修改循环依赖

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableColumnService.java

@@ -1,7 +1,7 @@
 package com.boman.gen.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.constant.ServiceNameConstants;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.GenTableColumn;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableService.java

@@ -1,15 +1,10 @@
 package com.boman.gen.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.constant.ServiceNameConstants;
 import com.boman.domain.GenTable;
-import com.boman.domain.TableSql;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 生成代码模块，远程调用入口，如需其他接口，在此添加

boman-api/boman-api-jflow/src/main/java/com/boman/jflow/api/RemoteJflowService.java

@@ -1,6 +1,6 @@
 package com.boman.jflow.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.domain.constant.ServiceNameConstants;
 import org.springframework.cloud.openfeign.FeignClient;
 
 /**

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteDeptService.java

@@ -1,6 +1,6 @@
 package com.boman.system.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.domain.constant.ServiceNameConstants;
 import com.boman.domain.SysDept;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteDictDataService.java

@@ -1,6 +1,6 @@
 package com.boman.system.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.domain.constant.ServiceNameConstants;
 import com.boman.domain.SysDictData;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteFileService.java

@@ -5,8 +5,8 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.domain.R;
+import com.boman.domain.constant.ServiceNameConstants;
+import com.boman.domain.dto.R;
 import com.boman.domain.SysFile;
 import com.boman.system.api.factory.RemoteFileFallbackFactory;
 

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteLogService.java

@@ -4,8 +4,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.domain.R;
+import com.boman.domain.constant.ServiceNameConstants;
+import com.boman.domain.dto.R;
 import com.boman.domain.SysOperLog;
 import com.boman.system.api.factory.RemoteLogFallbackFactory;
 

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteMenuService.java

@@ -1,6 +1,6 @@
 package com.boman.system.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.domain.constant.ServiceNameConstants;
 import com.boman.domain.SysMenu;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteRoleDataService.java

@@ -1,6 +1,6 @@
 package com.boman.system.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.domain.constant.ServiceNameConstants;
 import com.boman.domain.SysRoleData;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteSysMenuService.java

@@ -1,7 +1,7 @@
 package com.boman.system.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.constant.ServiceNameConstants;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.SysMenu;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteUserService.java

@@ -4,8 +4,8 @@ import com.boman.domain.SysUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.domain.R;
+import com.boman.domain.constant.ServiceNameConstants;
+import com.boman.domain.dto.R;
 import com.boman.system.api.factory.RemoteUserFallbackFactory;
 import com.boman.system.api.model.LoginUser;
 import org.springframework.web.bind.annotation.PostMapping;

boman-api/boman-api-system/src/main/java/com/boman/system/api/factory/RemoteFileFallbackFactory.java

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
-import com.boman.common.core.domain.R;
+import com.boman.domain.dto.R;
 import com.boman.system.api.RemoteFileService;
 import com.boman.domain.SysFile;
 import feign.hystrix.FallbackFactory;

boman-api/boman-api-system/src/main/java/com/boman/system/api/factory/RemoteLogFallbackFactory.java

@@ -3,7 +3,7 @@ package com.boman.system.api.factory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import com.boman.common.core.domain.R;
+import com.boman.domain.dto.R;
 import com.boman.system.api.RemoteLogService;
 import com.boman.domain.SysOperLog;
 import feign.hystrix.FallbackFactory;

boman-api/boman-api-system/src/main/java/com/boman/system/api/factory/RemoteUserFallbackFactory.java

@@ -3,7 +3,7 @@ package com.boman.system.api.factory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import com.boman.common.core.domain.R;
+import com.boman.domain.dto.R;
 import com.boman.system.api.RemoteUserService;
 import com.boman.system.api.model.LoginUser;
 import feign.hystrix.FallbackFactory;

boman-api/boman-api-web-core/src/main/java/com/boman/web/core/api/RemoteObjService.java

@@ -1,7 +1,7 @@
 package com.boman.web.core.api;
 
-import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.constant.ServiceNameConstants;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.FormDataDto;
 import com.boman.domain.dto.ImportExcelDto;
 import org.springframework.cloud.openfeign.FeignClient;

boman-api/boman-domain/pom.xml

@@ -16,10 +16,39 @@
     </description>
 
     <dependencies>
-        <dependency>
+<!--        <dependency>
             <groupId>com.boman</groupId>
             <artifactId>boman-common-core</artifactId>
             <version>2.5.0-SNAPSHOT</version>
+        </dependency>-->
+
+        <!-- Jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <!-- Apache Lang3 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <!-- Hibernate Validator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Openfeign -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
         <dependency>

boman-api/boman-domain/src/main/java/com.boman.domain/SysDept.java

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept

boman-api/boman-domain/src/main/java/com.boman.domain/SysDictData.java

@@ -1,9 +1,7 @@
 package com.boman.domain;
 
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.constant.UserConstants;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.constant.UserConstants;
 
 /**
  * 字典数据表 sys_dict_data

boman-api/boman-domain/src/main/java/com.boman.domain/SysMenu.java

@@ -1,6 +1,6 @@
 package com.boman.domain;
 
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

boman-api/boman-domain/src/main/java/com.boman.domain/SysOperLog.java

@@ -2,9 +2,9 @@ package com.boman.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.BaseEntity;
 
 /**
  * 操作日志记录表 oper_log

boman-api/boman-domain/src/main/java/com.boman.domain/SysRole.java

@@ -2,11 +2,10 @@ package com.boman.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.web.domain.BaseEntity;
+
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.BaseEntity;
 
 import java.util.Arrays;
 

boman-api/boman-domain/src/main/java/com.boman.domain/SysUser.java

@@ -8,11 +8,11 @@ import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.annotation.Excel.Type;
-import com.boman.common.core.annotation.Excels;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.annotation.Excel.Type;
+import com.boman.domain.annotation.Excels;
+import com.boman.domain.BaseEntity;
 
 /**
  * 用户对象 sys_user

boman-common/boman-common-core/src/main/java/com/boman/common/core/annotation/Excel.java → boman-api/boman-domain/src/main/java/com.boman.domain/annotation/Excel.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.annotation;
+package com.boman.domain.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

boman-common/boman-common-core/src/main/java/com/boman/common/core/annotation/Excels.java → boman-api/boman-domain/src/main/java/com.boman.domain/annotation/Excels.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.annotation;
+package com.boman.domain.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/CacheConstants.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/CacheConstants.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.constant;
+package com.boman.domain.constant;
 
 /**
  * 缓存的key 常量

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/Constants.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/Constants.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.constant;
+package com.boman.domain.constant;
 
 import java.util.HashMap;
 

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/GenConstants.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/GenConstants.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.constant;
+package com.boman.domain.constant;
 
 /**
  * 代码生成通用常量

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/HttpStatus.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/HttpStatus.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.constant;
+package com.boman.domain.constant;
 
 /**
  * 返回状态码

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/ScheduleConstants.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/ScheduleConstants.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.constant;
+package com.boman.domain.constant;
 
 /**
  * 任务调度通用常量

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/ServiceNameConstants.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/ServiceNameConstants.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.constant;
+package com.boman.domain.constant;
 
 /**
  * 服务名称

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/UserConstants.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/UserConstants.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.constant;
+package com.boman.domain.constant;
 
 /**
  * 用户常量信息

boman-common/boman-common-core/src/main/java/com/boman/common/core/web/domain/AjaxResult.java → boman-api/boman-domain/src/main/java/com.boman.domain/dto/AjaxResult.java

@@ -1,8 +1,7 @@
-package com.boman.common.core.web.domain;
+package com.boman.domain.dto;
 
 import java.util.HashMap;
-import com.boman.common.core.constant.HttpStatus;
-import com.boman.common.core.utils.StringUtils;
+import com.boman.domain.constant.HttpStatus;
 
 /**
  * 操作消息提醒
@@ -52,7 +51,7 @@ public class AjaxResult extends HashMap<String, Object>
     {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
-        if (StringUtils.isNotNull(data))
+        if (null != data)
         {
             super.put(DATA_TAG, data);
         }

boman-common/boman-common-core/src/main/java/com/boman/common/core/domain/R.java → boman-api/boman-domain/src/main/java/com.boman.domain/dto/R.java

@@ -1,7 +1,7 @@
-package com.boman.common.core.domain;
+package com.boman.domain.dto;
 
 import java.io.Serializable;
-import com.boman.common.core.constant.Constants;
+import com.boman.domain.constant.Constants;
 
 /**
  * 响应信息主体

boman-common/boman-common-core/src/main/java/com/boman/common/core/web/domain/TreeEntity.java → boman-api/boman-domain/src/main/java/com.boman.domain/dto/TreeEntity.java

@@ -1,4 +1,6 @@
-package com.boman.common.core.web.domain;
+package com.boman.domain.dto;
+
+import com.boman.domain.BaseEntity;
 
 import java.util.ArrayList;
 import java.util.List;

boman-auth/src/main/java/com/boman/auth/controller/TokenController.java

@@ -2,15 +2,11 @@ package com.boman.auth.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.gavaghan.geodesy.Ellipsoid;
-import org.gavaghan.geodesy.GeodeticCalculator;
-import org.gavaghan.geodesy.GeodeticCurve;
-import org.gavaghan.geodesy.GlobalCoordinates;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.boman.auth.form.LoginBody;
 import com.boman.auth.service.SysLoginService;
-import com.boman.common.core.domain.R;
+import com.boman.domain.dto.R;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.security.service.TokenService;
 import com.boman.system.api.model.LoginUser;

boman-auth/src/main/java/com/boman/auth/service/SysLoginService.java

@@ -2,9 +2,9 @@ package com.boman.auth.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.boman.common.core.constant.Constants;
-import com.boman.common.core.constant.UserConstants;
-import com.boman.common.core.domain.R;
+import com.boman.domain.constant.Constants;
+import com.boman.domain.constant.UserConstants;
+import com.boman.domain.dto.R;
 import com.boman.common.core.enums.UserStatus;
 import com.boman.common.core.exception.BaseException;
 import com.boman.common.core.utils.SecurityUtils;

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/SecurityUtils.java

@@ -3,7 +3,7 @@ package com.boman.common.core.utils;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import com.boman.common.core.constant.CacheConstants;
+import com.boman.domain.constant.CacheConstants;
 import com.boman.common.core.text.Convert;
 
 /**

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/ServletUtils.java

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpSession;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import com.boman.common.core.constant.Constants;
+import com.boman.domain.constant.Constants;
 import com.boman.common.core.text.Convert;
 
 /**

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/poi/ExcelUtil.java

@@ -2,10 +2,10 @@ package com.boman.common.core.utils.poi;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.util.TypeUtils;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.annotation.Excel.Type;
-import com.boman.common.core.annotation.Excels;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.annotation.Excel.Type;
+import com.boman.domain.annotation.Excels;
 import com.boman.common.core.text.Convert;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;

boman-common/boman-common-core/src/main/java/com/boman/common/core/web/controller/BaseController.java

@@ -9,11 +9,11 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.boman.common.core.constant.HttpStatus;
+import com.boman.domain.constant.HttpStatus;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.sql.SqlUtil;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.PageDomain;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.core.web.page.TableSupport;

boman-common/boman-common-core/src/main/java/com/boman/common/core/web/domain/BaseEntity.java

@@ -1,114 +1,114 @@
-package com.boman.common.core.web.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
- * Entity基类
- * 
- * @author ruoyi
- */
-public class BaseEntity implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 搜索值 */
-    private String searchValue;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /** 备注 */
-    private String remark;
-
-    /** 请求参数 */
-    private Map<String, Object> params;
-
-    public String getSearchValue()
-    {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue)
-    {
-        this.searchValue = searchValue;
-    }
-
-    public String getCreateBy()
-    {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy)
-    {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy()
-    {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy)
-    {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime()
-    {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime)
-    {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
-    public void setParams(Map<String, Object> params)
-    {
-        this.params = params;
-    }
-}
+//package com.boman.common.core.web.domain;
+//
+//import java.io.Serializable;
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.Map;
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//
+///**
+// * Entity基类
+// *
+// * @author ruoyi
+// */
+//public class BaseEntity implements Serializable
+//{
+//    private static final long serialVersionUID = 1L;
+//
+//    /** 搜索值 */
+//    private String searchValue;
+//
+//    /** 创建者 */
+//    private String createBy;
+//
+//    /** 创建时间 */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date createTime;
+//
+//    /** 更新者 */
+//    private String updateBy;
+//
+//    /** 更新时间 */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date updateTime;
+//
+//    /** 备注 */
+//    private String remark;
+//
+//    /** 请求参数 */
+//    private Map<String, Object> params;
+//
+//    public String getSearchValue()
+//    {
+//        return searchValue;
+//    }
+//
+//    public void setSearchValue(String searchValue)
+//    {
+//        this.searchValue = searchValue;
+//    }
+//
+//    public String getCreateBy()
+//    {
+//        return createBy;
+//    }
+//
+//    public void setCreateBy(String createBy)
+//    {
+//        this.createBy = createBy;
+//    }
+//
+//    public Date getCreateTime()
+//    {
+//        return createTime;
+//    }
+//
+//    public void setCreateTime(Date createTime)
+//    {
+//        this.createTime = createTime;
+//    }
+//
+//    public String getUpdateBy()
+//    {
+//        return updateBy;
+//    }
+//
+//    public void setUpdateBy(String updateBy)
+//    {
+//        this.updateBy = updateBy;
+//    }
+//
+//    public Date getUpdateTime()
+//    {
+//        return updateTime;
+//    }
+//
+//    public void setUpdateTime(Date updateTime)
+//    {
+//        this.updateTime = updateTime;
+//    }
+//
+//    public String getRemark()
+//    {
+//        return remark;
+//    }
+//
+//    public void setRemark(String remark)
+//    {
+//        this.remark = remark;
+//    }
+//
+//    public Map<String, Object> getParams()
+//    {
+//        if (params == null)
+//        {
+//            params = new HashMap<>();
+//        }
+//        return params;
+//    }
+//
+//    public void setParams(Map<String, Object> params)
+//    {
+//        this.params = params;
+//    }
+//}

boman-common/boman-common-datascope/src/main/java/com/boman/common/datascope/aspect/DataScopeAspect.java

@@ -10,7 +10,7 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.BaseEntity;
 import com.boman.common.datascope.annotation.DataScope;
 import com.boman.common.security.service.TokenService;
 import com.boman.domain.SysRole;

boman-common/boman-common-security/src/main/java/com/boman/common/security/feign/FeignRequestInterceptor.java

@@ -4,7 +4,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import com.boman.common.core.utils.ip.IpUtils;
 import org.springframework.stereotype.Component;
-import com.boman.common.core.constant.CacheConstants;
+import com.boman.domain.constant.CacheConstants;
 import com.boman.common.core.utils.ServletUtils;
 import com.boman.common.core.utils.StringUtils;
 import feign.RequestInterceptor;

boman-common/boman-common-security/src/main/java/com/boman/common/security/handler/GlobalExceptionHandler.java

@@ -11,7 +11,7 @@ import com.boman.common.core.exception.CustomException;
 import com.boman.common.core.exception.DemoModeException;
 import com.boman.common.core.exception.PreAuthorizeException;
 import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 
 /**
  * 全局异常处理器

boman-gateway/src/main/java/com/boman/gateway/filter/AuthFilter.java

@@ -17,9 +17,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.boman.common.core.constant.CacheConstants;
-import com.boman.common.core.constant.Constants;
-import com.boman.common.core.domain.R;
+import com.boman.domain.constant.CacheConstants;
+import com.boman.domain.constant.Constants;
+import com.boman.domain.dto.R;
 import com.boman.common.core.utils.ServletUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.redis.service.RedisService;

boman-gateway/src/main/java/com/boman/gateway/filter/BlackListUrlFilter.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFac
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import reactor.core.publisher.Mono;
 
 /**

boman-gateway/src/main/java/com/boman/gateway/filter/ValidateCodeFilter.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.gateway.service.ValidateCodeService;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

boman-gateway/src/main/java/com/boman/gateway/handler/GatewayExceptionHandler.java

@@ -13,7 +13,7 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import com.alibaba.fastjson.JSON;
-import com.boman.common.core.domain.R;
+import com.boman.domain.dto.R;
 import reactor.core.publisher.Mono;
 
 /**

boman-gateway/src/main/java/com/boman/gateway/handler/ValidateCodeHandler.java

@@ -9,7 +9,7 @@ import org.springframework.web.reactive.function.server.HandlerFunction;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import com.boman.common.core.exception.CaptchaException;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.gateway.service.ValidateCodeService;
 import reactor.core.publisher.Mono;
 

boman-gateway/src/main/java/com/boman/gateway/service/ValidateCodeService.java

@@ -2,7 +2,7 @@ package com.boman.gateway.service;
 
 import java.io.IOException;
 import com.boman.common.core.exception.CaptchaException;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 
 /**
  * 验证码处理

boman-gateway/src/main/java/com/boman/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -9,12 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FastByteArrayOutputStream;
 import com.google.code.kaptcha.Producer;
-import com.boman.common.core.constant.Constants;
+import com.boman.domain.constant.Constants;
 import com.boman.common.core.exception.CaptchaException;
 import com.boman.common.core.utils.IdUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.sign.Base64;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.redis.service.RedisService;
 import com.boman.gateway.service.ValidateCodeService;
 

boman-modules/boman-file/src/main/java/com/boman/file/controller/ExcelController.java

@@ -1,6 +1,6 @@
 package com.boman.file.controller;
 
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.ExportExcelDto;
 import com.boman.file.service.ISysFileService;
 import org.springframework.web.bind.annotation.*;
@@ -46,7 +46,7 @@ public class ExcelController {
      * @param dto      tableName
      *                 empty(true=>只带表头的excel，不含数据, false=>带数据的excel)
      *                 condition 查询条件
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @PostMapping("/export")
     public AjaxResult exportExcelCommon(HttpServletResponse response, @RequestBody ExportExcelDto dto) {

boman-modules/boman-file/src/main/java/com/boman/file/controller/SysFileController.java

@@ -1,7 +1,6 @@
 package com.boman.file.controller;
 
-import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.file.utils.FileUploadUtils;
+import com.boman.domain.dto.AjaxResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.boman.common.core.domain.R;
+import com.boman.domain.dto.R;
 import com.boman.common.core.utils.file.FileUtils;
 import com.boman.file.service.ISysFileService;
 import com.boman.domain.SysFile;

boman-modules/boman-file/src/main/java/com/boman/file/service/FastDfsSysFileServiceImpl.java

@@ -1,7 +1,7 @@
 //package com.boman.file.service;
 //
 //import com.alibaba.fastjson.JSONObject;
-//import com.boman.common.core.web.domain.AjaxResult;
+//import com.boman.domain.dto.AjaxResult;
 //import com.boman.domain.dto.ImportExcelDto;
 //import org.apache.commons.io.FilenameUtils;
 //import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +86,7 @@
 //     *
 //     * @param tableName tableName
 //     * @param empty     true=>只带表头的excel，不含数据, false=>带数据的excel
-//     * @return com.boman.common.core.web.domain.AjaxResult
+//     * @return com.boman.domain.dto.AjaxResult
 //     */
 //    @Override
 //    public AjaxResult exportExcelCommon(HttpServletResponse response, String tableName, Boolean empty, JSONObject condition) {

boman-modules/boman-file/src/main/java/com/boman/file/service/ISysFileService.java

@@ -1,7 +1,7 @@
 package com.boman.file.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.ExportExcelDto;
 import com.boman.domain.dto.ImportExcelDto;
 import org.springframework.web.multipart.MultipartFile;
@@ -58,7 +58,7 @@ public interface ISysFileService
      * @param dto      tableName
      *                 empty(true=>只带表头的excel，不含数据, false=>带数据的excel)
      *                 condition 查询条件
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     AjaxResult exportExcelCommon(HttpServletResponse response, ExportExcelDto dto);
 }

boman-modules/boman-file/src/main/java/com/boman/file/service/LocalSysFileServiceImpl.java

@@ -1,10 +1,9 @@
 package com.boman.file.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.boman.common.core.utils.SpringUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.GenTable;
@@ -123,7 +122,7 @@ public class LocalSysFileServiceImpl implements ISysFileService
      * @param dto      tableName
      *                 empty(true=>只带表头的excel，不含数据, false=>带数据的excel)
      *                 condition 查询条件
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @Override
     public AjaxResult exportExcelCommon(HttpServletResponse response, ExportExcelDto dto) {

boman-modules/boman-file/src/main/java/com/boman/file/service/MinioSysFileServiceImpl.java

@@ -1,7 +1,7 @@
 //package com.boman.file.service;
 //
 //import com.alibaba.fastjson.JSONObject;
-//import com.boman.common.core.web.domain.AjaxResult;
+//import com.boman.domain.dto.AjaxResult;
 //import com.boman.domain.dto.ImportExcelDto;
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.stereotype.Service;
@@ -89,7 +89,7 @@
 //     *
 //     * @param tableName tableName
 //     * @param empty     true=>只带表头的excel，不含数据, false=>带数据的excel
-//     * @return com.boman.common.core.web.domain.AjaxResult
+//     * @return com.boman.domain.dto.AjaxResult
 //     */
 //    @Override
 //    public AjaxResult exportExcelCommon(HttpServletResponse response, String tableName, Boolean empty, JSONObject condition) {

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -6,9 +6,8 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
-import com.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.gen.service.ILoadTableServer;
-import com.boman.gen.service.LoadTableServerImpl;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -22,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.text.Convert;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableColumnController.java

@@ -1,10 +1,10 @@
 package com.boman.gen.controller;
 
 
-import com.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableRelationController.java

@@ -3,7 +3,7 @@ package com.boman.gen.controller;
 
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.domain.GenTableRelation;
 import com.boman.gen.service.IGenTableRelationService;

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/LoadTableController.java

@@ -1,33 +1,14 @@
 package com.boman.gen.controller;
 
-import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.common.redis.RedisKey;
-import com.boman.common.redis.service.RedisService;
-import com.boman.domain.constant.FormDataConstant;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.GenTable;
-import com.boman.domain.GenTableColumn;
-import com.boman.domain.GenTableRelation;
-import com.boman.gen.service.IGenTableColumnService;
-import com.boman.gen.service.IGenTableRelationService;
-import com.boman.gen.service.IGenTableService;
 import com.boman.gen.service.ILoadTableServer;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
 
 /**

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/TableSqlController.java

@@ -1,7 +1,7 @@
 package com.boman.gen.controller;
 
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.TableSql;
 import com.boman.gen.service.ITableSqlService;
 import org.springframework.beans.factory.annotation.Autowired;

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableColumnServiceImpl.java

@@ -1,6 +1,6 @@
 package com.boman.gen.service;
 
-import com.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.text.Convert;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
@@ -20,7 +20,6 @@ import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.ArrayList;
 import java.util.Collections;

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -10,10 +10,10 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import com.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.text.Convert;
 import com.boman.common.core.utils.DateUtils;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.domain.RoleEnum;
 import com.boman.domain.TableSql;
@@ -32,8 +32,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.boman.common.core.constant.Constants;
-import com.boman.common.core.constant.GenConstants;
+import com.boman.domain.constant.Constants;
+import com.boman.domain.constant.GenConstants;
 import com.boman.common.core.exception.CustomException;
 import com.boman.common.core.text.CharsetKit;
 import com.boman.common.core.utils.SecurityUtils;

boman-modules/boman-gen/src/main/java/com/boman/gen/service/IGenTableService.java

@@ -3,7 +3,7 @@ package com.boman.gen.service;
 import java.util.List;
 import java.util.Map;
 
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.GenTable;
 
 /**

boman-modules/boman-gen/src/main/java/com/boman/gen/service/ILoadTableServer.java

@@ -1,6 +1,6 @@
 package com.boman.gen.service;
 
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.GenTable;
 
 /**

boman-modules/boman-gen/src/main/java/com/boman/gen/service/ITableSqlService.java

@@ -1,6 +1,6 @@
 package com.boman.gen.service;
 
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.TableSql;
 
 /**

boman-modules/boman-gen/src/main/java/com/boman/gen/service/LoadTableServerImpl.java

@@ -2,7 +2,7 @@ package com.boman.gen.service;
 
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.GenTable;

boman-modules/boman-gen/src/main/java/com/boman/gen/service/TableSqlServiceImpl.java

@@ -1,10 +1,10 @@
 package com.boman.gen.service;
 
-import com.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
 import com.boman.domain.TableSql;

boman-modules/boman-gen/src/main/java/com/boman/gen/util/GenUtils.java

@@ -1,7 +1,7 @@
 package com.boman.gen.util;
 
-import com.boman.common.core.constant.GenConstants;
-import com.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.GenConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.gen.config.GenConfig;
 import com.boman.domain.GenTable;

boman-modules/boman-gen/src/main/java/com/boman/gen/util/VelocityInitializer.java

@@ -2,7 +2,7 @@ package com.boman.gen.util;
 
 import java.util.Properties;
 import org.apache.velocity.app.Velocity;
-import com.boman.common.core.constant.Constants;
+import com.boman.domain.constant.Constants;
 
 /**
  * VelocityEngine工厂

boman-modules/boman-gen/src/main/java/com/boman/gen/util/VelocityUtils.java

@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 import org.apache.velocity.VelocityContext;
 import com.alibaba.fastjson.JSONObject;
-import com.boman.common.core.constant.GenConstants;
+import com.boman.domain.constant.GenConstants;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.domain.GenTable;

boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobController.java

@@ -17,7 +17,7 @@ import com.boman.common.core.exception.job.TaskException;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobLogController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

boman-modules/boman-job/src/main/java/com/boman/job/domain/SysJob.java

@@ -7,11 +7,11 @@ import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.constant.ScheduleConstants;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.constant.ScheduleConstants;
 import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.BaseEntity;
 import com.boman.job.util.CronUtils;
 
 /**

boman-modules/boman-job/src/main/java/com/boman/job/domain/SysJobLog.java

@@ -3,8 +3,8 @@ package com.boman.job.domain;
 import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.BaseEntity;
 
 /**
  * 定时任务调度日志表 sys_job_log

boman-modules/boman-job/src/main/java/com/boman/job/service/SysJobServiceImpl.java

@@ -9,7 +9,7 @@ import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.boman.common.core.constant.ScheduleConstants;
+import com.boman.domain.constant.ScheduleConstants;
 import com.boman.common.core.exception.job.TaskException;
 import com.boman.job.domain.SysJob;
 import com.boman.job.mapper.SysJobMapper;

boman-modules/boman-job/src/main/java/com/boman/job/util/AbstractQuartzJob.java

@@ -6,7 +6,7 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.boman.common.core.constant.ScheduleConstants;
+import com.boman.domain.constant.ScheduleConstants;
 import com.boman.common.core.utils.ExceptionUtil;
 import com.boman.common.core.utils.SpringUtils;
 import com.boman.common.core.utils.StringUtils;

boman-modules/boman-job/src/main/java/com/boman/job/util/ScheduleUtils.java

@@ -10,7 +10,7 @@ import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.quartz.TriggerBuilder;
 import org.quartz.TriggerKey;
-import com.boman.common.core.constant.ScheduleConstants;
+import com.boman.domain.constant.ScheduleConstants;
 import com.boman.common.core.exception.job.TaskException;
 import com.boman.common.core.exception.job.TaskException.Code;
 import com.boman.job.domain.SysJob;

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

@@ -13,11 +13,11 @@ 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.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -13,11 +13,11 @@ 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.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
@@ -72,7 +72,7 @@ public class SysDeptController extends BaseController
      * 功能描述: 拿到部门下所有的部门, 包含传过来的deptId
      *
      * @param deptId deptId
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("/list/children/depts/{deptId}")
     public List<SysDept> listChildrenDepts(@PathVariable(value = "deptId") Long deptId) {

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

@@ -18,7 +18,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -13,11 +13,11 @@ 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.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.boman.common.core.constant.Constants;
+import com.boman.domain.constant.Constants;
 import com.boman.common.core.utils.ServletUtils;
 import com.boman.common.core.utils.ip.IpUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -13,12 +13,12 @@ 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.boman.common.core.constant.Constants;
-import com.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.Constants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
@@ -105,7 +105,7 @@ public class SysMenuController extends BaseController
     * after: 不需要传roleId，查全部的，这样可以保证所有的角色都可以拿到所有的的菜单
     *
     * @param roleId roleId
-    * @return com.boman.common.core.web.domain.AjaxResult
+    * @return com.boman.domain.dto.AjaxResult
     */
     @GetMapping(value = "/listTreeByRoleId/{roleId}")
     public AjaxResult listTreeByRoleId(@PathVariable("roleId") Long roleId) {
@@ -117,13 +117,13 @@ public class SysMenuController extends BaseController
      * 功能描述: 根据菜单id，找到此菜单以及子菜单下所有的叶子节点
      *
      * @param menuId menuId
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     /**
      * 功能描述: 根据菜单id，找到此菜单以及子菜单下所有的叶子节点
      *
      * @param menuId menuId
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping(value = "/allLeafNodeById/{menuId}")
     public AjaxResult allLeafNodeById(@PathVariable("menuId") Long menuId) {
@@ -135,7 +135,7 @@ public class SysMenuController extends BaseController
      *
      * @param menuId menuId
      * @param roleId roleIdmenu/listTreeByRoleId/1
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping(value = "/listMenus/roleId/{roleId}/menuId/{menuId}")
     public AjaxResult listMenus(@PathVariable("roleId") Long roleId, @PathVariable(value = "menuId", required = false) Long menuId) {

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -13,11 +13,11 @@ 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.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.boman.common.core.domain.R;
+import com.boman.domain.dto.R;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.ServletUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.service.TokenService;

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

@@ -13,11 +13,11 @@ 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.boman.common.core.constant.UserConstants;
+import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleDataController.java

@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleMenuController.java

@@ -1,6 +1,6 @@
 package com.boman.system.controller;
 
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.RoleMenuDto;
 import com.boman.system.service.impl.ISysRoleMenuService;
 import org.slf4j.Logger;
@@ -30,7 +30,7 @@ public class SysRoleMenuController {
      * 功能描述: 批量保存roleMenu
      *
      * @param dtos dtos
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @PostMapping
     public AjaxResult list(@RequestBody List<RoleMenuDto> dtos) {

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

@@ -21,13 +21,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.boman.common.core.constant.UserConstants;
-import com.boman.common.core.domain.R;
+import com.boman.domain.constant.UserConstants;
+import com.boman.domain.dto.R;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -10,10 +10,10 @@ 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.boman.common.core.constant.CacheConstants;
+import com.boman.domain.constant.CacheConstants;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;

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

@@ -2,11 +2,10 @@ package com.boman.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.web.domain.BaseEntity;
+
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.BaseEntity;
 
 /**
  * 参数配置表 sys_config

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictData.java

@@ -4,10 +4,10 @@
 //import javax.validation.constraints.Size;
 //import org.apache.commons.lang3.builder.ToStringBuilder;
 //import org.apache.commons.lang3.builder.ToStringStyle;
-//import com.boman.common.core.annotation.Excel;
-//import com.boman.common.core.annotation.Excel.ColumnType;
-//import com.boman.common.core.constant.UserConstants;
-//import com.boman.common.core.web.domain.BaseEntity;
+//import com.boman.domain.annotation.Excel;
+//import com.boman.domain.annotation.Excel.ColumnType;
+//import com.boman.domain.constant.UserConstants;
+//import com.boman.domain.BaseEntity;
 //
 ///**
 // * 字典数据表 sys_dict_data

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictType.java

@@ -4,9 +4,9 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.BaseEntity;
 
 /**
  * 字典类型表 sys_dict_type

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysLogininfor.java

@@ -2,9 +2,9 @@ package com.boman.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.annotation.Excel.ColumnType;
-import com.boman.common.core.web.domain.BaseEntity;
+import com.boman.domain.annotation.Excel;
+import com.boman.domain.annotation.Excel.ColumnType;
+import com.boman.domain.BaseEntity;
 
 /**
  * 系统访问记录表 sys_logininfor