Merge branch 'master' of http://192.168.57.38:3000/wenhongquan/VisualInspection

# Conflicts:
#	Visuallnspection_fjq/visuallnspectioninteface/.idea/workspace.xml

VisualInspection_server/pom.xml

@@ -28,6 +28,24 @@
 
 	<dependencies>
 		<dependency>
+			<groupId>com.xintong.visuallnspection.inteface</groupId>
+			<artifactId>visuallnspectioninteface</artifactId>
+			<version>1.0</version>
+			<exclusions>  <exclusion>
+				<artifactId>spring-boot-starter-parent</artifactId>
+				<groupId>org.springframework.boot</groupId>
+			</exclusion>
+				<exclusion>
+					<artifactId>spring-boot-starter-web</artifactId>
+					<groupId>org.springframework.boot</groupId>
+				</exclusion>
+
+				<exclusion>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok</artifactId></exclusion></exclusions>
+		</dependency>
+
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
@@ -72,6 +90,9 @@
 		</dependency>
 
 
+
+
+
 		<!--<dependency> -->
 		<!--<groupId>org.springframework.session</groupId> -->
 		<!--<artifactId>spring-session-data-redis</artifactId> -->
@@ -181,6 +202,34 @@
 			<scope>test</scope>
 		</dependency>
 
+
+
+
+
+
+		<!--dubbo-->
+		<dependency>
+			<groupId>org.apache.zookeeper</groupId>
+			<artifactId>zookeeper</artifactId>
+			<version>3.4.11</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.sgroschupf</groupId>
+			<artifactId>zkclient</artifactId>
+			<version>0.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba.boot</groupId>
+			<artifactId>dubbo-spring-boot-starter</artifactId>
+			<version>0.1.0</version>
+		</dependency>
+
+
+
+
+
 	</dependencies>
 
 	<dependencyManagement>

VisualInspection_server/src/main/java/com/xintong/SystemInit.java

@@ -1,5 +1,6 @@
 package com.xintong;
 
+import com.xintong.visualinspection.service.UserService;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -7,7 +8,6 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import com.xintong.visualinspection.service.ConstantService;
 import com.xintong.visualinspection.service.DepartmentService;
 import com.xintong.visualinspection.service.JobService;
-import com.xintong.visualinspection.service.UserService;
 import com.xintong.visualinspection.service.impl.ConstantServiceImpl;
 import com.xintong.visualinspection.service.impl.DepartmentServiceImpl;
 import com.xintong.visualinspection.service.impl.JobServiceImpl;

VisualInspection_server/src/main/java/com/xintong/system/securityTools/JwtAuthenticationTokenFilter.java

@@ -1,16 +1,16 @@
 package com.xintong.system.securityTools;
 
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.dubbo.config.annotation.Service;
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -20,10 +20,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import com.alibaba.fastjson.JSON;
-import com.xintong.visualinspection.bean.User;
 
 @Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
