周伟鹏 / cnlive_shenhe · Commits

Commit e7a89da6477a2a223b832c6f1de2e923ee72172e

Authored by 郑超
1 parent 3155cd59

update

Inline Side-by-side
Showing 2 changed files with 36 additions and 26 deletions
src/main/resources/application.properties
  View file @e7a89da
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 15 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
6 16  
... ... @@ -27,13 +37,13 @@ spring.thymeleaf.cache=false
27 37  
28 38 mybatis.mapper-locations=classpath:mapper/*.xml
29 39 mybatis.type-aliases-package=com.cnlive.shenhe.entity
30   -server.port=82
  40 +server.port=81
31 41  
32 42 #rabbitmq\u76F8\u5173\u914D\u7F6E
33   -spring.rabbitmq.host=10.254.174.131
  43 +spring.rabbitmq.host=10.254.176.11
34 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 47 # \u5F00\u542F\u53D1\u9001\u786E\u8BA4
38 48 spring.rabbitmq.publisher-confirms=true
39 49 # \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
... ... @@ -52,8 +62,8 @@ spring.mvc.favicon.enabled = false
52 62 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
53 63  
54 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 68 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
59 69 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
... ... @@ -68,16 +78,16 @@ platformKey =AUDIT
68 78 platformValue=10011438
69 79  
70 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 83 #\u62BD\u5E27\u5E38\u91CF
74 84 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
75 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 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 92 #\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
83 93 email_app_id=769_jetja50p18
... ... @@ -85,17 +95,17 @@ email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
85 95 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
86 96  
87 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 108 #\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
99 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 112 \ No newline at end of file
... ...
src/main/resources/generatorConfig.xml
  View file @e7a89da
... ... @@ -23,7 +23,7 @@
23 23  
24 24  
25 25 <jdbcConnection driverClass="com.mysql.jdbc.Driver"
26   - connectionURL="jdbc:mysql://120.92.102.31:3306/new_shy?useUnicode=true&amp;characterEncoding=utf8&amp;characterSetResults=utf8"
  26 + connectionURL="jdbc:mysql://120.92.102.31:3306/new_shy??useUnicode=true&amp;characterEncoding=utf8&amp;characterSetResults=utf8"
27 27 userId="root"
28 28 password="M345sdfss4!">
29 29 </jdbcConnection>
... ... @@ -32,8 +32,8 @@
32 32 <sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources"/>
33 33 <javaClientGenerator targetPackage="com.cnlive.shenhe.mapper" targetProject="src/main/java"
34 34 type="XMLMAPPER"/>
35   - <table schema="new_shy" tableName="shy_activity" domainObjectName="">
36   - <property name="useActualColumnNames" value="true" />
  35 + <table schema="" tableName="%" domainObjectName="">
  36 + <property name="useActualColumnNames" value="false" />
37 37 </table>
38 38 </context>
39 39 </generatorConfiguration>
40 40 \ No newline at end of file
... ...