考试项目依赖调整

zd-modules/zd-chemical/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-                            _                           _                    
-                           (_)                         | |                   
- _ __  _   _   ___   _   _  _  ______  ___  _   _  ___ | |_   ___  _ __ ___  
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ 
-| |   | |_| || (_) || |_| || |        \__ \| |_| |\__ \| |_ |  __/| | | | | |
-|_|    \__,_| \___/  \__, ||_|        |___/ \__, ||___/ \__| \___||_| |_| |_|
-                      __/ |                  __/ |                           
-                     |___/                  |___/                            

zd-modules/zd-exam/pom.xml

@@ -38,11 +38,11 @@
         </dependency>
 
         <!-- Swagger UI -->
-        <dependency>
+        <!--<dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${swagger.fox.version}</version>
-        </dependency>
+        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>
@@ -51,22 +51,22 @@
         </dependency>
 
         <!-- zd Common DataSource -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datasource</artifactId>
         </dependency>
 
-        <!-- zd Common DataScope -->
+        &lt;!&ndash; zd Common DataScope &ndash;&gt;
         <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datascope</artifactId>
         </dependency>
 
-        <!-- zd Common Log -->
+        &lt;!&ndash; zd Common Log &ndash;&gt;
         <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-log</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common Swagger -->
         <dependency>
@@ -79,7 +79,7 @@
             <artifactId>jave-all-deps</artifactId>
             <version>3.2.0</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
@@ -89,12 +89,27 @@
                     <artifactId>junit-vintage-engine</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.base</groupId>
+            <artifactId>zd-base-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.laboratory</groupId>
+            <artifactId>zd-laboratory-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -111,15 +126,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 打包时跳过test插件，不运行test测试用例 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

zd-modules/zd-exam/src/main/java/com/zd/exam/ZdExamApplication.java

@@ -1,7 +1,7 @@
 package com.zd.exam;
 
-import com.zd.common.security.annotation.EnableCustomConfig;
-import com.zd.common.security.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableCustomConfig;
+import com.zd.common.core.annotation.EnableRyFeignClients;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElAIOController.java

@@ -1,11 +1,11 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.R;
+import com.zd.model.domain.R;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.UrlFormatUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.page.TableDataInfo;
 import com.zd.exam.domain.*;
 import com.zd.exam.domain.vo.ElCourseVo;
 import com.zd.exam.enums.ScopeType;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElCategoryController.java

@@ -1,16 +1,16 @@
 package com.zd.exam.controller;
 
 import cn.hutool.core.collection.ListUtil;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.exam.domain.ElCategory;
 import com.zd.exam.service.IElCategoryService;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElCourseChapterController.java

@@ -1,9 +1,9 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.R;
+import com.zd.model.domain.R;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
 import com.zd.exam.domain.ElCourseChapter;
 import com.zd.exam.domain.ElPaper;
 import com.zd.exam.service.IElCourseChapterQuService;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElCourseController.java

@@ -1,15 +1,15 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElChapterLearnRecord;
 import com.zd.exam.domain.ElCourse;
 import com.zd.exam.domain.ElCourseChapter;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElExamClassifyController.java

@@ -1,14 +1,14 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElExamClassify;
 import com.zd.exam.service.IElExamClassifyService;
 import io.swagger.annotations.Api;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElExamController.java

@@ -1,15 +1,15 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.security.TokenService;
 import com.zd.exam.domain.ElExam;
 import com.zd.exam.domain.ElExamCertRelation;
 import com.zd.exam.domain.ElUserCert;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElOnePcController.java

@@ -3,8 +3,8 @@ package com.zd.exam.controller;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.UrlFormatUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
 import com.zd.exam.domain.ElSafeTrain;
 import com.zd.exam.service.IElSafeTrainService;
 import io.swagger.annotations.Api;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElPaperController.java

@@ -1,15 +1,15 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElPaper;
 import com.zd.exam.domain.ElPaperQu;
 import com.zd.exam.domain.vo.ElPaperVO;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElPassMarkconfigController.java

@@ -1,15 +1,15 @@
 package com.zd.exam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.exam.domain.ElPassConfigdetail;
 import com.zd.exam.domain.ElPassMarkconfig;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElPointsRecordController.java

