删除多余的包

arch-base/src/main/java/org/arch/Result.java → arch-base/src/main/java/org/arch/base/Result.java

-package org.arch;
+package org.arch.base;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import org.arch.enums.ExceptionEnum;
+import org.arch.base.enums.ExceptionEnum;
 
 
 /**
 /**
  * 返回结果
  * 返回结果

arch-base/src/main/java/org/arch/config/LongListFormatSerializer.java → arch-base/src/main/java/org/arch/base/config/LongListFormatSerializer.java

-package org.arch.config;
+package org.arch.base.config;
 
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.JsonSerializer;

arch-base/src/main/java/org/arch/enums/ArchiAbilityInventoryEnum.java → arch-base/src/main/java/org/arch/base/enums/ArchiAbilityInventoryEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/ArchiAssetEnum.java → arch-base/src/main/java/org/arch/base/enums/ArchiAssetEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/ArchiAssetType.java → arch-base/src/main/java/org/arch/base/enums/ArchiAssetType.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 /**
 /**
  * 架构资产类型（3.新增、2.完善、1.遵从）
  * 架构资产类型（3.新增、2.完善、1.遵从）

arch-base/src/main/java/org/arch/enums/ArchiAssetTypeEnum.java → arch-base/src/main/java/org/arch/base/enums/ArchiAssetTypeEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.Getter;
 import lombok.Getter;
 
 

arch-base/src/main/java/org/arch/enums/ArchiBigClassEnum.java → arch-base/src/main/java/org/arch/base/enums/ArchiBigClassEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/ArchiPrjReviewEnum.java → arch-base/src/main/java/org/arch/base/enums/ArchiPrjReviewEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/ArchiStateEnum.java → arch-base/src/main/java/org/arch/base/enums/ArchiStateEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 /**
 /**
  * 状态 0:已停用 1:已发布 2:暂存
  * 状态 0:已停用 1:已发布 2:暂存

arch-base/src/main/java/org/arch/enums/BusinessTypeEnum.java → arch-base/src/main/java/org/arch/base/enums/BusinessTypeEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/DelFlagEnum.java → arch-base/src/main/java/org/arch/base/enums/DelFlagEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/DirectoryTypeEnum.java → arch-base/src/main/java/org/arch/base/enums/DirectoryTypeEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/EnableEnum.java → arch-base/src/main/java/org/arch/base/enums/EnableEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/ExceptionEnum.java → arch-base/src/main/java/org/arch/base/enums/ExceptionEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/IsDeleteEnum.java → arch-base/src/main/java/org/arch/base/enums/IsDeleteEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/IsExaApproveEnum.java → arch-base/src/main/java/org/arch/base/enums/IsExaApproveEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/MenuTypeEnum.java → arch-base/src/main/java/org/arch/base/enums/MenuTypeEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/PrjLinkEnum.java → arch-base/src/main/java/org/arch/base/enums/PrjLinkEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/PrjStateEnum.java → arch-base/src/main/java/org/arch/base/enums/PrjStateEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/SexEnum.java → arch-base/src/main/java/org/arch/base/enums/SexEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/StatusEnum.java → arch-base/src/main/java/org/arch/base/enums/StatusEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/TypeEnum.java → arch-base/src/main/java/org/arch/base/enums/TypeEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/UserTypeEnum.java → arch-base/src/main/java/org/arch/base/enums/UserTypeEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/enums/VersionStatusEnum.java → arch-base/src/main/java/org/arch/base/enums/VersionStatusEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

arch-base/src/main/java/org/arch/enums/ViewTypeEnum.java → arch-base/src/main/java/org/arch/base/enums/ViewTypeEnum.java

-package org.arch.enums;
+package org.arch.base.enums;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;

arch-base/src/main/java/org/arch/exception/BDException.java → arch-base/src/main/java/org/arch/base/exception/BDException.java

-package org.arch.exception;
+package org.arch.base.exception;
 
 
 /**
 /**
  * 自定义异常
  * 自定义异常

arch-base/src/main/java/org/arch/exception/BaseException.java → arch-base/src/main/java/org/arch/base/exception/BaseException.java

-package org.arch.exception;
+package org.arch.base.exception;
 
 
 import lombok.Data;
 import lombok.Data;
-import org.arch.enums.ExceptionEnum;
+import org.arch.base.enums.ExceptionEnum;
 
 
 /**
 /**
  * 基础错误
  * 基础错误

arch-base/src/main/java/org/arch/exception/CommonException.java → arch-base/src/main/java/org/arch/base/exception/CommonException.java

-package org.arch.exception;
+package org.arch.base.exception;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;

arch-base/src/main/java/org/arch/exception/GlobalExceptionTranslator.java → arch-base/src/main/java/org/arch/base/exception/GlobalExceptionTranslator.java

-package org.arch.exception;
+package org.arch.base.exception;
 
 
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationException;
-import org.arch.Result;
+import org.arch.base.Result;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;

arch-base/src/main/java/org/arch/utils/AesCipherUtil.java → arch-base/src/main/java/org/arch/base/utils/AesCipherUtil.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import javax.crypto.*;
 import javax.crypto.*;

arch-base/src/main/java/org/arch/utils/Base64ConvertUtil.java → arch-base/src/main/java/org/arch/base/utils/Base64ConvertUtil.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.util.Base64;
 import java.util.Base64;

arch-base/src/main/java/org/arch/utils/Constant.java → arch-base/src/main/java/org/arch/base/utils/Constant.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 public class Constant {
 public class Constant {
 
 

arch-base/src/main/java/org/arch/utils/FileUtils.java → arch-base/src/main/java/org/arch/base/utils/FileUtils.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileItemFactory;

arch-base/src/main/java/org/arch/utils/HexConvertUtil.java → arch-base/src/main/java/org/arch/base/utils/HexConvertUtil.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 /**
 /**
  * 进制转换工具
  * 进制转换工具

arch-base/src/main/java/org/arch/utils/JsonUtils.java → arch-base/src/main/java/org/arch/base/utils/JsonUtils.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;

arch-base/src/main/java/org/arch/utils/JwtUitls.java → arch-base/src/main/java/org/arch/base/utils/JwtUitls.java

-package org.arch.utils;
+package org.arch.base.utils;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.*;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 

arch-base/src/main/java/org/arch/utils/JwtUtil.java → arch-base/src/main/java/org/arch/base/utils/JwtUtil.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import org.arch.exception.BDException;
+import org.arch.base.exception.BDException;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;

arch-base/src/main/java/org/arch/utils/MD5Utils.java → arch-base/src/main/java/org/arch/base/utils/MD5Utils.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.net.util.Base64;
 import org.apache.commons.net.util.Base64;

arch-base/src/main/java/org/arch/utils/RequestUtils.java → arch-base/src/main/java/org/arch/base/utils/RequestUtils.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.request.ServletRequestAttributes;

arch-base/src/main/java/org/arch/utils/StringUtils.java → arch-base/src/main/java/org/arch/base/utils/StringUtils.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
 import java.net.InetAddress;

arch-base/src/main/java/org/arch/utils/VersionUtil.java → arch-base/src/main/java/org/arch/base/utils/VersionUtil.java

-package org.arch.utils;
+package org.arch.base.utils;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 
 

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AdsParserContentDTO.java

@@ -3,7 +3,7 @@ package org.arch.common.modules.archoverall.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.arch.enums.ArchiPrjReviewEnum;
+import org.arch.base.enums.ArchiPrjReviewEnum;
 
 
 import java.util.List;
 import java.util.List;
 
 

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AppArchiConRequireReviewDTO.java

@@ -3,7 +3,7 @@ package org.arch.common.modules.archoverall.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.arch.enums.ArchiPrjReviewEnum;
+import org.arch.base.enums.ArchiPrjReviewEnum;
 
 
 /**
 /**
  * <p>
  * <p>

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AppArchiPostilReqDTO.java

@@ -2,7 +2,7 @@ package org.arch.common.modules.archoverall.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.arch.enums.ArchiPrjReviewEnum;
+import org.arch.base.enums.ArchiPrjReviewEnum;
 
 
 @Data
 @Data
 public class AppArchiPostilReqDTO {
 public class AppArchiPostilReqDTO {

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiDto.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.arch.config.LongListFormatSerializer;
+import org.arch.base.config.LongListFormatSerializer;
 import org.arch.common.modules.archoverall.entity.ArchiAssetRelated;
 import org.arch.common.modules.archoverall.entity.ArchiAssetRelated;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiReqDto.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.arch.config.LongListFormatSerializer;
+import org.arch.base.config.LongListFormatSerializer;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.List;
 import java.util.List;

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/NeedInfoDTO.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
-import org.arch.enums.ArchiPrjReviewEnum;
+import org.arch.base.enums.ArchiPrjReviewEnum;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.util.Date;
 import java.util.Date;

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/WordContentDTO.java

@@ -3,7 +3,7 @@ package org.arch.common.modules.archoverall.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.arch.enums.ArchiPrjReviewEnum;
+import org.arch.base.enums.ArchiPrjReviewEnum;
 
 
 import java.util.List;
 import java.util.List;
 
 

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ability/ArchiAbilityInveStatReqDTO.java

@@ -3,8 +3,8 @@ package org.arch.common.modules.archoverall.dto.ability;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import org.arch.base.enums.ArchiAbilityInventoryEnum;
 import org.arch.common.modules.archoverall.dto.BasePageEntity;
 import org.arch.common.modules.archoverall.dto.BasePageEntity;
-import org.arch.enums.ArchiAbilityInventoryEnum;
 
 
 @Data
 @Data
 @ApiModel(value = "中台服务清单根据指标下钻资产列表", description = "中台服务清单根据指标下钻资产列表")
 @ApiModel(value = "中台服务清单根据指标下钻资产列表", description = "中台服务清单根据指标下钻资产列表")

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/asset/ArchiAssetDTO.java

@@ -3,7 +3,7 @@ package org.arch.common.modules.archoverall.dto.asset;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.arch.enums.ArchiAssetEnum;
+import org.arch.base.enums.ArchiAssetEnum;
 
 
 /**
 /**
  * 资产DTO
  * 资产DTO

arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/design/ArchiViewDTO.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import org.arch.enums.ArchiPrjReviewEnum;
+import org.arch.base.enums.ArchiPrjReviewEnum;
 
 
 /**
 /**
  * <p>
  * <p>

arch-clouds/mybatis/src/main/java/org/arch/config/MyMetaHandler.java → arch-clouds/common/src/main/java/org/arch/common/utils/MyMetaHandler.java

@@ -4,7 +4,7 @@
  * 注意：
  * 注意：
  * 本软件为www.yixiang.co开发研制
  * 本软件为www.yixiang.co开发研制
  */
  */
-package org.arch.config;
+package org.arch.common.utils;
 
 
 
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;

arch-clouds/mybatis/src/main/java/org/arch/config/MybatisConfig.java → arch-clouds/common/src/main/java/org/arch/common/utils/MybatisConfig.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.config;
+package org.arch.common.utils;
 
 
 /**
 /**
  * @author ：LionCity
  * @author ：LionCity

arch-clouds/filters/src/main/java/org/arch/filter/sqlFilter/SqlFilter.java

 package org.arch.filter.sqlFilter;
 package org.arch.filter.sqlFilter;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.arch.Result;
-import org.arch.utils.JsonUtils;
+import org.arch.base.Result;
+import org.arch.base.utils.JsonUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
 import javax.servlet.*;
 import javax.servlet.*;

arch-clouds/log/src/main/java/org/arch/log/service/impl/SysEventLogServiceImpl.java

@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import org.arch.base.utils.StringUtils;
 import org.arch.common.modules.sysmange.dto.UserDto;
 import org.arch.common.modules.sysmange.dto.UserDto;
 import org.arch.log.entity.SysEventLog;
 import org.arch.log.entity.SysEventLog;
 import org.arch.log.mapper.SysEventLogMapper;
 import org.arch.log.mapper.SysEventLogMapper;
 import org.arch.log.service.SysEventLogService;
 import org.arch.log.service.SysEventLogService;
-import org.arch.utils.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;

arch-clouds/mybatis/src/main/java/org/arch/annotation/Query.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/annotation/Query.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.annotation;
+package org.arch.mybatis.annotation;
 
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Retention;

arch-clouds/mybatis/src/main/java/org/arch/annotation/SwaggerDisplayEnum.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/annotation/SwaggerDisplayEnum.java

-package org.arch.annotation;
+package org.arch.mybatis.annotation;
 
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Retention;

arch-clouds/mybatis/src/main/java/org/arch/common/mapper/CoreMapper.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/common/mapper/CoreMapper.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.common.mapper;
+package org.arch.mybatis.common.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

arch-clouds/mybatis/src/main/java/org/arch/common/service/BaseService.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/common/service/BaseService.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.common.service;
+package org.arch.mybatis.common.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

arch-clouds/mybatis/src/main/java/org/arch/common/service/impl/BaseServiceImpl.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/common/service/impl/BaseServiceImpl.java

@@ -4,18 +4,17 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.common.service.impl;
+package org.arch.mybatis.common.service.impl;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.arch.common.service.BaseService;
-import org.arch.common.web.param.OrderQueryParam;
-import org.arch.common.web.param.QueryParam;
+import org.arch.mybatis.common.service.BaseService;
+import org.arch.mybatis.common.web.param.OrderQueryParam;
+import org.arch.mybatis.common.web.param.QueryParam;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 

arch-clouds/mybatis/src/main/java/org/arch/common/utils/QueryHelpPlus.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/common/utils/QueryHelpPlus.java

@@ -4,12 +4,12 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.common.utils;
+package org.arch.mybatis.common.utils;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.arch.annotation.Query;
+import org.arch.mybatis.annotation.Query;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;

arch-clouds/mybatis/src/main/java/org/arch/common/web/param/OrderQueryParam.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/common/web/param/OrderQueryParam.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.common.web.param;
+package org.arch.mybatis.common.web.param;
 
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
@@ -20,7 +20,7 @@ import java.util.List;
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("可排序查询参数对象")
 @ApiModel("可排序查询参数对象")
-public abstract class OrderQueryParam extends QueryParam{
+public abstract class OrderQueryParam extends QueryParam {
     private static final long serialVersionUID = 57714391204790143L;
     private static final long serialVersionUID = 57714391204790143L;
 
 
     @ApiModelProperty(value = "排序")
     @ApiModelProperty(value = "排序")

arch-clouds/mybatis/src/main/java/org/arch/common/web/param/QueryParam.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/common/web/param/QueryParam.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.common.web.param;
+package org.arch.mybatis.common.web.param;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

arch-clouds/mybatis/src/main/java/org/arch/common/web/vo/Paging.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/common/web/vo/Paging.java

@@ -4,7 +4,7 @@
 * 注意：
 * 注意：
 * 本软件为www.yixiang.co开发研制
 * 本软件为www.yixiang.co开发研制
 */
 */
-package org.arch.common.web.vo;
+package org.arch.mybatis.common.web.vo;
 
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;

arch-clouds/mybatis/src/main/java/org/arch/config/JsonArrayHandler.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/config/JsonArrayHandler.java

-package org.arch.config;
+package org.arch.mybatis.config;
 
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONArray;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.JdbcType;

arch-clouds/mybatis/src/main/java/org/arch/config/JsonTypeHandler.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/config/JsonTypeHandler.java

-package org.arch.config;
+package org.arch.mybatis.config;
 
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONObject;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.JdbcType;

arch-clouds/mybatis/src/main/java/org/arch/mybatis/config/MyMetaHandler.java

+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+ * 注意：
+ * 本软件为www.yixiang.co开发研制
+ */
+package org.arch.mybatis.config;
+
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 处理新增和更新的基础数据填充，配合BaseEntity和MyBatisPlusConfig使用
+ */
+@Slf4j
+@Component
+public class MyMetaHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        log.info("start insert fill ....");
+        this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); // 起始版本 3.3.0(推荐使用)
+        this.strictInsertFill(metaObject, "lastUpdateTime", Date.class, new Date()); // 起始版本 3.3.0(推荐)
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        log.info("start update fill ....");
+        this.strictUpdateFill(metaObject, "lastUpdateTime", Date.class, new Date()); // 起始版本 3.3.0(推荐)
+    }
+
+}

arch-clouds/mybatis/src/main/java/org/arch/mybatis/config/MybatisConfig.java

+/**
+* Copyright (C) 2018-2020
+* All rights reserved, Designed By www.yixiang.co
+* 注意：
+* 本软件为www.yixiang.co开发研制
+*/
+package org.arch.mybatis.config;
+
+/**
+ * @author ：LionCity
+ * @date ：Created in 2020-04-10 15:11
+ * @description：MybatisConfig
+ * @modified By：
+ * @version:
+ */
+
+import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+@Slf4j
+@Configuration
+@MapperScan(basePackages = {"org.arch.*.*.mapper","org.arch.**.mapper"})
+public class MybatisConfig {
+    public MybatisConfig() {
+        log.info("加载MybatisPlus配置...");
+    }
+    /**
+     * 配置mybatis的分页插件pageHelper
+     * @return
+     */
+    @Bean
+    public PageHelper pageHelper(){
+        PageHelper pageHelper = new PageHelper();
+        Properties properties = new Properties();
+        properties.setProperty("offsetAsPageNum","true");
+        properties.setProperty("rowBoundsWithCount","true");
+        properties.setProperty("reasonable","true");
+        //配置mysql数据库的方言
+        properties.setProperty("dialect","mysql");
+        pageHelper.setProperties(properties);
+        return pageHelper;
+    }
+}

arch-clouds/mybatis/src/main/java/org/arch/properties/PaginationProperties.java → arch-clouds/mybatis/src/main/java/org/arch/mybatis/properties/PaginationProperties.java

-package org.arch.properties;
+package org.arch.mybatis.properties;
 
 
 
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.DbType;

arch-clouds/mybatis/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.arch.config.MybatisConfig
+  org.arch.mybatis.config.MybatisConfig

arch-clouds/office/src/main/java/org/arch/Main.java

-package org.arch;
-
-public class Main {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
-}
\ No newline at end of file

arch-clouds/storage/src/main/java/org/arch/storage/mapper/FileMapper.java

@@ -3,8 +3,8 @@ package org.arch.storage.mapper;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
+import org.arch.base.utils.MD5Utils;
 import org.arch.storage.entity.File;
 import org.arch.storage.entity.File;
-import org.arch.utils.MD5Utils;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 

arch-clouds/storage/src/main/java/org/arch/storage/service/impl/OssServiceImpl.java

@@ -5,13 +5,13 @@ import cn.hutool.core.lang.Assert;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.arch.base.utils.FileUtils;
 import org.arch.storage.entity.File;
 import org.arch.storage.entity.File;
 import org.arch.common.modules.base.dto.DelDTO;
 import org.arch.common.modules.base.dto.DelDTO;
 import org.arch.common.modules.base.dto.DownloadObjectDTO;
 import org.arch.common.modules.base.dto.DownloadObjectDTO;
 import org.arch.common.modules.base.vo.UpLoadVO;
 import org.arch.common.modules.base.vo.UpLoadVO;
 import org.arch.storage.mapper.FileMapper;
 import org.arch.storage.mapper.FileMapper;
 import org.arch.storage.service.OssService;
 import org.arch.storage.service.OssService;
-import org.arch.utils.FileUtils;
 import org.dromara.x.file.storage.core.Downloader;
 import org.dromara.x.file.storage.core.Downloader;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.dromara.x.file.storage.core.FileStorageService;
 import org.dromara.x.file.storage.core.FileStorageService;

arch-gateway/pom.xml

@@ -17,17 +17,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     </properties>
     <dependencies>
     <dependencies>
-        <!--(nacos统一配置中心管理依赖)-->
-<!--        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>-->
-
        <dependency>
        <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-gateway-spring-boot-starter</artifactId>
             <artifactId>knife4j-gateway-spring-boot-starter</artifactId>

arch-gateway/src/main/java/org/arch/GatewayApp.java → arch-gateway/src/main/java/org/arch/gateway/GatewayApp.java

-package org.arch;
+package org.arch.gateway;
 
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

arch-gateway/src/main/java/org/arch/common/Constant.java → arch-gateway/src/main/java/org/arch/gateway/common/Constant.java

-package org.arch.common;
+package org.arch.gateway.common;
 
 
 public class Constant {
 public class Constant {
 
 

arch-gateway/src/main/java/org/arch/config/AnonFilterChainDefinitionMap.java → arch-gateway/src/main/java/org/arch/gateway/config/AnonFilterChainDefinitionMap.java

-package org.arch.config;
+package org.arch.gateway.config;
 
 
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.AntPathMatcher;
 
 

arch-gateway/src/main/java/org/arch/config/CacheBodyGlobalFilter.java → arch-gateway/src/main/java/org/arch/gateway/config/CacheBodyGlobalFilter.java

-package org.arch.config;
+package org.arch.gateway.config;
 
 
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.GlobalFilter;

arch-gateway/src/main/java/org/arch/config/GatewayLogFilter.java → arch-gateway/src/main/java/org/arch/gateway/config/GatewayLogFilter.java

-package org.arch.config;
+package org.arch.gateway.config;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.arch.systemLog.GatewayLog;
+import org.arch.gateway.systemLog.GatewayLog;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@@ -36,6 +35,7 @@ import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Mono;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.net.UnknownHostException;

arch-gateway/src/main/java/org/arch/config/LoginFilter.java → arch-gateway/src/main/java/org/arch/gateway/config/LoginFilter.java

-package org.arch.config;
+package org.arch.gateway.config;
 
 
 
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.cloud.commons.lang.StringUtils;
 import net.minidev.json.JSONObject;
 import net.minidev.json.JSONObject;
+import org.arch.base.utils.JwtUtil;
 import org.arch.common.redis.RedisService;
 import org.arch.common.redis.RedisService;
-import org.arch.utils.JwtUtil;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

arch-gateway/src/main/java/org/arch/config/ParamsEncryptionFilter.java → arch-gateway/src/main/java/org/arch/gateway/config/ParamsEncryptionFilter.java

-package org.arch.config;
+package org.arch.gateway.config;
 
 
 import cn.hutool.crypto.symmetric.AES;
 import cn.hutool.crypto.symmetric.AES;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;

arch-gateway/src/main/java/org/arch/config/ParamsSM4EncryptionFilter.java → arch-gateway/src/main/java/org/arch/gateway/config/ParamsSM4EncryptionFilter.java

-package org.arch.config;
+package org.arch.gateway.config;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONObject;
-import org.arch.config.sm4jm.SM4Utils;
+import org.arch.gateway.config.sm4jm.SM4Utils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;

arch-gateway/src/main/java/org/arch/config/fileFilter/FileUploadInterceptor.java → arch-gateway/src/main/java/org/arch/gateway/config/fileFilter/FileUploadInterceptor.java

-package org.arch.config.fileFilter;
+package org.arch.gateway.config.fileFilter;
 
 
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.GlobalFilter;

arch-gateway/src/main/java/org/arch/config/fileFilter/FileUploadSizeLimitFilter.java → arch-gateway/src/main/java/org/arch/gateway/config/fileFilter/FileUploadSizeLimitFilter.java

-package org.arch.config.fileFilter;
+package org.arch.gateway.config.fileFilter;
 
 
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.GlobalFilter;

arch-gateway/src/main/java/org/arch/config/fileFilter/FilterConfig.java → arch-gateway/src/main/java/org/arch/gateway/config/fileFilter/FilterConfig.java

-package org.arch.config.fileFilter;
+package org.arch.gateway.config.fileFilter;
 
 
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;

arch-gateway/src/main/java/org/arch/config/sm4jm/ByteConvertUtil.java → arch-gateway/src/main/java/org/arch/gateway/config/sm4jm/ByteConvertUtil.java

-package org.arch.config.sm4jm;
+package org.arch.gateway.config.sm4jm;
 
 
 import java.math.BigInteger;
 import java.math.BigInteger;
 
 

arch-gateway/src/main/java/org/arch/config/sm4jm/SM4.java → arch-gateway/src/main/java/org/arch/gateway/config/sm4jm/SM4.java

-package org.arch.config.sm4jm;
+package org.arch.gateway.config.sm4jm;
 
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayOutputStream;

arch-gateway/src/main/java/org/arch/config/sm4jm/SM4Context.java → arch-gateway/src/main/java/org/arch/gateway/config/sm4jm/SM4Context.java

-package org.arch.config.sm4jm;
+package org.arch.gateway.config.sm4jm;
 
 
 
 
 class SM4Context {
 class SM4Context {

arch-gateway/src/main/java/org/arch/config/sm4jm/SM4Utils.java → arch-gateway/src/main/java/org/arch/gateway/config/sm4jm/SM4Utils.java

-package org.arch.config.sm4jm;
+package org.arch.gateway.config.sm4jm;
 
 
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONString;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Base64;
 
 
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.StandardCharsets;

arch-gateway/src/main/java/org/arch/systemLog/GatewayLog.java → arch-gateway/src/main/java/org/arch/gateway/systemLog/GatewayLog.java

-package org.arch.systemLog;
+package org.arch.gateway.systemLog;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

arch-knowledge/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     </parent>
 
 
     <artifactId>arch-knowledge</artifactId>
     <artifactId>arch-knowledge</artifactId>
-
+    <name>知识库</name>
     <properties>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <maven.compiler.target>8</maven.compiler.target>

arch-overall/src/main/java/org/arch/overall/controller/ArchiAssetInfoController.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.arch.Result;
+import org.arch.base.Result;
 import org.arch.log.annotation.OperLog;
 import org.arch.log.annotation.OperLog;
 import org.arch.log.entity.DescContent;
 import org.arch.log.entity.DescContent;
 import org.arch.log.logenum.LogOperTypeEnum;
 import org.arch.log.logenum.LogOperTypeEnum;

arch-overall/src/main/java/org/arch/overall/controller/ArchiEleRelaController.java

 package org.arch.overall.controller;
 package org.arch.overall.controller;
 
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.arch.Result;
+import org.arch.base.Result;
 import org.arch.log.entity.DescContent;
 import org.arch.log.entity.DescContent;
 import org.arch.common.modules.archoverall.dto.ele.ArchiEleRelaDTO;
 import org.arch.common.modules.archoverall.dto.ele.ArchiEleRelaDTO;
 import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;
 import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;

arch-overall/src/main/java/org/arch/overall/controller/ArchiElementController.java

@@ -4,7 +4,7 @@ package org.arch.overall.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import org.arch.Result;
+import org.arch.base.Result;
 import org.arch.log.annotation.OperLog;
 import org.arch.log.annotation.OperLog;
 import org.arch.log.logenum.LogOperTypeEnum;
 import org.arch.log.logenum.LogOperTypeEnum;
 import org.arch.log.logenum.LogTypeEnum;
 import org.arch.log.logenum.LogTypeEnum;

arch-overall/src/main/java/org/arch/overall/controller/ArchiMetaModelController.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.arch.Result;
+import org.arch.base.Result;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
 import org.arch.common.modules.archoverall.dto.ele.ArchiMetaModelDTO;
 import org.arch.common.modules.archoverall.dto.ele.ArchiMetaModelDTO;
 import org.arch.common.modules.archoverall.dto.MetaModel;
 import org.arch.common.modules.archoverall.dto.MetaModel;

arch-overall/src/main/java/org/arch/overall/controller/ArchiViewController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import org.arch.Result;
+import org.arch.base.Result;
 import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
 import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
 import org.arch.log.annotation.OperLog;
 import org.arch.log.annotation.OperLog;
 import org.arch.log.entity.DescContent;
 import org.arch.log.entity.DescContent;

arch-overall/src/main/java/org/arch/overall/mapper/GraphRepositoryMapper.java

@@ -2,8 +2,8 @@ package org.arch.overall.mapper;
 
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.arch.base.utils.Constant;
 import org.arch.common.modules.archoverall.entity.GraphRepository;
 import org.arch.common.modules.archoverall.entity.GraphRepository;
-import org.arch.utils.Constant;
 
 
 public interface GraphRepositoryMapper extends BaseMapper<GraphRepository> {
 public interface GraphRepositoryMapper extends BaseMapper<GraphRepository> {
 
 

arch-overall/src/main/java/org/arch/overall/service/impl/ArchiAssertServiceImpl.java

@@ -19,6 +19,7 @@ import com.mxgraph.util.mxXmlUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.arch.base.enums.ArchiStateEnum;
 import org.arch.common.modules.archoverall.dto.*;
 import org.arch.common.modules.archoverall.dto.*;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
@@ -28,7 +29,6 @@ import org.arch.common.modules.archoverall.vo.ArchiAbilityAssetsRelationQueryVO;
 import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
 import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
 import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
 import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
 import org.arch.common.modules.archoverall.vo.MxCellVO;
 import org.arch.common.modules.archoverall.vo.MxCellVO;
-import org.arch.enums.ArchiStateEnum;
 import org.arch.common.modules.archoverall.entity.ArchiAbilityAssetsRelation;
 import org.arch.common.modules.archoverall.entity.ArchiAbilityAssetsRelation;
 import org.arch.common.modules.archoverall.entity.AssetInfo;
 import org.arch.common.modules.archoverall.entity.AssetInfo;
 import org.arch.overall.mapper.ArchiAbilityAssetsRelationMapper;
 import org.arch.overall.mapper.ArchiAbilityAssetsRelationMapper;

arch-overall/src/main/java/org/arch/overall/service/impl/ArchiAssetInfoServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.compress.utils.Lists;
+import org.arch.base.utils.VersionUtil;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetVisalDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetVisalDTO;
 import org.arch.common.modules.archoverall.vo.ArchVisualVO;
 import org.arch.common.modules.archoverall.vo.ArchVisualVO;
@@ -27,7 +28,6 @@ import org.arch.overall.mapper.ArchiAssetSystemMapper;
 import org.arch.overall.mapper.ArchiElementNestRelationMapper;
 import org.arch.overall.mapper.ArchiElementNestRelationMapper;
 import org.arch.overall.service.ArchiAssetInfoService;
 import org.arch.overall.service.ArchiAssetInfoService;
 import org.arch.overall.service.ArchiAssetService;
 import org.arch.overall.service.ArchiAssetService;
-import org.arch.utils.VersionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;

arch-overall/src/main/java/org/arch/overall/service/impl/ArchiAssetSysServiceImpl.java

@@ -14,11 +14,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.databind.type.CollectionType;
+import org.arch.base.enums.ArchiStateEnum;
+import org.arch.base.utils.VersionUtil;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetExtendDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetExtendDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
 import org.arch.common.modules.archoverall.dto.DelDTO;
 import org.arch.common.modules.archoverall.dto.DelDTO;
 import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
 import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
-import org.arch.enums.ArchiStateEnum;
 import org.arch.common.modules.archoverall.entity.ArchiAssetAppPrj;
 import org.arch.common.modules.archoverall.entity.ArchiAssetAppPrj;
 import org.arch.common.modules.archoverall.entity.ArchiAssetSystem;
 import org.arch.common.modules.archoverall.entity.ArchiAssetSystem;
 import org.arch.common.modules.archoverall.entity.AssetInfo;
 import org.arch.common.modules.archoverall.entity.AssetInfo;
@@ -30,7 +31,6 @@ import org.arch.overall.service.ArchiAssetService;
 import org.arch.overall.service.ArchiAssetSysService;
 import org.arch.overall.service.ArchiAssetSysService;
 import org.arch.overall.service.ArchiModelDictDetailService;
 import org.arch.overall.service.ArchiModelDictDetailService;
 import org.arch.common.modules.archoverall.vo.AssetInfoLevelVO;
 import org.arch.common.modules.archoverall.vo.AssetInfoLevelVO;
-import org.arch.utils.VersionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;