【重构架构】 system 和 base服务合并

zd-modules/zd-base/pom.xml

@@ -14,10 +14,6 @@
     <description>基础服务</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -40,23 +36,43 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- zd Common DataSource -->
         <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zd.base</groupId>
+            <artifactId>zd-base-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zd.laboratory</groupId>
+            <artifactId>zd-laboratory-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zd.exam</groupId>
+            <artifactId>zd-exam-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!-- zd Common DataSource -->
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datasource</artifactId>
         </dependency>
 
-        <!-- zd Common Log -->
+        &lt;!&ndash; zd Common Log &ndash;&gt;
         <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-log</artifactId>
         </dependency>
 
-        <!-- zd Common DataScope -->
+        &lt;!&ndash; zd Common DataScope &ndash;&gt;
         <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datascope</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>connect</groupId>

zd-modules/zd-base/src/main/java/com/zd/base/BaseApplicaion.java

@@ -1,16 +1,19 @@
 package com.zd.base;
 
-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 lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableCustomConfig
 @EnableRyFeignClients
 @SpringBootApplication
 @EnableScheduling
+@ComponentScan(basePackages = {"com.zd"})
 @Slf4j
 public class BaseApplicaion {
     public static void main(String[] args) {

zd-modules/zd-base/src/main/java/com/zd/base/files/file/controller/SysFileController.java

@@ -1,9 +1,9 @@
 package com.zd.base.files.file.controller;
 
+import com.zd.base.api.entity.SysFile;
 import com.zd.base.files.file.service.ISysFileService;
-import com.zd.common.core.domain.R;
 import com.zd.common.core.utils.file.FileUtils;
-import com.zd.system.api.domain.SysFile;
+import com.zd.model.domain.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-base/src/main/java/com/zd/base/job/controller/SysJobController.java

@@ -3,23 +3,22 @@ package com.zd.base.job.controller;
 import com.zd.base.job.domain.SysJob;
 import com.zd.base.job.service.ISysJobService;
 import com.zd.base.job.utils.CronUtils;
-import com.zd.common.core.constant.Constants;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.exception.job.TaskException;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.exception.TaskException;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.poi.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.constant.BaseConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
@@ -76,11 +75,11 @@ public class SysJobController extends BaseController {
     public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException {
         if (!CronUtils.isValid(job.getCronExpression())) {
             return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
-        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
+        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), BaseConstants.LOOKUP_RMI)) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi://'调用");
-        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_LDAP)) {
+        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), BaseConstants.LOOKUP_LDAP)) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap://'调用");
-        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{BaseConstants.HTTP, BaseConstants.HTTPS})) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)//'调用");
         }
         job.setCreateBy(SecurityUtils.getUsername());
@@ -96,11 +95,11 @@ public class SysJobController extends BaseController {
     public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException {
         if (!CronUtils.isValid(job.getCronExpression())) {
             return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
-        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
+        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), BaseConstants.LOOKUP_RMI)) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi://'调用");
-        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_LDAP)) {
+        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), BaseConstants.LOOKUP_LDAP)) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap://'调用");
-        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{BaseConstants.HTTP, BaseConstants.HTTPS})) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)//'调用");
         }
         job.setUpdateBy(SecurityUtils.getUsername());

zd-modules/zd-base/src/main/java/com/zd/base/job/controller/SysJobLogController.java

@@ -2,18 +2,17 @@ package com.zd.base.job.controller;
 
 import com.zd.base.job.domain.SysJobLog;
 import com.zd.base.job.service.ISysJobLogService;
-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.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+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.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

zd-modules/zd-base/src/main/java/com/zd/base/job/domain/SysJob.java

