周伟鹏 / cnlive_shenhe · Commits

Commit f49970ac2841c27bf5b9f930641be0ac5e131e75

Authored by liwei2917
2 parents 1072ddd2 79c56638

Merge branch 'master' into dev

Inline Side-by-side
Showing 6 changed files with 29 additions and 29 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_test</artifactId>
  7 + <artifactId>cnlive_shenhe</artifactId>
8 8 <version>0.0.1-SNAPSHOT</version>
9 9 <packaging>jar</packaging>
10 10  
... ... @@ -137,6 +137,7 @@
137 137 <artifactId>poi-ooxml</artifactId>
138 138 <version>3.16</version>
139 139 </dependency>
  140 +
140 141 </dependencies>
141 142  
142 143 <build>
... ...
src/main/java/com/cnlive/shenhe/ShenheApplication.java
  View file @f49970a
... ... @@ -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://test.shen.cnlive.com:82";
  26 + private static final String SERVER_NAME = "http://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://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://shen.cnlive.com:81/users/logout";
33 33  
34 34  
35 35 /**
... ...
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @f49970a
... ... @@ -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://test.shen.cnlive.com/users/login";
  40 + return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://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://test.shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=false&video_priority=";
  56 + return "redirect:http://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://test.shen.cnlive.com/users/login";
  65 + return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://shen.cnlive.com/users/login";
66 66 }
67 67  
68 68  
... ...
src/main/java/com/cnlive/shenhe/job/UsersSiteJob.java
  View file @f49970a
... ... @@ -46,7 +46,7 @@ public class UsersSiteJob {
46 46 ShySitesMapper shySitesMapper;
47 47  
48 48  
49   - @Scheduled(fixedRate = 30 * 60 * 1000)
  49 + @Scheduled(fixedRate = 1 * 60 * 1000)
50 50 public void syncUsers() {
51 51 try {
52 52 String tm = "0";
... ... @@ -64,6 +64,7 @@ public class UsersSiteJob {
64 64 logger.info("httpUrl===" + httpUrl);
65 65 Map<String, String> resultMap = HttpUtil.init().post(httpUrl);
66 66 JSONObject result = JSON.parseObject(resultMap.get("result"));
  67 + logger.error("请求用户云结果，result:{}", result);
67 68 String errorCode = result.getString("errorCode");
68 69 if ("0".equals(errorCode)) {
69 70 JSONArray data = result.getJSONArray("data");
... ...
src/main/resources/application.properties
  View file @f49970a
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
  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 +
12 13 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
13 14  
14 15 server.tomcat.protocol_header=x-forwarded-proto
... ... @@ -34,7 +35,7 @@ spring.thymeleaf.cache=false
34 35  
35 36 mybatis.mapper-locations=classpath:mapping/*.xml
36 37 mybatis.type-aliases-package=com.cnlive.shenhe.entity
37   -server.port=82
  38 +server.port=81
38 39  
39 40 sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
40 41 sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
... ... @@ -47,19 +48,19 @@ platformValue=10011438
47 48 #\u62bd\u5e27\u5e38\u91cf
48 49 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
49 50 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
50   -avsmple_url=http://test.transcode.cnlive.com/api/request
51   -avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
  51 +avsmple_url=http://transcode.cnlive.com/api/request
  52 +avsmple_callback=http://shen.cnlive.com/api/avsample/callback
52 53  
53 54 #\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d
54   -qn_bucket=cnlivetest
55   -qn_domain=http://test.qnvod.cnlive.com
56   -ks_bucket=cnlive-test
57   -ks_domain=http://test.wideo.cnlive.com
  55 +#qn_bucket=cnlivetest
  56 +#qn_domain=http://test.qnvod.cnlive.com
  57 +#ks_bucket=cnlive-test
  58 +#ks_domain=http://test.wideo.cnlive.com
58 59  
59   -#qn_bucket=mam-sxzg-82
60   -#qn_domain=http://sxzg.ys2.cnliveimg.com
61   -#ks_bucket=mam-sxzg-82
62   -#ks_domain=http://sxzg.ys1.cnliveimg.com
  60 +qn_bucket=mam-sxzg-82
  61 +qn_domain=http://sxzg.ys2.cnliveimg.com
  62 +ks_bucket=mam-sxzg-82
  63 +ks_domain=http://sxzg.ys1.cnliveimg.com
63 64  
64 65 #\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
65 66 desdir=shen
... ...
src/main/resources/templates/page/video.html
  View file @f49970a
... ... @@ -223,10 +223,7 @@
223 223 <td style="text-align: center; width: 17%;">
224 224 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
225 225 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
226   - <button class="btn btn-info btn-sm"
227   - th:style="${state1 eq '0' && receive1 eq 'false'} ? 'display: none ' : ' '">
228   - 查看
229   - </button>
  226 + <button class="btn btn-info btn-sm" th:style="${state1 eq '0' && receive1 eq 'false'} ? 'display: none ' : ' '">查看</button>
230 227 </a>
231 228 <span th:if="${video.state==0 and !video.receive}"> &nbsp;</span>
232 229 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}"
... ...