提交session 为空判断

王富生
1 parent 14519673
Showing 6 changed files with 68 additions and 44 deletions
pom.xml
src/main/java/com/zteits/oa/configuration/WebMvcConfig.java
src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java
src/main/java/com/zteits/oa/configuration/swagger/SwaggerConfigAuto.java
src/main/java/com/zteits/oa/report/web/AsraDailyController.java
src/main/resources/application.properties
@@ -10,11 +10,10 @@
 	<name>zteits_daily_report</name>
 	<description>Demo project for Spring Boot</description>
-
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.2.RELEASE</version>
+		<version>1.5.9.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
@@ -33,10 +32,6 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
@@ -49,9 +44,9 @@
 			<artifactId>spring-boot-starter-aop</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>org.springframework.boot</groupId>
-		    <artifactId>spring-boot-starter-redis</artifactId>
-		    <version>1.4.7.RELEASE</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-redis</artifactId>
+			<version>1.4.7.RELEASE</version>
 		</dependency>
 		<!-- spring session -->
 		<dependency>
@@ -77,17 +72,17 @@
 			<artifactId>hutool-all</artifactId>
 			<version>${hutool-all.version}</version>
 		</dependency>
-		<!--mybatis-->
+		<!--mybatis -->
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
 			<version>${org.mybatis.version}</version>
 		</dependency>
 		<dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper-spring-boot-starter.version}</version>
-            </dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>${pagehelper-spring-boot-starter.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
@@ -98,7 +93,7 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.47</version>
 		</dependency>
-		<!--swagger2-->
+		<!--swagger2 -->
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
@@ -110,26 +105,44 @@
 			<version>2.7.0</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.springframework.security</groupId>
-		    <artifactId>spring-security-web</artifactId>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
 		</dependency>
-		
 	</dependencies>
 	<build>
 		<defaultGoal>compile</defaultGoal>
-	   <finalName>zteits-oa</finalName>
+		<finalName>zteits-oa</finalName>
 		<plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>com.zteits.oa.DailyReportApplication</mainClass>
-                </configuration>
-                <version>1.3.5.RELEASE</version>
-            </plugin>
-
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<mainClass>com.zteits.oa.DailyReportApplication</mainClass>
+				</configuration>
+			</plugin>
+			 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
 		</plugins>
+		<!--  <resources>
+			<resource>
+				<directory>src/lib</directory>
+				<targetPath>BOOT-INF/lib/</targetPath>
+				<includes>
+					<include>**/*.jar</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<targetPath>BOOT-INF/classes/</targetPath>
+			</resource>
+		</resources>-->
 	</build>
@@ -2,7 +2,8 @@ package com.zteits.oa.configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -17,8 +18,13 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 	private Logger logger = LoggerFactory.getLogger(WebMvcConfig.class); 
-	@Autowired
-	private AuthInterceptor authInterceptor;
+	@Bean
+	AuthInterceptor  myInterceptor(){
+        return new AuthInterceptor();
+    }
+
+
+
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -34,8 +40,9 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 	 */
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
+		System.out.println("--begin 执行拦截器addInterceptors方法...");
 		//添加验证拦截器
-    	registry.addInterceptor(authInterceptor)
+    	registry.addInterceptor(myInterceptor())
     	   .addPathPatterns("/**")
     	   .excludePathPatterns("/oauth/**")
     	   .excludePathPatterns("/selectItem/**")
@@ -43,6 +50,8 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 			.excludePathPatterns("/swagger-resources/**")
 			.excludePathPatterns("/v2/**");
 	}
+	
+	
   }
@@ -35,7 +35,7 @@ import com.zteits.oa.api.dto.asraop.LoginOathRes;
  * ---------------------------------------------------------*
  * 2017/5/11      atao          v1.0.0          创建
  */
-@Component
+//@Component
 public class AuthInterceptor extends HandlerInterceptorAdapter {
     private static final Logger log = LoggerFactory.getLogger(AuthInterceptor.class);
@@ -16,7 +16,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration    // 配置注解，自动在本类上下文加载一些环境变量信息
 @EnableSwagger2   // 使swagger2生效
-public class SwaggerConfigAuto extends WebMvcConfigurationSupport{
+public class SwaggerConfigAuto{
 	@Bean
 	 public Docket buildDocket(){
@@ -48,7 +48,7 @@ public class AsraDailyController {
 		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
 		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
 		if(asraOpDTO == null){
-			throw new BizException(ErrorType.AUTH_TOKEN_NOT_EXISTS,"session过期或者已经失效");
+			throw new BizException(ErrorType.PARAMM_NULL,"session过期或者已经失效");
 		}
 		/**2.判断登录人和时间查询日报*/
 		Date dailyDate = DateUtil.parseDate(asraDailyQueryReq.getDailyDate());
@@ -73,7 +73,7 @@ public class AsraDailyController {
 		logger.info("--begin工时查询-当天填报人数统计(汇总),入参={}",JSONObject.toJSON(request));
 		AsraOpDTO asraOpDTO = (AsraOpDTO)servletRequest.getSession().getAttribute(SessionEnum.USER_INFO.key());
 		if(asraOpDTO == null ){
-			throw new BizException(ErrorType.AUTH_TOKEN_NOT_EXISTS,"获取session为空");
+			throw new BizException(ErrorType.PARAMM_NULL,"获取session为空");
 		}
 		request.setOpIds(asraOpDTO.getOpIds());
 		BizResult<AsraDailyOpNumForCurrentDayDTO> result = asraDailyQueryService.queryAsraDailyOpNumForCurrentDay(request);
@@ -94,7 +94,7 @@ public class AsraDailyController {
 		logger.info("--begin工时查询-所有员工及自己或者自己日报,入参={}",JSONObject.toJSON(request));
 		AsraOpDTO asraOpDTO = (AsraOpDTO)servletRequest.getSession().getAttribute(SessionEnum.USER_INFO.key());
 		if(asraOpDTO == null ){
-			throw new BizException(ErrorType.AUTH_TOKEN_NOT_EXISTS,"获取session为空");
+			throw new BizException(ErrorType.PARAMM_NULL,"获取session为空");
 		}
 		request.setOpIds(asraOpDTO.getOpIds());
 		BizResult<QueryAsraDailyAllForListReqDTO> result = asraDailyQueryService.queryAsraDailyAllForList(request);
@@ -110,7 +110,7 @@ public class AsraDailyController {
 		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
 		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
 		if(asraOpDTO == null ){
-			throw new BizException(ErrorType.AUTH_TOKEN_NOT_EXISTS,"获取session为空");
+			throw new BizException(ErrorType.PARAMM_NULL,"获取session为空");
 		}
 		/**2.判断登录人和时间查询日报*/
 		Date dailyDate = DateUtil.parseDate(asraDailySaveOrUpdateReq.getDailyDate());
@@ -12,12 +12,14 @@ local.base.url=http://pay.service.rnting.com
 druid.driverClass=com.mysql.jdbc.Driver
-druid.url=jdbc:mysql://192.168.1.167:3306/zt_asra?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
-druid.username=root
-druid.password=root
-#druid.url=jdbc:mysql://47.96.41.38:3306/zt_order_n?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
-#druid.username=order
-#druid.password=MySQL5.7@123
+#druid.url=jdbc:mysql://192.168.1.167:3306/zt_asra?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+#druid.username=root
+#druid.password=root
+druid.url=jdbc:mysql://47.96.41.38:3306/zt_asra?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+druid.username=asra
+druid.password=MySQL57@123
+
+
 druid.initialSize=1
 druid.minIdle=1