浏览代码

机构调整

wangwei 7 年之前
父节点
当前提交
947ffd20b8
共有 79 个文件被更改,包括 241 次插入277 次删除
  1. 1 1
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/UserCloudServiceProvider.java
  2. 9 8
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/CourseApi.java
  3. 5 5
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/CourseSpeciatlyApi.java
  4. 4 6
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/ExamSiteApi.java
  5. 1 1
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/FaceSetTokenApi.java
  6. 6 6
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgApi.java
  7. 1 1
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgConfigApi.java
  8. 2 2
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgFunctionApi.java
  9. 3 3
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/PermissionApi.java
  10. 3 3
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/RolePermissionRelationApi.java
  11. 7 7
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/SpecialtyApi.java
  12. 7 7
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/StudentApi.java
  13. 5 5
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/StudentFaceInfoApi.java
  14. 5 5
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/UserApi.java
  15. 5 5
      examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/UserRoleApi.java
  16. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/BaseMemRepository.java
  17. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/CourseRepo.java
  18. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/CourseSpeciatlyRepo.java
  19. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/ExamSiteRepo.java
  20. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/FaceSetTokenRepo.java
  21. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/OrgFunctionRepo.java
  22. 3 3
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/OrgMemRepo.java
  23. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/OrgRepo.java
  24. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/PermissionRepo.java
  25. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/RolePermissionRelationRepo.java
  26. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/SpecialtyRepo.java
  27. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/StudentFaceInfoRepo.java
  28. 3 3
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/StudentRepo.java
  29. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserLoginRepo.java
  30. 3 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserOpsLogRepo.java
  31. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserRepo.java
  32. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserRoleRepo.java
  33. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/constants/Consts.java
  34. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Course.java
  35. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/CourseSpeciatly.java
  36. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/ExamSite.java
  37. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/FaceSetToken.java
  38. 2 2
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Org.java
  39. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/OrgFunction.java
  40. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Permission.java
  41. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/RolePermissionRelation.java
  42. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Specialty.java
  43. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Student.java
  44. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/StudentFaceInfo.java
  45. 4 4
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/User.java
  46. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserLogin.java
  47. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserOpsLog.java
  48. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserRole.java
  49. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/CourseLevel.java
  50. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/Gender.java
  51. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/LoginType.java
  52. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/OrgType.java
  53. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/PermissionType.java
  54. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/UserScope.java
  55. 1 1
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/UserType.java
  56. 0 11
      examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/params/OrgProperties.java
  57. 2 3
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/CourseAssembler.java
  58. 1 1
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/CourseDto.java
  59. 1 1
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/OrgDto.java
  60. 2 2
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/SpecialtyDto.java
  61. 3 3
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/UserInfo.java
  62. 5 6
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseService.java
  63. 7 7
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseSpeciatlyService.java
  64. 5 5
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/DataSendService.java
  65. 4 3
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/ExamSiteService.java
  66. 2 2
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/ExportService.java
  67. 3 3
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/FaceSetTokenService.java
  68. 1 1
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgConfigService.java
  69. 17 19
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgService.java
  70. 2 2
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/PermissionService.java
  71. 5 5
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/PermissionServiceImpl.java
  72. 3 3
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/RolePermissionRelationService.java
  73. 5 5
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/RolePermissionRelationServiceImpl.java
  74. 5 6
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/SpecialtyService.java
  75. 5 6
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentFaceInfoService.java
  76. 12 13
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentService.java
  77. 3 2
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserRoleService.java
  78. 20 20
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserService.java
  79. 0 20
      examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/sync/DataReceiveService.java

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

@@ -11,7 +11,7 @@ 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;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserInfoResp;
-import cn.com.qmth.examcloud.service.core.service.UserService;
+import cn.com.qmth.examcloud.core.basic.service.impl.UserService;
 import io.swagger.annotations.ApiOperation;
 
 /**

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

@@ -30,12 +30,13 @@ 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.common.util.excel.ExcelError;
-import cn.com.qmth.examcloud.service.core.assemble.CourseAssembler;
-import cn.com.qmth.examcloud.service.core.dto.CourseDto;
-import cn.com.qmth.examcloud.service.core.entity.Course;
-import cn.com.qmth.examcloud.service.core.repo.CourseRepo;
-import cn.com.qmth.examcloud.service.core.service.CourseService;
-import cn.com.qmth.examcloud.service.core.util.ExportUtils;
+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;
@@ -200,7 +201,7 @@ public class CourseApi {
     public void importFileTemplate(HttpServletResponse response){
         List<CourseDto> list= new ArrayList<CourseDto>();
         list.add(new CourseDto("大学英语", "000001", "0"));
-        ExportUtils.exportEXCEL("课程导入模板", CourseDto.class, list, response);
+        ExportService.exportEXCEL("课程导入模板", CourseDto.class, list, response);
     }
     
     @ApiOperation(value="导出课程",notes = "导出")
@@ -210,7 +211,7 @@ public class CourseApi {
     	courseService.findAll(orgCriteria).forEach(c -> {
     		list.add(courseAssembler.toDTO(c));
         });
-    	ExportUtils.exportEXCEL("课程列表", CourseDto.class, list, response);
+    	ExportService.exportEXCEL("课程列表", CourseDto.class, list, response);
     }
     
     @ApiOperation(value="禁用课程",notes="禁用")

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

@@ -19,11 +19,11 @@ 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.service.core.entity.Course;
-import cn.com.qmth.examcloud.service.core.entity.Specialty;
-import cn.com.qmth.examcloud.service.core.repo.CourseRepo;
-import cn.com.qmth.examcloud.service.core.repo.SpecialtyRepo;
-import cn.com.qmth.examcloud.service.core.service.CourseSpeciatlyService;
+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;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;
+import cn.com.qmth.examcloud.core.basic.service.impl.CourseSpeciatlyService;
 
 /**
  * @Description 课程专业关联API

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

@@ -3,12 +3,10 @@ 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.service.core.entity.ExamSite;
-import cn.com.qmth.examcloud.service.core.repo.ExamSiteRepo;
-import cn.com.qmth.examcloud.service.core.repo.ExamSiteRepo;
-import cn.com.qmth.examcloud.service.core.service.ExamSiteService;
-import cn.com.qmth.examcloud.service.core.service.ExamSiteService;
-import cn.com.qmth.examcloud.service.core.util.ExportUtils;
+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 org.slf4j.Logger;

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

@@ -10,7 +10,7 @@ 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.service.core.service.FaceSetTokenService;
+import cn.com.qmth.examcloud.core.basic.service.impl.FaceSetTokenService;
 
 /**
  * @author  	chenken

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

@@ -37,11 +37,11 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 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.service.core.dto.OrgDto;
-import cn.com.qmth.examcloud.service.core.entity.Org;
-import cn.com.qmth.examcloud.service.core.repo.OrgRepo;
-import cn.com.qmth.examcloud.service.core.service.OrgService;
-import cn.com.qmth.examcloud.service.core.util.ExportUtils;
+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;
+import cn.com.qmth.examcloud.core.basic.service.impl.ExportService;
+import cn.com.qmth.examcloud.core.basic.service.impl.OrgService;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -209,7 +209,7 @@ public class OrgApi {
     @GetMapping("/download")
     public void importFileTemplate(HttpServletResponse response){
         List<OrgDto> list= new ArrayList<OrgDto>();
-        ExportUtils.exportEXCEL("学习中心导入模板", OrgDto.class, list, response);
+        ExportService.exportEXCEL("学习中心导入模板", OrgDto.class, list, response);
     }
 
     @ApiOperation(value = "启用机构", notes = "启用")

+ 1 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgConfigApi.java

@@ -10,7 +10,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.service.core.service.OrgConfigService;
+import cn.com.qmth.examcloud.core.basic.service.impl.OrgConfigService;
 import io.swagger.annotations.ApiOperation;
 
 /**

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

@@ -16,8 +16,8 @@ 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.service.core.entity.OrgFunction;
-import cn.com.qmth.examcloud.service.core.repo.OrgFunctionRepo;
+import cn.com.qmth.examcloud.core.basic.dao.OrgFunctionRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.OrgFunction;
 import io.swagger.annotations.ApiOperation;
 
 /**

+ 3 - 3
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/PermissionApi.java

@@ -16,9 +16,9 @@ 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.service.core.entity.Permission;
-import cn.com.qmth.examcloud.service.core.service.PermissionService;
-import cn.com.qmth.examcloud.service.core.service.RolePermissionRelationService;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
+import cn.com.qmth.examcloud.core.basic.service.impl.PermissionService;
+import cn.com.qmth.examcloud.core.basic.service.impl.RolePermissionRelationService;
 
 @RestController
 @RequestMapping("${app.api.root}/permission")

+ 3 - 3
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/RolePermissionRelationApi.java

@@ -16,9 +16,9 @@ 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.service.core.entity.Permission;
-import cn.com.qmth.examcloud.service.core.entity.RolePermissionRelation;
-import cn.com.qmth.examcloud.service.core.service.RolePermissionRelationService;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
+import cn.com.qmth.examcloud.core.basic.service.impl.RolePermissionRelationService;
 
 @RestController
 @RequestMapping("${app.api.root}/rolePermissionRelation")

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

@@ -10,6 +10,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.com.qmth.examcloud.common.util.excel.ExcelError;
+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;
+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;
 
 
@@ -24,11 +29,6 @@ import org.springframework.web.bind.annotation.*;
 
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import cn.com.qmth.examcloud.common.util.ErrorMsg;
-import cn.com.qmth.examcloud.service.core.dto.SpecialtyDto;
-import cn.com.qmth.examcloud.service.core.entity.Specialty;
-import cn.com.qmth.examcloud.service.core.repo.SpecialtyRepo;
-import cn.com.qmth.examcloud.service.core.service.SpecialtyService;
-import cn.com.qmth.examcloud.service.core.util.ExportUtils;
 
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
@@ -172,7 +172,7 @@ public class SpecialtyApi {
 	@GetMapping("/download")
 	public void importFileTemplate(HttpServletResponse response){
 		List<SpecialtyDto> list= new ArrayList<SpecialtyDto>();
-		ExportUtils.exportEXCEL("专业导入模板", SpecialtyDto.class, list, response);
+		ExportService.exportEXCEL("专业导入模板", SpecialtyDto.class, list, response);
 	}
 
 	@ApiOperation(value="导入",notes = "导入")
@@ -207,6 +207,6 @@ public class SpecialtyApi {
 		specialtyService.findAll(specialty).forEach(c -> {
 			list.add(new SpecialtyDto(c));
 		});
-		ExportUtils.exportEXCEL("专业列表", SpecialtyDto.class, list, response);
+		ExportService.exportEXCEL("专业列表", SpecialtyDto.class, list, response);
 	}
 }

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

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.service.core.api;
 
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
-import cn.com.qmth.examcloud.service.core.entity.User;
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
 import io.swagger.annotations.ApiOperation;
 
 import java.io.File;
@@ -25,11 +23,13 @@ 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.service.core.dto.UserInfo;
-import cn.com.qmth.examcloud.service.core.entity.Student;
-import cn.com.qmth.examcloud.service.core.enums.LoginType;
-import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
-import cn.com.qmth.examcloud.service.core.service.StudentService;
+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;
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+import cn.com.qmth.examcloud.core.basic.dao.enums.LoginType;
+import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
+import cn.com.qmth.examcloud.core.basic.service.impl.StudentService;
 
 import javax.servlet.http.HttpServletRequest;
 

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

@@ -22,11 +22,11 @@ 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.service.core.entity.Student;
-import cn.com.qmth.examcloud.service.core.entity.StudentFaceInfo;
-import cn.com.qmth.examcloud.service.core.repo.StudentFaceInfoRepo;
-import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
-import cn.com.qmth.examcloud.service.core.service.StudentFaceInfoService;
+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;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceInfo;
+import cn.com.qmth.examcloud.core.basic.service.impl.StudentFaceInfoService;
 
 /**
  * 学生照片API

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

@@ -34,11 +34,11 @@ 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.service.core.dto.UserInfo;
-import cn.com.qmth.examcloud.service.core.entity.User;
-import cn.com.qmth.examcloud.service.core.enums.UserType;
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
-import cn.com.qmth.examcloud.service.core.service.UserService;
+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;
+import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
+import cn.com.qmth.examcloud.core.basic.service.impl.UserService;
 
 /**
  * 用户服务API

+ 5 - 5
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/UserRoleApi.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import cn.com.qmth.examcloud.service.core.entity.User;
-import cn.com.qmth.examcloud.service.core.entity.UserRole;
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
-import cn.com.qmth.examcloud.service.core.repo.UserRoleRepo;
-import cn.com.qmth.examcloud.service.core.service.UserRoleService;
+import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
+import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
+import cn.com.qmth.examcloud.core.basic.service.impl.UserRoleService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/BaseMemRepository.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/BaseMemRepository.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import org.springframework.data.repository.Repository;
 

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/CourseRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/CourseRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.Course;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 
 public interface CourseRepo extends JpaRepository<Course, Long>,QueryByExampleExecutor<Course>, JpaSpecificationExecutor<Course> {
 

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/CourseSpeciatlyRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/CourseSpeciatlyRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.CourseSpeciatly;
+import cn.com.qmth.examcloud.core.basic.dao.entity.CourseSpeciatly;
 
 public interface CourseSpeciatlyRepo extends JpaRepository<CourseSpeciatly, Long>,QueryByExampleExecutor<CourseSpeciatly>,JpaSpecificationExecutor<CourseSpeciatly>{
 

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/ExamSiteRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/ExamSiteRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.ExamSite;
+import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
 
 /**
  * Created by songyue on 17/1/13.

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/FaceSetTokenRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/FaceSetTokenRepo.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.FaceSetToken;
+import cn.com.qmth.examcloud.core.basic.dao.entity.FaceSetToken;
 
 /**
  * @author  	chenken

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/OrgFunctionRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/OrgFunctionRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
@@ -9,7 +9,7 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 import org.springframework.transaction.annotation.Transactional;
 
-import cn.com.qmth.examcloud.service.core.entity.OrgFunction;
+import cn.com.qmth.examcloud.core.basic.dao.entity.OrgFunction;
 
 public interface OrgFunctionRepo extends JpaRepository<OrgFunction, Long>, QueryByExampleExecutor<OrgFunction> {
 

+ 3 - 3
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/memory/OrgMemRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/OrgMemRepo.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.service.core.repo.memory;
+package cn.com.qmth.examcloud.core.basic.dao;
 
-import cn.com.qmth.examcloud.service.core.entity.Org;
-import cn.com.qmth.examcloud.service.core.repo.BaseMemRepository;
 import org.springframework.stereotype.Repository;
 
+import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/OrgRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/OrgRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.Org;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 
 /**
  * Created by songyue on 17/1/13.

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/PermissionRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/PermissionRepo.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import cn.com.qmth.examcloud.service.core.entity.Permission;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
 
 public interface PermissionRepo extends JpaRepository<Permission,Integer>{
 	

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/RolePermissionRelationRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/RolePermissionRelationRepo.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import cn.com.qmth.examcloud.service.core.entity.RolePermissionRelation;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
 
 public interface RolePermissionRelationRepo  extends JpaRepository<RolePermissionRelation,Integer>{
 

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/SpecialtyRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/SpecialtyRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.Specialty;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;
 
 public interface SpecialtyRepo extends JpaRepository<Specialty, Long>,QueryByExampleExecutor<Specialty>,JpaSpecificationExecutor<Specialty>{
      

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/StudentFaceInfoRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/StudentFaceInfoRepo.java

@@ -1,11 +1,11 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.StudentFaceInfo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceInfo;
 
 public interface StudentFaceInfoRepo extends JpaRepository<StudentFaceInfo,Long>,QueryByExampleExecutor<StudentFaceInfo>{
 

+ 3 - 3
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/StudentRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/StudentRepo.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.service.core.repo;
-
-import cn.com.qmth.examcloud.service.core.entity.Student;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
+import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
+
 /**
  * Created by songyue on 17/1/13.
  */

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/UserLoginRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserLoginRepo.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 import org.springframework.transaction.annotation.Transactional;
 