+public class JwtAuthenticationTokenFilter extends OncePerRequestFilter  {
 
 	@Autowired
 	private UserDetailsService userDetailsService;
@@ -62,8 +61,8 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
 				if (u != null) {
 					UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
 
-					User u_t = (User) JSON.parseObject(JSON.toJSONString(u),User.class) ; 
-	                //判定token中的用户名是否数据库中一致 是与缓存中的用户token一致
+					User u_t = (User) JSON.parseObject(JSON.toJSONString(u),User.class) ;
+					//判定token中的用户名是否数据库中一致 是与缓存中的用户token一致
 					if (jwtTokenUtil.validateToken(authToken, userDetails)&& authToken.equals(u_t.getToken())) {
 						((User)userDetails).setToken(u_t.getToken());
 						redisCacheUtil.setUser(username, userDetails, expiration);
@@ -79,4 +78,5 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
 
 		chain.doFilter(request, response);
 	}
+
 }

VisualInspection_server/src/main/java/com/xintong/system/securityTools/JwtTokenUtil.java

@@ -1,5 +1,6 @@
 package com.xintong.system.securityTools;
 
+import com.xintong.visualinspection.bean.User;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -7,8 +8,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
-import com.xintong.visualinspection.bean.User;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;

VisualInspection_server/src/main/java/com/xintong/system/securityTools/RedisCacheUtil.java

@@ -7,8 +7,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
-import com.xintong.visualinspection.bean.User;
-
 @Component
 public class RedisCacheUtil {
 	@Autowired

VisualInspection_server/src/main/java/com/xintong/system/securityTools/WebSecurityConfig.java

@@ -1,5 +1,6 @@
 package com.xintong.system.securityTools;
 
+import com.xintong.visualinspection.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,8 +15,6 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-import com.xintong.visualinspection.service.UserService;
-
 /**
  * 文件名：WebSecurityConfig
  * 版本信息：日期：2017/3/31 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/BaseController.java

@@ -7,12 +7,12 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.xintong.visualinspection.bean.User;
 import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
@@ -26,8 +26,6 @@ import com.xintong.system.err.BusinessException;
 import com.xintong.system.err.ErrorCode;
 import com.xintong.system.securityTools.JwtTokenUtil;
 import com.xintong.system.securityTools.RedisCacheUtil;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.service.impl.CheckAppealServiceImpl;
 import com.xintong.visualinspection.util.CacheUtil;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckAppealController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,7 +18,6 @@ import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.CheckAppeal;
 import com.xintong.visualinspection.bean.Task;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CheckAppealService;
 import com.xintong.visualinspection.service.TaskService;
 import com.xintong.visualinspection.util.AuthorUtil;

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckApplyController.java

@@ -7,6 +7,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.github.pagehelper.Page;
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +21,6 @@ import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.CheckApply;
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Task;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CheckApplyService;
 import com.xintong.visualinspection.service.TaskService;
 import com.xintong.visualinspection.util.AuthorUtil;
@@ -223,8 +224,8 @@ public class CheckApplyController extends BaseController {
     
     @RequestMapping(value = "/getList/{page}/{size}")
     public String getList(HttpServletRequest request,@RequestBody CheckApply param ,@PathVariable Integer page,@PathVariable Integer size){
-    	PageHelper.startPage(page, size);
-    	User user = getCurrentUser(request);
+		final Page<Object> objects = PageHelper.startPage(page, size);
+		User user = getCurrentUser(request);
     	if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
     		param.setApply_man(new Long(user.getId()));
     	}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckOtherController.java

@@ -6,7 +6,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import com.xintong.visualinspection.pojo.OtherCheckStatistics;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,15 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xintong.system.err.BusinessException;
-import com.xintong.visualinspection.bean.CheckAppeal;
 import com.xintong.visualinspection.bean.CheckOther;
-import com.xintong.visualinspection.bean.Task;
-import com.xintong.visualinspection.bean.Team;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CheckOtherService;
 import com.xintong.visualinspection.util.CodeUtil;
-import com.xintong.visualinspection.util.Constants;
 
 /**
  * 文件名：CheckItemController 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/ConstantController.java

@@ -15,7 +15,6 @@ import com.github.pagehelper.PageInfo;
 import com.mysql.jdbc.StringUtils;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.ConstantService;
 import com.xintong.visualinspection.util.CacheUtil;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.bean.WreckerGroup;
 import com.xintong.visualinspection.service.DepartmentService;
 import com.xintong.visualinspection.util.CacheUtil;

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/MenuController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +17,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.Menu;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.MenuService;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/PermissionController.java

@@ -2,11 +2,8 @@ package com.xintong.visualinspection.controller;
 
 import java.util.List;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,13 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
-import com.xintong.system.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.pojo.RolePermision;
-import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.PermissionService;
-import com.xintong.visualinspection.service.UserService;
 
 /**
  * 文件名：TestController

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/RoleController.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.xintong.visualinspection.bean.Role;
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,8 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
-import com.xintong.visualinspection.bean.Role;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.pojo.RoleData;
 import com.xintong.visualinspection.service.RoleService;
 
@@ -94,6 +94,7 @@ public class RoleController extends BaseController {
 	@RequestMapping(value = "/get/all", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
 	public String getAllRole(HttpServletRequest request) {
 		try {
+
 			User u = getCurrentUser(request);
 			List<Role> roles = roleService.getRoles(new Role(),u);
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/ScoreController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,10 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.xintong.system.err.BusinessException;
-import com.xintong.visualinspection.bean.CheckApply;
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Score;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.ScoreService;
 import com.xintong.visualinspection.util.CodeUtil;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TaskController.java

@@ -5,6 +5,7 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.xintong.visualinspection.bean.*;
 import com.xintong.visualinspection.pojo.TaskListByDeptAppeal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -12,12 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
-import com.xintong.visualinspection.bean.CheckAppeal;
-import com.xintong.visualinspection.bean.Score;
-import com.xintong.visualinspection.bean.Task;
-import com.xintong.visualinspection.bean.TaskStatus;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.bean.UserClassCount;
 import com.xintong.visualinspection.service.CheckAppealService;
 import com.xintong.visualinspection.service.ScoreService;
 import com.xintong.visualinspection.service.TaskService;

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamClassController.java

@@ -1,22 +1,20 @@
 package com.xintong.visualinspection.controller;
 
-import java.util.Calendar;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.github.pagehelper.util.StringUtil;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.ClassCode;
 import com.xintong.visualinspection.bean.Team;
 import com.xintong.visualinspection.bean.TeamClass;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.TeamClassService;
 import com.xintong.visualinspection.service.TeamService;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamController.java

@@ -5,8 +5,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +16,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.Team;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.TeamService;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TestController.java

@@ -1,24 +1,17 @@
 package com.xintong.visualinspection.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.xintong.visualinspection.bean.Msg;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.expression.SecurityExpressionRoot;
-import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Array;
-import java.util.List;
 
 /**
  * 文件名：TestController

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserClassController.java

@@ -2,6 +2,7 @@ package com.xintong.visualinspection.controller;
 
 import java.util.List;
 
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -9,9 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xintong.system.err.BusinessException;
-import com.xintong.visualinspection.bean.TeamClass;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.bean.UserClass;
 import com.xintong.visualinspection.service.UserClassService;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
@@ -18,10 +20,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.system.securityTools.RedisCacheUtil;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.RoleService;
-import com.xintong.visualinspection.service.UserService;
 import com.xintong.visualinspection.util.CacheUtil;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -2,14 +2,9 @@ package com.xintong.visualinspection.dao.cluster;
 
 import java.util.List;
 
+import com.xintong.visualinspection.bean.*;
 import org.apache.ibatis.annotations.Mapper;
 
-import com.xintong.visualinspection.bean.FeeStation;
-import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.bean.StatisticsBean;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.bean.WreckerGroup;
-
 /**
  * 文件名：UserInfoDao
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/RoleDao.java

@@ -3,9 +3,9 @@ package com.xintong.visualinspection.dao.master;
 import java.util.List;
 import java.util.Map;
 
+import com.xintong.visualinspection.bean.Role;
 import org.apache.ibatis.annotations.Mapper;
 
-import com.xintong.visualinspection.bean.Role;
 import com.xintong.visualinspection.pojo.RoleData;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/UserDao.java

@@ -2,7 +2,6 @@ package com.xintong.visualinspection.dao.master;
 
 import com.xintong.visualinspection.bean.User;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/RoleData.java

@@ -1,7 +1,6 @@
 package com.xintong.visualinspection.pojo;
 
 import com.xintong.visualinspection.bean.Role;
-
 import lombok.Data;
 
 @Data

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/StatisiticPojo.java

@@ -1,6 +1,5 @@
 package com.xintong.visualinspection.pojo;
 
-import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.bean.UserStatistic;
 import lombok.Data;

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/UserClassCheck.java

@@ -3,7 +3,6 @@ package com.xintong.visualinspection.pojo;
 import java.util.List;
 
 import com.xintong.visualinspection.bean.User;
-
 import lombok.Data;
 
 @Data

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/AuthService.java

@@ -3,6 +3,6 @@ package com.xintong.visualinspection.service;
 import com.xintong.visualinspection.bean.User;
 
 public interface AuthService {
-	 public  User login(String username, String password);
+	 public User login(String username, String password);
 	 public  String refresh(String oldToken);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/MenuService.java

@@ -10,7 +10,7 @@ import com.xintong.visualinspection.bean.User;
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface MenuService {
-    public List<Menu> getMenus(Menu menu,User user,Integer judge);
+    public List<Menu> getMenus(Menu menu, User user, Integer judge);
     public List<Menu> getMenuByParent(Menu menu);
     public void insert(Menu menu);
     public void update(Menu menu);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/RoleService.java

@@ -1,7 +1,6 @@
 package com.xintong.visualinspection.service;
 
 import java.util.List;
-import java.util.Map;
 
 import com.xintong.visualinspection.bean.Role;
 import com.xintong.visualinspection.bean.User;
@@ -11,7 +10,7 @@ import com.xintong.visualinspection.pojo.RoleData;
  * 文件名：UserService 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface RoleService {
-	public List<Role> getRoles(Role role,User u);
+	public List<Role> getRoles(Role role, User u);
 
 	public void insert(Role role);
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TaskService.java

@@ -1,7 +1,6 @@
 package com.xintong.visualinspection.service;
 
 import java.util.List;
-import java.util.Map;
 
 import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.bean.TaskStatus;

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamService.java

@@ -2,7 +2,6 @@ package com.xintong.visualinspection.service;
 
 import java.util.List;
 
-import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Team;
 import com.xintong.visualinspection.bean.User;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/AuthServiceImpl.java

@@ -1,10 +1,8 @@
 package com.xintong.visualinspection.service.impl;
 
-import java.util.concurrent.TimeUnit;
-
+import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -14,7 +12,6 @@ import org.springframework.stereotype.Service;
 
 import com.xintong.system.securityTools.JwtTokenUtil;
 import com.xintong.system.securityTools.RedisCacheUtil;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.BaseService;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckAppealServiceImpl.java

@@ -1,18 +1,16 @@
 package com.xintong.visualinspection.service.impl;
 
-import java.util.HashMap;
 import java.util.List;
 
+import com.xintong.visualinspection.service.UserService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.CheckAppeal;
-import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.dao.master.CheckAppealDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.CheckAppealService;
-import com.xintong.visualinspection.service.UserService;
 import com.xintong.visualinspection.util.CacheUtil;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/DepartmentServiceImpl.java

@@ -5,15 +5,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.xintong.visualinspection.bean.*;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.xintong.visualinspection.bean.FeeStation;
-import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.bean.Role;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.bean.WreckerGroup;
 import com.xintong.visualinspection.dao.cluster.DepartmentDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.DepartmentService;

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/MenuServiceImpl.java

@@ -6,13 +6,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.xintong.visualinspection.bean.User;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.Menu;
 import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.master.MenuDao;
 import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.service.BaseService;
@@ -36,7 +36,7 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 	private PermissionDao permissionDao;
 
 	@Override
-	public List<Menu> getMenus(Menu menu,User user,Integer judge) {
+	public List<Menu> getMenus(Menu menu, User user, Integer judge) {
 		
 		List<Menu> menus = 	menuDao.getMenu(menu);
 		if(judge==null || judge.intValue()==0){

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/RoleServiceImpl.java

@@ -5,13 +5,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.xintong.visualinspection.bean.Role;
+import com.xintong.visualinspection.bean.User;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.Role;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.RoleDao;
 import com.xintong.visualinspection.pojo.RoleData;

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/TeamClassServiceImpl.java

@@ -1,10 +1,9 @@
 package com.xintong.visualinspection.service.impl;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
+import com.xintong.visualinspection.bean.User;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,11 +11,9 @@ import org.springframework.stereotype.Service;
 import com.github.pagehelper.util.StringUtil;
 import com.xintong.visualinspection.bean.ClassCode;
 import com.xintong.visualinspection.bean.TeamClass;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.cluster.UserInfoDao;
 import com.xintong.visualinspection.dao.master.TeamClassDao;
 import com.xintong.visualinspection.dao.master.UserCountDao;
-import com.xintong.visualinspection.dao.master.UserDao;
 import com.xintong.visualinspection.pojo.UserClassCheck;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.TeamClassService;

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/TeamServiceImpl.java

@@ -3,17 +3,17 @@ package com.xintong.visualinspection.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.UserService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.druid.util.StringUtils;
 import com.xintong.visualinspection.bean.Team;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.master.TeamDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.TeamService;
-import com.xintong.visualinspection.service.UserService;
 import com.xintong.visualinspection.util.CacheUtil;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserServiceImpl.java

@@ -3,6 +3,9 @@ package com.xintong.visualinspection.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.xintong.visualinspection.bean.Role;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.UserService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -11,19 +14,14 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import com.mysql.jdbc.StringUtils;
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.Role;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.cluster.UserInfoDao;
 import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.RoleDao;
 import com.xintong.visualinspection.dao.master.UserDao;
 import com.xintong.visualinspection.pojo.SimpleGrantedAuthority;
 import com.xintong.visualinspection.service.BaseService;
-import com.xintong.visualinspection.service.UserService;
-import com.xintong.visualinspection.util.CacheUtil;
 import com.xintong.visualinspection.util.CodeUtil;
 
 import lombok.Data;
@@ -34,6 +32,12 @@ import lombok.Data;
  */
 @Service
 @Data
+@com.alibaba.dubbo.config.annotation.Service(
+		version = "1.0.0",
+		application = "${dubbo.application.id}",
+		protocol = "${dubbo.protocol.id}",
+		registry = "${dubbo.registry.id}"
+)
 public class UserServiceImpl extends BaseService implements UserService {
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(UserService.class);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/WebcamServiceImpl.java

@@ -2,6 +2,7 @@ package com.xintong.visualinspection.service.impl;
 
 import java.util.List;
 
+import com.xintong.visualinspection.service.UserService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -9,7 +10,6 @@ import org.springframework.stereotype.Service;
 import com.xintong.visualinspection.bean.Webcam;
 import com.xintong.visualinspection.dao.cluster.WebcamDao;
 import com.xintong.visualinspection.service.BaseService;
-import com.xintong.visualinspection.service.UserService;
 import com.xintong.visualinspection.service.WebcamService;
 
 /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/CacheUtil.java

@@ -5,16 +5,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.UserService;
 import org.slf4j.LoggerFactory;
 
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Job;
 import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.ConstantService;
 import com.xintong.visualinspection.service.DepartmentService;
 import com.xintong.visualinspection.service.JobService;
-import com.xintong.visualinspection.service.UserService;
 
 public class CacheUtil {
 

VisualInspection_server/src/main/resources/application.properties

@@ -117,6 +117,28 @@ management.shell.auth.type=simple
 
 
 
+# Base packages to scan Dubbo Components (e.g., @Service, @Reference)
+dubbo.scan.basePackages  = com.xintong.visualinspection.service
+
+# Dubbo Config properties
+## ApplicationConfig Bean
+dubbo.application.id = jicha_base-provider
+dubbo.application.name = jicha_base-provider
+dubbo.reference.check = false
+
+# ProtocolConfig Bean
+dubbo.protocol.id = dubbo
+dubbo.protocol.name = dubbo
+dubbo.protocol.port = 7682
+dubbo.protocol.status = server
+
+## RegistryConfig Bean
+dubbo.registry.id = demoservice
+dubbo.registry.address = zookeeper://git.topm.win:9994
+
+
+
+
 
 
 

Visuallnspection_fjq/visuallnspection_fjq/pom.xml

@@ -25,6 +25,24 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.xintong.visuallnspection.inteface</groupId>
+            <artifactId>visuallnspectioninteface</artifactId>
+            <version>1.0</version>
+            <exclusions>  <exclusion>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <groupId>org.springframework.boot</groupId>
+            </exclusion>
+                <exclusion>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+
+                <exclusion>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId></exclusion></exclusions>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -41,33 +59,15 @@
             <version>1.3.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-remote-shell</artifactId>
-        </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
 
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-        </dependency>
 
 
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>0.7.0</version>
-        </dependency>
+
+
+
 
 
         <!--<dependency> -->
@@ -179,6 +179,29 @@
             <scope>test</scope>
         </dependency>
 
+
+
+
+
+        <!--dubbo-->
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.4.11</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.sgroschupf</groupId>
+            <artifactId>zkclient</artifactId>
+            <version>0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.boot</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+            <version>0.1.0</version>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/VisuallnspectionFjqApplication.java

@@ -1,12 +1,23 @@
 package com.xintong.visualinspection.visuallnspection_fjq;
 
+import com.alibaba.fastjson.parser.ParserConfig;
+import org.apache.ibatis.logging.LogFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.scheduling.annotation.EnableAsync;
 
-@SpringBootApplication
+@SpringBootApplication(exclude={DataSourceAutoConfiguration.class,HibernateJpaAutoConfiguration.class})
+@ServletComponentScan
 public class VisuallnspectionFjqApplication {
 
     public static void main(String[] args) {
+        ParserConfig.getGlobalInstance().addAccept("com.xintong.");
+        ParserConfig.getGlobalInstance().addAccept("org.springframework.security.core.");
+
+        LogFactory.useLog4JLogging();
         SpringApplication.run(VisuallnspectionFjqApplication.class, args);
     }
 }

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/securityTools/FastJson2JsonRedisSerializer.java

@@ -1,41 +0,0 @@
-package com.xintong.visualinspection.visuallnspection_fjq.securityTools;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
-
-import java.nio.charset.Charset;
-
-/**
- * 文件名：FastJson2JsonRedisSerializer
- * 版本信息：日期：2017/4/25 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
- */
-public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
-
-    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-
-    private Class<T> clazz;
-
-    public FastJson2JsonRedisSerializer(Class<T> clazz) {
-        super();
-        this.clazz = clazz;
-    }
-
-    public byte[] serialize(T t) throws SerializationException {
-        if (t == null) {
-            return new byte[0];
-        }
-        return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
-    }
-
-    public T deserialize(byte[] bytes) throws SerializationException {
-        if (bytes == null || bytes.length <= 0) {
-            return null;
-        }
-        String str = new String(bytes, DEFAULT_CHARSET);
-
-        return (T) JSON.parseObject(str, clazz);
-    }
-
-}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/securityTools/JwtAuthenticationTokenFilter.java

@@ -1,78 +0,0 @@
-package com.xintong.visualinspection.visuallnspection_fjq.securityTools;
-
-import com.alibaba.fastjson.JSON;
-import com.xintong.visualinspection.bean.User;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
-
-	@Autowired
-	private UserDetailsService userDetailsService;
-
-	@Autowired
-	private JwtTokenUtil jwtTokenUtil;
-	
-	@Autowired
-	private RedisCacheUtil redisCacheUtil;
-	
-
-	@Value("${jwt.header}")
-	private String tokenHeader;
-	
-	@Value("${jwt.expiration}")
-	private int expiration;
-	
-
-	@Value("${jwt.tokenHead}")
-	private String tokenHead;
-
-	@Override
-	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-			throws ServletException, IOException {
-		String authHeader = request.getHeader(this.tokenHeader);
-		if (authHeader != null && authHeader.startsWith(tokenHead)) {
-			final String authToken = authHeader.substring(tokenHead.length()); // The  part after "XingTong "
-			String username = jwtTokenUtil.getUsernameFromToken(authToken);
-
-			logger.info("checking authentication " + username);
-
-			if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
-
-				UserDetails u = redisCacheUtil.getUserByUserName(username);
-				// 验证是否跟缓存中有无
-				if (u != null) {
-					UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
-
-					User u_t = (User) JSON.parseObject(JSON.toJSONString(u),User.class) ; 
-	                //判定token中的用户名是否数据库中一致 是与缓存中的用户token一致
-					if (jwtTokenUtil.validateToken(authToken, userDetails)&& authToken.equals(u_t.getToken())) {
-						((User)userDetails).setToken(u_t.getToken());
-						redisCacheUtil.setUser(username, userDetails, expiration);
-						UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
-								userDetails, null, userDetails.getAuthorities());
-						authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-						logger.info("authenticated user " + username + ", setting security context");
-						SecurityContextHolder.getContext().setAuthentication(authentication);
-					}
-				}
-			}
-		}
-
-		chain.doFilter(request, response);
-	}
-}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/securityTools/JwtTokenUtil.java

@@ -1,133 +0,0 @@
-package com.xintong.visualinspection.visuallnspection_fjq.securityTools;
-
-import com.xintong.visualinspection.bean.User;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-public class JwtTokenUtil implements Serializable {
-
-    private static final long serialVersionUID = -3301605591108950415L;
-
-    private static final String CLAIM_KEY_USERNAME = "sub";
-    private static final String CLAIM_KEY_CREATED = "created";
-
-    @Value("${jwt.secret}")
-    private String secret;
-
-    @Value("${jwt.expiration}")
-    private Long expiration;
-
-    public String getUsernameFromToken(String token) {
-        String username;
-        try {
-            final Claims claims = getClaimsFromToken(token);
-            username = claims.getSubject();
-        } catch (Exception e) {
-            username = null;
-        }
-        return username;
-    }
-
-    public Date getCreatedDateFromToken(String token) {
-        Date created;
-        try {
-            final Claims claims = getClaimsFromToken(token);
-            created = new Date((Long) claims.get(CLAIM_KEY_CREATED));
-        } catch (Exception e) {
-            created = null;
-        }
-        return created;
-    }
-
-    public Date getExpirationDateFromToken(String token) {
-        Date expiration;
-        try {
-            final Claims claims = getClaimsFromToken(token);
-            expiration = claims.getExpiration();
-        } catch (Exception e) {
-            expiration = null;
-        }
-        return expiration;
-    }
-
-    private Claims getClaimsFromToken(String token) {
-        Claims claims;
-        try {
-            claims = Jwts.parser()
-                    .setSigningKey(secret)
-                    .parseClaimsJws(token)
-                    .getBody();
-        } catch (Exception e) {
-            claims = null;
-        }
-        return claims;
-    }
-
-    private Date generateExpirationDate() {
-        return new Date(System.currentTimeMillis() + expiration * 1000);
-    }
-
-    private Boolean isTokenExpired(String token) {
-        final Date expiration = getExpirationDateFromToken(token);
-        return expiration.before(new Date());
-    }
-
-    private Boolean isCreatedBeforeLastPasswordReset(Date created, Date lastPasswordReset) {
-        return (lastPasswordReset != null && created.before(lastPasswordReset));
-    }
-
-    public String generateToken(UserDetails userDetails) {
-        Map<String, Object> claims = new HashMap<>();
-        claims.put(CLAIM_KEY_USERNAME, userDetails.getUsername());
-        claims.put(CLAIM_KEY_CREATED, new Date());
-        return generateToken(claims);
-    }
-
-    String generateToken(Map<String, Object> claims) {
-        return Jwts.builder()
-                .setClaims(claims)
-                .setExpiration(generateExpirationDate())
-                .signWith(SignatureAlgorithm.HS512, secret)
-                .compact();
-    }
-
-    public Boolean canTokenBeRefreshed(String token, Date lastPasswordReset) {
-        final Date created = getCreatedDateFromToken(token);
-        return !isCreatedBeforeLastPasswordReset(created, lastPasswordReset)
-                && !isTokenExpired(token);
-    }
-
-    public String refreshToken(String token) {
-        String refreshedToken;
-        try {
-            final Claims claims = getClaimsFromToken(token);
-            claims.put(CLAIM_KEY_CREATED, new Date());
-            refreshedToken = generateToken(claims);
-        } catch (Exception e) {
-            refreshedToken = null;
-        }
-        return refreshedToken;
-    }
-    // 只是判定用户名是否一致 不去判定是否失效
-    public Boolean validateToken(String token, UserDetails userDetails) {
-        User user = (User) userDetails;
-        final String username = getUsernameFromToken(token);
-//        final Date created = getCreatedDateFromToken(token);
-        //final Date expiration = getExpirationDateFromToken(token);
-        return username.equals(user.getUsername());
-//        return (
-//                username.equals(user.getUsername())
-//                        && !isTokenExpired(token)
-//                        && !isCreatedBeforeLastPasswordReset(created, null));
-    }
-}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/securityTools/RedisCacheUtil.java

@@ -1,29 +0,0 @@
-package com.xintong.visualinspection.visuallnspection_fjq.securityTools;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.TimeUnit;
-
-@Component
-public class RedisCacheUtil {
-	@Autowired
-	private RedisTemplate redisTemplate;
-	
-	
-	public UserDetails getUserByUserName(String username){
-		return (UserDetails)redisTemplate.opsForValue().get(username);
-	}
-	
-	public void setUser(String username,UserDetails user,int timeout){
-		redisTemplate.opsForValue().set(username, user, timeout, TimeUnit.MILLISECONDS);
-	}
-	
-	public void removeForUserName(String username){
-		redisTemplate.delete(username);
-	}
-	
-
-}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/securityTools/RedisConf.java

@@ -1,66 +0,0 @@
-package com.xintong.visualinspection.visuallnspection_fjq.securityTools;
-
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.interceptor.KeyGenerator;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.RedisSerializer;
-
-import java.lang.reflect.Method;
-
-/**
- * 文件名：RedisConf
- * 版本信息：日期：2017/4/25 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
- */
-@Configuration
-@EnableCaching
-public class RedisConf extends CachingConfigurerSupport{
-
-    @Bean
-    public KeyGenerator keyGenerator(){
-        return new KeyGenerator() {
-            @Override
-            public Object generate(Object target, Method method, Object... params) {
-                StringBuilder sb = new StringBuilder();
-
-                sb.append(target.getClass().getName());
-                sb.append(method.getName());
-                for (Object obj : params) {
-                    sb.append(obj.toString());
-                }
-                return sb.toString();
-            }
-        };
-
-    }
-
-    @Bean
-    public CacheManager cacheManager(
-            @SuppressWarnings("rawtypes") RedisTemplate redisTemplate) {
-        return new RedisCacheManager(redisTemplate);
-    }
-
-    @Bean
-    @SuppressWarnings("rawtypes")
-    public RedisSerializer fastJson2JsonRedisSerializer() {
-        return new FastJson2JsonRedisSerializer<Object>(Object.class);
-    }
-
-    @Bean
-    @SuppressWarnings("rawtypes")
-    public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory factory, RedisSerializer fastJson2JsonRedisSerializer) {
-        StringRedisTemplate template = new StringRedisTemplate(factory);
-
-        template.setValueSerializer(fastJson2JsonRedisSerializer);
-
-        template.afterPropertiesSet();
-        return template;
-    }
-
-}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/securityTools/WebMvcConfig.java

