Merge commit '172a15a1'

周伟鹏
2 parents 9989cd41 172a15a1
Showing 4 changed files with 17 additions and 14 deletions
pom.xml
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/resources/application.properties
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cnlive.shenhe</groupId>
-    <artifactId>cnlive_shenhe</artifactId>
+    <artifactId>cnlive_shenhe_test</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -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://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";
     /**
@@ -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";
+                return "redirect:http://test.shen.cnlive.com/videos/page";
             }
         }
         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
+server.use-forward-headers=true
+
 spring.jpa.properties.hibernate.hbm2ddl.auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.show-sql= true
@@ -23,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