update

郑超
1 parent e8807a94
Showing 2 changed files with 68 additions and 199 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/resources/application.properties
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -17,10 +16,6 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.servlet.ModelAndView;
-
 import tk.mybatis.spring.annotation.MapperScan;
 import java.net.InetAddress;
@@ -29,24 +24,33 @@ import java.util.HashMap;
 import java.util.Map;
 @SpringBootApplication
-@MapperScan(basePackages= {"com.cnlive.shenhe.mapper"})
+@MapperScan(basePackages = {"com.cnlive.shenhe.mapper"})
 public class ShenheApplication extends SpringBootServletInitializer {
     //url的前缀
     private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2";
     private static final String CAS_SERVER_LOGIN_URL = "https://user.cnlive.com/OpenSSO2/login";
     //本机的名称
-    private static final String SERVER_NAME = "http://shen.cnlive.com:81";
+    private static final String SERVER_NAME = "http://test.shen.cnlive.com:82";
     //登录入口
-    private static final String SERVICE_LOGIN = "http://shen.cnlive.com:81/users/login";
+    private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login";
     //登出
-    private static final String SERVICE_LOGINOUT = "http://shen.cnlive.com:81/users/logout";
+    private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout";
+
+    public static void main(String[] args) {
+//		SpringApplication.run(ShenheApplication.class, args);
+        SpringApplicationBuilder builder = new SpringApplicationBuilder(ShenheApplication.class);
+        builder.headless(true).run(args);
+        // 设置Headless模式,linux系统下
+        System.setProperty("java.awt.headless", "true");
+    }
     /**
      * 用于实现单点登出功能
+     *
      * @return
      */
     @Bean
@@ -55,7 +59,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
         registration.setFilter(new SingleSignOutFilter());
         // 设定匹配的路径
         registration.addUrlPatterns("/*");
-        Map<String,String>  initParameters = new HashMap<String, String>();
+        Map<String, String> initParameters = new HashMap<String, String>();
         initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
         registration.setInitParameters(initParameters);
         // 设定加载的顺序
@@ -65,6 +69,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器负责用户的认证工作
+     *
      * @return
      */
     @Bean
@@ -73,7 +78,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
         registration.setFilter(new AuthenticationFilter());
         // 设定匹配的路径
         registration.addUrlPatterns("/*");
-        Map<String,String>  initParameters = new HashMap<String, String>();
+        Map<String, String> initParameters = new HashMap<String, String>();
         initParameters.put("casServerLoginUrl", CAS_SERVER_LOGIN_URL);
         initParameters.put("service", SERVICE_LOGIN);
         initParameters.put("ignorePattern", "/api/*|/logging/*");
@@ -86,6 +91,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器负责对Ticket的校验工作
+     *
      * @return
      */
     @Bean
@@ -94,10 +100,10 @@ public class ShenheApplication extends SpringBootServletInitializer {
         registration.setFilter(new Cas20ProxyReceivingTicketValidationFilter());
         // 设定匹配的路径
         registration.addUrlPatterns("/*");
-        Map<String,String>  initParameters = new HashMap<String, String>();
+        Map<String, String> initParameters = new HashMap<String, String>();
         initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
         initParameters.put("serverName", SERVER_NAME);
-        initParameters.put("encoding","utf-8");
+        initParameters.put("encoding", "utf-8");
         registration.setInitParameters(initParameters);
         // 设定加载的顺序
         registration.setOrder(3);
@@ -107,7 +113,8 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器负责实现HttpServletRequest请求的包裹，
-     *          比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。
+     * 比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。
+     *
      * @return
      */
     @Bean
@@ -123,7 +130,8 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器使得开发者可以通过org.jasig.cas.client.util.AssertionHolder来获取
-     *         用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。
+     * 用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。
+     *
      * @return
      */
     @Bean
@@ -137,136 +145,6 @@ public class ShenheApplication extends SpringBootServletInitializer {
         return registration;
     }
-
-
-
-
-
-
-
-
-
-
-
-
-
-    /**
-     * 登录过滤器
-     * @return
-     */
-  /*  @Bean
-    public FilterRegistrationBean filterSingleRegistration() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(new SingleSignOutFilter());
-        // 设定匹配的路径
-        registration.addUrlPatterns("/*");
-        Map<String,String>  initParameters = new HashMap<String, String>();
-        initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
-        registration.setInitParameters(initParameters);
-        // 设定加载的顺序
-        registration.setOrder(1);
-        return registration;
-    }
-
-    *//**
-     * 过滤验证器
-     * @return
-     *//*
-    @Bean
-    public FilterRegistrationBean filterValidationRegistration() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(new Cas30ProxyReceivingTicketValidationFilter());
-        // 设定匹配的路径
-        registration.addUrlPatterns("/*");
-        Map<String,String> initParameters = new HashMap<String, String>();
-        initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX);
-        initParameters.put("serverName", SERVER_NAME);
-        initParameters.put("useSession", "true");
-        registration.setInitParameters(initParameters);
-        // 设定加载的顺序
-        registration.setOrder(1);
-        return registration;
-    }
-
-    *//**
-     * 授权过滤器
-     * @return
-     *//*
-    *//*@Bean
-    public FilterRegistrationBean filterAuthenticationRegistration() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(new AuthenticationFilter());
-        // 设定匹配的路径
-        registration.addUrlPatterns("/*");
-        Map<String,String>  initParameters = new HashMap<String, String>();
-        initParameters.put("casServerLoginUrl", CAS_SERVER_URL_PREFIX);
-        initParameters.put("server", SERVICE_LOGIN);
-
-        //initParameters.put("ignorePattern", ".*");
-        //表示过滤所有
-        //initParameters.put("ignoreUrlPatternType", "com.cnlive.shenhe.config.SimpleUrlPatternMatcherStrategy");
-
-        registration.setInitParameters(initParameters);
-        // 设定加载的顺序
-        registration.setOrder(1);
-        return registration;
-    }*//*
-
-    *//**
-     * wraper过滤器
-     * @return
-     *//*
-    @Bean
-    public FilterRegistrationBean filterWrapperRegistration() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(new HttpServletRequestWrapperFilter());
-        // 设定匹配的路径
-        registration.addUrlPatterns("/*");
-        // 设定加载的顺序
-        registration.setOrder(1);
-        return registration;
-    }
-
-    *//**
-     * 添加监听器
-     * @return
-     *//*
-    @Bean
-    public ServletListenerRegistrationBean<EventListener> singleSignOutListenerRegistration(){
-        ServletListenerRegistrationBean<EventListener> registrationBean = new ServletListenerRegistrationBean<EventListener>();
-        registrationBean.setListener(new SingleSignOutHttpSessionListener());
-        registrationBean.setOrder(1);
-        return registrationBean;
-    }
-
-    *//**
-     * 设定首页
-     *//*
-    @Configuration
-    public class DefaultView extends WebMvcConfigurerAdapter {
-
-        @Override
-        public void addViewControllers(ViewControllerRegistry registry) {
-            //设定首页为index
-            registry.addViewController("/").setViewName("forward:/users/index");
-
-            //设定匹配的优先级
-            registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
-
-            //添加视图控制类
-            super.addViewControllers(registry);
-        }
-    }*/
-
-
-    public static void main(String[] args) {
-//		SpringApplication.run(ShenheApplication.class, args);
-        SpringApplicationBuilder builder=new SpringApplicationBuilder(ShenheApplication.class);
-        builder.headless(true).run(args);
-        // 设置Headless模式,linux系统下
-        System.setProperty("java.awt.headless", "true");
-    }
-
     /**
      * 配置内部类
      */
@@ -287,6 +165,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
          */
         @Value("${server.port}")
         private String port;
+
         /**
          * 启动成功
          */
@@ -305,4 +184,4 @@ public class ShenheApplication extends SpringBootServletInitializer {
         }
     }
-}
 \ No newline at end of file
