From 2c4a182f94b5c068c00744cca3c2747f5c3cb161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E7=8E=89=E7=A5=A5?= Date: Wed, 30 Jun 2021 16:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E5=BC=82=E5=B8=B8=E7=A0=81?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=88=86=E7=B1=BB=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?gen=E6=A8=A1=E5=9D=97=E5=8E=BB=E9=99=A4=E5=BC=95=E7=94=A8system?= =?UTF-8?q?=EF=BC=8Ccache=E5=88=86=E5=8C=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + snowy-base/snowy-core/pom.xml | 16 +++++ .../base/AbstractMemoryCacheOperator.java | 2 +- .../base/AbstractRedisCacheOperator.java | 2 +- snowy-base/snowy-gen/pom.xml | 8 +-- .../Config.java => consts/GenConstant.java} | 4 +- .../core/consts/GenExpEnumConstant.java | 59 +++++++++++++++++++ .../generate/core/param/XnCodeGenParam.java | 4 +- .../enums/CodeGenerateExceptionEnum.java | 4 +- .../SysCodeGenerateConfigExceptionEnum.java | 4 +- .../service/impl/CodeGenerateServiceImpl.java | 26 ++++---- .../SysCodeGenerateConfigServiceImpl.java | 4 +- snowy-base/snowy-system/pom.xml | 16 ----- .../xiaonuo/sys/core/cache/MappingCache.java | 2 +- .../vip/xiaonuo/sys/core/cache/UserCache.java | 2 +- snowy-main/pom.xml | 1 + 16 files changed, 105 insertions(+), 50 deletions(-) rename snowy-base/{snowy-system/src/main/java/vip/xiaonuo/sys => snowy-core/src/main/java/vip/xiaonuo}/core/cache/base/AbstractMemoryCacheOperator.java (98%) rename snowy-base/{snowy-system/src/main/java/vip/xiaonuo/sys => snowy-core/src/main/java/vip/xiaonuo}/core/cache/base/AbstractRedisCacheOperator.java (98%) rename snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/{config/Config.java => consts/GenConstant.java} (98%) create mode 100644 snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/consts/GenExpEnumConstant.java diff --git a/pom.xml b/pom.xml index 4028a80b..1cf050f0 100644 --- a/pom.xml +++ b/pom.xml @@ -216,6 +216,7 @@ org.apache.maven.plugins maven-resources-plugin + 2.6 @ diff --git a/snowy-base/snowy-core/pom.xml b/snowy-base/snowy-core/pom.xml index a5ac2ab1..a410b662 100644 --- a/snowy-base/snowy-core/pom.xml +++ b/snowy-base/snowy-core/pom.xml @@ -65,6 +65,22 @@ postgresql --> + + + org.springframework.boot + spring-boot-starter-data-redis + + + io.lettuce + lettuce-core + + + + + redis.clients + jedis + + com.alibaba diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractMemoryCacheOperator.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/cache/base/AbstractMemoryCacheOperator.java similarity index 98% rename from snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractMemoryCacheOperator.java rename to snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/cache/base/AbstractMemoryCacheOperator.java index 464d8b77..474a8aa4 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractMemoryCacheOperator.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/cache/base/AbstractMemoryCacheOperator.java @@ -22,7 +22,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy 6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package vip.xiaonuo.sys.core.cache.base; +package vip.xiaonuo.core.cache.base; import cn.hutool.cache.impl.CacheObj; import cn.hutool.cache.impl.TimedCache; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractRedisCacheOperator.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/cache/base/AbstractRedisCacheOperator.java similarity index 98% rename from snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractRedisCacheOperator.java rename to snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/cache/base/AbstractRedisCacheOperator.java index 0daee8c6..156ae309 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractRedisCacheOperator.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/cache/base/AbstractRedisCacheOperator.java @@ -22,7 +22,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy 6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package vip.xiaonuo.sys.core.cache.base; +package vip.xiaonuo.core.cache.base; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; diff --git a/snowy-base/snowy-gen/pom.xml b/snowy-base/snowy-gen/pom.xml index f3dd4fff..e3017e3a 100644 --- a/snowy-base/snowy-gen/pom.xml +++ b/snowy-base/snowy-gen/pom.xml @@ -16,6 +16,7 @@ jar + vip.xiaonuo @@ -23,13 +24,6 @@ 1.6.0 - - - vip.xiaonuo - snowy-system - 1.6.0 - - org.apache.velocity diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/config/Config.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/consts/GenConstant.java similarity index 98% rename from snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/config/Config.java rename to snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/consts/GenConstant.java index 599afe48..2eeee206 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/config/Config.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/consts/GenConstant.java @@ -22,7 +22,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy 6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package vip.xiaonuo.generate.core.config; +package vip.xiaonuo.generate.core.consts; import java.io.File; @@ -33,7 +33,7 @@ import java.io.File; * @author yubaoshan * @date 2020-12-19 02:30:56 */ -public class Config { +public class GenConstant { /** * 路径分离（不通的机器，取不同的路径） diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/consts/GenExpEnumConstant.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/consts/GenExpEnumConstant.java new file mode 100644 index 00000000..26ebd9de --- /dev/null +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/consts/GenExpEnumConstant.java @@ -0,0 +1,59 @@ +/* +Copyright [2020] [https://www.xiaonuo.vip] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + +1.请不要删除和修改根目录下的LICENSE文件。 +2.请不要删除和修改Snowy源码头部的版权声明。 +3.请保留源码和相关描述文件的项目出处，作者声明等。 +4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/snowy +5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy +6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.generate.core.consts; + +/** + * 代码生产 异常枚举编码构成常量 + *

+ * 异常枚举编码由3部分组成，如下： + *

+ * 模块编码（2位） + 分类编码（4位） + 具体项编码（至少1位） + *

+ * 模块编码和分类编码在ExpEnumCodeConstant类中声明 + * + * @author xuyuxiang + * @date 2020/6/19 20:46 + */ +public interface GenExpEnumConstant { + + /** + * 模块分类编码（2位） + *

+ * snowy-gen模块异常枚举编码 + */ + int SNOWY_GEN_MODULE_EXP_CODE = 60; + + /* 分类编码（4位） */ + /** + * 代码生成表相关异常枚举 + */ + int GEN_CODE_EXCEPTION_ENUM = 1100; + + /** + * 代码生成详细配置相关异常枚举 + */ + int GEN_CONFIG_EXCEPTION_ENUM = 1200; + +} diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java index 9a2fc1d9..97270307 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java @@ -25,7 +25,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.generate.core.param; import lombok.Data; -import vip.xiaonuo.generate.core.config.Config; +import vip.xiaonuo.generate.core.consts.GenConstant; import vip.xiaonuo.generate.modular.entity.SysCodeGenerateConfig; import java.util.List; @@ -86,7 +86,7 @@ public class XnCodeGenParam { /** * 模块名 */ - private String modularNane = Config.MODULAR_NAME; + private String modularNane = GenConstant.MODULAR_NAME; /** * 业务名 diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/CodeGenerateExceptionEnum.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/CodeGenerateExceptionEnum.java index 4be028aa..d0b3024c 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/CodeGenerateExceptionEnum.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/CodeGenerateExceptionEnum.java @@ -27,7 +27,7 @@ package vip.xiaonuo.generate.modular.enums; import vip.xiaonuo.core.annotion.ExpEnumType; import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; import vip.xiaonuo.core.factory.ExpEnumCodeFactory; -import vip.xiaonuo.sys.core.consts.SysExpEnumConstant; +import vip.xiaonuo.generate.core.consts.GenExpEnumConstant; /** * 代码生成基础配置相关异常枚举 @@ -35,7 +35,7 @@ import vip.xiaonuo.sys.core.consts.SysExpEnumConstant; * @author yubaoshan * @date 2020年12月16日21:21:14 */ -@ExpEnumType(module = SysExpEnumConstant.SNOWY_SYS_MODULE_EXP_CODE, kind = SysExpEnumConstant.SYS_APP_EXCEPTION_ENUM) +@ExpEnumType(module = GenExpEnumConstant.GEN_CODE_EXCEPTION_ENUM, kind = GenExpEnumConstant.GEN_CONFIG_EXCEPTION_ENUM) public enum CodeGenerateExceptionEnum implements AbstractBaseExceptionEnum { /** diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/SysCodeGenerateConfigExceptionEnum.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/SysCodeGenerateConfigExceptionEnum.java index f56fef86..3a2817a8 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/SysCodeGenerateConfigExceptionEnum.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/enums/SysCodeGenerateConfigExceptionEnum.java @@ -27,7 +27,7 @@ package vip.xiaonuo.generate.modular.enums; import vip.xiaonuo.core.annotion.ExpEnumType; import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; import vip.xiaonuo.core.factory.ExpEnumCodeFactory; -import vip.xiaonuo.sys.core.consts.SysExpEnumConstant; +import vip.xiaonuo.generate.core.consts.GenExpEnumConstant; /** * 代码生成详细配置 @@ -35,7 +35,7 @@ import vip.xiaonuo.sys.core.consts.SysExpEnumConstant; * @author yubaoshan * @date 2021-02-06 20:19:49 */ -@ExpEnumType(module = SysExpEnumConstant.SNOWY_SYS_MODULE_EXP_CODE, kind = SysExpEnumConstant.SYS_POS_EXCEPTION_ENUM) +@ExpEnumType(module = GenExpEnumConstant.SNOWY_GEN_MODULE_EXP_CODE, kind = GenExpEnumConstant.GEN_CONFIG_EXCEPTION_ENUM) public enum SysCodeGenerateConfigExceptionEnum implements AbstractBaseExceptionEnum { /** diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java index 59246cb2..636d5035 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java @@ -37,7 +37,7 @@ import org.springframework.stereotype.Service; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.factory.PageFactory; import vip.xiaonuo.core.pojo.page.PageResult; -import vip.xiaonuo.generate.core.config.Config; +import vip.xiaonuo.generate.core.consts.GenConstant; import vip.xiaonuo.generate.core.context.XnVelocityContext; import vip.xiaonuo.generate.core.param.XnCodeGenParam; import vip.xiaonuo.generate.core.tool.StringDateTool; @@ -186,7 +186,7 @@ public class CodeGenerateServiceImpl extends ServiceImpl inforMationColumnsResultList = this.baseMapper.selectInformationColumns(Util.getDataBasename(), tableName); for (int a = 0; a < inforMationColumnsResultList.size(); a++) { if (ObjectUtil.isNotNull(inforMationColumnsResultList.get(a).columnKey) - && inforMationColumnsResultList.get(a).columnKey.equals(Config.DB_TABLE_COM_KRY)) { + && inforMationColumnsResultList.get(a).columnKey.equals(GenConstant.DB_TABLE_COM_KRY)) { return true; } } @@ -251,24 +251,24 @@ public class CodeGenerateServiceImpl extends ServiceImpltrue - - - org.springframework.boot - spring-boot-starter-data-redis - - - io.lettuce - lettuce-core - - - - - redis.clients - jedis - - io.jsonwebtoken diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/MappingCache.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/MappingCache.java index 612800dd..bb4ead47 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/MappingCache.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/MappingCache.java @@ -25,7 +25,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.core.cache; import cn.hutool.cache.impl.TimedCache; -import vip.xiaonuo.sys.core.cache.base.AbstractMemoryCacheOperator; +import vip.xiaonuo.core.cache.base.AbstractMemoryCacheOperator; import java.util.Map; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/UserCache.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/UserCache.java index 4e011180..ba2e5567 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/UserCache.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/UserCache.java @@ -25,8 +25,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.core.cache; import org.springframework.data.redis.core.RedisTemplate; +import vip.xiaonuo.core.cache.base.AbstractRedisCacheOperator; import vip.xiaonuo.core.pojo.login.SysLoginUser; -import vip.xiaonuo.sys.core.cache.base.AbstractRedisCacheOperator; /** * 登录用户的缓存，存储了当前登录的用户 diff --git a/snowy-main/pom.xml b/snowy-main/pom.xml index fa276aaa..edcbd786 100644 --- a/snowy-main/pom.xml +++ b/snowy-main/pom.xml @@ -17,6 +17,7 @@ + vip.xiaonuo snowy-system