修改包路径

VisualInspection_server/src/main/java/com/xintong/visualinspection/ServletInitializer.java → VisualInspection_server/src/main/java/com/xintong/ServletInitializer.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection;
+package com.xintong;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;

VisualInspection_server/src/main/java/com/xintong/visualinspection/VideocheckApplication.java → VisualInspection_server/src/main/java/com/xintong/VideocheckApplication.java

@@ -1,18 +1,10 @@
-package com.xintong.visualinspection;
+package com.xintong;
 
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.fastjson.parser.ParserConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring4.SpringTemplateEngine;
-import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
 
-import javax.sql.DataSource;
+import com.alibaba.fastjson.parser.ParserConfig;
 
 @SpringBootApplication
 @ServletComponentScan
@@ -26,7 +18,7 @@ public class VideocheckApplication {
 
 
 	public static void main(String[] args) {
-		ParserConfig.getGlobalInstance().addAccept("com.xintong.visualinspection.");
+		ParserConfig.getGlobalInstance().addAccept("com.xintong.");
 		ParserConfig.getGlobalInstance().addAccept("org.springframework.security.core.");
         
         SpringApplication.run(VideocheckApplication.class, args);

VisualInspection_server/src/main/java/com/xintong/visualinspection/druidTools/ClusterDataSourceConfig.java → VisualInspection_server/src/main/java/com/xintong/system/druidTools/ClusterDataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.druidTools;
+package com.xintong.system.druidTools;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.github.pagehelper.PageHelper;

VisualInspection_server/src/main/java/com/xintong/visualinspection/druidTools/DruidStatFilter.java → VisualInspection_server/src/main/java/com/xintong/system/druidTools/DruidStatFilter.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.druidTools;
+package com.xintong.system.druidTools;
 
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.annotation.WebInitParam;

VisualInspection_server/src/main/java/com/xintong/visualinspection/druidTools/DruidStatViewServlet.java → VisualInspection_server/src/main/java/com/xintong/system/druidTools/DruidStatViewServlet.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.druidTools;
+package com.xintong.system.druidTools;
 
 import javax.servlet.annotation.WebInitParam;
 import javax.servlet.annotation.WebServlet;

VisualInspection_server/src/main/java/com/xintong/visualinspection/druidTools/MasterDataSourceConfig.java → VisualInspection_server/src/main/java/com/xintong/system/druidTools/MasterDataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.druidTools;
+package com.xintong.system.druidTools;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.github.pagehelper.PageHelper;

VisualInspection_server/src/main/java/com/xintong/visualinspection/err/BusinessException.java → VisualInspection_server/src/main/java/com/xintong/system/err/BusinessException.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.err;
+package com.xintong.system.err;
 import lombok.Data;
 @Data
 public class BusinessException extends RuntimeException {

VisualInspection_server/src/main/java/com/xintong/visualinspection/err/ErrorCode.java → VisualInspection_server/src/main/java/com/xintong/system/err/ErrorCode.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.err;
+package com.xintong.system.err;
 import lombok.Data;
 @Data
 public class ErrorCode {

VisualInspection_server/src/main/java/com/xintong/visualinspection/err/ErrorCodeEnum.java → VisualInspection_server/src/main/java/com/xintong/system/err/ErrorCodeEnum.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.err;
+package com.xintong.system.err;
 
 import java.util.ResourceBundle;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/securityTools/CorsConfig.java → VisualInspection_server/src/main/java/com/xintong/system/securityTools/CorsConfig.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;

VisualInspection_server/src/main/java/com/xintong/visualinspection/securityTools/FastJson2JsonRedisSerializer.java → VisualInspection_server/src/main/java/com/xintong/system/securityTools/FastJson2JsonRedisSerializer.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;

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

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;

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

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;

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

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 
 import java.util.concurrent.TimeUnit;
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/securityTools/RedisConf.java → VisualInspection_server/src/main/java/com/xintong/system/securityTools/RedisConf.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

VisualInspection_server/src/main/java/com/xintong/visualinspection/securityTools/WebMvcConfig.java → VisualInspection_server/src/main/java/com/xintong/system/securityTools/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;

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

@@ -1,4 +1,4 @@
-package com.xintong.visualinspection.securityTools;
+package com.xintong.system.securityTools;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

VisualInspection_server/src/main/java/com/xintong/visualinspection/aop/ControllerValidatorInterceptor.java

@@ -6,8 +6,8 @@ import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 
+import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.controller.BaseController;
-import com.xintong.visualinspection.err.BusinessException;
 @Aspect
 @Component
 public class ControllerValidatorInterceptor {

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

@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import com.alibaba.fastjson.JSON;
-import com.xintong.visualinspection.err.BusinessException;
-import com.xintong.visualinspection.err.ErrorCode;
+import com.xintong.system.err.BusinessException;
+import com.xintong.system.err.ErrorCode;
 
 /**
  * 文件名：TestController
@@ -137,5 +137,4 @@ public class BaseController {
        	}
        	return sb.toString();
     }
-
 }

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

@@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 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.CheckItem;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.CheckItemService;
 
 /**
- * 文件名：TestController
+ * 文件名：CheckItemController
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @RestController

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

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.mysql.jdbc.StringUtils;
+import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.CheckRule;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.CheckRuleService;
 
 /**

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

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.mysql.jdbc.StringUtils;
+import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.ConstantService;
 
 /**

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

@@ -12,8 +12,8 @@ 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.Organ;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.DepartmentService;
 
 /**

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

@@ -12,8 +12,8 @@ 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.Menu;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.MenuService;
 
 /**

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

@@ -15,10 +15,10 @@ 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.err.BusinessException;
-import com.xintong.visualinspection.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.PermissionService;
 import com.xintong.visualinspection.service.UserService;

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

@@ -12,8 +12,8 @@ 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.err.BusinessException;
 import com.xintong.visualinspection.service.RoleService;
 
 /**

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

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 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.Score;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.ScoreService;
 
 /**

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

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 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.Task;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.TaskService;
 
 /**

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

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 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.TeamClass;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.TeamClassService;
 
 /**

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

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 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.Team;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.TeamService;
 
 /**

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

@@ -15,9 +15,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.User;
-import com.xintong.visualinspection.err.BusinessException;
-import com.xintong.visualinspection.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.UserService;
 

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

@@ -11,8 +11,8 @@ 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.Webcam;
-import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.service.WebcamService;
 
 /**

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

@@ -12,9 +12,9 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetailsService;
 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.securityTools.JwtTokenUtil;
-import com.xintong.visualinspection.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.BaseService;
 

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

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.CheckItem;
-import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.dao.master.CheckItemDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.CheckItemService;