+}
-#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=nbLdyO.79
+spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=M345sdfss4!
-#\u91d1\u5c71\u4e00\u533a\u6570\u636e\u5e93
-#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#spring.datasource.username=admin
-#spring.datasource.password=Sre#45iU7kJ
-
-#\u91d1\u5c71\u516d\u533a\u6570\u636e\u5e93
-spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-spring.datasource.username=admin
-spring.datasource.password=83BwiCoq
-
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 server.tomcat.protocol_header=x-forwarded-proto
 server.use-forward-headers=true
@@ -27,85 +17,85 @@ spring.http.encoding.enabled=true
 spring.http.encoding.force=true
 spring.thymeleaf.mode=LEGACYHTML5
+spring.thymeleaf.cache=false
 #spring.thymeleaf.encoding=UTF-8
 #spring.thymeleaf.content-type=text/html
-#\u5f00\u53d1\u65f6\u5173\u95ed\u7f13\u5b58,\u4e0d\u7136\u6ca1\u6cd5\u770b\u5230\u5b9e\u65f6\u9875\u9762
-spring.thymeleaf.cache=false
+#\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
-#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
+#\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
 #logging.level.com.cnlive.shenhe.mapper=debug
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.cnlive.shenhe.entity
-server.port=81
+server.port=82
-#rabbitmq\u76f8\u5173\u914d\u7f6e
-spring.rabbitmq.host=10.254.176.11
+#rabbitmq\u76F8\u5173\u914D\u7F6E
+spring.rabbitmq.host=10.254.174.131
 spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=fA{5Uikx7
-# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
+spring.rabbitmq.username=test
+spring.rabbitmq.password=p3~amKKt9
+# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
 spring.rabbitmq.publisher-confirms=true
-# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
+# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
 spring.rabbitmq.publisher-returns=true
-# \u5f00\u542fACK
+# \u5F00\u542FACK
 spring.rabbitmq.listener.direct.acknowledge-mode=manual
 spring.rabbitmq.listener.simple.acknowledge-mode=manual
-#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5
+#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5
 #topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
-#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
+#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
 spring.mvc.favicon.enabled = false
-#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
+#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API
 speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
-#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
-spring.application.name=cnlive_shenhe
-spring.application.home=/usr/local/cnlive_shenhe/log
+#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528
+spring.application.name=cnlive_shenhe_test
+spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log
 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
-#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
+#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F
 queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
 queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
-#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
+#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF
 url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
 platformKey =AUDIT
 platformValue=10011438
-#\u672c\u673a\u5730\u5740
-spring.localhost.url=http://shen.cnlive.com
+#\u672C\u673A\u5730\u5740
+spring.localhost.url=http://test.shen.cnlive.com
-#\u62bd\u5e27\u5e38\u91cf
+#\u62BD\u5E27\u5E38\u91CF
 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
-avsmple_url=http://transcode.cnlive.com/api/request
-avsmple_callback=http://shen.cnlive.com/api/avsample/callback
+avsmple_url=http://test.transcode.cnlive.com/api/request
+avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
-#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
-live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
+#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
+live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
-#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
+#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
 email_app_id=769_jetja50p18
 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
-#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d
-#qn_bucket=cnlivetest
-#qn_domain=http://test.qnvod.cnlive.com
-#ks_bucket=cnlive-test
-#ks_domain=http://test.wideo.cnlive.com
+#\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D
+qn_bucket=cnlivetest
+qn_domain=http://test.qnvod.cnlive.com
+ks_bucket=cnlive-test
+ks_domain=http://test.wideo.cnlive.com
-qn_bucket=mam-sxzg-82
-qn_domain=http://sxzg.ys2.cnliveimg.com
-ks_bucket=mam-sxzg-82
-ks_domain=http://sxzg.ys1.cnliveimg.com
+#qn_bucket=mam-sxzg-82
+#qn_domain=http://sxzg.ys2.cnliveimg.com
+#ks_bucket=mam-sxzg-82
+#ks_domain=http://sxzg.ys1.cnliveimg.com
-#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
+#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
 desdir=shen
-yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
-cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
+yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
+cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio