update

郑超
1 parent b5258714
Showing 10 changed files with 249 additions and 414 deletions
pom.xml
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/YiDunAntiFraudUtil.java
src/main/resources/application-dev.properties
src/main/resources/application-pro.properties
src/main/resources/application.properties
src/main/resources/logback-pro.xml
src/main/resources/logback-dev.xml → src/main/resources/logback-spring.xml
src/main/resources/logback.xml
@@ -194,20 +194,8 @@
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <!-- 指定配置文件所在的resource目录 -->
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>application.properties</include>
-                    <include>application-${environment}.properties</include>
-                    <include>logback-${environment}.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
         <!-- 指定打包名称-->
-        <finalName>cnlive_shenhe_${environment}-0.0.1-SNAPSHOT</finalName>
+        <finalName>cnlive_shenhe</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -240,28 +228,4 @@
         </plugins>
     </build>
-    <!--分别设置开发，测试，生产环境-->
-    <profiles>
-        <!-- 开发环境 -->
-        <profile>
-            <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <environment>dev</environment>
-            </properties>
-        </profile>
-        <!-- 生产环境 -->
-        <profile>
-            <id>pro</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-                <environment>pro</environment>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
@@ -9,6 +9,7 @@ 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;
@@ -16,6 +17,10 @@ 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;
@@ -24,33 +29,24 @@ 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://test.shen.cnlive.com:82";
+    private static final String SERVER_NAME = "http://shen.cnlive.com:81";
     //登录入口
-    private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login";
+    private static final String SERVICE_LOGIN = "http://shen.cnlive.com:81/users/login";
     //登出
-    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");
-    }
+    private static final String SERVICE_LOGINOUT = "http://shen.cnlive.com:81/users/logout";
     /**
      * 用于实现单点登出功能
-     *
      * @return
      */
     @Bean
@@ -59,7 +55,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);
         // 设定加载的顺序
@@ -69,7 +65,6 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器负责用户的认证工作
-     *
      * @return
      */
     @Bean
@@ -78,7 +73,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/*");
@@ -91,7 +86,6 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器负责对Ticket的校验工作
-     *
      * @return
      */
     @Bean
@@ -100,10 +94,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);
@@ -113,8 +107,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器负责实现HttpServletRequest请求的包裹，
-     * 比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。
-     *
+     *          比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。
      * @return
      */
     @Bean
@@ -130,8 +123,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * 该过滤器使得开发者可以通过org.jasig.cas.client.util.AssertionHolder来获取
-     * 用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。
-     *
+     *         用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。
      * @return
      */
     @Bean
@@ -145,6 +137,136 @@ 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");
+    }
+
     /**
      * 配置内部类
      */
@@ -165,7 +287,6 @@ public class ShenheApplication extends SpringBootServletInitializer {
          */
         @Value("${server.port}")
         private String port;
-
         /**
          * 启动成功
          */
@@ -184,4 +305,4 @@ public class ShenheApplication extends SpringBootServletInitializer {
         }
     }
 -}
+}
 \ No newline at end of file
