周伟鹏 / cnlive_shenhe · Commits

Commit 238aa9042f8f3f72bdb902a7598c60c0c7921eaa

Authored by 郑超
1 parent e8807a94

update

Inline Side-by-side
Showing 2 changed files with 68 additions and 199 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
  View file @238aa90
... ... @@ -9,7 +9,6 @@ import org.slf4j.Logger;
9 9 import org.slf4j.LoggerFactory;
10 10 import org.springframework.beans.factory.annotation.Value;
11 11 import org.springframework.boot.ApplicationRunner;
12   -import org.springframework.boot.SpringApplication;
13 12 import org.springframework.boot.autoconfigure.SpringBootApplication;
14 13 import org.springframework.boot.builder.SpringApplicationBuilder;
15 14 import org.springframework.boot.web.servlet.FilterRegistrationBean;
... ... @@ -17,10 +16,6 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
17 16 import org.springframework.context.annotation.Bean;
18 17 import org.springframework.context.annotation.Configuration;
19 18 import org.springframework.stereotype.Controller;
20   -import org.springframework.ui.Model;
21   -import org.springframework.web.bind.annotation.GetMapping;
22   -import org.springframework.web.servlet.ModelAndView;
23   -
24 19 import tk.mybatis.spring.annotation.MapperScan;
25 20  
26 21 import java.net.InetAddress;
... ... @@ -29,24 +24,33 @@ import java.util.HashMap;
29 24 import java.util.Map;
30 25  
31 26 @SpringBootApplication
32   -@MapperScan(basePackages= {"com.cnlive.shenhe.mapper"})
  27 +@MapperScan(basePackages = {"com.cnlive.shenhe.mapper"})
