周伟鹏 / cnlive_shenhe · Commits

Commit 4b00787278431ef48af190465702b86f3cc3ef23

Authored by 周伟鹏
1 parent 5e3d8bba

update

Inline Side-by-side
Showing 3 changed files with 19 additions and 19 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
  View file @4b00787
... ... @@ -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://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://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://shen.cnlive.com:82/users/logout";
33 33  
34 34  
35 35 /**
... ...
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @4b00787
... ... @@ -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 @4b00787
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 7 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
8 8  
9 9 server.tomcat.protocol_header=x-forwarded-proto
... ... @@ -26,7 +26,7 @@ spring.thymeleaf.cache=false
26 26  
27 27 mybatis.mapper-locations=classpath:mapping/*.xml
28 28 mybatis.type-aliases-package=com.cnlive.shenhe.entity
29   -server.port=81
  29 +server.port=82
30 30  
31 31 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
32 32 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
... ... @@ -39,14 +39,14 @@ platformValue=10011438
39 39 #抽帧常量
40 40 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
41 41 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
42   -avsmple_url=http://transcode.cnlive.com/api/request
43   -avsmple_callback=http://shen.cnlive.com/api/avsample/callback
  42 +avsmple_url=http://test.transcode.cnlive.com/api/request
  43 +avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
44 44  
45 45 #抽帧存放bucket和域名
46   -qn_bucket=mam-sxzg-82
47   -qn_domain=http://sxzg.ys2.cnliveimg.com
48   -ks_bucket=mam-sxzg-82
49   -ks_domain=http://sxzg.ys1.cnliveimg.com
  46 +qn_bucket=cnlivetest
  47 +qn_domain=http://test.qnvod.cnlive.com
  48 +ks_bucket=cnlive-test
  49 +ks_domain=http://test.wideo.cnlive.com
50 50  
51 51 #图片存放根路径
52 52 desdir=shen
... ...