周伟鹏 / cnlive_shenhe · Commits

Commit 99ab1fa9e80c9ca09c93b44f4f95f7aebbd919c5

Authored by 王言钊
1 parent aa59f87e

推送远程dev

Inline Side-by-side
Showing 2 changed files with 25 additions and 15 deletions
src/main/resources/application-dev.properties
  View file @99ab1fa
@@ -18,6 +18,12 @@ spring.http.encoding.charset=UTF-8 @@ -18,6 +18,12 @@ spring.http.encoding.charset=UTF-8
18 spring.http.encoding.enabled=true 18 spring.http.encoding.enabled=true
19 spring.http.encoding.force=true 19 spring.http.encoding.force=true
20 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 +
21 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql 27 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
22 #logging.level.com.cnlive.shenhe.mapper=debug 28 #logging.level.com.cnlive.shenhe.mapper=debug
23 29
src/main/resources/application-prod.properties
  View file @99ab1fa
1 server.port=81 1 server.port=81
2 2
3 -#\u91D1\u5C71\u516D\u533A\u6570\u636E\u5E93 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 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 5 spring.datasource.username=admin
6 spring.datasource.password=83BwiCoq 6 spring.datasource.password=83BwiCoq
@@ -19,58 +19,62 @@ spring.http.encoding.charset=UTF-8 @@ -19,58 +19,62 @@ spring.http.encoding.charset=UTF-8
19 spring.http.encoding.enabled=true 19 spring.http.encoding.enabled=true
20 spring.http.encoding.force=true 20 spring.http.encoding.force=true
21 21
  22 +
  23 +#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
  24 +#logging.level.com.cnlive.shenhe.mapper=debug
  25 +
22 mybatis.mapper-locations=classpath:mapper/*.xml 26 mybatis.mapper-locations=classpath:mapper/*.xml
23 mybatis.type-aliases-package=com.cnlive.shenhe.entity 27 mybatis.type-aliases-package=com.cnlive.shenhe.entity
24 28
25 -#rabbitmq\u76F8\u5173\u914D\u7F6E 29 +#rabbitmq\u76f8\u5173\u914d\u7f6e
26 spring.rabbitmq.host=10.254.176.11 30 spring.rabbitmq.host=10.254.176.11
27 spring.rabbitmq.port=5672 31 spring.rabbitmq.port=5672
28 spring.rabbitmq.username=admin 32 spring.rabbitmq.username=admin
29 spring.rabbitmq.password=fA{5Uikx7 33 spring.rabbitmq.password=fA{5Uikx7
30 -# \u5F00\u542F\u53D1\u9001\u786E\u8BA4 34 +# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
31 spring.rabbitmq.publisher-confirms=true 35 spring.rabbitmq.publisher-confirms=true
32 -# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE 36 +# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
33 spring.rabbitmq.publisher-returns=true 37 spring.rabbitmq.publisher-returns=true
34 -# \u5F00\u542FACK 38 +# \u5f00\u542fACK
35 spring.rabbitmq.listener.direct.acknowledge-mode=manual 39 spring.rabbitmq.listener.direct.acknowledge-mode=manual
36 spring.rabbitmq.listener.simple.acknowledge-mode=manual 40 spring.rabbitmq.listener.simple.acknowledge-mode=manual
37 41
38 42
39 -#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico 43 +#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
40 spring.mvc.favicon.enabled = false 44 spring.mvc.favicon.enabled = false
41 45
42 -#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API 46 +#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
43 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted 47 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
44 48
45 -#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528 49 +#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
46 spring.application.name=cnlive_shenhe 50 spring.application.name=cnlive_shenhe
47 spring.application.home=/usr/local/cnlive_shenhe/log 51 spring.application.home=/usr/local/cnlive_shenhe/log
48 52
49 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser 53 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
50 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae 54 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
51 55
52 -#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F 56 +#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
53 queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName= 57 queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
54 queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid= 58 queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
55 59
56 -#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF 60 +#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
57 url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify 61 url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
58 platformKey =AUDIT 62 platformKey =AUDIT
59 platformValue=10011438 63 platformValue=10011438
60 64
61 -#\u672C\u673A\u5730\u5740 65 +#\u672c\u673a\u5730\u5740
62 spring.localhost.url=http://shen.cnlive.com 66 spring.localhost.url=http://shen.cnlive.com
63 67
64 -#\u62BD\u5E27\u5E38\u91CF 68 +#\u62bd\u5e27\u5e38\u91cf
65 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9 69 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
66 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9 70 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
67 avsmple_url=http://transcode.cnlive.com/api/request 71 avsmple_url=http://transcode.cnlive.com/api/request
68 avsmple_callback=http://shen.cnlive.com/api/avsample/callback 72 avsmple_callback=http://shen.cnlive.com/api/avsample/callback
69 73
70 -#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F 74 +#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
71 live_url=http://bc.cnlive.com/bokong/activity/activityShenHe 75 live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
72 76
73 -#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF 77 +#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
74 email_app_id=769_jetja50p18 78 email_app_id=769_jetja50p18
75 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba 79 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
76 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action 80 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
@@ -81,7 +85,7 @@ qn_domain=http://sxzg.ys2.cnliveimg.com @@ -81,7 +85,7 @@ qn_domain=http://sxzg.ys2.cnliveimg.com
81 ks_bucket=mam-sxzg-82 85 ks_bucket=mam-sxzg-82
82 ks_domain=http://sxzg.ys1.cnliveimg.com 86 ks_domain=http://sxzg.ys1.cnliveimg.com
83 87
84 -#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84 88 +#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
85 desdir=shen 89 desdir=shen
86 yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio 90 yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
87 cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById 91 cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
88 \ No newline at end of file 92 \ No newline at end of file