@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 import java.text.ParseException;
@@ -39,7 +40,7 @@ import java.util.UUID;
 @Service
 public class VideosServiceImpl {
-    private  static Logger logger = LoggerFactory.getLogger(VideofilterServiceImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(VideofilterServiceImpl.class);
     @Autowired
     ShyVideosMapper shyVideosMapper;
     @Autowired
@@ -113,7 +114,7 @@ public class VideosServiceImpl {
     }
     public PageInfo<ShyVideos> getListContent(VideosDTO videosDTO) {
-        logger.info("接受桉树列表为，VideosDTO:{}",JSON.toJSONString(videosDTO));
+        logger.info("接受桉树列表为，VideosDTO:{}", JSON.toJSONString(videosDTO));
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -285,7 +286,6 @@ public class VideosServiceImpl {
     public List<ShyVideos> findByCondition(VideosDTO videosDTO) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
-        Example.Criteria criteria2 = example.createCriteria();
         if (CommonUtils.isNotEmpty(videosDTO.getOrderByClause())) {
             example.setOrderByClause(videosDTO.getOrderByClause());
         }
@@ -464,8 +464,8 @@ public class VideosServiceImpl {
         //初始化一个审核状态
         //审核类型，1:免审，2:机审，3:人工审
         Integer shenheType = 3;
-        //如果当前sp是免审sp
-        if (sites.contains(shyVideo.getSpid()) || shyActivities.contains(Integer.valueOf(source))) {
+        //如果当前sp是免审sp  source有传空的时候 默认给0
+        if (sites.contains(shyVideo.getSpid()) || shyActivities.contains(StringUtils.isEmpty(source) ? "0" : Integer.valueOf(source))) {
             logger.info("进入已经免审渠道:{}", source);
             //免审
             shenheType = 1;
@@ -81,6 +81,7 @@ public class YiDunAntiFraudUtil {
     private final static String URL_RESULT = "https://as.dun.163yun.com/v1/crawler/callback/results";
     public static void main(String[] args) {
+
 //        Map<String, String> params = new HashMap<String, String>(5);
 //        // 1.设置公共参数
 //        params.put("secretId", SECRETID);
@@ -97,26 +98,26 @@ public class YiDunAntiFraudUtil {
         //getTextFilter("王八蛋");
         //智能图片识别审核测试
-        JSONArray jsonArray = new JSONArray();
-        JSONObject image1 = new JSONObject();
-        image1.put("name", UUID.randomUUID());
-        image1.put("type", 1);
-        image1.put("data", "http://article-bj.bj.bcebos.com//20200326/7f3d23bbb28421e6e2a6f131273554fb_15.jpg?authorization=bce-auth-v1%2F1eda661c3697440eaaca912ccb6f959c%2F2020-03-30T05%3A42%3A21Z%2F604800%2F%2F39f195e2327ef87270bd095fa64dfdcadad6f01a0d6dc6a4313306f164591cc5");
-        jsonArray.add(image1);
-        JSONObject image2 = new JSONObject();
-        image2.put("name", UUID.randomUUID());
-        image2.put("type", 1);
-        image2.put("data", "http://test.qnvod.cnlive.com/shen/802/2020/03/01/8a8a878c6dce5cfe017096cd07940c84/000002.jpg");
-        jsonArray.add(image2);
-        JSONObject image3 = new JSONObject();
-        image3.put("name", UUID.randomUUID());
-        image3.put("type", 1);
-        image3.put("data", "https://wjj.ys2.cnliveimg.com/769/img/0/2020/03/21/158474856886077030277.jpg");
-        jsonArray.add(image3);
-        System.out.println(jsonArray);
-        JSONObject imagesFilter = getImagesFilter(jsonArray.toString());
+//        JSONArray jsonArray = new JSONArray();
+//        JSONObject image1 = new JSONObject();
+//        image1.put("name", UUID.randomUUID());
+//        image1.put("type", 1);
+//        image1.put("data", "http://article-bj.bj.bcebos.com//20200326/7f3d23bbb28421e6e2a6f131273554fb_15.jpg?authorization=bce-auth-v1%2F1eda661c3697440eaaca912ccb6f959c%2F2020-03-30T05%3A42%3A21Z%2F604800%2F%2F39f195e2327ef87270bd095fa64dfdcadad6f01a0d6dc6a4313306f164591cc5");
+//        jsonArray.add(image1);
+//        JSONObject image2 = new JSONObject();
+//        image2.put("name", UUID.randomUUID());
+//        image2.put("type", 1);
+//        image2.put("data", "http://test.qnvod.cnlive.com/shen/802/2020/03/01/8a8a878c6dce5cfe017096cd07940c84/000002.jpg");
+//        jsonArray.add(image2);
+//        JSONObject image3 = new JSONObject();
+//        image3.put("name", UUID.randomUUID());
+//        image3.put("type", 1);
+//        image3.put("data", "https://wjj.ys2.cnliveimg.com/769/img/0/2020/03/21/158474856886077030277.jpg");
+//        jsonArray.add(image3);
+//        System.out.println(jsonArray);
+//        JSONObject imagesFilter = getImagesFilter(jsonArray.toString());
 //        System.out.println(image1);
-        System.out.println(imagesFilter);
+//        System.out.println(imagesFilter);
         //智能网页识别审核测试
-server.port=82
-
-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!
-
-logging.config=classpath:logback-dev.xml
-
-#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
-spring.application.name=cnlive_shenhe_test
-spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log
-
-#\u672c\u673a\u5730\u5740
-spring.localhost.url=http://test.shen.cnlive.com
-
-#\u62bd\u5e27\u5e38\u91cf
-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://test.bc.cnlive.com/bokong/activity/activityShenHe
-
-#\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
-
-#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
-yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio
 \ No newline at end of file
-server.port=81
-
-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
-
-logging.config=classpath:logback-pro.xml
-
-#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
-spring.application.name=cnlive_shenhe
-spring.application.home=/usr/local/cnlive_shenhe/log
-
-#\u672c\u673a\u5730\u5740
-spring.localhost.url=http://shen.cnlive.com
-
-#\u62bd\u5e27\u5e38\u91cf
-avsmple_url=http://transcode.cnlive.com/api/request
-avsmple_callback=http://shen.cnlive.com/api/avsample/callback
-
-#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
-live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
-
-#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d
-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
-spring.profiles.active=@environment@
+#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.driver-class-name=com.mysql.cj.jdbc.Driver
+#\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
 server.tomcat.protocol_header=x-forwarded-proto
 server.use-forward-headers=true
@@ -15,52 +27,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
+
+#\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
-#rabbitmq\u76F8\u5173\u914D\u7F6E
-spring.rabbitmq.host=10.254.174.131
+#rabbitmq\u76f8\u5173\u914d\u7f6e
+spring.rabbitmq.host=10.254.176.11
 spring.rabbitmq.port=5672
-spring.rabbitmq.username=test
-spring.rabbitmq.password=p3~amKKt9
-
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=fA{5Uikx7
+# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
 spring.rabbitmq.publisher-confirms=true
+# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
 spring.rabbitmq.publisher-returns=true
+# \u5f00\u542fACK
 spring.rabbitmq.listener.direct.acknowledge-mode=manual
 spring.rabbitmq.listener.simple.acknowledge-mode=manual
-#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
+#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5
+#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
+
+#\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
+
 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
-#\u62BD\u5E27\u5E38\u91CF
+#\u672c\u673a\u5730\u5740
+spring.localhost.url=http://shen.cnlive.com
+
+#\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
-#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
+#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
+live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
+
+#\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
-#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
+#\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
+
+#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
 desdir=shen
-#yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
-#cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio
+yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
+cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-scan：当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true。
-scanPeriod：设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒当scan为true时，此属性生效。默认的时间间隔为1分钟。
-debug：当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。
--->
-<configuration scan="false" scanPeriod="60 seconds" debug="false">
-    <!--日志文件主目录：这里${user.home}为当前服务器用户主目录-->
-<!--     <property name="LOG_HOME" value="/usr/local/test_cnlive_shenhe/cnlive_shenhe/log" /> -->
-    <springProperty scope="context" name="LOG_HOME" source="spring.application.home"/>
-    <!-- 定义日志文件名称 -->
-<!--     <property name="appName" value="appName" source="spring.application.name"></property> -->
-    <!--日志文件名称：这里spring.application.name表示工程名称-->
-    <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
-    <!-- ch.qos.logback.core.ConsoleAppender 表示控制台输出 -->
-    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-        <!--
-        日志输出格式：
-            %d表示日期时间，
-            %thread表示线程名，
-            %-5level：级别从左显示5个字符宽度
-            %logger{50} 表示logger名字最长50个字符，否则按照句点分割。 
-            %msg：日志消息，
-            %n是换行符
-        -->
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </layout>
-    </appender>
-
-    <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 -->  
-    <appender name="appLogAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 指定日志文件的名称 -->
-<!--         <file>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</file> -->
-        <!--
-        当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名
-        TimeBasedRollingPolicy： 最常用的滚动策略，它根据时间来制定滚动策略，既负责滚动也负责出发滚动。
-        -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--
-            滚动时产生的文件的存放位置及文件名称 %d{yyyy-MM-dd}：按天进行日志滚动 
-            %i：当文件大小超过maxFileSize时，按照i进行文件滚动
-            -->
-            <fileNamePattern>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</fileNamePattern>
-            <!-- 
-            可选节点，控制保留的归档文件的最大数量，超出数量就删除旧文件。假设设置每天滚动，
-            且maxHistory是365，则只保存最近365天的文件，删除之前的旧文件。注意，删除旧文件是，
-            那些为了归档而创建的目录也会被删除。
-            -->
-            <MaxHistory>30</MaxHistory>
-            <!-- 
-            当日志文件超过maxFileSize指定的大小是，根据上面提到的%i进行日志文件滚动 注意此处配置SizeBasedTriggeringPolicy是无法实现按文件大小进行滚动的，必须配置timeBasedFileNamingAndTriggeringPolicy
-            -->
-<!--             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> -->
-<!--                 <maxFileSize>100MB</maxFileSize> -->
-<!--             </timeBasedFileNamingAndTriggeringPolicy> -->
-        </rollingPolicy>
-        <!-- 日志输出格式： -->     
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </layout>
-    </appender>
-
-    <!-- 
-        logger主要用于存放日志对象，也可以定义日志类型、级别
-        name：表示匹配的logger类型前缀，也就是包的前半部分
-        level：要记录的日志级别，包括 TRACE < DEBUG < INFO < WARN < ERROR
-        additivity：作用在于children-logger是否使用 rootLogger配置的appender进行输出，
-        false：表示只用当前logger的appender-ref，true：
-        表示当前logger的appender-ref和rootLogger的appender-ref都有效
-    -->
-    <!-- hibernate logger -->
-    <logger name="com.yuanqinnan" level="debug" />
-    <!-- Spring framework logger -->
-    <logger name="org.springframework" level="debug" additivity="false"></logger>
-
-
-
-    <!-- 
-    root与logger是父子关系，没有特别定义则默认为root，任何一个类只会和一个logger对应，
-    要么是定义的logger，要么是root，判断的关键在于找到这个logger，然后判断这个logger的appender和level。 
-    -->
-    <root level="info">
-        <appender-ref ref="stdout" />
-        <appender-ref ref="appLogAppender" />
-    </root>
-</configuration>
 \ No newline at end of file
@@ -6,10 +6,10 @@ debug嚗迨撅扯挽蝵桐蛹true嚗logback敹縑嚗
 -->
 <configuration scan="false" scanPeriod="60 seconds" debug="false">
     <!--敹辣銝餌敶${user.home}銝箏銝餌敶-->
-<!--     <property name="LOG_HOME" value="/usr/local/test_cnlive_shenhe/cnlive_shenhe/log" /> -->
+    <!--     <property name="LOG_HOME" value="/usr/local/test_cnlive_shenhe/cnlive_shenhe/log" /> -->
     <springProperty scope="context" name="LOG_HOME" source="spring.application.home"/>
     <!-- 摰敹辣妍 -->
-<!--     <property name="appName" value="appName" source="spring.application.name"></property> -->
+    <!--     <property name="appName" value="appName" source="spring.application.name"></property> -->
     <!--敹辣妍嚗pring.application.name銵函內撌亦妍-->
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
     <!-- ch.qos.logback.core.ConsoleAppender 銵函內颲 -->
@@ -19,7 +19,7 @@ debug嚗迨撅扯挽蝵桐蛹true嚗logback敹縑嚗
             %d銵函內嚗
             %thread銵函內蝥輻
             %-5level嚗漣隞椰蝷5銝芸泵摰賢漲
-            %logger{50} 銵函內logger50銝芸泵嚗 
+            %logger{50} 銵函內logger50銝芸泵嚗
             %msg嚗敹嚗
             %n銵泵
         -->
@@ -28,40 +28,40 @@ debug嚗迨撅扯挽蝵桐蛹true嚗logback敹縑嚗
         </layout>
     </appender>
-    <!-- 皛霈啣辣嚗敹扇敶辣嚗泵葵隞嗆嚗敹扇敶隞辣 -->  
+    <!-- 皛霈啣辣嚗敹扇敶辣嚗泵葵隞嗆嚗敹扇敶隞辣 -->
     <appender name="appLogAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 敹辣妍 -->
-<!--         <file>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</file> -->
+        <!--         <file>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</file> -->
         <!--
         敶嚗摰 RollingFileAppender 蛹嚗辣蝘餃
         TimeBasedRollingPolicy嚗 撣貊蝑嚗摰蝑嚗韐提皛銋提
         -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--
-            皛鈭抒辣雿蔭辣妍 %d{yyyy-MM-dd}嚗予餈敹 
+            皛鈭抒辣雿蔭辣妍 %d{yyyy-MM-dd}嚗予餈敹
             %i嚗辣憭批axFileSize嚗i餈辣皛
             -->
             <fileNamePattern>${LOG_HOME}/%d{yyyyMMdd}/${APP_NAME}.log</fileNamePattern>
-            <!-- 
+            <!--
             嚗靽﹝辣憭扳停辣挽霈曄蔭瘥予皛嚗
             銝axHistory365嚗靽餈365憭拍辣嚗銋辣釣辣嚗
             鈭蛹鈭﹝遣敶◤
             -->
             <MaxHistory>30</MaxHistory>
-            <!-- 
+            <!--
             敶敹辣頞axFileSize之撠嚗銝%i餈敹辣皛 瘜冽迨憭蔭SizeBasedTriggeringPolicy辣憭批◆蔭timeBasedFileNamingAndTriggeringPolicy
             -->
-<!--             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> -->
-<!--                 <maxFileSize>100MB</maxFileSize> -->
-<!--             </timeBasedFileNamingAndTriggeringPolicy> -->
+            <!--             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> -->
+            <!--                 <maxFileSize>100MB</maxFileSize> -->
+            <!--             </timeBasedFileNamingAndTriggeringPolicy> -->
         </rollingPolicy>
-        <!-- 敹撘 -->     
+        <!-- 敹撘 -->
         <layout class="ch.qos.logback.classic.PatternLayout">
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </layout>
     </appender>
-    <!-- 
+    <!--
         logger銝餉鈭敹笆鞊∴隞亙敹掩漣
         name嚗”蝷箏ogger蝐餃嚗停
         level嚗扇敶敹漣嚗 TRACE < DEBUG < INFO < WARN < ERROR
@@ -76,9 +76,9 @@ debug嚗迨撅扯挽蝵桐蛹true嚗logback敹縑嚗
-    <!-- 
+    <!--
     root銝ogger摮蝟鳴瓷摰恕銝氳oot嚗遙雿銝芰掩隡銝泓ogger撖孵
-    閬摰ogger嚗root嚗鈭餈葵logger嚗餈葵loggerppenderevel 
+    閬摰ogger嚗root嚗鈭餈葵logger嚗餈葵loggerppenderevel
     -->
     <root level="info">
         <appender-ref ref="stdout" />
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
-    <!-- 项目的appid -->
-    <property name="APP_ID" value="demo"/>
-    <property name="LOG_PATH" value="log"></property>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>DEBUG</level>
-        </filter>
-        <file>${LOG_PATH}/${APP_ID}/access.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/${APP_ID}/access.log.%d{yyyy-MM-dd}.zip</fileNamePattern>
-            <!-- maxHistory配置了日志在服务器上面只存留十个备份 -->
-            <maxHistory>10</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE_DEBUG"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>DEBUG</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <file>${LOG_PATH}/${APP_ID}/access_debug.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/${APP_ID}/access_debug.log.%d{yyyy-MM-dd}.zip</fileNamePattern>
-            <!-- maxHistory配置了日志在服务器上面只存留十个备份 -->
-            <maxHistory>10</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <file>${LOG_PATH}/${APP_ID}/access_info.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/${APP_ID}/access_info.log.%d{yyyy-MM-dd}.zip</fileNamePattern>
-            <!-- maxHistory配置了日志在服务器上面只存留十个备份 -->
-            <maxHistory>10</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>WARN</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <file>${LOG_PATH}/${APP_ID}/access_warn.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/${APP_ID}/access_warn.log.%d{yyyy-MM-dd}.zip</fileNamePattern>
-            <!-- maxHistory配置了日志在服务器上面只存留十个备份 -->
-            <maxHistory>10</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <file>${LOG_PATH}/${APP_ID}/access_error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/${APP_ID}/access_error.log.%d{yyyy-MM-dd}.zip</fileNamePattern>
-            <!-- maxHistory配置了日志在服务器上面只存留十个备份 -->
-            <maxHistory>10</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-
-    <appender name="ASYNC_LOG" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <appender-ref ref="FILE_LOG"/>
-    </appender>
-    <appender name="ASYNC_LOG" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <appender-ref ref="FILE_LOG"/>
-    </appender>
-    <appender name="ASYNC_LOG_DEBUG" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <appender-ref ref="FILE_DEBUG"/>
-    </appender>
-    <appender name="ASYNC_LOG_INFO" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <appender-ref ref="FILE_INFO"/>
-    </appender>
-    <appender name="ASYNC_LOG_WARN" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <appender-ref ref="FILE_WARN"/>
-    </appender>
-    <appender name="ASYNC_LOG_ERROR" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <appender-ref ref="FILE_ERROR"/>
-    </appender>
-    <root level="INFO">
-        <!-- appender referenced after it is defined -->
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="ASYNC_LOG"/>
-        <appender-ref ref="ASYNC_LOG_DEBUG"/>
-        <appender-ref ref="ASYNC_LOG_INFO"/>
-        <appender-ref ref="ASYNC_LOG_WARN"/>
-        <appender-ref ref="ASYNC_LOG_ERROR"/>
-    </root>
-    <logger name="org.springframework" level="INFO"/>
-</configuration>
 \ No newline at end of file