33 28 public class ShenheApplication extends SpringBootServletInitializer {
34 29  
35 30 //url的前缀
36 31 private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2";
37 32 private static final String CAS_SERVER_LOGIN_URL = "https://user.cnlive.com/OpenSSO2/login";
38 33 //本机的名称
39   - private static final String SERVER_NAME = "http://shen.cnlive.com:81";
  34 + private static final String SERVER_NAME = "http://test.shen.cnlive.com:82";
40 35  
41 36 //登录入口
42   - private static final String SERVICE_LOGIN = "http://shen.cnlive.com:81/users/login";
  37 + private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login";
43 38  
44 39 //登出
45   - private static final String SERVICE_LOGINOUT = "http://shen.cnlive.com:81/users/logout";
  40 + private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout";
  41 +
  42 + public static void main(String[] args) {
  43 +// SpringApplication.run(ShenheApplication.class, args);
  44 + SpringApplicationBuilder builder = new SpringApplicationBuilder(ShenheApplication.class);
  45 + builder.headless(true).run(args);
  46 + // 设置Headless模式,linux系统下
  47 + System.setProperty("java.awt.headless", "true");
  48 + }
46 49  
47 50  
48 51 /**
49 52 * 用于实现单点登出功能
  53 + *
50 54 * @return
51 55 */
52 56 @Bean
... ... @@ -55,7 +59,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
55 59 registration.setFilter(new SingleSignOutFilter());
56 60 // 设定匹配的路径
57 61 registration.addUrlPatterns("/*");
58   - Map<String,String> initParameters = new HashMap<String, String>();
  62 + Map<String, String> initParameters = new HashMap<String, String>();
59 63 initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
60 64 registration.setInitParameters(initParameters);
61 65 // 设定加载的顺序
... ... @@ -65,6 +69,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
65 69  
66 70 /**
67 71 * 该过滤器负责用户的认证工作
  72 + *
68 73 * @return
69 74 */
70 75 @Bean
... ... @@ -73,7 +78,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
73 78 registration.setFilter(new AuthenticationFilter());
74 79 // 设定匹配的路径
75 80 registration.addUrlPatterns("/*");
76   - Map<String,String> initParameters = new HashMap<String, String>();
  81 + Map<String, String> initParameters = new HashMap<String, String>();
77 82 initParameters.put("casServerLoginUrl", CAS_SERVER_LOGIN_URL);
78 83 initParameters.put("service", SERVICE_LOGIN);
79 84 initParameters.put("ignorePattern", "/api/*|/logging/*");
... ... @@ -86,6 +91,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
86 91  
87 92 /**
88 93 * 该过滤器负责对Ticket的校验工作
  94 + *
89 95 * @return
90 96 */
91 97 @Bean
... ... @@ -94,10 +100,10 @@ public class ShenheApplication extends SpringBootServletInitializer {
94 100 registration.setFilter(new Cas20ProxyReceivingTicketValidationFilter());
95 101 // 设定匹配的路径
96 102 registration.addUrlPatterns("/*");
97   - Map<String,String> initParameters = new HashMap<String, String>();
  103 + Map<String, String> initParameters = new HashMap<String, String>();
98 104 initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
99 105 initParameters.put("serverName", SERVER_NAME);
100   - initParameters.put("encoding","utf-8");
  106 + initParameters.put("encoding", "utf-8");
101 107 registration.setInitParameters(initParameters);
102 108 // 设定加载的顺序
103 109 registration.setOrder(3);
... ... @@ -107,7 +113,8 @@ public class ShenheApplication extends SpringBootServletInitializer {
107 113  
108 114 /**
109 115 * 该过滤器负责实现HttpServletRequest请求的包裹，
110   - * 比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。
  116 + * 比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。
  117 + *
111 118 * @return
112 119 */
113 120 @Bean
... ... @@ -123,7 +130,8 @@ public class ShenheApplication extends SpringBootServletInitializer {
123 130  
124 131 /**
125 132 * 该过滤器使得开发者可以通过org.jasig.cas.client.util.AssertionHolder来获取
126   - * 用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。
  133 + * 用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。
  134 + *
127 135 * @return
128 136 */
129 137 @Bean
... ... @@ -137,136 +145,6 @@ public class ShenheApplication extends SpringBootServletInitializer {
137 145 return registration;
138 146 }
139 147  
140   -
141   -
142   -
143   -
144   -
145   -
146   -
147   -
148   -
149   -
150   -
151   -
152   -
153   - /**
154   - * 登录过滤器
155   - * @return
156   - */
157   - /* @Bean
158   - public FilterRegistrationBean filterSingleRegistration() {
159   - FilterRegistrationBean registration = new FilterRegistrationBean();
160   - registration.setFilter(new SingleSignOutFilter());
161   - // 设定匹配的路径
162   - registration.addUrlPatterns("/*");
163   - Map<String,String> initParameters = new HashMap<String, String>();
164   - initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
165   - registration.setInitParameters(initParameters);
166   - // 设定加载的顺序
167   - registration.setOrder(1);
168   - return registration;
169   - }
170   -
171   - *//**
172   - * 过滤验证器
173   - * @return
174   - *//*
175   - @Bean
176   - public FilterRegistrationBean filterValidationRegistration() {
177   - FilterRegistrationBean registration = new FilterRegistrationBean();
178   - registration.setFilter(new Cas30ProxyReceivingTicketValidationFilter());
179   - // 设定匹配的路径
180   - registration.addUrlPatterns("/*");
181   - Map<String,String> initParameters = new HashMap<String, String>();
182   - initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
183   - initParameters.put("serverName", SERVER_NAME);
184   - initParameters.put("useSession", "true");
185   - registration.setInitParameters(initParameters);
186   - // 设定加载的顺序
187   - registration.setOrder(1);
188   - return registration;
189   - }
190   -
191   - *//**
192   - * 授权过滤器
193   - * @return
194   - *//*
195   - *//*@Bean
196   - public FilterRegistrationBean filterAuthenticationRegistration() {
197   - FilterRegistrationBean registration = new FilterRegistrationBean();
198   - registration.setFilter(new AuthenticationFilter());
199   - // 设定匹配的路径
200   - registration.addUrlPatterns("/*");
201   - Map<String,String> initParameters = new HashMap<String, String>();
202   - initParameters.put("casServerLoginUrl", CAS_SERVER_URL_PREFIX);
203   - initParameters.put("server", SERVICE_LOGIN);
204   -
205   - //initParameters.put("ignorePattern", ".*");
206   - //表示过滤所有
207   - //initParameters.put("ignoreUrlPatternType", "com.cnlive.shenhe.config.SimpleUrlPatternMatcherStrategy");
208   -
209   - registration.setInitParameters(initParameters);
210   - // 设定加载的顺序
211   - registration.setOrder(1);
212   - return registration;
213   - }*//*
214   -
215   - *//**
216   - * wraper过滤器
217   - * @return
218   - *//*
219   - @Bean
220   - public FilterRegistrationBean filterWrapperRegistration() {
221   - FilterRegistrationBean registration = new FilterRegistrationBean();
222   - registration.setFilter(new HttpServletRequestWrapperFilter());
223   - // 设定匹配的路径
224   - registration.addUrlPatterns("/*");
225   - // 设定加载的顺序
226   - registration.setOrder(1);
227   - return registration;
228   - }
229   -
230   - *//**
231   - * 添加监听器
232   - * @return
233   - *//*
234   - @Bean
235   - public ServletListenerRegistrationBean<EventListener> singleSignOutListenerRegistration(){
236   - ServletListenerRegistrationBean<EventListener> registrationBean = new ServletListenerRegistrationBean<EventListener>();
237   - registrationBean.setListener(new SingleSignOutHttpSessionListener());
238   - registrationBean.setOrder(1);
239   - return registrationBean;
240   - }
241   -
242   - *//**
243   - * 设定首页
244   - *//*
245   - @Configuration
246   - public class DefaultView extends WebMvcConfigurerAdapter {
247   -
248   - @Override
249   - public void addViewControllers(ViewControllerRegistry registry) {
250   - //设定首页为index
251   - registry.addViewController("/").setViewName("forward:/users/index");
252   -
253   - //设定匹配的优先级
254   - registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
255   -
256   - //添加视图控制类
257   - super.addViewControllers(registry);
258   - }
259   - }*/
260   -
261   -
262   - public static void main(String[] args) {
263   -// SpringApplication.run(ShenheApplication.class, args);
264   - SpringApplicationBuilder builder=new SpringApplicationBuilder(ShenheApplication.class);
265   - builder.headless(true).run(args);
266   - // 设置Headless模式,linux系统下
267   - System.setProperty("java.awt.headless", "true");
268   - }
269   -
270 148 /**
271 149 * 配置内部类
272 150 */
... ... @@ -287,6 +165,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
287 165 */
288 166 @Value("${server.port}")
289 167 private String port;
  168 +
290 169 /**
291 170 * 启动成功
292 171 */
... ... @@ -305,4 +184,4 @@ public class ShenheApplication extends SpringBootServletInitializer {
305 184 }
306 185  
307 186 }
308   -}
309 187 \ No newline at end of file
  188 +}
... ...
src/main/resources/application.properties
  View file @238aa90
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
  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 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
14   -
15   -spring.datasource.driver-class-name=com.mysql.jdbc.Driver
  5 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
16 6  
17 7 server.tomcat.protocol_header=x-forwarded-proto
18 8 server.use-forward-headers=true
... ... @@ -27,85 +17,85 @@ spring.http.encoding.enabled=true
27 17 spring.http.encoding.force=true
28 18  
29 19 spring.thymeleaf.mode=LEGACYHTML5
  20 +spring.thymeleaf.cache=false
30 21 #spring.thymeleaf.encoding=UTF-8
31 22 #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
  23 +#\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
34 24  
35   -#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
  25 +#\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
36 26 #logging.level.com.cnlive.shenhe.mapper=debug
37 27  
38 28 mybatis.mapper-locations=classpath:mapper/*.xml
39 29 mybatis.type-aliases-package=com.cnlive.shenhe.entity
40   -server.port=81
  30 +server.port=82
41 31  
42   -#rabbitmq\u76f8\u5173\u914d\u7f6e
43   -spring.rabbitmq.host=10.254.176.11
  32 +#rabbitmq\u76F8\u5173\u914D\u7F6E
  33 +spring.rabbitmq.host=10.254.174.131
44 34 spring.rabbitmq.port=5672
45   -spring.rabbitmq.username=admin
46   -spring.rabbitmq.password=fA{5Uikx7
47   -# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
  35 +spring.rabbitmq.username=test
  36 +spring.rabbitmq.password=p3~amKKt9
  37 +# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
48 38 spring.rabbitmq.publisher-confirms=true
49   -# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
  39 +# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
50 40 spring.rabbitmq.publisher-returns=true
51   -# \u5f00\u542fACK
  41 +# \u5F00\u542FACK
52 42 spring.rabbitmq.listener.direct.acknowledge-mode=manual
53 43 spring.rabbitmq.listener.simple.acknowledge-mode=manual
54 44  
55   -#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5
  45 +#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5
56 46 #topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
57 47  
58   -#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
  48 +#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
59 49 spring.mvc.favicon.enabled = false
60 50  
61   -#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
  51 +#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API
62 52 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
63 53  
64   -#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
65   -spring.application.name=cnlive_shenhe
66   -spring.application.home=/usr/local/cnlive_shenhe/log
  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
67 57  
68 58 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
69 59 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
70 60  
71   -#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
  61 +#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F
72 62 queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
73 63 queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
74 64  
75   -#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
  65 +#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF
76 66 url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
77 67 platformKey =AUDIT
78 68 platformValue=10011438
79 69  
80   -#\u672c\u673a\u5730\u5740
81   -spring.localhost.url=http://shen.cnlive.com
  70 +#\u672C\u673A\u5730\u5740
  71 +spring.localhost.url=http://test.shen.cnlive.com
82 72  
83   -#\u62bd\u5e27\u5e38\u91cf
  73 +#\u62BD\u5E27\u5E38\u91CF
84 74 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
85 75 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
86   -avsmple_url=http://transcode.cnlive.com/api/request
87   -avsmple_callback=http://shen.cnlive.com/api/avsample/callback
  76 +avsmple_url=http://test.transcode.cnlive.com/api/request
  77 +avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
88 78  
89   -#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
90   -live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
  79 +#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
  80 +live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
91 81  
92   -#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
  82 +#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
93 83 email_app_id=769_jetja50p18
94 84 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
95 85 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
96 86  
97   -#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d
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
  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
102 92  
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
  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
107 97  
108   -#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
  98 +#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
109 99 desdir=shen
110   -yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
111   -cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
  100 +yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
  101 +cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio
... ...