@@ -1,18 +0,0 @@
-package com.xintong.visualinspection.visuallnspection_fjq.securityTools;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-/**
- * 文件名：WebMvcConfig
- * 版本信息：日期：2017/3/31 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
- */
-@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
-
-    @Override
-    public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/login").setViewName("login");
-    }
-}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/securityTools/WebSecurityConfig.java

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.visuallnspection_fjq.securityTools;
 
+import com.alibaba.dubbo.config.annotation.Reference;
 import com.xintong.visualinspection.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -24,17 +25,9 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 @EnableGlobalMethodSecurity(securedEnabled = true,prePostEnabled=true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Autowired
-    private UserService userService;
-
-    @Bean
-    public JwtAuthenticationTokenFilter authenticationTokenFilterBean() throws Exception {
-        return new JwtAuthenticationTokenFilter();
-    }
     
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(userService).passwordEncoder(passwordEncoder());//user Details Service验证
     }
 
     @Override
@@ -65,18 +58,15 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                  "/**/*.js"
          ).permitAll()
          // 对于获取token的rest api要允许匿名访问
-         .antMatchers("/user/auth/**","/file/**","/druid/**").permitAll()
+         .antMatchers("/**").permitAll()
          // 除上面外的所有请求全部需要鉴权认证
          .anyRequest().authenticated();
     	
     	// 禁用缓存
         http.headers().cacheControl();
