配合升级公共Jar

examcloud-core-print-common/pom.xml

@@ -7,14 +7,14 @@
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-print</artifactId>
-        <version>master-SNAPSHOT</version>
+        <version>2019-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <!-- fix conflicted jars -->
         <dependency>
-            <groupId>cn.com.qmth.examcloud.commons</groupId>
-            <artifactId>examcloud-commons-web</artifactId>
+            <groupId>cn.com.qmth.examcloud</groupId>
+            <artifactId>examcloud-web</artifactId>
             <version>${examcloud.version}</version>
             <exclusions>
                 <exclusion>

examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/IdEntity.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.common;
 
-import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
+import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;

examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/aspect/AspectController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.common.aspect;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/upyun/UpYunClient.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.common.upyun;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.common.utils.FileUtils;
 import main.java.com.UpYun;

examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/utils/Check.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.common.utils;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 
 import java.lang.reflect.Array;
 import java.util.Collection;

examcloud-core-print-dao/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-print</artifactId>
-        <version>master-SNAPSHOT</version>
+        <version>2019-SNAPSHOT</version>
     </parent>
 
     <dependencies>

examcloud-core-print-provider/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-print</artifactId>
-        <version>master-SNAPSHOT</version>
+        <version>2019-SNAPSHOT</version>
     </parent>
 
     <dependencies>

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/bean/UserInfo.java

@@ -7,9 +7,9 @@
 
 package cn.com.qmth.examcloud.core.print.api.bean;
 
-import cn.com.qmth.examcloud.commons.web.security.bean.Role;
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
+import cn.com.qmth.examcloud.api.commons.security.bean.Role;
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.api.commons.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.core.print.service.bean.common.OrgInfo;
 
 import java.util.List;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/CommonController.java

@@ -7,8 +7,8 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.common.upyun.UpYunClient;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/CoursePaperController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.service.CoursePaperService;
 import cn.com.qmth.examcloud.core.print.service.ExamStructureService;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/CourseStatisticController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
 import cn.com.qmth.examcloud.core.print.service.bean.common.RefreshInfo;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/ExamStructureController.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.service.ExamStructureService;
 import cn.com.qmth.examcloud.core.print.service.bean.examstructure.ExamStructureInfo;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/PrintingProjectController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.api.bean.UserInfo;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/PrintingProjectStatisticController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectStatisticService;
 import cn.com.qmth.examcloud.core.print.service.bean.common.RefreshInfo;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/PrintingTemplateController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.service.PrintingTemplateService;
 import cn.com.qmth.examcloud.core.print.service.bean.printingtemplate.PrintingTemplateInfo;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/ProjectBackupSettingController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.entity.ProjectBackupSetting;
 import cn.com.qmth.examcloud.core.print.service.ProjectBackupSettingService;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/ProjectOtherSettingController.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.controller;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.entity.ProjectOtherSetting;
 import cn.com.qmth.examcloud.core.print.service.ProjectOtherSettingService;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/provider/CoursePaperCloudServiceProvider.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.provider;
 
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.api.CoursePaperCloudService;
 import cn.com.qmth.examcloud.core.print.api.request.SyncCoursePaperReq;
 import cn.com.qmth.examcloud.core.print.api.response.SyncCoursePaperResp;

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/provider/SyncCloudServiceProvider.java

@@ -7,10 +7,10 @@
 
 package cn.com.qmth.examcloud.core.print.api.provider;
 
-import cn.com.qmth.examcloud.commons.api.HandleSyncCloudService;
-import cn.com.qmth.examcloud.commons.api.request.*;
-import cn.com.qmth.examcloud.commons.api.response.*;
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.global.api.HandleSyncCloudService;
+import cn.com.qmth.examcloud.global.api.request.*;
+import cn.com.qmth.examcloud.global.api.response.*;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.enums.ExamType;
 import cn.com.qmth.examcloud.core.print.service.*;
 import cn.com.qmth.examcloud.core.print.service.bean.common.ExamInfo;

examcloud-core-print-service/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-print</artifactId>
-        <version>master-SNAPSHOT</version>
+        <version>2019-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -18,7 +18,7 @@
             <version>${examcloud.version}</version>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.rmi</groupId>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-print-api</artifactId>
             <version>${examcloud.version}</version>
             <exclusions>
@@ -29,8 +29,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.rmi</groupId>
-            <artifactId>examcloud-commons-api</artifactId>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
+            <artifactId>examcloud-global-api</artifactId>
             <version>${examcloud.version}</version>
             <exclusions>
                 <exclusion>
@@ -40,7 +40,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.rmi</groupId>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-basic-api-client</artifactId>
             <version>${examcloud.version}</version>
             <exclusions>
@@ -51,7 +51,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.rmi</groupId>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-examwork-api-client</artifactId>
             <version>${examcloud.version}</version>
             <exclusions>
@@ -62,7 +62,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.rmi</groupId>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-questions-api-client</artifactId>
             <version>${examcloud.version}</version>
             <exclusions>

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/common/CourseInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.common;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
  * 课程信息

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/common/ExamInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.common;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
  * 学校机构的考试信息

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/common/OrgInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.common;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
  * 学校信息

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursepaper/CoursePaperQuery.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.coursepaper;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
  * @author: fengdesheng

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursepaper/ExportAllReq.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.coursepaper;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.enums.ExportType;
 
 /**

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursepaper/ExportBatchReq.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.coursepaper;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.enums.ExportType;
 
 import java.util.Arrays;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursepaper/ExportFileInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.coursepaper;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.common.utils.Pair;
 
 /**

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseStatisticQuery.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.coursestatistic;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.common.PageQuery;
 
 /**

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/examquestionstructure/ExamQuestionStructureInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.examquestionstructure;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.entity.ObjectiveQuestionStructure;
 import cn.com.qmth.examcloud.core.print.entity.SubjectiveQuestionStructure;
 

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/examstructure/ExamStructureInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.examstructure;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.entity.ExamQuestionStructure;
 
 public class ExamStructureInfo implements JsonSerializable {

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/examstructure/ExamStructureQuery.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.examstructure;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.common.PageQuery;
 
 public class ExamStructureQuery extends PageQuery implements JsonSerializable {

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/printingproject/PrintingProjectInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.printingproject;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 import java.util.Date;
 

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/printingproject/PrintingProjectQuery.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.printingproject;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.common.PageQuery;
 
 /**

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/printingtemplate/PrintingTemplateInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.printingtemplate;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.print.enums.TemplateType;
 
 /**

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CoursePaperServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.print.common.upyun.SystemProperty;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CourseStatisticServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.OrderBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/ExamStructureServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.OrderBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingProjectServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.OrderBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingProjectStatisticServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.common.utils.DateUtils;
 import cn.com.qmth.examcloud.core.print.entity.PrintingProject;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingTemplateServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.print.common.upyun.UpYunClient;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/ProjectBackupSettingServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.entity.ProjectBackupSetting;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/ProjectOtherSettingServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.entity.ProjectOtherSetting;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/QuestionStructureServiceImpl.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;

examcloud-core-print-starter/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-print</artifactId>
-        <version>master-SNAPSHOT</version>
+        <version>2019-SNAPSHOT</version>
     </parent>
 
     <dependencies>

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/PrintApplication.java

@@ -7,10 +7,10 @@
 
 package cn.com.qmth.examcloud.core.print;
 
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.logging.SLF4JImpl;
-import cn.com.qmth.examcloud.commons.web.boot.ExamCloudApp;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.logging.SLF4JImpl;
+import cn.com.qmth.examcloud.web.boot.ExamCloudApp;
 import org.slf4j.MDC;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/InterceptorConfig.java

@@ -7,14 +7,14 @@
 
 package cn.com.qmth.examcloud.core.print.config;
 
-import cn.com.qmth.examcloud.commons.base.util.PathUtil;
-import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
-import cn.com.qmth.examcloud.commons.web.interceptor.FirstInterceptor;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.commons.web.security.RequestPermissionInterceptor;
-import cn.com.qmth.examcloud.commons.web.security.SpringCloudInterceptor;
-import cn.com.qmth.examcloud.commons.web.security.bean.Role;
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
+import cn.com.qmth.examcloud.api.commons.security.bean.Role;
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.commons.util.PathUtil;
+import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
+import cn.com.qmth.examcloud.web.interceptor.FirstInterceptor;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
+import cn.com.qmth.examcloud.web.security.RequestPermissionInterceptor;
+import cn.com.qmth.examcloud.web.security.SpringCloudInterceptor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/PropertiesConfig.java

@@ -7,8 +7,8 @@
 
 package cn.com.qmth.examcloud.core.print.config;
 
-import cn.com.qmth.examcloud.commons.base.util.PathUtil;
-import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
+import cn.com.qmth.examcloud.commons.util.PathUtil;
+import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Configuration;

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/RedisConfig.java

@@ -7,9 +7,9 @@
 
 package cn.com.qmth.examcloud.core.print.config;
 
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClientImpl;
-import cn.com.qmth.examcloud.commons.web.support.CustomResponseErrorHandler;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
+import cn.com.qmth.examcloud.web.redis.RedisClientImpl;
+import cn.com.qmth.examcloud.web.support.CustomResponseErrorHandler;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;

pom.xml

@@ -3,13 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-core-print</artifactId>
-    <version>master-SNAPSHOT</version>
+    <version>2019-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-parent</artifactId>
-        <version>master-SNAPSHOT</version>
+        <version>2019</version>
     </parent>
 
     <modules>
@@ -21,7 +21,7 @@
     </modules>
 
     <properties>
-        <examcloud.version>master-SNAPSHOT</examcloud.version>
+        <examcloud.version>2019-SNAPSHOT</examcloud.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>