diff --git a/README.md b/README.md index f11651ae..7e848adc 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ npm run dev 生成通用 controller entity service dao api convert http vue ts sql junit 代码位置 -com.orion.ops.launch.generator.CodeGenerator +com.orion.ops.framework.mybatis.core.generator.CodeGenerator // 生成的表为 system_role, 业务注释为 '角色', 业务包为 role Template.create("system_role", "角色", "role") diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerator.java similarity index 97% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerator.java index ab0b59b6..b03194ca 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerator.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator; +package com.orion.ops.framework.mybatis.core.generator; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.AutoGenerator; @@ -15,10 +15,10 @@ import com.orion.lang.utils.ansi.style.color.AnsiForeground; import com.orion.lang.utils.ext.yml.YmlExt; import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.framework.mybatis.core.domain.BaseDO; +import com.orion.ops.framework.mybatis.core.generator.engine.VelocityTemplateEngine; +import com.orion.ops.framework.mybatis.core.generator.template.Table; +import com.orion.ops.framework.mybatis.core.generator.template.Template; import com.orion.ops.framework.mybatis.core.mapper.IMapper; -import com.orion.ops.launch.generator.engine.VelocityTemplateEngine; -import com.orion.ops.launch.generator.template.Table; -import com.orion.ops.launch.generator.template.Template; import org.apache.ibatis.annotations.Mapper; import java.io.File; @@ -431,7 +431,8 @@ public class CodeGenerator { .append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "- 后端代码修改完成后请先执行单元测试检测是否正常\n") .append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "- vue 代码需要注意同一模块的 router 需要自行合并\n") .append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "- vue 枚举需要自行更改数据类型\n") - .append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "- 菜单 sql 执行完成后 需要在菜单页面刷新缓存\n") + .append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "- 菜单 sql 执行完成后 需要在系统菜单页面刷新缓存\n") + .append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "- 字典 sql 执行完成后 需要在字典配置项页面刷新缓存\n") .toString(); System.out.print(line); } diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/EnumMeta.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/engine/EnumMeta.java similarity index 89% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/EnumMeta.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/engine/EnumMeta.java index c6ede45f..69154fe4 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/EnumMeta.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/engine/EnumMeta.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.engine; +package com.orion.ops.framework.mybatis.core.generator.engine; import com.orion.lang.define.collect.MultiLinkedHashMap; import lombok.AllArgsConstructor; diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/VelocityTemplateEngine.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/engine/VelocityTemplateEngine.java similarity index 98% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/VelocityTemplateEngine.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/engine/VelocityTemplateEngine.java index bc6b13a2..f122a397 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/VelocityTemplateEngine.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/engine/VelocityTemplateEngine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.launch.generator.engine; +package com.orion.ops.framework.mybatis.core.generator.engine; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.generator.config.ConstVal; @@ -31,8 +31,8 @@ import com.orion.lang.utils.reflect.BeanMap; import com.orion.lang.utils.reflect.Fields; import com.orion.ops.framework.common.constant.Const; import com.orion.ops.framework.common.constant.OrionOpsProConst; -import com.orion.ops.launch.generator.template.Table; -import com.orion.ops.launch.generator.template.VueEnum; +import com.orion.ops.framework.mybatis.core.generator.template.Table; +import com.orion.ops.framework.mybatis.core.generator.template.VueEnum; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/CacheTemplate.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/CacheTemplate.java similarity index 97% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/CacheTemplate.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/CacheTemplate.java index efccbdf1..0e337032 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/CacheTemplate.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/CacheTemplate.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.template; +package com.orion.ops.framework.mybatis.core.generator.template; import java.util.concurrent.TimeUnit; diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/EnumsTemplate.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/EnumsTemplate.java similarity index 98% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/EnumsTemplate.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/EnumsTemplate.java index babaad23..fffe32de 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/EnumsTemplate.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/EnumsTemplate.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.template; +package com.orion.ops.framework.mybatis.core.generator.template; import com.orion.lang.utils.Enums; import com.orion.lang.utils.collect.Lists; diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/ServerTemplate.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/ServerTemplate.java similarity index 82% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/ServerTemplate.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/ServerTemplate.java index 2d0ed54d..28e12a44 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/ServerTemplate.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/ServerTemplate.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.template; +package com.orion.ops.framework.mybatis.core.generator.template; /** * 后端代码模板 @@ -26,6 +26,7 @@ public class ServerTemplate extends Template { table.comment = comment; table.bizPackage = bizPackage; table.enableUnitTest = true; + table.enableOperatorLog = true; } /** @@ -71,6 +72,17 @@ public class ServerTemplate extends Template { return this; } + // fixme + /** + * 生成导出 + * + * @return this + */ + public ServerTemplate enableExport() { + table.enableExport = false; + return this; + } + /** * 不生成单元测试 * @@ -81,6 +93,17 @@ public class ServerTemplate extends Template { return this; } + // fixme + /** + * 不生成操作日志 + * + * @return this + */ + public ServerTemplate disableOperatorLog() { + table.enableUnitTest = false; + return this; + } + /** * 设置 cache * diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/Table.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/Table.java similarity index 88% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/Table.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/Table.java index 0ac46631..35d66f90 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/Table.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/Table.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.template; +package com.orion.ops.framework.mybatis.core.generator.template; import lombok.Data; @@ -43,11 +43,21 @@ public class Table { */ protected boolean enableUnitTest; + /** + * 是否生成导出 + */ + protected boolean enableExport; + /** * 是否可缓存 */ protected boolean enableCache; + /** + * 是否生成操作日志 + */ + protected boolean enableOperatorLog; + /** * 缓存的 key */ diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/Template.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/Template.java similarity index 95% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/Template.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/Template.java index 40af0418..f633b99a 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/Template.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/Template.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.template; +package com.orion.ops.framework.mybatis.core.generator.template; import lombok.Data; diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/VueEnum.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/VueEnum.java similarity index 95% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/VueEnum.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/VueEnum.java index af665f12..06204460 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/VueEnum.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/VueEnum.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.template; +package com.orion.ops.framework.mybatis.core.generator.template; import lombok.Data; diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/VueTemplate.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/VueTemplate.java similarity index 97% rename from orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/VueTemplate.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/VueTemplate.java index 562a2488..cc40481a 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/VueTemplate.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/VueTemplate.java @@ -1,4 +1,4 @@ -package com.orion.ops.launch.generator.template; +package com.orion.ops.framework.mybatis.core.generator.template; /** * 前端代码模板 diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-cache-dto.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-dto.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-cache-dto.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-dto.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-cache-key-define.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-key-define.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-cache-key-define.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-key-define.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.http.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.http.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-controller.http.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.http.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-convert.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-convert.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-convert.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-convert.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-entity-do.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-entity-do.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-entity-export.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-export.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-entity-export.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-export.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-entity-request-create.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-create.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-entity-request-create.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-create.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-entity-request-query.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-entity-request-query.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-entity-request-update.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-update.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-entity-request-update.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-update.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-entity-vo.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-vo.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-entity-vo.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-vo.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-mapper.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-mapper.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-mapper.xml.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.xml.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-mapper.xml.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.xml.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-operator-key-define.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-operator-key-define.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-service.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-module-service.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-api.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-provider-api.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-convert.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-convert.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-provider-convert.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-convert.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto-create.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto-create.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto-create.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto-create.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto-query.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto-query.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto-query.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto-query.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto-update.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto-update.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto-update.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto-update.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-provider-entity-dto.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-test-create-table.sql.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-create-table.sql.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-test-create-table.sql.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-create-table.sql.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-sql-menu.sql.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-sql-menu.sql.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-router.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-router.ts.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-router.ts.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-router.ts.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-index.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-index.vue.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-const.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-const.ts.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-types-const.ts.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-const.ts.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-enum.types.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-enum.types.ts.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-types-enum.types.ts.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-enum.types.ts.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm similarity index 100% rename from orion-ops-launch/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/EnumGenerator.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/EnumGenerator.java deleted file mode 100644 index 6933a413..00000000 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/EnumGenerator.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.orion.ops.launch.generator; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.orion.lang.define.collect.MultiLinkedHashMap; -import com.orion.lang.utils.Enums; -import com.orion.lang.utils.ansi.AnsiAppender; -import com.orion.lang.utils.ansi.style.AnsiFont; -import com.orion.lang.utils.ansi.style.color.AnsiForeground; -import com.orion.lang.utils.awt.Clipboards; -import com.orion.lang.utils.reflect.Fields; -import com.orion.ops.framework.common.constant.Const; -import com.orion.ops.module.infra.enums.UserStatusEnum; - -import java.util.List; -import java.util.function.Function; - -/** - * 前端枚举生成器 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/8/25 14:55 - */ -public class EnumGenerator { - - public static void main(String[] args) { - // 生成前端枚举配置 - String gen = gen(UserStatusEnum.class, - UserStatusEnum::getStatus, - UserStatusEnum::name); - System.out.println(gen); - } - - public static > String gen(Class clazz, - Function valueFunction) { - return gen(clazz, valueFunction, Enum::name); - } - - @SuppressWarnings("unchecked") - public static > String gen(Class clazz, - Function valueFunction, - Function labelFunction) { - // 获取枚举 - Enum[] constants = clazz.getEnumConstants(); - // 获取字段 - List fields = Enums.getFields(clazz); - MultiLinkedHashMap result = MultiLinkedHashMap.create(); - for (Enum e : constants) { - String name = e.name(); - result.put(name, Const.VALUE, valueFunction.apply((E) e)); - result.put(name, Const.LABEL, labelFunction.apply((E) e)); - for (String field : fields) { - result.put(name, field, Fields.getFieldValue(e, field)); - } - } - // ts 代码 - String tsCode = "/**\n *\n */\nexport const " + clazz.getSimpleName() + " = " + JSON.toJSONString(result, SerializerFeature.PrettyFormat); - // 复制到剪切板 - Clipboards.setString(tsCode); - // 提示 - String tips = AnsiAppender.create() - .append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "代码生成完成 - 已复制到剪切板 ^_^") - .toString(); - return "\n" + tsCode + "\n\n" + tips; - } - -} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java index e402cdc3..aa89c5ab 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java @@ -1,6 +1,7 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; +import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; @@ -72,6 +73,14 @@ public class DictKeyController { return dictKeyService.getDictKeyPage(request); } + @PutMapping("/refresh-cache") + @Operation(summary = "刷新字典缓存") + @PreAuthorize("@ss.hasPermission('infra:dict-key:refresh-cache')") + public HttpWrapper refreshCache() { + dictKeyService.refreshCache(); + return HttpWrapper.ok(); + } + @OperatorLog(DictKeyOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "删除字典配置项") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.http b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.http index d8beca66..7718d7d8 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.http +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.http @@ -1,5 +1,5 @@ ### 初始化角色权限缓存 -GET {{baseUrl}}/infra/permission/init-cache +GET {{baseUrl}}/infra/permission/refresh-cache Authorization: {{token}} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java index ec7f64d0..af3d17bf 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java @@ -39,10 +39,10 @@ public class PermissionController { @Resource private PermissionService permissionService; - @PutMapping("/init-cache") - @Operation(summary = "初始化角色权限缓存") - @PreAuthorize("@ss.hasPermission('infra:system-menu:init-cache')") - public HttpWrapper initCache() { + @PutMapping("/refresh-cache") + @Operation(summary = "刷新角色权限缓存") + @PreAuthorize("@ss.hasPermission('infra:system-menu:refresh-cache')") + public HttpWrapper refreshCache() { permissionService.initPermissionCache(); return HttpWrapper.ok(); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DictKeyService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DictKeyService.java index cf929560..be4c908a 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DictKeyService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DictKeyService.java @@ -57,6 +57,11 @@ public interface DictKeyService { */ Map getDictSchema(String key); + /** + * 刷新字典缓存 + */ + void refreshCache(); + /** * 删除字典配置项 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictKeyServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictKeyServiceImpl.java index e027b4fe..3fa60aa1 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictKeyServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Objects1; import com.orion.lang.utils.Strings; +import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.ops.framework.biz.operator.log.core.uitls.OperatorLogs; import com.orion.ops.framework.common.constant.Const; @@ -166,6 +167,18 @@ public class DictKeyServiceImpl implements DictKeyService { return result; } + @Override + public void refreshCache() { + Set schemaKeys = RedisUtils.scanKeys(DictCacheKeyDefine.DICT_SCHEMA.format("*")); + Set valueKeys = RedisUtils.scanKeys(DictCacheKeyDefine.DICT_VALUE.format("*")); + // 需要删除的缓存 key + List list = Lists.of(DictCacheKeyDefine.DICT_KEY.getKey()); + list.addAll(schemaKeys); + list.addAll(valueKeys); + // 删除缓存 + RedisUtils.delete(list); + } + @Override public Integer deleteDictKeyById(Long id) { log.info("DictKeyService-deleteDictKeyById id: {}", id); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java index da205425..bb0c67fc 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java @@ -11,7 +11,6 @@ import com.orion.ops.framework.common.constant.Const; import com.orion.ops.framework.common.constant.ErrorMessage; import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.framework.mybatis.core.query.Conditions; -import com.orion.ops.framework.redis.core.utils.RedisMaps; import com.orion.ops.framework.redis.core.utils.RedisStrings; import com.orion.ops.module.infra.convert.DictValueConvert; import com.orion.ops.module.infra.dao.DictKeyDAO; @@ -79,7 +78,7 @@ public class DictValueServiceImpl implements DictValueService { Long id = record.getId(); log.info("DictValueService-createDictValue id: {}, effect: {}", id, effect); // 删除缓存 - RedisMaps.delete(DictCacheKeyDefine.DICT_VALUE.format(key)); + RedisStrings.delete(DictCacheKeyDefine.DICT_VALUE.format(key)); return id; } @@ -103,7 +102,7 @@ public class DictValueServiceImpl implements DictValueService { int effect = dictValueDAO.updateById(updateRecord); log.info("DictValueService-updateDictValueById effect: {}", effect); // 删除缓存 - RedisMaps.delete(DictCacheKeyDefine.DICT_VALUE.format(key)); + RedisStrings.delete(DictCacheKeyDefine.DICT_VALUE.format(key)); // 记录历史归档 this.checkRecordHistory(updateRecord, record); return effect; @@ -130,7 +129,7 @@ public class DictValueServiceImpl implements DictValueService { int effect = dictValueDAO.updateById(updateRecord); log.info("DictValueService-rollbackDictValueById effect: {}", effect); // 删除缓存 - RedisMaps.delete(DictCacheKeyDefine.DICT_VALUE.format(record.getKeyName())); + RedisStrings.delete(DictCacheKeyDefine.DICT_VALUE.format(record.getKeyName())); // 记录历史归档 this.checkRecordHistory(updateRecord, record); return effect; @@ -222,7 +221,7 @@ public class DictValueServiceImpl implements DictValueService { // 删除缓存 String beforeCacheKey = DictCacheKeyDefine.DICT_VALUE.format(beforeKey); String newCacheKey = DictCacheKeyDefine.DICT_VALUE.format(newKey); - RedisMaps.delete(beforeCacheKey, newCacheKey); + RedisStrings.delete(beforeCacheKey, newCacheKey); return effect; } @@ -296,7 +295,7 @@ public class DictValueServiceImpl implements DictValueService { .distinct() .map(DictCacheKeyDefine.DICT_VALUE::format) .collect(Collectors.toList()); - RedisMaps.delete(keyList); + RedisStrings.delete(keyList); return effect; } diff --git a/orion-ops-ui/src/api/system/dict-key.ts b/orion-ops-ui/src/api/system/dict-key.ts index 681832d0..0301e82d 100644 --- a/orion-ops-ui/src/api/system/dict-key.ts +++ b/orion-ops-ui/src/api/system/dict-key.ts @@ -69,6 +69,13 @@ export function getDictKeyPage(request: DictKeyQueryRequest) { return axios.post>('/infra/dict-key/query', request); } +/** + * 刷新字典缓存 + */ +export function refreshCache() { + return axios.put('/infra/dict-key/refresh-cache'); +} + /** * 删除字典配置项 */ diff --git a/orion-ops-ui/src/api/system/menu.ts b/orion-ops-ui/src/api/system/menu.ts index 3f15665e..99de3abd 100644 --- a/orion-ops-ui/src/api/system/menu.ts +++ b/orion-ops-ui/src/api/system/menu.ts @@ -88,8 +88,8 @@ export function deleteMenu(id: number) { } /** - * 初始化缓存 + * 刷新缓存 */ -export function initCache() { - return axios.put('/infra/permission/init-cache'); +export function refreshCache() { + return axios.put('/infra/permission/refresh-cache'); } diff --git a/orion-ops-ui/src/assets/style/layout.less b/orion-ops-ui/src/assets/style/layout.less index ea105d78..d050ba2b 100644 --- a/orion-ops-ui/src/assets/style/layout.less +++ b/orion-ops-ui/src/assets/style/layout.less @@ -65,11 +65,7 @@ } .modal-form { - .arco-form-item { - &:last-child { - margin-bottom: 0 !important; - } - } + padding: 24px 20px 4px 20px; } .card-list-item { diff --git a/orion-ops-ui/src/components/view/card-list/index.vue b/orion-ops-ui/src/components/view/card-list/index.vue index 3926b199..5841b3dd 100644 --- a/orion-ops-ui/src/components/view/card-list/index.vue +++ b/orion-ops-ui/src/components/view/card-list/index.vue @@ -223,7 +223,7 @@