-        
-        http
-        .addFilterBefore(authenticationTokenFilterBean(), UsernamePasswordAuthenticationFilter.class);
-    	
-    	
-  
+
+
+
     }
 
     /**

Visuallnspection_fjq/visuallnspection_fjq/src/main/resources/application.properties

@@ -0,0 +1,21 @@
+server.port = 9000
+spring.thymeleaf.cache=false
+
+# Base packages to scan Dubbo Components (e.g., @Service, @Reference)
+dubbo.scan.basePackages  = com.xintong.visualinspection.service
+
+# Dubbo Config properties
+## ApplicationConfig Bean
+dubbo.application.id = jicha_fjq-provider_consumer
+dubbo.application.name = jicha_fjq-provider_consumer
+
+# ProtocolConfig Bean
+dubbo.protocol.id = dubbo
+dubbo.protocol.name = dubbo
+dubbo.protocol.port = 7682
+dubbo.protocol.status = server
+
+## RegistryConfig Bean
+dubbo.registry.id = demoservice
+dubbo.registry.address = zookeeper://git.topm.win:9994
+

Visuallnspection_fjq/visuallnspectioninteface/.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+  </component>
+</project>

Visuallnspection_fjq/visuallnspectioninteface/.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

Visuallnspection_fjq/visuallnspectioninteface/.idea/workspace.xml

@@ -13,11 +13,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="798">
-              <caret line="42" selection-start-line="42" selection-end-line="42" />
+            <state relative-caret-position="342">
+              <caret line="18" column="20" lean-forward="true" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="UserService.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/UserService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="323">
+              <caret line="22" column="40" lean-forward="true" selection-start-line="22" selection-start-column="40" selection-end-line="22" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -27,7 +36,13 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/DemoService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/filter/JwtAuthenticationTokenFilterInterface.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/User.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/Role.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/UserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/AuthService.java" />
       </list>
     </option>
   </component>
@@ -50,17 +65,30 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="205" />
     <option name="y" value="403" />
     <option name="width" value="1640" />
     <option name="height" value="956" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="PackagesPane" proportions="" version="1">
+    <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="AndroidView" />
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="visuallnspectioninteface" type="58d84e3e:PackageViewProjectNode" />
+              <item name="visuallnspectioninteface" type="616d4139:PackageViewModuleNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -68,13 +96,58 @@
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
               <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
+              <item name="bean" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -85,6 +158,13 @@
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
+  <component name="RecentsManager">
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.xintong.visualinspection.service" />
+      <recent name="com.xintong.visuallnspection.bean" />
+      <recent name="com.xintong.visuallnspection.service" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -168,44 +248,49 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1522662684790</updated>
-      <workItem from="1522662689077" duration="39000" />
-      <workItem from="1522721071000" duration="1221000" />
+      <workItem from="1522662689077" duration="515000" />
+      <workItem from="1522722653914" duration="4789000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1260000" />
+    <option name="totallyTimeSpent" value="5348000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1920" height="1080" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="3" />
-      <window_info id="Image Layers" order="2" />
-      <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="7" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24947916" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info id="Image Layers" order="2" />
+      <window_info anchor="bottom" id="Java Enterprise" />
+      <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Spring" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32946146" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18489583" />
+      <window_info anchor="right" id="Bean Validation" />
+      <window_info id="Web" side_tool="true" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32946146" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -217,6 +302,13 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="798">
           <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
         </state>
@@ -229,6 +321,82 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/JwtAuthenticationTokenFilterInterface.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="6" column="33" lean-forward="true" selection-start-line="6" selection-start-column="33" selection-end-line="6" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/DemoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/filter/JwtAuthenticationTokenFilterInterface.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/Role.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-190">
+          <caret line="101" column="57" lean-forward="true" selection-start-line="101" selection-start-column="57" selection-end-line="101" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/UserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="13" column="57" lean-forward="true" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="18" column="20" lean-forward="true" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/AuthService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="4" column="16" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/UserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="22" column="40" lean-forward="true" selection-start-line="22" selection-start-column="40" selection-end-line="22" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

Visuallnspection_fjq/visuallnspectioninteface/pom.xml

@@ -8,7 +8,32 @@
     <artifactId>visuallnspectioninteface</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.2.RELEASE</version>
+        <relativePath /> <!-- lookup parent from repository -->
+    </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>4.2.2.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+
+    </dependencies>
 
     <build>
         <plugins>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/User.java → Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/User.java

@@ -1,17 +1,15 @@
 package com.xintong.visualinspection.bean;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 文件名：User 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/UserService.java → Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/UserService.java

@@ -4,7 +4,7 @@ import com.xintong.visualinspection.bean.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-import java.util.HashMap;
+
 import java.util.List;
 
 /**

Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Apr 03 17:57:45 CST 2018
+version=1.0-SNAPSHOT
+groupId=com.xintong.visuallnspection.inteface
+artifactId=visuallnspectioninteface

Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,3 @@
+com\xintong\visualinspection\service\UserService.class
+com\xintong\visualinspection\bean\Role.class
+com\xintong\visualinspection\bean\User.class

Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,3 @@
+D:\VisualInspection\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Role.java
+D:\VisualInspection\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\UserService.java
+D:\VisualInspection\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\User.java