update

周伟鹏
1 parent 5e3d8bba
Showing 3 changed files with 19 additions and 19 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/resources/application.properties
@@ -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://shen.cnlive.com:81";
+    private static final String SERVER_NAME = "http://shen.cnlive.com:82";
     //登录入口
-    private static final String SERVICE_LOGIN = "http://shen.cnlive.com:81/users/login";
+    private static final String SERVICE_LOGIN = "http://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://shen.cnlive.com:82/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://shen.cnlive.com/users/login";
+            return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://test.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://shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=false&video_priority=";
+                return "redirect:http://test.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://shen.cnlive.com/users/login";
+        return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://test.shen.cnlive.com/users/login";
     }
-#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://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://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://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
@@ -26,7 +26,7 @@ spring.thymeleaf.cache=false
 mybatis.mapper-locations=classpath:mapping/*.xml
 mybatis.type-aliases-package=com.cnlive.shenhe.entity
-server.port=81
+server.port=82
 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
@@ -39,14 +39,14 @@ platformValue=10011438
 #抽帧常量
 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
 #抽帧存放bucket和域名
-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=cnlivetest
+qn_domain=http://test.qnvod.cnlive.com
+ks_bucket=cnlive-test
+ks_domain=http://test.wideo.cnlive.com
 #图片存放根路径
 desdir=shen