@@ -1,15 +1,15 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElPassMarkconfig;
 import com.zd.exam.domain.ElPointsLoginfo;
 import com.zd.exam.domain.ElPointsRecord;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElPractiseController.java

@@ -1,13 +1,13 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElPractise;
 import com.zd.exam.domain.ElPractiseQu;
 import com.zd.exam.service.IElPractiseQuService;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElQuController.java

@@ -1,14 +1,14 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElQu;
 import com.zd.exam.service.ElQuService;
 import io.swagger.annotations.Api;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElRepoController.java

@@ -1,13 +1,13 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElRepo;
 import com.zd.exam.domain.vo.ElRepoVO;
 import com.zd.exam.service.ElRepoService;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElResourcesController.java

@@ -1,14 +1,14 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElResources;
 import com.zd.exam.service.IElResourcesService;
 import io.swagger.annotations.Api;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElSafeTrainController.java

@@ -5,8 +5,8 @@ import java.io.IOException;
 import java.util.Optional;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.exam.domain.ElSafeTrain;
 import com.zd.exam.domain.vo.ElSafeTrainVO;
 import com.zd.exam.service.IElSafeTrainService;
@@ -21,13 +21,13 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.utils.poi.ExcelUtil;
-import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.domain.AjaxResult;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.page.TableDataInfo;
 
 /**
  * 安全培训Controller

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElSafeTrainRecordController.java

@@ -2,10 +2,10 @@ package com.zd.exam.controller;
 
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElSafeTrainRecord;
 import com.zd.exam.service.IElSafeTrainRecordService;
 import io.swagger.annotations.Api;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElScoreRewardconfigController.java

@@ -1,16 +1,16 @@
 package com.zd.exam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.exam.domain.ElScoreRewardconfig;
 import com.zd.exam.service.IElScoreRewardconfigService;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElUserBookController.java

@@ -4,15 +4,15 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElUserExamController.java

@@ -4,16 +4,16 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElpersonCenterController.java

@@ -1,18 +1,13 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.domain.R;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * @Author: liujh
  * @Date: 2021/12/24/11:45

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElrewardPointController.java

@@ -1,12 +1,12 @@
 package com.zd.exam.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.ElPointsLoginfo;
 import com.zd.exam.domain.dto.ElPointsRecordDTO;
 import com.zd.exam.domain.vo.ElPointsLoginfoVO;

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/LabCertificateController.java

@@ -4,8 +4,8 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,15 +17,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.exam.domain.LabCertificate;
 import com.zd.exam.service.ILabCertificateService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.utils.poi.ExcelUtil;
-import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.domain.AjaxResult;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.page.TableDataInfo;
 
 /**
  * 证书管理Controller

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElCategory.java

@@ -1,8 +1,8 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.valid.ValidGroup;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.valid.ValidGroup;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.collections4.CollectionUtils;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElChapterLearnRecord.java

@@ -2,14 +2,14 @@ package com.zd.exam.domain;
 
 import javax.validation.constraints.NotNull;
 
-import com.zd.common.core.valid.ValidGroup;
+import com.zd.model.valid.ValidGroup;
 import com.zd.exam.util.CourcseUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElConvertRecord.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElCourcesAccessRecord.java

@@ -2,13 +2,13 @@ package com.zd.exam.domain;
 
 import javax.validation.constraints.NotNull;
 
-import com.zd.common.core.valid.ValidGroup;
+import com.zd.model.valid.ValidGroup;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 /**

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElCourse.java

@@ -1,10 +1,9 @@
 package com.zd.exam.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.domain.qc.QCInterface;
-import com.zd.common.core.valid.ValidGroup;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.valid.ValidGroup;
+import com.zd.model.entity.BaseEntity;
 import com.zd.exam.util.CourcseUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElCourseChapter.java

@@ -3,16 +3,16 @@ package com.zd.exam.domain;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import com.zd.common.core.valid.ValidGroup;
+import com.zd.model.valid.ValidGroup;
 import com.zd.exam.util.CourcseUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.hibernate.validator.constraints.Length;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 import java.util.ArrayList;
 import java.util.List;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElCourseChapterQu.java

@@ -2,13 +2,13 @@ package com.zd.exam.domain;
 
 import javax.validation.constraints.NotNull;
 
-import com.zd.common.core.valid.ValidGroup;
+import com.zd.model.valid.ValidGroup;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.List;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElCourseChapterQuAnswer.java

@@ -3,14 +3,14 @@ package com.zd.exam.domain;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import com.zd.common.core.valid.ValidGroup;
+import com.zd.model.valid.ValidGroup;
 import org.hibernate.validator.constraints.Length;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 考试考题题备选答案对象 el_course_chapter_qu_answer

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElExam.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElExamCertRelation.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElExamClassify.java

@@ -2,14 +2,14 @@ package com.zd.exam.domain;
 
 import javax.validation.constraints.NotBlank;
 
-import com.zd.common.core.valid.ValidGroup;
+import com.zd.model.valid.ValidGroup;
 import org.hibernate.validator.constraints.Length;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 题目类型对象 el_exam_classify

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElExamDept.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElExamQu.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElExamQuAnswer.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElExamRepo.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPaper.java

@@ -5,8 +5,8 @@ import java.util.Date;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import com.zd.exam.domain.vo.ExamConfig;
 import com.zd.exam.util.CourcseUtils;
 import io.swagger.annotations.ApiModel;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPaperQu.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.data.annotation.Transient;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPaperQuAnswer.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPassConfigdetail.java

@@ -2,10 +2,10 @@ package com.zd.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 信用合格分设置配置详情对象 el_pass_configdetail

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPassMarkconfig.java

@@ -2,10 +2,10 @@ package com.zd.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 信用合格分设置对象 el_pass_markconfig

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPointOrder.java

@@ -1,9 +1,9 @@
 package com.zd.exam.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.valid.ValidGroup;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.valid.ValidGroup;
+import com.zd.model.entity.BaseEntity;
 import com.zd.exam.util.CourcseUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPointTradeNo.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPointsLoginfo.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPointsRecord.java

@@ -1,10 +1,8 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
-import com.zd.common.core.enums.PointRecordType;
+import com.zd.model.entity.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
 
 
 /**

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPractise.java

@@ -1,8 +1,8 @@
 package com.zd.exam.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPractiseQu.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.data.annotation.Transient;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElPractiseQuAnswer.java

@@ -6,10 +6,10 @@ import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.springframework.data.annotation.Transient;
 
 /**

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElQu.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElQuAnswer.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElQuRepo.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElRepo.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElResources.java

@@ -3,16 +3,16 @@ package com.zd.exam.domain;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import com.zd.common.core.valid.ValidGroup;
+import com.zd.model.valid.ValidGroup;
 import com.zd.exam.enums.FileType;
 import com.zd.exam.util.CourcseUtils;
 import org.hibernate.validator.constraints.Length;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 import java.util.List;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElSafeTrain.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElSafeTrainRecord.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElScoreRewardconfig.java

@@ -2,10 +2,10 @@ package com.zd.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 奖励分设置对象 el_score_rewardconfig

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElUserBook.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElUserCert.java

@@ -2,8 +2,8 @@ package com.zd.exam.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElUserExam.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/LabCertificate.java

@@ -2,8 +2,8 @@ package com.zd.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 证书管理对象 lab_certificate

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/vo/ElCourseVo.java

@@ -1,7 +1,7 @@
 package com.zd.exam.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import com.zd.exam.util.CourcseUtils;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/vo/ElUserPointsLoginfoVO.java

@@ -1,6 +1,6 @@
 package com.zd.exam.domain.vo;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import com.zd.exam.domain.ElPointsLoginfo;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/mapper/ElPointsRecordMapper.java

@@ -1,6 +1,6 @@
 package com.zd.exam.mapper;
 
-import com.zd.common.core.domain.R;
+import com.zd.model.domain.R;
 import com.zd.exam.domain.ElPointsRecord;
 import com.zd.exam.domain.dto.ElPointsRecordDTO;
 import com.zd.exam.domain.vo.ElPointsRecordListVO;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/IElPointsRecordService.java

@@ -1,14 +1,13 @@
 package com.zd.exam.service;
 
-import com.zd.common.core.domain.R;
 import com.zd.exam.domain.ElPointsLoginfo;
 import com.zd.exam.domain.ElPointsRecord;
 import com.zd.exam.domain.dto.ElPointsRecordDTO;
 import com.zd.exam.domain.vo.ElPointsCountVO;
 import com.zd.exam.domain.vo.ElPointsLoginfoVO;
 import com.zd.exam.domain.vo.ElPointsRecordListVO;
-import com.zd.common.core.enums.PointRecordType;
 import com.zd.exam.domain.vo.ElUserPointsLoginfoVO;
+import com.zd.model.enums.PointRecordType;
 
 import java.util.List;
 import java.util.Map;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/IElScoreRewardconfigService.java

@@ -1,6 +1,6 @@
 package com.zd.exam.service;
 
-import com.zd.common.core.domain.R;
+import com.zd.model.domain.R;
 import com.zd.exam.domain.ElScoreRewardconfig;
 
 import java.util.List;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/convert/BonusPointsService.java

@@ -1,11 +1,9 @@
 package com.zd.exam.service.convert;
 
 import cn.hutool.json.JSONUtil;
-import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
-import com.zd.common.core.domain.R;
-import com.zd.exam.service.impl.ElPaperServiceImpl;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.domain.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,7 +110,7 @@ public class BonusPointsService {
             map.put("negativeOrBlack", userStatus);
             R r = remoteLaboratoryService.getBlackTimeArea(map);
             if(r != null && r.getData() != null){
-                LabBlackConfig labBlackConfig = JSON.parseObject(JSONUtils.toJSONString(r.getData()),LabBlackConfig.class);
+                LabBlackConfig labBlackConfig = JSON.parseObject(JSONUtil.toJsonStr(r.getData()),LabBlackConfig.class);
 
                 return labBlackConfig;
             }

zd-modules/zd-exam/src/main/java/com/zd/exam/service/convert/LabBlackConfig.java

@@ -1,7 +1,7 @@
 package com.zd.exam.service.convert;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElCategoryServiceImpl.java

@@ -4,13 +4,13 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.utils.SaveUtil;
 
 import com.zd.exam.domain.ElCourse;
 import com.zd.exam.domain.ElCourseChapter;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElChapterLearnRecordServiceImpl.java

@@ -1,36 +1,34 @@
 package com.zd.exam.service.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import cn.hutool.json.JSONUtil;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
-
+import com.zd.exam.domain.ElChapterLearnRecord;
 import com.zd.exam.domain.ElConvertRecord;
 import com.zd.exam.domain.ElCourseChapter;
 import com.zd.exam.domain.vo.ElCourseVo;
 import com.zd.exam.enums.ConvertType;
+import com.zd.exam.mapper.ElChapterLearnRecordMapper;
 import com.zd.exam.mapper.ElConvertRecordMapper;
 import com.zd.exam.mapper.ElCourseChapterMapper;
 import com.zd.exam.mapper.ElCourseMapper;
+import com.zd.exam.service.IElChapterLearnRecordService;
 import com.zd.exam.service.IElConvertRecordService;
 import com.zd.exam.service.convert.BonusPointsService;
 import com.zd.exam.service.convert.ConvertTimingService;
 import com.zd.exam.service.convert.LabBlackConfig;
-import com.zd.exam.util.CourcseUtils;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.exam.mapper.ElChapterLearnRecordMapper;
-import com.zd.exam.domain.ElChapterLearnRecord;
-import com.zd.exam.service.IElChapterLearnRecordService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 学习记录Service业务层处理

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElConvertRecordServiceImpl.java

@@ -2,7 +2,7 @@ package com.zd.exam.service.impl;
 
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.exam.domain.ElConvertRecord;
 import com.zd.exam.mapper.ElConvertRecordMapper;
 import com.zd.exam.service.IElConvertRecordService;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElCourcesAccessRecordServiceImpl.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElCourseChapterQuServiceImpl.java

@@ -6,7 +6,7 @@ import java.util.List;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import com.zd.exam.domain.*;
 import com.zd.exam.enums.QuType;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElCourseChapterServiceImpl.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import com.zd.exam.domain.ElCourse;
 import com.zd.exam.domain.ElCourseChapterQu;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElCourseServiceImpl.java

@@ -1,13 +1,13 @@
 package com.zd.exam.service.impl;
 
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.exam.domain.ElCategory;
 import com.zd.exam.domain.ElCourcesAccessRecord;
 import com.zd.exam.domain.ElCourse;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElExamCertRelationServiceImpl.java

@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.entity.SysUser;
 import com.zd.common.core.utils.SpringUtils;
-import com.zd.common.security.service.TokenService;
+import com.zd.common.core.security.TokenService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElExamClassifyServiceImpl.java

@@ -2,11 +2,11 @@ package com.zd.exam.service.impl;
 
 import java.util.List;
 
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElExamDeptServiceImpl.java

@@ -1,15 +1,16 @@
 package com.zd.exam.service.impl;
 
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.exam.domain.ElExamDept;
 import com.zd.exam.enums.ScopeType;
 import com.zd.exam.mapper.ElExamDeptMapper;
 import com.zd.exam.service.ElExamDeptService;
-import com.zd.system.api.RemoteDeptService;
+import com.zd.model.domain.AjaxResult;
+import com.zd.system.api.feign.RemoteDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElExamQuServiceImpl.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import com.zd.exam.domain.ElExam;
 import com.zd.exam.service.ElQuService;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElExamRepoServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zd.exam.service.impl;
 
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.security.service.TokenService;
+import com.zd.common.core.security.TokenService;
 import com.zd.exam.domain.*;
 import com.zd.exam.domain.vo.ExamConfig;
 import com.zd.exam.enums.QuType;
@@ -12,9 +12,7 @@ import com.zd.exam.mapper.ElRepoMapper;
 import com.zd.exam.service.ElExamRepoService;
 import com.zd.exam.service.ElQuAnswerService;
 import com.zd.exam.service.ElQuService;
-import com.zd.system.api.model.LoginUser;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.BeanUtils;
+import com.zd.model.entity.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElExamServiceImpl.java

@@ -1,10 +1,9 @@
 package com.zd.exam.service.impl;
 
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
 import com.zd.exam.domain.ElExam;
 import com.zd.exam.domain.ElExamCertRelation;
 import com.zd.exam.domain.ElExamQu;
@@ -17,7 +16,8 @@ import com.zd.exam.service.ElExamDeptService;
 import com.zd.exam.service.ElExamRepoService;
 import com.zd.exam.service.ElExamService;
 import com.zd.exam.service.IElExamQuService;
-import com.zd.system.api.model.LoginUser;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.LoginUser;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPaperServiceImpl.java

@@ -1,14 +1,10 @@
 package com.zd.exam.service.impl;
 
-import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.NoRollException;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.*;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
 import com.zd.exam.domain.*;
 import com.zd.exam.domain.vo.ChapterLearnVo;
 import com.zd.exam.domain.vo.ElPaperAssessVo;
@@ -20,8 +16,12 @@ import com.zd.exam.mapper.*;
 import com.zd.exam.service.*;
 import com.zd.exam.service.convert.BonusPointsService;
 import com.zd.exam.service.convert.ConvertTimingService;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.feign.RemoteUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPassConfigdetailServiceImpl.java

@@ -3,7 +3,7 @@ package com.zd.exam.service.impl;
 import java.util.List;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPassMarkconfigServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.exam.domain.ElPassConfigdetail;
 import com.zd.exam.domain.ElPassMarkconfig;
 import com.zd.exam.domain.vo.ElPassMarkconfigVO;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPointsRecordServiceImpl.java

@@ -1,28 +1,19 @@
 package com.zd.exam.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.SpringUtils;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
 import com.zd.exam.domain.*;
 import com.zd.exam.domain.dto.ElPointsRecordDTO;
 import com.zd.exam.domain.vo.*;
-import com.zd.common.core.enums.PointRecordType;
 import com.zd.exam.mapper.*;
 import com.zd.exam.service.IElPointsRecordService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.face.factory.RemoteFaceFallbackFactory;
-import io.netty.util.internal.StringUtil;
-import org.checkerframework.checker.units.qual.A;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.enums.PointRecordType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPractiseQuServiceImpl.java

@@ -3,7 +3,7 @@ package com.zd.exam.service.impl;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.exam.domain.*;
 import com.zd.exam.mapper.ElPractiseQuAnswerMapper;
 import com.zd.exam.mapper.ElPractiseQuMapper;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPractiseServiceImpl.java

@@ -7,8 +7,8 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.SaveUtil;
 
 import com.zd.exam.domain.*;
 import com.zd.exam.enums.ConvertType;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElQuAnswerServiceImpl.java

@@ -1,11 +1,8 @@
 package com.zd.exam.service.impl;
 
-import com.zd.common.security.service.TokenService;
 import com.zd.exam.domain.ElQuAnswer;
 import com.zd.exam.mapper.ElQuAnswerMapper;
 import com.zd.exam.service.ElQuAnswerService;
-import com.zd.system.api.domain.SysUser;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElQuServiceImpl.java

@@ -1,9 +1,8 @@
 package com.zd.exam.service.impl;
 
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
+import com.zd.common.core.security.TokenService;
 import com.zd.exam.domain.ElQu;
 import com.zd.exam.domain.ElQuAnswer;
 import com.zd.exam.mapper.ElQuAnswerMapper;
@@ -12,8 +11,9 @@ import com.zd.exam.mapper.ElQuRepoMapper;
 import com.zd.exam.service.ElQuAnswerService;
 import com.zd.exam.service.ElQuRepoService;
 import com.zd.exam.service.ElQuService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.model.LoginUser;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.entity.SysUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElRepoServiceImpl.java

@@ -1,15 +1,15 @@
 package com.zd.exam.service.impl;
 
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.security.TokenService;
 import com.zd.exam.domain.ElRepo;
 import com.zd.exam.domain.vo.ElRepoVO;
 import com.zd.exam.mapper.ElQuRepoMapper;
 import com.zd.exam.mapper.ElRepoMapper;
 import com.zd.exam.service.ElRepoService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.model.LoginUser;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElResourcesServiceImpl.java

@@ -1,22 +1,22 @@
 package com.zd.exam.service.impl;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.base.api.feign.RemoteFileService;
+import com.zd.base.api.feign.RemoteKkFileService;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
 import com.zd.exam.domain.ElCourseChapter;
 import com.zd.exam.domain.ElResources;
 import com.zd.exam.mapper.ElCategoryMapper;
 import com.zd.exam.mapper.ElCourseChapterMapper;
 import com.zd.exam.mapper.ElResourcesMapper;
 import com.zd.exam.service.IElResourcesService;
-import com.zd.system.api.RemoteFileService;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.kkFile.RemoteKkFileService;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysFile;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElSafeTrainServiceImpl.java

@@ -2,13 +2,13 @@ package com.zd.exam.service.impl;
 
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.security.TokenService;
 import com.zd.exam.domain.ElSafeTrain;
 import com.zd.exam.domain.vo.ElSafeTrainVO;
 import com.zd.exam.mapper.ElSafeTrainMapper;
 import com.zd.exam.service.IElSafeTrainService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElScoreRewardconfigServiceImpl.java

@@ -1,13 +1,12 @@
 package com.zd.exam.service.impl;
 
-import com.zd.common.core.domain.R;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
 import com.zd.exam.domain.ElScoreRewardconfig;
 import com.zd.exam.mapper.ElScoreRewardconfigMapper;
 import com.zd.exam.service.IElPointsRecordService;
 import com.zd.exam.service.IElScoreRewardconfigService;
+import com.zd.model.domain.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElUserBookServiceImpl.java

@@ -3,7 +3,7 @@ package com.zd.exam.service.impl;
 import java.util.List;
 
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.core.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.exam.mapper.ElUserBookMapper;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElUserCertServiceImpl.java

@@ -6,7 +6,7 @@ import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.UrlFormatUtils;
-import com.zd.common.security.service.TokenService;
+import com.zd.common.core.security.TokenService;
 import com.zd.exam.domain.ElExam;
 import com.zd.exam.domain.ElExamCertRelation;
 import com.zd.exam.domain.ElUserCert;
@@ -16,7 +16,7 @@ import com.zd.exam.mapper.ElUserCertMapper;
 import com.zd.exam.service.IElUserCertService;
 import com.zd.exam.service.ILabCertificateService;
 import com.zd.exam.util.CertUtil;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.entity.SysUser;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElUserExamServiceImpl.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.core.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.exam.mapper.ElUserExamMapper;