周伟鹏 / cnlive_shenhe · Commits

Commit d1dde21f2cd7f02cf4ba417803a4c30923c1f693

Authored by 王言钊
2 parents df480cbd d864e32b

Merge branch 'master' into dev

Inline Side-by-side
Showing 3 changed files with 5 additions and 13 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
  View file @d1dde21
... ... @@ -31,13 +31,13 @@ public class ShenheApplication extends SpringBootServletInitializer {
31 31 private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2";
32 32 private static final String CAS_SERVER_LOGIN_URL = "https://user.cnlive.com/OpenSSO2/login";
33 33 //本机的名称
34   - private static final String SERVER_NAME = "http://test.shen.cnlive.com:82";
  34 + private static final String SERVER_NAME = "http://shen.cnlive.com:81";
35 35  
36 36 //登录入口
37   - private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login";
  37 + private static final String SERVICE_LOGIN = "http://shen.cnlive.com:81/users/login";
38 38  
39 39 //登出
40   - private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout";
  40 + private static final String SERVICE_LOGINOUT = "http://shen.cnlive.com:81/users/logout";
41 41  
42 42 public static void main(String[] args) {
43 43 // SpringApplication.run(ShenheApplication.class, args);
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
  View file @d1dde21
... ... @@ -174,15 +174,6 @@ public class CommentsServiceImpl {
174 174 }
175 175 }
176 176  
177   - //if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
178   - // Example.Criteria criteria1 = example.createCriteria();
179   - // String[] stas = String.valueOf(commentsDTO.getState()).split(",");
180   - // for (String s : stas) {
181   - // criteria1.orEqualTo("state", Integer.parseInt(s));
182   - // }
183   - // example.and(criteria1);
184   - //}
185   -
186 177 if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
187 178 criteria.andEqualTo("state", commentsDTO.getState());
188 179 } else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
  View file @d1dde21
... ... @@ -365,9 +365,10 @@ public class ContentServiceImpl {
365 365 shenheType = 1;
366 366 } else {
367 367 if ("content".equals(ContentTag)) {
368   - //机审
  368 + //免审
369 369 shenheType = 1;
370 370 } else if (ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
  371 + //机审
371 372 shenheType = 2;
372 373 } else {
373 374 //人工审
... ...