...

examcloud-core-basic-api-client/pom.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
@@ -17,9 +15,6 @@
 			<artifactId>examcloud-core-basic-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-feign</artifactId>
-		</dependency>
 	</dependencies>
+	
 </project>

examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/BasicCloudClientSupport.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.client;
 
-import cn.com.qmth.examcloud.common.support.CloudClientSupport;
+import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
 
 /**
  * @author WANGWEI

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/CourseCloudServiceProvider.java

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-import cn.com.qmth.examcloud.common.support.exception.StatusException;
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.CourseReq;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/DemoCloudServiceProvider.java

@@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.DemoCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetXxxReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/OrgCloudServiceProvider.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.google.common.collect.Lists;
 
-import cn.com.qmth.examcloud.common.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgListByNameLikeReq;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/StudentCloudServiceProvider.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.StudentReq;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/UserCloudServiceProvider.java

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.UserInfo;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserInfoReq;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/AppApi.java

@@ -1,14 +1,12 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import io.swagger.annotations.ApiOperation;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.config.AppConfig;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 应用服务API Created by ting.yin on 17/3/9.
@@ -20,6 +18,6 @@ public class AppApi {
 	@ApiOperation(value = "查询所有应用")
 	@GetMapping
 	public ResponseEntity getAllApp() {
-		return new ResponseEntity(AppConfig.findAll(), HttpStatus.OK);
+		return new ResponseEntity(null, HttpStatus.OK);
 	}
 }

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/CourseApi.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import io.swagger.annotations.ApiOperation;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,20 +24,20 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import com.google.common.collect.Lists;
 
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
-import cn.com.qmth.examcloud.common.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 import cn.com.qmth.examcloud.core.basic.service.bean.CourseAssembler;
 import cn.com.qmth.examcloud.core.basic.service.bean.CourseDto;
 import cn.com.qmth.examcloud.core.basic.service.impl.CourseService;
 import cn.com.qmth.examcloud.core.basic.service.impl.ExportService;
-
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import com.google.common.collect.Lists;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 课程服务API

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/CourseSpeciatlyApi.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.SpecialtyRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/ExamSiteApi.java

@@ -1,32 +1,35 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
-import cn.com.qmth.examcloud.common.util.excel.ExcelError;
-import cn.com.qmth.examcloud.core.basic.dao.ExamSiteRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
-import cn.com.qmth.examcloud.core.basic.service.impl.ExamSiteService;
-import cn.com.qmth.examcloud.core.basic.service.impl.ExportService;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.io.IOUtils;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
+import cn.com.qmth.examcloud.core.basic.dao.ExamSiteRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
+import cn.com.qmth.examcloud.core.basic.service.impl.ExamSiteService;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 考点服务API

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/FaceSetTokenApi.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
 import cn.com.qmth.examcloud.core.basic.service.impl.FaceSetTokenService;
 
 /**

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgApi.java

@@ -34,10 +34,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import cn.com.qmth.examcloud.common.support.ControllerSupport;
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
-import cn.com.qmth.examcloud.common.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.service.bean.OrgDto;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgFunctionApi.java

@@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.support.ControllerSupport;
-import cn.com.qmth.examcloud.common.support.tree.TreeNode;
-import cn.com.qmth.examcloud.common.support.tree.TreeUtil;
-import cn.com.qmth.examcloud.common.support.tree.ZtreeNode;
+import cn.com.qmth.examcloud.commons.web.helpers.tree.TreeNode;
+import cn.com.qmth.examcloud.commons.web.helpers.tree.TreeUtil;
+import cn.com.qmth.examcloud.commons.web.helpers.tree.ZtreeNode;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.dao.FunctionRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgFunctionRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Function;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/SpecialtyApi.java

@@ -5,11 +5,28 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelError;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.basic.dao.SpecialtyRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;
 import cn.com.qmth.examcloud.core.basic.service.bean.SpecialtyDto;
@@ -17,21 +34,6 @@ import cn.com.qmth.examcloud.core.basic.service.impl.ExportService;
 import cn.com.qmth.examcloud.core.basic.service.impl.SpecialtyService;
 import io.swagger.annotations.ApiOperation;
 
-
-
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
-
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
 /**
  * @Description: 专业服务API
  * @author weiwenhai

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/StudentApi.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import io.swagger.annotations.ApiOperation;
 
 import java.io.File;
@@ -22,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Student;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/StudentFaceInfoApi.java

@@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.basic.dao.StudentFaceInfoRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Student;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/UserApi.java

@@ -29,11 +29,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.uac.annotation.Uac;
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
-import cn.com.qmth.examcloud.common.uac.enums.UacPolicy;
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.web.security.annotation.Uac;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
+import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
+import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.User;
 import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;

examcloud-core-basic-api/pom.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
@@ -14,7 +11,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-support</artifactId>
+			<artifactId>examcloud-commons-web</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/DemoCloudService.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api;
 
-import cn.com.qmth.examcloud.common.support.CloudService;
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetXxxReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;
 

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/CourseReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 
-import cn.com.qmth.examcloud.common.support.BaseRequest;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 public class CourseReq  extends BaseRequest {
 	

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgListByNameLikeReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 
-import cn.com.qmth.examcloud.common.support.BaseRequest;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 public class GetOrgListByNameLikeReq extends BaseRequest {
 

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserInfoReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 
-import cn.com.qmth.examcloud.common.support.BaseRequest;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 /**
  * @author WANGWEI

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetXxxReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 
-import cn.com.qmth.examcloud.common.support.BaseRequest;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 /**
  * @author WANGWEI

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/OrgReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 
-import cn.com.qmth.examcloud.common.support.BaseRequest;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 public class OrgReq  extends BaseRequest {
 	/**

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/StudentReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 
-import cn.com.qmth.examcloud.common.support.BaseRequest;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 public class StudentReq extends BaseRequest{
 

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgListByNameLikeResp.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.basic.api.response;
 
 import java.util.List;
 
-import cn.com.qmth.examcloud.common.support.BaseResponse;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 
 public class GetOrgListByNameLikeResp extends BaseResponse {

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUserInfoResp.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 
-import cn.com.qmth.examcloud.common.support.BaseResponse;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.UserInfo;
 
 public class GetUserInfoResp extends BaseResponse {

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetXxxResp.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 
-import cn.com.qmth.examcloud.common.support.BaseResponse;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 
 /**
  * @author WANGWEI

examcloud-core-basic-dao/pom.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
@@ -11,27 +9,9 @@
 	<artifactId>examcloud-core-basic-dao</artifactId>
 
 	<dependencies>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-util</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-support</artifactId>
+			<artifactId>examcloud-commons-web</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 		<dependency>

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Course.java

@@ -11,10 +11,10 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
+import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
 
 /**
  * 

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Function.java

@@ -9,7 +9,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import cn.com.qmth.examcloud.common.support.tree.TreeNode;
+import cn.com.qmth.examcloud.commons.web.helpers.tree.TreeNode;
 
 /**
  * 功能

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Org.java

@@ -1,15 +1,22 @@
 package cn.com.qmth.examcloud.core.basic.dao.entity;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
-import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
-import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
+import java.io.Serializable;
+import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 
-import java.io.Serializable;
-import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
+import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
 
 /**
  * Created by songyue on 17/1/13.

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Specialty.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
 
 /**
  * @Description: 专业

examcloud-core-basic-service/pom.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
@@ -17,63 +15,6 @@
 			<artifactId>examcloud-core-basic-dao</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-util</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-dto</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-uac</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-config</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-feign</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>2.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.2</version>
-		</dependency>
 		<dependency>
 			<groupId>com.qmth.commons</groupId>
 			<artifactId>data-sync-rabbit</artifactId>

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/CourseDto.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.service.bean;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
 
 /**
  * 

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/OrgDto.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.basic.service.bean;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
-
 import java.io.Serializable;
 
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
+
 /**
  * Created by songyue on 17/1/13.
  */

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/SpecialtyDto.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.service.bean;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;
 
 /**

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseService.java

@@ -20,9 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-import cn.com.qmth.examcloud.common.util.excel.ExcelError;
-import cn.com.qmth.examcloud.common.util.excel.ExcelReader;
-import cn.com.qmth.examcloud.common.util.excel.ExcelReaderHandle;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReader;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReaderHandle;
 import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 import cn.com.qmth.examcloud.core.basic.dao.entity.CourseSpeciatly;

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/DataSendService.java

@@ -3,18 +3,18 @@ package cn.com.qmth.examcloud.core.basic.service.impl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.qmth.commons.dataSync.core.service.DataSyncService;
+
 import cn.com.qmth.examcloud.common.dto.core.CourseSync;
 import cn.com.qmth.examcloud.common.dto.core.OrgSync;
 import cn.com.qmth.examcloud.common.dto.core.SpecialtySync;
 import cn.com.qmth.examcloud.common.dto.core.StudentSync;
-import cn.com.qmth.examcloud.common.util.BeanCopierUtil;
+import cn.com.qmth.examcloud.commons.base.util.BeanCopierUtil;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
 
-import com.qmth.commons.dataSync.core.service.DataSyncService;
-
 /**
  * Created by songyue on 17/8/3.
  */

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/ExportService.java

