周伟鹏 / cnlive_shenhe · Commits

Commit cc6dc3ca48df119e1811c3c2e954f97c6220b15a

Authored by 郑超
1 parent 815533ad

update

Inline Side-by-side
Showing 1 changed file with 33 additions and 23 deletions
src/main/resources/application.properties
  View file @cc6dc3c
1 -spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
2 -spring.datasource.username=root  
3 -spring.datasource.password=M345sdfss4! 1 +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  2 +#spring.datasource.username=root
  3 +#spring.datasource.password=nbLdyO.79
  4 +
  5 +#\u91D1\u5C71\u4E00\u533A\u6570\u636E\u5E93
  6 +#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  7 +#spring.datasource.username=admin
  8 +#spring.datasource.password=Sre#45iU7kJ
  9 +
  10 +#\u91D1\u5C71\u516D\u533A\u6570\u636E\u5E93
  11 +spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  12 +spring.datasource.username=admin
  13 +spring.datasource.password=83BwiCoq
4 14
5 spring.datasource.driver-class-name=com.mysql.jdbc.Driver 15 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
6 16
@@ -27,13 +37,13 @@ spring.thymeleaf.cache=false @@ -27,13 +37,13 @@ spring.thymeleaf.cache=false
27 37
28 mybatis.mapper-locations=classpath:mapper/*.xml 38 mybatis.mapper-locations=classpath:mapper/*.xml
29 mybatis.type-aliases-package=com.cnlive.shenhe.entity 39 mybatis.type-aliases-package=com.cnlive.shenhe.entity
30 -server.port=82 40 +server.port=81
31 41
32 #rabbitmq\u76F8\u5173\u914D\u7F6E 42 #rabbitmq\u76F8\u5173\u914D\u7F6E
33 -spring.rabbitmq.host=10.254.174.131 43 +spring.rabbitmq.host=10.254.176.11
34 spring.rabbitmq.port=5672 44 spring.rabbitmq.port=5672
35 -spring.rabbitmq.username=test  
36 -spring.rabbitmq.password=p3~amKKt9 45 +spring.rabbitmq.username=admin
  46 +spring.rabbitmq.password=fA{5Uikx7
37 # \u5F00\u542F\u53D1\u9001\u786E\u8BA4 47 # \u5F00\u542F\u53D1\u9001\u786E\u8BA4
38 spring.rabbitmq.publisher-confirms=true 48 spring.rabbitmq.publisher-confirms=true
39 # \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE 49 # \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
@@ -52,8 +62,8 @@ spring.mvc.favicon.enabled = false @@ -52,8 +62,8 @@ spring.mvc.favicon.enabled = false
52 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted 62 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
53 63
54 #logback\u65E5\u5FD7\u4E2D\u4F7F\u7528 64 #logback\u65E5\u5FD7\u4E2D\u4F7F\u7528
55 -spring.application.name=cnlive_shenhe_test  
56 -spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log 65 +spring.application.name=cnlive_shenhe
  66 +spring.application.home=/usr/local/cnlive_shenhe/log
57 67
58 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser 68 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
59 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae 69 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
@@ -68,16 +78,16 @@ platformKey =AUDIT @@ -68,16 +78,16 @@ platformKey =AUDIT
68 platformValue=10011438 78 platformValue=10011438
69 79
70 #\u672C\u673A\u5730\u5740 80 #\u672C\u673A\u5730\u5740
71 -spring.localhost.url=http://test.shen.cnlive.com 81 +spring.localhost.url=http://shen.cnlive.com
72 82
73 #\u62BD\u5E27\u5E38\u91CF 83 #\u62BD\u5E27\u5E38\u91CF
74 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9 84 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
75 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9 85 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
76 -avsmple_url=http://test.transcode.cnlive.com/api/request  
77 -avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback 86 +avsmple_url=http://transcode.cnlive.com/api/request
  87 +avsmple_callback=http://shen.cnlive.com/api/avsample/callback
78 88
79 #\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F 89 #\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
80 -live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe 90 +live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
81 91
82 #\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF 92 #\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
83 email_app_id=769_jetja50p18 93 email_app_id=769_jetja50p18
@@ -85,17 +95,17 @@ email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba @@ -85,17 +95,17 @@ email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
85 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action 95 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
86 96
87 #\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D 97 #\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D
88 -qn_bucket=cnlivetest  
89 -qn_domain=http://test.qnvod.cnlive.com  
90 -ks_bucket=cnlive-test  
91 -ks_domain=http://test.wideo.cnlive.com 98 +#qn_bucket=cnlivetest
  99 +#qn_domain=http://test.qnvod.cnlive.com
  100 +#ks_bucket=cnlive-test
  101 +#ks_domain=http://test.wideo.cnlive.com
92 102
93 -#qn_bucket=mam-sxzg-82  
94 -#qn_domain=http://sxzg.ys2.cnliveimg.com  
95 -#ks_bucket=mam-sxzg-82  
96 -#ks_domain=http://sxzg.ys1.cnliveimg.com 103 +qn_bucket=mam-sxzg-82
  104 +qn_domain=http://sxzg.ys2.cnliveimg.com
  105 +ks_bucket=mam-sxzg-82
  106 +ks_domain=http://sxzg.ys1.cnliveimg.com
97 107
98 #\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84 108 #\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
99 desdir=shen 109 desdir=shen
100 -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio  
101 -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById 110 +yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
  111 +cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
102 \ No newline at end of file 112 \ No newline at end of file