Merge branch 'master' of http://gitlab.egolm.com/hanxu/siff-film-api

src/main/java/com/egolm/film/api/admin/AdminCommonController.java

+package com.egolm.film.api.admin;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.egolm.film.api.admin.service.AdminCommonService;
+
+import io.swagger.annotations.Api;
+
+@Api
+@Controller
+@RequestMapping("admin/common")
+public class AdminCommonController {
+
+	@Autowired
+	AdminCommonService service;
+	
+}

src/main/java/com/egolm/film/api/admin/AdminFilmApplyController.java

+package com.egolm.film.api.admin;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.egolm.film.api.admin.service.AdminFilmApplyService;
+
+import io.swagger.annotations.Api;
+
+@Api
+@Controller
+@RequestMapping("admin/film_apply")
+public class AdminFilmApplyController {
+
+	@Autowired
+	AdminFilmApplyService service;
+	
+}

src/main/java/com/egolm/film/api/admin/AdminFilmGroupController.java

+package com.egolm.film.api.admin;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+
+import com.egolm.film.api.admin.service.AdminFilmGroupService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import io.swagger.annotations.Api;
+
+@Api
+@Controller
+@RequestMapping("admin/film_group")
+public class AdminFilmGroupController {
+
+	@Autowired
+	AdminFilmGroupService service;
+	
+}

src/main/java/com/egolm/film/api/admin/AdminUserController.java

+package com.egolm.film.api.admin;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.egolm.common.bean.Rjx;
+import com.egolm.film.api.admin.service.AdminUserService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api
+@Controller
+@RequestMapping("admin/user")
+public class AdminUserController {
+
+	@Autowired
+	AdminUserService service;
+	
+	@ResponseBody
+	@RequestMapping("list")
+	@ApiOperation("用户分页查询")
+	public Object list(String keyword, String group_id, Long index, Long limit) {
+		
+		return Rjx.jsonOk();
+	}
+	
+	@ResponseBody
+	@RequestMapping("add")
+	@ApiOperation("添加用户")
+	public Object add(String realname, String username, String password, String group_id, Date expire_time, String email, String telphone) {
+		
+		return Rjx.jsonOk();
+	}
+	
+	@ResponseBody
+	@RequestMapping("del")
+	@ApiOperation("删除用户")
+	public Object del(String adminid) {
+		
+		return Rjx.jsonOk();
+	}
+	
+	@ResponseBody
+	@RequestMapping("group/list")
+	@ApiOperation("组分页查询")
+	public Object groupList(Long index, Long limit) {
+		
+		return Rjx.jsonOk();
+	}
+	
+	@ResponseBody
+	@RequestMapping("group/add")
+	@ApiOperation("添加组")
+	public Object groupAdd(String group_name, Integer state) {
+		
+		return Rjx.jsonOk();
+	}
+	
+	@ResponseBody
+	@RequestMapping("group/del")
+	@ApiOperation("删除组")
+	public Object groupDel(String group_id) {
+		
+		return Rjx.jsonOk();
+	}
+	
+	
+	
+}

src/main/java/com/egolm/film/api/admin/service/AdminCommonService.java

+package com.egolm.film.api.admin.service;
+
+public interface AdminCommonService {
+
+}

src/main/java/com/egolm/film/api/admin/service/AdminFilmApplyService.java

+package com.egolm.film.api.admin.service;
+
+public interface AdminFilmApplyService {
+
+}

src/main/java/com/egolm/film/api/admin/service/AdminFilmGroupService.java

+package com.egolm.film.api.admin.service;
+
+public interface AdminFilmGroupService {
+
+}

src/main/java/com/egolm/film/api/admin/service/AdminUserService.java

+package com.egolm.film.api.admin.service;
+
+public interface AdminUserService {
+
+}

src/main/java/com/egolm/film/api/admin/service/impl/AdminCommonServiceImpl.java

+package com.egolm.film.api.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.egolm.common.jdbc.JdbcTemplate;
+import com.egolm.film.api.admin.service.AdminCommonService;
+
+@Service
+public class AdminCommonServiceImpl implements AdminCommonService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+}

src/main/java/com/egolm/film/api/admin/service/impl/AdminFilmApplyServiceImpl.java

+package com.egolm.film.api.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.egolm.common.jdbc.JdbcTemplate;
+import com.egolm.film.api.admin.service.AdminFilmApplyService;
+
+@Service
+public class AdminFilmApplyServiceImpl implements AdminFilmApplyService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+}

src/main/java/com/egolm/film/api/admin/service/impl/AdminFilmGroupServiceImpl.java

+package com.egolm.film.api.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.egolm.common.jdbc.JdbcTemplate;
+import com.egolm.film.api.admin.service.AdminFilmGroupService;
+
+@Service
+public class AdminFilmGroupServiceImpl implements AdminFilmGroupService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+}

src/main/java/com/egolm/film/api/admin/service/impl/AdminUserServiceImpl.java

+package com.egolm.film.api.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.egolm.common.jdbc.JdbcTemplate;
+import com.egolm.film.api.admin.service.AdminUserService;
+
+@Service
+public class AdminUserServiceImpl implements AdminUserService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+}

src/main/java/com/egolm/film/api/common/service/impl/EmailServiceImpl.java

