周伟鹏 / cnlive_shenhe · Commits

Commit c2ecefb92940d1bbe15c587a6c3ba87e989208b4

Authored by 周伟鹏
1 parent 8d89289b

update

Inline Side-by-side
Showing 3 changed files with 11 additions and 11 deletions
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <modelVersion>4.0.0</modelVersion> 4 <modelVersion>4.0.0</modelVersion>
5 5
6 <groupId>com.cnlive.shenhe</groupId> 6 <groupId>com.cnlive.shenhe</groupId>
7 - <artifactId>cnlive_shenhe_test</artifactId> 7 + <artifactId>cnlive_shenhe</artifactId>
8 <version>0.0.1-SNAPSHOT</version> 8 <version>0.0.1-SNAPSHOT</version>
9 <packaging>jar</packaging> 9 <packaging>jar</packaging>
10 10
src/main/java/com/cnlive/shenhe/ShenheApplication.java
  View file @c2ecefb
@@ -23,13 +23,13 @@ public class ShenheApplication extends SpringBootServletInitializer { @@ -23,13 +23,13 @@ public class ShenheApplication extends SpringBootServletInitializer {
23 private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2"; 23 private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2";
24 private static final String CAS_SERVER_LOGIN_URL = "https://user.cnlive.com/OpenSSO2/login"; 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://test.shen.cnlive.com:82"; 26 + private static final String SERVER_NAME = "http://test.shen.cnlive.com:81";
27 27
28 //登录入口 28 //登录入口
29 - private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login"; 29 + private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:81/users/login";
30 30
31 //登出 31 //登出
32 - private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout"; 32 + private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:81/users/logout";
33 33
34 34
35 /** 35 /**
src/main/resources/application.properties
  View file @c2ecefb
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 -#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
5 -#spring.datasource.username=admin  
6 -#spring.datasource.password=Sre#45iU7kJ 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 +spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  5 +spring.datasource.username=admin
  6 +spring.datasource.password=Sre#45iU7kJ
7 spring.datasource.driver-class-name=com.mysql.jdbc.Driver 7 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
8 8
9 server.tomcat.protocol_header=x-forwarded-proto 9 server.tomcat.protocol_header=x-forwarded-proto
@@ -26,7 +26,7 @@ spring.thymeleaf.cache=false @@ -26,7 +26,7 @@ spring.thymeleaf.cache=false
26 26
27 mybatis.mapper-locations=classpath:mapping/*.xml 27 mybatis.mapper-locations=classpath:mapping/*.xml
28 mybatis.type-aliases-package=com.cnlive.shenhe.entity 28 mybatis.type-aliases-package=com.cnlive.shenhe.entity
29 -server.port=82 29 +server.port=81
30 30
31 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser 31 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
32 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae 32 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae