周伟鹏 / cnlive_shenhe · Commits

Commit b410e3f1a26190c3d50531bcd91eb0a0afbb5c75

Authored by 郑超
1 parent 4533d76d

update

Inline Side-by-side
Showing 3 changed files with 109 additions and 117 deletions
src/main/resources/application-dev.properties 0 → 100644
  View file @b410e3f
  1 +server.port=82
  2 +
  3 +spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  4 +spring.datasource.username=root
  5 +spring.datasource.password=M345sdfss4!
  6 +
  7 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
  8 +
  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 +#\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
  22 +#logging.level.com.cnlive.shenhe.mapper=debug
  23 +
  24 +mybatis.mapper-locations=classpath:mapper/*.xml
  25 +mybatis.type-aliases-package=com.cnlive.shenhe.entity
  26 +
  27 +#rabbitmq\u76F8\u5173\u914D\u7F6E
  28 +spring.rabbitmq.host=10.254.174.131
  29 +spring.rabbitmq.port=5672
  30 +spring.rabbitmq.username=test
  31 +spring.rabbitmq.password=p3~amKKt9
  32 +# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
  33 +spring.rabbitmq.publisher-confirms=true
  34 +# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
  35 +spring.rabbitmq.publisher-returns=true
  36 +# \u5F00\u542FACK
  37 +spring.rabbitmq.listener.direct.acknowledge-mode=manual
  38 +spring.rabbitmq.listener.simple.acknowledge-mode=manual
  39 +
  40 +#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5
  41 +#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
  42 +
  43 +#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
  44 +spring.mvc.favicon.enabled = false
  45 +
  46 +#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API
  47 +speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
  48 +
  49 +#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528
  50 +spring.application.name=cnlive_shenhe_test
  51 +spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log
  52 +
  53 +sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
  54 +sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
  55 +
  56 +#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F
  57 +queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
  58 +queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
  59 +
  60 +#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF
  61 +url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
  62 +platformKey =AUDIT
  63 +platformValue=10011438
  64 +
  65 +#\u672C\u673A\u5730\u5740
  66 +spring.localhost.url=http://test.shen.cnlive.com
  67 +
  68 +#\u62BD\u5E27\u5E38\u91CF
  69 +avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
  70 +avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
  71 +avsmple_url=http://test.transcode.cnlive.com/api/request
  72 +avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
  73 +
  74 +#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
  75 +live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
  76 +
  77 +#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
  78 +email_app_id=769_jetja50p18
  79 +email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
  80 +email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
  81 +
  82 +#\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D
  83 +qn_bucket=cnlivetest
  84 +qn_domain=http://test.qnvod.cnlive.com
  85 +ks_bucket=cnlive-test
  86 +ks_domain=http://test.wideo.cnlive.com
  87 +
  88 +#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
  89 +desdir=shen
  90 +yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
  91 +cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio
... ...
src/main/resources/application-prod.properties
  View file @b410e3f
1 1 server.port=81
2 2  
3   -#\u91d1\u5c71\u516d\u533a\u6570\u636e\u5e93
  3 +#\u91D1\u5C71\u516D\u533A\u6570\u636E\u5E93
4 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 5 spring.datasource.username=admin
6 6 spring.datasource.password=83BwiCoq
... ... @@ -19,62 +19,58 @@ spring.http.encoding.charset=UTF-8
19 19 spring.http.encoding.enabled=true
20 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   -
26 22 mybatis.mapper-locations=classpath:mapper/*.xml
27 23 mybatis.type-aliases-package=com.cnlive.shenhe.entity
28 24  
29   -#rabbitmq\u76f8\u5173\u914d\u7f6e
  25 +#rabbitmq\u76F8\u5173\u914D\u7F6E
30 26 spring.rabbitmq.host=10.254.176.11
31 27 spring.rabbitmq.port=5672
32 28 spring.rabbitmq.username=admin
33 29 spring.rabbitmq.password=fA{5Uikx7
34   -# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
  30 +# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
35 31 spring.rabbitmq.publisher-confirms=true
36   -# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
  32 +# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
37 33 spring.rabbitmq.publisher-returns=true
38   -# \u5f00\u542fACK
  34 +# \u5F00\u542FACK
39 35 spring.rabbitmq.listener.direct.acknowledge-mode=manual
40 36 spring.rabbitmq.listener.simple.acknowledge-mode=manual
41 37  
42 38  
43   -#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
  39 +#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
44 40 spring.mvc.favicon.enabled = false
45 41  
46   -#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
  42 +#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API
47 43 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
48 44  
49   -#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
  45 +#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528
50 46 spring.application.name=cnlive_shenhe
51 47 spring.application.home=/usr/local/cnlive_shenhe/log
52 48  
53 49 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
54 50 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
55 51  
56   -#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
  52 +#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F
57 53 queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
58 54 queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
59 55  
60   -#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
  56 +#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF
61 57 url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
62 58 platformKey =AUDIT
63 59 platformValue=10011438
64 60  
65   -#\u672c\u673a\u5730\u5740
  61 +#\u672C\u673A\u5730\u5740
66 62 spring.localhost.url=http://shen.cnlive.com
67 63  
68   -#\u62bd\u5e27\u5e38\u91cf
  64 +#\u62BD\u5E27\u5E38\u91CF
69 65 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
70 66 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
71 67 avsmple_url=http://transcode.cnlive.com/api/request
72 68 avsmple_callback=http://shen.cnlive.com/api/avsample/callback
73 69  
74   -#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
  70 +#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
75 71 live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
76 72  
77   -#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
  73 +#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
78 74 email_app_id=769_jetja50p18
79 75 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
80 76 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
... ... @@ -85,7 +81,7 @@ qn_domain=http://sxzg.ys2.cnliveimg.com
85 81 ks_bucket=mam-sxzg-82
86 82 ks_domain=http://sxzg.ys1.cnliveimg.com
87 83  
88   -#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
  84 +#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
89 85 desdir=shen
90 86 yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
91 87 cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
92 88 \ No newline at end of file
... ...
src/main/resources/application.properties
  View file @b410e3f
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!
4   -
5   -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
6   -
7   -server.tomcat.protocol_header=x-forwarded-proto
8   -server.use-forward-headers=true
9   -
10   -spring.jpa.properties.hibernate.hbm2ddl.auto=update
11   -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
12   -spring.jpa.show-sql= true
13   -
14   -server.tomcat.uri-encoding=UTF-8
15   -spring.http.encoding.charset=UTF-8
16   -spring.http.encoding.enabled=true
17   -spring.http.encoding.force=true
  1 +spring.profiles.active=@environment@
18 2  
19 3 spring.thymeleaf.mode=LEGACYHTML5
  4 +spring.thymeleaf.encoding=UTF-8
  5 +spring.thymeleaf.content-type=text/html
20 6 spring.thymeleaf.cache=false
21   -#spring.thymeleaf.encoding=UTF-8
22   -#spring.thymeleaf.content-type=text/html
23   -#\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
24   -
25   -#\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
26   -#logging.level.com.cnlive.shenhe.mapper=debug
27   -
28   -mybatis.mapper-locations=classpath:mapper/*.xml
29   -mybatis.type-aliases-package=com.cnlive.shenhe.entity
30   -server.port=82
31   -
32   -#rabbitmq\u76F8\u5173\u914D\u7F6E
33   -spring.rabbitmq.host=10.254.174.131
34   -spring.rabbitmq.port=5672
35   -spring.rabbitmq.username=test
36   -spring.rabbitmq.password=p3~amKKt9
37   -# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
38   -spring.rabbitmq.publisher-confirms=true
39   -# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
40   -spring.rabbitmq.publisher-returns=true
41   -# \u5F00\u542FACK
42   -spring.rabbitmq.listener.direct.acknowledge-mode=manual
43   -spring.rabbitmq.listener.simple.acknowledge-mode=manual
44   -
45   -#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5
46   -#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
47   -
48   -#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
49   -spring.mvc.favicon.enabled = false
50   -
51   -#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API
52   -speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
53   -
54   -#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
57   -
58   -sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
59   -sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
60   -
61   -#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F
62   -queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
63   -queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
64   -
65   -#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF
66   -url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
67   -platformKey =AUDIT
68   -platformValue=10011438
69   -
70   -#\u672C\u673A\u5730\u5740
71   -spring.localhost.url=http://test.shen.cnlive.com
72   -
73   -#\u62BD\u5E27\u5E38\u91CF
74   -avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
75   -avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
76   -avsmple_url=http://test.transcode.cnlive.com/api/request
77   -avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
78   -
79   -#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
80   -live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
81   -
82   -#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
83   -email_app_id=769_jetja50p18
84   -email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
85   -email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
86   -
87   -#\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
92   -
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
97   -
98   -#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
99   -desdir=shen
100   -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
101   -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio
... ...