@@ -17,7 +17,11 @@ public class EmailServiceImpl implements EmailService {
 	
 	@Override
 	public void send(String subject, String content, String... emailAddress) {
-		MailUtil.sendBySmtp(host, port, is_auth, from, password, subject, content, null, emailAddress);
+		new Thread() {
+			public void run() {
+				MailUtil.sendBySmtp(host, port, is_auth, from, password, subject, content, null, emailAddress);
+			}
+		}.start();
 	}
 
 }

src/main/resources/application-dev.properties

-spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_critic_2018?useSSL=false&useUnicode=true&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_new?useSSL=false&useUnicode=true&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=egolm#2018
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
 spring.datasource.test-while-idle=true
 spring.datasource.test-on-borrow=false
 spring.datasource.test-on-return=false
@@ -14,7 +13,5 @@ spring.datasource.initial-size=10
 spring.datasource.max-active=100
 spring.datasource.min-idle=10
 
-
-###配置阿里云视频点播上传所需要的STS密钥
 aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
 aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
\ No newline at end of file

src/main/resources/application-pro.properties

-spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_critic_2018?useSSL=false&useUnicode=true&characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=egolm#2018
+spring.datasource.url=jdbc:mysql://rm-uf690z5r42mm16f3r.mysql.rds.aliyuncs.com:3306/film_2019?useSSL=false&useUnicode=true&characterEncoding=utf8
+spring.datasource.username=filmdb
+spring.datasource.password=SMG@film#2018
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
 spring.datasource.test-while-idle=true
 spring.datasource.test-on-borrow=false
 spring.datasource.test-on-return=false
@@ -12,4 +11,7 @@ spring.datasource.min-evictable-idle-time-millis=1800000
 spring.datasource.max-wait=10000
 spring.datasource.initial-size=10
 spring.datasource.max-active=100
-spring.datasource.min-idle=10
\ No newline at end of file
+spring.datasource.min-idle=10
+
+aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
+aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
\ No newline at end of file

src/main/resources/application.properties

@@ -4,8 +4,8 @@ server.tomcat.max-threads=1000
 server.tomcat.min-spare-threads=30
 server.port=20002
 server.context-path=/film
-server.session.timeout=90000
 server.tomcat.uri-encoding=utf-8
+server.session.timeout=90000
 
 spring.http.multipart.maxFileSize=5MB
 spring.http.multipart.maxRequestSize=5MB

src/main/resources/i18n/messages_en_US.properties

 msg.test=Test
 email.getPassword.subject=China Film Festival [retrieve password] email
-email.getPassword.content=Hello {0}, Your password is: [{1}]
+email.getPassword.content=Dear {0}, your new password is {1}
 
 err=System error
 err.user_disabled=User disabled

src/main/resources/i18n/messages_zh_CN.properties

 msg.test=\u6D4B\u8BD5
 email.getPassword.subject=\u4E2D\u56FD\u7535\u5F71\u8282[\u627E\u56DE\u5BC6\u7801]\u90AE\u4EF6
-email.getPassword.content={0} \u60A8\u597D, \u60A8\u7684\u65B0\u5BC6\u7801\u662F: [{1}]
+email.getPassword.content=\u4F60\u597D\u00A0 {0}\uFF0C\u60A8\u7684\u65B0\u5BC6\u7801\u662F\uFF1A{1}
 
 err=\u7CFB\u7EDF\u9519\u8BEF
 err.user_disabled=\u7528\u6237\u5DF2\u7ECF\u7981\u7528

src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-	<property name="LOG_BASE_PATH" value="/data/logs/film" />
-
 	<include resource="org/springframework/boot/logging/logback/base.xml" />
 	
-	<logger name="springfox" level="ERROR" />
-	<logger name="com.egolm" level="DEBUG" />
-
 	<appender name="siftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
 		<discriminator>
-			<key>CTX_PATH</key>
+			<key>context</key>
 			<DefaultValue>logback</DefaultValue>
 		</discriminator>
 		<sift>
 			<appender name="rollingFileAppender"
 				class="ch.qos.logback.core.rolling.RollingFileAppender">
 				<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-					<FileNamePattern>${LOG_BASE_PATH}/${CTX_PATH}-%d{yyyy-MM-dd}.log</FileNamePattern>
+					<FileNamePattern>/data/logs/film/${CTX_PATH}-%d{yyyy-MM-dd}.log</FileNamePattern>
 					<MaxHistory>30</MaxHistory>
 				</rollingPolicy>
 				<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -30,5 +25,23 @@
 	<root level="INFO">
 		<appender-ref ref="siftingAppender" />
 	</root>
+	
+	<springProfile name="dev">
+		<root level="DEBUG">
+			<appender-ref ref="siftingAppender" />
+		</root>
+	</springProfile>
+	
+	<springProfile name="pro">
+		<root level="INFO">
+			<appender-ref ref="siftingAppender" />
+		</root>
+	</springProfile>
+	
+	<logger name="springfox" level="ERROR" />
+	<logger name="javax" level="ERROR" />
+	<logger name="java"  level="ERROR" />
+	<logger name="net"   level="ERROR" />
+	<logger name="org"   level="INFO" />
 
 </configuration>
\ No newline at end of file