@@ -6,7 +6,7 @@ import java.util.Collection;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelWriter;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelWriter;
 
 /*
  * excel导出工具

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgService.java

@@ -7,8 +7,6 @@ import java.util.Date;
 import java.util.List;
 
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,18 +17,15 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelError;
-import cn.com.qmth.examcloud.common.util.excel.ExcelReader;
-import cn.com.qmth.examcloud.common.util.excel.ExcelReaderHandle;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReader;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReaderHandle;
 import cn.com.qmth.examcloud.core.basic.dao.ExamSiteRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgMemRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
-import cn.com.qmth.examcloud.core.basic.dao.entity.CourseSpeciatly;
 import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.User;

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/SpecialtyService.java

@@ -19,9 +19,9 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import cn.com.qmth.examcloud.common.util.excel.ExcelError;
-import cn.com.qmth.examcloud.common.util.excel.ExcelReader;
-import cn.com.qmth.examcloud.common.util.excel.ExcelReaderHandle;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReader;
+import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReaderHandle;
 import cn.com.qmth.examcloud.core.basic.dao.SpecialtyRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.CourseSpeciatly;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentService.java

@@ -17,8 +17,8 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import cn.com.qmth.examcloud.common.uac.AccessCtrlUtil;
-import cn.com.qmth.examcloud.common.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.web.security.AccessCtrlUtil;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserRoleService.java

@@ -1,16 +1,16 @@
 package cn.com.qmth.examcloud.core.basic.service.impl;
 
-import cn.com.qmth.examcloud.common.uac.entity.Role;
-import cn.com.qmth.examcloud.common.uac.entity.RolesService;
-import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
-import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import cn.com.qmth.examcloud.commons.web.security.entity.Role;
+import cn.com.qmth.examcloud.commons.web.security.entity.RolesService;
+import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
+import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
 
 /**
  * 用户角色服务类

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserServiceImpl.java

@@ -21,16 +21,14 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import com.esotericsoftware.minlog.Log;
-
-import cn.com.qmth.examcloud.common.uac.AccessCtrlUtil;
-import cn.com.qmth.examcloud.common.uac.AccessUserOps;
-import cn.com.qmth.examcloud.common.uac.AccessUserOpsForRedis;
-import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
-import cn.com.qmth.examcloud.common.util.ByteUtil;
-import cn.com.qmth.examcloud.common.util.SHA256;
-import cn.com.qmth.examcloud.common.util.StringUtil;
+import cn.com.qmth.examcloud.commons.base.util.ByteUtil;
+import cn.com.qmth.examcloud.commons.base.util.SHA256;
+import cn.com.qmth.examcloud.commons.base.util.StringUtil;
+import cn.com.qmth.examcloud.commons.web.security.AccessCtrlUtil;
+import cn.com.qmth.examcloud.commons.web.security.AccessUserOps;
+import cn.com.qmth.examcloud.commons.web.security.AccessUserOpsForRedis;
+import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
+import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.ThirdPartyAccessDao;

examcloud-core-basic-starter/pom.xml

@@ -15,16 +15,6 @@
 			<artifactId>examcloud-core-basic-api-provider</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure</artifactId>
-		</dependency>
 	</dependencies>
 
 	<build>

examcloud-core-basic-starter/src/main/java/cn/com/qmth/examcloud/core/basic/starter/CoreBasicApp.java

@@ -19,9 +19,9 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import com.qmth.commons.query.dao.impl.BaseQueryDaoImpl;
 
-import cn.com.qmth.examcloud.common.support.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.common.support.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.common.support.logging.SLF4JImpl;
+import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.base.logging.SLF4JImpl;
 
 @ComponentScan(basePackages = { "com.qmth.commons", "cn.com.qmth" })
 @EntityScan(basePackages = { "com.qmth.commons", "cn.com.qmth" })

examcloud-core-basic-starter/src/main/java/cn/com/qmth/examcloud/core/basic/starter/config/AccessControlConfig.java

@@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-import cn.com.qmth.examcloud.common.uac.AccessCtrlInterceptor;
+import cn.com.qmth.examcloud.commons.web.security.AccessCtrlInterceptor;
 
 /**
  * prod环境开启权限验证