Merge branch 'master' of

http://key@gitlab.egolm.com/hanxu/siff-film-api.git

Conflicts:
	pom.xml
	src/main/resources/application-dev.properties
	src/main/resources/application-pro.properties
	src/main/resources/application.properties

src/main/resources/application-dev.properties

-spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_dev?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.testWhileIdle=true
-spring.datasource.validationQuery=SELECT 1
+spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_dev?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.testWhileIdle=true
+spring.datasource.validationQuery=SELECT 1
 spring.datasource.timeBetweenEvictionRunsMillis=3600000
\ No newline at end of file

src/main/resources/application-pro.properties

-spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_dev?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.testWhileIdle=true
-spring.datasource.validationQuery=SELECT 1
+spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_dev?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.testWhileIdle=true
+spring.datasource.validationQuery=SELECT 1
 spring.datasource.timeBetweenEvictionRunsMillis=3600000
\ No newline at end of file

src/main/resources/application.properties

@@ -11,4 +11,5 @@ spring.http.multipart.maxFileSize=5MB
 spring.http.multipart.maxRequestSize=5MB
 spring.http.encoding.force=true
 spring.http.encoding.enabled=true
-spring.http.encoding.charset=utf-8
+spring.http.encoding.charset=utf-8
\ No newline at end of file
+

src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-	<property name="LOG_BASE_PATH" value="/data/logs/language" />
+	<property name="LOG_BASE_PATH" value="/data/logs/film" />
 
 	<include resource="org/springframework/boot/logging/logback/base.xml" />