-import cn.com.qmth.examcloud.service.core.entity.UserLogin;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserLogin;
 
 /**
  * Created by songyue on 17/2/22.

+ 3 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/UserOpsLogRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserOpsLogRepo.java

@@ -1,9 +1,10 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
-import cn.com.qmth.examcloud.service.core.entity.UserOpsLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserOpsLog;
+
 /**
  * Created by songyue on 17/2/22.
  */

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/UserRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 import org.springframework.transaction.annotation.Transactional;
 
-import cn.com.qmth.examcloud.service.core.entity.User;
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
 
 /**
  * Created by songyue on 17/1/13.

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/repo/UserRoleRepo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserRoleRepo.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.service.core.repo;
+package cn.com.qmth.examcloud.core.basic.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.core.entity.UserRole;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
 
 /**
  * Created by songyue on 17/2/22.

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/params/UserParam.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/constants/Consts.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.service.core.params;
+package cn.com.qmth.examcloud.core.basic.dao.constants;
 
 /**
  * 用户相关常量
  * Created by songyue on 17/2/22.
  */
-public final class UserParam {
+public final class Consts {
     public static final String DEFAULT_PASSWORD = "123456";
 }

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/Course.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Course.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/CourseSpeciatly.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/CourseSpeciatly.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/ExamSite.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/ExamSite.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import org.springframework.format.annotation.DateTimeFormat;
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/FaceSetToken.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/FaceSetToken.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/Org.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Org.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.service.core.entity;
+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.service.core.enums.OrgType;
+import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/OrgFunction.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/OrgFunction.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/Permission.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Permission.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.util.List;
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/RolePermissionRelation.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/RolePermissionRelation.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.util.List;
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/Specialty.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Specialty.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/Student.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Student.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import org.springframework.format.annotation.DateTimeFormat;
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/StudentFaceInfo.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/StudentFaceInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 4 - 4
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/User.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/User.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -9,9 +9,9 @@ import javax.validation.constraints.NotNull;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
-import cn.com.qmth.examcloud.service.core.enums.Gender;
-import cn.com.qmth.examcloud.service.core.enums.UserScope;
-import cn.com.qmth.examcloud.service.core.enums.UserType;
+import cn.com.qmth.examcloud.core.basic.dao.enums.Gender;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
 
 /**
  * Created by songyue on 17/1/13.

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/UserLogin.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserLogin.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/UserOpsLog.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserOpsLog.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/entity/UserRole.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserRole.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.core.basic.dao.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/enums/CourseLevel.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/CourseLevel.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 public enum CourseLevel {
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/enums/Gender.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/Gender.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 /**
  * Created by songyue on 17/2/22.

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/enums/LoginType.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/LoginType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 /**
  * Created by ting.yin on 17/2/22.

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/enums/OrgType.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/OrgType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 public enum OrgType {
 	SCHOOL("学校"),

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/enums/PermissionType.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/PermissionType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 public enum PermissionType {
 	/**

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/enums/UserScope.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/UserScope.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 /**
  * Created by songyue on 17/2/22.

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/enums/UserType.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/UserType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 /**
  * Created by songyue on 17/2/22.

+ 0 - 11
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/params/OrgProperties.java

@@ -1,11 +0,0 @@
-package cn.com.qmth.examcloud.service.core.params;
-
-/**
- * 机构属性
- * 
- * @author wang wei
- * @date 2018411
- */
-public interface OrgProperties {
-
-}

+ 2 - 3
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/assemble/CourseAssembler.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/CourseAssembler.java

@@ -1,9 +1,8 @@
-package cn.com.qmth.examcloud.service.core.assemble;
+package cn.com.qmth.examcloud.core.basic.service.bean;
 
 import org.springframework.stereotype.Component;
 
-import cn.com.qmth.examcloud.service.core.dto.CourseDto;
-import cn.com.qmth.examcloud.service.core.entity.Course;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 
 @Component
 public class CourseAssembler {

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/dto/CourseDto.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/CourseDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.dto;
+package cn.com.qmth.examcloud.core.basic.service.bean;
 
 import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
 

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/dto/OrgDto.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/OrgDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.dto;
+package cn.com.qmth.examcloud.core.basic.service.bean;
 
 import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
 

+ 2 - 2
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/dto/SpecialtyDto.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/SpecialtyDto.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.service.core.dto;
+package cn.com.qmth.examcloud.core.basic.service.bean;
 
 import cn.com.qmth.examcloud.common.util.excel.ExcelProperty;
-import cn.com.qmth.examcloud.service.core.entity.Specialty;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;
 
 /**
  * @Description 专业

+ 3 - 3
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/service/core/dto/UserInfo.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/UserInfo.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.service.core.dto;
-
-import cn.com.qmth.examcloud.service.core.entity.UserRole;
+package cn.com.qmth.examcloud.core.basic.service.bean;
 
 import java.io.Serializable;
 import java.util.List;
 
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
+
 /**
  * Created by songyue on 17/2/22.
  */

+ 5 - 6
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/CourseService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -23,11 +23,10 @@ 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.service.core.dto.CourseDto;
-import cn.com.qmth.examcloud.service.core.entity.Course;
-import cn.com.qmth.examcloud.service.core.entity.CourseSpeciatly;
-import cn.com.qmth.examcloud.service.core.repo.CourseRepo;
-import cn.com.qmth.examcloud.service.core.service.sync.DataSendService;
+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;
+import cn.com.qmth.examcloud.core.basic.service.bean.CourseDto;
 
 @Service
 public class CourseService {

+ 7 - 7
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/CourseSpeciatlyService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseSpeciatlyService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -7,12 +7,12 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.service.core.entity.Course;
-import cn.com.qmth.examcloud.service.core.entity.CourseSpeciatly;
-import cn.com.qmth.examcloud.service.core.entity.Specialty;
-import cn.com.qmth.examcloud.service.core.repo.CourseRepo;
-import cn.com.qmth.examcloud.service.core.repo.CourseSpeciatlyRepo;
-import cn.com.qmth.examcloud.service.core.repo.SpecialtyRepo;
+import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
+import cn.com.qmth.examcloud.core.basic.dao.CourseSpeciatlyRepo;
+import cn.com.qmth.examcloud.core.basic.dao.SpecialtyRepo;
+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.Specialty;
 
 @Service
 public class CourseSpeciatlyService {

+ 5 - 5
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/sync/DataSendService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/DataSendService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service.sync;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -8,10 +8,10 @@ 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.service.core.entity.Course;
-import cn.com.qmth.examcloud.service.core.entity.Org;
-import cn.com.qmth.examcloud.service.core.entity.Specialty;
-import cn.com.qmth.examcloud.service.core.entity.Student;
+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;
 

+ 4 - 3
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/ExamSiteService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/ExamSiteService.java

@@ -1,7 +1,8 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
+
+import cn.com.qmth.examcloud.core.basic.dao.ExamSiteRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
 
-import cn.com.qmth.examcloud.service.core.entity.ExamSite;
-import cn.com.qmth.examcloud.service.core.repo.ExamSiteRepo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;

+ 2 - 2
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/util/ExportUtils.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/ExportService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.util;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.net.URLEncoder;
 import java.util.Collection;
@@ -11,7 +11,7 @@ import cn.com.qmth.examcloud.common.util.excel.ExcelWriter;
 /*
  * excel导出工具
  */
-public class ExportUtils {
+public class ExportService {
 
     private static final String DEFALUT_CONTENT_TYPE = "application/vnd.ms-excel";
 

+ 3 - 3
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/FaceSetTokenService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/FaceSetTokenService.java

@@ -1,12 +1,12 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.service.core.entity.FaceSetToken;
-import cn.com.qmth.examcloud.service.core.repo.FaceSetTokenRepo;
+import cn.com.qmth.examcloud.core.basic.dao.FaceSetTokenRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.FaceSetToken;
 
 /**
  * @author  	chenken

+ 1 - 1
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/OrgConfigService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgConfigService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.List;
 import java.util.Map;

+ 17 - 19
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/OrgService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.contains;
 
 import java.io.InputStream;
@@ -10,19 +10,6 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 
-import cn.com.qmth.examcloud.service.core.dto.OrgDto;
-import cn.com.qmth.examcloud.service.core.entity.Course;
-import cn.com.qmth.examcloud.service.core.entity.CourseSpeciatly;
-import cn.com.qmth.examcloud.service.core.entity.ExamSite;
-import cn.com.qmth.examcloud.service.core.entity.UserRole;
-import cn.com.qmth.examcloud.service.core.enums.OrgType;
-import cn.com.qmth.examcloud.service.core.enums.UserScope;
-import cn.com.qmth.examcloud.service.core.enums.UserType;
-import cn.com.qmth.examcloud.service.core.params.UserParam;
-import cn.com.qmth.examcloud.service.core.repo.ExamSiteRepo;
-import cn.com.qmth.examcloud.service.core.repo.memory.OrgMemRepo;
-import cn.com.qmth.examcloud.service.core.service.sync.DataSendService;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
@@ -36,10 +23,21 @@ import org.springframework.transaction.annotation.Transactional;
 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.service.core.entity.Org;
-import cn.com.qmth.examcloud.service.core.entity.User;
-import cn.com.qmth.examcloud.service.core.repo.OrgRepo;
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
+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;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
+import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
+import cn.com.qmth.examcloud.core.basic.service.bean.OrgDto;
 
 @Service
 public class OrgService {
@@ -121,7 +119,7 @@ public class OrgService {
 		user.setLoginName(tempOrg.getCode());
 		user.setEnable(true);
 		user.setCreateTime(new Date());
-		user.setPassword(UserParam.DEFAULT_PASSWORD);
+		user.setPassword(Consts.DEFAULT_PASSWORD);
 		List<UserRole> userRoles = new ArrayList<UserRole>();
 		userRoles.add(new UserRole("ecs_exam_work", "LC_USER"));
 		user.setUserRoles(userRoles);

+ 2 - 2
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/PermissionService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/PermissionService.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.service.core.entity.Permission;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
 
 
 /**

+ 5 - 5
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/PermissionServiceImpl.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/PermissionServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -10,10 +10,10 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.service.core.entity.Permission;
-import cn.com.qmth.examcloud.service.core.entity.RolePermissionRelation;
-import cn.com.qmth.examcloud.service.core.enums.PermissionType;
-import cn.com.qmth.examcloud.service.core.repo.PermissionRepo;
+import cn.com.qmth.examcloud.core.basic.dao.PermissionRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
+import cn.com.qmth.examcloud.core.basic.dao.enums.PermissionType;
 
 /**
  * 

+ 3 - 3
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/RolePermissionRelationService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/RolePermissionRelationService.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.service.core.entity.Permission;
-import cn.com.qmth.examcloud.service.core.entity.RolePermissionRelation;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
 
 /**
  * 

+ 5 - 5
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/RolePermissionRelationServiceImpl.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/RolePermissionRelationServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,10 +12,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
-import cn.com.qmth.examcloud.service.core.entity.Permission;
-import cn.com.qmth.examcloud.service.core.entity.RolePermissionRelation;
-import cn.com.qmth.examcloud.service.core.enums.PermissionType;
-import cn.com.qmth.examcloud.service.core.repo.RolePermissionRelationRepo;
+import cn.com.qmth.examcloud.core.basic.dao.RolePermissionRelationRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
+import cn.com.qmth.examcloud.core.basic.dao.enums.PermissionType;
 
 
 /**

+ 5 - 6
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/SpecialtyService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/SpecialtyService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -22,11 +22,10 @@ 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.service.core.dto.SpecialtyDto;
-import cn.com.qmth.examcloud.service.core.entity.CourseSpeciatly;
-import cn.com.qmth.examcloud.service.core.entity.Specialty;
-import cn.com.qmth.examcloud.service.core.repo.SpecialtyRepo;
-import cn.com.qmth.examcloud.service.core.service.sync.DataSendService;
+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;
+import cn.com.qmth.examcloud.core.basic.service.bean.SpecialtyDto;
 
 @Service
 public class SpecialtyService {

+ 5 - 6
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/StudentFaceInfoService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentFaceInfoService.java

@@ -1,20 +1,19 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.Date;
 import java.util.List;
 
 import javax.transaction.Transactional;
 
-import cn.com.qmth.examcloud.service.core.entity.Student;
-import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
+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;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceInfo;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.service.core.entity.StudentFaceInfo;
-import cn.com.qmth.examcloud.service.core.repo.StudentFaceInfoRepo;
-
 
 @Service
 public class StudentFaceInfoService {

+ 12 - 13
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/StudentService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.contains;
 
@@ -19,18 +19,17 @@ 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.service.core.dto.UserInfo;
-import cn.com.qmth.examcloud.service.core.entity.Org;
-import cn.com.qmth.examcloud.service.core.entity.Student;
-import cn.com.qmth.examcloud.service.core.entity.User;
-import cn.com.qmth.examcloud.service.core.entity.UserRole;
-import cn.com.qmth.examcloud.service.core.enums.LoginType;
-import cn.com.qmth.examcloud.service.core.enums.UserScope;
-import cn.com.qmth.examcloud.service.core.enums.UserType;
-import cn.com.qmth.examcloud.service.core.repo.OrgRepo;
-import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
-import cn.com.qmth.examcloud.service.core.service.sync.DataSendService;
+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;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
+import cn.com.qmth.examcloud.core.basic.dao.enums.LoginType;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
+import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
 
 /**
  * 学生服务类

+ 3 - 2
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/UserRoleService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserRoleService.java

@@ -1,9 +1,10 @@
-package cn.com.qmth.examcloud.service.core.service;
+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.service.core.repo.UserRoleRepo;
+import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 20 - 20
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/UserService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -24,23 +24,23 @@ 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.service.core.dto.UserInfo;
-import cn.com.qmth.examcloud.service.core.entity.Org;
-import cn.com.qmth.examcloud.service.core.entity.Student;
-import cn.com.qmth.examcloud.service.core.entity.User;
-import cn.com.qmth.examcloud.service.core.entity.UserLogin;
-import cn.com.qmth.examcloud.service.core.entity.UserOpsLog;
-import cn.com.qmth.examcloud.service.core.entity.UserRole;
-import cn.com.qmth.examcloud.service.core.enums.OrgType;
-import cn.com.qmth.examcloud.service.core.enums.UserScope;
-import cn.com.qmth.examcloud.service.core.enums.UserType;
-import cn.com.qmth.examcloud.service.core.params.UserParam;
-import cn.com.qmth.examcloud.service.core.repo.OrgRepo;
-import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
-import cn.com.qmth.examcloud.service.core.repo.UserLoginRepo;
-import cn.com.qmth.examcloud.service.core.repo.UserOpsLogRepo;
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
-import cn.com.qmth.examcloud.service.core.repo.UserRoleRepo;
+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.UserLoginRepo;
+import cn.com.qmth.examcloud.core.basic.dao.UserOpsLogRepo;
+import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
+import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
+import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserLogin;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserOpsLog;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
+import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
+import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
 
 /**
  * 用户服务类
@@ -207,7 +207,7 @@ public class UserService {
         //根据用户类型采用不同的初始化策略
         if(user.getType() == UserType.NOT_STUDENT){
             //初始化为默认密码
-            user.setPassword(UserParam.DEFAULT_PASSWORD);
+            user.setPassword(Consts.DEFAULT_PASSWORD);
 
         }else if(user.getType() == UserType.STUDENT){
             //截取身份证后6位为学生登录密码
@@ -216,7 +216,7 @@ public class UserService {
             if(StringUtils.isNotEmpty(identityNumber)){
                 user.setPassword(StringUtils.substring(identityNumber,-6,identityNumber.length()));
             }else{
-                user.setPassword(UserParam.DEFAULT_PASSWORD);
+                user.setPassword(Consts.DEFAULT_PASSWORD);
             }
         }
         user.setUpdateTime(new Date());

+ 0 - 20
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/service/core/service/sync/DataReceiveService.java

@@ -1,20 +0,0 @@
-package cn.com.qmth.examcloud.service.core.service.sync;
-
-import com.qmth.commons.dataSync.core.service.DataSyncService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by songyue on 17/8/3.
- */
-@Service
-public class DataReceiveService {
-
-    private static final Logger log = LoggerFactory.getLogger(DataReceiveService.class);
-
-    @Autowired
-    DataSyncService dataSyncService;
-
-}