Commit 0d987955aed6da31c451c8db881eba8cb55cfbcd

Authored by 郑超
1 parent 86944d79

多环境配置修改

@@ -198,16 +198,11 @@ @@ -198,16 +198,11 @@
198 <resource> 198 <resource>
199 <!-- 指定配置文件所在的resource目录 --> 199 <!-- 指定配置文件所在的resource目录 -->
200 <directory>src/main/resources</directory> 200 <directory>src/main/resources</directory>
201 - <includes>  
202 - <include>application.properties</include>  
203 - <include>application-${environment}.properties</include>  
204 - <include>logback-${environment}.xml</include>  
205 - </includes>  
206 <filtering>true</filtering> 201 <filtering>true</filtering>
207 </resource> 202 </resource>
208 </resources> 203 </resources>
209 <!-- 指定打包名称--> 204 <!-- 指定打包名称-->
210 - <finalName>cnlive_shenhe_${environment}-0.0.1-SNAPSHOT</finalName> 205 + <finalName>cnlive_shenhe_${environment}</finalName>
211 <plugins> 206 <plugins>
212 <plugin> 207 <plugin>
213 <groupId>org.springframework.boot</groupId> 208 <groupId>org.springframework.boot</groupId>
@@ -254,12 +249,12 @@ @@ -254,12 +249,12 @@
254 </profile> 249 </profile>
255 <!-- 生产环境 --> 250 <!-- 生产环境 -->
256 <profile> 251 <profile>
257 - <id>pro</id> 252 + <id>prod</id>
258 <activation> 253 <activation>
259 <activeByDefault>false</activeByDefault> 254 <activeByDefault>false</activeByDefault>
260 </activation> 255 </activation>
261 <properties> 256 <properties>
262 - <environment>pro</environment> 257 + <environment>prod</environment>
263 </properties> 258 </properties>
264 </profile> 259 </profile>
265 </profiles> 260 </profiles>
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -113,7 +113,7 @@ public class VideosServiceImpl { @@ -113,7 +113,7 @@ public class VideosServiceImpl {
113 } 113 }
114 114
115 public PageInfo<ShyVideos> getListContent(VideosDTO videosDTO) { 115 public PageInfo<ShyVideos> getListContent(VideosDTO videosDTO) {
116 - logger.info("接受桉树列表为,VideosDTO:{}",JSON.toJSONString(videosDTO)); 116 + logger.info("接受点播列表为,VideosDTO:{}",JSON.toJSONString(videosDTO));
117 Example example = new Example(ShyVideos.class); 117 Example example = new Example(ShyVideos.class);
118 Example.Criteria criteria = example.createCriteria(); 118 Example.Criteria criteria = example.createCriteria();
119 Example.Criteria criteria2 = example.createCriteria(); 119 Example.Criteria criteria2 = example.createCriteria();
src/main/resources/application-dev.properties
@@ -4,27 +4,94 @@ spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asi @@ -4,27 +4,94 @@ spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asi
4 spring.datasource.username=root 4 spring.datasource.username=root
5 spring.datasource.password=M345sdfss4! 5 spring.datasource.password=M345sdfss4!
6 6
7 -logging.config=classpath:logback-dev.xml 7 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8 8
9 -#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528 9 +server.tomcat.protocol_header=x-forwarded-proto
  10 +server.use-forward-headers=true
  11 +
  12 +spring.jpa.properties.hibernate.hbm2ddl.auto=update
  13 +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  14 +spring.jpa.show-sql= true
  15 +
  16 +server.tomcat.uri-encoding=UTF-8
  17 +spring.http.encoding.charset=UTF-8
  18 +spring.http.encoding.enabled=true
  19 +spring.http.encoding.force=true
  20 +
  21 +spring.thymeleaf.mode=LEGACYHTML5
  22 +spring.thymeleaf.cache=false
  23 +#spring.thymeleaf.encoding=UTF-8
  24 +#spring.thymeleaf.content-type=text/html
  25 +#\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
  26 +
  27 +#\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
  28 +#logging.level.com.cnlive.shenhe.mapper=debug
  29 +
  30 +mybatis.mapper-locations=classpath:mapper/*.xml
  31 +mybatis.type-aliases-package=com.cnlive.shenhe.entity
  32 +
  33 +#rabbitmq\u76F8\u5173\u914D\u7F6E
  34 +spring.rabbitmq.host=10.254.174.131
  35 +spring.rabbitmq.port=5672
  36 +spring.rabbitmq.username=test
  37 +spring.rabbitmq.password=p3~amKKt9
  38 +# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
  39 +spring.rabbitmq.publisher-confirms=true
  40 +# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
  41 +spring.rabbitmq.publisher-returns=true
  42 +# \u5F00\u542FACK
  43 +spring.rabbitmq.listener.direct.acknowledge-mode=manual
  44 +spring.rabbitmq.listener.simple.acknowledge-mode=manual
  45 +
  46 +#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5
  47 +#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
  48 +
  49 +#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
  50 +spring.mvc.favicon.enabled = false
  51 +
  52 +#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API
  53 +speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
  54 +
  55 +#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528
10 spring.application.name=cnlive_shenhe_test 56 spring.application.name=cnlive_shenhe_test
11 spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log 57 spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log
12 58
13 -#\u672c\u673a\u5730\u5740 59 +sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
  60 +sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
  61 +
  62 +#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F
  63 +queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
  64 +queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
  65 +
  66 +#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF
  67 +url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
  68 +platformKey =AUDIT
  69 +platformValue=10011438
  70 +
  71 +#\u672C\u673A\u5730\u5740
14 spring.localhost.url=http://test.shen.cnlive.com 72 spring.localhost.url=http://test.shen.cnlive.com
15 73
16 -#\u62bd\u5e27\u5e38\u91cf 74 +#\u62BD\u5E27\u5E38\u91CF
  75 +avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
  76 +avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
17 avsmple_url=http://test.transcode.cnlive.com/api/request 77 avsmple_url=http://test.transcode.cnlive.com/api/request
18 avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback 78 avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
19 79
20 -#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f 80 +#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
21 live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe 81 live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
22 82
23 -#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d 83 +#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
  84 +email_app_id=769_jetja50p18
  85 +email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
  86 +email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
  87 +
  88 +#\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D
24 qn_bucket=cnlivetest 89 qn_bucket=cnlivetest
25 qn_domain=http://test.qnvod.cnlive.com 90 qn_domain=http://test.qnvod.cnlive.com
26 ks_bucket=cnlive-test 91 ks_bucket=cnlive-test
27 ks_domain=http://test.wideo.cnlive.com 92 ks_domain=http://test.wideo.cnlive.com
28 93
29 -#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84  
30 -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio  
31 \ No newline at end of file 94 \ No newline at end of file
  95 +#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
  96 +desdir=shen
  97 +yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
  98 +cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio
src/main/resources/application-pro.properties deleted 100644 → 0
1 -server.port=81  
2 -  
3 -spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
4 -spring.datasource.username=admin  
5 -spring.datasource.password=83BwiCoq  
6 -  
7 -logging.config=classpath:logback-pro.xml  
8 -  
9 -#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528  
10 -spring.application.name=cnlive_shenhe  
11 -spring.application.home=/usr/local/cnlive_shenhe/log  
12 -  
13 -#\u672c\u673a\u5730\u5740  
14 -spring.localhost.url=http://shen.cnlive.com  
15 -  
16 -#\u62bd\u5e27\u5e38\u91cf  
17 -avsmple_url=http://transcode.cnlive.com/api/request  
18 -avsmple_callback=http://shen.cnlive.com/api/avsample/callback  
19 -  
20 -#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f  
21 -live_url=http://bc.cnlive.com/bokong/activity/activityShenHe  
22 -  
23 -#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d  
24 -qn_bucket=mam-sxzg-82  
25 -qn_domain=http://sxzg.ys2.cnliveimg.com  
26 -ks_bucket=mam-sxzg-82  
27 -ks_domain=http://sxzg.ys1.cnliveimg.com  
28 -  
29 -#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84  
src/main/resources/application_prod.properties renamed to src/main/resources/application-prod.properties
1 -server.port=8082 1 +server.port=81
2 2
3 -spring.datasource.url=jdbc:mysql://120.92.51.254:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
4 -spring.datasource.username=root  
5 -spring.datasource.password=M345sdfss4! 3 +#\u91d1\u5c71\u516d\u533a\u6570\u636e\u5e93
  4 +spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  5 +spring.datasource.username=admin
  6 +spring.datasource.password=83BwiCoq
6 7
7 -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
8 -#spring.datasource.username=root  
9 -#spring.datasource.password=nbLdyO.79  
10 -  
11 -#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
12 -#spring.datasource.username=admin  
13 -#spring.datasource.password=Sre#45iU7kJ  
14 spring.datasource.driver-class-name=com.mysql.jdbc.Driver 8 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
15 9
16 server.tomcat.protocol_header=x-forwarded-proto 10 server.tomcat.protocol_header=x-forwarded-proto
@@ -25,13 +19,6 @@ spring.http.encoding.charset=UTF-8 @@ -25,13 +19,6 @@ spring.http.encoding.charset=UTF-8
25 spring.http.encoding.enabled=true 19 spring.http.encoding.enabled=true
26 spring.http.encoding.force=true 20 spring.http.encoding.force=true
27 21
28 -spring.thymeleaf.mode=LEGACYHTML5  
29 -#spring.thymeleaf.encoding=UTF-8  
30 -#spring.thymeleaf.content-type=text/html  
31 -#\u5f00\u53d1\u65f6\u5173\u95ed\u7f13\u5b58,\u4e0d\u7136\u6ca1\u6cd5\u770b\u5230\u5b9e\u65f6\u9875\u9762  
32 -spring.thymeleaf.cache=false  
33 -  
34 -spring.freemarker.settings.classic_compatible=true  
35 22
36 #\u6253\u5370\u8fd0\u884c\u65f6\u7684sql 23 #\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
37 #logging.level.com.cnlive.shenhe.mapper=debug 24 #logging.level.com.cnlive.shenhe.mapper=debug
@@ -39,22 +26,19 @@ spring.freemarker.settings.classic_compatible=true @@ -39,22 +26,19 @@ spring.freemarker.settings.classic_compatible=true
39 mybatis.mapper-locations=classpath:mapper/*.xml 26 mybatis.mapper-locations=classpath:mapper/*.xml
40 mybatis.type-aliases-package=com.cnlive.shenhe.entity 27 mybatis.type-aliases-package=com.cnlive.shenhe.entity
41 28
42 -  
43 #rabbitmq\u76f8\u5173\u914d\u7f6e 29 #rabbitmq\u76f8\u5173\u914d\u7f6e
44 -spring.rabbitmq.host=10.254.174.131 30 +spring.rabbitmq.host=10.254.176.11
45 spring.rabbitmq.port=5672 31 spring.rabbitmq.port=5672
46 -spring.rabbitmq.username=test  
47 -spring.rabbitmq.password=p3~amKKt9 32 +spring.rabbitmq.username=admin
  33 +spring.rabbitmq.password=fA{5Uikx7
48 # \u5f00\u542f\u53d1\u9001\u786e\u8ba4 34 # \u5f00\u542f\u53d1\u9001\u786e\u8ba4
49 spring.rabbitmq.publisher-confirms=true 35 spring.rabbitmq.publisher-confirms=true
50 # \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de 36 # \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
51 spring.rabbitmq.publisher-returns=true 37 spring.rabbitmq.publisher-returns=true
52 # \u5f00\u542fACK 38 # \u5f00\u542fACK
53 -#spring.rabbitmq.listener.direct.acknowledge-mode=manual  
54 -#spring.rabbitmq.listener.simple.acknowledge-mode=manual 39 +spring.rabbitmq.listener.direct.acknowledge-mode=manual
  40 +spring.rabbitmq.listener.simple.acknowledge-mode=manual
55 41
56 -#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5  
57 -#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=  
58 42
59 #\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico 43 #\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
60 spring.mvc.favicon.enabled = false 44 spring.mvc.favicon.enabled = false
@@ -95,18 +79,13 @@ email_app_id=769_jetja50p18 @@ -95,18 +79,13 @@ email_app_id=769_jetja50p18
95 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba 79 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
96 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action 80 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
97 81
98 -#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d  
99 -qn_bucket=cnlivetest  
100 -qn_domain=http://test.qnvod.cnlive.com  
101 -ks_bucket=cnlive-test  
102 -ks_domain=http://test.wideo.cnlive.com  
103 82
104 -#qn_bucket=mam-sxzg-82  
105 -#qn_domain=http://sxzg.ys2.cnliveimg.com  
106 -#ks_bucket=mam-sxzg-82  
107 -#ks_domain=http://sxzg.ys1.cnliveimg.com 83 +qn_bucket=mam-sxzg-82
  84 +qn_domain=http://sxzg.ys2.cnliveimg.com
  85 +ks_bucket=mam-sxzg-82
  86 +ks_domain=http://sxzg.ys1.cnliveimg.com
108 87
109 #\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84 88 #\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
110 desdir=shen 89 desdir=shen
111 yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio 90 yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
112 -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById 91 +cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
113 \ No newline at end of file 92 \ No newline at end of file
src/main/resources/application.properties
1 spring.profiles.active=@environment@ 1 spring.profiles.active=@environment@
2 2
3 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver  
4 -  
5 -server.tomcat.protocol_header=x-forwarded-proto  
6 -server.use-forward-headers=true  
7 -  
8 -spring.jpa.properties.hibernate.hbm2ddl.auto=update  
9 -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
10 -spring.jpa.show-sql= true  
11 -  
12 -server.tomcat.uri-encoding=UTF-8  
13 -spring.http.encoding.charset=UTF-8  
14 -spring.http.encoding.enabled=true  
15 -spring.http.encoding.force=true  
16 -  
17 spring.thymeleaf.mode=LEGACYHTML5 3 spring.thymeleaf.mode=LEGACYHTML5
  4 +spring.thymeleaf.encoding=UTF-8
  5 +spring.thymeleaf.content-type=text/html
18 spring.thymeleaf.cache=false 6 spring.thymeleaf.cache=false
19 -#spring.thymeleaf.encoding=UTF-8  
20 -#spring.thymeleaf.content-type=text/html  
21 -  
22 -mybatis.mapper-locations=classpath:mapper/*.xml  
23 -mybatis.type-aliases-package=com.cnlive.shenhe.entity  
24 -  
25 -#rabbitmq\u76F8\u5173\u914D\u7F6E  
26 -spring.rabbitmq.host=10.254.174.131  
27 -spring.rabbitmq.port=5672  
28 -spring.rabbitmq.username=test  
29 -spring.rabbitmq.password=p3~amKKt9  
30 -  
31 -spring.rabbitmq.publisher-confirms=true  
32 -spring.rabbitmq.publisher-returns=true  
33 -spring.rabbitmq.listener.direct.acknowledge-mode=manual  
34 -spring.rabbitmq.listener.simple.acknowledge-mode=manual  
35 -  
36 -#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico  
37 -spring.mvc.favicon.enabled = false  
38 -  
39 -#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API  
40 -speak_comment=http://comment.cnlive.com/services/commentForTopic/muted  
41 -  
42 -sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser  
43 -sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae  
44 -  
45 -#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F  
46 -queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=  
47 -queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=  
48 -  
49 -#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF  
50 -url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify  
51 -platformKey =AUDIT  
52 -platformValue=10011438  
53 -  
54 -#\u62BD\u5E27\u5E38\u91CF  
55 -avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9  
56 -avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9  
57 -  
58 -#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF  
59 -email_app_id=769_jetja50p18  
60 -email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba  
61 -email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action  
62 -  
63 -#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84  
64 -desdir=shen  
65 -#yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/  
66 -#cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio  
src/main/resources/application_dev.properties deleted 100644 → 0
1 -server.port=8081  
2 -  
3 -  
4 -spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
5 -spring.datasource.username=root  
6 -spring.datasource.password=M345sdfss4!  
7 -  
8 -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
9 -#spring.datasource.username=root  
10 -#spring.datasource.password=nbLdyO.79  
11 -  
12 -#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
13 -#spring.datasource.username=admin  
14 -#spring.datasource.password=Sre#45iU7kJ  
15 -#spring.datasource.driver-class-name=com.mysql.jdbc.Driver  
16 -  
17 -server.tomcat.protocol_header=x-forwarded-proto  
18 -server.use-forward-headers=true  
19 -  
20 -spring.jpa.properties.hibernate.hbm2ddl.auto=update  
21 -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
22 -spring.jpa.show-sql= true  
23 -  
24 -#server.tomcat.uri-encoding=UTF-8  
25 -#spring.http.encoding.charset=UTF-8  
26 -#spring.http.encoding.enabled=true  
27 -#spring.http.encoding.force=true  
28 -#  
29 -#spring.thymeleaf.mode=LEGACYHTML5  
30 -#spring.thymeleaf.encoding=UTF-8  
31 -#spring.thymeleaf.content-type=text/html  
32 -#\u5f00\u53d1\u65f6\u5173\u95ed\u7f13\u5b58,\u4e0d\u7136\u6ca1\u6cd5\u770b\u5230\u5b9e\u65f6\u9875\u9762  
33 -#spring.thymeleaf.cache=false  
34 -  
35 -spring.freemarker.settings.classic_compatible=true  
36 -  
37 -#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql  
38 -#logging.level.com.cnlive.shenhe.mapper=debug  
39 -  
40 -#mybatis.mapper-locations=classpath:mapper/*.xml  
41 -#mybatis.type-aliases-package=com.cnlive.shenhe.entity  
42 -  
43 -  
44 -#rabbitmq\u76f8\u5173\u914d\u7f6e  
45 -spring.rabbitmq.host=10.254.174.131  
46 -spring.rabbitmq.port=5672  
47 -spring.rabbitmq.username=test  
48 -spring.rabbitmq.password=p3~amKKt9  
49 -# \u5f00\u542f\u53d1\u9001\u786e\u8ba4  
50 -spring.rabbitmq.publisher-confirms=true  
51 -# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de  
52 -spring.rabbitmq.publisher-returns=true  
53 -# \u5f00\u542fACK  
54 -#spring.rabbitmq.listener.direct.acknowledge-mode=manual  
55 -#spring.rabbitmq.listener.simple.acknowledge-mode=manual  
56 -  
57 -#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5  
58 -#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=  
59 -  
60 -#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico  
61 -#spring.mvc.favicon.enabled = false  
62 -  
63 -#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API  
64 -speak_comment=http://comment.cnlive.com/services/commentForTopic/muted  
65 -  
66 -#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528  
67 -spring.application.name=cnlive_shenhe_test  
68 -spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log  
69 -  
70 -sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser  
71 -sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae  
72 -  
73 -#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f  
74 -queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=  
75 -queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=  
76 -  
77 -#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf  
78 -url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify  
79 -platformKey =AUDIT  
80 -platformValue=10011438  
81 -  
82 -#\u672c\u673a\u5730\u5740  
83 -spring.localhost.url=http://test.shen.cnlive.com  
84 -  
85 -#\u62bd\u5e27\u5e38\u91cf  
86 -avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9  
87 -avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9  
88 -avsmple_url=http://test.transcode.cnlive.com/api/request  
89 -avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback  
90 -  
91 -#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f  
92 -live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe  
93 -  
94 -#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf  
95 -#email_app_id=769_jetja50p18  
96 -#email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba  
97 -#email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action  
98 -  
99 -#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d  
100 -qn_bucket=cnlivetest  
101 -qn_domain=http://test.qnvod.cnlive.com  
102 -ks_bucket=cnlive-test  
103 -ks_domain=http://test.wideo.cnlive.com  
104 -  
105 -#qn_bucket=mam-sxzg-82  
106 -#qn_domain=http://sxzg.ys2.cnliveimg.com  
107 -#ks_bucket=mam-sxzg-82  
108 -#ks_domain=http://sxzg.ys1.cnliveimg.com  
109 -  
110 -#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84  
111 -desdir=shen  
112 -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio  
113 -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById  
src/main/resources/logback-dev.xml deleted 100644 → 0
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!--  
3 -scan:当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true。  
4 -scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒当scan为true时,此属性生效。默认的时间间隔为1分钟。  
5 -debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。  
6 --->  
7 -<configuration scan="false" scanPeriod="60 seconds" debug="false">  
8 - <!--日志文件主目录:这里${user.home}为当前服务器用户主目录-->  
9 -<!-- <property name="LOG_HOME" value="/usr/local/test_cnlive_shenhe/cnlive_shenhe/log" /> -->  
10 - <springProperty scope="context" name="LOG_HOME" source="spring.application.home"/>  
11 - <!-- 定义日志文件名称 -->  
12 -<!-- <property name="appName" value="appName" source="spring.application.name"></property> -->  
13 - <!--日志文件名称:这里spring.application.name表示工程名称-->  
14 - <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>  
15 - <!-- ch.qos.logback.core.ConsoleAppender 表示控制台输出 -->  
16 - <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">  
17 - <!--  
18 - 日志输出格式:  
19 - %d表示日期时间,  
20 - %thread表示线程名,  
21 - %-5level:级别从左显示5个字符宽度  
22 - %logger{50} 表示logger名字最长50个字符,否则按照句点分割。  
23 - %msg:日志消息,  
24 - %n是换行符  
25 - -->  
26 - <layout class="ch.qos.logback.classic.PatternLayout">  
27 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
28 - </layout>  
29 - </appender>  
30 -  
31 - <!-- 滚动记录文件,先将日志记录到指定文件,当符合某个条件时,将日志记录到其他文件 -->  
32 - <appender name="appLogAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">  
33 - <!-- 指定日志文件的名称 -->  
34 -<!-- <file>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</file> -->  
35 - <!--  
36 - 当发生滚动时,决定 RollingFileAppender 的行为,涉及文件移动和重命名  
37 - TimeBasedRollingPolicy: 最常用的滚动策略,它根据时间来制定滚动策略,既负责滚动也负责出发滚动。  
38 - -->  
39 - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
40 - <!--  
41 - 滚动时产生的文件的存放位置及文件名称 %d{yyyy-MM-dd}:按天进行日志滚动  
42 - %i:当文件大小超过maxFileSize时,按照i进行文件滚动  
43 - -->  
44 - <fileNamePattern>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</fileNamePattern>  
45 - <!--  
46 - 可选节点,控制保留的归档文件的最大数量,超出数量就删除旧文件。假设设置每天滚动,  
47 - 且maxHistory是365,则只保存最近365天的文件,删除之前的旧文件。注意,删除旧文件是,  
48 - 那些为了归档而创建的目录也会被删除。  
49 - -->  
50 - <MaxHistory>30</MaxHistory>  
51 - <!--  
52 - 当日志文件超过maxFileSize指定的大小是,根据上面提到的%i进行日志文件滚动 注意此处配置SizeBasedTriggeringPolicy是无法实现按文件大小进行滚动的,必须配置timeBasedFileNamingAndTriggeringPolicy  
53 - -->  
54 -<!-- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> -->  
55 -<!-- <maxFileSize>100MB</maxFileSize> -->  
56 -<!-- </timeBasedFileNamingAndTriggeringPolicy> -->  
57 - </rollingPolicy>  
58 - <!-- 日志输出格式: -->  
59 - <layout class="ch.qos.logback.classic.PatternLayout">  
60 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
61 - </layout>  
62 - </appender>  
63 -  
64 - <!--  
65 - logger主要用于存放日志对象,也可以定义日志类型、级别  
66 - name:表示匹配的logger类型前缀,也就是包的前半部分  
67 - level:要记录的日志级别,包括 TRACE < DEBUG < INFO < WARN < ERROR  
68 - additivity:作用在于children-logger是否使用 rootLogger配置的appender进行输出,  
69 - false:表示只用当前logger的appender-ref,true:  
70 - 表示当前logger的appender-ref和rootLogger的appender-ref都有效  
71 - -->  
72 - <!-- hibernate logger -->  
73 - <logger name="com.yuanqinnan" level="debug" />  
74 - <!-- Spring framework logger -->  
75 - <logger name="org.springframework" level="debug" additivity="false"></logger>  
76 -  
77 -  
78 -  
79 - <!--  
80 - root与logger是父子关系,没有特别定义则默认为root,任何一个类只会和一个logger对应,  
81 - 要么是定义的logger,要么是root,判断的关键在于找到这个logger,然后判断这个logger的appender和level。  
82 - -->  
83 - <root level="info">  
84 - <appender-ref ref="stdout" />  
85 - <appender-ref ref="appLogAppender" />  
86 - </root>  
87 -</configuration>  
88 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/logback-pro.xml deleted 100644 → 0
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!--  
3 -scan:当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true。  
4 -scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒当scan为true时,此属性生效。默认的时间间隔为1分钟。  
5 -debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。  
6 --->  
7 -<configuration scan="false" scanPeriod="60 seconds" debug="false">  
8 - <!--日志文件主目录:这里${user.home}为当前服务器用户主目录-->  
9 -<!-- <property name="LOG_HOME" value="/usr/local/test_cnlive_shenhe/cnlive_shenhe/log" /> -->  
10 - <springProperty scope="context" name="LOG_HOME" source="spring.application.home"/>  
11 - <!-- 定义日志文件名称 -->  
12 -<!-- <property name="appName" value="appName" source="spring.application.name"></property> -->  
13 - <!--日志文件名称:这里spring.application.name表示工程名称-->  
14 - <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>  
15 - <!-- ch.qos.logback.core.ConsoleAppender 表示控制台输出 -->  
16 - <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">  
17 - <!--  
18 - 日志输出格式:  
19 - %d表示日期时间,  
20 - %thread表示线程名,  
21 - %-5level:级别从左显示5个字符宽度  
22 - %logger{50} 表示logger名字最长50个字符,否则按照句点分割。  
23 - %msg:日志消息,  
24 - %n是换行符  
25 - -->  
26 - <layout class="ch.qos.logback.classic.PatternLayout">  
27 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
28 - </layout>  
29 - </appender>  
30 -  
31 - <!-- 滚动记录文件,先将日志记录到指定文件,当符合某个条件时,将日志记录到其他文件 -->  
32 - <appender name="appLogAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">  
33 - <!-- 指定日志文件的名称 -->  
34 -<!-- <file>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</file> -->  
35 - <!--  
36 - 当发生滚动时,决定 RollingFileAppender 的行为,涉及文件移动和重命名  
37 - TimeBasedRollingPolicy: 最常用的滚动策略,它根据时间来制定滚动策略,既负责滚动也负责出发滚动。  
38 - -->  
39 - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
40 - <!--  
41 - 滚动时产生的文件的存放位置及文件名称 %d{yyyy-MM-dd}:按天进行日志滚动  
42 - %i:当文件大小超过maxFileSize时,按照i进行文件滚动  
43 - -->  
44 - <fileNamePattern>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</fileNamePattern>  
45 - <!--  
46 - 可选节点,控制保留的归档文件的最大数量,超出数量就删除旧文件。假设设置每天滚动,  
47 - 且maxHistory是365,则只保存最近365天的文件,删除之前的旧文件。注意,删除旧文件是,  
48 - 那些为了归档而创建的目录也会被删除。  
49 - -->  
50 - <MaxHistory>30</MaxHistory>  
51 - <!--  
52 - 当日志文件超过maxFileSize指定的大小是,根据上面提到的%i进行日志文件滚动 注意此处配置SizeBasedTriggeringPolicy是无法实现按文件大小进行滚动的,必须配置timeBasedFileNamingAndTriggeringPolicy  
53 - -->  
54 -<!-- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> -->  
55 -<!-- <maxFileSize>100MB</maxFileSize> -->  
56 -<!-- </timeBasedFileNamingAndTriggeringPolicy> -->  
57 - </rollingPolicy>  
58 - <!-- 日志输出格式: -->  
59 - <layout class="ch.qos.logback.classic.PatternLayout">  
60 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
61 - </layout>  
62 - </appender>  
63 -  
64 - <!--  
65 - logger主要用于存放日志对象,也可以定义日志类型、级别  
66 - name:表示匹配的logger类型前缀,也就是包的前半部分  
67 - level:要记录的日志级别,包括 TRACE < DEBUG < INFO < WARN < ERROR  
68 - additivity:作用在于children-logger是否使用 rootLogger配置的appender进行输出,  
69 - false:表示只用当前logger的appender-ref,true:  
70 - 表示当前logger的appender-ref和rootLogger的appender-ref都有效  
71 - -->  
72 - <!-- hibernate logger -->  
73 - <logger name="com.yuanqinnan" level="debug" />  
74 - <!-- Spring framework logger -->  
75 - <logger name="org.springframework" level="debug" additivity="false"></logger>  
76 -  
77 -  
78 -  
79 - <!--  
80 - root与logger是父子关系,没有特别定义则默认为root,任何一个类只会和一个logger对应,  
81 - 要么是定义的logger,要么是root,判断的关键在于找到这个logger,然后判断这个logger的appender和level。  
82 - -->  
83 - <root level="info">  
84 - <appender-ref ref="stdout" />  
85 - <appender-ref ref="appLogAppender" />  
86 - </root>  
87 -</configuration>  
88 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/logback.xml renamed to src/main/resources/logback-spring.xml