@@ -2,14 +2,12 @@ package com.zd.base.job.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.base.job.utils.CronUtils;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.constant.ScheduleConstants;
+import com.zd.model.annotation.Excel;
+import com.zd.model.constant.ScheduleConstants;
+import com.zd.model.entity.BaseEntity;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.util.Date;
@@ -25,7 +23,7 @@ public class SysJob extends BaseEntity {
     /**
      * 任务ID
      */
-    @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
+    @Excel(name = "任务序号", cellType = Excel.ColumnType.NUMERIC)
     private Long jobId;
 
     /**

zd-modules/zd-base/src/main/java/com/zd/base/job/domain/SysJobLog.java

@@ -1,10 +1,9 @@
 package com.zd.base.job.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 org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-
 import java.util.Date;
 
 /**

zd-modules/zd-base/src/main/java/com/zd/base/job/service/ISysJobService.java

@@ -1,9 +1,8 @@
 package com.zd.base.job.service;
 
 import com.zd.base.job.domain.SysJob;
-import com.zd.common.core.exception.job.TaskException;
+import com.zd.common.core.exception.TaskException;
 import org.quartz.SchedulerException;
-
 import java.util.List;
 
 /**

zd-modules/zd-base/src/main/java/com/zd/base/job/service/impl/SysJobServiceImpl.java

@@ -5,8 +5,8 @@ import com.zd.base.job.mapper.SysJobMapper;
 import com.zd.base.job.service.ISysJobService;
 import com.zd.base.job.utils.CronUtils;
 import com.zd.base.job.utils.ScheduleUtils;
-import com.zd.common.core.constant.ScheduleConstants;
-import com.zd.common.core.exception.job.TaskException;
+import com.zd.common.core.exception.TaskException;
+import com.zd.model.constant.ScheduleConstants;
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
 import org.quartz.Scheduler;
@@ -14,7 +14,6 @@ import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.PostConstruct;
 import java.util.List;
 

zd-modules/zd-base/src/main/java/com/zd/base/job/task/ChemicalTask.java

@@ -1,6 +1,6 @@
 package com.zd.base.job.task;
 
-import com.zd.system.api.chemical.RemoteStockService;
+import com.zd.system.api.feign.RemoteStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

zd-modules/zd-base/src/main/java/com/zd/base/job/task/ExamTask.java

@@ -1,10 +1,10 @@
 package com.zd.base.job.task;
 
-import com.zd.common.core.domain.R;
-import com.zd.system.api.exam.RemoteExamService;
+
+import com.zd.exam.api.feign.RemoteExamService;
+import com.zd.model.domain.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

zd-modules/zd-base/src/main/java/com/zd/base/job/task/FileViewTask.java

@@ -1,15 +1,15 @@
 package com.zd.base.job.task;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.redis.service.RedisService;
-import com.zd.system.api.exam.RemoteExamService;
-import com.zd.system.api.exam.domain.ElResources;
-import com.zd.system.api.kkFile.RemoteKkFileService;
+
+import com.zd.base.api.feign.RemoteKkFileService;
+import com.zd.common.core.redis.RedisService;
+import com.zd.exam.api.entity.ElResources;
+import com.zd.exam.api.feign.RemoteExamService;
+import com.zd.model.domain.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;

zd-modules/zd-base/src/main/java/com/zd/base/job/task/LabTask.java

@@ -1,6 +1,7 @@
 package com.zd.base.job.task;
 
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

zd-modules/zd-base/src/main/java/com/zd/base/job/utils/AbstractQuartzJob.java

@@ -3,17 +3,16 @@ package com.zd.base.job.utils;
 import com.zd.base.job.domain.SysJob;
 import com.zd.base.job.domain.SysJobLog;
 import com.zd.base.job.service.ISysJobLogService;
-import com.zd.common.core.constant.ScheduleConstants;
+import com.zd.common.core.utils.BeanUtils;
 import com.zd.common.core.utils.ExceptionUtil;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.bean.BeanUtils;
+import com.zd.model.constant.ScheduleConstants;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.util.Date;
 
 /**

zd-modules/zd-base/src/main/java/com/zd/base/job/utils/ScheduleUtils.java

@@ -1,9 +1,8 @@
 package com.zd.base.job.utils;
 
 import com.zd.base.job.domain.SysJob;
-import com.zd.common.core.constant.ScheduleConstants;
-import com.zd.common.core.exception.job.TaskException;
-import com.zd.common.core.exception.job.TaskException.Code;
+import com.zd.common.core.exception.TaskException;
+import com.zd.model.constant.ScheduleConstants;
 import org.quartz.*;
 
 /**
@@ -88,7 +87,7 @@ public class ScheduleUtils {
                 return cb.withMisfireHandlingInstructionDoNothing();
             default:
                 throw new TaskException("The task misfire policy '" + job.getMisfirePolicy()
-                        + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
+                        + "' cannot be used in cron schedule tasks", TaskException.Code.CONFIG_ERROR);
         }
     }
 }

zd-modules/zd-base/src/main/java/com/zd/base/message/base/FridConsumer.java

@@ -21,7 +21,7 @@ public class FridConsumer implements Consumer<InventoryTag> {
     public void accept(InventoryTag tag) {
         try {
             tag.setEpc(tag.getEpc().replace(" ", ""));
-            com.zd.system.api.domain.InventoryTag  inventoryTag = new com.zd.system.api.domain.InventoryTag ();
+            com.zd.model.entity.InventoryTag  inventoryTag = new com.zd.model.entity.InventoryTag ();
             BeanUtils.copyProperties(tag,inventoryTag);
             sendService.send(inventoryTag);
         } catch (BeansException e) {

zd-modules/zd-base/src/main/java/com/zd/base/message/controller/UserOpenIdController.java

@@ -2,20 +2,19 @@ package com.zd.base.message.controller;
 
 import com.zd.base.message.domain.UserOpenId;
 import com.zd.base.message.service.IUserOpenIdService;
-import com.zd.common.core.domain.R;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-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.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

zd-modules/zd-base/src/main/java/com/zd/base/message/controller/WechatMsgController.java

@@ -1,16 +1,15 @@
 package com.zd.base.message.controller;
 
 import com.zd.base.message.service.IWechatMsgSendService;
-import com.zd.common.core.domain.R;
 import com.zd.common.core.template.TemplateResult;
-import com.zd.common.core.web.domain.ResultData;
+import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.Date;
 import java.util.List;
 

zd-modules/zd-base/src/main/java/com/zd/base/message/domain/UserOpenId.java

@@ -1,6 +1,7 @@
 package com.zd.base.message.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;
 import lombok.Data;

zd-modules/zd-base/src/main/java/com/zd/base/message/service/ISendService.java

@@ -1,6 +1,7 @@
 package com.zd.base.message.service;
 
-import com.zd.system.api.domain.InventoryTag;
+
+import com.zd.model.entity.InventoryTag;
 
 public interface ISendService {
 

zd-modules/zd-base/src/main/java/com/zd/base/message/service/impl/SendServiceImpl.java

@@ -2,7 +2,7 @@ package com.zd.base.message.service.impl;
 
 
 import com.zd.base.message.service.ISendService;
-import com.zd.system.api.domain.InventoryTag;
+import com.zd.model.entity.InventoryTag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

zd-modules/zd-base/src/main/java/com/zd/base/message/service/impl/UserOpenIdServiceImpl.java

@@ -5,12 +5,11 @@ import com.zd.base.message.mapper.UserOpenIdMapper;
 import com.zd.base.message.service.IUserOpenIdService;
 import com.zd.base.message.service.IWechatMsgSendService;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.model.LoginUser;
+import com.zd.model.entity.LoginUser;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;

zd-modules/zd-base/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9500
+  port: ${service.port.base}
 # Spring
 #logging:
 #  level:

zd-modules/zd-modules-system/pom.xml

@@ -50,29 +50,53 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- zd Common DataSource -->
         <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.swagger</groupId>
+            <artifactId>common-swagger</artifactId>
+            <version>3.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.base</groupId>
+            <artifactId>zd-base-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.laboratory</groupId>
+            <artifactId>zd-laboratory-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!-- zd Common DataSource -->
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datasource</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common DataScope -->
-        <dependency>
+        <!--<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>
+        <!-- <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-swagger</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -85,6 +109,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-annotations</artifactId>
+            <version>3.0.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

zd-modules/zd-modules-system/src/main/java/com/zd/system/ZdSystemApplication.java

@@ -1,15 +1,17 @@
 package com.zd.system;
 
+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;
-import com.zd.common.security.annotation.EnableCustomConfig;
-import com.zd.common.security.annotation.EnableRyFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 系统模块
  *
  * @author zd
  */
+@ComponentScan(basePackages = "com.zd")
 @EnableCustomConfig
 @EnableRyFeignClients
 @SpringBootApplication

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysClassController.java

@@ -5,9 +5,15 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 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.web.domain.ResultData;
+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.utils.ExcelUtil;
+import com.zd.common.swagger.config.Knife4jConfiguration;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,17 +23,11 @@ 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.system.domain.SysClass;
 import com.zd.system.service.ISysClassService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-import com.zd.common.core.web.page.TableDataInfo;
 
 /**
  * 班级字典Controller

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysConfigController.java

@@ -4,8 +4,15 @@ import java.io.IOException;
 import java.util.List;
 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.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -16,15 +23,8 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.poi.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.system.domain.SysConfig;
 import com.zd.system.service.ISysConfigService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysDeptController.java

@@ -1,20 +1,20 @@
 package com.zd.system.controller;
 
-import com.zd.common.core.constant.UserConstants;
-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.security.TokenService;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.domain.ResultData;
-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.system.api.domain.SysDept;
-import com.zd.system.api.domain.SysDeptVO;
-import com.zd.system.api.model.SysDeptListVO;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysDept;
+import com.zd.system.api.vo.SysDeptListVO;
+import com.zd.system.api.vo.SysDeptVO;
 import com.zd.system.service.ISysDeptService;
 import com.zd.system.service.impl.SysDeptManager;
 import io.swagger.annotations.ApiOperation;

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysDeptSignController.java

@@ -1,17 +1,16 @@
 package com.zd.system.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.common.core.annotation.PreAuthorize;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.domain.SysDept;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysDept;
 import com.zd.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 import java.util.Map;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysDictDataController.java

@@ -4,8 +4,16 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 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.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.entity.SysDictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -18,14 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.poi.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.system.api.domain.SysDictData;
 import com.zd.system.service.ISysDictDataService;
 import com.zd.system.service.ISysDictTypeService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysDictTypeController.java

@@ -4,8 +4,16 @@ import java.io.IOException;
 import java.util.List;
 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.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.entity.SysDictType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -16,16 +24,8 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.poi.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.system.api.domain.SysDictType;
 import com.zd.system.service.ISysDictTypeService;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysLogininforController.java

@@ -3,8 +3,17 @@ package com.zd.system.controller;
 import java.io.IOException;
 import java.util.List;
 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.annotation.InnerAuth;
+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.utils.ExcelUtil;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.entity.SysLogininfor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,15 +22,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 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.core.utils.poi.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.InnerAuth;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.domain.SysLogininfor;
 import com.zd.system.service.ISysLogininforService;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysLogoConfigController.java

@@ -4,10 +4,14 @@ import java.util.List;
 import java.io.IOException;
 import java.util.Optional;
 import javax.servlet.http.HttpServletResponse;
-
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.FileConfigUtils;
-import com.zd.common.core.web.domain.ResultData;
+import com.zd.common.swagger.config.Knife4jConfiguration;
+import com.zd.model.domain.ResultData;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,17 +21,11 @@ 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.system.domain.SysLogoConfig;
 import com.zd.system.service.ISysLogoConfigService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-
-import com.zd.common.core.web.page.TableDataInfo;
 
 /**
  * logo配置Controller

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysMajorController.java

@@ -1,14 +1,14 @@
 package com.zd.system.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.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-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.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import com.zd.system.domain.SysMajor;
 import com.zd.system.service.ISysMajorService;
 import io.swagger.annotations.Api;

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysMenuController.java

@@ -2,8 +2,13 @@ package com.zd.system.controller;
 
 import java.util.List;
 
-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.model.constant.UserConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -14,14 +19,9 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
 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.system.domain.SysMenu;
 import com.zd.system.service.ISysMenuService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysNoticeController.java

@@ -1,9 +1,13 @@
 package com.zd.system.controller;
 
 import java.util.List;
-
-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.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -16,11 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 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.system.domain.SysNotice;
 import com.zd.system.service.ISysNoticeService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysOperlogController.java

@@ -4,8 +4,16 @@ import java.io.IOException;
 import java.util.List;
 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.annotation.InnerAuth;
+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.utils.ExcelUtil;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.entity.SysOperLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,15 +22,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 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.core.utils.poi.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.InnerAuth;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.domain.SysOperLog;
 import com.zd.system.service.ISysOperLogService;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysPermitController.java

@@ -1,13 +1,16 @@
 package com.zd.system.controller;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.InnerAuth;
+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.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-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.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import com.zd.system.domain.SysPermit;
 import com.zd.system.domain.SysPermitMenu;
 import com.zd.system.service.ISysPermitService;

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysPostController.java

@@ -3,9 +3,16 @@ package com.zd.system.controller;
 import java.io.IOException;
 import java.util.List;
 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.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -16,15 +23,7 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.poi.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.system.domain.SysPost;
 import com.zd.system.service.ISysPostService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysProfileController.java

@@ -1,19 +1,19 @@
 package com.zd.system.controller;
 
-import com.zd.common.core.constant.UserConstants;
-import com.zd.common.core.domain.R;
+import com.zd.base.api.entity.SysFile;
+import com.zd.base.api.feign.RemoteFileService;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.ServletUtils;
 import com.zd.common.core.utils.StringUtils;
 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.service.TokenService;
-import com.zd.system.api.RemoteFileService;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.model.LoginUser;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.entity.SysUser;
 import com.zd.system.service.ISysUserService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysRoleController.java

@@ -1,25 +1,25 @@
 package com.zd.system.controller;
 
-import com.zd.common.core.constant.UserConstants;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.poi.ExcelUtil;
+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.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.system.api.domain.SysRole;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
 import com.zd.system.domain.SysUserRole;
 import com.zd.system.service.ISysRoleService;
 import com.zd.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysStudentController.java

@@ -1,28 +1,29 @@
 package com.zd.system.controller;
 
-import com.zd.common.core.constant.Constants;
-import com.zd.common.core.constant.UserConstants;
-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.InnerAuth;
+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.redis.RedisService;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.model.constant.BaseConstants;
+import com.zd.model.constant.UserConstants;
+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 com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.poi.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.redis.service.RedisService;
-import com.zd.common.security.annotation.InnerAuth;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.domain.*;
-import com.zd.system.api.model.LoginUser;
+import com.zd.system.api.entity.SysUserStudentByExcel;
+import com.zd.system.api.entity.SysUserStudentByExport;
 import com.zd.system.domain.SysPost;
 import com.zd.system.service.*;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -335,8 +336,8 @@ public class SysStudentController extends BaseController {
     public AjaxResult userALLIDS() {
         Long userId = SecurityUtils.getUserId();
         SysUser user = new SysUser();
-        user.setDelFlag(Constants.NORMAL);
-        user.setStatus(Constants.NORMAL);
+        user.setDelFlag(BaseConstants.NORMAL);
+        user.setStatus(BaseConstants.NORMAL);
         List<SysUser> sysUsers = sysStudentService.selectUserList(user);
         List<Long> collect = sysUsers.stream().map(a -> a.getUserId()).collect(Collectors.toList());
         return AjaxResult.success(collect);
@@ -353,8 +354,8 @@ public class SysStudentController extends BaseController {
     @GetMapping("/dept/{deptId}")
     public AjaxResult userDeptIDS(@PathVariable("deptId") Long deptId) {
         SysUser user = new SysUser();
-        user.setDelFlag(Constants.NORMAL);
-        user.setStatus(Constants.NORMAL);
+        user.setDelFlag(BaseConstants.NORMAL);
+        user.setStatus(BaseConstants.NORMAL);
         user.setDeptId(deptId);
         List<SysUser> sysUsers = sysStudentService.selectUserList(user);
         List<Long> collect = sysUsers.stream().map(a -> a.getUserId()).collect(Collectors.toList());

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysTeacherController.java

@@ -1,22 +1,25 @@
 package com.zd.system.controller;
 
-import com.zd.common.core.constant.UserConstants;
-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.redis.RedisService;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.model.constant.BaseConstants;
+import com.zd.model.constant.UserConstants;
+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 com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.poi.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.redis.service.RedisService;
-import com.zd.common.security.annotation.InnerAuth;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.domain.*;
-import com.zd.system.api.model.LoginUser;
+import com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.entity.SysUserTeaCherByExcel;
+import com.zd.system.api.entity.SysUserTeaCherByExport;
+import com.zd.system.api.vo.TeacherListVO;
 import com.zd.system.domain.SysPost;
 import com.zd.system.service.*;
 import com.zd.system.service.impl.TeacherServiceImpl;
@@ -26,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -6,23 +6,32 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import com.zd.common.core.constant.Constants;
-import com.zd.common.core.constant.HttpStatus;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.base.api.entity.SysFile;
+import com.zd.base.api.feign.RemoteFileService;
+import com.zd.common.core.annotation.InnerAuth;
+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.utils.*;
+import com.zd.laboratory.api.feign.RemoteSubQueryService;
+import com.zd.model.constant.BaseConstants;
+import com.zd.model.constant.UserConstants;
+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 com.zd.model.entity.LoginUser;
+import com.zd.model.entity.SysDept;
+import com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.file.ImageUtils;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.system.api.RemoteDeptService;
-import com.zd.system.api.RemoteFileService;
-import com.zd.system.api.chemical.RemoteStockService;
-import com.zd.system.api.domain.*;
-import com.zd.system.api.laboratory.RemoteSubQueryService;
-import com.zd.system.api.model.SimpleUserVO;
+import com.zd.system.api.feign.RemoteStockService;
+import com.zd.system.api.vo.SelectUserVO;
+import com.zd.system.api.vo.SimpleUserVO;
 import com.zd.system.domain.SysLogoConfig;
 import com.zd.system.domain.SysPost;
 import com.zd.system.service.*;
@@ -33,21 +42,11 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import com.zd.common.core.constant.UserConstants;
-import com.zd.common.core.domain.R;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.utils.StringUtils;;
 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.InnerAuth;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.model.LoginUser;
 
-import static com.zd.common.core.constant.Constants.CODE_EXPIRATION;
+import static com.zd.model.constant.BaseConstants.CODE_EXPIRATION;
 
 /**
  * 用户信息
@@ -524,8 +523,8 @@ public class SysUserController extends BaseController {
     public AjaxResult userALLIDS() {
         Long userId = SecurityUtils.getUserId();
         SysUser user = new SysUser();
-        user.setDelFlag(Constants.NORMAL);
-        user.setStatus(Constants.NORMAL);
+        user.setDelFlag(BaseConstants.NORMAL);
+        user.setStatus(BaseConstants.NORMAL);
         List<SysUser> sysUsers = userService.selectUserList(user);
         List<Long> collect = sysUsers.stream().map(a -> a.getUserId()).collect(Collectors.toList());
         return AjaxResult.success(collect);
@@ -728,11 +727,11 @@ public class SysUserController extends BaseController {
     })
     @PostMapping("/send/code")
     public R<?> send(@RequestParam String phone) {
-        String key = Constants.DEFAULT_CODE_KEY + Constants.UPDATE_TYPE_MOBILE + "@" + phone;
+        String key = BaseConstants.DEFAULT_CODE_KEY + BaseConstants.UPDATE_TYPE_MOBILE + "@" + phone;
         String code = RandomUtil.randomNumbers(6);
         redisTemplate.opsForValue().set(key, code, CODE_EXPIRATION, TimeUnit.MINUTES);
         logger.info("========================>{}<=========================", code);
-        String countKey=Constants.DEFAULT_CODE_KEY + "@" + phone+"_COUNT";
+        String countKey = BaseConstants.DEFAULT_CODE_KEY + "@" + phone+"_COUNT";
         String count = redisTemplate.opsForValue().get(countKey);
         if (StringUtils.isEmpty(count)){
             redisTemplate.opsForValue().set(countKey,"1",60,TimeUnit.MINUTES);
@@ -810,7 +809,7 @@ public class SysUserController extends BaseController {
         if (StringUtils.isEmpty(code)) {
             throw new ServiceException("请输入验证码");
         }
-        String key = Constants.DEFAULT_CODE_KEY + Constants.UPDATE_TYPE_MOBILE + "@" + phone;
+        String key = BaseConstants.DEFAULT_CODE_KEY + BaseConstants.UPDATE_TYPE_MOBILE + "@" + phone;
 
         String temp = redisTemplate.opsForValue().get(key);
         if (temp == null) {

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserOnlineController.java

@@ -5,24 +5,24 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.redis.RedisService;
+import com.zd.model.constant.CacheConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.constant.CacheConstants;
 import com.zd.common.core.utils.StringUtils;
 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.redis.service.RedisService;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.model.LoginUser;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
 import com.zd.system.domain.SysUserOnline;
 import com.zd.system.service.ISysUserOnlineService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysClass.java

@@ -1,11 +1,11 @@
 package com.zd.system.domain;
 
+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;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
 
 /**
  * 班级字典对象 sys_class

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysConfig.java

@@ -3,11 +3,11 @@ package com.zd.system.domain;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+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;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.annotation.Excel.ColumnType;
 
 /**
  * 参数配置表 sys_config

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysLogoConfig.java

@@ -2,10 +2,10 @@ package com.zd.system.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;
 
 /**
  * logo配置对象 sys_logo_config

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysMajor.java

@@ -1,7 +1,7 @@
 package com.zd.system.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-modules-system/src/main/java/com/zd/system/domain/SysMenu.java

@@ -5,10 +5,10 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+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.web.domain.BaseEntity;
 
 /**
  * 菜单权限表 sys_menu

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysNotice.java

@@ -3,11 +3,10 @@ package com.zd.system.domain;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+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.web.domain.BaseEntity;
-
 /**
  * 通知公告表 sys_notice
  *

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysPermit.java

@@ -1,10 +1,9 @@
 package com.zd.system.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysPermitMenu.java

@@ -1,9 +1,8 @@
 package com.zd.system.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;
-
 import java.util.List;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysPermitMenuDept.java

@@ -1,6 +1,6 @@
 package com.zd.system.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-modules-system/src/main/java/com/zd/system/domain/SysPost.java

@@ -5,9 +5,9 @@ import javax.validation.constraints.Size;
 
 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.annotation.Excel.ColumnType;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.annotation.Excel.ColumnType;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 岗位表 sys_post

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/vo/TreeSelect.java

@@ -3,9 +3,8 @@ package com.zd.system.domain.vo;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.zd.system.api.domain.SysDept;
+import com.zd.model.entity.SysDept;
 import com.zd.system.domain.SysMenu;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/vo/TreeSelectVo.java

@@ -1,8 +1,7 @@
 package com.zd.system.domain.vo;
 
-import com.zd.system.api.domain.SysDept;
+import com.zd.model.entity.SysDept;
 import com.zd.system.domain.SysMenu;
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysDeptMapper.java

@@ -2,10 +2,9 @@ package com.zd.system.mapper;
 
 import java.util.List;
 import java.util.Map;
-
+import com.zd.model.entity.SysDept;
 import org.apache.ibatis.annotations.Param;
 
-import com.zd.system.api.domain.SysDept;
 
 /**
  * 部门管理 数据层

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysDictDataMapper.java

@@ -2,8 +2,9 @@ package com.zd.system.mapper;
 
 import java.util.List;
 
+import com.zd.system.api.entity.SysDictData;
 import org.apache.ibatis.annotations.Param;
-import com.zd.system.api.domain.SysDictData;
+
 
 /**
  * 字典表 数据层

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysDictTypeMapper.java

@@ -2,8 +2,8 @@ package com.zd.system.mapper;
 
 import java.util.List;
 
+import com.zd.system.api.entity.SysDictType;
 import org.apache.ibatis.annotations.Mapper;
-import com.zd.system.api.domain.SysDictType;
 
 /**
  * 字典表 数据层

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysLogininforMapper.java

@@ -1,9 +1,7 @@
 package com.zd.system.mapper;
 
+import com.zd.system.api.entity.SysLogininfor;
 import java.util.List;
-
-import com.zd.system.api.domain.SysLogininfor;
-
 /**
  * 系统访问日志情况信息 数据层
  *

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysOperLogMapper.java

@@ -1,8 +1,8 @@
 package com.zd.system.mapper;
 
-import java.util.List;
+import com.zd.system.api.entity.SysOperLog;
 
-import com.zd.system.api.domain.SysOperLog;
+import java.util.List;
 
 /**
  * 操作日志 数据层

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysPermitMenuMapper.java

@@ -2,7 +2,7 @@ package com.zd.system.mapper;
 
 import java.util.List;
 
-import com.zd.system.api.domain.SysPermitInfo;
+import com.zd.model.entity.SysPermitInfo;
 import com.zd.system.domain.SysPermitMenu;
 import org.apache.ibatis.annotations.Param;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysRoleMapper.java

@@ -1,9 +1,8 @@
 package com.zd.system.mapper;
 
+import com.zd.model.entity.SysRole;
 import java.util.List;
 
-import com.zd.system.api.domain.SysRole;
-
 /**
  * 角色表 数据层
  *

zd-modules/zd-modules-system/src/main/java/com/zd/system/mapper/SysUserMapper.java

@@ -1,9 +1,9 @@
 package com.zd.system.mapper;
 
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.laboratory.domain.TotalByID;
-import org.apache.ibatis.annotations.Param;
 
+import com.zd.model.entity.SysUser;
+import com.zd.model.entity.TotalByID;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysDeptService.java

@@ -3,8 +3,8 @@ package com.zd.system.service;
 import java.util.List;
 import java.util.Map;
 
-import com.zd.system.api.domain.SysDept;
-import com.zd.system.api.domain.SysDeptVO;
+import com.zd.model.entity.SysDept;
+import com.zd.system.api.vo.SysDeptVO;
 import com.zd.system.domain.vo.TreeSelect;
 import com.zd.system.domain.vo.TreeSelectVo;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysDictDataService.java

@@ -1,8 +1,8 @@
 package com.zd.system.service;
 
-import java.util.List;
+import com.zd.system.api.entity.SysDictData;
 
-import com.zd.system.api.domain.SysDictData;
+import java.util.List;
 
 /**
  * 字典 业务层

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysDictTypeService.java

@@ -1,10 +1,9 @@
 package com.zd.system.service;
 
-import java.util.List;
-
-import com.zd.system.api.domain.SysDictData;
-import com.zd.system.api.domain.SysDictType;
+import com.zd.system.api.entity.SysDictData;
+import com.zd.system.api.entity.SysDictType;
 
+import java.util.List;
 /**
  * 字典 业务层
  *

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysLogininforService.java

@@ -1,9 +1,8 @@
 package com.zd.system.service;
 
-import java.util.List;
-
-import com.zd.system.api.domain.SysLogininfor;
+import com.zd.system.api.entity.SysLogininfor;
 
+import java.util.List;
 /**
  * 系统访问日志情况信息 服务层
  *

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysOperLogService.java

@@ -1,8 +1,8 @@
 package com.zd.system.service;
 
-import java.util.List;
+import com.zd.system.api.entity.SysOperLog;
 
-import com.zd.system.api.domain.SysOperLog;
+import java.util.List;
 
 /**
  * 操作日志 服务层

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysPermissionService.java

@@ -1,6 +1,6 @@
 package com.zd.system.service;
 
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.entity.SysUser;
 
 import java.util.Set;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysPermitMenuService.java

@@ -2,8 +2,9 @@ package com.zd.system.service;
 
 import java.util.List;
 
-import com.zd.system.api.domain.SysPermitInfo;
-import com.zd.system.api.domain.SysUser;
+
+import com.zd.model.entity.SysPermitInfo;
+import com.zd.model.entity.SysUser;
 import com.zd.system.domain.SysPermitMenu;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysRoleService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.zd.system.api.domain.SysRole;
+import com.zd.model.entity.SysRole;
 import com.zd.system.domain.SysUserRole;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysStudentService.java

@@ -1,8 +1,8 @@
 package com.zd.system.service;
 
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.domain.SysUserStudentByExcel;
-import com.zd.system.api.domain.SysUserTeaCherByExcel;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.entity.SysUserStudentByExcel;
+import com.zd.system.api.entity.SysUserTeaCherByExcel;
 
 import java.util.List;
 import java.util.Map;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysTeacherService.java

@@ -1,8 +1,8 @@
 package com.zd.system.service;
 
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.domain.SysUserStudentByExcel;
-import com.zd.system.api.domain.SysUserTeaCherByExcel;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.entity.SysUserStudentByExcel;
+import com.zd.system.api.entity.SysUserTeaCherByExcel;
 
 import java.util.List;
 import java.util.Map;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysUserOnlineService.java

@@ -1,6 +1,7 @@
 package com.zd.system.service;
 
-import com.zd.system.api.model.LoginUser;
+
+import com.zd.model.entity.LoginUser;
 import com.zd.system.domain.SysUserOnline;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/ISysUserService.java

@@ -1,8 +1,9 @@
 package com.zd.system.service;
 
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.domain.SysUserStudentByExcel;
-import com.zd.system.api.domain.SysUserTeaCherByExcel;
+
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.entity.SysUserStudentByExcel;
+import com.zd.system.api.entity.SysUserTeaCherByExcel;
 
 import java.util.List;
 import java.util.Map;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysClassServiceImpl.java

@@ -3,11 +3,9 @@ package com.zd.system.service.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 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.utils.SaveUtil;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.system.mapper.SysClassMapper;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysConfigServiceImpl.java

@@ -3,15 +3,14 @@ package com.zd.system.service.impl;
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.PostConstruct;
-
+import com.zd.common.core.redis.RedisService;
+import com.zd.common.core.utils.Convert;
+import com.zd.model.constant.BaseConstants;
+import com.zd.model.constant.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.common.core.constant.Constants;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.text.Convert;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.redis.service.RedisService;
 import com.zd.system.domain.SysConfig;
 import com.zd.system.mapper.SysConfigMapper;
 import com.zd.system.service.ISysConfigService;
@@ -147,7 +146,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
      */
     @Override
     public void clearConfigCache() {
-        Collection<String> keys = redisService.keys(Constants.SYS_CONFIG_KEY + "*");
+        Collection<String> keys = redisService.keys(BaseConstants.SYS_CONFIG_KEY + "*");
         redisService.deleteObject(keys);
     }
 
@@ -183,6 +182,6 @@ public class SysConfigServiceImpl implements ISysConfigService {
      * @return 缓存键key
      */
     private String getCacheKey(String configKey) {
-        return Constants.SYS_CONFIG_KEY + configKey;
+        return BaseConstants.SYS_CONFIG_KEY + configKey;
     }
 }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDeptManager.java

@@ -1,20 +1,17 @@
 package com.zd.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import com.zd.common.core.domain.R;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.system.api.domain.SysDept;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.TotalByID;
-import com.zd.system.api.model.SysDeptListVO;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.domain.R;
+import com.zd.model.entity.SysDept;
+import com.zd.model.entity.TotalByID;
+import com.zd.system.api.vo.SysDeptListVO;
 import com.zd.system.mapper.SysDeptMapper;
 import com.zd.system.mapper.SysUserMapper;
 import com.zd.system.service.ISysDeptService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.*;
 import java.util.stream.Collectors;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDeptServiceImpl.java

@@ -3,21 +3,21 @@ package com.zd.system.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.Convert;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysDeptVO;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysDept;
+import com.zd.model.entity.SysRole;
+import com.zd.system.api.vo.SysDeptVO;
 import com.zd.system.domain.vo.TreeSelectVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.text.Convert;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.system.api.domain.SysDept;
-import com.zd.system.api.domain.SysRole;
 import com.zd.system.domain.vo.TreeSelect;
 import com.zd.system.mapper.SysDeptMapper;
 import com.zd.system.mapper.SysRoleMapper;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDictDataServiceImpl.java

@@ -2,10 +2,10 @@ package com.zd.system.service.impl;
 
 import java.util.List;
 
+import com.zd.common.core.utils.DictUtils;
+import com.zd.system.api.entity.SysDictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.system.api.domain.SysDictData;
 import com.zd.system.mapper.SysDictDataMapper;
 import com.zd.system.service.ISysDictDataService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDictTypeServiceImpl.java

@@ -3,15 +3,15 @@ package com.zd.system.service.impl;
 import java.util.List;
 import javax.annotation.PostConstruct;
 
+import com.zd.common.core.utils.DictUtils;
+import com.zd.model.constant.UserConstants;
+import com.zd.system.api.entity.SysDictData;
+import com.zd.system.api.entity.SysDictType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.system.api.domain.SysDictData;
-import com.zd.system.api.domain.SysDictType;
 import com.zd.system.mapper.SysDictDataMapper;
 import com.zd.system.mapper.SysDictTypeMapper;
 import com.zd.system.service.ISysDictTypeService;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysLogininforServiceImpl.java

@@ -2,11 +2,11 @@ package com.zd.system.service.impl;
 
 import java.util.List;
 
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.system.api.entity.SysLogininfor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.system.api.domain.SysLogininfor;
 import com.zd.system.mapper.SysLogininforMapper;
 import com.zd.system.service.ISysLogininforService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysLogoConfigServiceImpl.java

@@ -3,7 +3,7 @@ package com.zd.system.service.impl;
 import java.util.List;
 
 import com.zd.common.core.utils.StringUtils;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.system.mapper.SysLogoConfigMapper;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysMajorServiceImpl.java

@@ -1,14 +1,13 @@
 package com.zd.system.service.impl;
 
-import com.zd.common.core.domain.per.PerPrefix;
-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.model.domain.per.PerPrefix;
 import com.zd.system.domain.SysMajor;
 import com.zd.system.mapper.SysMajorMapper;
 import com.zd.system.service.ISysMajorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 
 /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysMenuServiceImpl.java

@@ -2,16 +2,15 @@ package com.zd.system.service.impl;
 
 import java.util.*;
 import java.util.stream.Collectors;
-
+import com.zd.model.constant.BaseConstants;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
 import com.zd.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.common.core.constant.Constants;
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.system.api.domain.SysRole;
-import com.zd.system.api.domain.SysUser;
 import com.zd.system.domain.SysMenu;
 import com.zd.system.domain.vo.MetaVo;
 import com.zd.system.domain.vo.RouterVo;
@@ -164,7 +163,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 router.setPath("/inner");
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();
-                String routerPath = StringUtils.replaceEach(menu.getPath(), new String[]{Constants.HTTP, Constants.HTTPS}, new String[]{"", ""});
+                String routerPath = StringUtils.replaceEach(menu.getPath(), new String[]{BaseConstants.HTTP, BaseConstants.HTTPS}, new String[]{"", ""});
                 children.setPath(routerPath);
                 children.setComponent(UserConstants.INNER_LINK);
                 children.setName(StringUtils.capitalize(routerPath));
@@ -361,7 +360,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
         String routerPath = menu.getPath();
         // 内链打开外网方式
         if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
-            routerPath = StringUtils.replaceEach(routerPath, new String[]{Constants.HTTP, Constants.HTTPS}, new String[]{"", ""});
+            routerPath = StringUtils.replaceEach(routerPath, new String[]{BaseConstants.HTTP, BaseConstants.HTTPS}, new String[]{"", ""});
         }
         // 非外链并且是一级目录（类型为目录）
         if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysOperLogServiceImpl.java

@@ -2,11 +2,11 @@ package com.zd.system.service.impl;
 
 import java.util.List;
 
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.core.annotation.DataScope;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.system.api.entity.SysOperLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.system.api.domain.SysOperLog;
 import com.zd.system.mapper.SysOperLogMapper;
 import com.zd.system.service.ISysOperLogService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermissionServiceImpl.java

@@ -3,11 +3,10 @@ package com.zd.system.service.impl;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.zd.common.core.constant.UserConstants;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.zd.system.api.domain.SysUser;
 import com.zd.system.service.ISysMenuService;
 import com.zd.system.service.ISysPermissionService;
 import com.zd.system.service.ISysRoleService;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermitMenuServiceImpl.java

@@ -2,12 +2,11 @@ package com.zd.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.exception.PreAuthorizeException;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.system.api.domain.SysPermitInfo;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.entity.SysPermitInfo;
+import com.zd.model.entity.SysUser;
 import com.zd.system.domain.SysPermitMenuDept;
 import com.zd.system.mapper.SysPermitMenuDeptMapper;
 import org.apache.commons.collections4.CollectionUtils;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermitServiceImpl.java

@@ -4,9 +4,8 @@ import java.util.List;
 
 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.security.utils.SaveUtil;
-
 import com.zd.system.domain.SysPermitMenu;
 import com.zd.system.service.ISysPermitMenuService;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPostServiceImpl.java

@@ -2,13 +2,12 @@ package com.zd.system.service.impl;
 
 import java.util.List;
 
-import com.zd.common.core.domain.per.PerPrefix;
-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.model.constant.UserConstants;
+import com.zd.model.domain.per.PerPrefix;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.system.domain.SysPost;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysRoleServiceImpl.java

@@ -1,19 +1,12 @@
 package com.zd.system.service.impl;
 
-import com.zd.common.core.constant.CacheConstants;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.constant.UserConstants;
-import com.zd.common.core.domain.R;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.*;
-import com.zd.common.core.utils.ip.IpUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.redis.service.RedisService;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysRole;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.model.LoginUser;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.entity.SysRole;
+import com.zd.system.api.feign.RemoteUserService;
 import com.zd.system.domain.SysRoleDept;
 import com.zd.system.domain.SysRoleMenu;
 import com.zd.system.domain.SysUserRole;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysStudentServiceImpl.java

@@ -1,28 +1,31 @@
 package com.zd.system.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.zd.common.core.constant.UserConstants;
-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.DictUtils;
 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.service.TokenService;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.system.api.domain.*;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysDept;
+import com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.entity.SysDictData;
+import com.zd.system.api.entity.SysUserStudentByExcel;
+import com.zd.system.api.entity.SysUserTeaCherByExcel;
 import com.zd.system.domain.*;
 import com.zd.system.mapper.*;
 import com.zd.system.service.ISysConfigService;
 import com.zd.system.service.ISysPermitMenuService;
 import com.zd.system.service.ISysStudentService;
-import com.zd.system.service.ISysTeacherService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.text.SimpleDateFormat;
 import java.util.*;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysTeacherServiceImpl.java

@@ -1,20 +1,23 @@
 package com.zd.system.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.zd.common.core.constant.UserConstants;
-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.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.*;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysDept;
+import com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.entity.SysUserStudentByExcel;
+import com.zd.system.api.entity.SysUserTeaCherByExcel;
 import com.zd.system.domain.*;
 import com.zd.system.mapper.*;
 import com.zd.system.service.ISysConfigService;
 import com.zd.system.service.ISysPermitMenuService;
 import com.zd.system.service.ISysTeacherService;
-import com.zd.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysUserOnlineServiceImpl.java

@@ -1,8 +1,8 @@
 package com.zd.system.service.impl;
 
+import com.zd.model.entity.LoginUser;
 import org.springframework.stereotype.Service;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.system.api.model.LoginUser;
 import com.zd.system.domain.SysUserOnline;
 import com.zd.system.service.ISysUserOnlineService;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysUserServiceImpl.java

@@ -1,14 +1,18 @@
 package com.zd.system.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.zd.common.core.constant.UserConstants;
-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.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.*;
+import com.zd.model.constant.UserConstants;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysDept;
+import com.zd.model.entity.SysRole;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.entity.SysUserStudentByExcel;
+import com.zd.system.api.entity.SysUserTeaCherByExcel;
 import com.zd.system.domain.*;
 import com.zd.system.mapper.*;
 import com.zd.system.service.ISysConfigService;
@@ -20,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.text.SimpleDateFormat;
 import java.util.*;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/TeacherServiceImpl.java

@@ -1,15 +1,12 @@
 package com.zd.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.domain.TeacherListVO;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.LabSubjectControllerVO;
-import com.zd.system.api.laboratory.domain.LabSubjectVO;
+import com.zd.laboratory.api.entity.LabSubjectVO;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.domain.R;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

zd-modules/zd-modules-system/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9201
+  port: ${service.port.system}
 
 # Spring
 spring: