Commit 815533ad7fc9caa531a6f596dbe913d4b781237e
Merge remote-tracking branch 'origin/dev' into master_bak
# Conflicts: # src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java # src/main/resources/application.properties
Showing
32 changed files
with
1753 additions
and
830 deletions
Too many changes to show.
To preserve performance only 32 of 37 files are displayed.
LOG_HOME_IS_UNDEFINED/20220304/APP_NAME_IS_UNDEFINED.log
0 → 100644
| 1 | +2022-03-04 17:00:58.798 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 17904 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 2 | +2022-03-04 17:00:58.802 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 3 | +2022-03-04 17:00:59.989 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 4 | +2022-03-04 17:01:00.046 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 5 | +2022-03-04 17:01:00.964 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 6 | +2022-03-04 17:01:00.964 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 7 | +2022-03-04 17:01:00.964 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 8 | +2022-03-04 17:01:01.088 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 9 | +2022-03-04 17:01:01.156 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 10 | +2022-03-04 17:01:01.159 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 11 | +2022-03-04 17:01:01.159 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 12 | +2022-03-04 17:01:01.159 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 13 | +2022-03-04 17:01:01.160 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 14 | +2022-03-04 17:01:01.162 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 15 | +2022-03-04 17:01:01.163 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 16 | +2022-03-04 17:01:01.163 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 17 | +2022-03-04 17:01:01.192 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] |
LOG_HOME_IS_UNDEFINED/20220307/APP_NAME_IS_UNDEFINED.log
0 → 100644
| 1 | +2022-03-07 14:36:40.138 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 19076 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 2 | +2022-03-07 14:36:40.141 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 3 | +2022-03-07 14:36:41.000 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 4 | +2022-03-07 14:36:41.021 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 5 | +2022-03-07 14:36:41.263 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 6 | +2022-03-07 14:36:41.866 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 7 | +2022-03-07 14:36:41.866 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 8 | +2022-03-07 14:36:41.867 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 9 | +2022-03-07 14:36:41.973 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 10 | +2022-03-07 14:36:42.041 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 11 | +2022-03-07 14:36:42.043 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 12 | +2022-03-07 14:36:42.044 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 13 | +2022-03-07 14:36:42.044 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 14 | +2022-03-07 14:36:42.045 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 15 | +2022-03-07 14:36:42.046 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 16 | +2022-03-07 14:36:42.048 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 17 | +2022-03-07 14:36:42.048 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 18 | +2022-03-07 14:36:42.075 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 19 | +2022-03-07 14:37:25.138 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 20204 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 20 | +2022-03-07 14:37:25.141 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 21 | +2022-03-07 14:37:26.034 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 22 | +2022-03-07 14:37:26.055 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 23 | +2022-03-07 14:37:26.294 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 24 | +2022-03-07 14:37:26.869 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 25 | +2022-03-07 14:37:26.870 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 26 | +2022-03-07 14:37:26.870 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 27 | +2022-03-07 14:37:26.975 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 28 | +2022-03-07 14:37:27.044 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 29 | +2022-03-07 14:37:27.046 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 30 | +2022-03-07 14:37:27.046 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 31 | +2022-03-07 14:37:27.047 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 32 | +2022-03-07 14:37:27.048 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 33 | +2022-03-07 14:37:27.049 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 34 | +2022-03-07 14:37:27.050 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 35 | +2022-03-07 14:37:27.051 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 36 | +2022-03-07 14:37:27.079 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 37 | +2022-03-07 14:38:37.280 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 20300 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 38 | +2022-03-07 14:38:37.283 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 39 | +2022-03-07 14:38:38.216 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 40 | +2022-03-07 14:38:38.242 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 41 | +2022-03-07 14:38:38.575 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 42 | +2022-03-07 14:38:39.208 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 43 | +2022-03-07 14:38:39.209 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 44 | +2022-03-07 14:38:39.209 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 45 | +2022-03-07 14:38:39.351 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 46 | +2022-03-07 14:38:39.419 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 47 | +2022-03-07 14:38:39.421 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 48 | +2022-03-07 14:38:39.422 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 49 | +2022-03-07 14:38:39.422 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 50 | +2022-03-07 14:38:39.423 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 51 | +2022-03-07 14:38:39.424 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 52 | +2022-03-07 14:38:39.425 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 53 | +2022-03-07 14:38:39.426 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 54 | +2022-03-07 14:38:39.452 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 55 | +2022-03-07 14:41:34.242 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 21200 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 56 | +2022-03-07 14:41:34.245 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 57 | +2022-03-07 14:41:35.157 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 58 | +2022-03-07 14:41:35.177 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 59 | +2022-03-07 14:41:35.415 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 60 | +2022-03-07 14:41:35.985 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 61 | +2022-03-07 14:41:35.986 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 62 | +2022-03-07 14:41:35.986 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 63 | +2022-03-07 14:41:36.109 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 64 | +2022-03-07 14:41:36.182 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 65 | +2022-03-07 14:41:36.184 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 66 | +2022-03-07 14:41:36.185 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 67 | +2022-03-07 14:41:36.185 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 68 | +2022-03-07 14:41:36.186 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 69 | +2022-03-07 14:41:36.188 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 70 | +2022-03-07 14:41:36.189 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 71 | +2022-03-07 14:41:36.189 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 72 | +2022-03-07 14:41:36.232 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 73 | +2022-03-07 14:46:56.201 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 19840 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 74 | +2022-03-07 14:46:56.206 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 75 | +2022-03-07 14:46:57.165 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 76 | +2022-03-07 14:46:57.186 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 77 | +2022-03-07 14:46:57.426 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 78 | +2022-03-07 14:46:57.990 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 79 | +2022-03-07 14:46:57.991 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 80 | +2022-03-07 14:46:57.991 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 81 | +2022-03-07 14:46:58.119 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 82 | +2022-03-07 14:46:58.188 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 83 | +2022-03-07 14:46:58.190 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 84 | +2022-03-07 14:46:58.191 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 85 | +2022-03-07 14:46:58.191 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 86 | +2022-03-07 14:46:58.192 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 87 | +2022-03-07 14:46:58.193 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 88 | +2022-03-07 14:46:58.195 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 89 | +2022-03-07 14:46:58.195 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 90 | +2022-03-07 14:46:58.221 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 91 | +2022-03-07 14:48:28.042 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 17384 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 92 | +2022-03-07 14:48:28.046 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 93 | +2022-03-07 14:48:28.957 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 94 | +2022-03-07 14:48:28.978 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 95 | +2022-03-07 14:48:29.215 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 96 | +2022-03-07 14:48:29.785 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 97 | +2022-03-07 14:48:29.785 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 98 | +2022-03-07 14:48:29.786 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 99 | +2022-03-07 14:48:29.891 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 100 | +2022-03-07 14:48:29.958 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 101 | +2022-03-07 14:48:29.961 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 102 | +2022-03-07 14:48:29.961 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 103 | +2022-03-07 14:48:29.961 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 104 | +2022-03-07 14:48:29.962 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 105 | +2022-03-07 14:48:29.964 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 106 | +2022-03-07 14:48:29.965 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 107 | +2022-03-07 14:48:29.965 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 108 | +2022-03-07 14:48:29.991 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 109 | +2022-03-07 14:53:32.869 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 20740 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 110 | +2022-03-07 14:53:32.873 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 111 | +2022-03-07 14:53:33.783 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 112 | +2022-03-07 14:53:33.804 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 113 | +2022-03-07 14:53:34.047 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 114 | +2022-03-07 14:53:34.624 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 115 | +2022-03-07 14:53:34.624 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 116 | +2022-03-07 14:53:34.625 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 117 | +2022-03-07 14:53:34.752 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 118 | +2022-03-07 14:53:34.821 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 119 | +2022-03-07 14:53:34.824 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 120 | +2022-03-07 14:53:34.824 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 121 | +2022-03-07 14:53:34.824 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 122 | +2022-03-07 14:53:34.826 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 123 | +2022-03-07 14:53:34.827 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 124 | +2022-03-07 14:53:34.828 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 125 | +2022-03-07 14:53:34.828 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 126 | +2022-03-07 14:53:34.856 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 127 | +2022-03-07 14:54:46.254 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 21044 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 128 | +2022-03-07 14:54:46.258 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 129 | +2022-03-07 14:54:47.173 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 130 | +2022-03-07 14:54:47.195 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 131 | +2022-03-07 14:54:47.438 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 132 | +2022-03-07 14:54:48.015 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 133 | +2022-03-07 14:54:48.016 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 134 | +2022-03-07 14:54:48.016 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 135 | +2022-03-07 14:54:48.142 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 136 | +2022-03-07 14:54:48.212 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 137 | +2022-03-07 14:54:48.215 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 138 | +2022-03-07 14:54:48.215 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 139 | +2022-03-07 14:54:48.215 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 140 | +2022-03-07 14:54:48.217 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 141 | +2022-03-07 14:54:48.218 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 142 | +2022-03-07 14:54:48.219 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 143 | +2022-03-07 14:54:48.219 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 144 | +2022-03-07 14:54:48.248 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 145 | +2022-03-07 15:01:55.391 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 18012 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 146 | +2022-03-07 15:01:55.394 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 147 | +2022-03-07 15:01:56.302 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 148 | +2022-03-07 15:01:56.324 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 149 | +2022-03-07 15:01:56.580 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 150 | +2022-03-07 15:01:57.148 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 151 | +2022-03-07 15:01:57.149 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 152 | +2022-03-07 15:01:57.149 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 153 | +2022-03-07 15:01:57.275 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 154 | +2022-03-07 15:01:57.344 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 155 | +2022-03-07 15:01:57.346 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 156 | +2022-03-07 15:01:57.346 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 157 | +2022-03-07 15:01:57.347 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 158 | +2022-03-07 15:01:57.348 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 159 | +2022-03-07 15:01:57.349 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 160 | +2022-03-07 15:01:57.350 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 161 | +2022-03-07 15:01:57.350 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 162 | +2022-03-07 15:01:57.379 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 163 | +2022-03-07 15:03:00.479 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 19804 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 164 | +2022-03-07 15:03:00.483 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 165 | +2022-03-07 15:03:01.477 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 166 | +2022-03-07 15:03:01.499 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 167 | +2022-03-07 15:03:01.743 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 168 | +2022-03-07 15:03:02.317 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 169 | +2022-03-07 15:03:02.318 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 170 | +2022-03-07 15:03:02.318 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 171 | +2022-03-07 15:03:02.443 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 172 | +2022-03-07 15:03:02.512 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 173 | +2022-03-07 15:03:02.514 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 174 | +2022-03-07 15:03:02.514 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 175 | +2022-03-07 15:03:02.515 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 176 | +2022-03-07 15:03:02.516 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 177 | +2022-03-07 15:03:02.517 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 178 | +2022-03-07 15:03:02.518 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 179 | +2022-03-07 15:03:02.518 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 180 | +2022-03-07 15:03:02.547 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 181 | +2022-03-07 15:06:48.158 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 20544 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 182 | +2022-03-07 15:06:48.161 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 183 | +2022-03-07 15:06:49.070 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 184 | +2022-03-07 15:06:49.091 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 185 | +2022-03-07 15:06:49.331 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 186 | +2022-03-07 15:06:49.902 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 187 | +2022-03-07 15:06:49.902 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 188 | +2022-03-07 15:06:49.903 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 189 | +2022-03-07 15:06:50.024 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 190 | +2022-03-07 15:06:50.093 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 191 | +2022-03-07 15:06:50.096 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 192 | +2022-03-07 15:06:50.096 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 193 | +2022-03-07 15:06:50.096 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 194 | +2022-03-07 15:06:50.097 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 195 | +2022-03-07 15:06:50.098 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 196 | +2022-03-07 15:06:50.100 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 197 | +2022-03-07 15:06:50.100 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 198 | +2022-03-07 15:06:50.127 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 199 | +2022-03-07 15:12:56.607 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 19248 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 200 | +2022-03-07 15:12:56.612 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 201 | +2022-03-07 15:12:57.561 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 202 | +2022-03-07 15:12:57.585 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 203 | +2022-03-07 15:12:58.507 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 204 | +2022-03-07 15:12:58.508 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 205 | +2022-03-07 15:12:58.509 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 206 | +2022-03-07 15:12:58.693 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 207 | +2022-03-07 15:12:58.779 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 208 | +2022-03-07 15:12:58.782 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 209 | +2022-03-07 15:12:58.783 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 210 | +2022-03-07 15:12:58.783 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 211 | +2022-03-07 15:12:58.785 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 212 | +2022-03-07 15:12:58.787 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 213 | +2022-03-07 15:12:58.789 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 214 | +2022-03-07 15:12:58.789 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 215 | +2022-03-07 15:12:58.819 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 216 | +2022-03-07 15:17:58.738 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 22560 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 217 | +2022-03-07 15:17:58.741 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 218 | +2022-03-07 15:17:59.573 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 219 | +2022-03-07 15:17:59.596 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 220 | +2022-03-07 15:18:00.477 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 221 | +2022-03-07 15:18:00.478 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 222 | +2022-03-07 15:18:00.478 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 223 | +2022-03-07 15:18:00.589 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 224 | +2022-03-07 15:18:00.660 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 225 | +2022-03-07 15:18:00.663 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 226 | +2022-03-07 15:18:00.663 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 227 | +2022-03-07 15:18:00.663 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 228 | +2022-03-07 15:18:00.665 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 229 | +2022-03-07 15:18:00.666 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 230 | +2022-03-07 15:18:00.667 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 231 | +2022-03-07 15:18:00.668 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 232 | +2022-03-07 15:18:00.700 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 233 | +2022-03-07 15:21:05.883 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 22584 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 234 | +2022-03-07 15:21:05.886 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 235 | +2022-03-07 15:21:06.759 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 236 | +2022-03-07 15:21:06.781 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 237 | +2022-03-07 15:21:07.575 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 238 | +2022-03-07 15:21:07.576 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 239 | +2022-03-07 15:21:07.576 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 240 | +2022-03-07 15:21:07.682 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 241 | +2022-03-07 15:21:07.750 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 242 | +2022-03-07 15:21:07.753 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 243 | +2022-03-07 15:21:07.753 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 244 | +2022-03-07 15:21:07.753 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 245 | +2022-03-07 15:21:07.754 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 246 | +2022-03-07 15:21:07.755 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 247 | +2022-03-07 15:21:07.756 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 248 | +2022-03-07 15:21:07.757 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 249 | +2022-03-07 15:21:07.783 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 250 | +2022-03-07 15:54:50.308 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 24400 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 251 | +2022-03-07 15:54:50.312 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 252 | +2022-03-07 15:54:51.216 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 253 | +2022-03-07 15:54:51.239 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 254 | +2022-03-07 15:54:52.140 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 255 | +2022-03-07 15:54:52.141 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 256 | +2022-03-07 15:54:52.141 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 257 | +2022-03-07 15:54:52.285 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 258 | +2022-03-07 15:54:52.362 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 259 | +2022-03-07 15:54:52.365 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 260 | +2022-03-07 15:54:52.365 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 261 | +2022-03-07 15:54:52.365 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 262 | +2022-03-07 15:54:52.367 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 263 | +2022-03-07 15:54:52.369 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 264 | +2022-03-07 15:54:52.370 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 265 | +2022-03-07 15:54:52.371 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 266 | +2022-03-07 15:54:52.404 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 267 | +2022-03-07 15:55:35.218 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 24456 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 268 | +2022-03-07 15:55:35.222 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 269 | +2022-03-07 15:55:36.118 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 270 | +2022-03-07 15:55:36.141 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 271 | +2022-03-07 15:55:37.111 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 272 | +2022-03-07 15:55:37.111 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 273 | +2022-03-07 15:55:37.111 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 274 | +2022-03-07 15:55:37.237 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 275 | +2022-03-07 15:55:37.318 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 276 | +2022-03-07 15:55:37.321 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 277 | +2022-03-07 15:55:37.321 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 278 | +2022-03-07 15:55:37.321 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 279 | +2022-03-07 15:55:37.322 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 280 | +2022-03-07 15:55:37.324 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 281 | +2022-03-07 15:55:37.325 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 282 | +2022-03-07 15:55:37.325 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 283 | +2022-03-07 15:55:37.352 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 284 | +2022-03-07 15:56:38.132 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 24928 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 285 | +2022-03-07 15:56:38.135 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 286 | +2022-03-07 15:56:39.032 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 287 | +2022-03-07 15:56:39.060 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 288 | +2022-03-07 15:56:40.038 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 289 | +2022-03-07 15:56:40.039 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 290 | +2022-03-07 15:56:40.039 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 291 | +2022-03-07 15:56:40.152 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 292 | +2022-03-07 15:56:40.226 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 293 | +2022-03-07 15:56:40.229 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 294 | +2022-03-07 15:56:40.229 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 295 | +2022-03-07 15:56:40.230 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 296 | +2022-03-07 15:56:40.231 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 297 | +2022-03-07 15:56:40.232 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 298 | +2022-03-07 15:56:40.234 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 299 | +2022-03-07 15:56:40.234 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 300 | +2022-03-07 15:56:40.262 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 301 | +2022-03-07 15:57:09.067 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 25288 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 302 | +2022-03-07 15:57:09.070 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 303 | +2022-03-07 15:57:09.975 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 304 | +2022-03-07 15:57:09.998 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 305 | +2022-03-07 15:57:10.915 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 306 | +2022-03-07 15:57:10.916 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 307 | +2022-03-07 15:57:10.916 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 308 | +2022-03-07 15:57:11.028 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 309 | +2022-03-07 15:57:11.110 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 310 | +2022-03-07 15:57:11.113 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 311 | +2022-03-07 15:57:11.113 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 312 | +2022-03-07 15:57:11.113 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 313 | +2022-03-07 15:57:11.115 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 314 | +2022-03-07 15:57:11.116 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 315 | +2022-03-07 15:57:11.118 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 316 | +2022-03-07 15:57:11.118 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 317 | +2022-03-07 15:57:11.154 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 318 | +2022-03-07 16:01:34.784 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 20168 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 319 | +2022-03-07 16:01:34.788 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 320 | +2022-03-07 16:01:35.695 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 321 | +2022-03-07 16:01:35.718 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 322 | +2022-03-07 16:01:36.512 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 323 | +2022-03-07 16:01:36.512 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 324 | +2022-03-07 16:01:36.513 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 325 | +2022-03-07 16:01:36.640 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 326 | +2022-03-07 16:01:36.718 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 327 | +2022-03-07 16:01:36.721 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 328 | +2022-03-07 16:01:36.721 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 329 | +2022-03-07 16:01:36.721 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 330 | +2022-03-07 16:01:36.722 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 331 | +2022-03-07 16:01:36.724 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 332 | +2022-03-07 16:01:36.725 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 333 | +2022-03-07 16:01:36.725 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 334 | +2022-03-07 16:01:36.752 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 335 | +2022-03-07 16:49:16.688 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 24180 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 336 | +2022-03-07 16:49:16.691 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 337 | +2022-03-07 16:49:17.504 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 338 | +2022-03-07 16:49:17.532 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 339 | +2022-03-07 16:49:18.410 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 340 | +2022-03-07 16:49:18.411 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 341 | +2022-03-07 16:49:18.411 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 342 | +2022-03-07 16:49:18.509 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 343 | +2022-03-07 16:49:18.576 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 344 | +2022-03-07 16:49:18.578 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 345 | +2022-03-07 16:49:18.578 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 346 | +2022-03-07 16:49:18.578 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 347 | +2022-03-07 16:49:18.580 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 348 | +2022-03-07 16:49:18.581 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 349 | +2022-03-07 16:49:18.582 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 350 | +2022-03-07 16:49:18.582 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 351 | +2022-03-07 16:49:18.607 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 352 | +2022-03-07 16:49:39.785 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 26048 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 353 | +2022-03-07 16:49:39.789 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 354 | +2022-03-07 16:49:40.666 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 355 | +2022-03-07 16:49:40.690 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 356 | +2022-03-07 16:49:41.514 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 357 | +2022-03-07 16:49:41.515 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 358 | +2022-03-07 16:49:41.515 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 359 | +2022-03-07 16:49:41.622 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 360 | +2022-03-07 16:49:41.695 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 361 | +2022-03-07 16:49:41.697 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 362 | +2022-03-07 16:49:41.697 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 363 | +2022-03-07 16:49:41.697 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 364 | +2022-03-07 16:49:41.699 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 365 | +2022-03-07 16:49:41.700 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 366 | +2022-03-07 16:49:41.701 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 367 | +2022-03-07 16:49:41.701 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 368 | +2022-03-07 16:49:41.729 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 369 | +2022-03-07 16:53:06.177 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 24596 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 370 | +2022-03-07 16:53:06.180 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 371 | +2022-03-07 16:53:07.103 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 372 | +2022-03-07 16:53:07.129 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 373 | +2022-03-07 16:53:08.164 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 374 | +2022-03-07 16:53:08.165 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 375 | +2022-03-07 16:53:08.165 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 376 | +2022-03-07 16:53:08.286 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 377 | +2022-03-07 16:53:08.363 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 378 | +2022-03-07 16:53:08.366 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 379 | +2022-03-07 16:53:08.366 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 380 | +2022-03-07 16:53:08.366 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 381 | +2022-03-07 16:53:08.368 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 382 | +2022-03-07 16:53:08.370 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 383 | +2022-03-07 16:53:08.371 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 384 | +2022-03-07 16:53:08.372 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 385 | +2022-03-07 16:53:08.400 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 386 | +2022-03-07 16:57:46.263 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 16608 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 387 | +2022-03-07 16:57:46.267 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 388 | +2022-03-07 16:57:47.185 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 389 | +2022-03-07 16:57:47.208 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 390 | +2022-03-07 16:57:48.027 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 391 | +2022-03-07 16:57:48.028 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 392 | +2022-03-07 16:57:48.028 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 393 | +2022-03-07 16:57:48.136 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 394 | +2022-03-07 16:57:48.207 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 395 | +2022-03-07 16:57:48.209 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 396 | +2022-03-07 16:57:48.210 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 397 | +2022-03-07 16:57:48.210 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 398 | +2022-03-07 16:57:48.211 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 399 | +2022-03-07 16:57:48.212 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 400 | +2022-03-07 16:57:48.213 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 401 | +2022-03-07 16:57:48.214 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 402 | +2022-03-07 16:57:48.240 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 403 | +2022-03-07 17:01:31.422 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 26920 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 404 | +2022-03-07 17:01:31.426 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 405 | +2022-03-07 17:01:32.309 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 406 | +2022-03-07 17:01:32.332 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 407 | +2022-03-07 17:01:33.146 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 408 | +2022-03-07 17:01:33.146 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 409 | +2022-03-07 17:01:33.147 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 410 | +2022-03-07 17:01:33.272 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 411 | +2022-03-07 17:01:33.341 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 412 | +2022-03-07 17:01:33.344 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 413 | +2022-03-07 17:01:33.344 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 414 | +2022-03-07 17:01:33.344 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 415 | +2022-03-07 17:01:33.345 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 416 | +2022-03-07 17:01:33.346 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 417 | +2022-03-07 17:01:33.347 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 418 | +2022-03-07 17:01:33.348 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 419 | +2022-03-07 17:01:33.373 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] | ||
| 420 | +2022-03-07 17:02:49.744 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - Starting ShenheApplication on WIN7-20190718XJ with PID 26580 (D:\cnlive_shenhe\target\classes started by Administrator in D:\cnlive_shenhe) | ||
| 421 | +2022-03-07 17:02:49.748 [restartedMain] INFO com.cnlive.shenhe.ShenheApplication - The following profiles are active: dev | ||
| 422 | +2022-03-07 17:02:50.696 [restartedMain] WARN tk.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 423 | +2022-03-07 17:02:50.724 [restartedMain] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.cnlive.shenhe]' package. Please check your configuration. | ||
| 424 | +2022-03-07 17:02:51.709 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] | ||
| 425 | +2022-03-07 17:02:51.709 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] | ||
| 426 | +2022-03-07 17:02:51.709 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.54] | ||
| 427 | +2022-03-07 17:02:51.819 [restartedMain] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext | ||
| 428 | +2022-03-07 17:02:51.888 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 429 | +2022-03-07 17:02:51.891 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [service] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82/users/login] | ||
| 430 | +2022-03-07 17:02:51.891 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerLoginUrl] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2/login] | ||
| 431 | +2022-03-07 17:02:51.891 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [ignorePattern] loaded from FilterConfig.getInitParameter with value [/api/*|/logging/*] | ||
| 432 | +2022-03-07 17:02:51.892 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [serverName] loaded from FilterConfig.getInitParameter with value [http://test.shen.cnlive.com:82] | ||
| 433 | +2022-03-07 17:02:51.893 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [casServerUrlPrefix] loaded from FilterConfig.getInitParameter with value [https://user.cnlive.com/OpenSSO2] | ||
| 434 | +2022-03-07 17:02:51.895 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 435 | +2022-03-07 17:02:51.895 [restartedMain] INFO o.j.c.c.c.WebXmlConfigurationStrategyImpl - Property [encoding] loaded from FilterConfig.getInitParameter with value [utf-8] | ||
| 436 | +2022-03-07 17:02:51.927 [restartedMain] INFO org.apache.catalina.core.StandardService - Stopping service [Tomcat] |
pom.xml
| @@ -137,7 +137,7 @@ | @@ -137,7 +137,7 @@ | ||
| 137 | <dependency> | 137 | <dependency> |
| 138 | <groupId>com.alibaba</groupId> | 138 | <groupId>com.alibaba</groupId> |
| 139 | <artifactId>fastjson</artifactId> | 139 | <artifactId>fastjson</artifactId> |
| 140 | - <version>1.2.67</version> | 140 | + <version>1.2.79</version> |
| 141 | </dependency> | 141 | </dependency> |
| 142 | <dependency> | 142 | <dependency> |
| 143 | <groupId>commons-codec</groupId> | 143 | <groupId>commons-codec</groupId> |
src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java
| @@ -53,7 +53,7 @@ public class AudioControllerApi { | @@ -53,7 +53,7 @@ public class AudioControllerApi { | ||
| 53 | * 音频入库 | 53 | * 音频入库 |
| 54 | * | 54 | * |
| 55 | * @param | 55 | * @param |
| 56 | - * @multiplecategory 获取栏目分类 | 56 | + * @multiplecategory 获取栏目分类// |
| 57 | * @audioClipsName 获取音频上传人的id | 57 | * @audioClipsName 获取音频上传人的id |
| 58 | * @soure 音频来源 | 58 | * @soure 音频来源 |
| 59 | * @audioId 音频id | 59 | * @audioId 音频id |
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
| @@ -11,24 +11,17 @@ import com.cnlive.shenhe.utils.CommonUtils; | @@ -11,24 +11,17 @@ import com.cnlive.shenhe.utils.CommonUtils; | ||
| 11 | import org.slf4j.Logger; | 11 | import org.slf4j.Logger; |
| 12 | import org.slf4j.LoggerFactory; | 12 | import org.slf4j.LoggerFactory; |
| 13 | import org.springframework.beans.factory.annotation.Autowired; | 13 | import org.springframework.beans.factory.annotation.Autowired; |
| 14 | -import org.springframework.beans.factory.annotation.Value; | ||
| 15 | import org.springframework.stereotype.Controller; | 14 | import org.springframework.stereotype.Controller; |
| 16 | -import org.springframework.web.bind.annotation.GetMapping; | ||
| 17 | import org.springframework.web.bind.annotation.PostMapping; | 15 | import org.springframework.web.bind.annotation.PostMapping; |
| 18 | import org.springframework.web.bind.annotation.RequestMapping; | 16 | import org.springframework.web.bind.annotation.RequestMapping; |
| 19 | import org.springframework.web.bind.annotation.ResponseBody; | 17 | import org.springframework.web.bind.annotation.ResponseBody; |
| 20 | 18 | ||
| 21 | -import java.util.HashMap; | ||
| 22 | import java.util.List; | 19 | import java.util.List; |
| 23 | -import java.util.Map; | ||
| 24 | 20 | ||
| 25 | @Controller | 21 | @Controller |
| 26 | @RequestMapping("/api/channel") | 22 | @RequestMapping("/api/channel") |
| 27 | public class ChannelControllerApi { | 23 | public class ChannelControllerApi { |
| 28 | private static Logger logger = LoggerFactory.getLogger(ChannelControllerApi.class); | 24 | private static Logger logger = LoggerFactory.getLogger(ChannelControllerApi.class); |
| 29 | - | ||
| 30 | - @Autowired | ||
| 31 | - AuditPass Pass; | ||
| 32 | @Autowired | 25 | @Autowired |
| 33 | ChannelServiceImpl channelService; | 26 | ChannelServiceImpl channelService; |
| 34 | 27 | ||
| @@ -46,51 +39,48 @@ public class ChannelControllerApi { | @@ -46,51 +39,48 @@ public class ChannelControllerApi { | ||
| 46 | ShyChannel shyChannel = new ShyChannel(); | 39 | ShyChannel shyChannel = new ShyChannel(); |
| 47 | shyChannel.setChannel_id(json.getString("channelId")); | 40 | shyChannel.setChannel_id(json.getString("channelId")); |
| 48 | List<ShyChannel> channelList = channelService.findshyChannel(shyChannel); | 41 | List<ShyChannel> channelList = channelService.findshyChannel(shyChannel); |
| 49 | - | ||
| 50 | - Integer sp_id=null; | 42 | + |
| 43 | + Integer spId; | ||
| 51 | try { | 44 | try { |
| 52 | - sp_id=json.getInteger("spId"); | ||
| 53 | - } catch (Exception e) { | ||
| 54 | - sp_id=null; | ||
| 55 | - } | 45 | + spId = json.getInteger("spId"); |
| 46 | + } catch (Exception e) { | ||
| 47 | + spId = null; | ||
| 48 | + } | ||
| 56 | //存在则更新 | 49 | //存在则更新 |
| 57 | if (channelList.size() > 0) { | 50 | if (channelList.size() > 0) { |
| 58 | ShyChannel shyChannel1 = channelList.get(0); | 51 | ShyChannel shyChannel1 = channelList.get(0); |
| 59 | shyChannel1.setShenhe_status(CommonConst.AUDIT_INTT); | 52 | shyChannel1.setShenhe_status(CommonConst.AUDIT_INTT); |
| 60 | - shyChannel1.setChannel_name(json.getString("channelName")); | 53 | + shyChannel1.setChannel_name(json.getString("channelName")); |
| 61 | shyChannel1.setChannel_img(json.getString("face")); | 54 | shyChannel1.setChannel_img(json.getString("face")); |
| 62 | shyChannel1.setCallback(json.getString("callback")); | 55 | shyChannel1.setCallback(json.getString("callback")); |
| 63 | - shyChannel1.setSp_id(sp_id); | ||
| 64 | -// shyChannel1.setAuditor(null); | ||
| 65 | -// shyChannel1.setUpdater(null); | ||
| 66 | - shyChannel1.setOffline(0);//是否下线 0表示正常 1表示下线 | 56 | + shyChannel1.setSp_id(spId); |
| 57 | + //是否下线 0表示正常 1表示下线 | ||
| 58 | + shyChannel1.setOffline(0); | ||
| 67 | shyChannel1.setUpdated_at(CommonUtils.getCurrentTime()); | 59 | shyChannel1.setUpdated_at(CommonUtils.getCurrentTime()); |
| 68 | channelService.getShenheType(shyChannel1); | 60 | channelService.getShenheType(shyChannel1); |
| 69 | boolean YorN = channelService.updateshyChannel(shyChannel1); | 61 | boolean YorN = channelService.updateshyChannel(shyChannel1); |
| 70 | - if (YorN == true) { | ||
| 71 | - return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(),"审核请求收到成功"); | ||
| 72 | - } else { | ||
| 73 | - return new ResponseBean(ErrorEnum.ERROR.getErrorCode(),"审核请求收到失败(更新)"); | 62 | + if (YorN) { |
| 63 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功"); | ||
| 74 | } | 64 | } |
| 65 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(更新)"); | ||
| 75 | } | 66 | } |
| 76 | //如果不存在直接插入 | 67 | //如果不存在直接插入 |
| 77 | shyChannel.setShenhe_status(CommonConst.AUDIT_INTT); | 68 | shyChannel.setShenhe_status(CommonConst.AUDIT_INTT); |
| 78 | - shyChannel.setChannel_name(json.getString("channelName")); | 69 | + shyChannel.setChannel_name(json.getString("channelName")); |
| 79 | shyChannel.setChannel_img(json.getString("face")); | 70 | shyChannel.setChannel_img(json.getString("face")); |
| 80 | shyChannel.setCallback(json.getString("callback")); | 71 | shyChannel.setCallback(json.getString("callback")); |
| 81 | - shyChannel.setSp_id(sp_id); | ||
| 82 | - shyChannel.setOffline(0);//是否下线 0表示正常 1表示下线 | 72 | + shyChannel.setSp_id(spId); |
| 73 | + //是否下线 0表示正常 1表示下线 | ||
| 74 | + shyChannel.setOffline(0); | ||
| 83 | shyChannel.setCreated_at(CommonUtils.getCurrentTime()); | 75 | shyChannel.setCreated_at(CommonUtils.getCurrentTime()); |
| 84 | shyChannel.setUpdated_at(CommonUtils.getCurrentTime()); | 76 | shyChannel.setUpdated_at(CommonUtils.getCurrentTime()); |
| 85 | channelService.getShenheType(shyChannel); | 77 | channelService.getShenheType(shyChannel); |
| 86 | boolean YorN = channelService.impotChannel(shyChannel); | 78 | boolean YorN = channelService.impotChannel(shyChannel); |
| 87 | - if (YorN == true) { | ||
| 88 | - return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(),"审核请求收到成功"); | ||
| 89 | - } else { | ||
| 90 | - return new ResponseBean(ErrorEnum.ERROR.getErrorCode(),"审核请求收到失败(新增)"); | 79 | + if (YorN) { |
| 80 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功"); | ||
| 91 | } | 81 | } |
| 82 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(新增)"); | ||
| 92 | } | 83 | } |
| 93 | - | ||
| 94 | - | 84 | + |
| 95 | 85 | ||
| 96 | } | 86 | } |
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
| @@ -4,11 +4,8 @@ import com.alibaba.fastjson.JSONArray; | @@ -4,11 +4,8 @@ import com.alibaba.fastjson.JSONArray; | ||
| 4 | import com.alibaba.fastjson.JSONObject; | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | import com.cnlive.shenhe.bean.ErrorEnum; | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 6 | import com.cnlive.shenhe.bean.ResponseBean; | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 7 | -import com.cnlive.shenhe.entity.ShyComments; | ||
| 8 | import com.cnlive.shenhe.entity.ShyContent; | 7 | import com.cnlive.shenhe.entity.ShyContent; |
| 9 | -import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; | ||
| 10 | import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; | 8 | import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; |
| 11 | -import com.cnlive.shenhe.utils.AuditPass; | ||
| 12 | import com.cnlive.shenhe.utils.CommonConst; | 9 | import com.cnlive.shenhe.utils.CommonConst; |
| 13 | import com.cnlive.shenhe.utils.CommonUtils; | 10 | import com.cnlive.shenhe.utils.CommonUtils; |
| 14 | import org.slf4j.Logger; | 11 | import org.slf4j.Logger; |
| @@ -16,27 +13,21 @@ import org.slf4j.LoggerFactory; | @@ -16,27 +13,21 @@ import org.slf4j.LoggerFactory; | ||
| 16 | import org.springframework.beans.factory.annotation.Autowired; | 13 | import org.springframework.beans.factory.annotation.Autowired; |
| 17 | import org.springframework.stereotype.Controller; | 14 | import org.springframework.stereotype.Controller; |
| 18 | import org.springframework.ui.Model; | 15 | import org.springframework.ui.Model; |
| 19 | -import org.springframework.web.bind.annotation.GetMapping; | ||
| 20 | -import org.springframework.web.bind.annotation.PathVariable; | ||
| 21 | -import org.springframework.web.bind.annotation.PostMapping; | ||
| 22 | -import org.springframework.web.bind.annotation.RequestBody; | ||
| 23 | -import org.springframework.web.bind.annotation.RequestMapping; | ||
| 24 | -import org.springframework.web.bind.annotation.ResponseBody; | 16 | +import org.springframework.web.bind.annotation.*; |
| 25 | 17 | ||
| 26 | import java.util.Date; | 18 | import java.util.Date; |
| 27 | import java.util.List; | 19 | import java.util.List; |
| 28 | -import java.util.Map; | ||
| 29 | - | ||
| 30 | -import javax.servlet.http.HttpSession; | ||
| 31 | 20 | ||
| 21 | +/** | ||
| 22 | + * 图文审核 | ||
| 23 | + * | ||
| 24 | + * @author | ||
| 25 | + */ | ||
| 32 | @Controller | 26 | @Controller |
| 33 | @RequestMapping("/api/content") | 27 | @RequestMapping("/api/content") |
| 34 | public class ContentControllerApi { | 28 | public class ContentControllerApi { |
| 35 | private static Logger logger = LoggerFactory.getLogger(ContentControllerApi.class); | 29 | private static Logger logger = LoggerFactory.getLogger(ContentControllerApi.class); |
| 36 | - @Autowired | ||
| 37 | - AuditPass Pass; | ||
| 38 | - @Autowired | ||
| 39 | - CommentsServiceImpl commentsService; | 30 | + |
| 40 | @Autowired | 31 | @Autowired |
| 41 | ContentServiceImpl contentService; | 32 | ContentServiceImpl contentService; |
| 42 | 33 | ||
| @@ -47,44 +38,57 @@ public class ContentControllerApi { | @@ -47,44 +38,57 @@ public class ContentControllerApi { | ||
| 47 | */ | 38 | */ |
| 48 | @PostMapping("/import") | 39 | @PostMapping("/import") |
| 49 | @ResponseBody | 40 | @ResponseBody |
| 50 | - public ResponseBean impotContent(String param) { | 41 | + public ResponseBean importContent(String param) { |
| 51 | logger.info("图文入库，param=====" + param); | 42 | logger.info("图文入库，param=====" + param); |
| 52 | JSONObject json = JSONObject.parseObject(param); | 43 | JSONObject json = JSONObject.parseObject(param); |
| 53 | //判断是否存在 | 44 | //判断是否存在 |
| 54 | - ShyContent shyContent=new ShyContent(); | 45 | + ShyContent shyContent = new ShyContent(); |
| 55 | shyContent.setContent_id(json.getString("contentId")); | 46 | shyContent.setContent_id(json.getString("contentId")); |
| 56 | - shyContent.setContent_tag("content");//图文标签 | ||
| 57 | - List<ShyContent> contentList = contentService.findshyContent(shyContent); | ||
| 58 | - | 47 | + //图文标签 |
| 48 | + shyContent.setContent_tag("content"); | ||
| 49 | + | ||
| 59 | //获取审核类型 | 50 | //获取审核类型 |
| 60 | - Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"content"); | 51 | + Integer shenheType = contentService.getShenheType(json.getInteger("spId"), "content"); |
| 52 | + List<ShyContent> contentList = contentService.findshyContent(shyContent); | ||
| 61 | //存在则更新 | 53 | //存在则更新 |
| 62 | if (contentList.size() > 0) { | 54 | if (contentList.size() > 0) { |
| 63 | ShyContent shyContent1 = contentList.get(0); | 55 | ShyContent shyContent1 = contentList.get(0); |
| 64 | - shyContent1.setTitle(json.getString("title"));//标题 | ||
| 65 | - shyContent1.setTitle_image(json.getString("titleImage"));//标题图片 | ||
| 66 | - shyContent1.setShenhe_type(shenheType);//审核类型 | ||
| 67 | - shyContent1.setContent_status(json.getInteger("contentStatus"));//当前图文的审核状态 | ||
| 68 | - shyContent1.setSource(json.getString("source"));//来源 | ||
| 69 | - shyContent1.setAuthor(json.getString("author"));//作者 | ||
| 70 | - shyContent1.setContent_text(json.getString("content_text"));//图文内容 | ||
| 71 | - String contentTime = json.getString("contentTime");//图文创建时间 | 56 | + //标题 |
| 57 | + shyContent1.setTitle(json.getString("title")); | ||
| 58 | + //标题图片 | ||
| 59 | + shyContent1.setTitle_image(json.getString("titleImage")); | ||
| 60 | + //审核类型 | ||
| 61 | + shyContent1.setShenhe_type(shenheType); | ||
| 62 | + //当前图文的审核状态 | ||
| 63 | + shyContent1.setContent_status(json.getInteger("contentStatus")); | ||
| 64 | + //来源 | ||
| 65 | + shyContent1.setSource(json.getString("source")); | ||
| 66 | + //作者 | ||
| 67 | + shyContent1.setAuthor(json.getString("author")); | ||
| 68 | + //图文内容 | ||
| 69 | + shyContent1.setContent_text(json.getString("content_text")); | ||
| 70 | + //图文创建时间 | ||
| 71 | + String contentTime = json.getString("contentTime"); | ||
| 72 | if (CommonUtils.isNotEmpty(contentTime)) { | 72 | if (CommonUtils.isNotEmpty(contentTime)) { |
| 73 | Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); | 73 | Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); |
| 74 | shyContent1.setContent_time(timestamp); | 74 | shyContent1.setContent_time(timestamp); |
| 75 | 75 | ||
| 76 | } | 76 | } |
| 77 | shyContent1.setCreate_date(CommonUtils.getCurrentTime()); | 77 | shyContent1.setCreate_date(CommonUtils.getCurrentTime()); |
| 78 | - shyContent1.setCallback(json.getString("callback"));//回调地址 | ||
| 79 | - shyContent1.setContent_url(json.getString("contentUrl"));//图文发布h5的url | ||
| 80 | - shyContent1.setContent_pc_url(json.getString("contentPCUrl"));//图文发布pc的url | ||
| 81 | - shyContent1.setSp_id(json.getInteger("spId"));//spid | ||
| 82 | - shyContent1.setContent_tag("content");//图文标签 | ||
| 83 | - shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | ||
| 84 | - shyContent1.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | ||
| 85 | - | ||
| 86 | - | ||
| 87 | - | 78 | + //回调地址 |
| 79 | + shyContent1.setCallback(json.getString("callback")); | ||
| 80 | + //图文发布h5的url | ||
| 81 | + shyContent1.setContent_url(json.getString("contentUrl")); | ||
| 82 | + //图文发布pc的url | ||
| 83 | + shyContent1.setContent_pc_url(json.getString("contentPCUrl")); | ||
| 84 | + //spid | ||
| 85 | + shyContent1.setSp_id(json.getInteger("spId")); | ||
| 86 | + //图文标签 | ||
| 87 | + shyContent1.setContent_tag("content"); | ||
| 88 | + //领取状态 | ||
| 89 | + shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE); | ||
| 90 | + //最后一次更新时间 | ||
| 91 | + shyContent1.setLast_update(CommonUtils.getCurrentTime()); | ||
| 88 | boolean YorN = contentService.updateshyContent(shyContent1); | 92 | boolean YorN = contentService.updateshyContent(shyContent1); |
| 89 | if (YorN == true) { | 93 | if (YorN == true) { |
| 90 | return new ResponseBean(ErrorEnum.SUCCESS); | 94 | return new ResponseBean(ErrorEnum.SUCCESS); |
| @@ -92,27 +96,53 @@ public class ContentControllerApi { | @@ -92,27 +96,53 @@ public class ContentControllerApi { | ||
| 92 | return new ResponseBean(ErrorEnum.ERROR); | 96 | return new ResponseBean(ErrorEnum.ERROR); |
| 93 | } | 97 | } |
| 94 | } | 98 | } |
| 99 | + return saveContent(json, shyContent, shenheType); | ||
| 100 | + } | ||
| 101 | + | ||
| 102 | + /** | ||
| 103 | + * 保存操作 | ||
| 104 | + * | ||
| 105 | + * @param json | ||
| 106 | + * @param shyContent | ||
| 107 | + * @param shenheType | ||
| 108 | + * @return | ||
| 109 | + */ | ||
| 110 | + private ResponseBean saveContent(JSONObject json, ShyContent shyContent, Integer shenheType) { | ||
| 95 | //如果不存在直接插入 | 111 | //如果不存在直接插入 |
| 96 | - shyContent.setTitle(json.getString("title"));//标题 | ||
| 97 | - shyContent.setTitle_image(json.getString("titleImage"));//标题图片 | ||
| 98 | - shyContent.setShenhe_type(shenheType);//审核类型 | ||
| 99 | - shyContent.setContent_status(json.getInteger("contentStatus"));//当前图文的审核状态 | ||
| 100 | - shyContent.setSource(json.getString("source"));//来源 | ||
| 101 | - shyContent.setAuthor(json.getString("author"));//作者 | ||
| 102 | - shyContent.setContent_text(json.getString("content_text"));//图文内容 | ||
| 103 | - String contentTime = json.getString("contentTime");//创建时间 | 112 | + //标题 |
| 113 | + shyContent.setTitle(json.getString("title")); | ||
| 114 | + //标题图片 | ||
| 115 | + shyContent.setTitle_image(json.getString("titleImage")); | ||
| 116 | + //审核类型 | ||
| 117 | + shyContent.setShenhe_type(shenheType); | ||
| 118 | + //当前图文的审核状态 | ||
| 119 | + shyContent.setContent_status(json.getInteger("contentStatus")); | ||
| 120 | + //来源 | ||
| 121 | + shyContent.setSource(json.getString("source")); | ||
| 122 | + //作者 | ||
| 123 | + shyContent.setAuthor(json.getString("author")); | ||
| 124 | + //图文内容 | ||
| 125 | + shyContent.setContent_text(json.getString("content_text")); | ||
| 126 | + //创建时间 | ||
| 127 | + String contentTime = json.getString("contentTime"); | ||
| 104 | if (CommonUtils.isNotEmpty(contentTime)) { | 128 | if (CommonUtils.isNotEmpty(contentTime)) { |
| 105 | Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); | 129 | Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); |
| 106 | shyContent.setContent_time(timestamp); | 130 | shyContent.setContent_time(timestamp); |
| 107 | 131 | ||
| 108 | } | 132 | } |
| 109 | shyContent.setCreate_date(CommonUtils.getCurrentTime()); | 133 | shyContent.setCreate_date(CommonUtils.getCurrentTime()); |
| 110 | - shyContent.setCallback(json.getString("callback"));//回调地址 | ||
| 111 | - shyContent.setContent_url(json.getString("contentUrl"));//图文发布h5的url | ||
| 112 | - shyContent.setContent_pc_url(json.getString("contentPCUrl"));//图文发布pc的url | ||
| 113 | - shyContent.setSp_id(json.getInteger("spId"));//spid | ||
| 114 | - shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | ||
| 115 | - shyContent.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | 134 | + //回调地址 |
| 135 | + shyContent.setCallback(json.getString("callback")); | ||
| 136 | + //图文发布h5的url | ||
| 137 | + shyContent.setContent_url(json.getString("contentUrl")); | ||
| 138 | + //图文发布pc的url | ||
| 139 | + shyContent.setContent_pc_url(json.getString("contentPCUrl")); | ||
| 140 | + //spid | ||
| 141 | + shyContent.setSp_id(json.getInteger("spId")); | ||
| 142 | + //领取状态 | ||
| 143 | + shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE); | ||
| 144 | + //最后一次更新时间 | ||
| 145 | + shyContent.setLast_update(CommonUtils.getCurrentTime()); | ||
| 116 | boolean YorN = contentService.impotContent(shyContent); | 146 | boolean YorN = contentService.impotContent(shyContent); |
| 117 | if (YorN == true) { | 147 | if (YorN == true) { |
| 118 | return new ResponseBean(ErrorEnum.SUCCESS); | 148 | return new ResponseBean(ErrorEnum.SUCCESS); |
| @@ -120,8 +150,8 @@ public class ContentControllerApi { | @@ -120,8 +150,8 @@ public class ContentControllerApi { | ||
| 120 | return new ResponseBean(ErrorEnum.ERROR); | 150 | return new ResponseBean(ErrorEnum.ERROR); |
| 121 | } | 151 | } |
| 122 | } | 152 | } |
| 123 | - | ||
| 124 | - | 153 | + |
| 154 | + | ||
| 125 | /** | 155 | /** |
| 126 | * @author liwei | 156 | * @author liwei |
| 127 | * @Date: 2019/05/15 11:17 | 157 | * @Date: 2019/05/15 11:17 |
| @@ -130,100 +160,99 @@ public class ContentControllerApi { | @@ -130,100 +160,99 @@ public class ContentControllerApi { | ||
| 130 | @PostMapping("/importMoment") | 160 | @PostMapping("/importMoment") |
| 131 | @ResponseBody | 161 | @ResponseBody |
| 132 | public ResponseBean impotMoment(@RequestBody String param) { | 162 | public ResponseBean impotMoment(@RequestBody String param) { |
| 133 | - logger.info("朋友圈入库，param=====" + param); | ||
| 134 | - JSONObject json = JSONObject.parseObject(param); | ||
| 135 | - //判断是否存在 | ||
| 136 | - ShyContent shyContent=new ShyContent(); | ||
| 137 | - shyContent.setContent_id(json.getString("momentId"));//朋友圈id | ||
| 138 | - shyContent.setContent_tag("moment");//朋友圈标签 | ||
| 139 | - List<ShyContent> contentList = contentService.findshyContent(shyContent); | ||
| 140 | - //获取审核类型 | ||
| 141 | - Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"moment"); | ||
| 142 | - | 163 | + logger.info("朋友圈入库，param=====" + param); |
| 164 | + JSONObject json = JSONObject.parseObject(param); | ||
| 165 | + //判断是否存在 | ||
| 166 | + ShyContent shyContent = new ShyContent(); | ||
| 167 | + shyContent.setContent_id(json.getString("momentId"));//朋友圈id | ||
| 168 | + shyContent.setContent_tag("moment");//朋友圈标签 | ||
| 169 | + List<ShyContent> contentList = contentService.findshyContent(shyContent); | ||
| 170 | + //获取审核类型 | ||
| 171 | + Integer shenheType = contentService.getShenheType(json.getInteger("spId"), "moment"); | ||
| 172 | + | ||
| 143 | //获取生活圈内容的类型 1：图片 2：视频 3：分享 | 173 | //获取生活圈内容的类型 1：图片 2：视频 3：分享 |
| 144 | Integer contentType = json.getInteger("contentType"); | 174 | Integer contentType = json.getInteger("contentType"); |
| 145 | - String contentImageUrl="";//内容图片地址 | ||
| 146 | - if(contentType!=null&&contentType==1){ | ||
| 147 | - JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl"));//朋友圈分享的内容的url | ||
| 148 | - for(int i=0;i<contentImageUrlList.size();i++){ | ||
| 149 | - JSONObject contentImageUrlMap = contentImageUrlList.getJSONObject(i); | ||
| 150 | - contentImageUrl+=contentImageUrlMap.getString("imageUrl")+","; | ||
| 151 | - } | ||
| 152 | - contentImageUrl=contentImageUrl.substring(0, contentImageUrl.length()-1);//去掉最后一个逗号 | ||
| 153 | - }else{ | ||
| 154 | - contentImageUrl=json.getString("contentImageUrl"); | 175 | + String contentImageUrl = "";//内容图片地址 |
| 176 | + if (contentType != null && contentType == 1) { | ||
| 177 | + JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl"));//朋友圈分享的内容的url | ||
| 178 | + for (int i = 0; i < contentImageUrlList.size(); i++) { | ||
| 179 | + JSONObject contentImageUrlMap = contentImageUrlList.getJSONObject(i); | ||
| 180 | + contentImageUrl += contentImageUrlMap.getString("imageUrl") + ","; | ||
| 181 | + } | ||
| 182 | + contentImageUrl = contentImageUrl.substring(0, contentImageUrl.length() - 1);//去掉最后一个逗号 | ||
| 183 | + } else { | ||
| 184 | + contentImageUrl = json.getString("contentImageUrl"); | ||
| 155 | } | 185 | } |
| 156 | - | ||
| 157 | - //存在则更新 | ||
| 158 | - if (contentList.size() > 0) { | ||
| 159 | - ShyContent shyContent1 = contentList.get(0); | ||
| 160 | - shyContent1.setTitle(json.getString("title"));//标题 | ||
| 161 | - shyContent1.setTitle_image(json.getString("image"));//用户头像 | ||
| 162 | - shyContent1.setShenhe_type(shenheType);//审核类型 | ||
| 163 | - String contentTime = json.getString("createTime");//朋友圈内容创建时间 | ||
| 164 | - if (CommonUtils.isNotEmpty(contentTime)) { | 186 | + |
| 187 | + //存在则更新 | ||
| 188 | + if (contentList.size() > 0) { | ||
| 189 | + ShyContent shyContent1 = contentList.get(0); | ||
| 190 | + shyContent1.setTitle(json.getString("title"));//标题 | ||
| 191 | + shyContent1.setTitle_image(json.getString("image"));//用户头像 | ||
| 192 | + shyContent1.setShenhe_type(shenheType);//审核类型 | ||
| 193 | + String contentTime = json.getString("createTime");//朋友圈内容创建时间 | ||
| 194 | + if (CommonUtils.isNotEmpty(contentTime)) { | ||
| 165 | // Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); | 195 | // Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); |
| 166 | - shyContent1.setContent_time(new Date(Long.valueOf(contentTime))); | ||
| 167 | - | ||
| 168 | - } | ||
| 169 | - shyContent1.setCreate_date(CommonUtils.getCurrentTime()); | ||
| 170 | - shyContent1.setCallback(json.getString("callbackUrl"));//回调地址 | ||
| 171 | - shyContent1.setContent_url(json.getString("pageUrl"));//朋友圈分享的url | ||
| 172 | - shyContent1.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔 | ||
| 173 | - shyContent1.setSp_id(json.getInteger("spId"));//spid | ||
| 174 | - shyContent1.setAuthor(json.getString("userId"));//用户id | ||
| 175 | - shyContent1.setSource(json.getString("nickName"));//用户昵称 | ||
| 176 | - shyContent1.setVideo_id(json.getString("videoId"));//关联videoId | ||
| 177 | - shyContent1.setContent_tag("moment");//图文标签 | ||
| 178 | - shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | ||
| 179 | - shyContent1.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | ||
| 180 | - | ||
| 181 | - | ||
| 182 | - | ||
| 183 | - boolean YorN = contentService.updateshyContent(shyContent1); | ||
| 184 | - if (YorN == true) { | ||
| 185 | - return new ResponseBean(ErrorEnum.SUCCESS); | ||
| 186 | - } else { | ||
| 187 | - return new ResponseBean(ErrorEnum.ERROR); | ||
| 188 | - } | ||
| 189 | - } | ||
| 190 | - //如果不存在直接插入 | ||
| 191 | - shyContent.setTitle(json.getString("title"));//标题 | ||
| 192 | - shyContent.setTitle_image(json.getString("image"));//用户头像 | ||
| 193 | - shyContent.setShenhe_type(shenheType);//审核类型 | ||
| 194 | - shyContent.setContent_status(1);//当前朋友圈内容的审核状态，先发后审 | ||
| 195 | - String contentTime = json.getString("createTime");//创建时间 | ||
| 196 | - if (CommonUtils.isNotEmpty(contentTime)) { | 196 | + shyContent1.setContent_time(new Date(Long.valueOf(contentTime))); |
| 197 | + | ||
| 198 | + } | ||
| 199 | + shyContent1.setCreate_date(CommonUtils.getCurrentTime()); | ||
| 200 | + shyContent1.setCallback(json.getString("callbackUrl"));//回调地址 | ||
| 201 | + shyContent1.setContent_url(json.getString("pageUrl"));//朋友圈分享的url | ||
| 202 | + shyContent1.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔 | ||
| 203 | + shyContent1.setSp_id(json.getInteger("spId"));//spid | ||
| 204 | + shyContent1.setAuthor(json.getString("userId"));//用户id | ||
| 205 | + shyContent1.setSource(json.getString("nickName"));//用户昵称 | ||
| 206 | + shyContent1.setVideo_id(json.getString("videoId"));//关联videoId | ||
| 207 | + shyContent1.setContent_tag("moment");//图文标签 | ||
| 208 | + shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | ||
| 209 | + shyContent1.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | ||
| 210 | + | ||
| 211 | + | ||
| 212 | + boolean YorN = contentService.updateshyContent(shyContent1); | ||
| 213 | + if (YorN == true) { | ||
| 214 | + return new ResponseBean(ErrorEnum.SUCCESS); | ||
| 215 | + } else { | ||
| 216 | + return new ResponseBean(ErrorEnum.ERROR); | ||
| 217 | + } | ||
| 218 | + } | ||
| 219 | + //如果不存在直接插入 | ||
| 220 | + shyContent.setTitle(json.getString("title"));//标题 | ||
| 221 | + shyContent.setTitle_image(json.getString("image"));//用户头像 | ||
| 222 | + shyContent.setShenhe_type(shenheType);//审核类型 | ||
| 223 | + shyContent.setContent_status(1);//当前朋友圈内容的审核状态，先发后审 | ||
| 224 | + String contentTime = json.getString("createTime");//创建时间 | ||
| 225 | + if (CommonUtils.isNotEmpty(contentTime)) { | ||
| 197 | // Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); | 226 | // Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); |
| 198 | - shyContent.setContent_time(new Date(Long.valueOf(contentTime))); | ||
| 199 | - | ||
| 200 | - } | ||
| 201 | - shyContent.setCreate_date(CommonUtils.getCurrentTime()); | ||
| 202 | - shyContent.setCallback(json.getString("callbackUrl"));//回调地址 | ||
| 203 | - shyContent.setContent_url(json.getString("pageUrl"));//朋友圈分享的url | ||
| 204 | - shyContent.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔 | ||
| 205 | - shyContent.setSp_id(json.getInteger("spId"));//spid | ||
| 206 | - shyContent.setAuthor(json.getString("userId"));//用户id | ||
| 207 | - shyContent.setSource(json.getString("nickName"));//用户昵称 | ||
| 208 | - shyContent.setVideo_id(json.getString("videoId"));//关联videoId | ||
| 209 | - shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | ||
| 210 | - shyContent.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | ||
| 211 | - boolean YorN = contentService.impotContent(shyContent); | ||
| 212 | - if (YorN == true) { | ||
| 213 | - return new ResponseBean(ErrorEnum.SUCCESS); | ||
| 214 | - } else { | ||
| 215 | - return new ResponseBean(ErrorEnum.ERROR); | ||
| 216 | - } | 227 | + shyContent.setContent_time(new Date(Long.valueOf(contentTime))); |
| 228 | + | ||
| 229 | + } | ||
| 230 | + shyContent.setCreate_date(CommonUtils.getCurrentTime()); | ||
| 231 | + shyContent.setCallback(json.getString("callbackUrl"));//回调地址 | ||
| 232 | + shyContent.setContent_url(json.getString("pageUrl"));//朋友圈分享的url | ||
| 233 | + shyContent.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔 | ||
| 234 | + shyContent.setSp_id(json.getInteger("spId"));//spid | ||
| 235 | + shyContent.setAuthor(json.getString("userId"));//用户id | ||
| 236 | + shyContent.setSource(json.getString("nickName"));//用户昵称 | ||
| 237 | + shyContent.setVideo_id(json.getString("videoId"));//关联videoId | ||
| 238 | + shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | ||
| 239 | + shyContent.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | ||
| 240 | + boolean YorN = contentService.impotContent(shyContent); | ||
| 241 | + if (YorN == true) { | ||
| 242 | + return new ResponseBean(ErrorEnum.SUCCESS); | ||
| 243 | + } else { | ||
| 244 | + return new ResponseBean(ErrorEnum.ERROR); | ||
| 245 | + } | ||
| 217 | } | 246 | } |
| 218 | - | 247 | + |
| 219 | @GetMapping("/detail/{id}.html") | 248 | @GetMapping("/detail/{id}.html") |
| 220 | - public Object getContentDetail(Model model, @PathVariable Integer id) { | ||
| 221 | - System.out.println("数美送审页面开始进入"); | ||
| 222 | - ShyContent content = contentService.selectByPrimaryKey(id); | ||
| 223 | - model.addAttribute("contentText", content.getContent_text()); | ||
| 224 | - model.addAttribute("contentTitle", content.getTitle()); | ||
| 225 | - return "html/contentPage.html"; | ||
| 226 | - } | ||
| 227 | - | 249 | + public Object getContentDetail(Model model, @PathVariable Integer id) { |
| 250 | + System.out.println("数美送审页面开始进入"); | ||
| 251 | + ShyContent content = contentService.selectByPrimaryKey(id); | ||
| 252 | + model.addAttribute("contentText", content.getContent_text()); | ||
| 253 | + model.addAttribute("contentTitle", content.getTitle()); | ||
| 254 | + return "html/contentPage.html"; | ||
| 255 | + } | ||
| 256 | + | ||
| 228 | 257 | ||
| 229 | } | 258 | } |
src/main/java/com/cnlive/shenhe/controller/AudioController.java
| @@ -98,7 +98,7 @@ public class AudioController extends BaseController { | @@ -98,7 +98,7 @@ public class AudioController extends BaseController { | ||
| 98 | if (CommonUtils.isNotNull(shySite)) { | 98 | if (CommonUtils.isNotNull(shySite)) { |
| 99 | spid = shySite.getSpid(); | 99 | spid = shySite.getSpid(); |
| 100 | } else { | 100 | } else { |
| 101 | - setmodel_site(model); | 101 | + setmodelSite(model); |
| 102 | return "error.html"; | 102 | return "error.html"; |
| 103 | } | 103 | } |
| 104 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | 104 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { |
| @@ -172,7 +172,7 @@ public class AudioController extends BaseController { | @@ -172,7 +172,7 @@ public class AudioController extends BaseController { | ||
| 172 | for (String cid : cids) { | 172 | for (String cid : cids) { |
| 173 | ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(cid)); | 173 | ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(cid)); |
| 174 | if (CommonUtils.isNotNull(shyAudio)) { | 174 | if (CommonUtils.isNotNull(shyAudio)) { |
| 175 | - if (shyAudio.getState() != CommonConst.AUDIT_INTT || shyAudio.getReceive()==CommonConst.RECEIVE_AFTER) { | 175 | + if (shyAudio.getState() != CommonConst.AUDIT_INTT || shyAudio.getReceive() == CommonConst.RECEIVE_AFTER) { |
| 176 | return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试"); | 176 | return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试"); |
| 177 | } | 177 | } |
| 178 | } else { | 178 | } else { |
| @@ -202,7 +202,7 @@ public class AudioController extends BaseController { | @@ -202,7 +202,7 @@ public class AudioController extends BaseController { | ||
| 202 | String[] cids = ids.split(","); | 202 | String[] cids = ids.split(","); |
| 203 | for (String cid : cids) { | 203 | for (String cid : cids) { |
| 204 | ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(cid)); | 204 | ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(cid)); |
| 205 | - if (shyAudio.getState() != CommonConst.AUDIT_INTT || shyAudio.getReceive()==CommonConst.RECEIVE_BEFORE || !shyAudio.getReceive_user_id().equals(userId)) { | 205 | + if (shyAudio.getState() != CommonConst.AUDIT_INTT || shyAudio.getReceive() == CommonConst.RECEIVE_BEFORE || !shyAudio.getReceive_user_id().equals(userId)) { |
| 206 | return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的"); | 206 | return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的"); |
| 207 | } | 207 | } |
| 208 | } | 208 | } |
| @@ -342,7 +342,7 @@ public class AudioController extends BaseController { | @@ -342,7 +342,7 @@ public class AudioController extends BaseController { | ||
| 342 | cell = row.createCell(5);//列 | 342 | cell = row.createCell(5);//列 |
| 343 | //审核员需要做处理 | 343 | //审核员需要做处理 |
| 344 | if (shyAudioList.get(i).getState() != CommonConst.AUDIT_INTT) { | 344 | if (shyAudioList.get(i).getState() != CommonConst.AUDIT_INTT) { |
| 345 | - updater = CommonUtils.isEmpty(shyAudioList.get(i).getUploader()) || "null".equals(shyAudioList.get(i).getUploader())? "白名单":shyAudioList.get(i).getUploader(); | 345 | + updater = CommonUtils.isEmpty(shyAudioList.get(i).getUploader()) || "null".equals(shyAudioList.get(i).getUploader()) ? "白名单" : shyAudioList.get(i).getUploader(); |
| 346 | String auditor_id = shyAudioList.get(i).getAuditor_id(); | 346 | String auditor_id = shyAudioList.get(i).getAuditor_id(); |
| 347 | if (CommonUtils.isNotEmpty(auditor_id)) { | 347 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 348 | ShyUsers user = new ShyUsers(); | 348 | ShyUsers user = new ShyUsers(); |
| @@ -351,7 +351,7 @@ public class AudioController extends BaseController { | @@ -351,7 +351,7 @@ public class AudioController extends BaseController { | ||
| 351 | if (CommonUtils.isNotNull(user)) { | 351 | if (CommonUtils.isNotNull(user)) { |
| 352 | String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | 352 | String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); |
| 353 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | 353 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 354 | - updater = userName ; | 354 | + updater = userName; |
| 355 | } | 355 | } |
| 356 | } | 356 | } |
| 357 | } | 357 | } |
src/main/java/com/cnlive/shenhe/controller/BaseController.java
| 1 | package com.cnlive.shenhe.controller; | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | ||
| 3 | -import java.io.IOException; | 3 | +import com.cnlive.shenhe.bean.SessionUser; |
| 4 | +import org.springframework.ui.Model; | ||
| 5 | +import org.springframework.web.context.request.RequestContextHolder; | ||
| 6 | +import org.springframework.web.context.request.ServletRequestAttributes; | ||
| 4 | 7 | ||
| 5 | import javax.servlet.http.HttpServletRequest; | 8 | import javax.servlet.http.HttpServletRequest; |
| 6 | import javax.servlet.http.HttpServletResponse; | 9 | import javax.servlet.http.HttpServletResponse; |
| 7 | import javax.servlet.http.HttpSession; | 10 | import javax.servlet.http.HttpSession; |
| 8 | 11 | ||
| 9 | -import org.springframework.stereotype.Controller; | ||
| 10 | -import org.springframework.ui.Model; | ||
| 11 | -import org.springframework.web.bind.annotation.GetMapping; | ||
| 12 | -import org.springframework.web.bind.annotation.RequestMapping; | ||
| 13 | -import org.springframework.web.context.request.RequestContextHolder; | ||
| 14 | -import org.springframework.web.context.request.ServletRequestAttributes; | ||
| 15 | -import org.springframework.web.servlet.ModelAndView; | 12 | +public class BaseController { |
| 16 | 13 | ||
| 17 | -import com.cnlive.shenhe.bean.SessionUser; | ||
| 18 | -import com.cnlive.shenhe.utils.CommonUtils; | ||
| 19 | 14 | ||
| 20 | -@Controller | ||
| 21 | -public class BaseController { | 15 | + /** |
| 16 | + * 得到request对象 | ||
| 17 | + */ | ||
| 18 | + public HttpServletRequest getRequest() { | ||
| 19 | + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||
| 20 | + return request; | ||
| 21 | + } | ||
| 22 | 22 | ||
| 23 | - | ||
| 24 | - /** | ||
| 25 | - * 得到request对象 | ||
| 26 | - */ | ||
| 27 | - public HttpServletRequest getRequest() { | ||
| 28 | - HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); | ||
| 29 | - return request; | ||
| 30 | - } | ||
| 31 | - /** | ||
| 32 | - * 得到response对象 | ||
| 33 | - */ | ||
| 34 | - public HttpServletResponse getResponse() { | ||
| 35 | - HttpServletResponse response = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getResponse(); | ||
| 36 | - return response; | ||
| 37 | - } | ||
| 38 | - | ||
| 39 | - /** | ||
| 40 | - * 得到session对象 | ||
| 41 | - */ | ||
| 42 | - public HttpSession getsession() { | ||
| 43 | - HttpSession session = this.getRequest().getSession(); | ||
| 44 | - return session; | ||
| 45 | - } | ||
| 46 | - | ||
| 47 | - | ||
| 48 | - /** | ||
| 49 | - * 获取session中的用户 | ||
| 50 | - * @return | ||
| 51 | - */ | ||
| 52 | - public SessionUser getSessionUser(){ | ||
| 53 | - SessionUser sessionUser = (SessionUser) this.getsession().getAttribute(SessionUser.getSessionKey()); | ||
| 54 | - return sessionUser; | 23 | + /** |
| 24 | + * 得到response对象 | ||
| 25 | + */ | ||
| 26 | + public HttpServletResponse getResponse() { | ||
| 27 | + HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse(); | ||
| 28 | + return response; | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 得到session对象 | ||
| 33 | + */ | ||
| 34 | + public HttpSession getsession() { | ||
| 35 | + HttpSession session = this.getRequest().getSession(); | ||
| 36 | + return session; | ||
| 55 | } | 37 | } |
| 56 | - | 38 | + |
| 39 | + | ||
| 57 | /** | 40 | /** |
| 58 | - * 获取session中的用户id | 41 | + * 获取session中的用户 |
| 42 | + * | ||
| 59 | * @return | 43 | * @return |
| 60 | */ | 44 | */ |
| 61 | - public String getSessionUserId(){ | ||
| 62 | - SessionUser sessionUser = getSessionUser(); | ||
| 63 | - if(sessionUser != null) return sessionUser.getUserId(); | ||
| 64 | - return null; | 45 | + public SessionUser getSessionUser() { |
| 46 | + SessionUser sessionUser = (SessionUser) this.getsession().getAttribute(SessionUser.getSessionKey()); | ||
| 47 | + return sessionUser; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + /** | ||
| 51 | + * 设置用户session | ||
| 52 | + */ | ||
| 53 | + public void setSessionUser(SessionUser sessionUser) { | ||
| 54 | + this.getsession().setAttribute("", null); | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + /** | ||
| 58 | + * 设置报错页面显示信息——站点查询失败 | ||
| 59 | + * | ||
| 60 | + * @param model | ||
| 61 | + */ | ||
| 62 | + public void setmodelSite(Model model) { | ||
| 63 | + model.addAttribute("errorMessage", "站点查询失败，不存在此站点，请重新查询！"); | ||
| 64 | + model.addAttribute("remindMessage", "提示：站点查询请输入全称，不支持模糊查询"); | ||
| 65 | } | 65 | } |
| 66 | - | ||
| 67 | 66 | ||
| 68 | - /** | ||
| 69 | - * 设置用户session | ||
| 70 | - * @param teacher | ||
| 71 | - */ | ||
| 72 | - public void setSessionUser(SessionUser sessionUser){ | ||
| 73 | - this.getsession().setAttribute("",null); | ||
| 74 | - } | ||
| 75 | - | ||
| 76 | - /** | ||
| 77 | - * 设置报错页面显示信息——站点查询失败 | ||
| 78 | - * @param model | ||
| 79 | - */ | ||
| 80 | - public void setmodel_site(Model model){ | ||
| 81 | - model.addAttribute("errorMessage", "站点查询失败，不存在此站点，请重新查询！"); | ||
| 82 | - model.addAttribute("remindMessage", "提示：站点查询请输入全称，不支持模糊查询"); | ||
| 83 | - } | ||
| 84 | - /** | ||
| 85 | - * 设置报错页面显示信息——参数校验失败 | ||
| 86 | - * @param model | ||
| 87 | - * @param value 不能为空的参数 | ||
| 88 | - */ | ||
| 89 | - public void setmodel_param(Model model,String value){ | ||
| 90 | - model.addAttribute("errorMessage", "参数传递不能为空！"+value); | ||
| 91 | - model.addAttribute("remindMessage", "提示：请检查所传参数，存在非空参数未赋值"); | ||
| 92 | - } | ||
| 93 | - | ||
| 94 | - /** | ||
| 95 | - * 设置报错页面显示信息——入库结果失败 | ||
| 96 | - * @param model | ||
| 97 | - */ | ||
| 98 | - public void setmodel_result(Model model){ | ||
| 99 | - model.addAttribute("errorMessage", "数据入库失败，请重试！"); | ||
| 100 | - model.addAttribute("remindMessage", "提示：如连续两次以上入库失败，请联系开发人员"); | ||
| 101 | - } | ||
| 102 | - /** | ||
| 103 | - * 设置报错页面显示信息——权限不足 | ||
| 104 | - * @param model | ||
| 105 | - */ | ||
| 106 | - public void setmodel_limit(Model model){ | ||
| 107 | - model.addAttribute("errorMessage", "您没有此操作的权限，请重试或者联系管理员开通！"); | ||
| 108 | - } | ||
| 109 | - | 67 | + /** |
| 68 | + * 设置报错页面显示信息——参数校验失败 | ||
| 69 | + * | ||
| 70 | + * @param model | ||
| 71 | + * @param value 不能为空的参数 | ||
| 72 | + */ | ||
| 73 | + public void setmodelParam(Model model, String value) { | ||
| 74 | + model.addAttribute("errorMessage", "参数传递不能为空！" + value); | ||
| 75 | + model.addAttribute("remindMessage", "提示：请检查所传参数，存在非空参数未赋值"); | ||
| 76 | + } | ||
| 77 | + | ||
| 78 | + /** | ||
| 79 | + * 设置报错页面显示信息——入库结果失败 | ||
| 80 | + * | ||
| 81 | + * @param model | ||
| 82 | + */ | ||
| 83 | + public void setmodelResult(Model model) { | ||
| 84 | + model.addAttribute("errorMessage", "数据入库失败，请重试！"); | ||
| 85 | + model.addAttribute("remindMessage", "提示：如连续两次以上入库失败，请联系开发人员"); | ||
| 86 | + } | ||
| 87 | + | ||
| 88 | + | ||
| 110 | } | 89 | } |
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
| @@ -5,12 +5,9 @@ import com.cnlive.shenhe.bean.ErrorEnum; | @@ -5,12 +5,9 @@ import com.cnlive.shenhe.bean.ErrorEnum; | ||
| 5 | import com.cnlive.shenhe.bean.ResponseBean; | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | import com.cnlive.shenhe.bean.SessionUser; | 6 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | import com.cnlive.shenhe.entity.ShyChannel; | 7 | import com.cnlive.shenhe.entity.ShyChannel; |
| 8 | -import com.cnlive.shenhe.entity.ShyContent; | ||
| 9 | import com.cnlive.shenhe.entity.ShySites; | 8 | import com.cnlive.shenhe.entity.ShySites; |
| 10 | import com.cnlive.shenhe.entity.ShyUsers; | 9 | import com.cnlive.shenhe.entity.ShyUsers; |
| 11 | -import com.cnlive.shenhe.entity.ShyVideos; | ||
| 12 | import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl; | 10 | import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl; |
| 13 | -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; | ||
| 14 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 11 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 15 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | 12 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 16 | import com.cnlive.shenhe.utils.AuditPass; | 13 | import com.cnlive.shenhe.utils.AuditPass; |
| @@ -37,7 +34,7 @@ import java.util.Map; | @@ -37,7 +34,7 @@ import java.util.Map; | ||
| 37 | public class ChannelController extends BaseController { | 34 | public class ChannelController extends BaseController { |
| 38 | private static Logger logger = LoggerFactory.getLogger(ChannelController.class); | 35 | private static Logger logger = LoggerFactory.getLogger(ChannelController.class); |
| 39 | @Value("${spring.localhost.url}") | 36 | @Value("${spring.localhost.url}") |
| 40 | - private String localhost_url;//本机地址 | 37 | + private String localhost_url;//本机地址 |
| 41 | @Autowired | 38 | @Autowired |
| 42 | AuditPass Pass; | 39 | AuditPass Pass; |
| 43 | @Autowired | 40 | @Autowired |
| @@ -45,47 +42,43 @@ public class ChannelController extends BaseController { | @@ -45,47 +42,43 @@ public class ChannelController extends BaseController { | ||
| 45 | 42 | ||
| 46 | @Autowired | 43 | @Autowired |
| 47 | UsersServiceImpl usersService; | 44 | UsersServiceImpl usersService; |
| 48 | - | 45 | + |
| 49 | @Autowired | 46 | @Autowired |
| 50 | SitesServiceImpl sitesService; | 47 | SitesServiceImpl sitesService; |
| 51 | 48 | ||
| 52 | - /** | ||
| 53 | - * 评论列表页 | ||
| 54 | - * | ||
| 55 | - * @param model | ||
| 56 | - * @param channelId | ||
| 57 | - * @param channelName | ||
| 58 | - * @param offline | ||
| 59 | - * @param start_date | ||
| 60 | - * @param end_date | ||
| 61 | - * @param state | ||
| 62 | - * @param sp_desc | ||
| 63 | - * @param page | ||
| 64 | - * @param pageSize | ||
| 65 | - * @param orderByClause | ||
| 66 | - * @param session | ||
| 67 | - * @return | ||
| 68 | - */ | 49 | + /** |
| 50 | + * 评论列表页 | ||
| 51 | + * | ||
| 52 | + * @param model | ||
| 53 | + * @param start_date | ||
| 54 | + * @param end_date | ||
| 55 | + * @param sp_desc | ||
| 56 | + * @param page | ||
| 57 | + * @param pageSize | ||
| 58 | + * @param orderByClause | ||
| 59 | + * @param session | ||
| 60 | + * @return | ||
| 61 | + */ | ||
| 69 | @GetMapping("/page") | 62 | @GetMapping("/page") |
| 70 | public String getPage(Model model, String channel_id, String channel_name, Integer receive, | 63 | public String getPage(Model model, String channel_id, String channel_name, Integer receive, |
| 71 | - String start_date, String end_date,Integer shenhe_status, String sp_desc, | 64 | + String start_date, String end_date, Integer shenhe_status, String sp_desc, |
| 72 | Integer page, Integer pageSize, String orderByClause, HttpSession session) { | 65 | Integer page, Integer pageSize, String orderByClause, HttpSession session) { |
| 73 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 66 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 74 | - if(CommonUtils.isNull(sessionUser)){ | ||
| 75 | - return "redirect:/users/login"; | 67 | + if (CommonUtils.isNull(sessionUser)) { |
| 68 | + return "redirect:/users/login"; | ||
| 76 | } | 69 | } |
| 77 | Integer spid = sessionUser.getSpid(); | 70 | Integer spid = sessionUser.getSpid(); |
| 78 | String userId = sessionUser.getUserId(); | 71 | String userId = sessionUser.getUserId(); |
| 79 | if (CommonUtils.isNull(page)) page = 1; | 72 | if (CommonUtils.isNull(page)) page = 1; |
| 80 | if (CommonUtils.isNull(pageSize)) pageSize = 10; | 73 | if (CommonUtils.isNull(pageSize)) pageSize = 10; |
| 81 | if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | 74 | if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { |
| 82 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | ||
| 83 | - if(CommonUtils.isNotNull(shySite)){ | ||
| 84 | - spid = shySite.getSpid(); | ||
| 85 | - }else{ | ||
| 86 | - setmodel_site(model); | ||
| 87 | - return "error.html"; | ||
| 88 | - } | 75 | + ShySites shySite = sitesService.findspidBySpdesc(sp_desc); |
| 76 | + if (CommonUtils.isNotNull(shySite)) { | ||
| 77 | + spid = shySite.getSpid(); | ||
| 78 | + } else { | ||
| 79 | + setmodelSite(model); | ||
| 80 | + return "error.html"; | ||
| 81 | + } | ||
| 89 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | 82 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { |
| 90 | spid = null; | 83 | spid = null; |
| 91 | } | 84 | } |
| @@ -108,31 +101,31 @@ public class ChannelController extends BaseController { | @@ -108,31 +101,31 @@ public class ChannelController extends BaseController { | ||
| 108 | List<ShyChannel> list = channelPage.getList(); | 101 | List<ShyChannel> list = channelPage.getList(); |
| 109 | if (!list.isEmpty()) { | 102 | if (!list.isEmpty()) { |
| 110 | for (ShyChannel channel : list) { | 103 | for (ShyChannel channel : list) { |
| 111 | - if (channel.getShenhe_status() != CommonConst.AUDIT_INTT) { | ||
| 112 | - String updater = CommonUtils.isEmpty(channel.getUpdater()) || "null".equals(channel.getUpdater())? "白名单":channel.getUpdater(); | 104 | + if (!channel.getShenhe_status().equals(CommonConst.AUDIT_INTT)) { |
| 105 | + String updater = CommonUtils.isEmpty(channel.getUpdater()) || "null".equals(channel.getUpdater()) ? "白名单" : channel.getUpdater(); | ||
| 113 | String auditor_id = channel.getAuditor(); | 106 | String auditor_id = channel.getAuditor(); |
| 114 | if (CommonUtils.isNotEmpty(auditor_id)) { | 107 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 115 | ShyUsers user = new ShyUsers(); | 108 | ShyUsers user = new ShyUsers(); |
| 116 | user.setUser_id(auditor_id); | 109 | user.setUser_id(auditor_id); |
| 117 | user = usersService.select(user); | 110 | user = usersService.select(user); |
| 118 | if (CommonUtils.isNotNull(user)) { | 111 | if (CommonUtils.isNotNull(user)) { |
| 119 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | 112 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); |
| 120 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | 113 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 121 | - updater = userName ; | 114 | + updater = userName; |
| 122 | } | 115 | } |
| 123 | } | 116 | } |
| 124 | channel.setUpdater(updater); | 117 | channel.setUpdater(updater); |
| 125 | } | 118 | } |
| 126 | - if(null!=channel.getSp_id()){ | ||
| 127 | - //显示spid简称 | ||
| 128 | - ShySites shySites = sitesService.findspidDescByspid(channel.getSp_id()); | ||
| 129 | - if (CommonUtils.isNotNull(shySites)) { | ||
| 130 | - channel.setSp_desc(shySites.getName()); | ||
| 131 | - } | ||
| 132 | - }else{ | ||
| 133 | - channel.setSp_desc("sp无法显示"); | 119 | + if (null != channel.getSp_id()) { |
| 120 | + //显示spid简称 | ||
| 121 | + ShySites shySites = sitesService.findspidDescByspid(channel.getSp_id()); | ||
| 122 | + if (CommonUtils.isNotNull(shySites)) { | ||
| 123 | + channel.setSp_desc(shySites.getName()); | ||
| 124 | + } | ||
| 125 | + } else { | ||
| 126 | + channel.setSp_desc("sp无法显示"); | ||
| 134 | } | 127 | } |
| 135 | - | 128 | + |
| 136 | } | 129 | } |
| 137 | } | 130 | } |
| 138 | /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/ | 131 | /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/ |
| @@ -168,7 +161,7 @@ public class ChannelController extends BaseController { | @@ -168,7 +161,7 @@ public class ChannelController extends BaseController { | ||
| 168 | public ResponseBean pass(String ids, HttpSession session) { | 161 | public ResponseBean pass(String ids, HttpSession session) { |
| 169 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 162 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 170 | String userId = sessionUser.getUserId(); | 163 | String userId = sessionUser.getUserId(); |
| 171 | - boolean success = channelService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId,"","审核通过"); | 164 | + boolean success = channelService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId, "", "审核通过"); |
| 172 | if (success) { | 165 | if (success) { |
| 173 | return new ResponseBean(); | 166 | return new ResponseBean(); |
| 174 | } else { | 167 | } else { |
| @@ -187,7 +180,7 @@ public class ChannelController extends BaseController { | @@ -187,7 +180,7 @@ public class ChannelController extends BaseController { | ||
| 187 | public ResponseBean refuse(String ids, String msg, HttpSession session) { | 180 | public ResponseBean refuse(String ids, String msg, HttpSession session) { |
| 188 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 181 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 189 | String userId = sessionUser.getUserId(); | 182 | String userId = sessionUser.getUserId(); |
| 190 | - boolean success = channelService.updateState(ids, CommonConst.AUDIT_REFUSE, userId,"",msg); | 183 | + boolean success = channelService.updateState(ids, CommonConst.AUDIT_REFUSE, userId, "", msg); |
| 191 | if (success) { | 184 | if (success) { |
| 192 | return new ResponseBean(); | 185 | return new ResponseBean(); |
| 193 | } else { | 186 | } else { |
| @@ -255,8 +248,8 @@ public class ChannelController extends BaseController { | @@ -255,8 +248,8 @@ public class ChannelController extends BaseController { | ||
| 255 | } | 248 | } |
| 256 | return responseBean; | 249 | return responseBean; |
| 257 | } | 250 | } |
| 258 | - | ||
| 259 | - | 251 | + |
| 252 | + | ||
| 260 | /** | 253 | /** |
| 261 | * @Auther: liwei | 254 | * @Auther: liwei |
| 262 | * @Date: 2019/08/17 11:17 | 255 | * @Date: 2019/08/17 11:17 |
| @@ -264,20 +257,20 @@ public class ChannelController extends BaseController { | @@ -264,20 +257,20 @@ public class ChannelController extends BaseController { | ||
| 264 | */ | 257 | */ |
| 265 | @GetMapping("/channelNotice") | 258 | @GetMapping("/channelNotice") |
| 266 | @ResponseBody | 259 | @ResponseBody |
| 267 | - public Map<String,Object> channelNotice() { | ||
| 268 | - Map<String,Object> map=new HashMap<>(); | ||
| 269 | - ShyChannel shyChannel = new ShyChannel(); | 260 | + public Map<String, Object> channelNotice() { |
| 261 | + Map<String, Object> map = new HashMap<>(); | ||
| 262 | + ShyChannel shyChannel = new ShyChannel(); | ||
| 270 | shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审 | 263 | shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审 |
| 271 | shyChannel.setShenhe_status(CommonConst.AUDIT_INTT); | 264 | shyChannel.setShenhe_status(CommonConst.AUDIT_INTT); |
| 272 | List<ShyChannel> channelList = channelService.findshyChannel(shyChannel); | 265 | List<ShyChannel> channelList = channelService.findshyChannel(shyChannel); |
| 273 | if (channelList.size() > 0) { | 266 | if (channelList.size() > 0) { |
| 274 | - logger.info("您有"+channelList.size()+"条新的频道审核申请，请注意查看！"); | ||
| 275 | - map.put("id", "1");//第一个提示框，避免冲突 | ||
| 276 | - map.put("title", "新频道审核通知"); | ||
| 277 | - map.put("content","您有"+channelList.size()+"条新的频道审核申请，请注意查看！" ); | ||
| 278 | - map.put("url",localhost_url+"/channel/page?shenhe_status=0&receive=0" ); | ||
| 279 | - return map; | 267 | + logger.info("您有" + channelList.size() + "条新的频道审核申请，请注意查看！"); |
| 268 | + map.put("id", "1");//第一个提示框，避免冲突 | ||
| 269 | + map.put("title", "新频道审核通知"); | ||
| 270 | + map.put("content", "您有" + channelList.size() + "条新的频道审核申请，请注意查看！"); | ||
| 271 | + map.put("url", localhost_url + "/channel/page?shenhe_status=0&receive=0"); | ||
| 272 | + return map; | ||
| 280 | } | 273 | } |
| 281 | - return null; | ||
| 282 | - } | 274 | + return null; |
| 275 | + } | ||
| 283 | } | 276 | } |
src/main/java/com/cnlive/shenhe/controller/ContentController.java
| 1 | package com.cnlive.shenhe.controller; | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | ||
| 3 | -import com.alibaba.fastjson.JSONObject; | ||
| 4 | import com.cnlive.shenhe.bean.ErrorEnum; | 3 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | import com.cnlive.shenhe.bean.ResponseBean; | 4 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | import com.cnlive.shenhe.bean.SessionUser; | 5 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | -import com.cnlive.shenhe.entity.ShyComments; | ||
| 8 | import com.cnlive.shenhe.entity.ShyContent; | 6 | import com.cnlive.shenhe.entity.ShyContent; |
| 9 | -import com.cnlive.shenhe.entity.ShyLive; | ||
| 10 | import com.cnlive.shenhe.entity.ShySites; | 7 | import com.cnlive.shenhe.entity.ShySites; |
| 11 | import com.cnlive.shenhe.entity.ShyUsers; | 8 | import com.cnlive.shenhe.entity.ShyUsers; |
| 12 | -import com.cnlive.shenhe.entity.ShyVideos; | ||
| 13 | -import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; | ||
| 14 | import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; | 9 | import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; |
| 15 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 10 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 16 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | 11 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 17 | -import com.cnlive.shenhe.utils.AuditPass; | ||
| 18 | import com.cnlive.shenhe.utils.CommonConst; | 12 | import com.cnlive.shenhe.utils.CommonConst; |
| 19 | import com.cnlive.shenhe.utils.CommonUtils; | 13 | import com.cnlive.shenhe.utils.CommonUtils; |
| 20 | import com.github.pagehelper.PageInfo; | 14 | import com.github.pagehelper.PageInfo; |
| 21 | - | ||
| 22 | import org.apache.poi.xssf.usermodel.XSSFCell; | 15 | import org.apache.poi.xssf.usermodel.XSSFCell; |
| 23 | import org.apache.poi.xssf.usermodel.XSSFRow; | 16 | import org.apache.poi.xssf.usermodel.XSSFRow; |
| 24 | import org.apache.poi.xssf.usermodel.XSSFSheet; | 17 | import org.apache.poi.xssf.usermodel.XSSFSheet; |
| 25 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; | 18 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
| 26 | -import org.slf4j.Logger; | ||
| 27 | -import org.slf4j.LoggerFactory; | ||
| 28 | import org.springframework.beans.factory.annotation.Autowired; | 19 | import org.springframework.beans.factory.annotation.Autowired; |
| 29 | import org.springframework.stereotype.Controller; | 20 | import org.springframework.stereotype.Controller; |
| 30 | import org.springframework.ui.Model; | 21 | import org.springframework.ui.Model; |
| @@ -33,12 +24,7 @@ import org.springframework.web.bind.annotation.*; | @@ -33,12 +24,7 @@ import org.springframework.web.bind.annotation.*; | ||
| 33 | import javax.servlet.ServletOutputStream; | 24 | import javax.servlet.ServletOutputStream; |
| 34 | import javax.servlet.http.HttpServletResponse; | 25 | import javax.servlet.http.HttpServletResponse; |
| 35 | import javax.servlet.http.HttpSession; | 26 | import javax.servlet.http.HttpSession; |
| 36 | - | ||
| 37 | -import java.io.BufferedInputStream; | ||
| 38 | -import java.io.BufferedOutputStream; | ||
| 39 | -import java.io.ByteArrayInputStream; | ||
| 40 | -import java.io.ByteArrayOutputStream; | ||
| 41 | -import java.io.InputStream; | 27 | +import java.io.*; |
| 42 | import java.util.Date; | 28 | import java.util.Date; |
| 43 | import java.util.List; | 29 | import java.util.List; |
| 44 | 30 | ||
| @@ -46,11 +32,6 @@ import java.util.List; | @@ -46,11 +32,6 @@ import java.util.List; | ||
| 46 | @Controller | 32 | @Controller |
| 47 | @RequestMapping("/content") | 33 | @RequestMapping("/content") |
| 48 | public class ContentController extends BaseController { | 34 | public class ContentController extends BaseController { |
| 49 | - private static Logger logger = LoggerFactory.getLogger(ContentController.class); | ||
| 50 | - @Autowired | ||
| 51 | - AuditPass Pass; | ||
| 52 | - @Autowired | ||
| 53 | - CommentsServiceImpl commentsService; | ||
| 54 | @Autowired | 35 | @Autowired |
| 55 | ContentServiceImpl contentService; | 36 | ContentServiceImpl contentService; |
| 56 | @Autowired | 37 | @Autowired |
| @@ -79,25 +60,25 @@ public class ContentController extends BaseController { | @@ -79,25 +60,25 @@ public class ContentController extends BaseController { | ||
| 79 | * @return | 60 | * @return |
| 80 | */ | 61 | */ |
| 81 | @GetMapping("/page") | 62 | @GetMapping("/page") |
| 82 | - public String getPage(Model model, String title,String contentId, String content_tag, | ||
| 83 | - String start_date, String end_date, Integer receive_status, String sp_desc,String source,String author, | 63 | + public String getPage(Model model, String title, String contentId, String content_tag, |
| 64 | + String start_date, String end_date, Integer receive_status, String sp_desc, String source, String author, | ||
| 84 | Integer page, Integer pageSize, String orderByClause, HttpSession session) { | 65 | Integer page, Integer pageSize, String orderByClause, HttpSession session) { |
| 85 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 66 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 86 | - if(CommonUtils.isNull(sessionUser)){ | ||
| 87 | - return "redirect:/users/login"; | 67 | + if (CommonUtils.isNull(sessionUser)) { |
| 68 | + return "redirect:/users/login"; | ||
| 88 | } | 69 | } |
| 89 | Integer spid = sessionUser.getSpid(); | 70 | Integer spid = sessionUser.getSpid(); |
| 90 | String userId = sessionUser.getUserId(); | 71 | String userId = sessionUser.getUserId(); |
| 91 | if (CommonUtils.isNull(page)) page = 1; | 72 | if (CommonUtils.isNull(page)) page = 1; |
| 92 | if (CommonUtils.isNull(pageSize)) pageSize = 10; | 73 | if (CommonUtils.isNull(pageSize)) pageSize = 10; |
| 93 | if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | 74 | if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { |
| 94 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | ||
| 95 | - if(CommonUtils.isNotNull(shySite)){ | ||
| 96 | - spid = shySite.getSpid(); | ||
| 97 | - }else{ | ||
| 98 | - setmodel_site(model); | ||
| 99 | - return "error.html"; | ||
| 100 | - } | 75 | + ShySites shySite = sitesService.findspidBySpdesc(sp_desc); |
| 76 | + if (CommonUtils.isNotNull(shySite)) { | ||
| 77 | + spid = shySite.getSpid(); | ||
| 78 | + } else { | ||
| 79 | + setmodelSite(model); | ||
| 80 | + return "error.html"; | ||
| 81 | + } | ||
| 101 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | 82 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { |
| 102 | spid = null; | 83 | spid = null; |
| 103 | } | 84 | } |
| @@ -116,20 +97,20 @@ public class ContentController extends BaseController { | @@ -116,20 +97,20 @@ public class ContentController extends BaseController { | ||
| 116 | } catch (Exception e) { | 97 | } catch (Exception e) { |
| 117 | } | 98 | } |
| 118 | } | 99 | } |
| 119 | - PageInfo<ShyContent> contentPage = contentService.getPage( title,source,author,content_tag,contentId, sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId); | 100 | + PageInfo<ShyContent> contentPage = contentService.getPage(title, source, author, content_tag, contentId, sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId); |
| 120 | List<ShyContent> list = contentPage.getList(); | 101 | List<ShyContent> list = contentPage.getList(); |
| 121 | if (!list.isEmpty()) { | 102 | if (!list.isEmpty()) { |
| 122 | for (ShyContent content : list) { | 103 | for (ShyContent content : list) { |
| 123 | if (content.getReceive_status() == CommonConst.RECEIVE_AUDIT) { | 104 | if (content.getReceive_status() == CommonConst.RECEIVE_AUDIT) { |
| 124 | - String auditor_id = content.getAuditor_id(); | ||
| 125 | - String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater())? "白名单":content.getUpdater(); | ||
| 126 | - updater =sitesService.getUpdater(updater,auditor_id); | 105 | + String auditor_id = content.getAuditor_id(); |
| 106 | + String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater(); | ||
| 107 | + updater = sitesService.getUpdater(updater, auditor_id); | ||
| 127 | content.setUpdater(updater); | 108 | content.setUpdater(updater); |
| 128 | } | 109 | } |
| 129 | //显示spid简称 | 110 | //显示spid简称 |
| 130 | ShySites shySites = sitesService.findspidDescByspid(content.getSp_id()); | 111 | ShySites shySites = sitesService.findspidDescByspid(content.getSp_id()); |
| 131 | if (CommonUtils.isNotNull(shySites)) { | 112 | if (CommonUtils.isNotNull(shySites)) { |
| 132 | - content.setSp_desc(shySites.getName()); | 113 | + content.setSp_desc(shySites.getName()); |
| 133 | } | 114 | } |
| 134 | } | 115 | } |
| 135 | } | 116 | } |
| @@ -146,20 +127,20 @@ public class ContentController extends BaseController { | @@ -146,20 +127,20 @@ public class ContentController extends BaseController { | ||
| 146 | */ | 127 | */ |
| 147 | @GetMapping("/details/{id}") | 128 | @GetMapping("/details/{id}") |
| 148 | public String getDetailsComments(@PathVariable Integer id, Model model) { | 129 | public String getDetailsComments(@PathVariable Integer id, Model model) { |
| 149 | - ShyContent content = contentService.getDetailsContent(id); | ||
| 150 | - if (content.getReceive_status() != CommonConst.RECEIVE_BEFORE) { | ||
| 151 | - String auditor_id = content.getAuditor_id(); | ||
| 152 | - String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater())? "白名单":content.getUpdater(); | ||
| 153 | - updater =sitesService.getUpdater(updater,auditor_id); | 130 | + ShyContent content = contentService.getDetailsContent(id); |
| 131 | + if (content.getReceive_status() != CommonConst.RECEIVE_BEFORE) { | ||
| 132 | + String auditor_id = content.getAuditor_id(); | ||
| 133 | + String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater(); | ||
| 134 | + updater = sitesService.getUpdater(updater, auditor_id); | ||
| 154 | content.setUpdater(updater); | 135 | content.setUpdater(updater); |
| 155 | } | 136 | } |
| 156 | - //朋友圈内容切割内容图片或者视频地址 | ||
| 157 | - if(content.getContent_tag().equals("moment")){ | ||
| 158 | - String[] contentImageUrlList=null; | ||
| 159 | - if(content.getContent_pc_url()!=null){ | ||
| 160 | - contentImageUrlList=content.getContent_pc_url().split(","); | ||
| 161 | - } | ||
| 162 | - model.addAttribute("contentImageUrlList", contentImageUrlList); | 137 | + //朋友圈内容切割内容图片或者视频地址 |
| 138 | + if (content.getContent_tag().equals("moment")) { | ||
| 139 | + String[] contentImageUrlList = null; | ||
| 140 | + if (content.getContent_pc_url() != null) { | ||
| 141 | + contentImageUrlList = content.getContent_pc_url().split(","); | ||
| 142 | + } | ||
| 143 | + model.addAttribute("contentImageUrlList", contentImageUrlList); | ||
| 163 | } | 144 | } |
| 164 | model.addAttribute("content", content); | 145 | model.addAttribute("content", content); |
| 165 | return "page/contentDetail.html"; | 146 | return "page/contentDetail.html"; |
| @@ -177,11 +158,11 @@ public class ContentController extends BaseController { | @@ -177,11 +158,11 @@ public class ContentController extends BaseController { | ||
| 177 | public ResponseBean pass(String ids, HttpSession session) { | 158 | public ResponseBean pass(String ids, HttpSession session) { |
| 178 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 159 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 179 | String userId = sessionUser.getUserId(); | 160 | String userId = sessionUser.getUserId(); |
| 180 | - boolean success =false; | 161 | + boolean success = false; |
| 181 | String[] contentIds = ids.split(","); | 162 | String[] contentIds = ids.split(","); |
| 182 | - for (String contentId : contentIds) { | ||
| 183 | - success = contentService.callback(contentId,"审核通过", CommonConst.AUDIT_SUCCESS, userId,""); | ||
| 184 | - } | 163 | + for (String contentId : contentIds) { |
| 164 | + success = contentService.callback(contentId, "审核通过", CommonConst.AUDIT_SUCCESS, userId, ""); | ||
| 165 | + } | ||
| 185 | if (success) { | 166 | if (success) { |
| 186 | return new ResponseBean(); | 167 | return new ResponseBean(); |
| 187 | } else { | 168 | } else { |
| @@ -197,14 +178,14 @@ public class ContentController extends BaseController { | @@ -197,14 +178,14 @@ public class ContentController extends BaseController { | ||
| 197 | */ | 178 | */ |
| 198 | @PostMapping("/refuse") | 179 | @PostMapping("/refuse") |
| 199 | @ResponseBody | 180 | @ResponseBody |
| 200 | - public ResponseBean refuse(String ids,String msg, HttpSession session) { | 181 | + public ResponseBean refuse(String ids, String msg, HttpSession session) { |
| 201 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 182 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 202 | String userId = sessionUser.getUserId(); | 183 | String userId = sessionUser.getUserId(); |
| 203 | - boolean success =false; | 184 | + boolean success = false; |
| 204 | String[] contentIds = ids.split(","); | 185 | String[] contentIds = ids.split(","); |
| 205 | - for (String contentId : contentIds) { | ||
| 206 | - success = contentService.callback(contentId,msg, CommonConst.AUDIT_REFUSE, userId,""); | ||
| 207 | - } | 186 | + for (String contentId : contentIds) { |
| 187 | + success = contentService.callback(contentId, msg, CommonConst.AUDIT_REFUSE, userId, ""); | ||
| 188 | + } | ||
| 208 | if (success) { | 189 | if (success) { |
| 209 | return new ResponseBean(); | 190 | return new ResponseBean(); |
| 210 | } else { | 191 | } else { |
| @@ -246,20 +227,19 @@ public class ContentController extends BaseController { | @@ -246,20 +227,19 @@ public class ContentController extends BaseController { | ||
| 246 | * 根据条件导出excel | 227 | * 根据条件导出excel |
| 247 | */ | 228 | */ |
| 248 | @GetMapping("excel") | 229 | @GetMapping("excel") |
| 249 | - public void getExcel( String title,String contentId, String content_tag, | ||
| 250 | - String start_date, String end_date, Integer receive_status, String sp_desc, | ||
| 251 | - Integer page, Integer pageSize, String orderByClause, HttpSession session,HttpServletResponse response) { | 230 | + public void getExcel(String title, String contentId, String content_tag, |
| 231 | + String start_date, String end_date, Integer receive_status, String sp_desc, | ||
| 232 | + Integer page, Integer pageSize, String orderByClause, HttpSession session, HttpServletResponse response) { | ||
| 252 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 233 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 253 | Integer spid = sessionUser.getSpid(); | 234 | Integer spid = sessionUser.getSpid(); |
| 254 | - String userId = sessionUser.getUserId(); | ||
| 255 | if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | 235 | if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { |
| 256 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | ||
| 257 | - if(CommonUtils.isNotNull(shySite)){ | ||
| 258 | - spid = shySite.getSpid(); | ||
| 259 | - } | ||
| 260 | - }else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | 236 | + ShySites shySite = sitesService.findspidBySpdesc(sp_desc); |
| 237 | + if (CommonUtils.isNotNull(shySite)) { | ||
| 238 | + spid = shySite.getSpid(); | ||
| 239 | + } | ||
| 240 | + } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | ||
| 261 | spid = null; | 241 | spid = null; |
| 262 | - } | 242 | + } |
| 263 | Date sDate = null; | 243 | Date sDate = null; |
| 264 | Date eDate = null; | 244 | Date eDate = null; |
| 265 | 245 | ||
| @@ -275,10 +255,10 @@ public class ContentController extends BaseController { | @@ -275,10 +255,10 @@ public class ContentController extends BaseController { | ||
| 275 | } catch (Exception e) { | 255 | } catch (Exception e) { |
| 276 | } | 256 | } |
| 277 | } | 257 | } |
| 278 | - List<ShyContent> contentList = contentService.findByCondition(title,content_tag,contentId, sDate, eDate, receive_status, page, pageSize, orderByClause, spid); | ||
| 279 | - | 258 | + List<ShyContent> contentList = contentService.findByCondition(title, content_tag, contentId, sDate, eDate, receive_status, page, pageSize, orderByClause, spid); |
| 259 | + | ||
| 280 | String fileName = "图文数据"; | 260 | String fileName = "图文数据"; |
| 281 | - | 261 | + |
| 282 | XSSFWorkbook wb = new XSSFWorkbook(); | 262 | XSSFWorkbook wb = new XSSFWorkbook(); |
| 283 | ServletOutputStream out = null; | 263 | ServletOutputStream out = null; |
| 284 | BufferedInputStream bis = null; | 264 | BufferedInputStream bis = null; |
| @@ -316,7 +296,7 @@ public class ContentController extends BaseController { | @@ -316,7 +296,7 @@ public class ContentController extends BaseController { | ||
| 316 | cell.setCellValue("作者（sid）"); | 296 | cell.setCellValue("作者（sid）"); |
| 317 | cell = row.createCell(14);//列 | 297 | cell = row.createCell(14);//列 |
| 318 | cell.setCellValue("图文url"); | 298 | cell.setCellValue("图文url"); |
| 319 | - | 299 | + |
| 320 | for (int i = 0; i < contentList.size(); i++) { | 300 | for (int i = 0; i < contentList.size(); i++) { |
| 321 | row = sheetlist.createRow((short) (i + 1));//行 | 301 | row = sheetlist.createRow((short) (i + 1));//行 |
| 322 | cell = row.createCell(0);//列 | 302 | cell = row.createCell(0);//列 |
| @@ -329,10 +309,10 @@ public class ContentController extends BaseController { | @@ -329,10 +309,10 @@ public class ContentController extends BaseController { | ||
| 329 | cell.setCellValue(contentList.get(i).getTitle()); | 309 | cell.setCellValue(contentList.get(i).getTitle()); |
| 330 | /*状态需要处理成用户可读*/ | 310 | /*状态需要处理成用户可读*/ |
| 331 | String contentTag = "";//图文标签 content：图文发布，moment：朋友圈 | 311 | String contentTag = "";//图文标签 content：图文发布，moment：朋友圈 |
| 332 | - if (contentList.get(i).getContent_tag().equals("content") ) { | ||
| 333 | - contentTag = "图文发布"; | 312 | + if (contentList.get(i).getContent_tag().equals("content")) { |
| 313 | + contentTag = "图文发布"; | ||
| 334 | } else if (contentList.get(i).getContent_tag().equals("moment")) { | 314 | } else if (contentList.get(i).getContent_tag().equals("moment")) { |
| 335 | - contentTag = "朋友圈"; | 315 | + contentTag = "朋友圈"; |
| 336 | } | 316 | } |
| 337 | cell = row.createCell(4);//列 | 317 | cell = row.createCell(4);//列 |
| 338 | cell.setCellValue(contentTag); | 318 | cell.setCellValue(contentTag); |
| @@ -340,11 +320,11 @@ public class ContentController extends BaseController { | @@ -340,11 +320,11 @@ public class ContentController extends BaseController { | ||
| 340 | /*状态需要处理成用户可读*/ | 320 | /*状态需要处理成用户可读*/ |
| 341 | String shenheType = "";//审核类型，1:免审，2:机审，3:人工审 | 321 | String shenheType = "";//审核类型，1:免审，2:机审，3:人工审 |
| 342 | if (contentList.get(i).getShenhe_type() == 1) { | 322 | if (contentList.get(i).getShenhe_type() == 1) { |
| 343 | - shenheType = "免审"; | 323 | + shenheType = "免审"; |
| 344 | } else if (contentList.get(i).getShenhe_type() == 2) { | 324 | } else if (contentList.get(i).getShenhe_type() == 2) { |
| 345 | - shenheType = "机审"; | 325 | + shenheType = "机审"; |
| 346 | } else { | 326 | } else { |
| 347 | - shenheType = "人工审"; | 327 | + shenheType = "人工审"; |
| 348 | } | 328 | } |
| 349 | cell = row.createCell(5);//列 | 329 | cell = row.createCell(5);//列 |
| 350 | cell.setCellValue(shenheType); | 330 | cell.setCellValue(shenheType); |
| @@ -352,56 +332,55 @@ public class ContentController extends BaseController { | @@ -352,56 +332,55 @@ public class ContentController extends BaseController { | ||
| 352 | /*状态需要处理成用户可读*/ | 332 | /*状态需要处理成用户可读*/ |
| 353 | String contentStatus = "";//内容状态:0:待发布,1:已发布,2:已下线，3:已删除 | 333 | String contentStatus = "";//内容状态:0:待发布,1:已发布,2:已下线，3:已删除 |
| 354 | if (contentList.get(i).getContent_status() == 0) { | 334 | if (contentList.get(i).getContent_status() == 0) { |
| 355 | - contentStatus = "待发布"; | 335 | + contentStatus = "待发布"; |
| 356 | } else if (contentList.get(i).getContent_status() == 1) { | 336 | } else if (contentList.get(i).getContent_status() == 1) { |
| 357 | - contentStatus = "已发布"; | ||
| 358 | - } else if(contentList.get(i).getContent_status() == 2){ | ||
| 359 | - contentStatus = "已下线"; | ||
| 360 | - }else if(contentList.get(i).getContent_status() == 3){ | ||
| 361 | - contentStatus = "已删除"; | 337 | + contentStatus = "已发布"; |
| 338 | + } else if (contentList.get(i).getContent_status() == 2) { | ||
| 339 | + contentStatus = "已下线"; | ||
| 340 | + } else if (contentList.get(i).getContent_status() == 3) { | ||
| 341 | + contentStatus = "已删除"; | ||
| 362 | } | 342 | } |
| 363 | - | 343 | + |
| 364 | cell = row.createCell(6);//列 | 344 | cell = row.createCell(6);//列 |
| 365 | cell.setCellValue(contentStatus); | 345 | cell.setCellValue(contentStatus); |
| 366 | cell = row.createCell(7);//列 | 346 | cell = row.createCell(7);//列 |
| 367 | - cell.setCellValue(contentList.get(i).getContent_time()==null?"":CommonUtils.formatDate(contentList.get(i).getContent_time(), "yyyy-MM-dd HH:mm:ss")); | 347 | + cell.setCellValue(contentList.get(i).getContent_time() == null ? "" : CommonUtils.formatDate(contentList.get(i).getContent_time(), "yyyy-MM-dd HH:mm:ss")); |
| 368 | cell = row.createCell(8);//列 | 348 | cell = row.createCell(8);//列 |
| 369 | - cell.setCellValue(contentList.get(i).getCreate_date()==null?"":CommonUtils.formatDate(contentList.get(i).getCreate_date(), "yyyy-MM-dd HH:mm:ss")); | 349 | + cell.setCellValue(contentList.get(i).getCreate_date() == null ? "" : CommonUtils.formatDate(contentList.get(i).getCreate_date(), "yyyy-MM-dd HH:mm:ss")); |
| 370 | 350 | ||
| 371 | /*状态需要处理成用户可读*/ | 351 | /*状态需要处理成用户可读*/ |
| 372 | String receiveStatus = "";//领取状态。0：未领取；1：已领取,2:已审核 | 352 | String receiveStatus = "";//领取状态。0：未领取；1：已领取,2:已审核 |
| 373 | if (contentList.get(i).getReceive_status() == 1) { | 353 | if (contentList.get(i).getReceive_status() == 1) { |
| 374 | - receiveStatus = "已领取"; | 354 | + receiveStatus = "已领取"; |
| 375 | } else if (contentList.get(i).getReceive_status() == 2) { | 355 | } else if (contentList.get(i).getReceive_status() == 2) { |
| 376 | - receiveStatus = "已审核"; | 356 | + receiveStatus = "已审核"; |
| 377 | } else { | 357 | } else { |
| 378 | - receiveStatus = "未领取"; | 358 | + receiveStatus = "未领取"; |
| 379 | } | 359 | } |
| 380 | - | 360 | + |
| 381 | cell = row.createCell(9);//列 | 361 | cell = row.createCell(9);//列 |
| 382 | cell.setCellValue(receiveStatus); | 362 | cell.setCellValue(receiveStatus); |
| 383 | 363 | ||
| 384 | /* 审核员需要做处理*/ | 364 | /* 审核员需要做处理*/ |
| 385 | String updater = "";//审核员名字 | 365 | String updater = "";//审核员名字 |
| 386 | if (contentList.get(i).getReceive_status() != CommonConst.RECEIVE_BEFORE) { | 366 | if (contentList.get(i).getReceive_status() != CommonConst.RECEIVE_BEFORE) { |
| 387 | - updater = CommonUtils.isEmpty(contentList.get(i).getUpdater()) || "null".equals(contentList.get(i).getUpdater())? "自动通过":contentList.get(i).getUpdater(); | 367 | + updater = CommonUtils.isEmpty(contentList.get(i).getUpdater()) || "null".equals(contentList.get(i).getUpdater()) ? "自动通过" : contentList.get(i).getUpdater(); |
| 388 | String auditor_id = contentList.get(i).getAuditor_id(); | 368 | String auditor_id = contentList.get(i).getAuditor_id(); |
| 389 | if (CommonUtils.isNotEmpty(auditor_id)) { | 369 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 390 | ShyUsers user = new ShyUsers(); | 370 | ShyUsers user = new ShyUsers(); |
| 391 | user.setUser_id(auditor_id); | 371 | user.setUser_id(auditor_id); |
| 392 | user = usersService.select(user); | 372 | user = usersService.select(user); |
| 393 | if (CommonUtils.isNotNull(user)) { | 373 | if (CommonUtils.isNotNull(user)) { |
| 394 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | 374 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); |
| 395 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | 375 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 396 | - updater = userName ; | 376 | + updater = userName; |
| 397 | } | 377 | } |
| 398 | } | 378 | } |
| 399 | } | 379 | } |
| 400 | cell = row.createCell(10);//列 | 380 | cell = row.createCell(10);//列 |
| 401 | cell.setCellValue(updater); | 381 | cell.setCellValue(updater); |
| 402 | - | ||
| 403 | - | ||
| 404 | - | 382 | + |
| 383 | + | ||
| 405 | cell = row.createCell(11);//列 | 384 | cell = row.createCell(11);//列 |
| 406 | cell.setCellValue(contentList.get(i).getShenhe_msg()); | 385 | cell.setCellValue(contentList.get(i).getShenhe_msg()); |
| 407 | cell = row.createCell(12);//列 | 386 | cell = row.createCell(12);//列 |
src/main/java/com/cnlive/shenhe/controller/EmailController.java
| @@ -5,9 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum; | @@ -5,9 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum; | ||
| 5 | import com.cnlive.shenhe.bean.ResponseBean; | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | import com.cnlive.shenhe.bean.SessionUser; | 6 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | import com.cnlive.shenhe.entity.ShyEmail; | 7 | import com.cnlive.shenhe.entity.ShyEmail; |
| 8 | -import com.cnlive.shenhe.entity.ShySites; | ||
| 9 | import com.cnlive.shenhe.entity.ShyUsers; | 8 | import com.cnlive.shenhe.entity.ShyUsers; |
| 10 | -import com.cnlive.shenhe.entity.ShyUsersfree; | ||
| 11 | import com.cnlive.shenhe.serviceImpl.EmailServiceImpl; | 9 | import com.cnlive.shenhe.serviceImpl.EmailServiceImpl; |
| 12 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 10 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 13 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | 11 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| @@ -15,22 +13,16 @@ import com.cnlive.shenhe.utils.CommonConst; | @@ -15,22 +13,16 @@ import com.cnlive.shenhe.utils.CommonConst; | ||
| 15 | import com.cnlive.shenhe.utils.CommonUtils; | 13 | import com.cnlive.shenhe.utils.CommonUtils; |
| 16 | import com.github.pagehelper.PageInfo; | 14 | import com.github.pagehelper.PageInfo; |
| 17 | 15 | ||
| 18 | -import org.jasig.cas.client.authentication.AttributePrincipal; | ||
| 19 | import org.springframework.beans.factory.annotation.Autowired; | 16 | import org.springframework.beans.factory.annotation.Autowired; |
| 20 | import org.springframework.stereotype.Controller; | 17 | import org.springframework.stereotype.Controller; |
| 21 | import org.springframework.ui.Model; | 18 | import org.springframework.ui.Model; |
| 22 | import org.springframework.web.bind.annotation.GetMapping; | 19 | import org.springframework.web.bind.annotation.GetMapping; |
| 23 | -import org.springframework.web.bind.annotation.PathVariable; | ||
| 24 | import org.springframework.web.bind.annotation.PostMapping; | 20 | import org.springframework.web.bind.annotation.PostMapping; |
| 25 | import org.springframework.web.bind.annotation.RequestMapping; | 21 | import org.springframework.web.bind.annotation.RequestMapping; |
| 26 | import org.springframework.web.bind.annotation.ResponseBody; | 22 | import org.springframework.web.bind.annotation.ResponseBody; |
| 27 | 23 | ||
| 28 | -import java.util.HashMap; | ||
| 29 | import java.util.List; | 24 | import java.util.List; |
| 30 | -import java.util.Map; | ||
| 31 | 25 | ||
| 32 | -import javax.print.attribute.HashAttributeSet; | ||
| 33 | -import javax.servlet.http.HttpServletRequest; | ||
| 34 | import javax.servlet.http.HttpSession; | 26 | import javax.servlet.http.HttpSession; |
| 35 | 27 | ||
| 36 | /** | 28 | /** |
| @@ -123,7 +115,7 @@ public class EmailController extends BaseController { | @@ -123,7 +115,7 @@ public class EmailController extends BaseController { | ||
| 123 | @PostMapping(value = "/write") | 115 | @PostMapping(value = "/write") |
| 124 | public String write(Model model,Integer id,String email,String remark, String[] write_business, HttpSession session, String redirect_url) { | 116 | public String write(Model model,Integer id,String email,String remark, String[] write_business, HttpSession session, String redirect_url) { |
| 125 | if(CommonUtils.isEmpty(email)&&CommonUtils.isEmpty(remark)){ | 117 | if(CommonUtils.isEmpty(email)&&CommonUtils.isEmpty(remark)){ |
| 126 | - setmodel_param(model,"email,remark不能为空"); | 118 | + setmodelParam(model,"email,remark不能为空"); |
| 127 | return "error.html"; | 119 | return "error.html"; |
| 128 | } | 120 | } |
| 129 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 121 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| @@ -138,7 +130,7 @@ public class EmailController extends BaseController { | @@ -138,7 +130,7 @@ public class EmailController extends BaseController { | ||
| 138 | if (success) { | 130 | if (success) { |
| 139 | return "redirect:" + redirect_url; | 131 | return "redirect:" + redirect_url; |
| 140 | } else { | 132 | } else { |
| 141 | - setmodel_result(model); | 133 | + setmodelResult(model); |
| 142 | return "error.html"; | 134 | return "error.html"; |
| 143 | } | 135 | } |
| 144 | } | 136 | } |
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
| @@ -4,17 +4,13 @@ import org.apache.poi.xssf.usermodel.XSSFCell; | @@ -4,17 +4,13 @@ import org.apache.poi.xssf.usermodel.XSSFCell; | ||
| 4 | import org.apache.poi.xssf.usermodel.XSSFRow; | 4 | import org.apache.poi.xssf.usermodel.XSSFRow; |
| 5 | import org.apache.poi.xssf.usermodel.XSSFSheet; | 5 | import org.apache.poi.xssf.usermodel.XSSFSheet; |
| 6 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; | 6 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
| 7 | -import com.alibaba.fastjson.JSON; | ||
| 8 | import com.alibaba.fastjson.JSONObject; | 7 | import com.alibaba.fastjson.JSONObject; |
| 9 | import com.cnlive.shenhe.bean.ErrorEnum; | 8 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 10 | import com.cnlive.shenhe.bean.ResponseBean; | 9 | import com.cnlive.shenhe.bean.ResponseBean; |
| 11 | import com.cnlive.shenhe.bean.SessionUser; | 10 | import com.cnlive.shenhe.bean.SessionUser; |
| 12 | -import com.cnlive.shenhe.entity.ShyChannel; | ||
| 13 | -import com.cnlive.shenhe.entity.ShyLive; | ||
| 14 | import com.cnlive.shenhe.entity.ShyLiveapply; | 11 | import com.cnlive.shenhe.entity.ShyLiveapply; |
| 15 | import com.cnlive.shenhe.entity.ShySites; | 12 | import com.cnlive.shenhe.entity.ShySites; |
| 16 | import com.cnlive.shenhe.entity.ShyUsers; | 13 | import com.cnlive.shenhe.entity.ShyUsers; |
| 17 | -import com.cnlive.shenhe.entity.ShyVideos; | ||
| 18 | import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl; | 14 | import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl; |
| 19 | import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; | 15 | import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; |
| 20 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 16 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| @@ -147,7 +143,7 @@ public class LiveApplyController extends BaseController { | @@ -147,7 +143,7 @@ public class LiveApplyController extends BaseController { | ||
| 147 | if(CommonUtils.isNotNull(shySite)){ | 143 | if(CommonUtils.isNotNull(shySite)){ |
| 148 | spid = shySite.getSpid(); | 144 | spid = shySite.getSpid(); |
| 149 | }else{ | 145 | }else{ |
| 150 | - setmodel_site(model); | 146 | + setmodelSite(model); |
| 151 | return "error.html"; | 147 | return "error.html"; |
| 152 | } | 148 | } |
| 153 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | 149 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { |
src/main/java/com/cnlive/shenhe/controller/LiveController.java
| @@ -5,7 +5,6 @@ import org.apache.poi.xssf.usermodel.XSSFCell; | @@ -5,7 +5,6 @@ import org.apache.poi.xssf.usermodel.XSSFCell; | ||
| 5 | import org.apache.poi.xssf.usermodel.XSSFRow; | 5 | import org.apache.poi.xssf.usermodel.XSSFRow; |
| 6 | import org.apache.poi.xssf.usermodel.XSSFSheet; | 6 | import org.apache.poi.xssf.usermodel.XSSFSheet; |
| 7 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; | 7 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
| 8 | -import com.alibaba.fastjson.JSON; | ||
| 9 | import com.alibaba.fastjson.JSONObject; | 8 | import com.alibaba.fastjson.JSONObject; |
| 10 | import com.cnlive.shenhe.bean.ErrorEnum; | 9 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 11 | import com.cnlive.shenhe.bean.ResponseBean; | 10 | import com.cnlive.shenhe.bean.ResponseBean; |
| @@ -13,7 +12,6 @@ import com.cnlive.shenhe.bean.SessionUser; | @@ -13,7 +12,6 @@ import com.cnlive.shenhe.bean.SessionUser; | ||
| 13 | import com.cnlive.shenhe.entity.ShyLive; | 12 | import com.cnlive.shenhe.entity.ShyLive; |
| 14 | import com.cnlive.shenhe.entity.ShySites; | 13 | import com.cnlive.shenhe.entity.ShySites; |
| 15 | import com.cnlive.shenhe.entity.ShyUsers; | 14 | import com.cnlive.shenhe.entity.ShyUsers; |
| 16 | -import com.cnlive.shenhe.entity.ShyVideos; | ||
| 17 | import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; | 15 | import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; |
| 18 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 16 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 19 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | 17 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| @@ -144,7 +142,7 @@ public class LiveController extends BaseController { | @@ -144,7 +142,7 @@ public class LiveController extends BaseController { | ||
| 144 | if (CommonUtils.isNotNull(shySite)) { | 142 | if (CommonUtils.isNotNull(shySite)) { |
| 145 | spid = shySite.getSpid(); | 143 | spid = shySite.getSpid(); |
| 146 | } else { | 144 | } else { |
| 147 | - setmodel_site(model); | 145 | + setmodelSite(model); |
| 148 | return "error.html"; | 146 | return "error.html"; |
| 149 | } | 147 | } |
| 150 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | 148 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { |
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
0 → 100644
| 1 | +package com.cnlive.shenhe.controller; | ||
| 2 | + | ||
| 3 | + | ||
| 4 | +import com.cnlive.shenhe.bean.ErrorEnum; | ||
| 5 | +import com.cnlive.shenhe.bean.ResponseBean; | ||
| 6 | +import com.cnlive.shenhe.dto.ShyActivityDTO; | ||
| 7 | +import com.cnlive.shenhe.entity.ShyActivity; | ||
| 8 | +import com.cnlive.shenhe.serviceImpl.ShyActivityImpl; | ||
| 9 | +import com.cnlive.shenhe.utils.CommonConst; | ||
| 10 | +import com.cnlive.shenhe.utils.CommonUtils; | ||
| 11 | +import com.github.pagehelper.PageInfo; | ||
| 12 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 13 | +import org.springframework.stereotype.Controller; | ||
| 14 | +import org.springframework.ui.Model; | ||
| 15 | +import org.springframework.web.bind.annotation.*; | ||
| 16 | + | ||
| 17 | +import java.util.Date; | ||
| 18 | +import java.util.List; | ||
| 19 | + | ||
| 20 | + | ||
| 21 | +/** | ||
| 22 | + * @author Administrator | ||
| 23 | + * @author yanzhaowang | ||
| 24 | + * @create 2022-03-08 12:37 | ||
| 25 | + */ | ||
| 26 | +@Controller | ||
| 27 | +@RequestMapping("/activity") | ||
| 28 | +public class ShyActivityController { | ||
| 29 | + @Autowired | ||
| 30 | + private ShyActivityImpl shyActivityImpl; | ||
| 31 | + | ||
| 32 | + @PostMapping("/add") | ||
| 33 | + @ResponseBody | ||
| 34 | + public ResponseBean insterShyActivity(ShyActivity shyActivity) { | ||
| 35 | + int i = shyActivityImpl.insertShyActivity(shyActivity); | ||
| 36 | + if (i > 0) { | ||
| 37 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前活动添加成功"); | ||
| 38 | + } | ||
| 39 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "添加失败，请重试"); | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + @PostMapping("/delete") | ||
| 43 | + @ResponseBody | ||
| 44 | + public ResponseBean deleteShyActivity(Integer id) { | ||
| 45 | + int i = shyActivityImpl.deleteShyActivity(id); | ||
| 46 | + if (i > 0) { | ||
| 47 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "删除当前活动成功"); | ||
| 48 | + } | ||
| 49 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "删除失败，请重试"); | ||
| 50 | + | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + @PostMapping("/update") | ||
| 54 | + @ResponseBody | ||
| 55 | + public ResponseBean updateShyActivity(ShyActivity shyActivity) { | ||
| 56 | + | ||
| 57 | + int i = shyActivityImpl.updateShyActivity(shyActivity); | ||
| 58 | + if (i > 0) { | ||
| 59 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "修改当前活动成功"); | ||
| 60 | + } | ||
| 61 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "修改失败，请重试"); | ||
| 62 | + | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + @GetMapping("/page") | ||
| 66 | + public String getShyActivity(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model, String activity, String exempt_from_trial) { | ||
| 67 | + PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(pageNum, pageSize, activity, exempt_from_trial); | ||
| 68 | + List<ShyActivity> list = shyActivityPageInfo.getList(); | ||
| 69 | + for (ShyActivity shyActivity : list) { | ||
| 70 | + model.addAttribute("shyActivity",shyActivity); | ||
| 71 | + } | ||
| 72 | + model.addAttribute("ShyActivitylist", shyActivityPageInfo); | ||
| 73 | + return "page/activity.html"; | ||
| 74 | + } | ||
| 75 | + | ||
| 76 | + | ||
| 77 | +} |
src/main/java/com/cnlive/shenhe/controller/SitesController.java
| @@ -50,7 +50,7 @@ public class SitesController extends BaseController { | @@ -50,7 +50,7 @@ public class SitesController extends BaseController { | ||
| 50 | } | 50 | } |
| 51 | Integer spid = sessionUser.getSpid(); | 51 | Integer spid = sessionUser.getSpid(); |
| 52 | if (!sessionUser.isMaster() && spid != 0) { | 52 | if (!sessionUser.isMaster() && spid != 0) { |
| 53 | - setmodel_site(model); | 53 | + setmodelSite(model); |
| 54 | return "error.html"; | 54 | return "error.html"; |
| 55 | } | 55 | } |
| 56 | if (spid == 0) spid = null; | 56 | if (spid == 0) spid = null; |
| @@ -98,7 +98,7 @@ public class SitesController extends BaseController { | @@ -98,7 +98,7 @@ public class SitesController extends BaseController { | ||
| 98 | if (success) { | 98 | if (success) { |
| 99 | return "redirect:" + redirect_url; | 99 | return "redirect:" + redirect_url; |
| 100 | } else { | 100 | } else { |
| 101 | - setmodel_result(model); | 101 | + setmodelResult(model); |
| 102 | return "error.html"; | 102 | return "error.html"; |
| 103 | } | 103 | } |
| 104 | } | 104 | } |
src/main/java/com/cnlive/shenhe/controller/TopicController.java
| 1 | package com.cnlive.shenhe.controller; | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | ||
| 3 | -import com.alibaba.fastjson.JSONObject; | ||
| 4 | import com.cnlive.shenhe.bean.ErrorEnum; | 3 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | import com.cnlive.shenhe.bean.ResponseBean; | 4 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | import com.cnlive.shenhe.bean.SessionUser; | 5 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | import com.cnlive.shenhe.entity.*; | 6 | import com.cnlive.shenhe.entity.*; |
| 8 | import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; | 7 | import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; |
| 9 | -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; | ||
| 10 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 8 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 11 | import com.cnlive.shenhe.serviceImpl.TopicServiceImpl; | 9 | import com.cnlive.shenhe.serviceImpl.TopicServiceImpl; |
| 12 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | 10 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 13 | import com.cnlive.shenhe.utils.AuditPass; | 11 | import com.cnlive.shenhe.utils.AuditPass; |
| 14 | import com.cnlive.shenhe.utils.CommonConst; | 12 | import com.cnlive.shenhe.utils.CommonConst; |
| 15 | import com.cnlive.shenhe.utils.CommonUtils; | 13 | import com.cnlive.shenhe.utils.CommonUtils; |
| 16 | -import com.cnlive.shenhe.utils.InfoUtil; | ||
| 17 | import com.github.pagehelper.PageInfo; | 14 | import com.github.pagehelper.PageInfo; |
| 18 | 15 | ||
| 19 | -import org.apache.poi.xssf.usermodel.XSSFCell; | ||
| 20 | -import org.apache.poi.xssf.usermodel.XSSFRow; | ||
| 21 | -import org.apache.poi.xssf.usermodel.XSSFSheet; | ||
| 22 | -import org.apache.poi.xssf.usermodel.XSSFWorkbook; | ||
| 23 | import org.slf4j.Logger; | 16 | import org.slf4j.Logger; |
| 24 | import org.slf4j.LoggerFactory; | 17 | import org.slf4j.LoggerFactory; |
| 25 | import org.springframework.beans.factory.annotation.Autowired; | 18 | import org.springframework.beans.factory.annotation.Autowired; |
| @@ -28,15 +21,8 @@ import org.springframework.stereotype.Controller; | @@ -28,15 +21,8 @@ import org.springframework.stereotype.Controller; | ||
| 28 | import org.springframework.ui.Model; | 21 | import org.springframework.ui.Model; |
| 29 | import org.springframework.web.bind.annotation.*; | 22 | import org.springframework.web.bind.annotation.*; |
| 30 | 23 | ||
| 31 | -import javax.servlet.ServletOutputStream; | ||
| 32 | -import javax.servlet.http.HttpServletResponse; | ||
| 33 | import javax.servlet.http.HttpSession; | 24 | import javax.servlet.http.HttpSession; |
| 34 | 25 | ||
| 35 | -import java.io.BufferedInputStream; | ||
| 36 | -import java.io.BufferedOutputStream; | ||
| 37 | -import java.io.ByteArrayInputStream; | ||
| 38 | -import java.io.ByteArrayOutputStream; | ||
| 39 | -import java.io.InputStream; | ||
| 40 | import java.util.Date; | 26 | import java.util.Date; |
| 41 | import java.util.HashMap; | 27 | import java.util.HashMap; |
| 42 | import java.util.List; | 28 | import java.util.List; |
| @@ -94,7 +80,7 @@ public class TopicController extends BaseController { | @@ -94,7 +80,7 @@ public class TopicController extends BaseController { | ||
| 94 | if(CommonUtils.isNotNull(shySite)){ | 80 | if(CommonUtils.isNotNull(shySite)){ |
| 95 | spid = shySite.getSpid(); | 81 | spid = shySite.getSpid(); |
| 96 | }else{ | 82 | }else{ |
| 97 | - setmodel_site(model); | 83 | + setmodelSite(model); |
| 98 | return "error.html"; | 84 | return "error.html"; |
| 99 | } | 85 | } |
| 100 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | 86 | } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { |
src/main/java/com/cnlive/shenhe/controller/UsersController.java
| 1 | package com.cnlive.shenhe.controller; | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSONObject; | 3 | import com.alibaba.fastjson.JSONObject; |
| 4 | -import com.cnlive.shenhe.bean.ErrorEnum; | ||
| 5 | -import com.cnlive.shenhe.bean.ResponseBean; | ||
| 6 | import com.cnlive.shenhe.bean.SessionUser; | 4 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | import com.cnlive.shenhe.entity.ShySites; | 5 | import com.cnlive.shenhe.entity.ShySites; |
| 8 | import com.cnlive.shenhe.entity.ShyUsers; | 6 | import com.cnlive.shenhe.entity.ShyUsers; |
| 9 | -import com.cnlive.shenhe.entity.ShyUsersfree; | ||
| 10 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 7 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 11 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | 8 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 12 | import com.cnlive.shenhe.utils.CommonConst; | 9 | import com.cnlive.shenhe.utils.CommonConst; |
| @@ -27,7 +24,6 @@ import java.util.HashMap; | @@ -27,7 +24,6 @@ import java.util.HashMap; | ||
| 27 | import java.util.List; | 24 | import java.util.List; |
| 28 | import java.util.Map; | 25 | import java.util.Map; |
| 29 | 26 | ||
| 30 | -import javax.print.attribute.HashAttributeSet; | ||
| 31 | import javax.servlet.http.HttpServletRequest; | 27 | import javax.servlet.http.HttpServletRequest; |
| 32 | import javax.servlet.http.HttpSession; | 28 | import javax.servlet.http.HttpSession; |
| 33 | 29 | ||
| @@ -166,7 +162,7 @@ public class UsersController extends BaseController { | @@ -166,7 +162,7 @@ public class UsersController extends BaseController { | ||
| 166 | if (success) { | 162 | if (success) { |
| 167 | return "redirect:" + redirect_url; | 163 | return "redirect:" + redirect_url; |
| 168 | } else { | 164 | } else { |
| 169 | - setmodel_result(model); | 165 | + setmodelResult(model); |
| 170 | return "error.html"; | 166 | return "error.html"; |
| 171 | } | 167 | } |
| 172 | } | 168 | } |
src/main/java/com/cnlive/shenhe/controller/UsersFreeController.java
| @@ -5,28 +5,23 @@ import com.cnlive.shenhe.bean.ErrorEnum; | @@ -5,28 +5,23 @@ import com.cnlive.shenhe.bean.ErrorEnum; | ||
| 5 | import com.cnlive.shenhe.bean.ResponseBean; | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | import com.cnlive.shenhe.bean.SessionUser; | 6 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | import com.cnlive.shenhe.entity.ShySites; | 7 | import com.cnlive.shenhe.entity.ShySites; |
| 8 | -import com.cnlive.shenhe.entity.ShyUsers; | ||
| 9 | import com.cnlive.shenhe.entity.ShyUsersfree; | 8 | import com.cnlive.shenhe.entity.ShyUsersfree; |
| 10 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 9 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 11 | -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | ||
| 12 | import com.cnlive.shenhe.serviceImpl.UsersfreeServiceImpl; | 10 | import com.cnlive.shenhe.serviceImpl.UsersfreeServiceImpl; |
| 13 | import com.cnlive.shenhe.utils.CommonConst; | 11 | import com.cnlive.shenhe.utils.CommonConst; |
| 14 | import com.cnlive.shenhe.utils.CommonUtils; | 12 | import com.cnlive.shenhe.utils.CommonUtils; |
| 15 | import com.github.pagehelper.PageInfo; | 13 | import com.github.pagehelper.PageInfo; |
| 16 | 14 | ||
| 17 | -import org.jasig.cas.client.authentication.AttributePrincipal; | ||
| 18 | import org.springframework.beans.factory.annotation.Autowired; | 15 | import org.springframework.beans.factory.annotation.Autowired; |
| 19 | import org.springframework.stereotype.Controller; | 16 | import org.springframework.stereotype.Controller; |
| 20 | import org.springframework.ui.Model; | 17 | import org.springframework.ui.Model; |
| 21 | import org.springframework.web.bind.annotation.GetMapping; | 18 | import org.springframework.web.bind.annotation.GetMapping; |
| 22 | -import org.springframework.web.bind.annotation.PathVariable; | ||
| 23 | import org.springframework.web.bind.annotation.PostMapping; | 19 | import org.springframework.web.bind.annotation.PostMapping; |
| 24 | import org.springframework.web.bind.annotation.RequestMapping; | 20 | import org.springframework.web.bind.annotation.RequestMapping; |
| 25 | import org.springframework.web.bind.annotation.ResponseBody; | 21 | import org.springframework.web.bind.annotation.ResponseBody; |
| 26 | 22 | ||
| 27 | import java.util.List; | 23 | import java.util.List; |
| 28 | 24 | ||
| 29 | -import javax.servlet.http.HttpServletRequest; | ||
| 30 | import javax.servlet.http.HttpSession; | 25 | import javax.servlet.http.HttpSession; |
| 31 | 26 | ||
| 32 | /** | 27 | /** |
| @@ -102,7 +97,7 @@ public class UsersFreeController extends BaseController { | @@ -102,7 +97,7 @@ public class UsersFreeController extends BaseController { | ||
| 102 | @PostMapping(value = "/write") | 97 | @PostMapping(value = "/write") |
| 103 | public String write(Model model,String userId,String userMobile,Integer spId, String[] write_business, HttpSession session, String redirect_url) { | 98 | public String write(Model model,String userId,String userMobile,Integer spId, String[] write_business, HttpSession session, String redirect_url) { |
| 104 | if(CommonUtils.isEmpty(userId)&&CommonUtils.isEmpty(userMobile)){ | 99 | if(CommonUtils.isEmpty(userId)&&CommonUtils.isEmpty(userMobile)){ |
| 105 | - setmodel_param(model,"userId,userMobile不能为空！"); | 100 | + setmodelParam(model,"userId,userMobile不能为空！"); |
| 106 | return "error.html"; | 101 | return "error.html"; |
| 107 | } | 102 | } |
| 108 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 103 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| @@ -117,7 +112,7 @@ public class UsersFreeController extends BaseController { | @@ -117,7 +112,7 @@ public class UsersFreeController extends BaseController { | ||
| 117 | if (success) { | 112 | if (success) { |
| 118 | return "redirect:" + redirect_url; | 113 | return "redirect:" + redirect_url; |
| 119 | } else { | 114 | } else { |
| 120 | - setmodel_result(model); | 115 | + setmodelResult(model); |
| 121 | return "error.html"; | 116 | return "error.html"; |
| 122 | } | 117 | } |
| 123 | } | 118 | } |
src/main/java/com/cnlive/shenhe/controller/VideosController.java
| @@ -5,13 +5,18 @@ import com.alibaba.fastjson.JSONObject; | @@ -5,13 +5,18 @@ import com.alibaba.fastjson.JSONObject; | ||
| 5 | import com.cnlive.shenhe.bean.ErrorEnum; | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 6 | import com.cnlive.shenhe.bean.ResponseBean; | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 7 | import com.cnlive.shenhe.bean.SessionUser; | 7 | import com.cnlive.shenhe.bean.SessionUser; |
| 8 | +import com.cnlive.shenhe.entity.ShyActivity; | ||
| 8 | import com.cnlive.shenhe.entity.ShySites; | 9 | import com.cnlive.shenhe.entity.ShySites; |
| 9 | import com.cnlive.shenhe.entity.ShyUsers; | 10 | import com.cnlive.shenhe.entity.ShyUsers; |
| 10 | import com.cnlive.shenhe.entity.ShyVideos; | 11 | import com.cnlive.shenhe.entity.ShyVideos; |
| 12 | +import com.cnlive.shenhe.serviceImpl.ShyActivityImpl; | ||
| 11 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | 13 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 12 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | 14 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 13 | import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; | 15 | import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; |
| 14 | -import com.cnlive.shenhe.utils.*; | 16 | +import com.cnlive.shenhe.utils.AuditPass; |
| 17 | +import com.cnlive.shenhe.utils.CommonConst; | ||
| 18 | +import com.cnlive.shenhe.utils.CommonUtils; | ||
| 19 | +import com.cnlive.shenhe.utils.HttpClientUtils; | ||
| 15 | import com.github.pagehelper.PageInfo; | 20 | import com.github.pagehelper.PageInfo; |
| 16 | import org.apache.poi.xssf.usermodel.XSSFCell; | 21 | import org.apache.poi.xssf.usermodel.XSSFCell; |
| 17 | import org.apache.poi.xssf.usermodel.XSSFRow; | 22 | import org.apache.poi.xssf.usermodel.XSSFRow; |
| @@ -44,13 +49,13 @@ public class VideosController extends BaseController { | @@ -44,13 +49,13 @@ public class VideosController extends BaseController { | ||
| 44 | @Autowired | 49 | @Autowired |
| 45 | AuditPass Pass; | 50 | AuditPass Pass; |
| 46 | @Autowired | 51 | @Autowired |
| 47 | - InfoUtil infoUtil; | ||
| 48 | - @Autowired | ||
| 49 | VideosServiceImpl videosService; | 52 | VideosServiceImpl videosService; |
| 50 | @Autowired | 53 | @Autowired |
| 51 | UsersServiceImpl usersService; | 54 | UsersServiceImpl usersService; |
| 52 | @Autowired | 55 | @Autowired |
| 53 | SitesServiceImpl sitesService; | 56 | SitesServiceImpl sitesService; |
| 57 | + @Autowired | ||
| 58 | + ShyActivityImpl shyActivityImpl; | ||
| 54 | 59 | ||
| 55 | @Value("${qn_domain}") | 60 | @Value("${qn_domain}") |
| 56 | String qn_domain; | 61 | String qn_domain; |
| @@ -76,28 +81,26 @@ public class VideosController extends BaseController { | @@ -76,28 +81,26 @@ public class VideosController extends BaseController { | ||
| 76 | logger.info("id:{},activity_id:{},state:{},attr_tags:{},msg:{},callback:{}", id, activity_id, state, attr_tags, msg, callback); | 81 | logger.info("id:{},activity_id:{},state:{},attr_tags:{},msg:{},callback:{}", id, activity_id, state, attr_tags, msg, callback); |
| 77 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | 82 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 78 | String userId = sessionUser.getUserId(); | 83 | String userId = sessionUser.getUserId(); |
| 79 | -// ShyVideos shyVideos = videosService.selectByPrimaryKey(id); | ||
| 80 | -// if (shyVideos.getReceive() && CommonUtils.isNotEmpty(shyVideos.getReceive_user_id()) && userId.equals(shyVideos.getReceive_user_id())) { | ||
| 81 | - JSONObject result = null; | 84 | + JSONObject result; |
| 82 | try { | 85 | try { |
| 83 | result = Pass.auditPass(activity_id, state, attr_tags, msg, callback); | 86 | result = Pass.auditPass(activity_id, state, attr_tags, msg, callback); |
| 84 | } catch (Exception e) { | 87 | } catch (Exception e) { |
| 85 | e.printStackTrace(); | 88 | e.printStackTrace(); |
| 86 | - System.out.println("视频审核失败"); | 89 | + logger.error("视频审核失败", e); |
| 87 | return new ResponseBean(ErrorEnum.ERROR); | 90 | return new ResponseBean(ErrorEnum.ERROR); |
| 88 | } | 91 | } |
| 89 | if (result == null) { | 92 | if (result == null) { |
| 90 | - System.out.println("视频审核失败且接口错误没有返回信息"); | 93 | + logger.error("视频审核失败且接口错误没有返回信息"); |
| 91 | return new ResponseBean(ErrorEnum.ERROR); | 94 | return new ResponseBean(ErrorEnum.ERROR); |
| 92 | } | 95 | } |
| 93 | Integer code = result.getInteger("code"); | 96 | Integer code = result.getInteger("code"); |
| 94 | String errorCode = result.getString("errorCode"); | 97 | String errorCode = result.getString("errorCode"); |
| 95 | if (code != null && code != 0) { | 98 | if (code != null && code != 0) { |
| 96 | - System.out.println("审核失败，code==" + code); | 99 | + logger.error("审核失败，code==" + code); |
| 97 | return new ResponseBean(code, result.getString("msg")); | 100 | return new ResponseBean(code, result.getString("msg")); |
| 98 | } | 101 | } |
| 99 | if (errorCode != null && !"0".equals(errorCode)) { | 102 | if (errorCode != null && !"0".equals(errorCode)) { |
| 100 | - System.out.println("审核失败，code==" + code); | 103 | + logger.error("审核失败，code==" + code); |
| 101 | return new ResponseBean(Integer.valueOf(errorCode), "服务器异常"); | 104 | return new ResponseBean(Integer.valueOf(errorCode), "服务器异常"); |
| 102 | } | 105 | } |
| 103 | state = state == 4 ? 2 : 1; | 106 | state = state == 4 ? 2 : 1; |
| @@ -106,9 +109,6 @@ public class VideosController extends BaseController { | @@ -106,9 +109,6 @@ public class VideosController extends BaseController { | ||
| 106 | return new ResponseBean(ErrorEnum.ERROR); | 109 | return new ResponseBean(ErrorEnum.ERROR); |
| 107 | } | 110 | } |
| 108 | return new ResponseBean(ErrorEnum.SUCCESS); | 111 | return new ResponseBean(ErrorEnum.SUCCESS); |
| 109 | -// } | ||
| 110 | -// logger.error("领取逻辑不符，不能审核，Video_id:{}", shyVideos.getVideo_id()); | ||
| 111 | -// return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "领取逻辑不符，不能审核"); | ||
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | /** | 114 | /** |
| @@ -135,21 +135,22 @@ public class VideosController extends BaseController { | @@ -135,21 +135,22 @@ public class VideosController extends BaseController { | ||
| 135 | if (CommonUtils.isNull(sessionUser)) { | 135 | if (CommonUtils.isNull(sessionUser)) { |
| 136 | return "redirect:/users/login"; | 136 | return "redirect:/users/login"; |
| 137 | } | 137 | } |
| 138 | - Integer spid = sessionUser.getSpid(); | ||
| 139 | - logger.info("sp_Id:{},spid:{}", sp_Id, spid); | 138 | + |
| 139 | + Integer sessionUserSpid = sessionUser.getSpid(); | ||
| 140 | + logger.info("sp_Id:{},sessionUserSpid:{}", sp_Id, sessionUserSpid); | ||
| 140 | String userId = sessionUser.getUserId(); | 141 | String userId = sessionUser.getUserId(); |
| 141 | if (CommonUtils.isNull(page)) page = 1; | 142 | if (CommonUtils.isNull(page)) page = 1; |
| 142 | if (CommonUtils.isNull(pageSize)) pageSize = 10; | 143 | if (CommonUtils.isNull(pageSize)) pageSize = 10; |
| 143 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | 144 | + if (CommonUtils.isNotEmpty(sp_desc) && sessionUserSpid == 0) { |
| 144 | ShySites shySite = sitesService.findspidBySpdesc(sp_desc); | 145 | ShySites shySite = sitesService.findspidBySpdesc(sp_desc); |
| 145 | if (CommonUtils.isNotNull(shySite)) { | 146 | if (CommonUtils.isNotNull(shySite)) { |
| 146 | - spid = shySite.getSpid(); | 147 | + sessionUserSpid = shySite.getSpid(); |
| 147 | } else { | 148 | } else { |
| 148 | - setmodel_site(model); | 149 | + setmodelSite(model); |
| 149 | return "error.html"; | 150 | return "error.html"; |
| 150 | } | 151 | } |
| 151 | - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | ||
| 152 | - spid = null; | 152 | + } else if (CommonUtils.isEmpty(sp_desc) && sessionUserSpid == 0) { |
| 153 | + sessionUserSpid = null; | ||
| 153 | } | 154 | } |
| 154 | 155 | ||
| 155 | if (CommonUtils.isNotNull(contentId)) { | 156 | if (CommonUtils.isNotNull(contentId)) { |
| @@ -166,21 +167,22 @@ public class VideosController extends BaseController { | @@ -166,21 +167,22 @@ public class VideosController extends BaseController { | ||
| 166 | } | 167 | } |
| 167 | } | 168 | } |
| 168 | 169 | ||
| 169 | - PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id); | 170 | + PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, sessionUserSpid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id); |
| 171 | + //查询查询条件 | ||
| 172 | + List<ShyActivity> activityList = shyActivityImpl.selectAll(); | ||
| 170 | List<ShyVideos> list = videoPage.getList(); | 173 | List<ShyVideos> list = videoPage.getList(); |
| 171 | if (!list.isEmpty()) { | 174 | if (!list.isEmpty()) { |
| 172 | for (ShyVideos videos : list) { | 175 | for (ShyVideos videos : list) { |
| 173 | - if (videos.getState() != CommonConst.AUDIT_INTT) { | 176 | + if (!videos.getState().equals(CommonConst.AUDIT_INTT)) { |
| 174 | String updater = CommonUtils.isEmpty(videos.getUpdater()) || "null".equals(videos.getUpdater()) ? "白名单" : videos.getUpdater(); | 177 | String updater = CommonUtils.isEmpty(videos.getUpdater()) || "null".equals(videos.getUpdater()) ? "白名单" : videos.getUpdater(); |
| 175 | - String auditor_id = videos.getAuditor_id(); | ||
| 176 | - if (CommonUtils.isNotEmpty(auditor_id)) { | 178 | + String auditorId = videos.getAuditor_id(); |
| 179 | + if (CommonUtils.isNotEmpty(auditorId)) { | ||
| 177 | ShyUsers user = new ShyUsers(); | 180 | ShyUsers user = new ShyUsers(); |
| 178 | - user.setUser_id(auditor_id); | 181 | + user.setUser_id(auditorId); |
| 179 | user = usersService.select(user); | 182 | user = usersService.select(user); |
| 180 | if (CommonUtils.isNotNull(user)) { | 183 | if (CommonUtils.isNotNull(user)) { |
| 181 | String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | 184 | String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); |
| 182 | - String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | ||
| 183 | - updater = userName; | 185 | + updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 184 | } | 186 | } |
| 185 | } | 187 | } |
| 186 | videos.setUpdater(updater); | 188 | videos.setUpdater(updater); |
| @@ -189,116 +191,31 @@ public class VideosController extends BaseController { | @@ -189,116 +191,31 @@ public class VideosController extends BaseController { | ||
| 189 | ShySites shySites = sitesService.findspidDescByspid(videos.getSpid()); | 191 | ShySites shySites = sitesService.findspidDescByspid(videos.getSpid()); |
| 190 | if (CommonUtils.isNotNull(shySites)) { | 192 | if (CommonUtils.isNotNull(shySites)) { |
| 191 | if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) { | 193 | if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) { |
| 192 | - //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会 33-万人同唱献给党-独唱 34-万人同唱献给党-合唱 | 194 | + //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 ..... |
| 193 | String source1 = videos.getSource(); | 195 | String source1 = videos.getSource(); |
| 194 | - if ("1".equals(source1)) { | ||
| 195 | - videos.setSpid_desc("童声共济" + "(目击者)"); | ||
| 196 | - } else if ("2".equals(source1)) { | ||
| 197 | - videos.setSpid_desc("全民健身" + "(目击者)"); | ||
| 198 | - } else if ("3".equals(source1)) { | ||
| 199 | - videos.setSpid_desc("政府监督" + "(目击者)"); | ||
| 200 | - } else if ("4".equals(source1)) { | ||
| 201 | - videos.setSpid_desc("美食中国" + "(目击者)"); | ||
| 202 | - } else if ("5".equals(source1)) { | ||
| 203 | - videos.setSpid_desc("老年大学" + "(目击者)"); | ||
| 204 | - } else if ("6".equals(source1)) { | ||
| 205 | - videos.setSpid_desc("旅游摄影大赛" + "(目击者)"); | ||
| 206 | - } else if ("7".equals(source1)) { | ||
| 207 | - videos.setSpid_desc("老年大学公开课" + "(目击者)"); | ||
| 208 | - } else if ("8".equals(source1)) { | ||
| 209 | - videos.setSpid_desc("甲申同文" + "(目击者)"); | ||
| 210 | - } else if ("9".equals(source1)) { | ||
| 211 | - videos.setSpid_desc("万人同唱一首歌" + "(目击者)"); | ||
| 212 | - } else if ("10".equals(source1)) { | ||
| 213 | - videos.setSpid_desc("上太空" + "(目击者)"); | ||
| 214 | - } else if ("11".equals(source1)) { | ||
| 215 | - videos.setSpid_desc("芳华归来个人" + "(目击者)"); | ||
| 216 | - } else if ("12".equals(source1)) { | ||
| 217 | - videos.setSpid_desc("芳华归来团体" + "(目击者)"); | ||
| 218 | - } else if ("13".equals(source1)) { | ||
| 219 | - videos.setSpid_desc("小小表演家" + "(目击者)"); | ||
| 220 | - } else if ("100".equals(source1)) { | ||
| 221 | - videos.setSpid_desc("追问发布会" + "(目击者)"); | ||
| 222 | - } else if ("14".equals(source1)) { | ||
| 223 | - videos.setSpid_desc("中国微电影" + "(目击者)"); | ||
| 224 | - } else if ("15".equals(source1)) { | ||
| 225 | - videos.setSpid_desc("幼儿闯关" + "(目击者)"); | ||
| 226 | - } else if ("16".equals(source1)) { | ||
| 227 | - videos.setSpid_desc("少儿闯关" + "(目击者)"); | ||
| 228 | - } else if ("101".equals(source1)) { | ||
| 229 | - videos.setSpid_desc("电商-cms" + "(目击者)"); | ||
| 230 | - } else if ("17".equals(source1)) { | ||
| 231 | - videos.setSpid_desc("青岛读书" + "(目击者)"); | ||
| 232 | - } else if ("18".equals(source1)) { | ||
| 233 | - videos.setSpid_desc("红色故事演讲" + "(目击者)"); | ||
| 234 | - } else if ("19".equals(source1)) { | ||
| 235 | - videos.setSpid_desc("红色诗词朗诵" + "(目击者)"); | ||
| 236 | - } else if ("20".equals(source1)) { | ||
| 237 | - videos.setSpid_desc("红色短剧展演" + "(目击者)"); | ||
| 238 | - } else if ("21".equals(source1)) { | ||
| 239 | - videos.setSpid_desc("视频号" + "(目击者)"); | ||
| 240 | - } else if ("29".equals(source1)) { | ||
| 241 | - videos.setSpid_desc("中国故事上太空" + "(目击者)"); | ||
| 242 | - } else if ("30".equals(source1)) { | ||
| 243 | - videos.setSpid_desc("绽放夕阳二期" + "(目击者)"); | ||
| 244 | - } else if ("31".equals(source1)) { | ||
| 245 | - videos.setSpid_desc("绽放夕阳三期" + "(目击者)"); | ||
| 246 | - } else if ("33".equals(source1)) { | ||
| 247 | - videos.setSpid_desc("万人同唱献给党-独唱" + "(目击者)"); | ||
| 248 | - } else if ("34".equals(source1)) { | ||
| 249 | - videos.setSpid_desc("万人同唱献给党-合唱" + "(目击者)"); | ||
| 250 | - } else if ("29".equals(source1)) { | ||
| 251 | - videos.setSpid_desc("我们的声音上太空" + "(目击者)"); | ||
| 252 | - } else if ("35".equals(source1)) { | ||
| 253 | - videos.setSpid_desc("精英少年作品展示" + "(目击者)"); | ||
| 254 | - } else if ("36".equals(source1)) { | ||
| 255 | - videos.setSpid_desc("上太空成年" + "(目击者)"); | ||
| 256 | - } else if ("37".equals(source1)) { | ||
| 257 | - videos.setSpid_desc("中国推介" + "(目击者)"); | ||
| 258 | - } else if ("38".equals(source1)) { | ||
| 259 | - videos.setSpid_desc("教学成果展" + "(目击者)"); | ||
| 260 | - } else if ("39".equals(source1)) { | ||
| 261 | - videos.setSpid_desc("绽放夕阳" + "(目击者)"); | ||
| 262 | - } else if ("40".equals(source1)) { | ||
| 263 | - videos.setSpid_desc("家乡推介" + "(目击者)"); | ||
| 264 | - } else if ("41".equals(source1)) { | ||
| 265 | - videos.setSpid_desc("老体协-柔力球" + "(目击者)"); | ||
| 266 | - } else if ("42".equals(source1)) { | ||
| 267 | - videos.setSpid_desc("老体协-健身球操" + "(目击者)"); | ||
| 268 | - } else if ("43".equals(source1)) { | ||
| 269 | - videos.setSpid_desc("老体协-太极拳" + "(目击者)"); | ||
| 270 | - } else if ("44".equals(source1)) { | ||
| 271 | - videos.setSpid_desc("老体协-持杖健走" + "(目击者)"); | ||
| 272 | - } else if ("45".equals(source1)) { | ||
| 273 | - videos.setSpid_desc("老体协-广场舞" + "(目击者)"); | ||
| 274 | - } else if ("46".equals(source1)) { | ||
| 275 | - videos.setSpid_desc("老体协-健身秧歌（鼓）" + "(目击者)"); | ||
| 276 | - } else if ("47".equals(source1)) { | ||
| 277 | - videos.setSpid_desc("老体协-综合类" + "(目击者)"); | ||
| 278 | - } else if ("48".equals(source1)) { | ||
| 279 | - videos.setSpid_desc("少儿吟诵" + "(目击者)"); | ||
| 280 | - } else if ("49".equals(source1)) { | ||
| 281 | - videos.setSpid_desc("少年先锋" + "(目击者)"); | ||
| 282 | - } else if ("50".equals(source1)) { | ||
| 283 | - videos.setSpid_desc("巾帼故事汇" + "(目击者)"); | ||
| 284 | - } else if ("51".equals(source1)) { | ||
| 285 | - videos.setSpid_desc("浣花吟唱节" + "(目击者)"); | ||
| 286 | - } else { | ||
| 287 | - videos.setSpid_desc(shySites.getName() + "(目击者)"); | 196 | + if (CommonUtils.isNotEmpty(source1)) { |
| 197 | + for (ShyActivity activity : activityList) { | ||
| 198 | + if (activity.getId().equals(Integer.valueOf(source1))) { | ||
| 199 | + videos.setSpid_desc(activity.getActivity()); | ||
| 200 | + break; | ||
| 201 | + } | ||
| 202 | + } | ||
| 288 | } | 203 | } |
| 289 | - } else if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_MOMENT)) { | ||
| 290 | - videos.setSpid_desc(shySites.getName() + "(朋友圈)"); | ||
| 291 | } else { | 204 | } else { |
| 292 | - videos.setSpid_desc(shySites.getName()); | 205 | + videos.setSpid_desc(shySites.getName() + "(目击者)"); |
| 293 | } | 206 | } |
| 207 | + } else if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_MOMENT)) { | ||
| 208 | + videos.setSpid_desc(shySites.getName() + "(朋友圈)"); | ||
| 209 | + } else { | ||
| 210 | + videos.setSpid_desc(shySites.getName()); | ||
| 294 | } | 211 | } |
| 295 | } | 212 | } |
| 296 | } | 213 | } |
| 297 | /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/ | 214 | /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/ |
| 298 | String state1 = state == null ? "" : state.toString(); | 215 | String state1 = state == null ? "" : state.toString(); |
| 299 | - String receive1 = ""; | 216 | + String receive1; |
| 300 | if (CommonUtils.isNotNull(receive)) { | 217 | if (CommonUtils.isNotNull(receive)) { |
| 301 | - receive1 = receive == CommonConst.RECEIVE_AFTER ? "true" : "false"; | 218 | + receive1 = receive.equals(CommonConst.RECEIVE_AFTER) ? "true" : "false"; |
| 302 | } else { | 219 | } else { |
| 303 | receive1 = ""; | 220 | receive1 = ""; |
| 304 | } | 221 | } |
| @@ -307,6 +224,8 @@ public class VideosController extends BaseController { | @@ -307,6 +224,8 @@ public class VideosController extends BaseController { | ||
| 307 | model.addAttribute("pageSize", pageSize); | 224 | model.addAttribute("pageSize", pageSize); |
| 308 | model.addAttribute("videoPage", videoPage); | 225 | model.addAttribute("videoPage", videoPage); |
| 309 | model.addAttribute("sp_Id", sp_Id); | 226 | model.addAttribute("sp_Id", sp_Id); |
| 227 | + model.addAttribute("source", source); | ||
| 228 | + model.addAttribute("activityList", activityList); | ||
| 310 | return "page/video.html"; | 229 | return "page/video.html"; |
| 311 | } | 230 | } |
| 312 | 231 | ||
| @@ -323,78 +242,37 @@ public class VideosController extends BaseController { | @@ -323,78 +242,37 @@ public class VideosController extends BaseController { | ||
| 323 | Object avsampleImgs = JSON.parse(detailsContent.getAvsample_imgs()); | 242 | Object avsampleImgs = JSON.parse(detailsContent.getAvsample_imgs()); |
| 324 | String yuming = ""; | 243 | String yuming = ""; |
| 325 | Integer plat = detailsContent.getPlat(); | 244 | Integer plat = detailsContent.getPlat(); |
| 326 | - if (plat == CommonConst.QINIU_PLAT) { | 245 | + if (CommonConst.QINIU_PLAT.equals(plat)) { |
| 327 | yuming = qn_domain + "/"; | 246 | yuming = qn_domain + "/"; |
| 328 | - } else if (plat == CommonConst.KS_PLAT) { | 247 | + } else if (CommonConst.KS_PLAT.equals(plat)) { |
| 329 | yuming = ks_domain + "/"; | 248 | yuming = ks_domain + "/"; |
| 330 | } | 249 | } |
| 331 | detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags()); | 250 | detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags()); |
| 332 | - | 251 | + List<ShyActivity> activityList = shyActivityImpl.selectAll(); |
| 252 | + //model.addAttribute("activityList", activityList); | ||
| 333 | ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid()); | 253 | ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid()); |
| 334 | if (CommonUtils.isNotNull(shySites)) { | 254 | if (CommonUtils.isNotNull(shySites)) { |
| 335 | if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_WITNESS)) { | 255 | if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_WITNESS)) { |
| 336 | //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会 33-万人同唱献给党-独唱 34-万人同唱献给党-合唱 | 256 | //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会 33-万人同唱献给党-独唱 34-万人同唱献给党-合唱 |
| 337 | String source1 = detailsContent.getSource(); | 257 | String source1 = detailsContent.getSource(); |
| 338 | - if ("1".equals(source1)) { | ||
| 339 | - detailsContent.setSpid_desc("童声共济" + "(目击者)"); | ||
| 340 | - } else if ("2".equals(source1)) { | ||
| 341 | - detailsContent.setSpid_desc("全民健身" + "(目击者)"); | ||
| 342 | - } else if ("3".equals(source1)) { | ||
| 343 | - detailsContent.setSpid_desc("政府监督" + "(目击者)"); | ||
| 344 | - } else if ("4".equals(source1)) { | ||
| 345 | - detailsContent.setSpid_desc("美食中国" + "(目击者)"); | ||
| 346 | - } else if ("5".equals(source1)) { | ||
| 347 | - detailsContent.setSpid_desc("老年大学" + "(目击者)"); | ||
| 348 | - } else if ("6".equals(source1)) { | ||
| 349 | - detailsContent.setSpid_desc("旅游摄影大赛" + "(目击者)"); | ||
| 350 | - } else if ("7".equals(source1)) { | ||
| 351 | - detailsContent.setSpid_desc("老年大学公开课" + "(目击者)"); | ||
| 352 | - } else if ("8".equals(source1)) { | ||
| 353 | - detailsContent.setSpid_desc("甲申同文" + "(目击者)"); | ||
| 354 | - } else if ("9".equals(source1)) { | ||
| 355 | - detailsContent.setSpid_desc("万人同唱一首歌" + "(目击者)"); | ||
| 356 | - } else if ("10".equals(source1)) { | ||
| 357 | - detailsContent.setSpid_desc("上太空" + "(目击者)"); | ||
| 358 | - } else if ("11".equals(source1)) { | ||
| 359 | - detailsContent.setSpid_desc("芳华归来个人" + "(目击者)"); | ||
| 360 | - } else if ("12".equals(source1)) { | ||
| 361 | - detailsContent.setSpid_desc("芳华归来团体" + "(目击者)"); | ||
| 362 | - } else if ("13".equals(source1)) { | ||
| 363 | - detailsContent.setSpid_desc("小小表演家" + "(目击者)"); | ||
| 364 | - } else if ("100".equals(source1)) { | ||
| 365 | - detailsContent.setSpid_desc("追问发布会" + "(目击者)"); | ||
| 366 | - } else if ("14".equals(source1)) { | ||
| 367 | - detailsContent.setSpid_desc("中国微电影" + "(目击者)"); | ||
| 368 | - } else if ("15".equals(source1)) { | ||
| 369 | - detailsContent.setSpid_desc("幼儿闯关" + "(目击者)"); | ||
| 370 | - } else if ("16".equals(source1)) { | ||
| 371 | - detailsContent.setSpid_desc("少儿闯关" + "(目击者)"); | ||
| 372 | - } else if ("101".equals(source1)) { | ||
| 373 | - detailsContent.setSpid_desc("电商-cms" + "(目击者)"); | ||
| 374 | - } else if ("17".equals(source1)) { | ||
| 375 | - detailsContent.setSpid_desc("青岛读书" + "(目击者)"); | ||
| 376 | - } else if ("18".equals(source1)) { | ||
| 377 | - detailsContent.setSpid_desc("红色故事演讲" + "(目击者)"); | ||
| 378 | - } else if ("19".equals(source1)) { | ||
| 379 | - detailsContent.setSpid_desc("红色诗词朗诵" + "(目击者)"); | ||
| 380 | - } else if ("20".equals(source1)) { | ||
| 381 | - detailsContent.setSpid_desc("红色短剧展演" + "(目击者)"); | ||
| 382 | - } else if ("21".equals(source1)) { | ||
| 383 | - detailsContent.setSpid_desc("视频号" + "(目击者)"); | ||
| 384 | - } else if ("33".equals(source1)) { | ||
| 385 | - detailsContent.setSpid_desc("万人同唱献给党-独唱" + "(目击者)"); | ||
| 386 | - } else if ("34".equals(source1)) { | ||
| 387 | - detailsContent.setSpid_desc("万人同唱献给党-合唱" + "(目击者)"); | ||
| 388 | - } else if ("29".equals(source1)) { | ||
| 389 | - detailsContent.setSpid_desc("我们的声音上太空" + "(目击者)"); | ||
| 390 | - } else { | ||
| 391 | - detailsContent.setSpid_desc(shySites.getName() + "(目击者)"); | 258 | + |
| 259 | + //如果source1不等于null；直接查询 | ||
| 260 | + if (CommonUtils.isNotEmpty(source1)) { | ||
| 261 | + for (ShyActivity activity : activityList) { | ||
| 262 | + if (activity.getId().equals(Integer.valueOf(source1))) { | ||
| 263 | + detailsContent.setSpid_desc(activity.getActivity()); | ||
| 264 | + break; | ||
| 265 | + } | ||
| 266 | + } | ||
| 392 | } | 267 | } |
| 393 | - } else if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_MOMENT)) { | ||
| 394 | - detailsContent.setSpid_desc(shySites.getName() + "(朋友圈)"); | 268 | + |
| 395 | } else { | 269 | } else { |
| 396 | - detailsContent.setSpid_desc(shySites.getName()); | 270 | + detailsContent.setSpid_desc(shySites.getName() + "(目击者)"); |
| 397 | } | 271 | } |
| 272 | + } else if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_MOMENT)) { | ||
| 273 | + detailsContent.setSpid_desc(shySites.getName() + "(朋友圈)"); | ||
| 274 | + } else { | ||
| 275 | + detailsContent.setSpid_desc(shySites.getName()); | ||
| 398 | } | 276 | } |
| 399 | model.addAttribute("images", images); | 277 | model.addAttribute("images", images); |
| 400 | model.addAttribute("avsampleImgs", avsampleImgs); | 278 | model.addAttribute("avsampleImgs", avsampleImgs); |
src/main/java/com/cnlive/shenhe/dto/ShyActivityDTO.java
0 → 100644
| 1 | +package com.cnlive.shenhe.dto; | ||
| 2 | + | ||
| 3 | + | ||
| 4 | +import org.springframework.stereotype.Component; | ||
| 5 | + | ||
| 6 | +import java.io.Serializable; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * @author Administrator | ||
| 10 | + * @author yanzhaowang | ||
| 11 | + * @create 2022-03-14 13:16 | ||
| 12 | + */ | ||
| 13 | +@Component | ||
| 14 | +public class ShyActivityDTO implements Serializable { | ||
| 15 | + | ||
| 16 | + | ||
| 17 | + | ||
| 18 | + private Integer pageNum = 1; | ||
| 19 | + | ||
| 20 | + private Integer pageSize = 10; | ||
| 21 | + | ||
| 22 | + private String activity; | ||
| 23 | + | ||
| 24 | + private Byte exempt_from_trial; | ||
| 25 | + | ||
| 26 | + public ShyActivityDTO(Integer pageNum, Integer pageSize, String activity, Byte exempt_from_trial) { | ||
| 27 | + this.pageNum = pageNum; | ||
| 28 | + this.pageSize = pageSize; | ||
| 29 | + this.activity = activity; | ||
| 30 | + this.exempt_from_trial = exempt_from_trial; | ||
| 31 | + } | ||
| 32 | + | ||
| 33 | + public Integer getPageNum() { | ||
| 34 | + return pageNum; | ||
| 35 | + } | ||
| 36 | + | ||
| 37 | + public void setPageNum(Integer pageNum) { | ||
| 38 | + this.pageNum = pageNum; | ||
| 39 | + } | ||
| 40 | + | ||
| 41 | + public Integer getPageSize() { | ||
| 42 | + return pageSize; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + public void setPageSize(Integer pageSize) { | ||
| 46 | + this.pageSize = pageSize; | ||
| 47 | + } | ||
| 48 | + | ||
| 49 | + public String getActivity() { | ||
| 50 | + return activity; | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + public void setActivity(String activity) { | ||
| 54 | + this.activity = activity; | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + public Byte getExempt_from_trial() { | ||
| 58 | + return exempt_from_trial; | ||
| 59 | + } | ||
| 60 | + | ||
| 61 | + public void setExempt_from_trial(Byte exempt_from_trial) { | ||
| 62 | + this.exempt_from_trial = exempt_from_trial; | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + public ShyActivityDTO(String activity, Byte exempt_from_trial) { | ||
| 66 | + this.activity = activity; | ||
| 67 | + this.exempt_from_trial = exempt_from_trial; | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + public ShyActivityDTO() { | ||
| 71 | + } | ||
| 72 | +} |
src/main/java/com/cnlive/shenhe/entity/ShyActivity.java
0 → 100644
| 1 | +package com.cnlive.shenhe.entity; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | +import javax.persistence.*; | ||
| 5 | + | ||
| 6 | +@Table(name = "shy_activity") | ||
| 7 | +public class ShyActivity { | ||
| 8 | + /** | ||
| 9 | + * 活动表主键ID | ||
| 10 | + */ | ||
| 11 | + @Id | ||
| 12 | + private Integer id; | ||
| 13 | + | ||
| 14 | + /** | ||
| 15 | + * 活动名称 | ||
| 16 | + */ | ||
| 17 | + private String activity; | ||
| 18 | + | ||
| 19 | + /** | ||
| 20 | + * 创建时间 | ||
| 21 | + */ | ||
| 22 | + private Date create_time; | ||
| 23 | + | ||
| 24 | + /** | ||
| 25 | + * 修改时间 | ||
| 26 | + */ | ||
| 27 | + private Date update_time; | ||
| 28 | + | ||
| 29 | + private Byte exempt_from_trial; | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 获取活动表主键ID | ||
| 33 | + * | ||
| 34 | + * @return id - 活动表主键ID | ||
| 35 | + */ | ||
| 36 | + public Integer getId() { | ||
| 37 | + return id; | ||
| 38 | + } | ||
| 39 | + | ||
| 40 | + /** | ||
| 41 | + * 设置活动表主键ID | ||
| 42 | + * | ||
| 43 | + * @param id 活动表主键ID | ||
| 44 | + */ | ||
| 45 | + public void setId(Integer id) { | ||
| 46 | + this.id = id; | ||
| 47 | + } | ||
| 48 | + | ||
| 49 | + /** | ||
| 50 | + * 获取活动名称 | ||
| 51 | + * | ||
| 52 | + * @return activity - 活动名称 | ||
| 53 | + */ | ||
| 54 | + public String getActivity() { | ||
| 55 | + return activity; | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + /** | ||
| 59 | + * 设置活动名称 | ||
| 60 | + * | ||
| 61 | + * @param activity 活动名称 | ||
| 62 | + */ | ||
| 63 | + public void setActivity(String activity) { | ||
| 64 | + this.activity = activity; | ||
| 65 | + } | ||
| 66 | + | ||
| 67 | + /** | ||
| 68 | + * 获取创建时间 | ||
| 69 | + * | ||
| 70 | + * @return create_time - 创建时间 | ||
| 71 | + */ | ||
| 72 | + public Date getCreate_time() { | ||
| 73 | + return create_time; | ||
| 74 | + } | ||
| 75 | + | ||
| 76 | + /** | ||
| 77 | + * 设置创建时间 | ||
| 78 | + * | ||
| 79 | + * @param create_time 创建时间 | ||
| 80 | + */ | ||
| 81 | + public void setCreate_time(Date create_time) { | ||
| 82 | + this.create_time = create_time; | ||
| 83 | + } | ||
| 84 | + | ||
| 85 | + /** | ||
| 86 | + * 获取修改时间 | ||
| 87 | + * | ||
| 88 | + * @return update_time - 修改时间 | ||
| 89 | + */ | ||
| 90 | + public Date getUpdate_time() { | ||
| 91 | + return update_time; | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + /** | ||
| 95 | + * 设置修改时间 | ||
| 96 | + * | ||
| 97 | + * @param update_time 修改时间 | ||
| 98 | + */ | ||
| 99 | + public void setUpdate_time(Date update_time) { | ||
| 100 | + this.update_time = update_time; | ||
| 101 | + } | ||
| 102 | + | ||
| 103 | + /** | ||
| 104 | + * @return exempt_from_trial | ||
| 105 | + */ | ||
| 106 | + public Byte getExempt_from_trial() { | ||
| 107 | + return exempt_from_trial; | ||
| 108 | + } | ||
| 109 | + | ||
| 110 | + /** | ||
| 111 | + * @param exempt_from_trial | ||
| 112 | + */ | ||
| 113 | + public void setExempt_from_trial(Byte exempt_from_trial) { | ||
| 114 | + this.exempt_from_trial = exempt_from_trial; | ||
| 115 | + } | ||
| 116 | +} | ||
| 0 | \ No newline at end of file | 117 | \ No newline at end of file |
src/main/java/com/cnlive/shenhe/mapper/ShyActivityMapper.java
0 → 100644
| 1 | +package com.cnlive.shenhe.mapper; | ||
| 2 | + | ||
| 3 | +import com.cnlive.shenhe.entity.ShyActivity; | ||
| 4 | +import tk.mybatis.mapper.common.Mapper; | ||
| 5 | + | ||
| 6 | +import java.util.List; | ||
| 7 | + | ||
| 8 | +public interface ShyActivityMapper extends Mapper<ShyActivity> { | ||
| 9 | + | ||
| 10 | + | ||
| 11 | + List<Integer> selectAllByExempt_from_trial(Integer exempt_from_trial); | ||
| 12 | +} | ||
| 0 | \ No newline at end of file | 13 | \ No newline at end of file |
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java
| @@ -77,20 +77,20 @@ public class AudioServiceImpl { | @@ -77,20 +77,20 @@ public class AudioServiceImpl { | ||
| 77 | //修改点播云音频状态 | 77 | //修改点播云音频状态 |
| 78 | JSONObject result = Pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback()); | 78 | JSONObject result = Pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback()); |
| 79 | Integer code = result.getInteger("code"); | 79 | Integer code = result.getInteger("code"); |
| 80 | - Integer shenheState=CommonConst.AUDIT_REFUSE; | 80 | + Integer shenheState = CommonConst.AUDIT_REFUSE; |
| 81 | if (0 == code) { | 81 | if (0 == code) { |
| 82 | - if(audioState==3){ | ||
| 83 | - shenheState=CommonConst.AUDIT_SUCCESS; | 82 | + if (audioState == 3) { |
| 83 | + shenheState = CommonConst.AUDIT_SUCCESS; | ||
| 84 | } | 84 | } |
| 85 | //修改审核云的音频状态 | 85 | //修改审核云的音频状态 |
| 86 | - int i = audioService.updateAudio(shyAudio.getId(), null,shyAudio.getUploader(),"", shenheState, shyAudio.getMsg()); | 86 | + int i = audioService.updateAudio(shyAudio.getId(), null, shyAudio.getUploader(), "", shenheState, shyAudio.getMsg()); |
| 87 | if (i != 1) { | 87 | if (i != 1) { |
| 88 | logger.error("点播音频更改失败,AudioId:{}", shyAudio.getAudioId()); | 88 | logger.error("点播音频更改失败,AudioId:{}", shyAudio.getAudioId()); |
| 89 | } | 89 | } |
| 90 | return i; | 90 | return i; |
| 91 | } else { | 91 | } else { |
| 92 | - shyAudio.setMsg("点播音频回调失败，"+shyAudio.getMsg()); | ||
| 93 | - audioService.updateAudio(shyAudio.getId(), null,shyAudio.getUploader(),"", CommonConst.AUDIT_CALLBACK_FAIL, shyAudio.getMsg()); | 92 | + shyAudio.setMsg("点播音频回调失败，" + shyAudio.getMsg()); |
| 93 | + audioService.updateAudio(shyAudio.getId(), null, shyAudio.getUploader(), "", CommonConst.AUDIT_CALLBACK_FAIL, shyAudio.getMsg()); | ||
| 94 | logger.error("点播音频回调失败，activity_id:{},code:{},msg:{}", shyAudio.getAudioId(), code, result.getString("msg")); | 94 | logger.error("点播音频回调失败，activity_id:{},code:{},msg:{}", shyAudio.getAudioId(), code, result.getString("msg")); |
| 95 | } | 95 | } |
| 96 | 96 | ||
| @@ -104,7 +104,7 @@ public class AudioServiceImpl { | @@ -104,7 +104,7 @@ public class AudioServiceImpl { | ||
| 104 | String[] cids = ids.split(","); | 104 | String[] cids = ids.split(","); |
| 105 | for (String cid : cids) { | 105 | for (String cid : cids) { |
| 106 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(Integer.parseInt(cid)); | 106 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(Integer.parseInt(cid)); |
| 107 | - if (CommonUtils.isNotNull(shyAudio) && shyAudio.getState() == CommonConst.AUDIT_INTT && shyAudio.getReceive()==CommonConst.RECEIVE_BEFORE) { | 107 | + if (CommonUtils.isNotNull(shyAudio) && shyAudio.getState() == CommonConst.AUDIT_INTT && shyAudio.getReceive() == CommonConst.RECEIVE_BEFORE) { |
| 108 | shyAudio.setReceive_user_id(userId); | 108 | shyAudio.setReceive_user_id(userId); |
| 109 | shyAudio.setReceive(CommonConst.RECEIVE_AFTER); | 109 | shyAudio.setReceive(CommonConst.RECEIVE_AFTER); |
| 110 | shyAudioMapper.updateByPrimaryKeySelective(shyAudio); | 110 | shyAudioMapper.updateByPrimaryKeySelective(shyAudio); |
| @@ -135,7 +135,7 @@ public class AudioServiceImpl { | @@ -135,7 +135,7 @@ public class AudioServiceImpl { | ||
| 135 | String[] cids = ids.split(","); | 135 | String[] cids = ids.split(","); |
| 136 | for (String cid : cids) { | 136 | for (String cid : cids) { |
| 137 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(Integer.parseInt(cid)); | 137 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(Integer.parseInt(cid)); |
| 138 | - if (shyAudio.getState() == CommonConst.AUDIT_INTT && shyAudio.getReceive()==CommonConst.RECEIVE_AFTER && shyAudio.getReceive_user_id().equals(userId)) { | 138 | + if (shyAudio.getState() == CommonConst.AUDIT_INTT && shyAudio.getReceive() == CommonConst.RECEIVE_AFTER && shyAudio.getReceive_user_id().equals(userId)) { |
| 139 | shyAudio.setReceive(CommonConst.RECEIVE_BEFORE); | 139 | shyAudio.setReceive(CommonConst.RECEIVE_BEFORE); |
| 140 | shyAudio.setReceive_user_id(null); | 140 | shyAudio.setReceive_user_id(null); |
| 141 | int i = shyAudioMapper.updateByPrimaryKey(shyAudio); | 141 | int i = shyAudioMapper.updateByPrimaryKey(shyAudio); |
| @@ -181,18 +181,18 @@ public class AudioServiceImpl { | @@ -181,18 +181,18 @@ public class AudioServiceImpl { | ||
| 181 | return showMsg; | 181 | return showMsg; |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | - public int updateAudio(Integer id, String auditor_id,String updater,String attr_tags, Integer state, String msg) { | 184 | + public int updateAudio(Integer id, String auditor_id, String updater, String attr_tags, Integer state, String msg) { |
| 185 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id); | 185 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id); |
| 186 | shyAudio.setAuditor_id(auditor_id); | 186 | shyAudio.setAuditor_id(auditor_id); |
| 187 | shyAudio.setState(state); | 187 | shyAudio.setState(state); |
| 188 | - if(CommonUtils.isNotEmpty(attr_tags)){ | 188 | + if (CommonUtils.isNotEmpty(attr_tags)) { |
| 189 | shyAudio.setAttr_tags(attr_tags); | 189 | shyAudio.setAttr_tags(attr_tags); |
| 190 | } | 190 | } |
| 191 | - if(CommonUtils.isNotEmpty(msg)){ | 191 | + if (CommonUtils.isNotEmpty(msg)) { |
| 192 | shyAudio.setMsg(msg); | 192 | shyAudio.setMsg(msg); |
| 193 | } | 193 | } |
| 194 | shyAudio.setUploader(updater); | 194 | shyAudio.setUploader(updater); |
| 195 | - if(CommonUtils.isNotEmpty(auditor_id)){ | 195 | + if (CommonUtils.isNotEmpty(auditor_id)) { |
| 196 | shyAudio.setReceive(CommonConst.RECEIVE_AFTER); | 196 | shyAudio.setReceive(CommonConst.RECEIVE_AFTER); |
| 197 | shyAudio.setReceive_user_id(auditor_id); | 197 | shyAudio.setReceive_user_id(auditor_id); |
| 198 | shyAudio.setShenhe_type(CommonConst.AUDIT_TYPE_USER); | 198 | shyAudio.setShenhe_type(CommonConst.AUDIT_TYPE_USER); |
| @@ -263,14 +263,14 @@ public class AudioServiceImpl { | @@ -263,14 +263,14 @@ public class AudioServiceImpl { | ||
| 263 | public ShyAudio getDetailsContent(Integer id) { | 263 | public ShyAudio getDetailsContent(Integer id) { |
| 264 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id); | 264 | ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id); |
| 265 | if (shyAudio.getState() != CommonConst.AUDIT_INTT) { | 265 | if (shyAudio.getState() != CommonConst.AUDIT_INTT) { |
| 266 | - String updater = CommonUtils.isEmpty(shyAudio.getUploader()) || "null".equals(shyAudio.getUploader())? "白名单":shyAudio.getUploader(); | 266 | + String updater = CommonUtils.isEmpty(shyAudio.getUploader()) || "null".equals(shyAudio.getUploader()) ? "白名单" : shyAudio.getUploader(); |
| 267 | String auditor_id = shyAudio.getAuditor_id(); | 267 | String auditor_id = shyAudio.getAuditor_id(); |
| 268 | if (CommonUtils.isNotEmpty(auditor_id)) { | 268 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 269 | ShyUsers user = new ShyUsers(); | 269 | ShyUsers user = new ShyUsers(); |
| 270 | user.setUser_id(auditor_id); | 270 | user.setUser_id(auditor_id); |
| 271 | user = shyUsersMapper.selectOne(user); | 271 | user = shyUsersMapper.selectOne(user); |
| 272 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail())? "" : user.getEmail(); | ||
| 273 | - String userName = CommonUtils.isEmpty(user.getUsername()) ? email: user.getUsername(); | 272 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); |
| 273 | + String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | ||
| 274 | updater = userName; | 274 | updater = userName; |
| 275 | } | 275 | } |
| 276 | shyAudio.setUploader(updater); | 276 | shyAudio.setUploader(updater); |
| @@ -351,6 +351,7 @@ public class AudioServiceImpl { | @@ -351,6 +351,7 @@ public class AudioServiceImpl { | ||
| 351 | } | 351 | } |
| 352 | shyAudio.setShenhe_type(shenheType); | 352 | shyAudio.setShenhe_type(shenheType); |
| 353 | } | 353 | } |
| 354 | + | ||
| 354 | /** | 355 | /** |
| 355 | * 易盾点播音频过滤 | 356 | * 易盾点播音频过滤 |
| 356 | * | 357 | * |
| @@ -359,7 +360,7 @@ public class AudioServiceImpl { | @@ -359,7 +360,7 @@ public class AudioServiceImpl { | ||
| 359 | */ | 360 | */ |
| 360 | public void audioFilter(ShyAudio shyAudio) { | 361 | public void audioFilter(ShyAudio shyAudio) { |
| 361 | //调用易盾点播音频检测接口 | 362 | //调用易盾点播音频检测接口 |
| 362 | - JSONObject jsonObject = YiDunAntiFraudUtil.submitAudioOnDemandUrl(shyAudio.getAudioUrl(),yiDun_audio_callback); | 363 | + JSONObject jsonObject = YiDunAntiFraudUtil.submitAudioOnDemandUrl(shyAudio.getAudioUrl(), yiDun_audio_callback); |
| 363 | if (jsonObject != null) { | 364 | if (jsonObject != null) { |
| 364 | JSONObject result = jsonObject.getJSONObject("result"); | 365 | JSONObject result = jsonObject.getJSONObject("result"); |
| 365 | String taskId = result.getString("taskId"); | 366 | String taskId = result.getString("taskId"); |
src/main/java/com/cnlive/shenhe/serviceImpl/ChannelServiceImpl.java
| @@ -2,14 +2,8 @@ package com.cnlive.shenhe.serviceImpl; | @@ -2,14 +2,8 @@ package com.cnlive.shenhe.serviceImpl; | ||
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSONObject; | 3 | import com.alibaba.fastjson.JSONObject; |
| 4 | import com.cnlive.shenhe.entity.ShyChannel; | 4 | import com.cnlive.shenhe.entity.ShyChannel; |
| 5 | -import com.cnlive.shenhe.entity.ShyChannel; | ||
| 6 | -import com.cnlive.shenhe.entity.ShySites; | ||
| 7 | import com.cnlive.shenhe.entity.ShyUsers; | 5 | import com.cnlive.shenhe.entity.ShyUsers; |
| 8 | -import com.cnlive.shenhe.entity.ShyUsersfree; | ||
| 9 | -import com.cnlive.shenhe.entity.ShyVideos; | ||
| 10 | -import com.cnlive.shenhe.mapper.ShyChannelMapper; | ||
| 11 | import com.cnlive.shenhe.mapper.ShyChannelMapper; | 6 | import com.cnlive.shenhe.mapper.ShyChannelMapper; |
| 12 | -import com.cnlive.shenhe.mapper.ShySitesMapper; | ||
| 13 | import com.cnlive.shenhe.mapper.ShyUsersMapper; | 7 | import com.cnlive.shenhe.mapper.ShyUsersMapper; |
| 14 | import com.cnlive.shenhe.utils.AuditPass; | 8 | import com.cnlive.shenhe.utils.AuditPass; |
| 15 | import com.cnlive.shenhe.utils.CommonConst; | 9 | import com.cnlive.shenhe.utils.CommonConst; |
| @@ -23,8 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; | @@ -23,8 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; | ||
| 23 | import org.springframework.stereotype.Service; | 17 | import org.springframework.stereotype.Service; |
| 24 | import tk.mybatis.mapper.entity.Example; | 18 | import tk.mybatis.mapper.entity.Example; |
| 25 | 19 | ||
| 26 | -import java.sql.Timestamp; | ||
| 27 | -import java.text.ParseException; | ||
| 28 | import java.util.Date; | 20 | import java.util.Date; |
| 29 | import java.util.List; | 21 | import java.util.List; |
| 30 | 22 | ||
| @@ -40,24 +32,17 @@ public class ChannelServiceImpl { | @@ -40,24 +32,17 @@ public class ChannelServiceImpl { | ||
| 40 | @Autowired | 32 | @Autowired |
| 41 | ShyChannelMapper shyChannelMapper; | 33 | ShyChannelMapper shyChannelMapper; |
| 42 | @Autowired | 34 | @Autowired |
| 43 | - ShySitesMapper shySitesMapper; | ||
| 44 | - @Autowired | ||
| 45 | ShyUsersMapper shyUsersMapper; | 35 | ShyUsersMapper shyUsersMapper; |
| 46 | @Autowired | 36 | @Autowired |
| 47 | AuditPass Pass; | 37 | AuditPass Pass; |
| 48 | - | 38 | + |
| 49 | @Autowired | 39 | @Autowired |
| 50 | SitesServiceImpl sitesService; | 40 | SitesServiceImpl sitesService; |
| 51 | 41 | ||
| 52 | - public List<ShySites> getBusiness(ShySites shySites) { | ||
| 53 | - List<ShySites> sitesList = shySitesMapper.select(shySites); | ||
| 54 | - return sitesList; | ||
| 55 | - } | ||
| 56 | 42 | ||
| 57 | //************************************** | 43 | //************************************** |
| 58 | public List<ShyChannel> findshyChannel(ShyChannel shyChannel) { | 44 | public List<ShyChannel> findshyChannel(ShyChannel shyChannel) { |
| 59 | - List<ShyChannel> channelList = shyChannelMapper.selectByRowBounds(shyChannel, new RowBounds(0, 100)); | ||
| 60 | - return channelList; | 45 | + return shyChannelMapper.selectByRowBounds(shyChannel, new RowBounds(0, 100)); |
| 61 | } | 46 | } |
| 62 | 47 | ||
| 63 | public boolean updateshyChannel(ShyChannel shyChannel) { | 48 | public boolean updateshyChannel(ShyChannel shyChannel) { |
| @@ -76,13 +61,6 @@ public class ChannelServiceImpl { | @@ -76,13 +61,6 @@ public class ChannelServiceImpl { | ||
| 76 | return true; | 61 | return true; |
| 77 | } | 62 | } |
| 78 | 63 | ||
| 79 | - public int updateChannel(Integer id, Integer state, String msg) { | ||
| 80 | - ShyChannel shyChannel = shyChannelMapper.selectByPrimaryKey(id); | ||
| 81 | - shyChannel.setShenhe_status(state); | ||
| 82 | - shyChannel.setShenhe_msg(msg); | ||
| 83 | - return shyChannelMapper.updateByPrimaryKeySelective(shyChannel); | ||
| 84 | - } | ||
| 85 | - | ||
| 86 | public PageInfo<ShyChannel> getPage(String channelId, String channelName, Integer receive, Date start_date, Date end_date, Integer shenhe_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) { | 64 | public PageInfo<ShyChannel> getPage(String channelId, String channelName, Integer receive, Date start_date, Date end_date, Integer shenhe_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) { |
| 87 | Example example = new Example(ShyChannel.class); | 65 | Example example = new Example(ShyChannel.class); |
| 88 | Example.Criteria criteria = example.createCriteria(); | 66 | Example.Criteria criteria = example.createCriteria(); |
| @@ -91,11 +69,11 @@ public class ChannelServiceImpl { | @@ -91,11 +69,11 @@ public class ChannelServiceImpl { | ||
| 91 | } else { | 69 | } else { |
| 92 | example.setOrderByClause("created_at desc"); | 70 | example.setOrderByClause("created_at desc"); |
| 93 | } | 71 | } |
| 94 | - if (CommonUtils.isNotNull(start_date) ) { | 72 | + if (CommonUtils.isNotNull(start_date)) { |
| 95 | criteria.andGreaterThanOrEqualTo("created_at", start_date); | 73 | criteria.andGreaterThanOrEqualTo("created_at", start_date); |
| 96 | } | 74 | } |
| 97 | if (CommonUtils.isNotNull(end_date)) { | 75 | if (CommonUtils.isNotNull(end_date)) { |
| 98 | - criteria.andLessThanOrEqualTo("created_at", end_date); | 76 | + criteria.andLessThanOrEqualTo("created_at", end_date); |
| 99 | } | 77 | } |
| 100 | if (CommonUtils.isNotEmpty(channelName)) { | 78 | if (CommonUtils.isNotEmpty(channelName)) { |
| 101 | criteria.andLike("channel_name", "%" + channelName + "%"); | 79 | criteria.andLike("channel_name", "%" + channelName + "%"); |
| @@ -106,21 +84,24 @@ public class ChannelServiceImpl { | @@ -106,21 +84,24 @@ public class ChannelServiceImpl { | ||
| 106 | if (CommonUtils.isNotNull(spid)) { | 84 | if (CommonUtils.isNotNull(spid)) { |
| 107 | criteria.andEqualTo("sp_id", spid); | 85 | criteria.andEqualTo("sp_id", spid); |
| 108 | } | 86 | } |
| 109 | - | 87 | + |
| 110 | if (CommonUtils.isNotEmpty(channelId)) { | 88 | if (CommonUtils.isNotEmpty(channelId)) { |
| 111 | criteria.andLike("channel_id", "%" + channelId + "%"); | 89 | criteria.andLike("channel_id", "%" + channelId + "%"); |
| 112 | } | 90 | } |
| 113 | - | ||
| 114 | - if (CommonUtils.isNotNull(receive)&& receive==1) {//已认领 加上用户id | ||
| 115 | - criteria.andEqualTo("auditor", userId); | 91 | + |
| 92 | + //已认领 加上用户id | ||
| 93 | + if (CommonUtils.isNotNull(receive) && receive == 1) { | ||
| 94 | + criteria.andEqualTo("auditor", userId); | ||
| 116 | } | 95 | } |
| 117 | - if (CommonUtils.isNotNull(shenhe_status) && shenhe_status != 3) {//不是 我的已审 进来的，只查一种状态 | 96 | + //不是 我的已审 进来的，只查一种状态 |
| 97 | + if (CommonUtils.isNotNull(shenhe_status) && shenhe_status != 3) { | ||
| 118 | criteria.andEqualTo("shenhe_status", shenhe_status); | 98 | criteria.andEqualTo("shenhe_status", shenhe_status); |
| 119 | - } else if (CommonUtils.isNotNull(shenhe_status) && shenhe_status == 3) {//是 我的已审，查通过和拒绝的两种状态 | ||
| 120 | - Example.Criteria criteria1 = example.createCriteria(); | ||
| 121 | - criteria1.orEqualTo("shenhe_status", 1); | ||
| 122 | - criteria1.orEqualTo("shenhe_status", 2); | ||
| 123 | - example.and(criteria1); | 99 | + //是 我的已审，查通过和拒绝的两种状态 |
| 100 | + } else if (CommonUtils.isNotNull(shenhe_status) && shenhe_status == 3) { | ||
| 101 | + Example.Criteria criteria1 = example.createCriteria(); | ||
| 102 | + criteria1.orEqualTo("shenhe_status", 1); | ||
| 103 | + criteria1.orEqualTo("shenhe_status", 2); | ||
| 104 | + example.and(criteria1); | ||
| 124 | } | 105 | } |
| 125 | 106 | ||
| 126 | PageHelper.startPage(page, pageSize, true); | 107 | PageHelper.startPage(page, pageSize, true); |
| @@ -131,23 +112,23 @@ public class ChannelServiceImpl { | @@ -131,23 +112,23 @@ public class ChannelServiceImpl { | ||
| 131 | 112 | ||
| 132 | public ShyChannel getDetailsComment(Integer id) { | 113 | public ShyChannel getDetailsComment(Integer id) { |
| 133 | ShyChannel comment = shyChannelMapper.selectByPrimaryKey(id); | 114 | ShyChannel comment = shyChannelMapper.selectByPrimaryKey(id); |
| 134 | - if (comment.getShenhe_status() != CommonConst.AUDIT_INTT) { | ||
| 135 | - String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater())? "白名单":comment.getUpdater(); | ||
| 136 | - String auditor_id = comment.getAuditor(); | ||
| 137 | - if (CommonUtils.isNotEmpty(auditor_id)) { | 115 | + if (!comment.getShenhe_status().equals(CommonConst.AUDIT_INTT)) { |
| 116 | + String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater()) ? "白名单" : comment.getUpdater(); | ||
| 117 | + String auditorId = comment.getAuditor(); | ||
| 118 | + if (CommonUtils.isNotEmpty(auditorId)) { | ||
| 138 | ShyUsers user = new ShyUsers(); | 119 | ShyUsers user = new ShyUsers(); |
| 139 | - user.setUser_id(auditor_id); | 120 | + user.setUser_id(auditorId); |
| 140 | user = shyUsersMapper.selectOne(user); | 121 | user = shyUsersMapper.selectOne(user); |
| 141 | - String email = CommonUtils.isEmpty(user.getEmail())|| "null".equals(user.getEmail()) ? "" : user.getEmail(); | 122 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); |
| 142 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | 123 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 143 | - updater = userName ; | 124 | + updater = userName; |
| 144 | } | 125 | } |
| 145 | comment.setUpdater(updater); | 126 | comment.setUpdater(updater); |
| 146 | } | 127 | } |
| 147 | return comment; | 128 | return comment; |
| 148 | } | 129 | } |
| 149 | 130 | ||
| 150 | - public boolean updateState(String ids, Integer state, String userId,String updater,String msg) { | 131 | + public boolean updateState(String ids, Integer state, String userId, String updater, String msg) { |
| 151 | boolean success = true; | 132 | boolean success = true; |
| 152 | String[] channelIds = ids.split(","); | 133 | String[] channelIds = ids.split(","); |
| 153 | for (String channelId : channelIds) { | 134 | for (String channelId : channelIds) { |
| @@ -157,16 +138,16 @@ public class ChannelServiceImpl { | @@ -157,16 +138,16 @@ public class ChannelServiceImpl { | ||
| 157 | json.put("state", state + 2); | 138 | json.put("state", state + 2); |
| 158 | json.put("channel_id", channel.getChannel_id()); | 139 | json.put("channel_id", channel.getChannel_id()); |
| 159 | json.put("msg", msg); | 140 | json.put("msg", msg); |
| 160 | - JSONObject result = new JSONObject(); | 141 | + JSONObject result; |
| 161 | try { | 142 | try { |
| 162 | result = Pass.channelPass(json, channel.getCallback()); | 143 | result = Pass.channelPass(json, channel.getCallback()); |
| 163 | } catch (Exception e) { | 144 | } catch (Exception e) { |
| 164 | - logger.error("频道回调失败，id:{},channel_id:{}",channel.getId(), channel.getChannel_id()); | 145 | + logger.error("频道回调失败，id:{},channel_id:{}", channel.getId(), channel.getChannel_id()); |
| 165 | success = false; | 146 | success = false; |
| 166 | break; | 147 | break; |
| 167 | } | 148 | } |
| 168 | if (result == null) { | 149 | if (result == null) { |
| 169 | - logger.error("频道回调错误，且无返回信息。id:{},channel_id:{}",channel.getId(), channel.getChannel_id()); | 150 | + logger.error("频道回调错误，且无返回信息。id:{},channel_id:{}", channel.getId(), channel.getChannel_id()); |
| 170 | success = false; | 151 | success = false; |
| 171 | break; | 152 | break; |
| 172 | } else { | 153 | } else { |
| @@ -178,12 +159,12 @@ public class ChannelServiceImpl { | @@ -178,12 +159,12 @@ public class ChannelServiceImpl { | ||
| 178 | } | 159 | } |
| 179 | channel.setShenhe_status(state); | 160 | channel.setShenhe_status(state); |
| 180 | channel.setShenhe_msg(msg); | 161 | channel.setShenhe_msg(msg); |
| 181 | - if(CommonUtils.isEmpty(userId)){ | ||
| 182 | - channel.setUpdater(updater); | ||
| 183 | - channel.setAuditor(null); | ||
| 184 | - }else{ | ||
| 185 | - channel.setAuditor(userId); | ||
| 186 | - channel.setUpdater(null); | 162 | + if (CommonUtils.isEmpty(userId)) { |
| 163 | + channel.setUpdater(updater); | ||
| 164 | + channel.setAuditor(null); | ||
| 165 | + } else { | ||
| 166 | + channel.setAuditor(userId); | ||
| 167 | + channel.setUpdater(null); | ||
| 187 | } | 168 | } |
| 188 | int i = shyChannelMapper.updateByPrimaryKey(channel); | 169 | int i = shyChannelMapper.updateByPrimaryKey(channel); |
| 189 | if (i != 1) { | 170 | if (i != 1) { |
| @@ -199,26 +180,30 @@ public class ChannelServiceImpl { | @@ -199,26 +180,30 @@ public class ChannelServiceImpl { | ||
| 199 | ShyChannel shyChannel = shyChannelMapper.selectByPrimaryKey(id); | 180 | ShyChannel shyChannel = shyChannelMapper.selectByPrimaryKey(id); |
| 200 | return shyChannel; | 181 | return shyChannel; |
| 201 | } | 182 | } |
| 183 | + | ||
| 202 | public int updateByPrimaryKeySelective(ShyChannel channel) { | 184 | public int updateByPrimaryKeySelective(ShyChannel channel) { |
| 203 | return shyChannelMapper.updateByPrimaryKeySelective(channel); | 185 | return shyChannelMapper.updateByPrimaryKeySelective(channel); |
| 204 | } | 186 | } |
| 205 | - | 187 | + |
| 206 | /** | 188 | /** |
| 207 | * 获得审核类型 | 189 | * 获得审核类型 |
| 190 | + * | ||
| 208 | * @param shyChannel | 191 | * @param shyChannel |
| 209 | */ | 192 | */ |
| 210 | - public void getShenheType(ShyChannel shyChannel){ | ||
| 211 | - | ||
| 212 | - //获取直播频道免审sp | 193 | + public void getShenheType(ShyChannel shyChannel) { |
| 194 | + | ||
| 195 | + //获取直播频道免审sp | ||
| 213 | List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CHANNEL); | 196 | List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CHANNEL); |
| 214 | //初始化一个审核状态 | 197 | //初始化一个审核状态 |
| 215 | - Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审 | 198 | + //审核类型，1:免审，2:机审，3:人工审 |
| 199 | + Integer shenheType = 3; | ||
| 216 | //如果当前sp是免审sp | 200 | //如果当前sp是免审sp |
| 217 | - if(sites.contains(shyChannel.getSp_id())){ | ||
| 218 | - shenheType=1;//免审 | 201 | + if (sites.contains(shyChannel.getSp_id())) { |
| 202 | + //免审 | ||
| 203 | + shenheType = 1; | ||
| 219 | } | 204 | } |
| 220 | shyChannel.setShenhe_type(shenheType); | 205 | shyChannel.setShenhe_type(shenheType); |
| 221 | - } | 206 | + } |
| 222 | 207 | ||
| 223 | } | 208 | } |
| 224 | 209 |
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
0 → 100644
| 1 | +package com.cnlive.shenhe.serviceImpl; | ||
| 2 | + | ||
| 3 | + | ||
| 4 | +import com.cnlive.shenhe.dto.ShyActivityDTO; | ||
| 5 | +import com.cnlive.shenhe.entity.ShyActivity; | ||
| 6 | +import com.cnlive.shenhe.mapper.ShyActivityMapper; | ||
| 7 | +import com.cnlive.shenhe.utils.CommonUtils; | ||
| 8 | +import com.github.pagehelper.Page; | ||
| 9 | +import com.github.pagehelper.PageHelper; | ||
| 10 | +import com.github.pagehelper.PageInfo; | ||
| 11 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 12 | +import org.springframework.stereotype.Service; | ||
| 13 | +import org.springframework.web.bind.annotation.RequestParam; | ||
| 14 | +import tk.mybatis.mapper.entity.Example; | ||
| 15 | + | ||
| 16 | +import java.security.PublicKey; | ||
| 17 | +import java.util.Date; | ||
| 18 | +import java.util.List; | ||
| 19 | + | ||
| 20 | +/** | ||
| 21 | + * @author Administrator | ||
| 22 | + * @author yanzhaowang | ||
| 23 | + * @create 2022-03-08 10:43 | ||
| 24 | + */ | ||
| 25 | +@Service | ||
| 26 | +public class ShyActivityImpl { | ||
| 27 | + | ||
| 28 | + @Autowired | ||
| 29 | + private ShyActivityMapper ShyActivityMapper; | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 添加活动 | ||
| 33 | + * | ||
| 34 | + * @param shyActivity | ||
| 35 | + * @return | ||
| 36 | + */ | ||
| 37 | + public int insertShyActivity(ShyActivity shyActivity) { | ||
| 38 | + Date date = new Date(); | ||
| 39 | + shyActivity.setCreate_time(date); | ||
| 40 | + shyActivity.setUpdate_time(date); | ||
| 41 | + Byte aByte = new Byte("0"); | ||
| 42 | + shyActivity.setExempt_from_trial(aByte); | ||
| 43 | + int i = ShyActivityMapper.insertSelective(shyActivity); | ||
| 44 | + return i; | ||
| 45 | + } | ||
| 46 | + | ||
| 47 | + /** | ||
| 48 | + * 根据主键删除活动 | ||
| 49 | + * | ||
| 50 | + * @param id | ||
| 51 | + * @return | ||
| 52 | + */ | ||
| 53 | + public int deleteShyActivity(Integer id) { | ||
| 54 | + | ||
| 55 | + int i = ShyActivityMapper.deleteByPrimaryKey(id); | ||
| 56 | + return i; | ||
| 57 | + } | ||
| 58 | + | ||
| 59 | + /** | ||
| 60 | + * 修改活动 | ||
| 61 | + * | ||
| 62 | + * @param shyActivity | ||
| 63 | + * @return | ||
| 64 | + */ | ||
| 65 | + public int updateShyActivity(ShyActivity shyActivity) { | ||
| 66 | + Date date = new Date(); | ||
| 67 | + shyActivity.setCreate_time(date); | ||
| 68 | + shyActivity.setUpdate_time(date); | ||
| 69 | + int i = ShyActivityMapper.updateByPrimaryKeySelective(shyActivity); | ||
| 70 | + return i; | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + /** | ||
| 74 | + * 查询活动 | ||
| 75 | + * @param pageNum | ||
| 76 | + * @param pageSize | ||
| 77 | + * @return | ||
| 78 | + */ | ||
| 79 | + public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize,String activity,String exempt_from_trial) { | ||
| 80 | + Example example = new Example(ShyActivity.class); | ||
| 81 | + //如果为空 按照倒序排序 分页查询所有 | ||
| 82 | + //以创建时间为条件进行倒序 | ||
| 83 | + example.setOrderByClause("`create_time` desc"); | ||
| 84 | + | ||
| 85 | + Example.Criteria criteria = example.createCriteria(); | ||
| 86 | + | ||
| 87 | + // 如果查询条件不为空 按照条件走模糊查询 | ||
| 88 | + if (CommonUtils.isNotEmpty(exempt_from_trial)) { | ||
| 89 | + criteria.andLike("exempt_from_trial", "%" + exempt_from_trial + "%"); | ||
| 90 | + } | ||
| 91 | + // 如果查询条件不为空 按照条件走模糊查询 | ||
| 92 | + if (CommonUtils.isNotEmpty(activity)) { | ||
| 93 | + criteria.andLike("activity", "%" + activity + "%"); | ||
| 94 | + } | ||
| 95 | + PageHelper.startPage(pageNum, pageSize, true); | ||
| 96 | + List<ShyActivity> shyActivities = ShyActivityMapper.selectByExample(example); | ||
| 97 | + PageInfo<ShyActivity> shyActivityPageInfo = new PageInfo<>(shyActivities); | ||
| 98 | + return shyActivityPageInfo; | ||
| 99 | + } | ||
| 100 | + | ||
| 101 | + | ||
| 102 | + /** | ||
| 103 | + * 根据条件查询活动 | ||
| 104 | + * | ||
| 105 | + * @param | ||
| 106 | + * @param exempt_from_trial | ||
| 107 | + * @return | ||
| 108 | + */ | ||
| 109 | + public List<Integer> selectByExample(Integer exempt_from_trial) { | ||
| 110 | + List<Integer> shyActivities = ShyActivityMapper.selectAllByExempt_from_trial(exempt_from_trial); | ||
| 111 | + return shyActivities; | ||
| 112 | + } | ||
| 113 | + | ||
| 114 | + /** | ||
| 115 | + * 查询所有的数据 | ||
| 116 | + */ | ||
| 117 | + /** | ||
| 118 | + * @return | ||
| 119 | + */ | ||
| 120 | + public List<ShyActivity> selectAll() { | ||
| 121 | + List<ShyActivity> shyActivities = ShyActivityMapper.selectAll(); | ||
| 122 | + return shyActivities; | ||
| 123 | + } | ||
| 124 | + | ||
| 125 | +} |
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
| @@ -8,7 +8,6 @@ import com.cnlive.shenhe.entity.ShyUsers; | @@ -8,7 +8,6 @@ import com.cnlive.shenhe.entity.ShyUsers; | ||
| 8 | import com.cnlive.shenhe.entity.ShyUsersfree; | 8 | import com.cnlive.shenhe.entity.ShyUsersfree; |
| 9 | import com.cnlive.shenhe.entity.ShyVideos; | 9 | import com.cnlive.shenhe.entity.ShyVideos; |
| 10 | import com.cnlive.shenhe.entity.ShyYidun; | 10 | import com.cnlive.shenhe.entity.ShyYidun; |
| 11 | -import com.cnlive.shenhe.mapper.ShySitesMapper; | ||
| 12 | import com.cnlive.shenhe.mapper.ShyUsersMapper; | 11 | import com.cnlive.shenhe.mapper.ShyUsersMapper; |
| 13 | import com.cnlive.shenhe.mapper.ShyVideosMapper; | 12 | import com.cnlive.shenhe.mapper.ShyVideosMapper; |
| 14 | import com.cnlive.shenhe.utils.AuditPass; | 13 | import com.cnlive.shenhe.utils.AuditPass; |
| @@ -42,8 +41,6 @@ public class VideosServiceImpl { | @@ -42,8 +41,6 @@ public class VideosServiceImpl { | ||
| 42 | @Autowired | 41 | @Autowired |
| 43 | ShyVideosMapper shyVideosMapper; | 42 | ShyVideosMapper shyVideosMapper; |
| 44 | @Autowired | 43 | @Autowired |
| 45 | - ShySitesMapper shySitesMapper; | ||
| 46 | - @Autowired | ||
| 47 | ShyUsersMapper shyUsersMapper; | 44 | ShyUsersMapper shyUsersMapper; |
| 48 | 45 | ||
| 49 | @Autowired | 46 | @Autowired |
| @@ -55,9 +52,9 @@ public class VideosServiceImpl { | @@ -55,9 +52,9 @@ public class VideosServiceImpl { | ||
| 55 | UsersfreeServiceImpl usersfreeServiceImpl; | 52 | UsersfreeServiceImpl usersfreeServiceImpl; |
| 56 | 53 | ||
| 57 | @Autowired | 54 | @Autowired |
| 58 | - VideofilterServiceImpl videofilterServiceImpl; | ||
| 59 | - @Autowired | ||
| 60 | YiDunServiceImpl yiDunServiceImpl; | 55 | YiDunServiceImpl yiDunServiceImpl; |
| 56 | + @Autowired | ||
| 57 | + ShyActivityImpl shyActivityImpl; | ||
| 61 | 58 | ||
| 62 | @Value("${qn_domain}") | 59 | @Value("${qn_domain}") |
| 63 | String qn_domain; | 60 | String qn_domain; |
| @@ -124,8 +121,6 @@ public class VideosServiceImpl { | @@ -124,8 +121,6 @@ public class VideosServiceImpl { | ||
| 124 | Timestamp startdate = null; | 121 | Timestamp startdate = null; |
| 125 | Timestamp enddate = null; | 122 | Timestamp enddate = null; |
| 126 | try { | 123 | try { |
| 127 | -// startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss"); | ||
| 128 | -// enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss"); | ||
| 129 | startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | 124 | startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); |
| 130 | enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | 125 | enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); |
| 131 | } catch (ParseException e) { | 126 | } catch (ParseException e) { |
| @@ -161,12 +156,15 @@ public class VideosServiceImpl { | @@ -161,12 +156,15 @@ public class VideosServiceImpl { | ||
| 161 | } | 156 | } |
| 162 | } | 157 | } |
| 163 | 158 | ||
| 164 | - if (CommonUtils.isNotEmpty(source) && !"moment".equals(source)) { | 159 | + if (CommonUtils.isNotEmpty(source) && !"22".equals(source) && !"102".equals(source)) { |
| 165 | criteria.andEqualTo("source", source); | 160 | criteria.andEqualTo("source", source); |
| 166 | criteria2.andEqualTo("source", source); | 161 | criteria2.andEqualTo("source", source); |
| 167 | - } else if (CommonUtils.isNotEmpty(source) && "moment".equals(source)) { | 162 | + } else if (CommonUtils.isNotEmpty(source) && "22".equals(source)) { |
| 168 | criteria.andEqualTo("category", source); | 163 | criteria.andEqualTo("category", source); |
| 169 | criteria2.andEqualTo("category", source); | 164 | criteria2.andEqualTo("category", source); |
| 165 | + } else if (CommonUtils.isNotEmpty(source) && "102".equals(source)) { | ||
| 166 | + criteria.andEqualTo("source", "102".equals(source) ? "0" : source); | ||
| 167 | + criteria2.andEqualTo("source", "102".equals(source) ? "0" : source); | ||
| 170 | } | 168 | } |
| 171 | 169 | ||
| 172 | if (CommonUtils.isNotEmpty(video_user_id)) { | 170 | if (CommonUtils.isNotEmpty(video_user_id)) { |
| @@ -298,8 +296,6 @@ public class VideosServiceImpl { | @@ -298,8 +296,6 @@ public class VideosServiceImpl { | ||
| 298 | Timestamp startdate = null; | 296 | Timestamp startdate = null; |
| 299 | Timestamp enddate = null; | 297 | Timestamp enddate = null; |
| 300 | try { | 298 | try { |
| 301 | -// startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss"); | ||
| 302 | -// enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss"); | ||
| 303 | startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | 299 | startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); |
| 304 | enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | 300 | enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); |
| 305 | } catch (ParseException e) { | 301 | } catch (ParseException e) { |
| @@ -371,13 +367,12 @@ public class VideosServiceImpl { | @@ -371,13 +367,12 @@ public class VideosServiceImpl { | ||
| 371 | url = url + "(" + uuid + ")"; | 367 | url = url + "(" + uuid + ")"; |
| 372 | } | 368 | } |
| 373 | //易盾返回结果的类型 | 369 | //易盾返回结果的类型 |
| 374 | - String type = ""; | ||
| 375 | - //易盾失败结果的详情 | ||
| 376 | - String desc = ""; | ||
| 377 | //调用易盾智能图片审核接口 | 370 | //调用易盾智能图片审核接口 |
| 378 | JSONObject imagesFilter = YiDunAntiFraudUtil.getImagesFilter(jsonArray.toJSONString()); | 371 | JSONObject imagesFilter = YiDunAntiFraudUtil.getImagesFilter(jsonArray.toJSONString()); |
| 379 | - type = imagesFilter.getString("type"); | ||
| 380 | - desc = imagesFilter.getString("desc"); | 372 | + //易盾返回结果的类型 |
| 373 | + String type = imagesFilter.getString("type"); | ||
| 374 | + //易盾失败结果的详情 | ||
| 375 | + String desc = imagesFilter.getString("desc"); | ||
| 381 | if (type.toLowerCase().equals(CommonConst.PASS)) { | 376 | if (type.toLowerCase().equals(CommonConst.PASS)) { |
| 382 | shyVideos.setMsg(desc); | 377 | shyVideos.setMsg(desc); |
| 383 | //修改点播云视频状态 | 378 | //修改点播云视频状态 |
| @@ -466,18 +461,13 @@ public class VideosServiceImpl { | @@ -466,18 +461,13 @@ public class VideosServiceImpl { | ||
| 466 | public void getShenheType(ShyVideos shyVideo) { | 461 | public void getShenheType(ShyVideos shyVideo) { |
| 467 | //获取点播免审sp | 462 | //获取点播免审sp |
| 468 | List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_VIDEO); | 463 | List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_VIDEO); |
| 464 | + List<Integer> shyActivities = shyActivityImpl.selectByExample(CommonConst.AUDIT_TYPE_FREE); | ||
| 469 | logger.info("sites" + sites.toString()); | 465 | logger.info("sites" + sites.toString()); |
| 470 | //初始化一个审核状态 | 466 | //初始化一个审核状态 |
| 471 | //审核类型，1:免审，2:机审，3:人工审 | 467 | //审核类型，1:免审，2:机审，3:人工审 |
| 472 | Integer shenheType = 3; | 468 | Integer shenheType = 3; |
| 473 | - //如果当前sp是免审sp 增加免审渠道类型 | ||
| 474 | - if (sites.contains(shyVideo.getSpid()) || "1".equals(shyVideo.getSource()) | ||
| 475 | - || "9".equals(shyVideo.getSource()) || "8".equals(shyVideo.getSource()) | ||
| 476 | - || "29".equals(shyVideo.getSource()) | ||
| 477 | - || "30".equals(shyVideo.getSource()) || "31".equals(shyVideo.getSource()) | ||
| 478 | - || "36".equals(shyVideo.getSource()) || "38".equals(shyVideo.getSource()) | ||
| 479 | - || "39".equals(shyVideo.getSource()) | ||
| 480 | - || "40".equals(shyVideo.getSource()) || "50".equals(shyVideo.getSource())) { | 469 | + //如果当前sp是免审sp |
| 470 | + if (sites.contains(shyVideo.getSpid()) || shyActivities.contains(shyVideo.getSource())) { | ||
| 481 | //免审 | 471 | //免审 |
| 482 | shenheType = 1; | 472 | shenheType = 1; |
| 483 | } else { | 473 | } else { |
src/main/java/com/cnlive/shenhe/utils/CommonUtils.java
| @@ -42,14 +42,10 @@ public class CommonUtils { | @@ -42,14 +42,10 @@ public class CommonUtils { | ||
| 42 | public static Timestamp getCurrentTime() { | 42 | public static Timestamp getCurrentTime() { |
| 43 | return new Timestamp(new Date().getTime()); | 43 | return new Timestamp(new Date().getTime()); |
| 44 | } | 44 | } |
| 45 | + | ||
| 45 | //获取当前时间加上一个时间（分钟算） | 46 | //获取当前时间加上一个时间（分钟算） |
| 46 | public static Timestamp getAddTime(Integer addTime) { | 47 | public static Timestamp getAddTime(Integer addTime) { |
| 47 | - return new Timestamp(new Date().getTime()+addTime*60*1000); | ||
| 48 | - } | ||
| 49 | - | ||
| 50 | - public static String getRandowUUID() { | ||
| 51 | - UUID uuid = UUID.randomUUID(); | ||
| 52 | - return uuid.toString().replaceAll("-", ""); | 48 | + return new Timestamp(new Date().getTime() + addTime * 60 * 1000); |
| 53 | } | 49 | } |
| 54 | 50 | ||
| 55 | public static boolean isEmpty(String str) { | 51 | public static boolean isEmpty(String str) { |
src/main/java/com/cnlive/shenhe/utils/YiDunAntiFraudUtil.java
| @@ -2,8 +2,6 @@ package com.cnlive.shenhe.utils; | @@ -2,8 +2,6 @@ package com.cnlive.shenhe.utils; | ||
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSONArray; | 3 | import com.alibaba.fastjson.JSONArray; |
| 4 | import com.alibaba.fastjson.JSONObject; | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | -import com.cnlive.shenhe.api.AvsampleCallBackControllerApi; | ||
| 6 | -import com.cnlive.shenhe.entity.ShyYidun; | ||
| 7 | import com.cnlive.shenhe.enums.ImageLabels; | 5 | import com.cnlive.shenhe.enums.ImageLabels; |
| 8 | import com.cnlive.shenhe.enums.TextLabels; | 6 | import com.cnlive.shenhe.enums.TextLabels; |
| 9 | import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl; | 7 | import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl; |
| @@ -141,7 +139,7 @@ public class YiDunAntiFraudUtil { | @@ -141,7 +139,7 @@ public class YiDunAntiFraudUtil { | ||
| 141 | * @param url | 139 | * @param url |
| 142 | * @return | 140 | * @return |
| 143 | */ | 141 | */ |
| 144 | - public static JSONObject submitAudioOnDemandUrl(String url,String callbackUrl) { | 142 | + public static JSONObject submitAudioOnDemandUrl(String url, String callbackUrl) { |
| 145 | try { | 143 | try { |
| 146 | Map<String, String> params = new HashMap<>(); | 144 | Map<String, String> params = new HashMap<>(); |
| 147 | // 1.设置公共参数 | 145 | // 1.设置公共参数 |
| @@ -265,7 +263,7 @@ public class YiDunAntiFraudUtil { | @@ -265,7 +263,7 @@ public class YiDunAntiFraudUtil { | ||
| 265 | public static JSONObject getImagesFilter(String jsonImg) { | 263 | public static JSONObject getImagesFilter(String jsonImg) { |
| 266 | JSONObject jsonObj = new JSONObject(); | 264 | JSONObject jsonObj = new JSONObject(); |
| 267 | try { | 265 | try { |
| 268 | - Map<String, String> params = new HashMap<String, String>(); | 266 | + Map<String, String> params = new HashMap<>(7); |
| 269 | // 1.设置公共参数 | 267 | // 1.设置公共参数 |
| 270 | params.put("secretId", TEXTANDIMAGESECRETID); | 268 | params.put("secretId", TEXTANDIMAGESECRETID); |
| 271 | params.put("businessId", IMAGEBUSINESSID); | 269 | params.put("businessId", IMAGEBUSINESSID); |
src/main/resources/application.properties
| 1 | -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false | ||
| 2 | -#spring.datasource.username=root | ||
| 3 | -#spring.datasource.password=nbLdyO.79 | ||
| 4 | - | ||
| 5 | -#\u91d1\u5c71\u4e00\u533a\u6570\u636e\u5e93 | ||
| 6 | -#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false | ||
| 7 | -#spring.datasource.username=admin | ||
| 8 | -#spring.datasource.password=Sre#45iU7kJ | ||
| 9 | - | ||
| 10 | -#\u91d1\u5c71\u516d\u533a\u6570\u636e\u5e93 | ||
| 11 | -spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false | ||
| 12 | -spring.datasource.username=admin | ||
| 13 | -spring.datasource.password=83BwiCoq | 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! | ||
| 14 | 4 | ||
| 15 | spring.datasource.driver-class-name=com.mysql.jdbc.Driver | 5 | spring.datasource.driver-class-name=com.mysql.jdbc.Driver |
| 16 | 6 | ||
| @@ -29,83 +19,83 @@ spring.http.encoding.force=true | @@ -29,83 +19,83 @@ spring.http.encoding.force=true | ||
| 29 | spring.thymeleaf.mode=LEGACYHTML5 | 19 | spring.thymeleaf.mode=LEGACYHTML5 |
| 30 | #spring.thymeleaf.encoding=UTF-8 | 20 | #spring.thymeleaf.encoding=UTF-8 |
| 31 | #spring.thymeleaf.content-type=text/html | 21 | #spring.thymeleaf.content-type=text/html |
| 32 | -#\u5f00\u53d1\u65f6\u5173\u95ed\u7f13\u5b58,\u4e0d\u7136\u6ca1\u6cd5\u770b\u5230\u5b9e\u65f6\u9875\u9762 | 22 | +#\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762 |
| 33 | spring.thymeleaf.cache=false | 23 | spring.thymeleaf.cache=false |
| 34 | 24 | ||
| 35 | -#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql | 25 | +#\u6253\u5370\u8FD0\u884C\u65F6\u7684sql |
| 36 | #logging.level.com.cnlive.shenhe.mapper=debug | 26 | #logging.level.com.cnlive.shenhe.mapper=debug |
| 37 | 27 | ||
| 38 | mybatis.mapper-locations=classpath:mapper/*.xml | 28 | mybatis.mapper-locations=classpath:mapper/*.xml |
| 39 | mybatis.type-aliases-package=com.cnlive.shenhe.entity | 29 | mybatis.type-aliases-package=com.cnlive.shenhe.entity |
| 40 | -server.port=81 | 30 | +server.port=82 |
| 41 | 31 | ||
| 42 | -#rabbitmq\u76f8\u5173\u914d\u7f6e | ||
| 43 | -spring.rabbitmq.host=10.254.176.11 | 32 | +#rabbitmq\u76F8\u5173\u914D\u7F6E |
| 33 | +spring.rabbitmq.host=10.254.174.131 | ||
| 44 | spring.rabbitmq.port=5672 | 34 | spring.rabbitmq.port=5672 |
| 45 | -spring.rabbitmq.username=admin | ||
| 46 | -spring.rabbitmq.password=fA{5Uikx7 | ||
| 47 | -# \u5f00\u542f\u53d1\u9001\u786e\u8ba4 | 35 | +spring.rabbitmq.username=test |
| 36 | +spring.rabbitmq.password=p3~amKKt9 | ||
| 37 | +# \u5F00\u542F\u53D1\u9001\u786E\u8BA4 | ||
| 48 | spring.rabbitmq.publisher-confirms=true | 38 | spring.rabbitmq.publisher-confirms=true |
| 49 | -# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de | 39 | +# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE |
| 50 | spring.rabbitmq.publisher-returns=true | 40 | spring.rabbitmq.publisher-returns=true |
| 51 | -# \u5f00\u542fACK | 41 | +# \u5F00\u542FACK |
| 52 | spring.rabbitmq.listener.direct.acknowledge-mode=manual | 42 | spring.rabbitmq.listener.direct.acknowledge-mode=manual |
| 53 | spring.rabbitmq.listener.simple.acknowledge-mode=manual | 43 | spring.rabbitmq.listener.simple.acknowledge-mode=manual |
| 54 | 44 | ||
| 55 | -#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5 | 45 | +#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5 |
| 56 | #topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid= | 46 | #topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid= |
| 57 | 47 | ||
| 58 | -#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico | 48 | +#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico |
| 59 | spring.mvc.favicon.enabled = false | 49 | spring.mvc.favicon.enabled = false |
| 60 | 50 | ||
| 61 | -#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API | 51 | +#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API |
| 62 | speak_comment=http://comment.cnlive.com/services/commentForTopic/muted | 52 | speak_comment=http://comment.cnlive.com/services/commentForTopic/muted |
| 63 | 53 | ||
| 64 | -#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528 | ||
| 65 | -spring.application.name=cnlive_shenhe | ||
| 66 | -spring.application.home=/usr/local/cnlive_shenhe/log | 54 | +#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528 |
| 55 | +spring.application.name=cnlive_shenhe_test | ||
| 56 | +spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log | ||
| 67 | 57 | ||
| 68 | sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser | 58 | sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser |
| 69 | sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae | 59 | sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae |
| 70 | 60 | ||
| 71 | -#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f | 61 | +#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F |
| 72 | queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName= | 62 | queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName= |
| 73 | queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid= | 63 | queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid= |
| 74 | 64 | ||
| 75 | -#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf | 65 | +#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF |
| 76 | url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify | 66 | url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify |
| 77 | platformKey =AUDIT | 67 | platformKey =AUDIT |
| 78 | platformValue=10011438 | 68 | platformValue=10011438 |
| 79 | 69 | ||
| 80 | -#\u672c\u673a\u5730\u5740 | ||
| 81 | -spring.localhost.url=http://shen.cnlive.com | 70 | +#\u672C\u673A\u5730\u5740 |
| 71 | +spring.localhost.url=http://test.shen.cnlive.com | ||
| 82 | 72 | ||
| 83 | -#\u62bd\u5e27\u5e38\u91cf | 73 | +#\u62BD\u5E27\u5E38\u91CF |
| 84 | avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9 | 74 | avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9 |
| 85 | avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9 | 75 | avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9 |
| 86 | -avsmple_url=http://transcode.cnlive.com/api/request | ||
| 87 | -avsmple_callback=http://shen.cnlive.com/api/avsample/callback | 76 | +avsmple_url=http://test.transcode.cnlive.com/api/request |
| 77 | +avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback | ||
| 88 | 78 | ||
| 89 | -#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f | ||
| 90 | -live_url=http://bc.cnlive.com/bokong/activity/activityShenHe | 79 | +#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F |
| 80 | +live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe | ||
| 91 | 81 | ||
| 92 | -#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf | 82 | +#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF |
| 93 | email_app_id=769_jetja50p18 | 83 | email_app_id=769_jetja50p18 |
| 94 | email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba | 84 | email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba |
| 95 | email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action | 85 | email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action |
| 96 | 86 | ||
| 97 | -#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d | ||
| 98 | -#qn_bucket=cnlivetest | ||
| 99 | -#qn_domain=http://test.qnvod.cnlive.com | ||
| 100 | -#ks_bucket=cnlive-test | ||
| 101 | -#ks_domain=http://test.wideo.cnlive.com | 87 | +#\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D |
| 88 | +qn_bucket=cnlivetest | ||
| 89 | +qn_domain=http://test.qnvod.cnlive.com | ||
| 90 | +ks_bucket=cnlive-test | ||
| 91 | +ks_domain=http://test.wideo.cnlive.com | ||
| 102 | 92 | ||
| 103 | -qn_bucket=mam-sxzg-82 | ||
| 104 | -qn_domain=http://sxzg.ys2.cnliveimg.com | ||
| 105 | -ks_bucket=mam-sxzg-82 | ||
| 106 | -ks_domain=http://sxzg.ys1.cnliveimg.com | 93 | +#qn_bucket=mam-sxzg-82 |
| 94 | +#qn_domain=http://sxzg.ys2.cnliveimg.com | ||
| 95 | +#ks_bucket=mam-sxzg-82 | ||
| 96 | +#ks_domain=http://sxzg.ys1.cnliveimg.com | ||
| 107 | 97 | ||
| 108 | -#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84 | 98 | +#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84 |
| 109 | desdir=shen | 99 | desdir=shen |
| 110 | -yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio | ||
| 111 | -cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById | ||
| 112 | \ No newline at end of file | 100 | \ No newline at end of file |
| 101 | +yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio | ||
| 102 | +cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById |
src/main/resources/generatorConfig.xml
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | <jdbcConnection driverClass="com.mysql.jdbc.Driver" | 25 | <jdbcConnection driverClass="com.mysql.jdbc.Driver" |
| 26 | - connectionURL="jdbc:mysql://120.92.102.31:3306/new_shy??useUnicode=true&characterEncoding=utf8&characterSetResults=utf8" | 26 | + connectionURL="jdbc:mysql://120.92.102.31:3306/new_shy?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8" |
| 27 | userId="root" | 27 | userId="root" |
| 28 | password="M345sdfss4!"> | 28 | password="M345sdfss4!"> |
| 29 | </jdbcConnection> | 29 | </jdbcConnection> |
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | <sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources"/> | 32 | <sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources"/> |
| 33 | <javaClientGenerator targetPackage="com.cnlive.shenhe.mapper" targetProject="src/main/java" | 33 | <javaClientGenerator targetPackage="com.cnlive.shenhe.mapper" targetProject="src/main/java" |
| 34 | type="XMLMAPPER"/> | 34 | type="XMLMAPPER"/> |
| 35 | - <table schema="" tableName="%" domainObjectName=""> | 35 | + <table schema="new_shy" tableName="shy_activity" domainObjectName=""> |
| 36 | <property name="useActualColumnNames" value="true" /> | 36 | <property name="useActualColumnNames" value="true" /> |
| 37 | </table> | 37 | </table> |
| 38 | </context> | 38 | </context> |
src/main/resources/mapper/ShyActivityMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 3 | +<mapper namespace="com.cnlive.shenhe.mapper.ShyActivityMapper"> | ||
| 4 | + <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.ShyActivity"> | ||
| 5 | + <!-- | ||
| 6 | + WARNING - @mbg.generated | ||
| 7 | + --> | ||
| 8 | + <id column="id" jdbcType="INTEGER" property="id" /> | ||
| 9 | + <result column="activity" jdbcType="VARCHAR" property="activity" /> | ||
| 10 | + <result column="create_time" jdbcType="TIMESTAMP" property="create_time" /> | ||
| 11 | + <result column="update_time" jdbcType="TIMESTAMP" property="update_time" /> | ||
| 12 | + <result column="exempt_from_trial" jdbcType="TINYINT" property="exempt_from_trial" /> | ||
| 13 | + </resultMap> | ||
| 14 | + <select id="selectAllByExempt_from_trial" resultType="java.lang.Integer"> | ||
| 15 | + select id from shy_activity where exempt_from_trial=${exempt_from_trial}; | ||
| 16 | + </select> | ||
| 17 | + | ||
| 18 | + | ||
| 19 | +</mapper> | ||
| 0 | \ No newline at end of file | 20 | \ No newline at end of file |
src/main/resources/static/css/bootstrap-table.min.css
| 1 | -.fixed-table-container .bs-checkbox,.fixed-table-container .no-records-found{text-align:center}.fixed-table-body thead th .th-inner,.table td,.table th{box-sizing:border-box}.bootstrap-table .table{margin-bottom:0!important;border-bottom:1px solid #ddd;border-collapse:collapse!important;border-radius:1px}.bootstrap-table .table:not(.table-condensed),.bootstrap-table .table:not(.table-condensed)>tbody>tr>td,.bootstrap-table .table:not(.table-condensed)>tbody>tr>th,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>td,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>th,.bootstrap-table .table:not(.table-condensed)>thead>tr>td{padding:8px}.bootstrap-table .table.table-no-bordered>tbody>tr>td,.bootstrap-table .table.table-no-bordered>thead>tr>th{border-right:2px solid transparent}.bootstrap-table .table.table-no-bordered>tbody>tr>td:last-child{border-right:none}.fixed-table-container{position:relative;clear:both;border:1px solid #ddd;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}.fixed-table-container.table-no-bordered{border:1px solid transparent}.fixed-table-footer,.fixed-table-header{overflow:hidden}.fixed-table-footer{border-top:1px solid #ddd}.fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.fixed-table-container table{width:100%}.fixed-table-container thead th{height:0;padding:0;margin:0;border-left:1px solid #ddd}.fixed-table-container thead th:focus{outline:transparent solid 0}.fixed-table-container thead th:first-child{border-left:none;border-top-left-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px}.fixed-table-container tbody td .th-inner,.fixed-table-container thead th .th-inner{padding:8px;line-height:24px;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.fixed-table-container thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px}.fixed-table-container thead th .both{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC')}.fixed-table-container thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.fixed-table-container thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.fixed-table-container th.detail{width:30px}.fixed-table-container tbody td{border-left:1px solid #ddd}.fixed-table-container tbody tr:first-child td{border-top:none}.fixed-table-container tbody td:first-child{border-left:none}.fixed-table-container tbody .selected td{background-color:#f5f5f5}.fixed-table-container .bs-checkbox .th-inner{padding:8px 0}.fixed-table-container input[type=radio],.fixed-table-container input[type=checkbox]{margin:0 auto!important}.fixed-table-pagination .pagination-detail,.fixed-table-pagination div.pagination{margin-top:10px;margin-bottom:10px}.fixed-table-pagination div.pagination .pagination{margin:0}.fixed-table-pagination .pagination a{padding:6px 12px;line-height:1.428571429}.fixed-table-pagination .pagination-info{line-height:34px;margin-right:5px}.fixed-table-pagination .btn-group{position:relative;display:inline-block;vertical-align:middle}.fixed-table-pagination .dropup .dropdown-menu{margin-bottom:0}.fixed-table-pagination .page-list{display:inline-block}.fixed-table-toolbar .columns-left{margin-right:5px}.fixed-table-toolbar .columns-right{margin-left:5px}.fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.fixed-table-toolbar .bs-bars,.fixed-table-toolbar .columns,.fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px;line-height:34px}.fixed-table-pagination li.disabled a{pointer-events:none;cursor:default}.fixed-table-loading{display:none;position:absolute;top:42px;right:0;bottom:0;left:0;z-index:99;background-color:#fff;text-align:center}.fixed-table-body .card-view .title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.table td,.table th{vertical-align:middle}.fixed-table-toolbar .dropdown-menu{text-align:left;max-height:300px;overflow:auto}.fixed-table-toolbar .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.fixed-table-toolbar .btn-group>.btn-group>.btn{border-radius:0}.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .table>thead>tr>th{vertical-align:bottom;border-bottom:1px solid #ddd}.bootstrap-table .table thead>tr>th{padding:0;margin:0}.bootstrap-table .fixed-table-footer tbody>tr>td{padding:0!important}.bootstrap-table .fixed-table-footer .table{border-bottom:none;border-radius:0;padding:0!important}.pull-right .dropdown-menu{right:0;left:auto}p.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden} | ||
| 2 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +.fixed-table-container .bs-checkbox, .fixed-table-container .no-records-found { | ||
| 3 | + text-align: center | ||
| 4 | +} | ||
| 5 | + | ||
| 6 | +.fixed-table-body thead th .th-inner, .table td, .table th { | ||
| 7 | + box-sizing: border-box | ||
| 8 | +} | ||
| 9 | + | ||
| 10 | +.bootstrap-table .table { | ||
| 11 | + margin-bottom: 0 !important; | ||
| 12 | + border-bottom: 1px solid #ddd; | ||
| 13 | + border-collapse: collapse !important; | ||
| 14 | + border-radius: 1px | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +.bootstrap-table .table:not(.table-condensed), .bootstrap-table .table:not(.table-condensed) > tbody > tr > td, .bootstrap-table .table:not(.table-condensed) > tbody > tr > th, .bootstrap-table .table:not(.table-condensed) > tfoot > tr > td, .bootstrap-table .table:not(.table-condensed) > tfoot > tr > th, .bootstrap-table .table:not(.table-condensed) > thead > tr > td { | ||
| 18 | + padding: 8px | ||
| 19 | +} | ||
| 20 | + | ||
| 21 | +.bootstrap-table .table.table-no-bordered > tbody > tr > td, .bootstrap-table .table.table-no-bordered > thead > tr > th { | ||
| 22 | + border-right: 2px solid transparent | ||
| 23 | +} | ||
| 24 | + | ||
| 25 | +.bootstrap-table .table.table-no-bordered > tbody > tr > td:last-child { | ||
| 26 | + border-right: none | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +.fixed-table-container { | ||
| 30 | + position: relative; | ||
| 31 | + clear: both; | ||
| 32 | + border: 1px solid #ddd; | ||
| 33 | + border-radius: 4px; | ||
| 34 | + -webkit-border-radius: 4px; | ||
| 35 | + -moz-border-radius: 4px | ||
| 36 | +} | ||
| 37 | + | ||
| 38 | +.fixed-table-container.table-no-bordered { | ||
| 39 | + border: 1px solid transparent | ||
| 40 | +} | ||
| 41 | + | ||
| 42 | +.fixed-table-footer, .fixed-table-header { | ||
| 43 | + overflow: hidden | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +.fixed-table-footer { | ||
| 47 | + border-top: 1px solid #ddd | ||
| 48 | +} | ||
| 49 | + | ||
| 50 | +.fixed-table-body { | ||
| 51 | + overflow-x: auto; | ||
| 52 | + overflow-y: auto; | ||
| 53 | + height: 100% | ||
| 54 | +} | ||
| 55 | + | ||
| 56 | +.fixed-table-container table { | ||
| 57 | + width: 100% | ||
| 58 | +} | ||
| 59 | + | ||
| 60 | +.fixed-table-container thead th { | ||
| 61 | + height: 0; | ||
| 62 | + padding: 0; | ||
| 63 | + margin: 0; | ||
| 64 | + border-left: 1px solid #ddd | ||
| 65 | +} | ||
| 66 | + | ||
| 67 | +.fixed-table-container thead th:focus { | ||
| 68 | + outline: transparent solid 0 | ||
| 69 | +} | ||
| 70 | + | ||
| 71 | +.fixed-table-container thead th:first-child { | ||
| 72 | + border-left: none; | ||
| 73 | + border-top-left-radius: 4px; | ||
| 74 | + -webkit-border-top-left-radius: 4px; | ||
| 75 | + -moz-border-radius-topleft: 4px | ||
| 76 | +} | ||
| 77 | + | ||
| 78 | +.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner { | ||
| 79 | + padding: 8px; | ||
| 80 | + line-height: 24px; | ||
| 81 | + vertical-align: top; | ||
| 82 | + overflow: hidden; | ||
| 83 | + text-overflow: ellipsis; | ||
| 84 | + white-space: nowrap | ||
| 85 | +} | ||
| 86 | + | ||
| 87 | +.fixed-table-container thead th .sortable { | ||
| 88 | + cursor: pointer; | ||
| 89 | + background-position: right; | ||
| 90 | + background-repeat: no-repeat; | ||
| 91 | + padding-right: 30px | ||
| 92 | +} | ||
| 93 | + | ||
| 94 | +.fixed-table-container thead th .both { | ||
| 95 | + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC') | ||
| 96 | +} | ||
| 97 | + | ||
| 98 | +.fixed-table-container thead th .asc { | ||
| 99 | + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==) | ||
| 100 | +} | ||
| 101 | + | ||
| 102 | +.fixed-table-container thead th .desc { | ||
| 103 | + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=) | ||
| 104 | +} | ||
| 105 | + | ||
| 106 | +.fixed-table-container th.detail { | ||
| 107 | + width: 30px | ||
| 108 | +} | ||
| 109 | + | ||
| 110 | +.fixed-table-container tbody td { | ||
| 111 | + border-left: 1px solid #ddd | ||
| 112 | +} | ||
| 113 | + | ||
| 114 | +.fixed-table-container tbody tr:first-child td { | ||
| 115 | + border-top: none | ||
| 116 | +} | ||
| 117 | + | ||
| 118 | +.fixed-table-container tbody td:first-child { | ||
| 119 | + border-left: none | ||
| 120 | +} | ||
| 121 | + | ||
| 122 | +.fixed-table-container tbody .selected td { | ||
| 123 | + background-color: #f5f5f5 | ||
| 124 | +} | ||
| 125 | + | ||
| 126 | +.fixed-table-container .bs-checkbox .th-inner { | ||
| 127 | + padding: 8px 0 | ||
| 128 | +} | ||
| 129 | + | ||
| 130 | +.fixed-table-container input[type=radio], .fixed-table-container input[type=checkbox] { | ||
| 131 | + margin: 0 auto !important | ||
| 132 | +} | ||
| 133 | + | ||
| 134 | +.fixed-table-pagination .pagination-detail, .fixed-table-pagination div.pagination { | ||
| 135 | + margin-top: 10px; | ||
| 136 | + margin-bottom: 10px | ||
| 137 | +} | ||
| 138 | + | ||
| 139 | +.fixed-table-pagination div.pagination .pagination { | ||
| 140 | + margin: 0 | ||
| 141 | +} | ||
| 142 | + | ||
| 143 | +.fixed-table-pagination .pagination a { | ||
| 144 | + padding: 6px 12px; | ||
| 145 | + line-height: 1.428571429 | ||
| 146 | +} | ||
| 147 | + | ||
| 148 | +.fixed-table-pagination .pagination-info { | ||
| 149 | + line-height: 34px; | ||
| 150 | + margin-right: 5px | ||
| 151 | +} | ||
| 152 | + | ||
| 153 | +.fixed-table-pagination .btn-group { | ||
| 154 | + position: relative; | ||
| 155 | + display: inline-block; | ||
| 156 | + vertical-align: middle | ||
| 157 | +} | ||
| 158 | + | ||
| 159 | +.fixed-table-pagination .dropup .dropdown-menu { | ||
| 160 | + margin-bottom: 0 | ||
| 161 | +} | ||
| 162 | + | ||
| 163 | +.fixed-table-pagination .page-list { | ||
| 164 | + display: inline-block | ||
| 165 | +} | ||
| 166 | + | ||
| 167 | +.fixed-table-toolbar .columns-left { | ||
| 168 | + margin-right: 5px | ||
| 169 | +} | ||
| 170 | + | ||
| 171 | +.fixed-table-toolbar .columns-right { | ||
| 172 | + margin-left: 5px | ||
| 173 | +} | ||
| 174 | + | ||
| 175 | +.fixed-table-toolbar .columns label { | ||
| 176 | + display: block; | ||
| 177 | + padding: 3px 20px; | ||
| 178 | + clear: both; | ||
| 179 | + font-weight: 400; | ||
| 180 | + line-height: 1.428571429 | ||
| 181 | +} | ||
| 182 | + | ||
| 183 | +.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search { | ||
| 184 | + position: relative; | ||
| 185 | + margin-top: 10px; | ||
| 186 | + margin-bottom: 10px; | ||
| 187 | + line-height: 34px | ||
| 188 | +} | ||
| 189 | + | ||
| 190 | +.fixed-table-pagination li.disabled a { | ||
| 191 | + pointer-events: none; | ||
| 192 | + cursor: default | ||
| 193 | +} | ||
| 194 | + | ||
| 195 | +.fixed-table-loading { | ||
| 196 | + display: none; | ||
| 197 | + position: absolute; | ||
| 198 | + top: 42px; | ||
| 199 | + right: 0; | ||
| 200 | + bottom: 0; | ||
| 201 | + left: 0; | ||
| 202 | + z-index: 99; | ||
| 203 | + background-color: #fff; | ||
| 204 | + text-align: center | ||
| 205 | +} | ||
| 206 | + | ||
| 207 | +.fixed-table-body .card-view .title { | ||
| 208 | + font-weight: 700; | ||
| 209 | + display: inline-block; | ||
| 210 | + min-width: 30%; | ||
| 211 | + text-align: left !important | ||
| 212 | +} | ||
| 213 | + | ||
| 214 | +.table td, .table th { | ||
| 215 | + vertical-align: middle | ||
| 216 | +} | ||
| 217 | + | ||
| 218 | +.fixed-table-toolbar .dropdown-menu { | ||
| 219 | + text-align: left; | ||
| 220 | + max-height: 300px; | ||
| 221 | + overflow: auto | ||
| 222 | +} | ||
| 223 | + | ||
| 224 | +.fixed-table-toolbar .btn-group > .btn-group { | ||
| 225 | + display: inline-block; | ||
| 226 | + margin-left: -1px !important | ||
| 227 | +} | ||
| 228 | + | ||
| 229 | +.fixed-table-toolbar .btn-group > .btn-group > .btn { | ||
| 230 | + border-radius: 0 | ||
| 231 | +} | ||
| 232 | + | ||
| 233 | +.fixed-table-toolbar .btn-group > .btn-group:first-child > .btn { | ||
| 234 | + border-top-left-radius: 4px; | ||
| 235 | + border-bottom-left-radius: 4px | ||
| 236 | +} | ||
| 237 | + | ||
| 238 | +.fixed-table-toolbar .btn-group > .btn-group:last-child > .btn { | ||
| 239 | + border-top-right-radius: 4px; | ||
| 240 | + border-bottom-right-radius: 4px | ||
| 241 | +} | ||
| 242 | + | ||
| 243 | +.bootstrap-table .table > thead > tr > th { | ||
| 244 | + vertical-align: bottom; | ||
| 245 | + border-bottom: 1px solid #ddd | ||
| 246 | +} | ||
| 247 | + | ||
| 248 | +.bootstrap-table .table thead > tr > th { | ||
| 249 | + padding: 0; | ||
| 250 | + margin: 0 | ||
| 251 | +} | ||
| 252 | + | ||
| 253 | +.bootstrap-table .fixed-table-footer tbody > tr > td { | ||
| 254 | + padding: 0 !important | ||
| 255 | +} | ||
| 256 | + | ||
| 257 | +.bootstrap-table .fixed-table-footer .table { | ||
| 258 | + border-bottom: none; | ||
| 259 | + border-radius: 0; | ||
| 260 | + padding: 0 !important | ||
| 261 | +} | ||
| 262 | + | ||
| 263 | +.pull-right .dropdown-menu { | ||
| 264 | + right: 0; | ||
| 265 | + left: auto | ||
| 266 | +} | ||
| 267 | + | ||
| 268 | +p.fixed-table-scroll-inner { | ||
| 269 | + width: 100%; | ||
| 270 | + height: 200px | ||
| 271 | +} | ||
| 272 | + | ||
| 273 | +div.fixed-table-scroll-outer { | ||
| 274 | + top: 0; | ||
| 275 | + left: 0; | ||
| 276 | + visibility: hidden; | ||
| 277 | + width: 200px; | ||
| 278 | + height: 150px; | ||
| 279 | + overflow: hidden | ||
| 280 | +} | ||
| 3 | \ No newline at end of file | 281 | \ No newline at end of file |