Commit 86944d7928c097f2b4463d1529e62448472665ba
Merge branch 'dev' into dev_wangyanzhao
# Conflicts: # src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java # src/main/java/com/cnlive/shenhe/controller/ChannelController.java # src/main/java/com/cnlive/shenhe/utils/CommonUtils.java # src/main/resources/application.properties
Showing
32 changed files
with
1703 additions
and
1313 deletions
Too many changes to show.
To preserve performance only 32 of 109 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
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | <modelVersion>4.0.0</modelVersion> |
| 5 | 5 | |
| 6 | 6 | <groupId>com.cnlive.shenhe</groupId> |
| 7 | - <artifactId>cnlive_shenhe_test</artifactId> | |
| 7 | + <artifactId>cnlive_shenhe</artifactId> | |
| 8 | 8 | <version>0.0.1-SNAPSHOT</version> |
| 9 | 9 | <packaging>jar</packaging> |
| 10 | 10 | |
| ... | ... | @@ -22,12 +22,14 @@ |
| 22 | 22 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| 23 | 23 | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
| 24 | 24 | <java.version>1.8</java.version> |
| 25 | + <mysql.connector.java.version>8.0.28</mysql.connector.java.version> | |
| 25 | 26 | </properties> |
| 26 | 27 | |
| 27 | 28 | <dependencies> |
| 28 | 29 | <dependency> |
| 29 | 30 | <groupId>mysql</groupId> |
| 30 | 31 | <artifactId>mysql-connector-java</artifactId> |
| 32 | + <version>${mysql.connector.java.version}</version> | |
| 31 | 33 | </dependency> |
| 32 | 34 | <dependency> |
| 33 | 35 | <groupId>org.springframework.boot</groupId> |
| ... | ... | @@ -50,37 +52,37 @@ |
| 50 | 52 | </exclusion> |
| 51 | 53 | </exclusions> |
| 52 | 54 | </dependency> |
| 53 | - | |
| 55 | + | |
| 54 | 56 | <!-- springboot websocket --> |
| 55 | 57 | <dependency> |
| 56 | 58 | <groupId>org.springframework.boot</groupId> |
| 57 | 59 | <artifactId>spring-boot-starter-websocket</artifactId> |
| 58 | 60 | </dependency> |
| 59 | - | |
| 61 | + | |
| 60 | 62 | <!-- mq队列 --> |
| 61 | 63 | <dependency> |
| 62 | - <groupId>org.springframework.boot</groupId> | |
| 63 | - <artifactId>spring-boot-starter-amqp</artifactId> | |
| 64 | - </dependency> | |
| 65 | - | |
| 66 | - <!-- 自动更新 --> | |
| 67 | - <dependency> | |
| 68 | - <groupId>org.springframework.boot</groupId> | |
| 69 | - <artifactId>spring-boot-devtools</artifactId> | |
| 70 | - <optional>true</optional> | |
| 71 | - </dependency> | |
| 72 | - <dependency> | |
| 73 | - <groupId>org.apache.commons</groupId> | |
| 74 | - <artifactId>commons-lang3</artifactId> | |
| 75 | - <version>3.8</version> | |
| 76 | - </dependency> | |
| 77 | - | |
| 78 | - <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup --> | |
| 79 | - <dependency> | |
| 80 | - <groupId>org.jsoup</groupId> | |
| 81 | - <artifactId>jsoup</artifactId> | |
| 82 | - <version>1.11.3</version> | |
| 83 | - </dependency> | |
| 64 | + <groupId>org.springframework.boot</groupId> | |
| 65 | + <artifactId>spring-boot-starter-amqp</artifactId> | |
| 66 | + </dependency> | |
| 67 | + | |
| 68 | + <!-- 自动更新 --> | |
| 69 | + <dependency> | |
| 70 | + <groupId>org.springframework.boot</groupId> | |
| 71 | + <artifactId>spring-boot-devtools</artifactId> | |
| 72 | + <optional>true</optional> | |
| 73 | + </dependency> | |
| 74 | + <dependency> | |
| 75 | + <groupId>org.apache.commons</groupId> | |
| 76 | + <artifactId>commons-lang3</artifactId> | |
| 77 | + <version>3.8</version> | |
| 78 | + </dependency> | |
| 79 | + | |
| 80 | + <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup --> | |
| 81 | + <dependency> | |
| 82 | + <groupId>org.jsoup</groupId> | |
| 83 | + <artifactId>jsoup</artifactId> | |
| 84 | + <version>1.11.3</version> | |
| 85 | + </dependency> | |
| 84 | 86 | |
| 85 | 87 | <dependency> |
| 86 | 88 | <groupId>org.mybatis.spring.boot</groupId> |
| ... | ... | @@ -135,7 +137,7 @@ |
| 135 | 137 | <dependency> |
| 136 | 138 | <groupId>com.alibaba</groupId> |
| 137 | 139 | <artifactId>fastjson</artifactId> |
| 138 | - <version>1.2.67</version> | |
| 140 | + <version>1.2.79</version> | |
| 139 | 141 | </dependency> |
| 140 | 142 | <dependency> |
| 141 | 143 | <groupId>commons-codec</groupId> |
| ... | ... | @@ -192,6 +194,20 @@ |
| 192 | 194 | </dependencies> |
| 193 | 195 | |
| 194 | 196 | <build> |
| 197 | + <resources> | |
| 198 | + <resource> | |
| 199 | + <!-- 指定配置文件所在的resource目录 --> | |
| 200 | + <directory>src/main/resources</directory> | |
| 201 | + <includes> | |
| 202 | + <include>application.properties</include> | |
| 203 | + <include>application-${environment}.properties</include> | |
| 204 | + <include>logback-${environment}.xml</include> | |
| 205 | + </includes> | |
| 206 | + <filtering>true</filtering> | |
| 207 | + </resource> | |
| 208 | + </resources> | |
| 209 | + <!-- 指定打包名称--> | |
| 210 | + <finalName>cnlive_shenhe_${environment}-0.0.1-SNAPSHOT</finalName> | |
| 195 | 211 | <plugins> |
| 196 | 212 | <plugin> |
| 197 | 213 | <groupId>org.springframework.boot</groupId> |
| ... | ... | @@ -211,7 +227,7 @@ |
| 211 | 227 | <dependency> |
| 212 | 228 | <groupId>mysql</groupId> |
| 213 | 229 | <artifactId>mysql-connector-java</artifactId> |
| 214 | - <version>5.1.39</version> | |
| 230 | + <version>${mysql.connector.java.version}</version> | |
| 215 | 231 | </dependency> |
| 216 | 232 | <dependency> |
| 217 | 233 | <groupId>tk.mybatis</groupId> |
| ... | ... | @@ -224,5 +240,28 @@ |
| 224 | 240 | </plugins> |
| 225 | 241 | </build> |
| 226 | 242 | |
| 243 | + <!--分别设置开发，测试，生产环境--> | |
| 244 | + <profiles> | |
| 245 | + <!-- 开发环境 --> | |
| 246 | + <profile> | |
| 247 | + <id>dev</id> | |
| 248 | + <activation> | |
| 249 | + <activeByDefault>true</activeByDefault> | |
| 250 | + </activation> | |
| 251 | + <properties> | |
| 252 | + <environment>dev</environment> | |
| 253 | + </properties> | |
| 254 | + </profile> | |
| 255 | + <!-- 生产环境 --> | |
| 256 | + <profile> | |
| 257 | + <id>pro</id> | |
| 258 | + <activation> | |
| 259 | + <activeByDefault>false</activeByDefault> | |
| 260 | + </activation> | |
| 261 | + <properties> | |
| 262 | + <environment>pro</environment> | |
| 263 | + </properties> | |
| 264 | + </profile> | |
| 265 | + </profiles> | |
| 227 | 266 | |
| 228 | 267 | </project> | ... | ... |
src/main/java/com/cnlive/shenhe/ShenheApplication.java
| ... | ... | @@ -9,7 +9,6 @@ import org.slf4j.Logger; |
| 9 | 9 | import org.slf4j.LoggerFactory; |
| 10 | 10 | import org.springframework.beans.factory.annotation.Value; |
| 11 | 11 | import org.springframework.boot.ApplicationRunner; |
| 12 | -import org.springframework.boot.SpringApplication; | |
| 13 | 12 | import org.springframework.boot.autoconfigure.SpringBootApplication; |
| 14 | 13 | import org.springframework.boot.builder.SpringApplicationBuilder; |
| 15 | 14 | import org.springframework.boot.web.servlet.FilterRegistrationBean; |
| ... | ... | @@ -17,10 +16,6 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer |
| 17 | 16 | import org.springframework.context.annotation.Bean; |
| 18 | 17 | import org.springframework.context.annotation.Configuration; |
| 19 | 18 | import org.springframework.stereotype.Controller; |
| 20 | -import org.springframework.ui.Model; | |
| 21 | -import org.springframework.web.bind.annotation.GetMapping; | |
| 22 | -import org.springframework.web.servlet.ModelAndView; | |
| 23 | - | |
| 24 | 19 | import tk.mybatis.spring.annotation.MapperScan; |
| 25 | 20 | |
| 26 | 21 | import java.net.InetAddress; |
| ... | ... | @@ -29,7 +24,7 @@ import java.util.HashMap; |
| 29 | 24 | import java.util.Map; |
| 30 | 25 | |
| 31 | 26 | @SpringBootApplication |
| 32 | -@MapperScan(basePackages= {"com.cnlive.shenhe.mapper"}) | |
| 27 | +@MapperScan(basePackages = {"com.cnlive.shenhe.mapper"}) | |
| 33 | 28 | public class ShenheApplication extends SpringBootServletInitializer { |
| 34 | 29 | |
| 35 | 30 | //url的前缀 |
| ... | ... | @@ -44,9 +39,18 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 44 | 39 | //登出 |
| 45 | 40 | private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout"; |
| 46 | 41 | |
| 42 | + public static void main(String[] args) { | |
| 43 | +// SpringApplication.run(ShenheApplication.class, args); | |
| 44 | + SpringApplicationBuilder builder = new SpringApplicationBuilder(ShenheApplication.class); | |
| 45 | + builder.headless(true).run(args); | |
| 46 | + // 设置Headless模式,linux系统下 | |
| 47 | + System.setProperty("java.awt.headless", "true"); | |
| 48 | + } | |
| 49 | + | |
| 47 | 50 | |
| 48 | 51 | /** |
| 49 | 52 | * 用于实现单点登出功能 |
| 53 | + * | |
| 50 | 54 | * @return |
| 51 | 55 | */ |
| 52 | 56 | @Bean |
| ... | ... | @@ -55,7 +59,7 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 55 | 59 | registration.setFilter(new SingleSignOutFilter()); |
| 56 | 60 | // 设定匹配的路径 |
| 57 | 61 | registration.addUrlPatterns("/*"); |
| 58 | - Map<String,String> initParameters = new HashMap<String, String>(); | |
| 62 | + Map<String, String> initParameters = new HashMap<String, String>(); | |
| 59 | 63 | initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX); |
| 60 | 64 | registration.setInitParameters(initParameters); |
| 61 | 65 | // 设定加载的顺序 |
| ... | ... | @@ -65,6 +69,7 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 65 | 69 | |
| 66 | 70 | /** |
| 67 | 71 | * 该过滤器负责用户的认证工作 |
| 72 | + * | |
| 68 | 73 | * @return |
| 69 | 74 | */ |
| 70 | 75 | @Bean |
| ... | ... | @@ -73,7 +78,7 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 73 | 78 | registration.setFilter(new AuthenticationFilter()); |
| 74 | 79 | // 设定匹配的路径 |
| 75 | 80 | registration.addUrlPatterns("/*"); |
| 76 | - Map<String,String> initParameters = new HashMap<String, String>(); | |
| 81 | + Map<String, String> initParameters = new HashMap<String, String>(); | |
| 77 | 82 | initParameters.put("casServerLoginUrl", CAS_SERVER_LOGIN_URL); |
| 78 | 83 | initParameters.put("service", SERVICE_LOGIN); |
| 79 | 84 | initParameters.put("ignorePattern", "/api/*|/logging/*"); |
| ... | ... | @@ -86,6 +91,7 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 86 | 91 | |
| 87 | 92 | /** |
| 88 | 93 | * 该过滤器负责对Ticket的校验工作 |
| 94 | + * | |
| 89 | 95 | * @return |
| 90 | 96 | */ |
| 91 | 97 | @Bean |
| ... | ... | @@ -94,10 +100,10 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 94 | 100 | registration.setFilter(new Cas20ProxyReceivingTicketValidationFilter()); |
| 95 | 101 | // 设定匹配的路径 |
| 96 | 102 | registration.addUrlPatterns("/*"); |
| 97 | - Map<String,String> initParameters = new HashMap<String, String>(); | |
| 103 | + Map<String, String> initParameters = new HashMap<String, String>(); | |
| 98 | 104 | initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX); |
| 99 | 105 | initParameters.put("serverName", SERVER_NAME); |
| 100 | - initParameters.put("encoding","utf-8"); | |
| 106 | + initParameters.put("encoding", "utf-8"); | |
| 101 | 107 | registration.setInitParameters(initParameters); |
| 102 | 108 | // 设定加载的顺序 |
| 103 | 109 | registration.setOrder(3); |
| ... | ... | @@ -107,7 +113,8 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 107 | 113 | |
| 108 | 114 | /** |
| 109 | 115 | * 该过滤器负责实现HttpServletRequest请求的包裹， |
| 110 | - * 比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。 | |
| 116 | + * 比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。 | |
| 117 | + * | |
| 111 | 118 | * @return |
| 112 | 119 | */ |
| 113 | 120 | @Bean |
| ... | ... | @@ -123,7 +130,8 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 123 | 130 | |
| 124 | 131 | /** |
| 125 | 132 | * 该过滤器使得开发者可以通过org.jasig.cas.client.util.AssertionHolder来获取 |
| 126 | - * 用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。 | |
| 133 | + * 用户的登录名。比如AssertionHolder.getAssertion().getPrincipal().getName()。 | |
| 134 | + * | |
| 127 | 135 | * @return |
| 128 | 136 | */ |
| 129 | 137 | @Bean |
| ... | ... | @@ -137,137 +145,7 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 137 | 145 | return registration; |
| 138 | 146 | } |
| 139 | 147 | |
| 140 | - | |
| 141 | - | |
| 142 | - | |
| 143 | - | |
| 144 | - | |
| 145 | - | |
| 146 | - | |
| 147 | - | |
| 148 | - | |
| 149 | - | |
| 150 | - | |
| 151 | - | |
| 152 | - | |
| 153 | 148 | /** |
| 154 | - * 登录过滤器 | |
| 155 | - * @return | |
| 156 | - */ | |
| 157 | - /* @Bean | |
| 158 | - public FilterRegistrationBean filterSingleRegistration() { | |
| 159 | - FilterRegistrationBean registration = new FilterRegistrationBean(); | |
| 160 | - registration.setFilter(new SingleSignOutFilter()); | |
| 161 | - // 设定匹配的路径 | |
| 162 | - registration.addUrlPatterns("/*"); | |
| 163 | - Map<String,String> initParameters = new HashMap<String, String>(); | |
| 164 | - initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX); | |
| 165 | - registration.setInitParameters(initParameters); | |
| 166 | - // 设定加载的顺序 | |
| 167 | - registration.setOrder(1); | |
| 168 | - return registration; | |
| 169 | - } | |
| 170 | - | |
| 171 | - *//** | |
| 172 | - * 过滤验证器 | |
| 173 | - * @return | |
| 174 | - *//* | |
| 175 | - @Bean | |
| 176 | - public FilterRegistrationBean filterValidationRegistration() { | |
| 177 | - FilterRegistrationBean registration = new FilterRegistrationBean(); | |
| 178 | - registration.setFilter(new Cas30ProxyReceivingTicketValidationFilter()); | |
| 179 | - // 设定匹配的路径 | |
| 180 | - registration.addUrlPatterns("/*"); | |
| 181 | - Map<String,String> initParameters = new HashMap<String, String>(); | |
| 182 | - initParameters.put("casServerUrlPrefix", CAS_SERVER_URL_PREFIX); | |
| 183 | - initParameters.put("serverName", SERVER_NAME); | |
| 184 | - initParameters.put("useSession", "true"); | |
| 185 | - registration.setInitParameters(initParameters); | |
| 186 | - // 设定加载的顺序 | |
| 187 | - registration.setOrder(1); | |
| 188 | - return registration; | |
| 189 | - } | |
| 190 | - | |
| 191 | - *//** | |
| 192 | - * 授权过滤器 | |
| 193 | - * @return | |
| 194 | - *//* | |
| 195 | - *//*@Bean | |
| 196 | - public FilterRegistrationBean filterAuthenticationRegistration() { | |
| 197 | - FilterRegistrationBean registration = new FilterRegistrationBean(); | |
| 198 | - registration.setFilter(new AuthenticationFilter()); | |
| 199 | - // 设定匹配的路径 | |
| 200 | - registration.addUrlPatterns("/*"); | |
| 201 | - Map<String,String> initParameters = new HashMap<String, String>(); | |
| 202 | - initParameters.put("casServerLoginUrl", CAS_SERVER_URL_PREFIX); | |
| 203 | - initParameters.put("server", SERVICE_LOGIN); | |
| 204 | - | |
| 205 | - //initParameters.put("ignorePattern", ".*"); | |
| 206 | - //表示过滤所有 | |
| 207 | - //initParameters.put("ignoreUrlPatternType", "com.cnlive.shenhe.config.SimpleUrlPatternMatcherStrategy"); | |
| 208 | - | |
| 209 | - registration.setInitParameters(initParameters); | |
| 210 | - // 设定加载的顺序 | |
| 211 | - registration.setOrder(1); | |
| 212 | - return registration; | |
| 213 | - }*//* | |
| 214 | - | |
| 215 | - *//** | |
| 216 | - * wraper过滤器 | |
| 217 | - * @return | |
| 218 | - *//* | |
| 219 | - @Bean | |
| 220 | - public FilterRegistrationBean filterWrapperRegistration() { | |
| 221 | - FilterRegistrationBean registration = new FilterRegistrationBean(); | |
| 222 | - registration.setFilter(new HttpServletRequestWrapperFilter()); | |
| 223 | - // 设定匹配的路径 | |
| 224 | - registration.addUrlPatterns("/*"); | |
| 225 | - // 设定加载的顺序 | |
| 226 | - registration.setOrder(1); | |
| 227 | - return registration; | |
| 228 | - } | |
| 229 | - | |
| 230 | - *//** | |
| 231 | - * 添加监听器 | |
| 232 | - * @return | |
| 233 | - *//* | |
| 234 | - @Bean | |
| 235 | - public ServletListenerRegistrationBean<EventListener> singleSignOutListenerRegistration(){ | |
| 236 | - ServletListenerRegistrationBean<EventListener> registrationBean = new ServletListenerRegistrationBean<EventListener>(); | |
| 237 | - registrationBean.setListener(new SingleSignOutHttpSessionListener()); | |
| 238 | - registrationBean.setOrder(1); | |
| 239 | - return registrationBean; | |
| 240 | - } | |
| 241 | - | |
| 242 | - *//** | |
| 243 | - * 设定首页 | |
| 244 | - *//* | |
| 245 | - @Configuration | |
| 246 | - public class DefaultView extends WebMvcConfigurerAdapter { | |
| 247 | - | |
| 248 | - @Override | |
| 249 | - public void addViewControllers(ViewControllerRegistry registry) { | |
| 250 | - //设定首页为index | |
| 251 | - registry.addViewController("/").setViewName("forward:/users/index"); | |
| 252 | - | |
| 253 | - //设定匹配的优先级 | |
| 254 | - registry.setOrder(Ordered.HIGHEST_PRECEDENCE); | |
| 255 | - | |
| 256 | - //添加视图控制类 | |
| 257 | - super.addViewControllers(registry); | |
| 258 | - } | |
| 259 | - }*/ | |
| 260 | - | |
| 261 | - | |
| 262 | - public static void main(String[] args) { | |
| 263 | -// SpringApplication.run(ShenheApplication.class, args); | |
| 264 | - SpringApplicationBuilder builder=new SpringApplicationBuilder(ShenheApplication.class); | |
| 265 | - builder.headless(true).run(args); | |
| 266 | - // 设置Headless模式,linux系统下 | |
| 267 | - System.setProperty("java.awt.headless", "true"); | |
| 268 | - } | |
| 269 | - | |
| 270 | - /** | |
| 271 | 149 | * 配置内部类 |
| 272 | 150 | */ |
| 273 | 151 | @Controller |
| ... | ... | @@ -287,6 +165,7 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 287 | 165 | */ |
| 288 | 166 | @Value("${server.port}") |
| 289 | 167 | private String port; |
| 168 | + | |
| 290 | 169 | /** |
| 291 | 170 | * 启动成功 |
| 292 | 171 | */ |
| ... | ... | @@ -303,6 +182,6 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 303 | 182 | } |
| 304 | 183 | }; |
| 305 | 184 | } |
| 306 | - | |
| 185 | + | |
| 307 | 186 | } |
| 308 | 187 | } | ... | ... |
src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java
| ... | ... | @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; |
| 5 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 6 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 7 | 7 | import com.cnlive.shenhe.entity.ShyAudio; |
| 8 | -import com.cnlive.shenhe.entity.ShyContent; | |
| 9 | 8 | import com.cnlive.shenhe.entity.ShyYidun; |
| 10 | 9 | import com.cnlive.shenhe.enums.TextLabels; |
| 11 | 10 | import com.cnlive.shenhe.serviceImpl.AudioServiceImpl; |
| ... | ... | @@ -14,20 +13,16 @@ import com.cnlive.shenhe.utils.AuditPass; |
| 14 | 13 | import com.cnlive.shenhe.utils.CommonConst; |
| 15 | 14 | import com.cnlive.shenhe.utils.YiDunAntiFraudUtil; |
| 16 | 15 | import com.google.common.collect.EvictingQueue; |
| 17 | -import com.google.common.collect.Maps; | |
| 18 | -import org.apache.commons.lang3.StringUtils; | |
| 19 | 16 | import org.slf4j.Logger; |
| 20 | 17 | import org.slf4j.LoggerFactory; |
| 21 | 18 | import org.springframework.beans.factory.annotation.Autowired; |
| 22 | 19 | import org.springframework.stereotype.Controller; |
| 23 | 20 | import org.springframework.web.bind.annotation.PostMapping; |
| 24 | -import org.springframework.web.bind.annotation.RequestBody; | |
| 25 | 21 | import org.springframework.web.bind.annotation.RequestMapping; |
| 26 | 22 | import org.springframework.web.bind.annotation.ResponseBody; |
| 27 | 23 | |
| 28 | 24 | import java.util.Date; |
| 29 | 25 | |
| 30 | - | |
| 31 | 26 | /** |
| 32 | 27 | * @Author: xujincheng |
| 33 | 28 | * @Date: 2020/6/5 13:33 |
| ... | ... | @@ -52,7 +47,7 @@ public class AudioControllerApi { |
| 52 | 47 | * 音频入库 |
| 53 | 48 | * |
| 54 | 49 | * @param |
| 55 | - * @multiplecategory 获取栏目分类 | |
| 50 | + * @multiplecategory 获取栏目分类// | |
| 56 | 51 | * @audioClipsName 获取音频上传人的id |
| 57 | 52 | * @soure 音频来源 |
| 58 | 53 | * @audioId 音频id |
| ... | ... | @@ -65,7 +60,7 @@ public class AudioControllerApi { |
| 65 | 60 | * @uploadTime 音频上传时间 |
| 66 | 61 | * @priority 优先级（1-热点 0-非热点） |
| 67 | 62 | * @callback 回调函数 |
| 68 | - * * @spId spId | |
| 63 | + * @spId spId | |
| 69 | 64 | * @bucketName 存储空间名 |
| 70 | 65 | * @bucketType 金山或七牛 |
| 71 | 66 | * @duration 时长 |
| ... | ... | @@ -107,6 +102,7 @@ public class AudioControllerApi { |
| 107 | 102 | |
| 108 | 103 | /** |
| 109 | 104 | * 易盾音频检测结果回调 |
| 105 | + * | |
| 110 | 106 | * @param |
| 111 | 107 | */ |
| 112 | 108 | @PostMapping("/callbackAudio") |
| ... | ... | @@ -141,6 +137,7 @@ public class AudioControllerApi { |
| 141 | 137 | newshyAudio.setId(shyAudio.getId()); |
| 142 | 138 | if (action == 0 && asrStatus == 3) { |
| 143 | 139 | newYiDunMsg.setDesc_msg("易盾点播音频审核通过了"); |
| 140 | + newYiDunMsg.setCheck_status(0); | |
| 144 | 141 | newshyAudio.setMsg("易盾点播音频审核通过了"); |
| 145 | 142 | newshyAudio.setUploader("机审通过"); |
| 146 | 143 | newshyAudio.setState(1); |
| ... | ... | @@ -174,6 +171,8 @@ public class AudioControllerApi { |
| 174 | 171 | newshyAudio.setState(0); |
| 175 | 172 | newshyAudio.setShenhe_type(CommonConst.AUDIT_TYPE_USER); |
| 176 | 173 | newshyAudio.setReceive(CommonConst.RECEIVE_BEFORE); |
| 174 | + //审核失败 | |
| 175 | + newYiDunMsg.setCheck_status(2); | |
| 177 | 176 | } |
| 178 | 177 | newYiDunMsg.setResult_type(String.valueOf(action)); |
| 179 | 178 | } catch (NumberFormatException e) { | ... | ... |
src/main/java/com/cnlive/shenhe/api/AvsampleCallBackControllerApi.java
| 1 | 1 | package com.cnlive.shenhe.api; |
| 2 | 2 | |
| 3 | 3 | import com.alibaba.fastjson.JSONObject; |
| 4 | -import com.cnlive.shenhe.bean.ErrorEnum; | |
| 5 | -import com.cnlive.shenhe.bean.ResponseBean; | |
| 6 | 4 | import com.cnlive.shenhe.entity.ShyVideos; |
| 7 | 5 | import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; |
| 8 | 6 | import com.cnlive.shenhe.utils.CommonConst; |
| ... | ... | @@ -10,15 +8,8 @@ import com.cnlive.shenhe.utils.CommonUtils; |
| 10 | 8 | import org.slf4j.Logger; |
| 11 | 9 | import org.slf4j.LoggerFactory; |
| 12 | 10 | import org.springframework.beans.factory.annotation.Autowired; |
| 13 | -import org.springframework.beans.factory.annotation.Value; | |
| 14 | 11 | import org.springframework.stereotype.Controller; |
| 15 | -import org.springframework.ui.Model; | |
| 16 | -import org.springframework.web.bind.annotation.GetMapping; | |
| 17 | -import org.springframework.web.bind.annotation.PostMapping; | |
| 18 | -import org.springframework.web.bind.annotation.RequestBody; | |
| 19 | -import org.springframework.web.bind.annotation.RequestMapping; | |
| 20 | -import org.springframework.web.bind.annotation.ResponseBody; | |
| 21 | -import org.springframework.web.servlet.ModelAndView; | |
| 12 | +import org.springframework.web.bind.annotation.*; | |
| 22 | 13 | |
| 23 | 14 | import java.util.List; |
| 24 | 15 | |
| ... | ... | @@ -38,43 +29,51 @@ public class AvsampleCallBackControllerApi { |
| 38 | 29 | |
| 39 | 30 | /** |
| 40 | 31 | * 接收抽帧结果 |
| 32 | + * | |
| 41 | 33 | * @param json |
| 42 | 34 | */ |
| 43 | 35 | @PostMapping("/callback") |
| 44 | 36 | @ResponseBody |
| 45 | 37 | public JSONObject callback(@RequestBody JSONObject json) { |
| 46 | - logger.info("抽帧回调请求。。。。json=="+json.toJSONString()); | |
| 47 | 38 | JSONObject result = new JSONObject(); |
| 48 | - result.put("code",1); | |
| 49 | - String taskId = json.getString("taskId"); | |
| 50 | - if(CommonUtils.isNotEmpty(taskId)){ | |
| 51 | - ShyVideos shyVideo = new ShyVideos(); | |
| 52 | - shyVideo.setTask_id(taskId); | |
| 53 | - List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideo); | |
| 54 | - if(!shyVideosList.isEmpty()){ | |
| 55 | - ShyVideos video = shyVideosList.get(0); | |
| 56 | - Integer code = json.getInteger("code"); | |
| 57 | - if(code==3){ | |
| 58 | - video.setAvsample(CommonConst.AVSAMPLE_SUCCESS); | |
| 59 | - video.setAvsample_imgs(json.getJSONArray("images").toJSONString()); | |
| 60 | - }else{ | |
| 61 | - video.setAvsample(CommonConst.AVSAMPLE_FAIL);//抽帧失败 | |
| 62 | - video.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//改为人工审核 | |
| 63 | - video.setMsg("抽帧失败，改为人工审核，失败消息："+json.getInteger("errorMsg")); | |
| 64 | - } | |
| 65 | - video.setAvsample_msg(json.toJSONString()); | |
| 66 | - boolean success = videosService.updateshyVideos(video); | |
| 67 | - if(!success){ | |
| 68 | - result.put("code",-1); | |
| 39 | + result.put("code", 1); | |
| 40 | + try { | |
| 41 | + logger.info("抽帧回调请求。。。。json=={}", json.toJSONString()); | |
| 42 | + String taskId = json.getString("taskId"); | |
| 43 | + if (CommonUtils.isNotEmpty(taskId)) { | |
| 44 | + ShyVideos shyVideo = new ShyVideos(); | |
| 45 | + shyVideo.setTask_id(taskId); | |
| 46 | + List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideo); | |
| 47 | + if (!shyVideosList.isEmpty()) { | |
| 48 | + ShyVideos video = shyVideosList.get(0); | |
| 49 | + Integer code = json.getInteger("code"); | |
| 50 | + if (code == 3) { | |
| 51 | + video.setAvsample(CommonConst.AVSAMPLE_SUCCESS); | |
| 52 | + video.setAvsample_imgs(json.getJSONArray("images").toJSONString()); | |
| 53 | + } else { | |
| 54 | + //抽帧失败 | |
| 55 | + video.setAvsample(CommonConst.AVSAMPLE_FAIL); | |
| 56 | + //改为人工审核 | |
| 57 | + video.setShenhe_type(CommonConst.AUDIT_TYPE_USER); | |
| 58 | + video.setMsg("抽帧失败，改为人工审核，失败消息：" + json.getString("errorMsg")); | |
| 59 | + } | |
| 60 | + video.setAvsample_msg(json.toJSONString()); | |
| 61 | + boolean success = videosService.updateshyVideos(video); | |
| 62 | + if (!success) { | |
| 63 | + result.put("code", -1); | |
| 64 | + } | |
| 69 | 65 | } |
| 70 | 66 | } |
| 67 | + return result; | |
| 68 | + } catch (Exception e) { | |
| 69 | + e.printStackTrace(); | |
| 71 | 70 | } |
| 72 | 71 | return result; |
| 73 | 72 | } |
| 74 | - | |
| 73 | + | |
| 75 | 74 | @GetMapping("/getGame") |
| 76 | - public String getGame(){ | |
| 77 | - return "html/game.html"; | |
| 75 | + public String getGame() { | |
| 76 | + return "html/game.html"; | |
| 78 | 77 | } |
| 79 | - | |
| 78 | + | |
| 80 | 79 | } | ... | ... |
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
| ... | ... | @@ -5,30 +5,29 @@ import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 6 | import com.cnlive.shenhe.entity.ShyChannel; |
| 7 | 7 | import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl; |
| 8 | -import com.cnlive.shenhe.utils.AuditPass; | |
| 9 | 8 | import com.cnlive.shenhe.utils.CommonConst; |
| 10 | 9 | import com.cnlive.shenhe.utils.CommonUtils; |
| 11 | 10 | import org.slf4j.Logger; |
| 12 | 11 | import org.slf4j.LoggerFactory; |
| 13 | 12 | import org.springframework.beans.factory.annotation.Autowired; |
| 14 | -import org.springframework.beans.factory.annotation.Value; | |
| 15 | 13 | import org.springframework.stereotype.Controller; |
| 16 | -import org.springframework.web.bind.annotation.GetMapping; | |
| 17 | 14 | import org.springframework.web.bind.annotation.PostMapping; |
| 18 | 15 | import org.springframework.web.bind.annotation.RequestMapping; |
| 19 | 16 | import org.springframework.web.bind.annotation.ResponseBody; |
| 20 | 17 | |
| 21 | -import java.util.HashMap; | |
| 22 | 18 | import java.util.List; |
| 23 | -import java.util.Map; | |
| 24 | 19 | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | +/** | |
| 25 | + * @author Administrator | |
| 26 | + */ | |
| 25 | 27 | @Controller |
| 26 | 28 | @RequestMapping("/api/channel") |
| 27 | 29 | public class ChannelControllerApi { |
| 28 | 30 | private static Logger logger = LoggerFactory.getLogger(ChannelControllerApi.class); |
| 29 | - | |
| 30 | - @Autowired | |
| 31 | - AuditPass Pass; | |
| 32 | 31 | @Autowired |
| 33 | 32 | ChannelServiceImpl channelService; |
| 34 | 33 | |
| ... | ... | @@ -46,51 +45,48 @@ public class ChannelControllerApi { |
| 46 | 45 | ShyChannel shyChannel = new ShyChannel(); |
| 47 | 46 | shyChannel.setChannel_id(json.getString("channelId")); |
| 48 | 47 | List<ShyChannel> channelList = channelService.findshyChannel(shyChannel); |
| 49 | - | |
| 50 | - Integer sp_id=null; | |
| 48 | + | |
| 49 | + Integer spId; | |
| 51 | 50 | try { |
| 52 | - sp_id=json.getInteger("spId"); | |
| 53 | - } catch (Exception e) { | |
| 54 | - sp_id=null; | |
| 55 | - } | |
| 51 | + spId = json.getInteger("spId"); | |
| 52 | + } catch (Exception e) { | |
| 53 | + spId = null; | |
| 54 | + } | |
| 56 | 55 | //存在则更新 |
| 57 | 56 | if (channelList.size() > 0) { |
| 58 | 57 | ShyChannel shyChannel1 = channelList.get(0); |
| 59 | 58 | shyChannel1.setShenhe_status(CommonConst.AUDIT_INTT); |
| 60 | - shyChannel1.setChannel_name(json.getString("channelName")); | |
| 59 | + shyChannel1.setChannel_name(json.getString("channelName")); | |
| 61 | 60 | shyChannel1.setChannel_img(json.getString("face")); |
| 62 | 61 | 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表示下线 | |
| 62 | + shyChannel1.setSp_id(spId); | |
| 63 | + //是否下线 0表示正常 1表示下线 | |
| 64 | + shyChannel1.setOffline(0); | |
| 67 | 65 | shyChannel1.setUpdated_at(CommonUtils.getCurrentTime()); |
| 68 | 66 | channelService.getShenheType(shyChannel1); |
| 69 | 67 | 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(),"审核请求收到失败(更新)"); | |
| 68 | + if (YorN) { | |
| 69 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功"); | |
| 74 | 70 | } |
| 71 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(更新)"); | |
| 75 | 72 | } |
| 76 | 73 | //如果不存在直接插入 |
| 77 | 74 | shyChannel.setShenhe_status(CommonConst.AUDIT_INTT); |
| 78 | - shyChannel.setChannel_name(json.getString("channelName")); | |
| 75 | + shyChannel.setChannel_name(json.getString("channelName")); | |
| 79 | 76 | shyChannel.setChannel_img(json.getString("face")); |
| 80 | 77 | shyChannel.setCallback(json.getString("callback")); |
| 81 | - shyChannel.setSp_id(sp_id); | |
| 82 | - shyChannel.setOffline(0);//是否下线 0表示正常 1表示下线 | |
| 78 | + shyChannel.setSp_id(spId); | |
| 79 | + //是否下线 0表示正常 1表示下线 | |
| 80 | + shyChannel.setOffline(0); | |
| 83 | 81 | shyChannel.setCreated_at(CommonUtils.getCurrentTime()); |
| 84 | 82 | shyChannel.setUpdated_at(CommonUtils.getCurrentTime()); |
| 85 | 83 | channelService.getShenheType(shyChannel); |
| 86 | 84 | 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(),"审核请求收到失败(新增)"); | |
| 85 | + if (YorN) { | |
| 86 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功"); | |
| 91 | 87 | } |
| 88 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(新增)"); | |
| 92 | 89 | } |
| 93 | - | |
| 94 | - | |
| 90 | + | |
| 95 | 91 | |
| 96 | 92 | } | ... | ... |
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
| ... | ... | @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; |
| 4 | 4 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 6 | import com.cnlive.shenhe.entity.ShyComments; |
| 7 | -import com.cnlive.shenhe.entity.ShyTopic; | |
| 8 | 7 | import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; |
| 9 | 8 | import com.cnlive.shenhe.serviceImpl.TopicServiceImpl; |
| 10 | 9 | import com.cnlive.shenhe.utils.AuditPass; |
| ... | ... | @@ -13,7 +12,6 @@ import com.cnlive.shenhe.utils.CommonUtils; |
| 13 | 12 | import org.slf4j.Logger; |
| 14 | 13 | import org.slf4j.LoggerFactory; |
| 15 | 14 | import org.springframework.beans.factory.annotation.Autowired; |
| 16 | -import org.springframework.beans.factory.annotation.Value; | |
| 17 | 15 | import org.springframework.stereotype.Controller; |
| 18 | 16 | import org.springframework.web.bind.annotation.PostMapping; |
| 19 | 17 | import org.springframework.web.bind.annotation.RequestMapping; |
| ... | ... | @@ -22,6 +20,9 @@ import org.springframework.web.bind.annotation.ResponseBody; |
| 22 | 20 | import java.util.Date; |
| 23 | 21 | import java.util.List; |
| 24 | 22 | |
| 23 | +/** | |
| 24 | + * @author Administrator | |
| 25 | + */ | |
| 25 | 26 | @Controller |
| 26 | 27 | @RequestMapping("/api/comments") |
| 27 | 28 | public class CommentsControllerApi { |
| ... | ... | @@ -32,9 +33,6 @@ public class CommentsControllerApi { |
| 32 | 33 | CommentsServiceImpl commentsService; |
| 33 | 34 | @Autowired |
| 34 | 35 | TopicServiceImpl topicService; |
| 35 | - | |
| 36 | -// @Value("${topic_comment_shareH5}") | |
| 37 | -// String topic_comment_shareH5; | |
| 38 | 36 | |
| 39 | 37 | /** |
| 40 | 38 | * @Auther: chenhao |
| ... | ... | @@ -46,8 +44,10 @@ public class CommentsControllerApi { |
| 46 | 44 | public ResponseBean impotComment(String param) { |
| 47 | 45 | logger.info("评论入库，param=====" + param); |
| 48 | 46 | JSONObject json = JSONObject.parseObject(param); |
| 49 | - String type=json.getString("type")==null?"else":json.getString("type");//评论类型，topic:话题 | |
| 50 | - Integer level=json.getInteger("level")==null?1:json.getInteger("level");//评论的级别 | |
| 47 | + //评论类型，topic:话题 | |
| 48 | + String type=json.getString("type")==null?"else":json.getString("type"); | |
| 49 | + //评论的级别 | |
| 50 | + Integer level=json.getInteger("level")==null?1:json.getInteger("level"); | |
| 51 | 51 | String programId=json.getString("programId"); |
| 52 | 52 | String originalUrl=json.getString("originalUrl"); |
| 53 | 53 | String commentTitle=json.getString("commentTitle"); | ... | ... |
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
| ... | ... | @@ -4,11 +4,8 @@ import com.alibaba.fastjson.JSONArray; |
| 4 | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 6 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 7 | -import com.cnlive.shenhe.entity.ShyComments; | |
| 8 | 7 | import com.cnlive.shenhe.entity.ShyContent; |
| 9 | -import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; | |
| 10 | 8 | import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; |
| 11 | -import com.cnlive.shenhe.utils.AuditPass; | |
| 12 | 9 | import com.cnlive.shenhe.utils.CommonConst; |
| 13 | 10 | import com.cnlive.shenhe.utils.CommonUtils; |
| 14 | 11 | import org.slf4j.Logger; |
| ... | ... | @@ -16,27 +13,22 @@ import org.slf4j.LoggerFactory; |
| 16 | 13 | import org.springframework.beans.factory.annotation.Autowired; |
| 17 | 14 | import org.springframework.stereotype.Controller; |
| 18 | 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.util.StringUtils; | |
| 17 | +import org.springframework.web.bind.annotation.*; | |
| 25 | 18 | |
| 26 | 19 | import java.util.Date; |
| 27 | 20 | import java.util.List; |
| 28 | -import java.util.Map; | |
| 29 | - | |
| 30 | -import javax.servlet.http.HttpSession; | |
| 31 | 21 | |
| 22 | +/** | |
| 23 | + * 图文审核 | |
| 24 | + * | |
| 25 | + * @author | |
| 26 | + */ | |
| 32 | 27 | @Controller |
| 33 | 28 | @RequestMapping("/api/content") |
| 34 | 29 | public class ContentControllerApi { |
| 35 | 30 | private static Logger logger = LoggerFactory.getLogger(ContentControllerApi.class); |
| 36 | - @Autowired | |
| 37 | - AuditPass Pass; | |
| 38 | - @Autowired | |
| 39 | - CommentsServiceImpl commentsService; | |
| 31 | + | |
| 40 | 32 | @Autowired |
| 41 | 33 | ContentServiceImpl contentService; |
| 42 | 34 | |
| ... | ... | @@ -47,81 +39,128 @@ public class ContentControllerApi { |
| 47 | 39 | */ |
| 48 | 40 | @PostMapping("/import") |
| 49 | 41 | @ResponseBody |
| 50 | - public ResponseBean impotContent(String param) { | |
| 42 | + public ResponseBean importContent(String param) { | |
| 51 | 43 | logger.info("图文入库，param=====" + param); |
| 52 | 44 | JSONObject json = JSONObject.parseObject(param); |
| 53 | 45 | //判断是否存在 |
| 54 | - ShyContent shyContent=new ShyContent(); | |
| 55 | - shyContent.setContent_id(json.getString("contentId")); | |
| 56 | - shyContent.setContent_tag("content");//图文标签 | |
| 57 | - List<ShyContent> contentList = contentService.findshyContent(shyContent); | |
| 58 | - | |
| 46 | + ShyContent shyContent = new ShyContent(); | |
| 47 | + String contentId = json.getString("contentId"); | |
| 48 | + shyContent.setContent_id(contentId); | |
| 49 | + //图文标签 | |
| 50 | + shyContent.setContent_tag("content"); | |
| 51 | + //图文标签 | |
| 52 | + String contentTag = json.getString("content_tag"); | |
| 53 | + String newContentTag = StringUtils.isEmpty(contentTag) ? "content" : contentTag; | |
| 59 | 54 | //获取审核类型 |
| 60 | - Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"content"); | |
| 55 | + Integer shenheType = contentService.getShenheType(json.getInteger("spId"), newContentTag); | |
| 56 | + List<ShyContent> contentList = contentService.findshyContent(shyContent); | |
| 61 | 57 | //存在则更新 |
| 62 | 58 | if (contentList.size() > 0) { |
| 63 | 59 | 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");//图文创建时间 | |
| 60 | + //标题 | |
| 61 | + shyContent1.setTitle(json.getString("title")); | |
| 62 | + //标题图片 | |
| 63 | + shyContent1.setTitle_image(json.getString("titleImage")); | |
| 64 | + //审核类型 | |
| 65 | + shyContent1.setShenhe_type(shenheType); | |
| 66 | + //当前图文的审核状态 | |
| 67 | + shyContent1.setContent_status(json.getInteger("contentStatus")); | |
| 68 | + //来源 | |
| 69 | + shyContent1.setSource(json.getString("source")); | |
| 70 | + //作者 | |
| 71 | + shyContent1.setAuthor(json.getString("author")); | |
| 72 | + //图文内容 | |
| 73 | + shyContent1.setContent_text(json.getString("content_text")); | |
| 74 | + //图文创建时间 | |
| 75 | + String contentTime = json.getString("contentTime"); | |
| 72 | 76 | if (CommonUtils.isNotEmpty(contentTime)) { |
| 73 | 77 | Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); |
| 74 | 78 | shyContent1.setContent_time(timestamp); |
| 75 | 79 | |
| 76 | 80 | } |
| 77 | 81 | 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 | - | |
| 82 | + //回调地址 | |
| 83 | + shyContent1.setCallback(json.getString("callback")); | |
| 84 | + //图文发布h5的url | |
| 85 | + shyContent1.setContent_url(json.getString("contentUrl")); | |
| 86 | + //图文发布pc的url | |
| 87 | + shyContent1.setContent_pc_url(json.getString("contentPCUrl")); | |
| 88 | + //spid | |
| 89 | + shyContent1.setSp_id(json.getInteger("spId")); | |
| 90 | + //图文标签 | |
| 91 | + shyContent1.setContent_tag(newContentTag); | |
| 92 | + //领取状态 | |
| 93 | + shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE); | |
| 94 | + //最后一次更新时间 | |
| 95 | + shyContent1.setLast_update(CommonUtils.getCurrentTime()); | |
| 88 | 96 | boolean YorN = contentService.updateshyContent(shyContent1); |
| 89 | 97 | if (YorN == true) { |
| 98 | + logger.info("图文同步接口更新成功:{}", contentId); | |
| 90 | 99 | return new ResponseBean(ErrorEnum.SUCCESS); |
| 91 | 100 | } else { |
| 92 | 101 | return new ResponseBean(ErrorEnum.ERROR); |
| 93 | 102 | } |
| 94 | 103 | } |
| 104 | + return saveContent(json, shyContent, shenheType); | |
| 105 | + } | |
| 106 | + | |
| 107 | + /** | |
| 108 | + * 保存操作 | |
| 109 | + * | |
| 110 | + * @param json | |
| 111 | + * @param shyContent | |
| 112 | + * @param shenheType | |
| 113 | + * @return | |
| 114 | + */ | |
| 115 | + private ResponseBean saveContent(JSONObject json, ShyContent shyContent, Integer shenheType) { | |
| 95 | 116 | //如果不存在直接插入 |
| 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");//创建时间 | |
| 117 | + //标题 | |
| 118 | + shyContent.setTitle(json.getString("title")); | |
| 119 | + //标题图片 | |
| 120 | + shyContent.setTitle_image(json.getString("titleImage")); | |
| 121 | + //审核类型 | |
| 122 | + shyContent.setShenhe_type(shenheType); | |
| 123 | + //当前图文的审核状态 | |
| 124 | + shyContent.setContent_status(json.getInteger("contentStatus")); | |
| 125 | + //来源 | |
| 126 | + shyContent.setSource(json.getString("source")); | |
| 127 | + //作者 | |
| 128 | + shyContent.setAuthor(json.getString("author")); | |
| 129 | + //图文内容 | |
| 130 | + shyContent.setContent_text(json.getString("content_text")); | |
| 131 | + //创建时间 | |
| 132 | + String contentTime = json.getString("contentTime"); | |
| 104 | 133 | if (CommonUtils.isNotEmpty(contentTime)) { |
| 105 | 134 | Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); |
| 106 | 135 | shyContent.setContent_time(timestamp); |
| 107 | 136 | |
| 108 | 137 | } |
| 138 | + String contentTag = json.getString("content_tag"); | |
| 139 | + shyContent.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag); | |
| 140 | + | |
| 109 | 141 | 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());//最后一次更新时间 | |
| 142 | + //回调地址 | |
| 143 | + shyContent.setCallback(json.getString("callback")); | |
| 144 | + //图文发布h5的url | |
| 145 | + shyContent.setContent_url(json.getString("contentUrl")); | |
| 146 | + //图文发布pc的url | |
| 147 | + shyContent.setContent_pc_url(json.getString("contentPCUrl")); | |
| 148 | + //spid | |
| 149 | + shyContent.setSp_id(json.getInteger("spId")); | |
| 150 | + //领取状态 | |
| 151 | + shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE); | |
| 152 | + //最后一次更新时间 | |
| 153 | + shyContent.setLast_update(CommonUtils.getCurrentTime()); | |
| 116 | 154 | boolean YorN = contentService.impotContent(shyContent); |
| 117 | 155 | if (YorN == true) { |
| 156 | + logger.info("图文同步接口保存操作成功:{}", json.getString("contentId")); | |
| 118 | 157 | return new ResponseBean(ErrorEnum.SUCCESS); |
| 119 | 158 | } else { |
| 120 | 159 | return new ResponseBean(ErrorEnum.ERROR); |
| 121 | 160 | } |
| 122 | 161 | } |
| 123 | - | |
| 124 | - | |
| 162 | + | |
| 163 | + | |
| 125 | 164 | /** |
| 126 | 165 | * @author liwei |
| 127 | 166 | * @Date: 2019/05/15 11:17 |
| ... | ... | @@ -130,100 +169,106 @@ public class ContentControllerApi { |
| 130 | 169 | @PostMapping("/importMoment") |
| 131 | 170 | @ResponseBody |
| 132 | 171 | 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 | - | |
| 172 | + logger.info("朋友圈入库，param=====" + param); | |
| 173 | + JSONObject json = JSONObject.parseObject(param); | |
| 174 | + //判断是否存在 | |
| 175 | + ShyContent shyContent = new ShyContent(); | |
| 176 | + //朋友圈id | |
| 177 | + shyContent.setContent_id(json.getString("momentId")); | |
| 178 | + //朋友圈标签 | |
| 179 | + shyContent.setContent_tag("moment"); | |
| 180 | + List<ShyContent> contentList = contentService.findshyContent(shyContent); | |
| 181 | + //获取审核类型 | |
| 182 | + Integer shenheType = contentService.getShenheType(json.getInteger("spId"), "moment"); | |
| 183 | + | |
| 143 | 184 | //获取生活圈内容的类型 1：图片 2：视频 3：分享 |
| 144 | 185 | 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"); | |
| 186 | + //内容图片地址 | |
| 187 | + String contentImageUrl = ""; | |
| 188 | + if (contentType != null && contentType == 1) { | |
| 189 | + //朋友圈分享的内容的url | |
| 190 | + JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl")); | |
| 191 | + for (int i = 0; i < contentImageUrlList.size(); i++) { | |
| 192 | + JSONObject contentImageUrlMap = contentImageUrlList.getJSONObject(i); | |
| 193 | + contentImageUrl += contentImageUrlMap.getString("imageUrl") + ","; | |
| 194 | + } | |
| 195 | + //去掉最后一个逗号 | |
| 196 | + contentImageUrl = contentImageUrl.substring(0, contentImageUrl.length() - 1); | |
| 197 | + } else { | |
| 198 | + contentImageUrl = json.getString("contentImageUrl"); | |
| 155 | 199 | } |
| 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)) { | |
| 165 | -// 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)) { | |
| 200 | + | |
| 201 | + //存在则更新 | |
| 202 | + if (contentList.size() > 0) { | |
| 203 | + ShyContent shyContent1 = contentList.get(0); | |
| 204 | + //标题 | |
| 205 | + shyContent1.setTitle(json.getString("title")); | |
| 206 | + //用户头像 | |
| 207 | + shyContent1.setTitle_image(json.getString("image")); | |
| 208 | + shyContent1.setShenhe_type(shenheType);//审核类型 | |
| 209 | + String contentTime = json.getString("createTime");//朋友圈内容创建时间 | |
| 210 | + if (CommonUtils.isNotEmpty(contentTime)) { | |
| 211 | + //Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss"); | |
| 212 | + shyContent1.setContent_time(new Date(Long.valueOf(contentTime))); | |
| 213 | + | |
| 214 | + } | |
| 215 | + shyContent1.setCreate_date(CommonUtils.getCurrentTime()); | |
| 216 | + shyContent1.setCallback(json.getString("callbackUrl"));//回调地址 | |
| 217 | + shyContent1.setContent_url(json.getString("pageUrl"));//朋友圈分享的url | |
| 218 | + shyContent1.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔 | |
| 219 | + shyContent1.setSp_id(json.getInteger("spId"));//spid | |
| 220 | + shyContent1.setAuthor(json.getString("userId"));//用户id | |
| 221 | + shyContent1.setSource(json.getString("nickName"));//用户昵称 | |
| 222 | + shyContent1.setVideo_id(json.getString("videoId"));//关联videoId | |
| 223 | + shyContent1.setContent_tag("moment");//图文标签 | |
| 224 | + shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | |
| 225 | + shyContent1.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | |
| 226 | + | |
| 227 | + | |
| 228 | + boolean YorN = contentService.updateshyContent(shyContent1); | |
| 229 | + if (YorN == true) { | |
| 230 | + return new ResponseBean(ErrorEnum.SUCCESS); | |
| 231 | + } else { | |
| 232 | + return new ResponseBean(ErrorEnum.ERROR); | |
| 233 | + } | |
| 234 | + } | |
| 235 | + //如果不存在直接插入 | |
| 236 | + shyContent.setTitle(json.getString("title"));//标题 | |
| 237 | + shyContent.setTitle_image(json.getString("image"));//用户头像 | |
| 238 | + shyContent.setShenhe_type(shenheType);//审核类型 | |
| 239 | + shyContent.setContent_status(1);//当前朋友圈内容的审核状态，先发后审 | |
| 240 | + String contentTime = json.getString("createTime");//创建时间 | |
| 241 | + if (CommonUtils.isNotEmpty(contentTime)) { | |
| 197 | 242 | // 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 | - } | |
| 243 | + shyContent.setContent_time(new Date(Long.valueOf(contentTime))); | |
| 244 | + | |
| 245 | + } | |
| 246 | + shyContent.setCreate_date(CommonUtils.getCurrentTime()); | |
| 247 | + shyContent.setCallback(json.getString("callbackUrl"));//回调地址 | |
| 248 | + shyContent.setContent_url(json.getString("pageUrl"));//朋友圈分享的url | |
| 249 | + shyContent.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔 | |
| 250 | + shyContent.setSp_id(json.getInteger("spId"));//spid | |
| 251 | + shyContent.setAuthor(json.getString("userId"));//用户id | |
| 252 | + shyContent.setSource(json.getString("nickName"));//用户昵称 | |
| 253 | + shyContent.setVideo_id(json.getString("videoId"));//关联videoId | |
| 254 | + shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态 | |
| 255 | + shyContent.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间 | |
| 256 | + boolean YorN = contentService.impotContent(shyContent); | |
| 257 | + if (YorN == true) { | |
| 258 | + return new ResponseBean(ErrorEnum.SUCCESS); | |
| 259 | + } else { | |
| 260 | + return new ResponseBean(ErrorEnum.ERROR); | |
| 261 | + } | |
| 217 | 262 | } |
| 218 | - | |
| 263 | + | |
| 219 | 264 | @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 | - | |
| 265 | + public Object getContentDetail(Model model, @PathVariable Integer id) { | |
| 266 | + System.out.println("数美送审页面开始进入"); | |
| 267 | + ShyContent content = contentService.selectByPrimaryKey(id); | |
| 268 | + model.addAttribute("contentText", content.getContent_text()); | |
| 269 | + model.addAttribute("contentTitle", content.getTitle()); | |
| 270 | + return "html/contentPage.html"; | |
| 271 | + } | |
| 272 | + | |
| 228 | 273 | |
| 229 | 274 | } | ... | ... |
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
| 1 | 1 | package com.cnlive.shenhe.api; |
| 2 | 2 | |
| 3 | -import com.alibaba.fastjson.JSON; | |
| 4 | -import com.alibaba.fastjson.JSONArray; | |
| 5 | 3 | import com.alibaba.fastjson.JSONObject; |
| 6 | -import com.cnlive.shenhe.bean.ErrorEnum; | |
| 7 | -import com.cnlive.shenhe.bean.ResponseBean; | |
| 8 | -import com.cnlive.shenhe.entity.ShyLive; | |
| 9 | 4 | import com.cnlive.shenhe.entity.ShyLiveapply; |
| 10 | -import com.cnlive.shenhe.entity.ShyVideos; | |
| 11 | 5 | import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl; |
| 12 | -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; | |
| 13 | -import com.cnlive.shenhe.utils.AntiFraudUtil; | |
| 14 | 6 | import com.cnlive.shenhe.utils.CommonConst; |
| 15 | 7 | import com.cnlive.shenhe.utils.CommonUtils; |
| 16 | - | |
| 17 | -import java.sql.Timestamp; | |
| 18 | -import java.util.Date; | |
| 19 | -import java.util.HashMap; | |
| 20 | -import java.util.List; | |
| 21 | -import java.util.Map; | |
| 22 | -import java.util.UUID; | |
| 23 | - | |
| 24 | -import org.apache.commons.lang3.StringUtils; | |
| 25 | 8 | import org.slf4j.Logger; |
| 26 | 9 | import org.slf4j.LoggerFactory; |
| 27 | 10 | import org.springframework.beans.factory.annotation.Autowired; |
| 28 | 11 | import org.springframework.stereotype.Controller; |
| 29 | 12 | import org.springframework.web.bind.annotation.PostMapping; |
| 30 | -import org.springframework.web.bind.annotation.RequestBody; | |
| 31 | 13 | import org.springframework.web.bind.annotation.RequestMapping; |
| 32 | -import org.springframework.web.bind.annotation.RequestMethod; | |
| 33 | 14 | import org.springframework.web.bind.annotation.ResponseBody; |
| 34 | -import com.cnlive.shenhe.utils.AntiFraudUtil; | |
| 15 | + | |
| 16 | +import java.sql.Timestamp; | |
| 17 | +import java.util.Date; | |
| 18 | +import java.util.List; | |
| 35 | 19 | |
| 36 | 20 | |
| 37 | -@SuppressWarnings("unused") | |
| 21 | + | |
| 22 | +/** | |
| 23 | + * @author Administrator | |
| 24 | + */ | |
| 38 | 25 | @Controller |
| 39 | 26 | @RequestMapping("/api/liveApply") |
| 40 | 27 | public class LiveApplyControllerApi { |
| ... | ... | @@ -48,20 +35,24 @@ public class LiveApplyControllerApi { |
| 48 | 35 | public JSONObject impotVideo(String param) { |
| 49 | 36 | JSONObject map = new JSONObject(); |
| 50 | 37 | JSONObject result = new JSONObject(); |
| 51 | - boolean YorN =true;//初始化一个请求数据库返回结果 | |
| 52 | - | |
| 38 | + //初始化一个请求数据库返回结果 | |
| 39 | + boolean YorN =true; | |
| 40 | + | |
| 53 | 41 | logger.info("直播申请入库，param=====" + param); |
| 54 | 42 | JSONObject json = JSONObject.parseObject(param); |
| 55 | 43 | //获取所有参数 |
| 56 | - String activityId = json.getString("activityId");//直播活动id | |
| 57 | - String channelId = json.getString("channelId");//直播频道id | |
| 58 | - Integer spId=null; | |
| 44 | + //直播活动id | |
| 45 | + String activityId = json.getString("activityId"); | |
| 46 | + //直播频道id | |
| 47 | + String channelId = json.getString("channelId"); | |
| 48 | + Integer spId=null; | |
| 59 | 49 | try { |
| 60 | 50 | spId=json.getInteger("spId"); |
| 61 | 51 | } catch (Exception e) { |
| 62 | 52 | spId=null; |
| 63 | 53 | } |
| 64 | - String sender = json.getString("sender");//直播发起人 | |
| 54 | + //直播发起人 | |
| 55 | + String sender = json.getString("sender"); | |
| 65 | 56 | String mobile = json.getString("mobile");//联系方式 |
| 66 | 57 | String callback = json.getString("callback");//回调地址 |
| 67 | 58 | String organization = json.getString("organization");//直播发起单位 | ... | ... |
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
| 1 | 1 | package com.cnlive.shenhe.api; |
| 2 | 2 | |
| 3 | 3 | import com.alibaba.fastjson.JSON; |
| 4 | -import com.alibaba.fastjson.JSONArray; | |
| 5 | 4 | import com.alibaba.fastjson.JSONObject; |
| 6 | -import com.cnlive.shenhe.bean.ErrorEnum; | |
| 7 | -import com.cnlive.shenhe.bean.ResponseBean; | |
| 8 | 5 | import com.cnlive.shenhe.entity.ShyLive; |
| 9 | -import com.cnlive.shenhe.entity.ShyVideos; | |
| 10 | 6 | import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; |
| 11 | -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; | |
| 12 | 7 | import com.cnlive.shenhe.utils.AntiFraudUtil; |
| 13 | 8 | import com.cnlive.shenhe.utils.CommonUtils; |
| 14 | - | |
| 15 | -import java.sql.Timestamp; | |
| 16 | -import java.util.Date; | |
| 17 | -import java.util.HashMap; | |
| 18 | -import java.util.List; | |
| 19 | -import java.util.Map; | |
| 20 | -import java.util.UUID; | |
| 21 | - | |
| 22 | 9 | import org.apache.commons.lang3.StringUtils; |
| 23 | 10 | import org.slf4j.Logger; |
| 24 | 11 | import org.slf4j.LoggerFactory; |
| 25 | 12 | import org.springframework.beans.factory.annotation.Autowired; |
| 26 | 13 | import org.springframework.stereotype.Controller; |
| 27 | -import org.springframework.web.bind.annotation.PostMapping; | |
| 28 | -import org.springframework.web.bind.annotation.RequestBody; | |
| 29 | -import org.springframework.web.bind.annotation.RequestMapping; | |
| 30 | -import org.springframework.web.bind.annotation.RequestMethod; | |
| 31 | -import org.springframework.web.bind.annotation.ResponseBody; | |
| 32 | -import com.cnlive.shenhe.utils.AntiFraudUtil; | |
| 14 | +import org.springframework.web.bind.annotation.*; | |
| 15 | + | |
| 16 | +import java.sql.Timestamp; | |
| 17 | +import java.util.Date; | |
| 18 | +import java.util.List; | |
| 19 | +import java.util.UUID; | |
| 33 | 20 | |
| 34 | 21 | |
| 22 | +/** | |
| 23 | + * @author Administrator | |
| 24 | + */ | |
| 35 | 25 | @SuppressWarnings("unused") |
| 36 | 26 | @Controller |
| 37 | 27 | @RequestMapping("/api/live") |
| ... | ... | @@ -46,12 +36,14 @@ public class LiveControllerApi { |
| 46 | 36 | public JSONObject impotVideo(String param) { |
| 47 | 37 | JSONObject map = new JSONObject(); |
| 48 | 38 | JSONObject result = new JSONObject(); |
| 49 | - boolean YorN =true;//初始化一个请求数据库返回结果 | |
| 50 | - | |
| 39 | + //初始化一个请求数据库返回结果 | |
| 40 | + boolean YorN =true; | |
| 41 | + | |
| 51 | 42 | logger.info("直播入库，param=====" + param); |
| 52 | 43 | JSONObject json = JSONObject.parseObject(param); |
| 53 | 44 | //获取所有参数 |
| 54 | - String activityId = json.getString("activityId");//直播活动id | |
| 45 | + //直播活动id | |
| 46 | + String activityId = json.getString("activityId"); | |
| 55 | 47 | String activityName = json.getString("activityName");//直播活动名称 |
| 56 | 48 | Integer activityStatus = Integer.parseInt(json.getString("activityStatus"));//直播活动状态 |
| 57 | 49 | String channelId = json.getString("channelId");//直播频道id |
| ... | ... | @@ -251,7 +243,7 @@ public class LiveControllerApi { |
| 251 | 243 | |
| 252 | 244 | /** |
| 253 | 245 | * 测试视频流 |
| 254 | - * @param videoStream | |
| 246 | + * @param | |
| 255 | 247 | */ |
| 256 | 248 | @RequestMapping(value="ceshiFinishVideo") |
| 257 | 249 | @ResponseBody |
| ... | ... | @@ -265,7 +257,7 @@ public class LiveControllerApi { |
| 265 | 257 | |
| 266 | 258 | /** |
| 267 | 259 | * 测试视频流 |
| 268 | - * @param videoStream | |
| 260 | + * @param | |
| 269 | 261 | */ |
| 270 | 262 | @RequestMapping(value="queryVideo") |
| 271 | 263 | @ResponseBody | ... | ... |
src/main/java/com/cnlive/shenhe/api/TopicControllerApi.java
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
| ... | ... | @@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject; |
| 5 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 6 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 7 | 7 | import com.cnlive.shenhe.entity.ShyVideos; |
| 8 | -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | |
| 9 | -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | |
| 10 | 8 | import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; |
| 11 | -import com.cnlive.shenhe.utils.AuditPass; | |
| 12 | 9 | import com.cnlive.shenhe.utils.CommonConst; |
| 13 | 10 | import com.cnlive.shenhe.utils.CommonUtils; |
| 14 | 11 | import com.cnlive.shenhe.utils.HttpUtil; |
| ... | ... | @@ -22,13 +19,12 @@ import org.springframework.web.bind.annotation.RequestMapping; |
| 22 | 19 | import org.springframework.web.bind.annotation.ResponseBody; |
| 23 | 20 | |
| 24 | 21 | import java.net.URLEncoder; |
| 25 | -import java.util.Date; | |
| 26 | 22 | import java.util.HashMap; |
| 27 | 23 | import java.util.List; |
| 28 | 24 | import java.util.Map; |
| 29 | 25 | |
| 30 | 26 | /** |
| 31 | - * @Auther: chenhao | |
| 27 | + * @author : chenhao | |
| 32 | 28 | * @Date: 2018/12/6 11:17 |
| 33 | 29 | * @Description: 视频送审接口 |
| 34 | 30 | */ |
| ... | ... | @@ -37,13 +33,7 @@ import java.util.Map; |
| 37 | 33 | public class VideosControllerApi { |
| 38 | 34 | private static Logger logger = LoggerFactory.getLogger(VideosControllerApi.class); |
| 39 | 35 | @Autowired |
| 40 | - AuditPass Pass; | |
| 41 | - @Autowired | |
| 42 | 36 | VideosServiceImpl videosService; |
| 43 | - @Autowired | |
| 44 | - UsersServiceImpl usersService; | |
| 45 | - @Autowired | |
| 46 | - SitesServiceImpl sitesService; | |
| 47 | 37 | |
| 48 | 38 | @Value("${avsmple_appKey}") |
| 49 | 39 | String appkey; |
| ... | ... | @@ -69,31 +59,28 @@ public class VideosControllerApi { |
| 69 | 59 | @PostMapping("/import") |
| 70 | 60 | @ResponseBody |
| 71 | 61 | public ResponseBean impotVideo(String param) { |
| 72 | - logger.info("点播入库，param=====" + param); | |
| 62 | + logger.info("点播入库,param====={}", param); | |
| 73 | 63 | JSONObject json = JSONObject.parseObject(param); |
| 74 | - ShyVideos shyVideos1 = new ShyVideos(); | |
| 75 | - //g得到视频id去查询是否已有 | |
| 76 | - String videoId = json.getString("videoId"); | |
| 77 | - shyVideos1.setVideo_id(videoId); | |
| 78 | 64 | //目击者类型 0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 |
| 79 | 65 | String source = json.getString("source"); |
| 80 | 66 | Integer duration = json.getInteger("duration"); |
| 81 | 67 | if (CommonUtils.isNotNull(duration)) duration = duration / 1000; |
| 82 | 68 | //获取栏目分类 |
| 83 | - String category=CommonUtils.isEmpty(json.getString("multiplecategory"))?"":json.getString("multiplecategory"); | |
| 69 | + String category = CommonUtils.isEmpty(json.getString("multiplecategory")) ? "" : json.getString("multiplecategory"); | |
| 84 | 70 | //获取视频上传人的id |
| 85 | - String sid=CommonUtils.isEmpty(json.getString("videoClipsName"))?"":json.getString("videoClipsName"); | |
| 86 | - logger.info("videoClipsName:"+sid); | |
| 87 | - sid=CommonUtils.isEmpty(sid)?"":sid.split("_")[2]; | |
| 88 | - logger.info("sid:"+sid); | |
| 89 | - //初始化一个审核状态 | |
| 90 | -// Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审 | |
| 91 | -// shenheType=videosService.getShenheType(json.getInteger("spId"),category,sid); | |
| 92 | - | |
| 71 | + String sid = CommonUtils.isEmpty(json.getString("videoClipsName")) ? "" : json.getString("videoClipsName"); | |
| 72 | + logger.info("videoClipsName:" + sid); | |
| 73 | + sid = CommonUtils.isEmpty(sid) ? "" : sid.split("_")[2]; | |
| 74 | + logger.info("sid:" + sid); | |
| 93 | 75 | //查询一下 存在，更新 没有，插入 |
| 94 | - List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1); | |
| 95 | - if (listshyVideos.size() > 0) { | |
| 96 | - ShyVideos shyVideos = listshyVideos.get(0); | |
| 76 | + ShyVideos shyVideos1 = new ShyVideos(); | |
| 77 | + //g得到视频id去查询是否已有 | |
| 78 | + String videoId = json.getString("videoId"); | |
| 79 | + shyVideos1.setVideo_id(videoId); | |
| 80 | + List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos1); | |
| 81 | + if (shyVideosList.size() > 0) { | |
| 82 | + logger.info("点播入库更新视频开始............................"); | |
| 83 | + ShyVideos shyVideos = shyVideosList.get(0); | |
| 97 | 84 | //封装数据入库 |
| 98 | 85 | shyVideos.setVideo_id(videoId); |
| 99 | 86 | shyVideos.setSource(source); |
| ... | ... | @@ -117,12 +104,15 @@ public class VideosControllerApi { |
| 117 | 104 | shyVideos.setBucket(json.getString("bucketName")); |
| 118 | 105 | shyVideos.setPlat(json.getInteger("bucketType")); |
| 119 | 106 | shyVideos.setDuration(duration); |
| 120 | - shyVideos.setCategory(category);//传入栏目分类 | |
| 121 | - shyVideos.setVideo_user_id(sid);//传入sid | |
| 107 | + //传入栏目分类 | |
| 108 | + shyVideos.setCategory(category); | |
| 109 | + //传入sid | |
| 110 | + shyVideos.setVideo_user_id(sid); | |
| 122 | 111 | shyVideos.setReceive(CommonConst.RECEIVE_BEFORE); |
| 123 | 112 | shyVideos.setReceive_user_id(null); |
| 124 | 113 | shyVideos.setUpdated_at(CommonUtils.getCurrentTime()); |
| 125 | - videosService.getShenheType(shyVideos);//获取审核类型 | |
| 114 | + //获取审核类型 | |
| 115 | + videosService.getShenheType(shyVideos); | |
| 126 | 116 | boolean YorN = videosService.updateshyVideos(shyVideos); |
| 127 | 117 | if (YorN == true) { |
| 128 | 118 | return new ResponseBean(ErrorEnum.SUCCESS); |
| ... | ... | @@ -130,7 +120,24 @@ public class VideosControllerApi { |
| 130 | 120 | return new ResponseBean(ErrorEnum.ERROR); |
| 131 | 121 | } |
| 132 | 122 | } |
| 123 | + return saveVideo(json, shyVideos1, source, duration, category, sid); | |
| 124 | + | |
| 125 | + } | |
| 126 | + | |
| 127 | + /** | |
| 128 | + * 保存视频 | |
| 129 | + * | |
| 130 | + * @param json | |
| 131 | + * @param shyVideos1 | |
| 132 | + * @param source | |
| 133 | + * @param duration | |
| 134 | + * @param category | |
| 135 | + * @param sid | |
| 136 | + * @return | |
| 137 | + */ | |
| 138 | + private ResponseBean saveVideo(JSONObject json, ShyVideos shyVideos1, String source, Integer duration, String category, String sid) { | |
| 133 | 139 | //查了，没有，直接插入数据库 |
| 140 | + logger.info("点播入库保存视频开始............................"); | |
| 134 | 141 | shyVideos1.setSource(source); |
| 135 | 142 | shyVideos1.setVideo_title(json.getString("videoTitle")); |
| 136 | 143 | shyVideos1.setVideo_url(json.getString("videoUrl")); |
| ... | ... | @@ -156,24 +163,32 @@ public class VideosControllerApi { |
| 156 | 163 | shyVideos1.setBucket(json.getString("bucketName")); |
| 157 | 164 | shyVideos1.setPlat(json.getInteger("bucketType")); |
| 158 | 165 | shyVideos1.setDuration(duration); |
| 159 | - shyVideos1.setCategory(category);//传入栏目分类 | |
| 160 | - shyVideos1.setVideo_user_id(sid);//传入sid | |
| 161 | - videosService.getShenheType(shyVideos1);//获取审核类型 | |
| 166 | + //传入栏目分类 | |
| 167 | + shyVideos1.setCategory(category); | |
| 168 | + //传入sid | |
| 169 | + shyVideos1.setVideo_user_id(sid); | |
| 170 | + //获取审核类型 | |
| 171 | + videosService.getShenheType(shyVideos1); | |
| 162 | 172 | |
| 163 | - if(shyVideos1.getShenhe_type()!=1){ | |
| 164 | - if(shyVideos1.getShenhe_type()==CommonConst.AUDIT_TYPE_USER){//如果审核类型是人工审核，按照原有规则 | |
| 173 | + if (shyVideos1.getShenhe_type() != 1) { | |
| 174 | + //如果审核类型是人工审核，按照原有规则 | |
| 175 | + if (shyVideos1.getShenhe_type() == CommonConst.AUDIT_TYPE_USER) { | |
| 165 | 176 | if (CommonUtils.isNotNull(duration) && duration > 80) { |
| 166 | - shyVideos1 = avsample(shyVideos1);//视频至少可以抽8张，请求抽帧 | |
| 177 | + //视频至少可以抽8张，请求抽帧 | |
| 178 | + shyVideos1 = avsample(shyVideos1); | |
| 167 | 179 | } |
| 168 | - }else if(shyVideos1.getShenhe_type()==CommonConst.AUDIT_TYPE_MACHANE){//如果审核类型是机审 | |
| 169 | - if (CommonUtils.isNotNull(duration) && duration < 60) {//"目击者"视频，小于60秒的抽帧 | |
| 180 | + //如果审核类型是机审 | |
| 181 | + } else if (shyVideos1.getShenhe_type() == CommonConst.AUDIT_TYPE_MACHANE) { | |
| 182 | + //"目击者"视频，小于60秒的抽帧 | |
| 183 | + if (CommonUtils.isNotNull(duration) && duration < 60) { | |
| 170 | 184 | shyVideos1 = avsample(shyVideos1); |
| 171 | - }else{//机审超过60秒的改为人工审核 | |
| 185 | + } else { | |
| 186 | + //机审超过60秒的改为人工审核 | |
| 172 | 187 | shyVideos1.setShenhe_type(3); |
| 173 | 188 | } |
| 174 | 189 | } |
| 175 | 190 | } |
| 176 | - logger.info("当前视频类型是："+shyVideos1.getShenhe_type()); | |
| 191 | + logger.info("当前视频类型是：" + shyVideos1.getShenhe_type()); | |
| 177 | 192 | boolean result = videosService.impotVideo(shyVideos1); |
| 178 | 193 | |
| 179 | 194 | if (result == true) { |
| ... | ... | @@ -192,45 +207,52 @@ public class VideosControllerApi { |
| 192 | 207 | public ShyVideos avsample(ShyVideos video) { |
| 193 | 208 | try { |
| 194 | 209 | JSONObject params = new JSONObject(); |
| 195 | - String video_url = video.getVideo_url(); | |
| 210 | + String videoUrl = video.getVideo_url(); | |
| 196 | 211 | Integer plat = video.getPlat(); |
| 197 | 212 | String bucket = video.getBucket(); |
| 198 | 213 | Integer spid = video.getSpid(); |
| 199 | 214 | |
| 200 | - String path = video_url.replace("//", ""); | |
| 215 | + String path = videoUrl.replace("//", ""); | |
| 201 | 216 | path = path.substring(path.indexOf("/"), path.length()); |
| 202 | - String domian = video_url.replace(path, ""); | |
| 217 | + String domainName = videoUrl.replace(path, ""); | |
| 203 | 218 | path = "/" + bucket + path; |
| 204 | 219 | |
| 205 | 220 | JSONObject attach = new JSONObject(); |
| 206 | 221 | JSONObject extParam = new JSONObject(); |
| 207 | - | |
| 208 | - if(!video.getCategory().equals(CommonConst.CATEGORY_WITNESS)){//非“目击者”视频 | |
| 209 | - Integer interval=10;//默认抽帧时长 | |
| 210 | - interval=video.getDuration()/3600*10+10;//抽帧时长的算法：视频时长每增加一小时，抽帧时长增加10秒 | |
| 211 | - attach.put("interval", interval); | |
| 212 | - attach.put("strategy", 1); | |
| 213 | - attach.put("duration", video.getDuration()); | |
| 214 | - }else{ | |
| 215 | - if(video.getDuration()>4){//“目击者”视频时间大于4秒 | |
| 216 | - attach.put("interval", 4);//间隔 单位s | |
| 217 | - attach.put("num", video.getDuration()/4);//覆盖转码服务的默认抽帧图数量 | |
| 218 | - attach.put("duration", video.getDuration()); | |
| 219 | -// attach.put("strategy", 1);//是否从头抽到尾（1：是，优先级大于num） | |
| 220 | - }else{ | |
| 221 | - attach.put("num", 1);//抽帧图片张数 | |
| 222 | - attach.put("first", 0);//是否首帧，0：是。num=1时有效 | |
| 223 | - } | |
| 222 | + | |
| 223 | + //非“目击者”视频 | |
| 224 | + if (!video.getCategory().equals(CommonConst.CATEGORY_WITNESS)) { | |
| 225 | + //默认抽帧时长 抽帧时长的算法：视频时长每增加一小时，抽帧时长增加10秒 | |
| 226 | + Integer duration = video.getDuration(); | |
| 227 | + Integer interval = duration / 3600 * 10 + 10; | |
| 228 | + attach.put("interval", interval); | |
| 229 | + attach.put("strategy", 1); | |
| 230 | + attach.put("duration", video.getDuration()); | |
| 231 | + if (duration < 60) { | |
| 232 | + int num = duration / 10; | |
| 233 | + attach.put("num", num == 0 ? 1 : num); | |
| 234 | + } | |
| 235 | + } else { | |
| 236 | + //“目击者”视频时间大于4秒 | |
| 237 | + if (video.getDuration() > 4) { | |
| 238 | + //间隔 单位s | |
| 239 | + attach.put("interval", 4); | |
| 240 | + //覆盖转码服务的默认抽帧图数量 | |
| 241 | + attach.put("num", video.getDuration() / 4); | |
| 242 | + attach.put("duration", video.getDuration()); | |
| 243 | + } else { | |
| 244 | + //抽帧图片张数 | |
| 245 | + attach.put("num", 1); | |
| 246 | + //是否首帧，0：是。num=1时有效 | |
| 247 | + attach.put("first", 0); | |
| 248 | + } | |
| 224 | 249 | } |
| 225 | - | |
| 226 | - | |
| 227 | 250 | logger.info("抽帧attach参数：attach:{}", attach); |
| 228 | - extParam.put("domain", domian); | |
| 251 | + extParam.put("domain", domainName); | |
| 229 | 252 | if (CommonConst.KS_PLAT == plat) { |
| 230 | 253 | //金山 |
| 231 | 254 | params.put("plat", 0); |
| 232 | 255 | params.put("dstBucket", ks_bucket); |
| 233 | - | |
| 234 | 256 | } else if (CommonConst.QINIU_PLAT == plat) { |
| 235 | 257 | //七牛 |
| 236 | 258 | params.put("plat", 1); |
| ... | ... | @@ -247,7 +269,7 @@ public class VideosControllerApi { |
| 247 | 269 | params.put("attach", attach); |
| 248 | 270 | params.put("extParam", extParam); |
| 249 | 271 | logger.info("抽帧params参数：params:{}", params); |
| 250 | - long timestamp = new Date().getTime(); | |
| 272 | + long timestamp = System.currentTimeMillis(); | |
| 251 | 273 | String sign = CommonUtils.md5(URLEncoder.encode(appkey + timestamp + params.toJSONString() + appSecret, "utf-8")); |
| 252 | 274 | Map<String, String> dataMap = new HashMap<>(); |
| 253 | 275 | dataMap.put("timestamp", timestamp + ""); |
| ... | ... | @@ -275,4 +297,5 @@ public class VideosControllerApi { |
| 275 | 297 | return video; |
| 276 | 298 | } |
| 277 | 299 | |
| 300 | + | |
| 278 | 301 | } | ... | ... |
src/main/java/com/cnlive/shenhe/api/YiDunControllerApi.java
| ... | ... | @@ -66,13 +66,11 @@ public class YiDunControllerApi { |
| 66 | 66 | params.put("checkFlags", "1,2"); |
| 67 | 67 | //不是必传参数 |
| 68 | 68 | params.put("callback", UUID.randomUUID().toString()); |
| 69 | - | |
| 70 | 69 | // 3.生成签名信息 |
| 71 | 70 | String signature = YiDunAntiFraudUtil.genSignature(SECRETKEY, params); |
| 72 | 71 | params.put("signature", signature); |
| 73 | 72 | |
| 74 | 73 | // 4.发送HTTP请求 |
| 75 | - //String response = HttpClient4Utils.sendPost(httpClient, API_URL, params, Consts.UTF_8); | |
| 76 | 74 | String s = HttpClientUtils.post_str(URL_SUBMIT, params); |
| 77 | 75 | logger.info("向易盾提交网站检测地址返回的结果:{}", s); |
| 78 | 76 | JSONObject jsonObject = JSONObject.parseObject(s); |
| ... | ... | @@ -81,12 +79,15 @@ public class YiDunControllerApi { |
| 81 | 79 | if (code == 200 && "ok".equals(msg)) { |
| 82 | 80 | JSONObject result = jsonObject.getJSONObject("result"); |
| 83 | 81 | String dataId = result.getString("dataId"); |
| 82 | + String taskId = result.getString("taskId"); | |
| 84 | 83 | ShyYidun shyYidun = new ShyYidun(); |
| 85 | 84 | shyYidun.setId(dataId); |
| 85 | + shyYidun.setTask_id(taskId); | |
| 86 | + shyYidun.setData_id(dataId); | |
| 87 | + //网页 | |
| 88 | + shyYidun.setCheck_type(3); | |
| 86 | 89 | shyYidun.setCreate_time(new Date()); |
| 87 | 90 | yiDunServiceImpl.addYiDunMsg(shyYidun); |
| 88 | - | |
| 89 | 91 | } |
| 90 | - | |
| 91 | 92 | } |
| 92 | 93 | } | ... | ... |
src/main/java/com/cnlive/shenhe/bean/ErrorEnum.java
src/main/java/com/cnlive/shenhe/bean/ResponseBean.java
src/main/java/com/cnlive/shenhe/config/MyInterceptor.java
src/main/java/com/cnlive/shenhe/config/SessionFilter.java
| 1 | 1 | package com.cnlive.shenhe.config; |
| 2 | + | |
| 2 | 3 | import org.slf4j.LoggerFactory; |
| 3 | 4 | import org.springframework.web.context.request.RequestContextHolder; |
| 4 | 5 | import org.springframework.web.context.request.ServletRequestAttributes; |
| ... | ... | @@ -16,14 +17,15 @@ import java.util.regex.Matcher; |
| 16 | 17 | import java.util.regex.Pattern; |
| 17 | 18 | |
| 18 | 19 | /** |
| 19 | - * Created by liwei on 2018/08/28. | |
| 20 | - * | |
| 20 | + * @author liwei | |
| 21 | + * @date 2018/08/28 | |
| 22 | + * <p> | |
| 21 | 23 | * 过滤器 |
| 22 | 24 | */ |
| 23 | 25 | public class SessionFilter implements Filter { |
| 24 | 26 | private static final org.slf4j.Logger logger = LoggerFactory.getLogger(SessionFilter.class); |
| 25 | - HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); | |
| 26 | - HttpServletResponse response = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getResponse(); | |
| 27 | + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |
| 28 | + HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse(); | |
| 27 | 29 | /** |
| 28 | 30 | * 封装，不需要过滤的list列表 |
| 29 | 31 | */ |
| ... | ... | @@ -44,19 +46,19 @@ public class SessionFilter implements Filter { |
| 44 | 46 | url = url.substring(1); |
| 45 | 47 | } |
| 46 | 48 | |
| 47 | - if (isInclude(url)){ | |
| 49 | + if (isInclude(url)) { | |
| 48 | 50 | chain.doFilter(httpRequest, httpResponse); |
| 49 | 51 | return; |
| 50 | 52 | } else { |
| 51 | 53 | HttpSession session = httpRequest.getSession(); |
| 52 | - if (session.getAttribute(SessionUser.getSessionKey()) != null){ | |
| 54 | + if (session.getAttribute(SessionUser.getSessionKey()) != null) { | |
| 53 | 55 | // session存在 |
| 54 | 56 | chain.doFilter(httpRequest, httpResponse); |
| 55 | 57 | return; |
| 56 | 58 | } else { |
| 57 | 59 | // session不存在 准备跳转失败 |
| 58 | - RequestDispatcher dispatcher = request.getRequestDispatcher("/users/login"); | |
| 59 | - dispatcher.forward(request, response); | |
| 60 | + RequestDispatcher dispatcher = request.getRequestDispatcher("/users/login"); | |
| 61 | + dispatcher.forward(request, response); | |
| 60 | 62 | // chain.doFilter(httpRequest, httpResponse); |
| 61 | 63 | return; |
| 62 | 64 | } |
| ... | ... | @@ -73,6 +75,7 @@ public class SessionFilter implements Filter { |
| 73 | 75 | |
| 74 | 76 | /** |
| 75 | 77 | * 是否需要过滤 |
| 78 | + * | |
| 76 | 79 | * @param url |
| 77 | 80 | * @return |
| 78 | 81 | */ | ... | ... |
src/main/java/com/cnlive/shenhe/config/WebConfiguration.java
src/main/java/com/cnlive/shenhe/controller/AudioController.java
| ... | ... | @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; |
| 5 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 6 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 7 | 7 | import com.cnlive.shenhe.bean.SessionUser; |
| 8 | +import com.cnlive.shenhe.dto.AudioDTO; | |
| 8 | 9 | import com.cnlive.shenhe.entity.ShyAudio; |
| 9 | 10 | import com.cnlive.shenhe.entity.ShySites; |
| 10 | 11 | import com.cnlive.shenhe.entity.ShyUsers; |
| ... | ... | @@ -68,44 +69,34 @@ public class AudioController extends BaseController { |
| 68 | 69 | * 音频数据分页获取 |
| 69 | 70 | * |
| 70 | 71 | * @param model |
| 71 | - * @param video_title | |
| 72 | - * @param start_date | |
| 73 | - * @param end_date | |
| 74 | - * @param state | |
| 75 | - * @param receive | |
| 76 | - * @param page | |
| 77 | - * @param pageSize | |
| 78 | - * @param video_priority | |
| 79 | - * @param orderByClause | |
| 80 | - * @param sp_desc | |
| 81 | - * @param sp_Id | |
| 72 | + * @param audioDTO | |
| 82 | 73 | * @param session |
| 83 | 74 | * @return |
| 84 | 75 | */ |
| 85 | 76 | @GetMapping("/page") |
| 86 | - public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, HttpSession session) { | |
| 77 | + public Object getListVideos(Model model, AudioDTO audioDTO, HttpSession session) { | |
| 78 | + logger.info("列表请求参数:{}", JSON.toJSONString(audioDTO)); | |
| 87 | 79 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 88 | 80 | if (CommonUtils.isNull(sessionUser)) { |
| 89 | 81 | return "redirect:/users/login"; |
| 90 | 82 | } |
| 91 | 83 | Integer spid = sessionUser.getSpid(); |
| 92 | - logger.info("sp_Id:{},spid:{}", sp_Id, spid); | |
| 84 | + audioDTO.setSpid(spid); | |
| 85 | + logger.info("sp_Id:{},spid:{}", audioDTO.getSp_Id(), audioDTO.getSpid()); | |
| 93 | 86 | String userId = sessionUser.getUserId(); |
| 94 | - if (CommonUtils.isNull(page)) page = 1; | |
| 95 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 96 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | |
| 97 | - ShySites shySite = sitesService.findspidBySpdesc(sp_desc); | |
| 87 | + audioDTO.setUserId(userId); | |
| 88 | + if (CommonUtils.isNotEmpty(audioDTO.getSp_desc()) && audioDTO.getSpid() == 0) { | |
| 89 | + ShySites shySite = sitesService.findspidBySpdesc(audioDTO.getSp_desc()); | |
| 98 | 90 | if (CommonUtils.isNotNull(shySite)) { |
| 99 | - spid = shySite.getSpid(); | |
| 91 | + audioDTO.setSpid(shySite.getSpid()); | |
| 100 | 92 | } else { |
| 101 | - setmodel_site(model); | |
| 93 | + setmodelSite(model); | |
| 102 | 94 | return "error.html"; |
| 103 | 95 | } |
| 104 | - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 105 | - spid = null; | |
| 96 | + } else if (CommonUtils.isEmpty(audioDTO.getSp_desc()) && audioDTO.getSpid() == 0) { | |
| 97 | + audioDTO.setSpid(null); | |
| 106 | 98 | } |
| 107 | - | |
| 108 | - PageInfo<ShyAudio> audioPage = audioService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id); | |
| 99 | + PageInfo<ShyAudio> audioPage = audioService.getListContent(audioDTO); | |
| 109 | 100 | if (audioPage != null && audioPage.getSize() > 0) { |
| 110 | 101 | List<ShyAudio> list = audioPage.getList(); |
| 111 | 102 | if (list != null && list.size() > 0) { |
| ... | ... | @@ -137,16 +128,16 @@ public class AudioController extends BaseController { |
| 137 | 128 | } |
| 138 | 129 | |
| 139 | 130 | //获取参数值给前台 用来判断是否需要把查看显示出来 state recive |
| 140 | - String state1 = state == null ? "" : state.toString(); | |
| 131 | + String state1 = audioDTO.getState() == null ? "" : audioDTO.getState().toString(); | |
| 141 | 132 | String receive1 = ""; |
| 142 | - if (CommonUtils.isNotNull(receive)) { | |
| 143 | - receive1 = receive == CommonConst.RECEIVE_AFTER ? "true" : "false"; | |
| 133 | + if (CommonUtils.isNotNull(audioDTO.getReceive())) { | |
| 134 | + receive1 = audioDTO.getReceive().equals(CommonConst.RECEIVE_AFTER) ? "true" : "false"; | |
| 144 | 135 | } else { |
| 145 | 136 | receive1 = ""; |
| 146 | 137 | } |
| 147 | 138 | model.addAttribute("state1", state1); |
| 148 | 139 | model.addAttribute("receive1", receive1); |
| 149 | - model.addAttribute("pageSize", pageSize); | |
| 140 | + model.addAttribute("pageSize", audioDTO.getPageSize()); | |
| 150 | 141 | model.addAttribute("audioPage", audioPage); |
| 151 | 142 | return "page/audio.html"; |
| 152 | 143 | } |
| ... | ... | @@ -172,7 +163,7 @@ public class AudioController extends BaseController { |
| 172 | 163 | for (String cid : cids) { |
| 173 | 164 | ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(cid)); |
| 174 | 165 | if (CommonUtils.isNotNull(shyAudio)) { |
| 175 | - if (shyAudio.getState() != CommonConst.AUDIT_INTT || shyAudio.getReceive()==CommonConst.RECEIVE_AFTER) { | |
| 166 | + if (!shyAudio.getState().equals(CommonConst.AUDIT_INTT) || shyAudio.getReceive().equals(CommonConst.RECEIVE_AFTER)) { | |
| 176 | 167 | return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试"); |
| 177 | 168 | } |
| 178 | 169 | } else { |
| ... | ... | @@ -202,7 +193,7 @@ public class AudioController extends BaseController { |
| 202 | 193 | String[] cids = ids.split(","); |
| 203 | 194 | for (String cid : cids) { |
| 204 | 195 | 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)) { | |
| 196 | + if (!shyAudio.getState() .equals( CommonConst.AUDIT_INTT )|| shyAudio.getReceive() .equals(CommonConst.RECEIVE_BEFORE) || !shyAudio.getReceive_user_id().equals(userId)) { | |
| 206 | 197 | return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的"); |
| 207 | 198 | } |
| 208 | 199 | } |
| ... | ... | @@ -250,9 +241,9 @@ public class AudioController extends BaseController { |
| 250 | 241 | |
| 251 | 242 | String yuming = ""; |
| 252 | 243 | Integer plat = shyAudio.getBucketType(); |
| 253 | - if (plat == CommonConst.QINIU_PLAT) { | |
| 244 | + if (plat .equals( CommonConst.QINIU_PLAT)) { | |
| 254 | 245 | yuming = qn_domain + "/"; |
| 255 | - } else if (plat == CommonConst.KS_PLAT) { | |
| 246 | + } else if (plat .equals( CommonConst.KS_PLAT)) { | |
| 256 | 247 | yuming = ks_domain + "/"; |
| 257 | 248 | } |
| 258 | 249 | shyAudio.setAttr_tags(CommonUtils.isEmpty(shyAudio.getAttr_tags()) ? "" : shyAudio.getAttr_tags()); |
| ... | ... | @@ -265,23 +256,21 @@ public class AudioController extends BaseController { |
| 265 | 256 | /** |
| 266 | 257 | * 根据条件导出excel |
| 267 | 258 | * |
| 268 | - * @param video_title | |
| 269 | - * @param start_date | |
| 270 | - * @param end_date | |
| 271 | - * @param state | |
| 272 | - * @param receive | |
| 273 | - * @param video_priority | |
| 274 | - * @param orderByClause | |
| 259 | + * @param audioDTO | |
| 275 | 260 | * @param session |
| 276 | 261 | * @param response |
| 277 | 262 | */ |
| 278 | 263 | @GetMapping("excel") |
| 279 | - public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, HttpSession session, HttpServletResponse response) { | |
| 264 | + public void getExcel(AudioDTO audioDTO, HttpSession session, HttpServletResponse response) { | |
| 280 | 265 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 281 | 266 | Integer spid = sessionUser.getSpid(); |
| 282 | 267 | String userId = sessionUser.getUserId(); |
| 283 | - if (spid == 0) spid = null; | |
| 284 | - List<ShyAudio> shyAudioList = audioService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId); | |
| 268 | + audioDTO.setSpid(spid); | |
| 269 | + audioDTO.setUserId(userId); | |
| 270 | + if (spid == 0) { | |
| 271 | + audioDTO.setSpid(null); | |
| 272 | + } | |
| 273 | + List<ShyAudio> shyAudioList = audioService.findByCondition(audioDTO); | |
| 285 | 274 | String fileName = "音频数据"; |
| 286 | 275 | String updater = "";//审核员名字 |
| 287 | 276 | String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核 |
| ... | ... | @@ -341,8 +330,8 @@ public class AudioController extends BaseController { |
| 341 | 330 | cell.setCellValue(shyAudioList.get(i).getAudioTag()); |
| 342 | 331 | cell = row.createCell(5);//列 |
| 343 | 332 | //审核员需要做处理 |
| 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(); | |
| 333 | + if (!shyAudioList.get(i).getState().equals(CommonConst.AUDIT_INTT)) { | |
| 334 | + updater = CommonUtils.isEmpty(shyAudioList.get(i).getUploader()) || "null".equals(shyAudioList.get(i).getUploader()) ? "白名单" : shyAudioList.get(i).getUploader(); | |
| 346 | 335 | String auditor_id = shyAudioList.get(i).getAuditor_id(); |
| 347 | 336 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 348 | 337 | ShyUsers user = new ShyUsers(); |
| ... | ... | @@ -351,7 +340,7 @@ public class AudioController extends BaseController { |
| 351 | 340 | if (CommonUtils.isNotNull(user)) { |
| 352 | 341 | String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); |
| 353 | 342 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 354 | - updater = userName ; | |
| 343 | + updater = userName; | |
| 355 | 344 | } |
| 356 | 345 | } |
| 357 | 346 | } |
| ... | ... | @@ -408,19 +397,23 @@ public class AudioController extends BaseController { |
| 408 | 397 | } catch (final Exception e) { |
| 409 | 398 | e.printStackTrace(); |
| 410 | 399 | try { |
| 411 | - if (bis != null) | |
| 400 | + if (bis != null) { | |
| 412 | 401 | bis.close(); |
| 413 | - if (bos != null) | |
| 402 | + } | |
| 403 | + if (bos != null) { | |
| 414 | 404 | bos.close(); |
| 405 | + } | |
| 415 | 406 | } catch (Exception e1) { |
| 416 | 407 | e1.printStackTrace(); |
| 417 | 408 | } |
| 418 | 409 | } finally { |
| 419 | 410 | try { |
| 420 | - if (bis != null) | |
| 411 | + if (bis != null) { | |
| 421 | 412 | bis.close(); |
| 422 | - if (bos != null) | |
| 413 | + } | |
| 414 | + if (bos != null) { | |
| 423 | 415 | bos.close(); |
| 416 | + } | |
| 424 | 417 | } catch (Exception e2) { |
| 425 | 418 | e2.printStackTrace(); |
| 426 | 419 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/BaseController.java
| 1 | 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 | 8 | import javax.servlet.http.HttpServletRequest; |
| 6 | 9 | import javax.servlet.http.HttpServletResponse; |
| 7 | 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 | 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
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 3 | 4 | import com.alibaba.fastjson.JSONObject; |
| 4 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 7 | import com.cnlive.shenhe.bean.SessionUser; |
| 8 | +import com.cnlive.shenhe.dto.ChannelDTO; | |
| 7 | 9 | import com.cnlive.shenhe.entity.ShyChannel; |
| 8 | -import com.cnlive.shenhe.entity.ShyContent; | |
| 9 | 10 | import com.cnlive.shenhe.entity.ShySites; |
| 10 | 11 | import com.cnlive.shenhe.entity.ShyUsers; |
| 11 | -import com.cnlive.shenhe.entity.ShyVideos; | |
| 12 | 12 | import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl; |
| 13 | -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; | |
| 14 | 13 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 15 | 14 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 16 | 15 | import com.cnlive.shenhe.utils.AuditPass; |
| ... | ... | @@ -26,18 +25,20 @@ import org.springframework.ui.Model; |
| 26 | 25 | import org.springframework.web.bind.annotation.*; |
| 27 | 26 | |
| 28 | 27 | import javax.servlet.http.HttpSession; |
| 29 | -import java.util.Date; | |
| 30 | 28 | import java.util.HashMap; |
| 31 | 29 | import java.util.List; |
| 32 | 30 | import java.util.Map; |
| 33 | 31 | |
| 34 | 32 | |
| 33 | +/** | |
| 34 | + * @author Administrator | |
| 35 | + */ | |
| 35 | 36 | @Controller |
| 36 | 37 | @RequestMapping("/channel") |
| 37 | 38 | public class ChannelController extends BaseController { |
| 38 | 39 | private static Logger logger = LoggerFactory.getLogger(ChannelController.class); |
| 39 | 40 | @Value("${spring.localhost.url}") |
| 40 | - private String localhost_url;//本机地址 | |
| 41 | + private String localhost_url;//本机地址 | |
| 41 | 42 | @Autowired |
| 42 | 43 | AuditPass Pass; |
| 43 | 44 | @Autowired |
| ... | ... | @@ -45,99 +46,88 @@ public class ChannelController extends BaseController { |
| 45 | 46 | |
| 46 | 47 | @Autowired |
| 47 | 48 | UsersServiceImpl usersService; |
| 49 | + | |
| 48 | 50 | @Autowired |
| 49 | 51 | SitesServiceImpl sitesService; |
| 50 | 52 | |
| 51 | - /** | |
| 52 | - * 评论列表页 | |
| 53 | - * | |
| 54 | - * @param model | |
| 55 | - * @param channelId | |
| 56 | - * @param channelName | |
| 57 | - * @param offline | |
| 58 | - * @param start_date | |
| 59 | - * @param end_date | |
| 60 | - * @param state | |
| 61 | - * @param sp_desc | |
| 62 | - * @param page | |
| 63 | - * @param pageSize | |
| 64 | - * @param orderByClause | |
| 65 | - * @param session | |
| 66 | - * @return | |
| 67 | - */ | |
| 53 | + /** | |
| 54 | + * 评论列表页 | |
| 55 | + * | |
| 56 | + * @param model | |
| 57 | + * @param channelDTO | |
| 58 | + * @param session | |
| 59 | + * @return | |
| 60 | + */ | |
| 68 | 61 | @GetMapping("/page") |
| 69 | - public String getPage(Model model, String channel_id, String channel_name, Integer receive, | |
| 70 | - String start_date, String end_date,Integer shenhe_status, String sp_desc, | |
| 71 | - Integer page, Integer pageSize, String orderByClause, HttpSession session) { | |
| 62 | + public String getPage(Model model, ChannelDTO channelDTO, HttpSession session) { | |
| 63 | + logger.info("列表请求参数:{}", JSON.toJSONString(channelDTO)); | |
| 72 | 64 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 73 | - if(CommonUtils.isNull(sessionUser)){ | |
| 74 | - return "redirect:/users/login"; | |
| 65 | + if (CommonUtils.isNull(sessionUser)) { | |
| 66 | + return "redirect:/users/login"; | |
| 75 | 67 | } |
| 76 | 68 | Integer spid = sessionUser.getSpid(); |
| 69 | + channelDTO.setSpid(spid); | |
| 77 | 70 | String userId = sessionUser.getUserId(); |
| 78 | - if (CommonUtils.isNull(page)) page = 1; | |
| 79 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 80 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | |
| 81 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | |
| 82 | - if(CommonUtils.isNotNull(shySite)){ | |
| 83 | - spid = shySite.getSpid(); | |
| 84 | - }else{ | |
| 85 | - setmodel_site(model); | |
| 86 | - return "error.html"; | |
| 87 | - } | |
| 88 | - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 89 | - spid = null; | |
| 71 | + channelDTO.setUserId(userId); | |
| 72 | + if (CommonUtils.isNotEmpty(channelDTO.getSp_desc()) && channelDTO.getSpid() == 0) { | |
| 73 | + ShySites shySite = sitesService.findspidBySpdesc(channelDTO.getSp_desc()); | |
| 74 | + if (CommonUtils.isNotNull(shySite)) { | |
| 75 | + channelDTO.setSpid(shySite.getSpid()); | |
| 76 | + } else { | |
| 77 | + setmodelSite(model); | |
| 78 | + return "error.html"; | |
| 79 | + } | |
| 80 | + } else if (CommonUtils.isEmpty(channelDTO.getSp_desc()) && channelDTO.getSpid() == 0) { | |
| 81 | + channelDTO.setSpid(null); | |
| 90 | 82 | } |
| 91 | - Date sDate = null; | |
| 92 | - Date eDate = null; | |
| 93 | 83 | |
| 94 | - if (CommonUtils.isNotEmpty(start_date)) { | |
| 84 | + if (CommonUtils.isNotEmpty(channelDTO.getStart_date())) { | |
| 95 | 85 | try { |
| 96 | - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | |
| 86 | + channelDTO.setStart_date(String.valueOf(CommonUtils.parseDate(channelDTO.getStart_date(), "yyyy-MM-dd"))); | |
| 97 | 87 | } catch (Exception e) { |
| 98 | 88 | } |
| 99 | 89 | } |
| 100 | - if (CommonUtils.isNotEmpty(end_date)) { | |
| 90 | + if (CommonUtils.isNotEmpty(channelDTO.getEnd_date())) { | |
| 101 | 91 | try { |
| 102 | - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | |
| 92 | + channelDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(channelDTO.getEnd_date(), "yyyy-MM-dd"))); | |
| 103 | 93 | } catch (Exception e) { |
| 104 | 94 | } |
| 105 | 95 | } |
| 106 | - PageInfo<ShyChannel> channelPage = channelService.getPage(channel_id, channel_name, receive, sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId); | |
| 96 | + PageInfo<ShyChannel> channelPage = channelService.getPage(channelDTO); | |
| 107 | 97 | List<ShyChannel> list = channelPage.getList(); |
| 108 | 98 | if (!list.isEmpty()) { |
| 109 | 99 | for (ShyChannel channel : list) { |
| 110 | - if (channel.getShenhe_status() != CommonConst.AUDIT_INTT) { | |
| 111 | - String updater = CommonUtils.isEmpty(channel.getUpdater()) || "null".equals(channel.getUpdater())? "白名单":channel.getUpdater(); | |
| 100 | + if (!channel.getShenhe_status().equals(CommonConst.AUDIT_INTT)) { | |
| 101 | + String updater = CommonUtils.isEmpty(channel.getUpdater()) || "null".equals(channel.getUpdater()) ? "白名单" : channel.getUpdater(); | |
| 112 | 102 | String auditor_id = channel.getAuditor(); |
| 113 | 103 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 114 | 104 | ShyUsers user = new ShyUsers(); |
| 115 | 105 | user.setUser_id(auditor_id); |
| 116 | 106 | user = usersService.select(user); |
| 117 | 107 | if (CommonUtils.isNotNull(user)) { |
| 118 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 108 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 119 | 109 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 120 | - updater = userName ; | |
| 110 | + updater = userName; | |
| 121 | 111 | } |
| 122 | 112 | } |
| 123 | 113 | channel.setUpdater(updater); |
| 124 | 114 | } |
| 125 | - if(null!=channel.getSp_id()){ | |
| 126 | - //显示spid简称 | |
| 127 | - ShySites shySites = sitesService.findspidDescByspid(channel.getSp_id()); | |
| 128 | - if (CommonUtils.isNotNull(shySites)) { | |
| 129 | - channel.setSp_desc(shySites.getName()); | |
| 130 | - } | |
| 131 | - }else{ | |
| 132 | - channel.setSp_desc("sp无法显示"); | |
| 115 | + if (null != channel.getSp_id()) { | |
| 116 | + //显示spid简称 | |
| 117 | + ShySites shySites = sitesService.findspidDescByspid(channel.getSp_id()); | |
| 118 | + if (CommonUtils.isNotNull(shySites)) { | |
| 119 | + channel.setSp_desc(shySites.getName()); | |
| 120 | + } | |
| 121 | + } else { | |
| 122 | + channel.setSp_desc("sp无法显示"); | |
| 133 | 123 | } |
| 134 | - | |
| 124 | + | |
| 135 | 125 | } |
| 136 | 126 | } |
| 137 | 127 | /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/ |
| 138 | - String state1 = shenhe_status == null ? "" : shenhe_status.toString(); | |
| 128 | + String state1 = channelDTO.getShenhe_status() == null ? "" : channelDTO.getShenhe_status().toString(); | |
| 139 | 129 | model.addAttribute("state1", state1); |
| 140 | - model.addAttribute("pageSize", pageSize); | |
| 130 | + model.addAttribute("pageSize", channelDTO.getPageSize()); | |
| 141 | 131 | model.addAttribute("channelPage", channelPage); |
| 142 | 132 | return "page/channel.html"; |
| 143 | 133 | } |
| ... | ... | @@ -167,7 +157,7 @@ public class ChannelController extends BaseController { |
| 167 | 157 | public ResponseBean pass(String ids, HttpSession session) { |
| 168 | 158 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 169 | 159 | String userId = sessionUser.getUserId(); |
| 170 | - boolean success = channelService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId,"","审核通过"); | |
| 160 | + boolean success = channelService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId, "", "审核通过"); | |
| 171 | 161 | if (success) { |
| 172 | 162 | return new ResponseBean(); |
| 173 | 163 | } else { |
| ... | ... | @@ -186,7 +176,7 @@ public class ChannelController extends BaseController { |
| 186 | 176 | public ResponseBean refuse(String ids, String msg, HttpSession session) { |
| 187 | 177 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 188 | 178 | String userId = sessionUser.getUserId(); |
| 189 | - boolean success = channelService.updateState(ids, CommonConst.AUDIT_REFUSE, userId,"",msg); | |
| 179 | + boolean success = channelService.updateState(ids, CommonConst.AUDIT_REFUSE, userId, "", msg); | |
| 190 | 180 | if (success) { |
| 191 | 181 | return new ResponseBean(); |
| 192 | 182 | } else { |
| ... | ... | @@ -254,8 +244,8 @@ public class ChannelController extends BaseController { |
| 254 | 244 | } |
| 255 | 245 | return responseBean; |
| 256 | 246 | } |
| 257 | - | |
| 258 | - | |
| 247 | + | |
| 248 | + | |
| 259 | 249 | /** |
| 260 | 250 | * @Auther: liwei |
| 261 | 251 | * @Date: 2019/08/17 11:17 |
| ... | ... | @@ -263,20 +253,20 @@ public class ChannelController extends BaseController { |
| 263 | 253 | */ |
| 264 | 254 | @GetMapping("/channelNotice") |
| 265 | 255 | @ResponseBody |
| 266 | - public Map<String,Object> channelNotice() { | |
| 267 | - Map<String,Object> map=new HashMap<>(); | |
| 268 | - ShyChannel shyChannel = new ShyChannel(); | |
| 256 | + public Map<String, Object> channelNotice() { | |
| 257 | + Map<String, Object> map = new HashMap<>(); | |
| 258 | + ShyChannel shyChannel = new ShyChannel(); | |
| 269 | 259 | shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审 |
| 270 | 260 | shyChannel.setShenhe_status(CommonConst.AUDIT_INTT); |
| 271 | 261 | List<ShyChannel> channelList = channelService.findshyChannel(shyChannel); |
| 272 | 262 | if (channelList.size() > 0) { |
| 273 | - logger.info("您有"+channelList.size()+"条新的频道审核申请，请注意查看！"); | |
| 274 | - map.put("id", "1");//第一个提示框，避免冲突 | |
| 275 | - map.put("title", "新频道审核通知"); | |
| 276 | - map.put("content","您有"+channelList.size()+"条新的频道审核申请，请注意查看！" ); | |
| 277 | - map.put("url",localhost_url+"/channel/page?shenhe_status=0&receive=0" ); | |
| 278 | - return map; | |
| 263 | + logger.info("您有" + channelList.size() + "条新的频道审核申请，请注意查看！"); | |
| 264 | + map.put("id", "1");//第一个提示框，避免冲突 | |
| 265 | + map.put("title", "新频道审核通知"); | |
| 266 | + map.put("content", "您有" + channelList.size() + "条新的频道审核申请，请注意查看！"); | |
| 267 | + map.put("url", localhost_url + "/channel/page?shenhe_status=0&receive=0"); | |
| 268 | + return map; | |
| 279 | 269 | } |
| 280 | - return null; | |
| 281 | - } | |
| 270 | + return null; | |
| 271 | + } | |
| 282 | 272 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 3 | 4 | import com.alibaba.fastjson.JSONObject; |
| 4 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 7 | import com.cnlive.shenhe.bean.SessionUser; |
| 8 | +import com.cnlive.shenhe.dto.CommentsDTO; | |
| 7 | 9 | import com.cnlive.shenhe.entity.ShyComments; |
| 8 | 10 | import com.cnlive.shenhe.entity.ShyContent; |
| 9 | 11 | import com.cnlive.shenhe.entity.ShySites; |
| 10 | 12 | import com.cnlive.shenhe.entity.ShyUsers; |
| 11 | -import com.cnlive.shenhe.entity.ShyVideos; | |
| 12 | 13 | import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; |
| 13 | 14 | import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; |
| 14 | 15 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| ... | ... | @@ -17,7 +18,6 @@ import com.cnlive.shenhe.utils.AuditPass; |
| 17 | 18 | import com.cnlive.shenhe.utils.CommonConst; |
| 18 | 19 | import com.cnlive.shenhe.utils.CommonUtils; |
| 19 | 20 | import com.github.pagehelper.PageInfo; |
| 20 | - | |
| 21 | 21 | import org.apache.poi.xssf.usermodel.XSSFCell; |
| 22 | 22 | import org.apache.poi.xssf.usermodel.XSSFRow; |
| 23 | 23 | import org.apache.poi.xssf.usermodel.XSSFSheet; |
| ... | ... | @@ -25,7 +25,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
| 25 | 25 | import org.slf4j.Logger; |
| 26 | 26 | import org.slf4j.LoggerFactory; |
| 27 | 27 | import org.springframework.beans.factory.annotation.Autowired; |
| 28 | -import org.springframework.beans.factory.annotation.Value; | |
| 29 | 28 | import org.springframework.stereotype.Controller; |
| 30 | 29 | import org.springframework.ui.Model; |
| 31 | 30 | import org.springframework.web.bind.annotation.*; |
| ... | ... | @@ -33,14 +32,7 @@ import org.springframework.web.bind.annotation.*; |
| 33 | 32 | import javax.servlet.ServletOutputStream; |
| 34 | 33 | import javax.servlet.http.HttpServletResponse; |
| 35 | 34 | import javax.servlet.http.HttpSession; |
| 36 | - | |
| 37 | -import java.awt.color.CMMException; | |
| 38 | -import java.io.BufferedInputStream; | |
| 39 | -import java.io.BufferedOutputStream; | |
| 40 | -import java.io.ByteArrayInputStream; | |
| 41 | -import java.io.ByteArrayOutputStream; | |
| 42 | -import java.io.InputStream; | |
| 43 | -import java.util.Date; | |
| 35 | +import java.io.*; | |
| 44 | 36 | import java.util.List; |
| 45 | 37 | |
| 46 | 38 | |
| ... | ... | @@ -55,7 +47,7 @@ public class CommentsController extends BaseController { |
| 55 | 47 | |
| 56 | 48 | @Autowired |
| 57 | 49 | UsersServiceImpl usersService; |
| 58 | - | |
| 50 | + | |
| 59 | 51 | @Autowired |
| 60 | 52 | SitesServiceImpl sitesService; |
| 61 | 53 | @Autowired |
| ... | ... | @@ -64,50 +56,41 @@ public class CommentsController extends BaseController { |
| 64 | 56 | /** |
| 65 | 57 | * 评论列表页 |
| 66 | 58 | * |
| 67 | - * @param activity_id | |
| 68 | - * @param content | |
| 69 | - * @param is_hot | |
| 70 | - * @param start_date | |
| 71 | - * @param end_date | |
| 72 | - * @param state | |
| 73 | - * @param page | |
| 74 | - * @param pageSize | |
| 75 | - * @param orderByClause | |
| 59 | + * @param commentsDTO | |
| 76 | 60 | * @return |
| 77 | 61 | */ |
| 78 | 62 | @GetMapping("/page") |
| 79 | - public String getPage(Model model, String activity_id, String content, Integer is_hot, | |
| 80 | - String start_date, String end_date, Integer state, Integer receive, | |
| 81 | - Integer page, Integer pageSize, String orderByClause, HttpSession session, Integer type, Integer comment_user_id) { | |
| 63 | + public String getPage(Model model, CommentsDTO commentsDTO, HttpSession session) { | |
| 64 | + logger.info("列表请求参数:{}", JSON.toJSONString(commentsDTO)); | |
| 82 | 65 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 83 | 66 | if (CommonUtils.isNull(sessionUser)) { |
| 84 | 67 | return "redirect:/users/login"; |
| 85 | 68 | } |
| 86 | 69 | Integer spid = sessionUser.getSpid(); |
| 70 | + commentsDTO.setSpid(spid); | |
| 87 | 71 | String userId = sessionUser.getUserId(); |
| 88 | - if (spid == 0) spid = null; | |
| 89 | - if (CommonUtils.isNull(page)) page = 1; | |
| 90 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 91 | - Date sDate = null; | |
| 92 | - Date eDate = null; | |
| 72 | + commentsDTO.setUserId(userId); | |
| 73 | + if (spid == 0) { | |
| 74 | + commentsDTO.setSpid(null); | |
| 75 | + } | |
| 93 | 76 | |
| 94 | - if (CommonUtils.isNotEmpty(start_date)) { | |
| 77 | + if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) { | |
| 95 | 78 | try { |
| 96 | - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | |
| 79 | + commentsDTO.setStart_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd"))); | |
| 97 | 80 | } catch (Exception e) { |
| 98 | 81 | } |
| 99 | 82 | } |
| 100 | - if (CommonUtils.isNotEmpty(end_date)) { | |
| 83 | + if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) { | |
| 101 | 84 | try { |
| 102 | - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | |
| 85 | + commentsDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd"))); | |
| 103 | 86 | } catch (Exception e) { |
| 104 | 87 | } |
| 105 | 88 | } |
| 106 | - PageInfo<ShyComments> commentPage = commentsService.getPage(activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId, type, comment_user_id); | |
| 89 | + PageInfo<ShyComments> commentPage = commentsService.getPage(commentsDTO); | |
| 107 | 90 | List<ShyComments> list = commentPage.getList(); |
| 108 | 91 | if (!list.isEmpty()) { |
| 109 | 92 | for (ShyComments comment : list) { |
| 110 | - if (comment.getState() != CommonConst.AUDIT_INTT) { | |
| 93 | + if (!comment.getState().equals(CommonConst.AUDIT_INTT)) { | |
| 111 | 94 | String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater()) ? "白名单" : comment.getUpdater(); |
| 112 | 95 | String auditor_id = comment.getAuditor_id(); |
| 113 | 96 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| ... | ... | @@ -156,9 +139,9 @@ public class CommentsController extends BaseController { |
| 156 | 139 | } |
| 157 | 140 | } |
| 158 | 141 | /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/ |
| 159 | - String state1 = state == null ? "" : state.toString(); | |
| 142 | + String state1 = commentsDTO.getState() == null ? "" : commentsDTO.getState().toString(); | |
| 160 | 143 | model.addAttribute("state1", state1); |
| 161 | - model.addAttribute("pageSize", pageSize); | |
| 144 | + model.addAttribute("pageSize", commentsDTO.getPageSize()); | |
| 162 | 145 | model.addAttribute("commentPage", commentPage); |
| 163 | 146 | return "page/comment.html"; |
| 164 | 147 | } |
| ... | ... | @@ -188,7 +171,7 @@ public class CommentsController extends BaseController { |
| 188 | 171 | public ResponseBean pass(String ids, HttpSession session) { |
| 189 | 172 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 190 | 173 | String userId = sessionUser.getUserId(); |
| 191 | - boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId,"","审核通过"); | |
| 174 | + boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId, "", "审核通过"); | |
| 192 | 175 | if (success) { |
| 193 | 176 | return new ResponseBean(); |
| 194 | 177 | } else { |
| ... | ... | @@ -207,7 +190,7 @@ public class CommentsController extends BaseController { |
| 207 | 190 | public ResponseBean refuse(String ids, HttpSession session) { |
| 208 | 191 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 209 | 192 | String userId = sessionUser.getUserId(); |
| 210 | - boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId,"","审核拒绝"); | |
| 193 | + boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId, "", "审核拒绝"); | |
| 211 | 194 | if (success) { |
| 212 | 195 | return new ResponseBean(); |
| 213 | 196 | } else { |
| ... | ... | @@ -303,47 +286,46 @@ public class CommentsController extends BaseController { |
| 303 | 286 | } |
| 304 | 287 | return responseBean; |
| 305 | 288 | } |
| 306 | - | |
| 307 | - | |
| 289 | + | |
| 290 | + | |
| 308 | 291 | /** |
| 309 | 292 | * 根据条件导出excel |
| 310 | 293 | */ |
| 311 | 294 | @GetMapping("excel") |
| 312 | - public void getExcel( String activity_id, String content, Integer is_hot, | |
| 313 | - String start_date, String end_date, Integer state, Integer receive,Integer type, | |
| 314 | - Integer page, Integer pageSize, String orderByClause, HttpSession session,HttpServletResponse response) { | |
| 315 | - SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | |
| 316 | - Integer spid = sessionUser.getSpid(); | |
| 295 | + public void getExcel(CommentsDTO commentsDTO, HttpSession session, HttpServletResponse response) { | |
| 296 | + SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); | |
| 297 | + Integer spid = sessionUser.getSpid(); | |
| 298 | + commentsDTO.setSpid(spid); | |
| 317 | 299 | String userId = sessionUser.getUserId(); |
| 318 | - if (spid == 0) spid = null; | |
| 319 | - if (CommonUtils.isNull(page)) page = 1; | |
| 320 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 321 | - Date sDate = null; | |
| 322 | - Date eDate = null; | |
| 300 | + commentsDTO.setUserId(userId); | |
| 301 | + if (spid == 0) { | |
| 302 | + commentsDTO.setSpid(null); | |
| 303 | + } | |
| 323 | 304 | |
| 324 | - if (CommonUtils.isNotEmpty(start_date)) { | |
| 305 | + if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) { | |
| 325 | 306 | try { |
| 326 | - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | |
| 307 | + commentsDTO.setStart_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd"))); | |
| 327 | 308 | } catch (Exception e) { |
| 328 | 309 | } |
| 329 | 310 | } |
| 330 | - if (CommonUtils.isNotEmpty(end_date)) { | |
| 311 | + if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) { | |
| 331 | 312 | try { |
| 332 | - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | |
| 313 | + commentsDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd"))); | |
| 333 | 314 | } catch (Exception e) { |
| 334 | 315 | } |
| 335 | 316 | } |
| 336 | - PageInfo<ShyComments> commentPage = commentsService.getPageExcel(activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId,type); | |
| 337 | - List<ShyComments> list = commentPage.getList(); | |
| 317 | + PageInfo<ShyComments> commentPage = commentsService.getPageExcel(commentsDTO); | |
| 318 | + List<ShyComments> list = commentPage.getList(); | |
| 338 | 319 | String fileName = "评论数据"; |
| 339 | - | |
| 320 | + | |
| 340 | 321 | XSSFWorkbook wb = new XSSFWorkbook(); |
| 341 | 322 | ServletOutputStream out = null; |
| 342 | 323 | BufferedInputStream bis = null; |
| 343 | 324 | BufferedOutputStream bos = null; |
| 344 | 325 | try { |
| 345 | 326 | XSSFSheet sheetlist = wb.createSheet(fileName); |
| 346 | - XSSFRow row = sheetlist.createRow(0);//行 | |
| 327 | + //行 | |
| 328 | + XSSFRow row = sheetlist.createRow(0); | |
| 347 | 329 | XSSFCell cell = row.createCell(0);//列 |
| 348 | 330 | cell.setCellValue("id"); |
| 349 | 331 | cell = row.createCell(1);//列 |
| ... | ... | @@ -370,32 +352,32 @@ public class CommentsController extends BaseController { |
| 370 | 352 | cell.setCellValue("审核人"); |
| 371 | 353 | cell = row.createCell(12);//列 |
| 372 | 354 | cell.setCellValue("审核意见"); |
| 373 | - | |
| 355 | + | |
| 374 | 356 | for (int i = 0; i < list.size(); i++) { |
| 375 | 357 | row = sheetlist.createRow((short) (i + 1));//行 |
| 376 | 358 | cell = row.createCell(0);//列 |
| 377 | 359 | cell.setCellValue(list.get(i).getId()); |
| 378 | 360 | cell = row.createCell(1);//列 |
| 379 | - cell.setCellValue(list.get(i).getSpid()==null?"":sitesService.findspidDescByspid(list.get(i).getSpid()).getName()); | |
| 361 | + cell.setCellValue(list.get(i).getSpid() == null ? "" : sitesService.findspidDescByspid(list.get(i).getSpid()).getName()); | |
| 380 | 362 | cell = row.createCell(2);//列 |
| 381 | 363 | cell.setCellValue(list.get(i).getComment_user_id()); |
| 382 | 364 | cell = row.createCell(3);//列 |
| 383 | 365 | cell.setCellValue(list.get(i).getComment_user_name()); |
| 384 | - | |
| 366 | + | |
| 385 | 367 | cell = row.createCell(4);//列 |
| 386 | 368 | cell.setCellValue(list.get(i).getComment_content()); |
| 387 | - | |
| 369 | + | |
| 388 | 370 | cell = row.createCell(5);//列 |
| 389 | 371 | cell.setCellValue(list.get(i).getComment_title()); |
| 390 | - | |
| 391 | - | |
| 392 | - | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 393 | 375 | /*状态需要处理成用户可读*/ |
| 394 | 376 | String common_type = "";//评论类型，topic:话题 |
| 395 | - if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC) ) { | |
| 396 | - common_type = "话题"; | |
| 377 | + if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC)) { | |
| 378 | + common_type = "话题"; | |
| 397 | 379 | } else { |
| 398 | - common_type = "其他"; | |
| 380 | + common_type = "其他"; | |
| 399 | 381 | } |
| 400 | 382 | cell = row.createCell(6);//列 |
| 401 | 383 | cell.setCellValue(common_type); |
| ... | ... | @@ -404,45 +386,44 @@ public class CommentsController extends BaseController { |
| 404 | 386 | /*状态需要处理成用户可读*/ |
| 405 | 387 | String platform = "";//评论所属的平台 |
| 406 | 388 | if (list.get(i).getPlatform().equals("a")) { |
| 407 | - platform = "安卓"; | |
| 389 | + platform = "安卓"; | |
| 408 | 390 | } else if (list.get(i).getPlatform().equals("i")) { |
| 409 | - platform = "ios"; | |
| 391 | + platform = "ios"; | |
| 410 | 392 | } else { |
| 411 | - platform = "未知"; | |
| 393 | + platform = "未知"; | |
| 412 | 394 | } |
| 413 | 395 | cell = row.createCell(8);//列 |
| 414 | 396 | cell.setCellValue(platform); |
| 415 | - | |
| 416 | - | |
| 417 | - | |
| 397 | + | |
| 398 | + | |
| 418 | 399 | cell = row.createCell(9);//列 |
| 419 | - cell.setCellValue(list.get(i).getCreated_at()==null?"":CommonUtils.formatDate(list.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss")); | |
| 420 | - | |
| 400 | + cell.setCellValue(list.get(i).getCreated_at() == null ? "" : CommonUtils.formatDate(list.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss")); | |
| 401 | + | |
| 421 | 402 | /*状态需要处理成用户可读*/ |
| 422 | 403 | String shenhe_Status = "";//状态 0.未审核,1:已审核,2审核失败 |
| 423 | 404 | if (list.get(i).getState() == 1) { |
| 424 | - shenhe_Status = "已审核"; | |
| 405 | + shenhe_Status = "已审核"; | |
| 425 | 406 | } else if (list.get(i).getState() == 2) { |
| 426 | - shenhe_Status = "已拒绝"; | |
| 407 | + shenhe_Status = "已拒绝"; | |
| 427 | 408 | } else { |
| 428 | - shenhe_Status = "未审核"; | |
| 409 | + shenhe_Status = "未审核"; | |
| 429 | 410 | } |
| 430 | 411 | cell = row.createCell(10);//列 |
| 431 | 412 | cell.setCellValue(shenhe_Status); |
| 432 | - | |
| 413 | + | |
| 433 | 414 | /* 审核员需要做处理*/ |
| 434 | 415 | String updater = "";//审核员名字 |
| 435 | - if (list.get(i).getState() != CommonConst.AUDIT_INTT) { | |
| 436 | - updater = CommonUtils.isEmpty(list.get(i).getUpdater()) || "null".equals(list.get(i).getUpdater())? "自动通过":list.get(i).getUpdater(); | |
| 416 | + if (!list.get(i).getState().equals(CommonConst.AUDIT_INTT)) { | |
| 417 | + updater = CommonUtils.isEmpty(list.get(i).getUpdater()) || "null".equals(list.get(i).getUpdater()) ? "自动通过" : list.get(i).getUpdater(); | |
| 437 | 418 | String auditor_id = list.get(i).getAuditor_id(); |
| 438 | 419 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 439 | 420 | ShyUsers user = new ShyUsers(); |
| 440 | 421 | user.setUser_id(auditor_id); |
| 441 | 422 | user = usersService.select(user); |
| 442 | 423 | if (CommonUtils.isNotNull(user)) { |
| 443 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 424 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 444 | 425 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 445 | - updater = userName ; | |
| 426 | + updater = userName; | |
| 446 | 427 | } |
| 447 | 428 | } |
| 448 | 429 | } |
| ... | ... | @@ -450,7 +431,7 @@ public class CommentsController extends BaseController { |
| 450 | 431 | cell.setCellValue(updater); |
| 451 | 432 | cell = row.createCell(12);//列 |
| 452 | 433 | cell.setCellValue(list.get(i).getMsg()); |
| 453 | - | |
| 434 | + | |
| 454 | 435 | } |
| 455 | 436 | |
| 456 | 437 | ByteArrayOutputStream os = new ByteArrayOutputStream(); |
| ... | ... | @@ -470,19 +451,23 @@ public class CommentsController extends BaseController { |
| 470 | 451 | } catch (final Exception e) { |
| 471 | 452 | e.printStackTrace(); |
| 472 | 453 | try { |
| 473 | - if (bis != null) | |
| 454 | + if (bis != null) { | |
| 474 | 455 | bis.close(); |
| 475 | - if (bos != null) | |
| 456 | + } | |
| 457 | + if (bos != null) { | |
| 476 | 458 | bos.close(); |
| 459 | + } | |
| 477 | 460 | } catch (Exception e1) { |
| 478 | 461 | e1.printStackTrace(); |
| 479 | 462 | } |
| 480 | 463 | } finally { |
| 481 | 464 | try { |
| 482 | - if (bis != null) | |
| 465 | + if (bis != null) { | |
| 483 | 466 | bis.close(); |
| 484 | - if (bos != null) | |
| 467 | + } | |
| 468 | + if (bos != null) { | |
| 485 | 469 | bos.close(); |
| 470 | + } | |
| 486 | 471 | } catch (Exception e2) { |
| 487 | 472 | e2.printStackTrace(); |
| 488 | 473 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/ContentController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | -import com.alibaba.fastjson.JSONObject; | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 4 | 4 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 6 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | -import com.cnlive.shenhe.entity.ShyComments; | |
| 7 | +import com.cnlive.shenhe.dto.ContentDTO; | |
| 8 | 8 | import com.cnlive.shenhe.entity.ShyContent; |
| 9 | -import com.cnlive.shenhe.entity.ShyLive; | |
| 10 | 9 | import com.cnlive.shenhe.entity.ShySites; |
| 11 | 10 | import com.cnlive.shenhe.entity.ShyUsers; |
| 12 | -import com.cnlive.shenhe.entity.ShyVideos; | |
| 13 | -import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; | |
| 14 | 11 | import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; |
| 15 | 12 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 16 | 13 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 17 | -import com.cnlive.shenhe.utils.AuditPass; | |
| 18 | 14 | import com.cnlive.shenhe.utils.CommonConst; |
| 19 | 15 | import com.cnlive.shenhe.utils.CommonUtils; |
| 20 | 16 | import com.github.pagehelper.PageInfo; |
| 21 | - | |
| 22 | 17 | import org.apache.poi.xssf.usermodel.XSSFCell; |
| 23 | 18 | import org.apache.poi.xssf.usermodel.XSSFRow; |
| 24 | 19 | import org.apache.poi.xssf.usermodel.XSSFSheet; |
| ... | ... | @@ -33,25 +28,18 @@ import org.springframework.web.bind.annotation.*; |
| 33 | 28 | import javax.servlet.ServletOutputStream; |
| 34 | 29 | import javax.servlet.http.HttpServletResponse; |
| 35 | 30 | 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; | |
| 42 | -import java.util.Date; | |
| 31 | +import java.io.*; | |
| 43 | 32 | import java.util.List; |
| 44 | 33 | |
| 45 | 34 | |
| 35 | +/** | |
| 36 | + * @author Administrator | |
| 37 | + */ | |
| 46 | 38 | @Controller |
| 47 | 39 | @RequestMapping("/content") |
| 48 | 40 | public class ContentController extends BaseController { |
| 49 | 41 | private static Logger logger = LoggerFactory.getLogger(ContentController.class); |
| 50 | 42 | @Autowired |
| 51 | - AuditPass Pass; | |
| 52 | - @Autowired | |
| 53 | - CommentsServiceImpl commentsService; | |
| 54 | - @Autowired | |
| 55 | 43 | ContentServiceImpl contentService; |
| 56 | 44 | @Autowired |
| 57 | 45 | SitesServiceImpl sitesService; |
| ... | ... | @@ -63,78 +51,64 @@ public class ContentController extends BaseController { |
| 63 | 51 | * 图文列表 |
| 64 | 52 | * |
| 65 | 53 | * @param model |
| 66 | - * @param title | |
| 67 | - * @param contentId | |
| 68 | - * @param content_tag | |
| 69 | - * @param start_date | |
| 70 | - * @param end_date | |
| 71 | - * @param receive_status | |
| 72 | - * @param sp_desc | |
| 73 | - * @param source | |
| 74 | - * @param author | |
| 75 | - * @param page | |
| 76 | - * @param pageSize | |
| 77 | - * @param orderByClause | |
| 54 | + * @param contentDTO | |
| 78 | 55 | * @param session |
| 79 | 56 | * @return |
| 80 | 57 | */ |
| 81 | 58 | @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, | |
| 84 | - Integer page, Integer pageSize, String orderByClause, HttpSession session) { | |
| 59 | + public String getPage(Model model, ContentDTO contentDTO, HttpSession session) { | |
| 60 | + logger.info("列表请求参数:{}", JSON.toJSONString(contentDTO)); | |
| 85 | 61 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 86 | - if(CommonUtils.isNull(sessionUser)){ | |
| 87 | - return "redirect:/users/login"; | |
| 62 | + if (CommonUtils.isNull(sessionUser)) { | |
| 63 | + return "redirect:/users/login"; | |
| 88 | 64 | } |
| 89 | 65 | Integer spid = sessionUser.getSpid(); |
| 66 | + contentDTO.setSpid(spid); | |
| 90 | 67 | String userId = sessionUser.getUserId(); |
| 91 | - if (CommonUtils.isNull(page)) page = 1; | |
| 92 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 93 | - 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 | - } | |
| 101 | - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 102 | - spid = null; | |
| 68 | + contentDTO.setUserId(userId); | |
| 69 | + if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) { | |
| 70 | + ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc()); | |
| 71 | + if (CommonUtils.isNotNull(shySite)) { | |
| 72 | + contentDTO.setSpid(shySite.getSpid()); | |
| 73 | + } else { | |
| 74 | + setmodelSite(model); | |
| 75 | + return "error.html"; | |
| 76 | + } | |
| 77 | + } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) { | |
| 78 | + contentDTO.setSpid(null); | |
| 103 | 79 | } |
| 104 | - Date sDate = null; | |
| 105 | - Date eDate = null; | |
| 106 | 80 | |
| 107 | - if (CommonUtils.isNotEmpty(start_date)) { | |
| 81 | + if (CommonUtils.isNotEmpty(String.valueOf(contentDTO.getStart_date()))) { | |
| 108 | 82 | try { |
| 109 | - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | |
| 83 | + contentDTO.setStart_date(String.valueOf(CommonUtils.parseDate(String.valueOf(contentDTO.getStart_date()), "yyyy-MM-dd"))); | |
| 110 | 84 | } catch (Exception e) { |
| 111 | 85 | } |
| 112 | 86 | } |
| 113 | - if (CommonUtils.isNotEmpty(end_date)) { | |
| 87 | + if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) { | |
| 114 | 88 | try { |
| 115 | - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | |
| 89 | + contentDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd"))); | |
| 116 | 90 | } catch (Exception e) { |
| 117 | 91 | } |
| 118 | 92 | } |
| 119 | - PageInfo<ShyContent> contentPage = contentService.getPage( title,source,author,content_tag,contentId, sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId); | |
| 93 | + PageInfo<ShyContent> contentPage = contentService.getPage(contentDTO); | |
| 120 | 94 | List<ShyContent> list = contentPage.getList(); |
| 121 | 95 | if (!list.isEmpty()) { |
| 122 | 96 | for (ShyContent content : list) { |
| 123 | - 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); | |
| 97 | + if (content.getReceive_status().equals(CommonConst.RECEIVE_AUDIT)) { | |
| 98 | + String auditor_id = content.getAuditor_id(); | |
| 99 | + String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater(); | |
| 100 | + updater = sitesService.getUpdater(updater, auditor_id); | |
| 127 | 101 | content.setUpdater(updater); |
| 128 | 102 | } |
| 129 | 103 | //显示spid简称 |
| 130 | 104 | ShySites shySites = sitesService.findspidDescByspid(content.getSp_id()); |
| 131 | 105 | if (CommonUtils.isNotNull(shySites)) { |
| 132 | - content.setSp_desc(shySites.getName()); | |
| 106 | + content.setSp_desc(shySites.getName()); | |
| 133 | 107 | } |
| 134 | 108 | } |
| 135 | 109 | } |
| 136 | 110 | model.addAttribute("contentPage", contentPage); |
| 137 | - model.addAttribute("pageSize", pageSize); | |
| 111 | + model.addAttribute("pageSize", contentDTO.getPageSize()); | |
| 138 | 112 | return "page/content.html"; |
| 139 | 113 | } |
| 140 | 114 | |
| ... | ... | @@ -146,20 +120,20 @@ public class ContentController extends BaseController { |
| 146 | 120 | */ |
| 147 | 121 | @GetMapping("/details/{id}") |
| 148 | 122 | 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); | |
| 123 | + ShyContent content = contentService.getDetailsContent(id); | |
| 124 | + if (!content.getReceive_status().equals(CommonConst.RECEIVE_BEFORE)) { | |
| 125 | + String auditor_id = content.getAuditor_id(); | |
| 126 | + String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater(); | |
| 127 | + updater = sitesService.getUpdater(updater, auditor_id); | |
| 154 | 128 | content.setUpdater(updater); |
| 155 | 129 | } |
| 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); | |
| 130 | + //朋友圈内容切割内容图片或者视频地址 | |
| 131 | + if (content.getContent_tag().equals("moment")) { | |
| 132 | + String[] contentImageUrlList = null; | |
| 133 | + if (content.getContent_pc_url() != null) { | |
| 134 | + contentImageUrlList = content.getContent_pc_url().split(","); | |
| 135 | + } | |
| 136 | + model.addAttribute("contentImageUrlList", contentImageUrlList); | |
| 163 | 137 | } |
| 164 | 138 | model.addAttribute("content", content); |
| 165 | 139 | return "page/contentDetail.html"; |
| ... | ... | @@ -177,11 +151,11 @@ public class ContentController extends BaseController { |
| 177 | 151 | public ResponseBean pass(String ids, HttpSession session) { |
| 178 | 152 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 179 | 153 | String userId = sessionUser.getUserId(); |
| 180 | - boolean success =false; | |
| 154 | + boolean success = false; | |
| 181 | 155 | String[] contentIds = ids.split(","); |
| 182 | - for (String contentId : contentIds) { | |
| 183 | - success = contentService.callback(contentId,"审核通过", CommonConst.AUDIT_SUCCESS, userId,""); | |
| 184 | - } | |
| 156 | + for (String contentId : contentIds) { | |
| 157 | + success = contentService.callback(contentId, "审核通过", CommonConst.AUDIT_SUCCESS, userId, ""); | |
| 158 | + } | |
| 185 | 159 | if (success) { |
| 186 | 160 | return new ResponseBean(); |
| 187 | 161 | } else { |
| ... | ... | @@ -197,14 +171,14 @@ public class ContentController extends BaseController { |
| 197 | 171 | */ |
| 198 | 172 | @PostMapping("/refuse") |
| 199 | 173 | @ResponseBody |
| 200 | - public ResponseBean refuse(String ids,String msg, HttpSession session) { | |
| 174 | + public ResponseBean refuse(String ids, String msg, HttpSession session) { | |
| 201 | 175 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 202 | 176 | String userId = sessionUser.getUserId(); |
| 203 | - boolean success =false; | |
| 177 | + boolean success = false; | |
| 204 | 178 | String[] contentIds = ids.split(","); |
| 205 | - for (String contentId : contentIds) { | |
| 206 | - success = contentService.callback(contentId,msg, CommonConst.AUDIT_REFUSE, userId,""); | |
| 207 | - } | |
| 179 | + for (String contentId : contentIds) { | |
| 180 | + success = contentService.callback(contentId, msg, CommonConst.AUDIT_REFUSE, userId, ""); | |
| 181 | + } | |
| 208 | 182 | if (success) { |
| 209 | 183 | return new ResponseBean(); |
| 210 | 184 | } else { |
| ... | ... | @@ -246,169 +220,173 @@ public class ContentController extends BaseController { |
| 246 | 220 | * 根据条件导出excel |
| 247 | 221 | */ |
| 248 | 222 | @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) { | |
| 223 | + public void getExcel(ContentDTO contentDTO, HttpSession session, HttpServletResponse response) { | |
| 252 | 224 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 253 | 225 | Integer spid = sessionUser.getSpid(); |
| 226 | + contentDTO.setSpid(spid); | |
| 254 | 227 | String userId = sessionUser.getUserId(); |
| 255 | - 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) { | |
| 261 | - spid = null; | |
| 262 | - } | |
| 263 | - Date sDate = null; | |
| 264 | - Date eDate = null; | |
| 228 | + contentDTO.setUserId(userId); | |
| 229 | + if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) { | |
| 230 | + ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc()); | |
| 231 | + if (CommonUtils.isNotNull(shySite)) { | |
| 232 | + contentDTO.setSpid(shySite.getSpid()); | |
| 233 | + } | |
| 234 | + } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) { | |
| 235 | + contentDTO.setSpid(null); | |
| 236 | + } | |
| 265 | 237 | |
| 266 | - if (CommonUtils.isNotEmpty(start_date)) { | |
| 238 | + if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) { | |
| 267 | 239 | try { |
| 268 | - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | |
| 240 | + contentDTO.setStart_date(String.valueOf((CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd")))); | |
| 269 | 241 | } catch (Exception e) { |
| 270 | 242 | } |
| 271 | 243 | } |
| 272 | - if (CommonUtils.isNotEmpty(end_date)) { | |
| 244 | + if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) { | |
| 273 | 245 | try { |
| 274 | - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | |
| 246 | + contentDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd"))); | |
| 275 | 247 | } catch (Exception e) { |
| 276 | 248 | } |
| 277 | 249 | } |
| 278 | - List<ShyContent> contentList = contentService.findByCondition(title,content_tag,contentId, sDate, eDate, receive_status, page, pageSize, orderByClause, spid); | |
| 279 | - | |
| 250 | + List<ShyContent> contentList = contentService.findByCondition(contentDTO); | |
| 280 | 251 | String fileName = "图文数据"; |
| 281 | - | |
| 252 | + | |
| 282 | 253 | XSSFWorkbook wb = new XSSFWorkbook(); |
| 283 | - ServletOutputStream out = null; | |
| 254 | + ServletOutputStream out; | |
| 284 | 255 | BufferedInputStream bis = null; |
| 285 | 256 | BufferedOutputStream bos = null; |
| 286 | 257 | try { |
| 287 | 258 | XSSFSheet sheetlist = wb.createSheet(fileName); |
| 288 | - XSSFRow row = sheetlist.createRow(0);//行 | |
| 289 | - XSSFCell cell = row.createCell(0);//列 | |
| 259 | + //行 | |
| 260 | + XSSFRow row = sheetlist.createRow(0); | |
| 261 | + //列 | |
| 262 | + XSSFCell cell = row.createCell(0); | |
| 290 | 263 | cell.setCellValue("id"); |
| 291 | - cell = row.createCell(1);//列 | |
| 264 | + cell = row.createCell(1); | |
| 292 | 265 | cell.setCellValue("sp昵称"); |
| 293 | - cell = row.createCell(2);//列 | |
| 266 | + cell = row.createCell(2); | |
| 294 | 267 | cell.setCellValue("图文id"); |
| 295 | - cell = row.createCell(3);//列 | |
| 268 | + cell = row.createCell(3); | |
| 296 | 269 | cell.setCellValue("内容标题"); |
| 297 | - cell = row.createCell(4);//列 | |
| 270 | + cell = row.createCell(4); | |
| 298 | 271 | cell.setCellValue("图文标签"); |
| 299 | - cell = row.createCell(5);//列 | |
| 272 | + cell = row.createCell(5); | |
| 300 | 273 | cell.setCellValue("审核类型"); |
| 301 | - cell = row.createCell(6);//列 | |
| 274 | + cell = row.createCell(6); | |
| 302 | 275 | cell.setCellValue("内容状态"); |
| 303 | - cell = row.createCell(7);//列 | |
| 276 | + cell = row.createCell(7); | |
| 304 | 277 | cell.setCellValue("图文创建时间"); |
| 305 | - cell = row.createCell(8);//列 | |
| 278 | + cell = row.createCell(8); | |
| 306 | 279 | cell.setCellValue("图文送审时间"); |
| 307 | - cell = row.createCell(9);//列 | |
| 280 | + cell = row.createCell(9); | |
| 308 | 281 | cell.setCellValue("领取状态"); |
| 309 | - cell = row.createCell(10);//列 | |
| 282 | + cell = row.createCell(10); | |
| 310 | 283 | cell.setCellValue("审核人"); |
| 311 | - cell = row.createCell(11);//列 | |
| 284 | + cell = row.createCell(11); | |
| 312 | 285 | cell.setCellValue("审核意见"); |
| 313 | - cell = row.createCell(12);//列 | |
| 286 | + cell = row.createCell(12); | |
| 314 | 287 | cell.setCellValue("来源（昵称）"); |
| 315 | - cell = row.createCell(13);//列 | |
| 288 | + cell = row.createCell(13); | |
| 316 | 289 | cell.setCellValue("作者（sid）"); |
| 317 | - cell = row.createCell(14);//列 | |
| 290 | + cell = row.createCell(14); | |
| 318 | 291 | cell.setCellValue("图文url"); |
| 319 | - | |
| 292 | + | |
| 320 | 293 | for (int i = 0; i < contentList.size(); i++) { |
| 321 | - row = sheetlist.createRow((short) (i + 1));//行 | |
| 322 | - cell = row.createCell(0);//列 | |
| 294 | + //行 | |
| 295 | + row = sheetlist.createRow((short) (i + 1)); | |
| 296 | + cell = row.createCell(0); | |
| 323 | 297 | cell.setCellValue(contentList.get(i).getId()); |
| 324 | - cell = row.createCell(1);//列 | |
| 298 | + cell = row.createCell(1); | |
| 325 | 299 | cell.setCellValue(sitesService.findspidDescByspid(contentList.get(i).getSp_id()).getName()); |
| 326 | - cell = row.createCell(2);//列 | |
| 300 | + cell = row.createCell(2); | |
| 327 | 301 | cell.setCellValue(contentList.get(i).getContent_id()); |
| 328 | - cell = row.createCell(3);//列 | |
| 302 | + cell = row.createCell(3); | |
| 329 | 303 | cell.setCellValue(contentList.get(i).getTitle()); |
| 330 | 304 | /*状态需要处理成用户可读*/ |
| 331 | - String contentTag = "";//图文标签 content：图文发布，moment：朋友圈 | |
| 332 | - if (contentList.get(i).getContent_tag().equals("content") ) { | |
| 333 | - contentTag = "图文发布"; | |
| 305 | + //图文标签 content：图文发布，moment：朋友圈 | |
| 306 | + String contentTag = ""; | |
| 307 | + if (contentList.get(i).getContent_tag().equals("content")) { | |
| 308 | + contentTag = "图文发布"; | |
| 334 | 309 | } else if (contentList.get(i).getContent_tag().equals("moment")) { |
| 335 | - contentTag = "朋友圈"; | |
| 310 | + contentTag = "朋友圈"; | |
| 336 | 311 | } |
| 337 | - cell = row.createCell(4);//列 | |
| 312 | + cell = row.createCell(4); | |
| 338 | 313 | cell.setCellValue(contentTag); |
| 339 | - | |
| 314 | + | |
| 340 | 315 | /*状态需要处理成用户可读*/ |
| 341 | - String shenheType = "";//审核类型，1:免审，2:机审，3:人工审 | |
| 316 | + //审核类型，1:免审，2:机审，3:人工审 | |
| 317 | + String shenheType; | |
| 342 | 318 | if (contentList.get(i).getShenhe_type() == 1) { |
| 343 | - shenheType = "免审"; | |
| 319 | + shenheType = "免审"; | |
| 344 | 320 | } else if (contentList.get(i).getShenhe_type() == 2) { |
| 345 | - shenheType = "机审"; | |
| 321 | + shenheType = "机审"; | |
| 346 | 322 | } else { |
| 347 | - shenheType = "人工审"; | |
| 323 | + shenheType = "人工审"; | |
| 348 | 324 | } |
| 349 | - cell = row.createCell(5);//列 | |
| 325 | + //列 | |
| 326 | + cell = row.createCell(5); | |
| 350 | 327 | cell.setCellValue(shenheType); |
| 351 | - | |
| 352 | 328 | /*状态需要处理成用户可读*/ |
| 353 | - String contentStatus = "";//内容状态:0:待发布,1:已发布,2:已下线，3:已删除 | |
| 354 | - if (contentList.get(i).getContent_status() == 0) { | |
| 355 | - contentStatus = "待发布"; | |
| 356 | - } 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 = "已删除"; | |
| 329 | + //内容状态:0:待发布,1:已发布,2:已下线，3:已删除 | |
| 330 | + Integer contentState = contentList.get(i).getContent_status(); | |
| 331 | + String contentStatus = ""; | |
| 332 | + if (contentState != null) { | |
| 333 | + if (contentState == 0) { | |
| 334 | + contentStatus = "待发布"; | |
| 335 | + } else if (contentState == 1) { | |
| 336 | + contentStatus = "已发布"; | |
| 337 | + } else if (contentState == 2) { | |
| 338 | + contentStatus = "已下线"; | |
| 339 | + } else if (contentState == 3) { | |
| 340 | + contentStatus = "已删除"; | |
| 341 | + } | |
| 362 | 342 | } |
| 363 | - | |
| 364 | - cell = row.createCell(6);//列 | |
| 343 | + cell = row.createCell(6); | |
| 365 | 344 | cell.setCellValue(contentStatus); |
| 366 | - 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")); | |
| 368 | - 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")); | |
| 370 | - | |
| 345 | + cell = row.createCell(7); | |
| 346 | + cell.setCellValue(contentList.get(i).getContent_time() == null ? "" : CommonUtils.formatDate(contentList.get(i).getContent_time(), "yyyy-MM-dd HH:mm:ss")); | |
| 347 | + cell = row.createCell(8); | |
| 348 | + cell.setCellValue(contentList.get(i).getCreate_date() == null ? "" : CommonUtils.formatDate(contentList.get(i).getCreate_date(), "yyyy-MM-dd HH:mm:ss")); | |
| 349 | + | |
| 371 | 350 | /*状态需要处理成用户可读*/ |
| 372 | - String receiveStatus = "";//领取状态。0：未领取；1：已领取,2:已审核 | |
| 351 | + //领取状态。0：未领取；1：已领取,2:已审核 | |
| 352 | + String receiveStatus; | |
| 373 | 353 | if (contentList.get(i).getReceive_status() == 1) { |
| 374 | - receiveStatus = "已领取"; | |
| 354 | + receiveStatus = "已领取"; | |
| 375 | 355 | } else if (contentList.get(i).getReceive_status() == 2) { |
| 376 | - receiveStatus = "已审核"; | |
| 356 | + receiveStatus = "已审核"; | |
| 377 | 357 | } else { |
| 378 | - receiveStatus = "未领取"; | |
| 358 | + receiveStatus = "未领取"; | |
| 379 | 359 | } |
| 380 | - | |
| 381 | - cell = row.createCell(9);//列 | |
| 360 | + cell = row.createCell(9); | |
| 382 | 361 | cell.setCellValue(receiveStatus); |
| 383 | - | |
| 362 | + | |
| 384 | 363 | /* 审核员需要做处理*/ |
| 385 | - String updater = "";//审核员名字 | |
| 386 | - 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(); | |
| 364 | + //审核员名字 | |
| 365 | + String updater = ""; | |
| 366 | + if (!contentList.get(i).getReceive_status().equals(CommonConst.RECEIVE_BEFORE)) { | |
| 367 | + updater = CommonUtils.isEmpty(contentList.get(i).getUpdater()) || "null".equals(contentList.get(i).getUpdater()) ? "自动通过" : contentList.get(i).getUpdater(); | |
| 388 | 368 | String auditor_id = contentList.get(i).getAuditor_id(); |
| 389 | 369 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 390 | 370 | ShyUsers user = new ShyUsers(); |
| 391 | 371 | user.setUser_id(auditor_id); |
| 392 | 372 | user = usersService.select(user); |
| 393 | 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 | 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 | 381 | cell.setCellValue(updater); |
| 402 | - | |
| 403 | - | |
| 404 | - | |
| 405 | - cell = row.createCell(11);//列 | |
| 382 | + | |
| 383 | + cell = row.createCell(11); | |
| 406 | 384 | cell.setCellValue(contentList.get(i).getShenhe_msg()); |
| 407 | - cell = row.createCell(12);//列 | |
| 385 | + cell = row.createCell(12); | |
| 408 | 386 | cell.setCellValue(contentList.get(i).getSource()); |
| 409 | - cell = row.createCell(13);//列 | |
| 387 | + cell = row.createCell(13); | |
| 410 | 388 | cell.setCellValue(contentList.get(i).getAuthor()); |
| 411 | - cell = row.createCell(14);//列 | |
| 389 | + cell = row.createCell(14); | |
| 412 | 390 | cell.setCellValue(contentList.get(i).getContent_url()); |
| 413 | 391 | } |
| 414 | 392 | |
| ... | ... | @@ -429,19 +407,23 @@ public class ContentController extends BaseController { |
| 429 | 407 | } catch (final Exception e) { |
| 430 | 408 | e.printStackTrace(); |
| 431 | 409 | try { |
| 432 | - if (bis != null) | |
| 410 | + if (bis != null) { | |
| 433 | 411 | bis.close(); |
| 434 | - if (bos != null) | |
| 412 | + } | |
| 413 | + if (bos != null) { | |
| 435 | 414 | bos.close(); |
| 415 | + } | |
| 436 | 416 | } catch (Exception e1) { |
| 437 | 417 | e1.printStackTrace(); |
| 438 | 418 | } |
| 439 | 419 | } finally { |
| 440 | 420 | try { |
| 441 | - if (bis != null) | |
| 421 | + if (bis != null) { | |
| 442 | 422 | bis.close(); |
| 443 | - if (bos != null) | |
| 423 | + } | |
| 424 | + if (bos != null) { | |
| 444 | 425 | bos.close(); |
| 426 | + } | |
| 445 | 427 | } catch (Exception e2) { |
| 446 | 428 | e2.printStackTrace(); |
| 447 | 429 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/EmailController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 3 | 4 | import com.alibaba.fastjson.JSONObject; |
| 4 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 7 | import com.cnlive.shenhe.bean.SessionUser; |
| 8 | +import com.cnlive.shenhe.dto.EmailDTO; | |
| 7 | 9 | import com.cnlive.shenhe.entity.ShyEmail; |
| 8 | -import com.cnlive.shenhe.entity.ShySites; | |
| 9 | 10 | import com.cnlive.shenhe.entity.ShyUsers; |
| 10 | -import com.cnlive.shenhe.entity.ShyUsersfree; | |
| 11 | 11 | import com.cnlive.shenhe.serviceImpl.EmailServiceImpl; |
| 12 | 12 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 13 | 13 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 14 | 14 | import com.cnlive.shenhe.utils.CommonConst; |
| 15 | 15 | import com.cnlive.shenhe.utils.CommonUtils; |
| 16 | 16 | import com.github.pagehelper.PageInfo; |
| 17 | - | |
| 18 | -import org.jasig.cas.client.authentication.AttributePrincipal; | |
| 17 | +import org.slf4j.Logger; | |
| 18 | +import org.slf4j.LoggerFactory; | |
| 19 | 19 | import org.springframework.beans.factory.annotation.Autowired; |
| 20 | 20 | import org.springframework.stereotype.Controller; |
| 21 | 21 | import org.springframework.ui.Model; |
| 22 | 22 | import org.springframework.web.bind.annotation.GetMapping; |
| 23 | -import org.springframework.web.bind.annotation.PathVariable; | |
| 24 | 23 | import org.springframework.web.bind.annotation.PostMapping; |
| 25 | 24 | import org.springframework.web.bind.annotation.RequestMapping; |
| 26 | 25 | import org.springframework.web.bind.annotation.ResponseBody; |
| 27 | 26 | |
| 28 | -import java.util.HashMap; | |
| 29 | -import java.util.List; | |
| 30 | -import java.util.Map; | |
| 31 | - | |
| 32 | -import javax.print.attribute.HashAttributeSet; | |
| 33 | -import javax.servlet.http.HttpServletRequest; | |
| 34 | 27 | import javax.servlet.http.HttpSession; |
| 28 | +import java.util.List; | |
| 35 | 29 | |
| 36 | 30 | /** |
| 31 | + * | |
| 37 | 32 | * @Auther: liwei |
| 38 | 33 | * @Date: 2019/08/20 14:22 |
| 39 | 34 | * @Description: |
| ... | ... | @@ -41,6 +36,7 @@ import javax.servlet.http.HttpSession; |
| 41 | 36 | @Controller |
| 42 | 37 | @RequestMapping("/email") |
| 43 | 38 | public class EmailController extends BaseController { |
| 39 | + private static Logger logger = LoggerFactory.getLogger(EmailController.class); | |
| 44 | 40 | |
| 45 | 41 | @Autowired |
| 46 | 42 | EmailServiceImpl emailServiceImpl; |
| ... | ... | @@ -52,15 +48,13 @@ public class EmailController extends BaseController { |
| 52 | 48 | |
| 53 | 49 | |
| 54 | 50 | @GetMapping(value = "/page") |
| 55 | - public String page(Model model, Integer page, Integer pageSize, String orderByClause, | |
| 56 | - String remark,String email, HttpSession session) { | |
| 51 | + public String page(Model model, EmailDTO emailDTO, HttpSession session) { | |
| 52 | + logger.info("列表请求参数:{}", JSON.toJSONString(emailDTO)); | |
| 57 | 53 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 58 | 54 | if(CommonUtils.isNull(sessionUser)){ |
| 59 | 55 | return "redirect:/users/login"; |
| 60 | 56 | } |
| 61 | - if (CommonUtils.isNull(page)) page = 1; | |
| 62 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 63 | - PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(page, pageSize, orderByClause, remark,email); | |
| 57 | + PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(emailDTO); | |
| 64 | 58 | List<ShyEmail> list = emailPage.getList(); |
| 65 | 59 | JSONObject email_message = CommonConst.EMAIL_MESSAGE; |
| 66 | 60 | if (!list.isEmpty()) { |
| ... | ... | @@ -92,7 +86,7 @@ public class EmailController extends BaseController { |
| 92 | 86 | } |
| 93 | 87 | } |
| 94 | 88 | model.addAttribute("emailPage", emailPage); |
| 95 | - model.addAttribute("pageSize", pageSize); | |
| 89 | + model.addAttribute("pageSize", emailDTO.getPageSize()); | |
| 96 | 90 | model.addAttribute("email_message", email_message); |
| 97 | 91 | return "page/email.html"; |
| 98 | 92 | } |
| ... | ... | @@ -123,7 +117,7 @@ public class EmailController extends BaseController { |
| 123 | 117 | @PostMapping(value = "/write") |
| 124 | 118 | public String write(Model model,Integer id,String email,String remark, String[] write_business, HttpSession session, String redirect_url) { |
| 125 | 119 | if(CommonUtils.isEmpty(email)&&CommonUtils.isEmpty(remark)){ |
| 126 | - setmodel_param(model,"email,remark不能为空"); | |
| 120 | + setmodelParam(model,"email,remark不能为空"); | |
| 127 | 121 | return "error.html"; |
| 128 | 122 | } |
| 129 | 123 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| ... | ... | @@ -138,7 +132,7 @@ public class EmailController extends BaseController { |
| 138 | 132 | if (success) { |
| 139 | 133 | return "redirect:" + redirect_url; |
| 140 | 134 | } else { |
| 141 | - setmodel_result(model); | |
| 135 | + setmodelResult(model); | |
| 142 | 136 | return "error.html"; |
| 143 | 137 | } |
| 144 | 138 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | -import org.apache.poi.xssf.usermodel.XSSFCell; | |
| 4 | -import org.apache.poi.xssf.usermodel.XSSFRow; | |
| 5 | -import org.apache.poi.xssf.usermodel.XSSFSheet; | |
| 6 | -import org.apache.poi.xssf.usermodel.XSSFWorkbook; | |
| 7 | 3 | import com.alibaba.fastjson.JSON; |
| 8 | 4 | import com.alibaba.fastjson.JSONObject; |
| 9 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 10 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 11 | 7 | import com.cnlive.shenhe.bean.SessionUser; |
| 12 | -import com.cnlive.shenhe.entity.ShyChannel; | |
| 13 | -import com.cnlive.shenhe.entity.ShyLive; | |
| 8 | +import com.cnlive.shenhe.dto.LiveApplyDTO; | |
| 14 | 9 | import com.cnlive.shenhe.entity.ShyLiveapply; |
| 15 | 10 | import com.cnlive.shenhe.entity.ShySites; |
| 16 | 11 | import com.cnlive.shenhe.entity.ShyUsers; |
| 17 | -import com.cnlive.shenhe.entity.ShyVideos; | |
| 18 | -import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl; | |
| 19 | -import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; | |
| 20 | -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | |
| 21 | -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | |
| 22 | -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; | |
| 12 | +import com.cnlive.shenhe.serviceImpl.*; | |
| 23 | 13 | import com.cnlive.shenhe.utils.AuditPass; |
| 24 | 14 | import com.cnlive.shenhe.utils.CommonConst; |
| 25 | 15 | import com.cnlive.shenhe.utils.CommonUtils; |
| 26 | 16 | import com.github.pagehelper.PageInfo; |
| 17 | +import org.apache.poi.xssf.usermodel.XSSFCell; | |
| 18 | +import org.apache.poi.xssf.usermodel.XSSFRow; | |
| 19 | +import org.apache.poi.xssf.usermodel.XSSFSheet; | |
| 20 | +import org.apache.poi.xssf.usermodel.XSSFWorkbook; | |
| 27 | 21 | import org.slf4j.Logger; |
| 28 | 22 | import org.slf4j.LoggerFactory; |
| 29 | 23 | import org.springframework.beans.factory.annotation.Autowired; |
| ... | ... | @@ -43,6 +37,9 @@ import java.util.HashMap; |
| 43 | 37 | import java.util.List; |
| 44 | 38 | import java.util.Map; |
| 45 | 39 | |
| 40 | +/** | |
| 41 | + * @author Administrator | |
| 42 | + */ | |
| 46 | 43 | @Controller |
| 47 | 44 | @RequestMapping("/liveApply") |
| 48 | 45 | public class LiveApplyController extends BaseController { |
| ... | ... | @@ -69,9 +66,9 @@ public class LiveApplyController extends BaseController { |
| 69 | 66 | /** |
| 70 | 67 | * 直播申请审核信息回调接口 |
| 71 | 68 | * |
| 72 | - * @param activity_id 视频id | |
| 69 | + * @param ids 视频id | |
| 73 | 70 | * @param state 状态码 |
| 74 | - * @param attr_tags 标签 | |
| 71 | + * @param | |
| 75 | 72 | * @param msg 备注信息 |
| 76 | 73 | * @return |
| 77 | 74 | */ |
| ... | ... | @@ -120,45 +117,37 @@ public class LiveApplyController extends BaseController { |
| 120 | 117 | /** |
| 121 | 118 | * 内容分页列表接口 |
| 122 | 119 | * |
| 123 | - * @param video_title | |
| 124 | - * @param start_date | |
| 125 | - * @param end_date | |
| 126 | - * @param state | |
| 127 | - * @param page | |
| 128 | - * @param pageSize | |
| 129 | - * @param orderByClause | |
| 120 | + * @param liveApplyDTO | |
| 130 | 121 | * @return |
| 131 | 122 | */ |
| 132 | 123 | @GetMapping("/page") |
| 133 | - public Object getListLiveApply(Model model,String start_date,String end_date, | |
| 134 | - String theme, String business_model, Integer page,Integer pageSize, | |
| 135 | - Integer shenhe_state,Integer receive, String sp_desc,String orderByClause, HttpSession session) { | |
| 124 | + public Object getListLiveApply(Model model, LiveApplyDTO liveApplyDTO, HttpSession session) { | |
| 125 | + logger.info("列表请求参数:{}", JSON.toJSONString(liveApplyDTO)); | |
| 136 | 126 | System.out.println("进入直播申请内容页"); |
| 137 | 127 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 138 | 128 | if(CommonUtils.isNull(sessionUser)){ |
| 139 | 129 | return "redirect:/users/login"; |
| 140 | 130 | } |
| 141 | 131 | Integer spid = sessionUser.getSpid(); |
| 132 | + liveApplyDTO.setSpid(spid); | |
| 142 | 133 | String userId = sessionUser.getUserId(); |
| 143 | - if (CommonUtils.isNull(page)) page = 1; | |
| 144 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 145 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | |
| 146 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | |
| 134 | + liveApplyDTO.setUserId(userId); | |
| 135 | + if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && liveApplyDTO.getSpid() == 0) { | |
| 136 | + ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc()); | |
| 147 | 137 | if(CommonUtils.isNotNull(shySite)){ |
| 148 | - spid = shySite.getSpid(); | |
| 138 | + liveApplyDTO.setSpid(shySite.getSpid()); | |
| 149 | 139 | }else{ |
| 150 | - setmodel_site(model); | |
| 140 | + setmodelSite(model); | |
| 151 | 141 | return "error.html"; |
| 152 | 142 | } |
| 153 | - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 154 | - spid = null; | |
| 143 | + } else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && liveApplyDTO.getSpid() == 0) { | |
| 144 | + liveApplyDTO.setSpid(null); | |
| 155 | 145 | } |
| 156 | - PageInfo<ShyLiveapply> liveApplyPage = liveApplyServiceImpl.getListLiveApply(theme, start_date,end_date, | |
| 157 | - business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId); | |
| 146 | + PageInfo<ShyLiveapply> liveApplyPage = liveApplyServiceImpl.getListLiveApply(liveApplyDTO); | |
| 158 | 147 | List<ShyLiveapply> list = liveApplyPage.getList(); |
| 159 | 148 | if (!list.isEmpty()) { |
| 160 | 149 | for (ShyLiveapply liveApply : list) { |
| 161 | - if (liveApply.getShenhe_state() != CommonConst.AUDIT_INTT) { | |
| 150 | + if (!liveApply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) { | |
| 162 | 151 | String updater =CommonUtils.isEmpty(liveApply.getUpdater()) || "null".equals(liveApply.getUpdater())? "白名单":liveApply.getUpdater(); |
| 163 | 152 | String auditor_id = liveApply.getAuditor(); |
| 164 | 153 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| ... | ... | @@ -181,7 +170,7 @@ public class LiveApplyController extends BaseController { |
| 181 | 170 | } |
| 182 | 171 | } |
| 183 | 172 | model.addAttribute("liveApplyPage", liveApplyPage); |
| 184 | - model.addAttribute("pageSize", pageSize); | |
| 173 | + model.addAttribute("pageSize", liveApplyDTO.getPageSize()); | |
| 185 | 174 | return "page/liveApply.html"; |
| 186 | 175 | } |
| 187 | 176 | |
| ... | ... | @@ -226,7 +215,7 @@ public class LiveApplyController extends BaseController { |
| 226 | 215 | for (String cid : cids) { |
| 227 | 216 | ShyLiveapply shyLiveapply = liveApplyServiceImpl.selectByPrimaryKey(Integer.parseInt(cid)); |
| 228 | 217 | if (CommonUtils.isNotNull(shyLiveapply)) { |
| 229 | - if (shyLiveapply.getShenhe_state() != CommonConst.RECEIVE_BEFORE ) { | |
| 218 | + if (!shyLiveapply.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) { | |
| 230 | 219 | return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试"); |
| 231 | 220 | } |
| 232 | 221 | } else { |
| ... | ... | @@ -316,23 +305,22 @@ public class LiveApplyController extends BaseController { |
| 316 | 305 | * 根据条件导出excel |
| 317 | 306 | */ |
| 318 | 307 | @GetMapping("excel") |
| 319 | - public void getExcel(String start_date,String end_date, | |
| 320 | - String theme, Integer business_model, Integer page,Integer pageSize, | |
| 321 | - Integer shenhe_state,Integer receive, String sp_desc,String orderByClause, HttpSession session,HttpServletResponse response) { | |
| 308 | + public void getExcel(LiveApplyDTO liveApplyDTO, HttpSession session,HttpServletResponse response) { | |
| 322 | 309 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 323 | 310 | Integer spid = sessionUser.getSpid(); |
| 311 | + liveApplyDTO.setSpid(spid); | |
| 324 | 312 | String userId = sessionUser.getUserId(); |
| 325 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | |
| 326 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | |
| 313 | + liveApplyDTO.setUserId(userId); | |
| 314 | + if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && liveApplyDTO.getSpid() == 0) { | |
| 315 | + ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc()); | |
| 327 | 316 | if(CommonUtils.isNotNull(shySite)){ |
| 328 | - spid = shySite.getSpid(); | |
| 317 | + liveApplyDTO.setSpid(shySite.getSpid()); | |
| 329 | 318 | } |
| 330 | - }else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 331 | - spid = null; | |
| 319 | + }else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && liveApplyDTO.getSpid() == 0) { | |
| 320 | + liveApplyDTO.setSpid(null); | |
| 332 | 321 | } |
| 333 | - List<ShyLiveapply> liveApplyList = liveApplyServiceImpl.findByCondition(theme, start_date,end_date, | |
| 334 | - business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId); | |
| 335 | - | |
| 322 | + List<ShyLiveapply> liveApplyList = liveApplyServiceImpl.findByCondition(liveApplyDTO); | |
| 323 | + | |
| 336 | 324 | String fileName = "直播申请数据"; |
| 337 | 325 | |
| 338 | 326 | XSSFWorkbook wb = new XSSFWorkbook(); |
| ... | ... | @@ -426,19 +414,23 @@ public class LiveApplyController extends BaseController { |
| 426 | 414 | } catch (final Exception e) { |
| 427 | 415 | e.printStackTrace(); |
| 428 | 416 | try { |
| 429 | - if (bis != null) | |
| 417 | + if (bis != null) { | |
| 430 | 418 | bis.close(); |
| 431 | - if (bos != null) | |
| 419 | + } | |
| 420 | + if (bos != null) { | |
| 432 | 421 | bos.close(); |
| 422 | + } | |
| 433 | 423 | } catch (Exception e1) { |
| 434 | 424 | e1.printStackTrace(); |
| 435 | 425 | } |
| 436 | 426 | } finally { |
| 437 | 427 | try { |
| 438 | - if (bis != null) | |
| 428 | + if (bis != null) { | |
| 439 | 429 | bis.close(); |
| 440 | - if (bos != null) | |
| 430 | + } | |
| 431 | + if (bos != null) { | |
| 441 | 432 | bos.close(); |
| 433 | + } | |
| 442 | 434 | } catch (Exception e2) { |
| 443 | 435 | e2.printStackTrace(); |
| 444 | 436 | } |
| ... | ... | @@ -468,13 +460,5 @@ public class LiveApplyController extends BaseController { |
| 468 | 460 | } |
| 469 | 461 | return null; |
| 470 | 462 | } |
| 471 | - | |
| 472 | - @PostMapping("/ceshi") | |
| 473 | - @ResponseBody | |
| 474 | - public static String ceshi(String name) { | |
| 475 | - | |
| 476 | - | |
| 477 | - return name; | |
| 478 | - } | |
| 479 | 463 | |
| 480 | 464 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/LiveController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | -import com.cnlive.shenhe.utils.HttpClientUtils; | |
| 4 | -import org.apache.poi.xssf.usermodel.XSSFCell; | |
| 5 | -import org.apache.poi.xssf.usermodel.XSSFRow; | |
| 6 | -import org.apache.poi.xssf.usermodel.XSSFSheet; | |
| 7 | -import org.apache.poi.xssf.usermodel.XSSFWorkbook; | |
| 8 | 3 | import com.alibaba.fastjson.JSON; |
| 9 | 4 | import com.alibaba.fastjson.JSONObject; |
| 10 | 5 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 11 | 6 | import com.cnlive.shenhe.bean.ResponseBean; |
| 12 | 7 | import com.cnlive.shenhe.bean.SessionUser; |
| 8 | +import com.cnlive.shenhe.dto.LiveDTO; | |
| 13 | 9 | import com.cnlive.shenhe.entity.ShyLive; |
| 14 | 10 | import com.cnlive.shenhe.entity.ShySites; |
| 15 | 11 | import com.cnlive.shenhe.entity.ShyUsers; |
| 16 | -import com.cnlive.shenhe.entity.ShyVideos; | |
| 17 | 12 | import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; |
| 18 | 13 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 19 | 14 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| ... | ... | @@ -21,7 +16,12 @@ import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; |
| 21 | 16 | import com.cnlive.shenhe.utils.AuditPass; |
| 22 | 17 | import com.cnlive.shenhe.utils.CommonConst; |
| 23 | 18 | import com.cnlive.shenhe.utils.CommonUtils; |
| 19 | +import com.cnlive.shenhe.utils.HttpClientUtils; | |
| 24 | 20 | import com.github.pagehelper.PageInfo; |
| 21 | +import org.apache.poi.xssf.usermodel.XSSFCell; | |
| 22 | +import org.apache.poi.xssf.usermodel.XSSFRow; | |
| 23 | +import org.apache.poi.xssf.usermodel.XSSFSheet; | |
| 24 | +import org.apache.poi.xssf.usermodel.XSSFWorkbook; | |
| 25 | 25 | import org.slf4j.Logger; |
| 26 | 26 | import org.slf4j.LoggerFactory; |
| 27 | 27 | import org.springframework.beans.factory.annotation.Autowired; |
| ... | ... | @@ -41,6 +41,9 @@ import java.util.HashMap; |
| 41 | 41 | import java.util.List; |
| 42 | 42 | import java.util.Map; |
| 43 | 43 | |
| 44 | +/** | |
| 45 | + * @author Administrator | |
| 46 | + */ | |
| 44 | 47 | @Controller |
| 45 | 48 | @RequestMapping("/live") |
| 46 | 49 | public class LiveController extends BaseController { |
| ... | ... | @@ -113,73 +116,60 @@ public class LiveController extends BaseController { |
| 113 | 116 | * 内容分页列表接口 |
| 114 | 117 | * |
| 115 | 118 | * @param model |
| 116 | - * @param activity_id | |
| 117 | - * @param start_date | |
| 118 | - * @param end_date | |
| 119 | - * @param activity_name | |
| 120 | - * @param activity_status | |
| 121 | - * @param page | |
| 122 | - * @param pageSize | |
| 123 | - * @param shenhe_state | |
| 124 | - * @param sp_desc | |
| 125 | - * @param contentId | |
| 119 | + * @param liveDTO | |
| 126 | 120 | * @param session |
| 127 | 121 | * @return |
| 128 | 122 | */ |
| 129 | 123 | @GetMapping("/page") |
| 130 | - public Object getListVideos(Model model, String activity_id, String start_date, String end_date, | |
| 131 | - String activity_name, Integer activity_status, Integer page, Integer pageSize, | |
| 132 | - Integer shenhe_state, String sp_desc, Integer contentId, HttpSession session) { | |
| 124 | + public Object getListVideos(Model model, LiveDTO liveDTO, HttpSession session) { | |
| 125 | + logger.info("列表请求参数:{}", JSON.toJSONString(liveDTO)); | |
| 133 | 126 | System.out.println("进入直播内容页"); |
| 134 | 127 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 135 | -// if(CommonUtils.isNull(sessionUser)){ | |
| 136 | -// return "redirect:/users/login"; | |
| 137 | -// } | |
| 138 | 128 | Integer spid = sessionUser.getSpid(); |
| 139 | 129 | String userId = sessionUser.getUserId(); |
| 140 | - if (CommonUtils.isNull(page)) page = 1; | |
| 141 | - if (CommonUtils.isNull(pageSize)) pageSize = 20; | |
| 142 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | |
| 143 | - ShySites shySite = sitesService.findspidBySpdesc(sp_desc); | |
| 130 | + liveDTO.setSpid(spid); | |
| 131 | + liveDTO.setUserId(userId); | |
| 132 | + if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && liveDTO.getSpid() == 0) { | |
| 133 | + ShySites shySite = sitesService.findspidBySpdesc(liveDTO.getSp_desc()); | |
| 144 | 134 | if (CommonUtils.isNotNull(shySite)) { |
| 145 | - spid = shySite.getSpid(); | |
| 135 | + liveDTO.setSpid(shySite.getSpid()); | |
| 146 | 136 | } else { |
| 147 | - setmodel_site(model); | |
| 137 | + setmodelSite(model); | |
| 148 | 138 | return "error.html"; |
| 149 | 139 | } |
| 150 | - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 151 | - spid = null; | |
| 140 | + } else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && liveDTO.getSpid() == 0) { | |
| 141 | + liveDTO.setSpid(null); | |
| 152 | 142 | } |
| 153 | 143 | String orderByClause = ""; |
| 154 | - if (shenhe_state != null && shenhe_state == 0) {//审核状态：全部待领 | |
| 144 | + //审核状态：全部待领 | |
| 145 | + if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 0) { | |
| 155 | 146 | orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time "; |
| 156 | - } else if (shenhe_state != null && shenhe_state == 1) {//审核状态：待审核 | |
| 147 | + } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 1) {//审核状态：待审核 | |
| 157 | 148 | orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time "; |
| 158 | - } else if (shenhe_state != null && shenhe_state == 2) {//审核状态：已审核 | |
| 149 | + } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 2) {//审核状态：已审核 | |
| 159 | 150 | orderByClause = "pre_start_time desc"; |
| 160 | 151 | } else {//审核状态：全部 |
| 161 | 152 | orderByClause = "is_hot desc, pre_start_time "; |
| 162 | - if (activity_status != null && (activity_status == 0 || activity_status == 2 || activity_status == 4)) {//直播状态：结束、撤销、下线 | |
| 153 | + if (liveDTO.getActivity_status() != null && (liveDTO.getActivity_status() == 0 || liveDTO.getActivity_status() == 2 || liveDTO.getActivity_status() == 4)) {//直播状态：结束、撤销、下线 | |
| 163 | 154 | orderByClause = "is_hot desc, pre_start_time desc"; |
| 164 | 155 | } |
| 165 | 156 | } |
| 166 | 157 | |
| 167 | - if (CommonUtils.isNotNull(contentId)) { | |
| 158 | + if (CommonUtils.isNotNull(liveDTO.getContentId())) { | |
| 168 | 159 | Map<String, String> map = new HashMap<>(1); |
| 169 | - map.put("id", contentId.toString()); | |
| 160 | + map.put("id", liveDTO.getContentId().toString()); | |
| 170 | 161 | String post = HttpClientUtils.get(cms_getVideoAndLiveId, map); |
| 171 | 162 | JSONObject jsonObject = JSONObject.parseObject(post); |
| 172 | 163 | JSONObject data = jsonObject.getJSONObject("data"); |
| 173 | 164 | if (data != null) { |
| 174 | 165 | String pid = data.getString("pid"); |
| 175 | - activity_id = pid; | |
| 166 | + liveDTO.setActivity_id(pid); | |
| 176 | 167 | } else { |
| 177 | - activity_id = contentId.toString(); | |
| 168 | + liveDTO.setActivity_id(String.valueOf(liveDTO.getContentId())); | |
| 178 | 169 | } |
| 179 | 170 | } |
| 180 | 171 | |
| 181 | - PageInfo<ShyLive> livePage = liveService.getListContent(activity_name, start_date, end_date, | |
| 182 | - activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid, userId); | |
| 172 | + PageInfo<ShyLive> livePage = liveService.getListContent(liveDTO); | |
| 183 | 173 | List<ShyLive> list = livePage.getList(); |
| 184 | 174 | if (!list.isEmpty()) { |
| 185 | 175 | for (ShyLive live : list) { |
| ... | ... | @@ -191,7 +181,7 @@ public class LiveController extends BaseController { |
| 191 | 181 | } |
| 192 | 182 | } |
| 193 | 183 | model.addAttribute("livePage", livePage); |
| 194 | - model.addAttribute("pageSize", pageSize); | |
| 184 | + model.addAttribute("pageSize", liveDTO.getPageSize()); | |
| 195 | 185 | return "page/live.html"; |
| 196 | 186 | } |
| 197 | 187 | |
| ... | ... | @@ -326,7 +316,7 @@ public class LiveController extends BaseController { |
| 326 | 316 | * 同步直播云信息 |
| 327 | 317 | * |
| 328 | 318 | * @param ids |
| 329 | - * @param msg | |
| 319 | + * @param | |
| 330 | 320 | * @param session |
| 331 | 321 | * @return |
| 332 | 322 | */ |
| ... | ... | @@ -374,22 +364,22 @@ public class LiveController extends BaseController { |
| 374 | 364 | * 根据条件导出excel |
| 375 | 365 | */ |
| 376 | 366 | @GetMapping("excel") |
| 377 | - public void getExcel(String activity_id,String start_date,String end_date, | |
| 378 | - String activity_name, Integer activity_status, Integer page,Integer pageSize, | |
| 379 | - Integer shenhe_state, String orderByClause, String sp_desc, HttpSession session,HttpServletResponse response) { | |
| 367 | + public void getExcel(LiveDTO liveDTO, HttpSession session,HttpServletResponse response) { | |
| 368 | + | |
| 380 | 369 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 381 | 370 | Integer spid = sessionUser.getSpid(); |
| 382 | 371 | String userId = sessionUser.getUserId(); |
| 383 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | |
| 384 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | |
| 372 | + liveDTO.setSpid(spid); | |
| 373 | + liveDTO.setUserId(userId); | |
| 374 | + if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && liveDTO.getSpid() == 0) { | |
| 375 | + ShySites shySite=sitesService.findspidBySpdesc(liveDTO.getSp_desc()); | |
| 385 | 376 | if(CommonUtils.isNotNull(shySite)){ |
| 386 | - spid = shySite.getSpid(); | |
| 377 | + liveDTO.setSpid(shySite.getSpid()); | |
| 387 | 378 | } |
| 388 | - }else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 389 | - spid = null; | |
| 379 | + }else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && liveDTO.getSpid() == 0) { | |
| 380 | + liveDTO.setSpid(null); | |
| 390 | 381 | } |
| 391 | - List<ShyLive> liveList = liveService.findByCondition(activity_name, start_date,end_date, | |
| 392 | - activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid,userId); | |
| 382 | + List<ShyLive> liveList = liveService.findByCondition(liveDTO); | |
| 393 | 383 | |
| 394 | 384 | String fileName = "直播数据"; |
| 395 | 385 | |
| ... | ... | @@ -434,23 +424,28 @@ public class LiveController extends BaseController { |
| 434 | 424 | cell = row.createCell(0);//列 |
| 435 | 425 | cell.setCellValue(liveList.get(i).getId()); |
| 436 | 426 | cell = row.createCell(1);//列 |
| 437 | - cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getPre_start_time(), "yyyy/MM/dd")); | |
| 427 | + if (liveList.get(i).getPre_start_time() != null) { | |
| 428 | + cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getPre_start_time(), "yyyy/MM/dd")); | |
| 429 | + } | |
| 438 | 430 | cell = row.createCell(2);//列 |
| 439 | - cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getPre_start_time(), "HH:mm")); | |
| 431 | + if (liveList.get(i).getPre_start_time() != null) { | |
| 432 | + cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getPre_start_time(), "HH:mm")); | |
| 433 | + } | |
| 440 | 434 | /*预计结束时间需要处理成用户可读*/ |
| 441 | - String pre_endTime=""; | |
| 442 | - long start = liveList.get(i).getPre_start_time().getTime()+8*60*60*1000; | |
| 443 | - if(CommonUtils.isNull(liveList.get(i).getPre_end_time())){//结束时间为空 | |
| 444 | - pre_endTime="待定"; | |
| 445 | - }else{ | |
| 446 | - long end = liveList.get(i).getPre_end_time().getTime()+8*60*60*1000; | |
| 447 | - long count=end/(24*3600*1000)-start/(24*3600*1000); | |
| 448 | - logger.info(String.valueOf(count)); | |
| 449 | - if(count==0){ | |
| 450 | - pre_endTime=CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm"); | |
| 451 | - }else if(count > 0){ | |
| 452 | - pre_endTime="跨"+count+"天 "+CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm"); | |
| 453 | - } | |
| 435 | + String pre_endTime = ""; | |
| 436 | + | |
| 437 | + if (CommonUtils.isNull(liveList.get(i).getPre_end_time())) {//结束时间为空 | |
| 438 | + pre_endTime = "待定"; | |
| 439 | + } else { | |
| 440 | + long start = liveList.get(i).getPre_start_time().getTime() + 8 * 60 * 60 * 1000; | |
| 441 | + long end = liveList.get(i).getPre_end_time().getTime() + 8 * 60 * 60 * 1000; | |
| 442 | + long count = end / (24 * 3600 * 1000) - start / (24 * 3600 * 1000); | |
| 443 | + logger.info(String.valueOf(count)); | |
| 444 | + if (count == 0) { | |
| 445 | + pre_endTime = CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm"); | |
| 446 | + } else if (count > 0) { | |
| 447 | + pre_endTime = "跨" + count + "天 " + CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm"); | |
| 448 | + } | |
| 454 | 449 | } |
| 455 | 450 | cell = row.createCell(3);//列 |
| 456 | 451 | cell.setCellValue(pre_endTime); |
| ... | ... | @@ -463,48 +458,54 @@ public class LiveController extends BaseController { |
| 463 | 458 | cell = row.createCell(7);//列 |
| 464 | 459 | /* 审核员需要做处理*/ |
| 465 | 460 | String updater = "";//审核员名字 |
| 466 | - if (liveList.get(i).getShenhe_state() != CommonConst.RECEIVE_BEFORE) { | |
| 467 | - updater = CommonUtils.isEmpty(liveList.get(i).getUpdater()) || "null".equals(liveList.get(i).getUpdater())? "自动通过":liveList.get(i).getUpdater(); | |
| 461 | + if (!liveList.get(i).getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) { | |
| 462 | + updater = CommonUtils.isEmpty(liveList.get(i).getUpdater()) || "null".equals(liveList.get(i).getUpdater()) ? "自动通过" : liveList.get(i).getUpdater(); | |
| 468 | 463 | String auditor_id = liveList.get(i).getAuditor(); |
| 469 | 464 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 470 | 465 | ShyUsers user = new ShyUsers(); |
| 471 | 466 | user.setUser_id(auditor_id); |
| 472 | 467 | user = usersService.select(user); |
| 473 | 468 | if (CommonUtils.isNotNull(user)) { |
| 474 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 469 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 475 | 470 | String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); |
| 476 | - updater = userName ; | |
| 471 | + updater = userName; | |
| 477 | 472 | } |
| 478 | 473 | } |
| 479 | 474 | } |
| 480 | 475 | cell.setCellValue(updater); |
| 481 | 476 | cell = row.createCell(8);//列 |
| 482 | - cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getActivity_start_time(), "yyyy/MM/dd")); | |
| 477 | + if (liveList.get(i).getActivity_start_time() != null) { | |
| 478 | + cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getActivity_start_time(), "yyyy/MM/dd")); | |
| 479 | + } | |
| 483 | 480 | cell = row.createCell(9);//列 |
| 484 | - cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getActivity_start_time(), "HH:mm")); | |
| 481 | + if (liveList.get(i).getActivity_start_time() != null) { | |
| 482 | + cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getActivity_start_time(), "HH:mm")); | |
| 483 | + } | |
| 485 | 484 | /*实际结束时间需要处理成用户可读*/ |
| 486 | - String Activity_endTime=""; | |
| 487 | - long Activity_start = liveList.get(i).getActivity_start_time().getTime()+8*60*60*1000; | |
| 488 | - long Activity_end = liveList.get(i).getActivity_end_time().getTime()+8*60*60*1000; | |
| 489 | - long Activity_count=Activity_end/(24*3600*1000)-Activity_start/(24*3600*1000); | |
| 490 | - logger.info(String.valueOf(Activity_count)); | |
| 491 | - if(Activity_count==0){ | |
| 492 | - Activity_endTime=CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm"); | |
| 493 | - }else if(Activity_count > 0){ | |
| 494 | - Activity_endTime="跨"+Activity_count+"天 "+CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm"); | |
| 485 | + String Activity_endTime = ""; | |
| 486 | + if (liveList.get(i).getActivity_start_time() != null && liveList.get(i).getActivity_end_time()!=null) { | |
| 487 | + long Activity_start = liveList.get(i).getActivity_start_time().getTime() + 8 * 60 * 60 * 1000; | |
| 488 | + long Activity_end = liveList.get(i).getActivity_end_time().getTime() + 8 * 60 * 60 * 1000; | |
| 489 | + long Activity_count = Activity_end / (24 * 3600 * 1000) - Activity_start / (24 * 3600 * 1000); | |
| 490 | + logger.info(String.valueOf(Activity_count)); | |
| 491 | + if (Activity_count == 0) { | |
| 492 | + Activity_endTime = CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm"); | |
| 493 | + } else if (Activity_count > 0) { | |
| 494 | + Activity_endTime = "跨" + Activity_count + "天 " + CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm"); | |
| 495 | + } | |
| 496 | + | |
| 497 | + cell = row.createCell(10);//列 | |
| 498 | + cell.setCellValue(Activity_endTime); | |
| 499 | + cell = row.createCell(11);//时长 | |
| 500 | + /*时长需要处理成用户可读,单位：分钟*/ | |
| 501 | + long time_length = (Activity_end - Activity_start) / (60 * 1000); | |
| 502 | + cell.setCellValue(time_length); | |
| 503 | + | |
| 504 | + cell = row.createCell(12);//列 | |
| 505 | + cell.setCellValue(""); | |
| 506 | + cell = row.createCell(13);//列 | |
| 507 | + cell.setCellValue(""); | |
| 495 | 508 | } |
| 496 | - | |
| 497 | - cell = row.createCell(10);//列 | |
| 498 | - cell.setCellValue(Activity_endTime); | |
| 499 | - cell = row.createCell(11);//时长 | |
| 500 | - /*时长需要处理成用户可读,单位：分钟*/ | |
| 501 | - long time_length = (Activity_end-Activity_start)/(60*1000); | |
| 502 | - cell.setCellValue(time_length); | |
| 503 | - | |
| 504 | - cell = row.createCell(12);//列 | |
| 505 | - cell.setCellValue(""); | |
| 506 | - cell = row.createCell(13);//列 | |
| 507 | - cell.setCellValue(""); | |
| 508 | 509 | } |
| 509 | 510 | |
| 510 | 511 | ByteArrayOutputStream os = new ByteArrayOutputStream(); |
| ... | ... | @@ -524,31 +525,29 @@ public class LiveController extends BaseController { |
| 524 | 525 | } catch (final Exception e) { |
| 525 | 526 | e.printStackTrace(); |
| 526 | 527 | try { |
| 527 | - if (bis != null) | |
| 528 | + if (bis != null) { | |
| 528 | 529 | bis.close(); |
| 529 | - if (bos != null) | |
| 530 | + } | |
| 531 | + if (bos != null) { | |
| 530 | 532 | bos.close(); |
| 533 | + } | |
| 531 | 534 | } catch (Exception e1) { |
| 532 | 535 | e1.printStackTrace(); |
| 533 | 536 | } |
| 534 | 537 | } finally { |
| 535 | 538 | try { |
| 536 | - if (bis != null) | |
| 539 | + if (bis != null) { | |
| 537 | 540 | bis.close(); |
| 538 | - if (bos != null) | |
| 541 | + } | |
| 542 | + if (bos != null) { | |
| 539 | 543 | bos.close(); |
| 544 | + } | |
| 540 | 545 | } catch (Exception e2) { |
| 541 | 546 | e2.printStackTrace(); |
| 542 | 547 | } |
| 543 | 548 | } |
| 544 | 549 | } |
| 545 | - | |
| 546 | - @PostMapping("/ceshi") | |
| 547 | - @ResponseBody | |
| 548 | - public static String ceshi(String name) { | |
| 549 | - | |
| 550 | - | |
| 551 | - return name; | |
| 552 | - } | |
| 550 | + | |
| 551 | + | |
| 553 | 552 | |
| 554 | 553 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/NotSpeakController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | -import com.alibaba.fastjson.JSONObject; | |
| 4 | -import com.cnlive.shenhe.bean.ErrorEnum; | |
| 3 | + | |
| 4 | +import com.alibaba.fastjson.JSON; | |
| 5 | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 6 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | -import com.cnlive.shenhe.entity.ShyComments; | |
| 8 | -import com.cnlive.shenhe.entity.ShyContent; | |
| 7 | +import com.cnlive.shenhe.dto.NotSpeakDTO; | |
| 9 | 8 | import com.cnlive.shenhe.entity.ShyNotspeak; |
| 10 | 9 | import com.cnlive.shenhe.entity.ShySites; |
| 11 | 10 | 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; | |
| 15 | -import com.cnlive.shenhe.serviceImpl.NotspeakServiceImpl; | |
| 16 | -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; | |
| 17 | -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | |
| 11 | +import com.cnlive.shenhe.serviceImpl.*; | |
| 18 | 12 | import com.cnlive.shenhe.utils.AuditPass; |
| 19 | -import com.cnlive.shenhe.utils.CommonConst; | |
| 20 | 13 | import com.cnlive.shenhe.utils.CommonUtils; |
| 21 | 14 | import com.github.pagehelper.PageInfo; |
| 22 | 15 | import org.slf4j.Logger; |
| 23 | 16 | import org.slf4j.LoggerFactory; |
| 24 | 17 | import org.springframework.beans.factory.annotation.Autowired; |
| 25 | -import org.springframework.beans.factory.annotation.Value; | |
| 26 | 18 | import org.springframework.stereotype.Controller; |
| 27 | 19 | import org.springframework.ui.Model; |
| 28 | -import org.springframework.web.bind.annotation.*; | |
| 20 | +import org.springframework.web.bind.annotation.GetMapping; | |
| 21 | +import org.springframework.web.bind.annotation.PostMapping; | |
| 22 | +import org.springframework.web.bind.annotation.RequestMapping; | |
| 23 | +import org.springframework.web.bind.annotation.ResponseBody; | |
| 29 | 24 | |
| 30 | 25 | import javax.servlet.http.HttpSession; |
| 31 | -import java.util.Date; | |
| 32 | 26 | import java.util.List; |
| 33 | 27 | |
| 34 | 28 | |
| 29 | +/** | |
| 30 | + * @author Administrator | |
| 31 | + */ | |
| 35 | 32 | @Controller |
| 36 | 33 | @RequestMapping("/notSpeak") |
| 37 | 34 | public class NotSpeakController extends BaseController { |
| ... | ... | @@ -54,28 +51,20 @@ public class NotSpeakController extends BaseController { |
| 54 | 51 | /** |
| 55 | 52 | * 禁言列表页 |
| 56 | 53 | * |
| 57 | - * @param activity_id | |
| 58 | - * @param content | |
| 59 | - * @param is_hot | |
| 60 | - * @param start_date | |
| 61 | - * @param end_date | |
| 62 | - * @param state | |
| 63 | - * @param page | |
| 64 | - * @param pageSize | |
| 65 | - * @param orderByClause | |
| 54 | + * @param notSpeakDTO | |
| 66 | 55 | * @return |
| 67 | 56 | */ |
| 68 | 57 | @GetMapping("/page") |
| 69 | - public String getPage(Model model, String user_name, Integer user_id,Integer state, | |
| 70 | - Integer page, Integer pageSize, String orderByClause, HttpSession session) { | |
| 58 | + public String getPage(Model model, NotSpeakDTO notSpeakDTO, HttpSession session) { | |
| 59 | + logger.info("列表请求参数:{}", JSON.toJSONString(notSpeakDTO)); | |
| 71 | 60 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 72 | 61 | if(CommonUtils.isNull(sessionUser)){ |
| 73 | 62 | return "redirect:/users/login"; |
| 74 | 63 | } |
| 75 | 64 | String userId = sessionUser.getUserId(); |
| 76 | - if (CommonUtils.isNull(page)) page = 1; | |
| 77 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 78 | - PageInfo<ShyNotspeak> shyNotspeakPage = notSpeakService.getPage(user_name,user_id, state, page, pageSize, orderByClause); | |
| 65 | + notSpeakDTO.setUserId(userId); | |
| 66 | + PageInfo<ShyNotspeak> shyNotspeakPage = notSpeakService.getPage(notSpeakDTO); | |
| 67 | + | |
| 79 | 68 | List<ShyNotspeak> list = shyNotspeakPage.getList(); |
| 80 | 69 | if (!list.isEmpty()) { |
| 81 | 70 | for (ShyNotspeak notspeak : list) { |
| ... | ... | @@ -103,7 +92,7 @@ public class NotSpeakController extends BaseController { |
| 103 | 92 | } |
| 104 | 93 | } |
| 105 | 94 | } |
| 106 | - model.addAttribute("pageSize", pageSize); | |
| 95 | + model.addAttribute("pageSize", notSpeakDTO.getPageSize()); | |
| 107 | 96 | model.addAttribute("notspeakPage", shyNotspeakPage); |
| 108 | 97 | return "page/notspeak.html"; |
| 109 | 98 | } |
| ... | ... | @@ -112,7 +101,7 @@ public class NotSpeakController extends BaseController { |
| 112 | 101 | /** |
| 113 | 102 | * 禁言(通过评论进入) |
| 114 | 103 | * @param commentId |
| 115 | - * @param type | |
| 104 | + * @param | |
| 116 | 105 | * @param time |
| 117 | 106 | * @param session |
| 118 | 107 | * @return |
| ... | ... | @@ -128,8 +117,8 @@ public class NotSpeakController extends BaseController { |
| 128 | 117 | /** |
| 129 | 118 | * 查询禁言状态(通过评论进入) |
| 130 | 119 | * @param commentId |
| 131 | - * @param type | |
| 132 | - * @param time | |
| 120 | + * @param | |
| 121 | + * @param | |
| 133 | 122 | * @param session |
| 134 | 123 | * @return |
| 135 | 124 | */ | ... | ... |
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
0 → 100644
| 1 | +package com.cnlive.shenhe.controller; | |
| 2 | + | |
| 3 | + | |
| 4 | +import com.alibaba.fastjson.JSON; | |
| 5 | +import com.cnlive.shenhe.bean.ErrorEnum; | |
| 6 | +import com.cnlive.shenhe.bean.ResponseBean; | |
| 7 | +import com.cnlive.shenhe.dto.ShyActivityDTO; | |
| 8 | +import com.cnlive.shenhe.entity.ShyActivity; | |
| 9 | +import com.cnlive.shenhe.serviceImpl.ShyActivityImpl; | |
| 10 | +import com.github.pagehelper.PageInfo; | |
| 11 | +import org.slf4j.Logger; | |
| 12 | +import org.slf4j.LoggerFactory; | |
| 13 | +import org.springframework.beans.factory.annotation.Autowired; | |
| 14 | +import org.springframework.stereotype.Controller; | |
| 15 | +import org.springframework.ui.Model; | |
| 16 | +import org.springframework.web.bind.annotation.GetMapping; | |
| 17 | +import org.springframework.web.bind.annotation.PostMapping; | |
| 18 | +import org.springframework.web.bind.annotation.RequestMapping; | |
| 19 | +import org.springframework.web.bind.annotation.ResponseBody; | |
| 20 | + | |
| 21 | +import java.util.List; | |
| 22 | + | |
| 23 | + | |
| 24 | +/** | |
| 25 | + * @author Administrator | |
| 26 | + * @author yanzhaowang | |
| 27 | + * @create 2022-03-08 12:37 | |
| 28 | + */ | |
| 29 | +@Controller | |
| 30 | +@RequestMapping("/activity") | |
| 31 | +public class ShyActivityController extends BaseController { | |
| 32 | + | |
| 33 | + private static Logger logger = LoggerFactory.getLogger(ShyActivityController.class); | |
| 34 | + | |
| 35 | + @Autowired | |
| 36 | + private ShyActivityImpl shyActivityImpl; | |
| 37 | + | |
| 38 | + @PostMapping("/add") | |
| 39 | + @ResponseBody | |
| 40 | + public ResponseBean insterShyActivity(ShyActivity shyActivity) { | |
| 41 | + int i = shyActivityImpl.insertShyActivity(shyActivity); | |
| 42 | + if (i > 0) { | |
| 43 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前活动添加成功"); | |
| 44 | + } | |
| 45 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "添加失败，请重试"); | |
| 46 | + } | |
| 47 | + | |
| 48 | + @PostMapping("/delete") | |
| 49 | + @ResponseBody | |
| 50 | + public ResponseBean deleteShyActivity(Integer id) { | |
| 51 | + int i = shyActivityImpl.deleteShyActivity(id); | |
| 52 | + if (i > 0) { | |
| 53 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "删除当前活动成功"); | |
| 54 | + } | |
| 55 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "删除失败，请重试"); | |
| 56 | + | |
| 57 | + } | |
| 58 | + | |
| 59 | + @PostMapping("/update") | |
| 60 | + @ResponseBody | |
| 61 | + public ResponseBean updateShyActivity(ShyActivity shyActivity) { | |
| 62 | + | |
| 63 | + int i = shyActivityImpl.updateShyActivity(shyActivity); | |
| 64 | + if (i > 0) { | |
| 65 | + return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "修改当前活动成功"); | |
| 66 | + } | |
| 67 | + return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "修改失败，请重试"); | |
| 68 | + | |
| 69 | + } | |
| 70 | + | |
| 71 | + @GetMapping("/page") | |
| 72 | + public String getShyActivity(ShyActivityDTO shyActivityDTO, Model model) { | |
| 73 | + logger.info("列表请求参数:{}", JSON.toJSONString(shyActivityDTO)); | |
| 74 | + PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(shyActivityDTO); | |
| 75 | + List<ShyActivity> list = shyActivityPageInfo.getList(); | |
| 76 | + model.addAttribute("exempt_from_trial",shyActivityDTO.getExempt_from_trial()); | |
| 77 | + model.addAttribute("ShyActivitylist", shyActivityPageInfo); | |
| 78 | + return "page/activity.html"; | |
| 79 | + } | |
| 80 | + | |
| 81 | + | |
| 82 | +} | ... | ... |
src/main/java/com/cnlive/shenhe/controller/SitesController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 3 | 4 | import com.alibaba.fastjson.JSONObject; |
| 4 | 5 | import com.cnlive.shenhe.bean.SessionUser; |
| 6 | +import com.cnlive.shenhe.dto.SitesDTO; | |
| 5 | 7 | import com.cnlive.shenhe.entity.ShySites; |
| 6 | 8 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 7 | 9 | import com.cnlive.shenhe.utils.CommonConst; |
| ... | ... | @@ -20,6 +22,7 @@ import javax.servlet.http.HttpSession; |
| 20 | 22 | import java.util.List; |
| 21 | 23 | |
| 22 | 24 | /** |
| 25 | + * @author Administrator | |
| 23 | 26 | * @Auther: 周伟鹏 |
| 24 | 27 | * @Date: 2018/11/30 17:28 |
| 25 | 28 | * @Description: |
| ... | ... | @@ -36,27 +39,27 @@ public class SitesController extends BaseController { |
| 36 | 39 | /** |
| 37 | 40 | * 站点白名单分页列表 |
| 38 | 41 | * |
| 39 | - * @param page | |
| 40 | - * @param pageSize | |
| 41 | - * @param orderByClause | |
| 42 | - * @param keyword | |
| 42 | + * @param sitesDTO | |
| 43 | 43 | * @return |
| 44 | 44 | */ |
| 45 | 45 | @GetMapping(value = "/page") |
| 46 | - public String page(Model model, Integer page, Integer pageSize, String orderByClause, String keyword, HttpSession session) { | |
| 46 | + public String page(Model model, SitesDTO sitesDTO, HttpSession session) { | |
| 47 | + logger.info("列表请求参数:{}", JSON.toJSONString(sitesDTO)); | |
| 47 | 48 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 48 | 49 | if(CommonUtils.isNull(sessionUser)){ |
| 49 | 50 | return "redirect:/users/login"; |
| 50 | 51 | } |
| 51 | 52 | Integer spid = sessionUser.getSpid(); |
| 52 | - if (!sessionUser.isMaster() && spid != 0) { | |
| 53 | - setmodel_site(model); | |
| 53 | + sitesDTO.setSpId(spid); | |
| 54 | + if (!sessionUser.isMaster() && sitesDTO.getSpId() != 0) { | |
| 55 | + setmodelSite(model); | |
| 54 | 56 | return "error.html"; |
| 55 | 57 | } |
| 56 | - if (spid == 0) spid = null; | |
| 57 | - if (CommonUtils.isNull(page)) page = 1; | |
| 58 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 59 | - PageInfo<ShySites> sitePage = sitesService.getPage(page, pageSize, orderByClause, keyword, spid); | |
| 58 | + if (spid == 0) { | |
| 59 | + sitesDTO.setSpId(null); | |
| 60 | + } | |
| 61 | + | |
| 62 | + PageInfo<ShySites> sitePage = sitesService.getPage(sitesDTO); | |
| 60 | 63 | List<ShySites> list = sitePage.getList(); |
| 61 | 64 | JSONObject business = CommonConst.BUSINESS; |
| 62 | 65 | if (!list.isEmpty()) { |
| ... | ... | @@ -73,7 +76,7 @@ public class SitesController extends BaseController { |
| 73 | 76 | } |
| 74 | 77 | } |
| 75 | 78 | model.addAttribute("sitePage", sitePage); |
| 76 | - model.addAttribute("pageSize", pageSize); | |
| 79 | + model.addAttribute("pageSize", sitesDTO.getPageSize()); | |
| 77 | 80 | model.addAttribute("business", business); |
| 78 | 81 | return "page/site.html"; |
| 79 | 82 | } |
| ... | ... | @@ -98,7 +101,7 @@ public class SitesController extends BaseController { |
| 98 | 101 | if (success) { |
| 99 | 102 | return "redirect:" + redirect_url; |
| 100 | 103 | } else { |
| 101 | - setmodel_result(model); | |
| 104 | + setmodelResult(model); | |
| 102 | 105 | return "error.html"; |
| 103 | 106 | } |
| 104 | 107 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/TopicController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | -import com.alibaba.fastjson.JSONObject; | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 4 | 4 | import com.cnlive.shenhe.bean.ErrorEnum; |
| 5 | 5 | import com.cnlive.shenhe.bean.ResponseBean; |
| 6 | 6 | import com.cnlive.shenhe.bean.SessionUser; |
| 7 | -import com.cnlive.shenhe.entity.*; | |
| 7 | +import com.cnlive.shenhe.dto.TopicDTO; | |
| 8 | +import com.cnlive.shenhe.entity.ShySites; | |
| 9 | +import com.cnlive.shenhe.entity.ShyTopic; | |
| 8 | 10 | import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; |
| 9 | -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; | |
| 10 | 11 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 11 | 12 | import com.cnlive.shenhe.serviceImpl.TopicServiceImpl; |
| 12 | 13 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 13 | 14 | import com.cnlive.shenhe.utils.AuditPass; |
| 14 | 15 | import com.cnlive.shenhe.utils.CommonConst; |
| 15 | 16 | import com.cnlive.shenhe.utils.CommonUtils; |
| 16 | -import com.cnlive.shenhe.utils.InfoUtil; | |
| 17 | 17 | import com.github.pagehelper.PageInfo; |
| 18 | - | |
| 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 | 18 | import org.slf4j.Logger; |
| 24 | 19 | import org.slf4j.LoggerFactory; |
| 25 | 20 | import org.springframework.beans.factory.annotation.Autowired; |
| 26 | 21 | import org.springframework.beans.factory.annotation.Value; |
| 27 | 22 | import org.springframework.stereotype.Controller; |
| 28 | 23 | import org.springframework.ui.Model; |
| 29 | -import org.springframework.web.bind.annotation.*; | |
| 24 | +import org.springframework.web.bind.annotation.GetMapping; | |
| 25 | +import org.springframework.web.bind.annotation.PostMapping; | |
| 26 | +import org.springframework.web.bind.annotation.RequestMapping; | |
| 27 | +import org.springframework.web.bind.annotation.ResponseBody; | |
| 30 | 28 | |
| 31 | -import javax.servlet.ServletOutputStream; | |
| 32 | -import javax.servlet.http.HttpServletResponse; | |
| 33 | 29 | import javax.servlet.http.HttpSession; |
| 34 | - | |
| 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; | |
| 41 | 30 | import java.util.HashMap; |
| 42 | 31 | import java.util.List; |
| 43 | 32 | import java.util.Map; |
| 44 | 33 | |
| 45 | 34 | |
| 35 | +/** | |
| 36 | + * @author Administrator | |
| 37 | + */ | |
| 46 | 38 | @Controller |
| 47 | 39 | @RequestMapping("/topic") |
| 48 | 40 | public class TopicController extends BaseController { |
| ... | ... | @@ -66,60 +58,50 @@ public class TopicController extends BaseController { |
| 66 | 58 | * 图文列表 |
| 67 | 59 | * |
| 68 | 60 | * @param model |
| 69 | - * @param title | |
| 70 | - * @param start_date | |
| 71 | - * @param end_date | |
| 72 | - * @param receive_status | |
| 73 | - * @param sp_desc | |
| 74 | - * @param page | |
| 75 | - * @param pageSize | |
| 76 | - * @param orderByClause | |
| 61 | + * @param topicDTO | |
| 77 | 62 | * @param session |
| 78 | 63 | * @return |
| 79 | 64 | */ |
| 80 | 65 | @GetMapping("/page") |
| 81 | - public String getPage(Model model, String topic_name,String topic_id, String topic_tag, | |
| 82 | - String start_date, String end_date, Integer shenhe_status, String sp_desc, | |
| 83 | - Integer page, Integer pageSize,Integer receive, String orderByClause, HttpSession session) { | |
| 66 | + public String getPage(Model model, TopicDTO topicDTO, HttpSession session) { | |
| 67 | + logger.info("列表请求参数:{}", JSON.toJSONString(topicDTO)); | |
| 84 | 68 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 85 | 69 | if(CommonUtils.isNull(sessionUser)){ |
| 86 | 70 | return "redirect:/users/login"; |
| 87 | 71 | } |
| 88 | 72 | Integer spid = sessionUser.getSpid(); |
| 89 | 73 | String userId = sessionUser.getUserId(); |
| 90 | - if (CommonUtils.isNull(page)) page = 1; | |
| 91 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 92 | - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { | |
| 93 | - ShySites shySite=sitesService.findspidBySpdesc(sp_desc); | |
| 74 | + topicDTO.setSpid(spid); | |
| 75 | + topicDTO.setUserId(userId); | |
| 76 | + if (CommonUtils.isNotEmpty(topicDTO.getSp_desc()) && topicDTO.getSpid() == 0) { | |
| 77 | + ShySites shySite=sitesService.findspidBySpdesc(topicDTO.getSp_desc()); | |
| 94 | 78 | if(CommonUtils.isNotNull(shySite)){ |
| 95 | - spid = shySite.getSpid(); | |
| 79 | + topicDTO.setSpid(shySite.getSpid()); | |
| 96 | 80 | }else{ |
| 97 | - setmodel_site(model); | |
| 81 | + setmodelSite(model); | |
| 98 | 82 | return "error.html"; |
| 99 | 83 | } |
| 100 | - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { | |
| 101 | - spid = null; | |
| 84 | + } else if (CommonUtils.isEmpty(topicDTO.getSp_desc()) && topicDTO.getSpid() == 0) { | |
| 85 | + topicDTO.setSpid(null); | |
| 102 | 86 | } |
| 103 | - Date sDate = null; | |
| 104 | - Date eDate = null; | |
| 105 | 87 | |
| 106 | - if (CommonUtils.isNotEmpty(start_date)) { | |
| 88 | + if (CommonUtils.isNotEmpty(topicDTO.getStart_date())) { | |
| 107 | 89 | try { |
| 108 | - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); | |
| 90 | + topicDTO.setStart_date(String.valueOf(CommonUtils.parseDate(topicDTO.getStart_date(), "yyyy-MM-dd"))); | |
| 109 | 91 | } catch (Exception e) { |
| 110 | 92 | } |
| 111 | 93 | } |
| 112 | - if (CommonUtils.isNotEmpty(end_date)) { | |
| 94 | + if (CommonUtils.isNotEmpty(topicDTO.getEnd_date())) { | |
| 113 | 95 | try { |
| 114 | - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); | |
| 96 | + topicDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(topicDTO.getEnd_date(), "yyyy-MM-dd"))); | |
| 115 | 97 | } catch (Exception e) { |
| 116 | 98 | } |
| 117 | 99 | } |
| 118 | - PageInfo<ShyTopic> topicPage = topicService.getPage( topic_name,topic_tag,topic_id, sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId,receive); | |
| 100 | + PageInfo<ShyTopic> topicPage = topicService.getPage(topicDTO); | |
| 119 | 101 | List<ShyTopic> list = topicPage.getList(); |
| 120 | 102 | if (!list.isEmpty()) { |
| 121 | 103 | for (ShyTopic topic : list) { |
| 122 | - if (topic.getShenhe_status() != CommonConst.AUDIT_INTT) { | |
| 104 | + if (!topic.getShenhe_status().equals(CommonConst.AUDIT_INTT)) { | |
| 123 | 105 | String auditor_id = topic.getAuditor_id(); |
| 124 | 106 | String updater = CommonUtils.isEmpty(topic.getUpdater()) || "null".equals(topic.getUpdater())? "白名单":topic.getUpdater(); |
| 125 | 107 | updater =sitesService.getUpdater(updater,auditor_id); |
| ... | ... | @@ -137,7 +119,7 @@ public class TopicController extends BaseController { |
| 137 | 119 | } |
| 138 | 120 | } |
| 139 | 121 | model.addAttribute("topicPage", topicPage); |
| 140 | - model.addAttribute("pageSize", pageSize); | |
| 122 | + model.addAttribute("pageSize", topicDTO.getPageSize()); | |
| 141 | 123 | return "page/topic.html"; |
| 142 | 124 | } |
| 143 | 125 | ... | ... |
src/main/java/com/cnlive/shenhe/controller/UsersController.java
| 1 | 1 | package com.cnlive.shenhe.controller; |
| 2 | 2 | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 3 | 4 | import com.alibaba.fastjson.JSONObject; |
| 4 | -import com.cnlive.shenhe.bean.ErrorEnum; | |
| 5 | -import com.cnlive.shenhe.bean.ResponseBean; | |
| 6 | 5 | import com.cnlive.shenhe.bean.SessionUser; |
| 6 | +import com.cnlive.shenhe.dto.UsersDTO; | |
| 7 | 7 | import com.cnlive.shenhe.entity.ShySites; |
| 8 | 8 | import com.cnlive.shenhe.entity.ShyUsers; |
| 9 | -import com.cnlive.shenhe.entity.ShyUsersfree; | |
| 10 | 9 | import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; |
| 11 | 10 | import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; |
| 12 | 11 | import com.cnlive.shenhe.utils.CommonConst; |
| 13 | 12 | import com.cnlive.shenhe.utils.CommonUtils; |
| 14 | 13 | import com.github.pagehelper.PageInfo; |
| 15 | - | |
| 16 | 14 | import org.jasig.cas.client.authentication.AttributePrincipal; |
| 15 | +import org.slf4j.Logger; | |
| 16 | +import org.slf4j.LoggerFactory; | |
| 17 | 17 | import org.springframework.beans.factory.annotation.Autowired; |
| 18 | 18 | import org.springframework.stereotype.Controller; |
| 19 | 19 | import org.springframework.ui.Model; |
| 20 | -import org.springframework.web.bind.annotation.GetMapping; | |
| 21 | -import org.springframework.web.bind.annotation.PathVariable; | |
| 22 | -import org.springframework.web.bind.annotation.PostMapping; | |
| 23 | -import org.springframework.web.bind.annotation.RequestMapping; | |
| 24 | -import org.springframework.web.bind.annotation.ResponseBody; | |
| 20 | +import org.springframework.web.bind.annotation.*; | |
| 25 | 21 | |
| 22 | +import javax.servlet.http.HttpServletRequest; | |
| 23 | +import javax.servlet.http.HttpSession; | |
| 26 | 24 | import java.util.HashMap; |
| 27 | 25 | import java.util.List; |
| 28 | 26 | import java.util.Map; |
| 29 | 27 | |
| 30 | -import javax.print.attribute.HashAttributeSet; | |
| 31 | -import javax.servlet.http.HttpServletRequest; | |
| 32 | -import javax.servlet.http.HttpSession; | |
| 33 | - | |
| 34 | 28 | /** |
| 35 | 29 | * @Auther: liwei |
| 36 | 30 | * @Date: 2019/08/20 14:22 |
| ... | ... | @@ -40,6 +34,8 @@ import javax.servlet.http.HttpSession; |
| 40 | 34 | @RequestMapping("/users") |
| 41 | 35 | public class UsersController extends BaseController { |
| 42 | 36 | |
| 37 | + private static Logger logger = LoggerFactory.getLogger(UsersController.class); | |
| 38 | + | |
| 43 | 39 | @Autowired |
| 44 | 40 | UsersServiceImpl usersService; |
| 45 | 41 | @Autowired |
| ... | ... | @@ -55,7 +51,7 @@ public class UsersController extends BaseController { |
| 55 | 51 | public String index(HttpServletRequest request) { |
| 56 | 52 | AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal(); |
| 57 | 53 | if (CommonUtils.isNull(principal)) { |
| 58 | - return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://test.shen.cnlive.com:82/users/login"; | |
| 54 | + return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://shen.cnlive.com/users/login"; | |
| 59 | 55 | } |
| 60 | 56 | //用户ID |
| 61 | 57 | String id = principal.getName(); |
| ... | ... | @@ -71,7 +67,7 @@ public class UsersController extends BaseController { |
| 71 | 67 | sessionUser.setLogo(user.getUser_logo()); |
| 72 | 68 | sessionUser.setMaster(user.getMaster()); |
| 73 | 69 | request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser); |
| 74 | - return "redirect:http://test.shen.cnlive.com:82/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority="; | |
| 70 | + return "redirect:http://shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority="; | |
| 75 | 71 | } |
| 76 | 72 | } |
| 77 | 73 | return "page/error.html"; |
| ... | ... | @@ -80,22 +76,24 @@ public class UsersController extends BaseController { |
| 80 | 76 | @RequestMapping("/logout") |
| 81 | 77 | public String logout(HttpSession session) { |
| 82 | 78 | session.invalidate(); |
| 83 | - return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://test.shen.cnlive.com:82/users/login"; | |
| 79 | + return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://shen.cnlive.com/users/login"; | |
| 84 | 80 | } |
| 85 | 81 | |
| 86 | 82 | |
| 87 | 83 | @GetMapping(value = "/page") |
| 88 | - public String page(Model model, Integer page, Integer pageSize, String orderByClause, | |
| 89 | - String username, String mobile, Integer sp_id, String company_brief, HttpSession session) { | |
| 84 | + public String page(Model model, UsersDTO usersDTO, HttpSession session) { | |
| 85 | + logger.info("列表请求参数:{}", JSON.toJSONString(usersDTO)); | |
| 90 | 86 | SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); |
| 91 | 87 | if(CommonUtils.isNull(sessionUser)){ |
| 92 | 88 | return "redirect:/users/login"; |
| 93 | 89 | } |
| 94 | 90 | Integer spid = sessionUser.getSpid(); |
| 95 | - if (spid == 0) spid = null; | |
| 96 | - if (CommonUtils.isNull(page)) page = 1; | |
| 97 | - if (CommonUtils.isNull(pageSize)) pageSize = 10; | |
| 98 | - PageInfo<ShyUsers> usersPage = usersService.getPage(page, pageSize, orderByClause, username,mobile,sp_id,company_brief); | |
| 91 | + usersDTO.setSp_id(spid); | |
| 92 | + if (spid == 0) { | |
| 93 | + usersDTO.setSp_id(null); | |
| 94 | + } | |
| 95 | + | |
| 96 | + PageInfo<ShyUsers> usersPage = usersService.getPage(usersDTO); | |
| 99 | 97 | List<ShyUsers> list = usersPage.getList(); |
| 100 | 98 | JSONObject notice = CommonConst.NOTICE; |
| 101 | 99 | if (!list.isEmpty()) { |
| ... | ... | @@ -108,14 +106,14 @@ public class UsersController extends BaseController { |
| 108 | 106 | } |
| 109 | 107 | } |
| 110 | 108 | model.addAttribute("usersPage", usersPage); |
| 111 | - model.addAttribute("pageSize", pageSize); | |
| 109 | + model.addAttribute("pageSize", usersDTO.getPageSize()); | |
| 112 | 110 | model.addAttribute("notice", notice); |
| 113 | 111 | return "page/users.html"; |
| 114 | 112 | } |
| 115 | 113 | |
| 116 | 114 | /** |
| 117 | 115 | * 获取通知是否显示 |
| 118 | - * @param showType | |
| 116 | + * @param | |
| 119 | 117 | * @param session |
| 120 | 118 | * @return |
| 121 | 119 | */ |
| ... | ... | @@ -166,7 +164,7 @@ public class UsersController extends BaseController { |
| 166 | 164 | if (success) { |
| 167 | 165 | return "redirect:" + redirect_url; |
| 168 | 166 | } else { |
| 169 | - setmodel_result(model); | |
| 167 | + setmodelResult(model); | |
| 170 | 168 | return "error.html"; |
| 171 | 169 | } |
| 172 | 170 | } | ... | ... |