Merge branch 'master' of

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

src/main/resources/application-proupload.properties

+server.tomcat.max-threads=1000
+server.tomcat.min-spare-threads=30
+server.port=40002
+server.context-path=/film
+server.tomcat.uri-encoding=utf-8
+server.session.timeout=90000
+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
+
+com.egolm.film.email.test=
+com.egolm.film.email.smtp.host=smtphz.qiye.163.com
+com.egolm.film.email.smtp.port=994
+com.egolm.film.email.smtp.is_auth=true
+com.egolm.film.email.smtp.from=filmpassword@siff.com
+com.egolm.film.email.smtp.username=filmpassword@siff.com
+com.egolm.film.email.smtp.password=siffstvf2018
+
+spring.datasource.url=jdbc:mysql://rm-uf690z5r42mm16f3rho.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
+spring.datasource.validation-query=select 1 from dual
+spring.datasource.time-between-eviction-runs-millis=300000
+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
+
+aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
+aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
+#\u89C6\u9891\u8F6C\u7801ID
+aliyun.video.templateGroupId=d9f4a79cba14ce4cbc98d6516d35bf37
+aliyun.video.cateID=1000018494
+opt.project.type=1
\ No newline at end of file