周伟鹏 / cnlive_shenhe · Commits

Commit 2dffc7e1c5f2ec1ec6624544f3feef73127dfa50

Authored by liwei2917
1 parent e459622e

改回测试环境

Inline Side-by-side
Showing 4 changed files with 13 additions and 15 deletions
... ... @@ -4,7 +4,7 @@
4 4 <modelVersion>4.0.0</modelVersion>
5 5  
6 6 <groupId>com.cnlive.shenhe</groupId>
7   - <artifactId>cnlive_shenhe</artifactId>
  7 + <artifactId>cnlive_shenhe_test</artifactId>
8 8 <version>0.0.1-SNAPSHOT</version>
9 9 <packaging>jar</packaging>
10 10  
... ... @@ -137,7 +137,6 @@
137 137 <artifactId>poi-ooxml</artifactId>
138 138 <version>3.16</version>
139 139 </dependency>
140   -
141 140 </dependencies>
142 141  
143 142 <build>
... ...
src/main/java/com/cnlive/shenhe/ShenheApplication.java
  View file @2dffc7e
... ... @@ -23,13 +23,13 @@ public class ShenheApplication extends SpringBootServletInitializer {
23 23 private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2";
24 24 private static final String CAS_SERVER_LOGIN_URL = "https://user.cnlive.com/OpenSSO2/login";
25 25 //本机的名称
26   - private static final String SERVER_NAME = "http://shen.cnlive.com:81";
  26 + private static final String SERVER_NAME = "http://test.shen.cnlive.com:82";
27 27  
28 28 //登录入口
29   - private static final String SERVICE_LOGIN = "http://shen.cnlive.com:81/users/login";
  29 + private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login";
30 30  
31 31 //登出
32   - private static final String SERVICE_LOGINOUT = "http://shen.cnlive.com:81/users/logout";
  32 + private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout";
33 33  
34 34  
35 35 /**
... ...
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @2dffc7e
... ... @@ -37,7 +37,7 @@ public class UsersController {
37 37 public String index(HttpServletRequest request) {
38 38 AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
39 39 if (CommonUtils.isNull(principal)) {
40   - return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://shen.cnlive.com/users/login";
  40 + return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://test.shen.cnlive.com/users/login";
41 41 }
42 42 //用户ID
43 43 String id = principal.getName();
... ... @@ -53,7 +53,7 @@ public class UsersController {
53 53 sessionUser.setLogo(user.getUser_logo());
54 54 sessionUser.setMaster(user.getMaster());
55 55 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser);
56   - return "redirect:http://shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=false&video_priority=";
  56 + return "redirect:http://test.shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=false&video_priority=";
57 57 }
58 58 }
59 59 return "page/error.html";
... ... @@ -62,7 +62,7 @@ public class UsersController {
62 62 @RequestMapping("/logout")
63 63 public String logout(HttpSession session) {
64 64 session.invalidate();
65   - return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://shen.cnlive.com/users/login";
  65 + return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://test.shen.cnlive.com/users/login";
66 66 }
67 67  
68 68  
... ...
src/main/resources/application.properties
  View file @2dffc7e
1   -#spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
2   -#spring.datasource.username=root
3   -#spring.datasource.password=M345sdfss4!
  1 +spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  2 +spring.datasource.username=root
  3 +spring.datasource.password=M345sdfss4!
4 4  
5 5 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
6 6 #spring.datasource.username=root
7 7 #spring.datasource.password=nbLdyO.79
8 8  
9   -spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
10   -spring.datasource.username=admin
11   -spring.datasource.password=Sre#45iU7kJ
12   -
  9 +#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  10 +#spring.datasource.username=admin
  11 +#spring.datasource.password=Sre#45iU7kJ
13 12 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
14 13  
15 14 server.tomcat.protocol_header=x-forwarded-proto
... ...