Merge branch 'master' into dev

liwei2917
2 parents 1072ddd2 79c56638
Showing 6 changed files with 29 additions and 29 deletions
pom.xml
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/job/UsersSiteJob.java
src/main/resources/application.properties
src/main/resources/templates/page/video.html
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cnlive.shenhe</groupId>
-    <artifactId>cnlive_shenhe_test</artifactId>
+    <artifactId>cnlive_shenhe</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -137,6 +137,7 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.16</version>
         </dependency>
+
     </dependencies>
     <build>
@@ -23,13 +23,13 @@ public class ShenheApplication extends SpringBootServletInitializer {
     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";
+    private static final String SERVICE_LOGINOUT = "http://shen.cnlive.com:81/users/logout";
     /**
@@ -37,7 +37,7 @@ public class UsersController {
     public String index(HttpServletRequest request) {
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         if (CommonUtils.isNull(principal)) {
-            return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://test.shen.cnlive.com/users/login";
+            return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://shen.cnlive.com/users/login";
         }
         //用户ID
         String id = principal.getName();
@@ -53,7 +53,7 @@ public class UsersController {
                 sessionUser.setLogo(user.getUser_logo());
                 sessionUser.setMaster(user.getMaster());
                 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser);
-                return "redirect:http://test.shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=false&video_priority=";
+                return "redirect:http://shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=false&video_priority=";
             }
         }
         return "page/error.html";
@@ -62,7 +62,7 @@ public class UsersController {
     @RequestMapping("/logout")
     public String logout(HttpSession session) {
         session.invalidate();
-        return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://test.shen.cnlive.com/users/login";
+        return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://shen.cnlive.com/users/login";
     }
@@ -46,7 +46,7 @@ public class UsersSiteJob {
     ShySitesMapper shySitesMapper;
-    @Scheduled(fixedRate = 30 * 60 * 1000)
+    @Scheduled(fixedRate = 1 * 60 * 1000)
     public void syncUsers() {
         try {
             String tm = "0";
@@ -64,6 +64,7 @@ public class UsersSiteJob {
             logger.info("httpUrl===" + httpUrl);
             Map<String, String> resultMap = HttpUtil.init().post(httpUrl);
             JSONObject result = JSON.parseObject(resultMap.get("result"));
+            logger.error("请求用户云结果，result:{}", result);
             String errorCode = result.getString("errorCode");
             if ("0".equals(errorCode)) {
                 JSONArray data = result.getJSONArray("data");
-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!
+#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!
 #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://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
+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
+
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 server.tomcat.protocol_header=x-forwarded-proto
@@ -34,7 +35,7 @@ spring.thymeleaf.cache=false
 mybatis.mapper-locations=classpath:mapping/*.xml
 mybatis.type-aliases-package=com.cnlive.shenhe.entity
-server.port=82
+server.port=81
 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
@@ -47,19 +48,19 @@ platformValue=10011438
 #\u62bd\u5e27\u5e38\u91cf
 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
-avsmple_url=http://test.transcode.cnlive.com/api/request
-avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
+avsmple_url=http://transcode.cnlive.com/api/request
+avsmple_callback=http://shen.cnlive.com/api/avsample/callback
 #\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=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
 desdir=shen
@@ -223,10 +223,7 @@
                                             <td style="text-align: center; width: 17%;">
                                                 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
                                                     <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
-                                                    <button class="btn btn-info btn-sm"
-                                                            th:style="${state1 eq '0' && receive1 eq  'false'} ? 'display: none ' : ' '">
-                                                        查看
-                                                    </button>
+                                                    <button  class="btn btn-info btn-sm" th:style="${state1 eq '0' && receive1 eq  'false'} ? 'display: none ' : ' '">查看</button>
                                                 </a>
                                                 <span th:if="${video.state==0 and !video.receive}"> &nbsp;</span>
                                                 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}"