新增充值订单结算任务

redis-demo/redis-demo.iml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.7-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.7-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.7-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.26" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.22.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.12.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.12.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.11" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.mysql:mysql-connector-j:8.0.31" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:6.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.10.2" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.10.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ibeetl:beetl:3.6.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.9.2" level="project" />
+  </component>
+</module>

redis-demo/src/main/resources/application-dev.yml

@@ -0,0 +1,23 @@
+# 开发环境配置
+
+# 数据源配置
+spring:
+  datasource:
+    url: jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: com_gxwebsoft_oa
+    password: EZfW2R4YiWfbLHLw
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+
+# 日志配置
+logging:
+  level:
+    com.gxwebsoft: DEBUG
+    com.baomidou.mybatisplus: DEBUG
+
+
+# 框架配置
+config:
+  # 开发环境接口
+  server-url: http://127.0.0.1:8081/api
+  upload-path: /Users/gxwebsoft/Documents/uploads/

redis-demo/src/main/resources/application-prod.yml

@@ -0,0 +1,26 @@
+# 生产环境配置
+
+# 数据源配置
+spring:
+  datasource:
+    url: jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: com_gxwebsoft_oa
+    password: EZfW2R4YiWfbLHLw
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+
+# 日志配置
+logging:
+  file:
+    name: websoft-api.log
+  level:
+    root: WARN
+    com.gxwebsoft: ERROR
+    com.baomidou.mybatisplus: ERROR
+
+# 框架配置
+config:
+  # 生产环境接口
+  server-url: https://open.gxwebsoft.com/api
+  upload-path: /www/wwwroot/file.ws/
+

redis-demo/src/test/java/com/gxwebsoft/generator/AppsGenerator.java

@@ -0,0 +1,181 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class AppsGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//      "apps_equipment",
+//      "apps_equipment_fault",
+//      "apps_equipment_alarm",
+//      "apps_equipment_record"
+//      "apps_cashier",
+//        "apps_hualala_card",
+//        "apps_hualala_card_benefits",
+        "apps_hualala_food",
+//        "apps_hualala_shop",
+//        "apps_hualala_cart_food",
+//        "apps_hualala_food_category",
+//      "apps_link",
+//      "apps_link",
+//      "apps_link",
+//      "apps_link",
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "apps_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/CmsGenerator.java

@@ -0,0 +1,177 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class CmsGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "cms";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//            "cms_article",
+            "cms_article_category",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "cms_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/CodeGenerator.java

@@ -0,0 +1,167 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class CodeGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "WebSoft";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://localhost:3306/websoft-api?useUnicode=true&useSSL=false&characterEncoding=utf8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "root";
+    private static final String DB_PASSWORD = "123456";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "test";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+            "sys_user",
+            "sys_role"
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "sys_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/OaGenerator.java

@@ -0,0 +1,176 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class OaGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "oa";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//      "oa_project",
+//      "oa_link",
+//      "oa_assets",
+//      "oa_customer",
+//      "oa_task",
+//      "sys_tenant",
+//      "oa_app",
+//      "oa_setting",
+//      "oa_assets",
+//      "oa_assets",
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "oa_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/ShopGenerator.java

@@ -0,0 +1,195 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class ShopGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "shop";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//      "shop_order",
+//      "shop_goods",
+//      "shop_store",
+//      "shop_cart",
+//      "shop_express",
+//      "shop_category",
+//      "shop_goods_image",
+//      "shop_comment",
+//      "shop_goods_service"
+//      "shop_member"
+//      "shop_user_balance_log",
+//      "shop_user_address",
+//      "shop_user_coupon",
+//      "shop_user_follow",
+//      "shop_user_oauth",
+//      "shop_user_points_log",
+//      "shop_cart"
+//      "shop_info"
+//      "shop_coupon"
+//        "shop_clerk"
+//      "shop_merchant",
+//      "shop_merchant_clerk"
+//      "shop_merchant_withdraw"
+//      "shop_order_address"
+      "shop_payment",
+//      "shop_payment_template",
+//      "shop_payment_trade"
+//      "shop_order_goods"
+//      "shop_user_oauth"
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "shop_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/SysGenerator.java

@@ -0,0 +1,170 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class SysGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "common.system";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+
+//      "sys_user",
+      "sys_tenant",
+      "sys_setting"
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "sys_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java

@@ -0,0 +1,50 @@
+package com.gxwebsoft.generator.engine;
+
+import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
+import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine;
+import org.beetl.core.Configuration;
+import org.beetl.core.GroupTemplate;
+import org.beetl.core.Template;
+import org.beetl.core.resource.FileResourceLoader;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Beetl模板引擎实现文件输出
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:30:28
+ */
+public class BeetlTemplateEnginePlus extends AbstractTemplateEngine {
+    private GroupTemplate groupTemplate;
+
+    @Override
+    public AbstractTemplateEngine init(ConfigBuilder configBuilder) {
+        super.init(configBuilder);
+        try {
+            Configuration cfg = Configuration.defaultConfiguration();
+            groupTemplate = new GroupTemplate(new FileResourceLoader(), cfg);
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        return this;
+    }
+
+    @Override
+    public void writer(Map<String, Object> objectMap, String templatePath, String outputFile) throws Exception {
+        Template template = groupTemplate.getTemplate(templatePath);
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile)) {
+            template.binding(objectMap);
+            template.renderTo(fileOutputStream);
+        }
+        logger.debug("模板:" + templatePath + ";  文件:" + outputFile);
+    }
+
+    @Override
+    public String templateFilePath(String filePath) {
+        return filePath + ".btl";
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl

@@ -0,0 +1,284 @@
+<%
+var serviceIns = strutil.toLowerCase(strutil.subStringTo(table.serviceName, 0, 1)) + strutil.subString(table.serviceName, 1);
+var authPre = package.ModuleName + ':' + table.entityPath;
+var idFieldName, idPropertyName;
+for(field in table.fields) {
+    if(field.keyFlag) {
+        idFieldName = field.name;
+        idPropertyName = field.propertyName;
+    }
+}
+%>
+package ${package.Controller};
+
+<% if(isNotEmpty(superControllerClassPackage)) { %>
+import ${superControllerClassPackage};
+<% } %>
+import ${cfg.packageName!}.${package.ModuleName}.service.${entity}Service;
+import ${cfg.packageName!}.${package.ModuleName}.entity.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+import ${cfg.packageName!}.common.core.web.ApiResult;
+import ${cfg.packageName!}.common.core.web.PageResult;
+import ${cfg.packageName!}.common.core.web.PageParam;
+import ${cfg.packageName!}.common.core.web.BatchParam;
+import ${cfg.packageName!}.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+<% if(!restControllerStyle) { %>
+import org.springframework.stereotype.Controller;
+<% } %>
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * ${table.comment!}控制器
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(swagger2) { %>
+@Api(tags = "${table.comment!}管理")
+<% } %>
+<% if(restControllerStyle) { %>
+@RestController
+<% } else { %>
+@Controller
+<% } %>
+@RequestMapping("${cfg.controllerMappingPrefix!}<% if(isNotEmpty(package.ModuleName)){ %>/${package.ModuleName}<% } %>/<% if(isNotEmpty(controllerMappingHyphenStyle)){ %>${controllerMappingHyphen}<% }else{ %>${table.entityPath}<% } %>")
+<% if(kotlin) { %>
+class ${table.controllerName}<% if(isNotEmpty(superControllerClass)) { %> : ${superControllerClass}()<% } %>
+<% } else if(isNotEmpty(superControllerClass)) { %>
+public class ${table.controllerName} extends ${superControllerClass} {
+<% } else { %>
+public class ${table.controllerName} {
+<% } %>
+    @Resource
+    private ${table.serviceName} ${serviceIns};
+
+    <% if(!swagger2) { %>
+    /**
+     * 分页查询${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:list')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("分页查询${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @GetMapping("/page")
+    public ApiResult<PageResult<${entity}>> page(${entity}Param param) {
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(${serviceIns}.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(${serviceIns}.pageRel(param));
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 查询全部${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:list')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("查询全部${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @GetMapping()
+    public ApiResult<List<${entity}>> list(${entity}Param param) {
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(${serviceIns}.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(${serviceIns}.listRel(param));
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 根据id查询${table.comment!}
+     */
+    <% } %>
+    @PreAuthorize("hasAuthority('${authPre}:list')")
+    @OperationLog
+    @ApiOperation("根据id查询${table.comment!}")
+    @GetMapping("/{id}")
+    public ApiResult<${entity}> get(@PathVariable("id") Integer id) {
+        return success(${serviceIns}.getById(id));
+        // 使用关联查询
+        //return success(${serviceIns}.getByIdRel(id));
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 添加${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:save')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("添加${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody ${entity} ${table.entityPath}) {
+        // 记录当前登录用户id、租户id、商户编号
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          ${table.entityPath}.setUserId(loginUser.getUserId());
+          ${table.entityPath}.setMerchantCode(getMerchantCode());
+        }
+        if (${serviceIns}.save(${table.entityPath})) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 修改${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:update')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("修改${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody ${entity} ${table.entityPath}) {
+        if (${serviceIns}.updateById(${table.entityPath})) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 删除${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:remove')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("删除${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (${serviceIns}.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 批量添加${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:save')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("批量添加${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<${entity}> list) {
+        if (${serviceIns}.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 批量修改${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:update')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("批量修改${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<${entity}> batchParam) {
+        if (batchParam.update(${serviceIns}, "${idFieldName!}")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 批量删除${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:remove')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("批量删除${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (${serviceIns}.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

redis-demo/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl

@@ -0,0 +1,158 @@
+package ${package.Entity};
+
+<% for(pkg in table.importPackages) { %>
+import ${pkg};
+<% } %>
+<% if(swagger2) { %>
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+<% } %>
+<% if(entityLombokModel) { %>
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+    <% if(chainModel) { %>
+import lombok.experimental.Accessors;
+    <% } %>
+<% } %>
+
+/**
+ * ${table.comment!}
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(entityLombokModel) { %>
+@Data
+    <% if(isNotEmpty(superEntityClass)) { %>
+@EqualsAndHashCode(callSuper = true)
+    <% } else { %>
+@EqualsAndHashCode(callSuper = false)
+    <% } %>
+    <% if(chainModel) { %>
+@Accessors(chain = true)
+    <% } %>
+<% } %>
+<% if(swagger2) { %>
+@ApiModel(value = "${entity}对象", description = "${table.comment!''}")
+<% } %>
+<% if(table.convert) { %>
+@TableName("${table.name}")
+<% } %>
+<% if(isNotEmpty(superEntityClass)) { %>
+public class ${entity} extends ${superEntityClass}<% if(activeRecord) { %><${entity}><% } %>{
+<% } else if(activeRecord) { %>
+public class ${entity} extends Model<${entity}> {
+<% } else { %>
+public class ${entity} implements Serializable {
+<% } %>
+<% if(entitySerialVersionUID) { %>
+    private static final long serialVersionUID = 1L;
+<% } %>
+<% /** -----------BEGIN 字段循环遍历----------- **/ %>
+<% for(field in table.fields) { %>
+    <%
+    var keyPropertyName;
+    if(field.keyFlag) {
+        keyPropertyName = field.propertyName;
+    }
+    %>
+
+    <% if(isNotEmpty(field.comment)) { %>
+        <% if(swagger2) { %>
+    @ApiModelProperty(value = "${field.comment}")
+        <% }else{ %>
+    /**
+     * ${field.comment}
+     */
+        <% } %>
+    <% } %>
+    <% /* 主键 */ %>
+    <% if(field.keyFlag) { %>
+        <% if(field.keyIdentityFlag) { %>
+    @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
+        <% } else if(isNotEmpty(idType)) { %>
+    @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
+        <% } else if(field.convert) { %>
+    @TableId("${field.annotationColumnName}")
+        <% } %>
+    <% /* 普通字段 */ %>
+    <% } else if(isNotEmpty(field.fill)) { %>
+        <% if(field.convert){ %>
+    @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
+        <% }else{ %>
+    @TableField(fill = FieldFill.${field.fill})
+        <% } %>
+    <% } else if(field.convert) { %>
+    @TableField("${field.annotationColumnName}")
+    <% } %>
+    <% /* 乐观锁注解 */ %>
+    <% if(versionFieldName!'' == field.name) { %>
+    @Version
+    <% } %>
+    <% /* 逻辑删除注解 */ %>
+    <% if(logicDeleteFieldName!'' == field.name) { %>
+    @TableLogic
+    <% } %>
+    private ${field.propertyType} ${field.propertyName};
+<% } %>
+<% /** -----------END 字段循环遍历----------- **/ %>
+
+<% if(!entityLombokModel) { %>
+    <% for(field in table.fields) { %>
+        <%
+        var getprefix = '';
+        if(field.propertyType == 'boolean') {
+            getprefix = 'is';
+        } else {
+            getprefix = 'get';
+        }
+        %>
+    public ${field.propertyType} ${getprefix}${field.capitalName}() {
+        return ${field.propertyName};
+    }
+
+        <% if(chainModel) { %>
+    public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        <% } else { %>
+    public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        <% } %>
+        this.${field.propertyName} = ${field.propertyName};
+        <% if(chainModel){ %>
+        return this;
+        <% } %>
+    }
+
+    <% } %>
+<% } %>
+<% if(entityColumnConstant) { %>
+    <% for(field in table.fields) { %>
+    public static final String ${strutil.toUpperCase(field.name)} = "${field.name}";
+
+    <% } %>
+<% } %>
+<% if(activeRecord) { %>
+    @Override
+    protected Serializable pkVal() {
+        <% if(isNotEmpty(keyPropertyName)){ %>
+        return this.${keyPropertyName};
+        <% }else{ %>
+        return null;
+        <% } %>
+    }
+
+<% } %>
+<% if(!entityLombokModel){ %>
+    @Override
+    public String toString() {
+        return "${entity}{" +
+        <% for(field in table.fields){ %>
+            <% if(fieldLP.index==0){ %>
+        "${field.propertyName}=" + ${field.propertyName} +
+            <% }else{ %>
+        ", ${field.propertyName}=" + ${field.propertyName} +
+            <% } %>
+        <% } %>
+        "}";
+    }
+<% } %>
+}

redis-demo/src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl

@@ -0,0 +1,41 @@
+package ${package.Mapper};
+
+import ${superMapperClassPackage};
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import ${package.Entity}.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ${table.comment!}Mapper
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(kotlin){ %>
+interface ${table.mapperName} : ${superMapperClass}<${entity}>
+<% }else{ %>
+public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<${entity}>
+     */
+    List<${entity}> selectPageRel(@Param("page") IPage<${entity}> page,
+                             @Param("param") ${entity}Param param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<${entity}> selectListRel(@Param("param") ${entity}Param param);
+
+}
+<% } %>

redis-demo/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${package.Mapper}.${table.mapperName}">
+<% if(enableCache) { %>
+
+    <!-- 开启二级缓存 -->
+    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
+<% } %>
+<% if(baseResultMap) { %>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="${package.Entity}.${entity}">
+    <% /** 生成主键排在第一位 **/ %>
+    <% for(field in table.fields) { %>
+        <% if(field.keyFlag){ %>
+        <id column="${field.name}" property="${field.propertyName}" />
+        <% } %>
+    <% } %>
+    <% /** 生成公共字段 **/ %>
+    <% for(field in table.commonFields) { %>
+        <result column="${field.name}" property="${field.propertyName}" />
+    <% } %>
+    <% /** 生成普通字段 **/ %>
+    <% for(field in table.fields) { %>
+        <% if(!field.keyFlag) { %>
+        <result column="${field.name}" property="${field.propertyName}" />
+        <% } %>
+    <% } %>
+    </resultMap>
+<% } %>
+<% if(baseColumnList) { %>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+    <% for(field in table.commonFields) { %>
+        ${field.columnName},
+    <% } %>
+        ${table.fieldNames}
+    </sql>
+<% } %>
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*
+        FROM ${table.name} a
+        <where>
+<% for(field in table.fields) { %>
+    <% if(field.keyFlag) { %>
+        <% /** 主键字段 **/ %>
+            <if test="param.${field.propertyName} != null">
+                AND a.${field.name} = #{param.${field.propertyName}}
+            </if>
+    <% } else if(field.name == logicDeleteFieldName) { %>
+        <% /** 逻辑删除字段 **/ %>
+            <if test="param.deleted != null">
+                AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+                AND a.deleted = 0
+            </if>
+    <% } else if(field.name == 'create_time') { %>
+        <% /** 创建时间字段 **/ %>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+    <% } else if(array.contain(cfg.paramExcludeFields, field.name)) { %>
+        <% /** 排除的字段 **/ %>
+    <% } else if(array.contain(cfg.paramEqType, field.propertyType)) { %>
+        <% /** 使用EQ的字段 **/ %>
+            <if test="param.${field.propertyName} != null">
+                AND a.${field.name} = #{param.${field.propertyName}}
+            </if>
+    <% } else { %>
+        <% /** 其它类型使用LIKE **/ %>
+            <if test="param.${field.propertyName} != null">
+                AND a.${field.name} LIKE CONCAT('%', #{param.${field.propertyName}}, '%')
+            </if>
+    <% } %>
+<% } %>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="${package.Entity}.${entity}">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="${package.Entity}.${entity}">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

redis-demo/src/test/java/com/gxwebsoft/generator/templates/param.java.btl

@@ -0,0 +1,146 @@
+package ${cfg.packageName!}.${package.ModuleName}.param;
+
+import ${cfg.packageName!}.common.core.annotation.QueryField;
+import ${cfg.packageName!}.common.core.annotation.QueryType;
+import ${cfg.packageName!}.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+<% if(swagger2) { %>
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+<% } %>
+<% if(entityLombokModel) { %>
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+    <% if(chainModel) { %>
+import lombok.experimental.Accessors;
+    <% } %>
+<% } %>
+
+/**
+ * ${table.comment!}查询参数
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(entityLombokModel) { %>
+@Data
+    <% if(isNotEmpty(superEntityClass)) { %>
+@EqualsAndHashCode(callSuper = true)
+    <% } else { %>
+@EqualsAndHashCode(callSuper = false)
+    <% } %>
+    <% if(chainModel) { %>
+@Accessors(chain = true)
+    <% } %>
+<% } %>
+@JsonInclude(JsonInclude.Include.NON_NULL)
+<% if(swagger2) { %>
+@ApiModel(value = "${entity}Param对象", description = "${table.comment!''}查询参数")
+<% } %>
+public class ${entity}Param extends BaseParam {
+<% if(entitySerialVersionUID) { %>
+    private static final long serialVersionUID = 1L;
+<% } %>
+<% /** -----------BEGIN 字段循环遍历----------- **/ %>
+<% for(field in table.fields) { %>
+    <%
+    var keyPropertyName;
+    if(field.keyFlag) {
+        keyPropertyName = field.propertyName;
+    }
+    // 排除的字段
+    if(array.contain(cfg.paramExcludeFields, field.name)) {
+        continue;
+    }
+    %>
+
+    <% if(isNotEmpty(field.comment)) { %>
+        <% if(swagger2) { %>
+    @ApiModelProperty(value = "${field.comment}")
+        <% }else{ %>
+    /**
+     * ${field.comment}
+     */
+        <% } %>
+    <% } %>
+    <% /* 主键 */ %>
+    <% if(field.keyFlag) { %>
+    @QueryField(type = QueryType.EQ)
+    <% /* 使用EQ的字段 */ %>
+    <% } else if(array.contain(cfg.paramEqType, field.propertyType)) { %>
+    @QueryField(type = QueryType.EQ)
+    <% } %>
+    <% /* 使用String类型的字段 */ %>
+    <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    private String ${field.propertyName};
+    <% } else { %>
+    <% /* 普通字段 */ %>
+    private ${field.propertyType} ${field.propertyName};
+    <% } %>
+<% } %>
+<% /** -----------END 字段循环遍历----------- **/ %>
+
+<% if(!entityLombokModel) { %>
+    <% for(field in table.fields) { %>
+        <%
+        var getprefix = '';
+        if(field.propertyType == 'boolean') {
+            getprefix = 'is';
+        } else {
+            getprefix = 'get';
+        }
+        // 排除的字段
+        if(array.contain(cfg.paramExcludeFields, field.name)) {
+            continue;
+        }
+        %>
+        <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    public String ${getprefix}${field.capitalName}() {
+        <% } else { %>
+    public ${field.propertyType} ${getprefix}${field.capitalName}() {
+        <% } %>
+        return ${field.propertyName};
+    }
+
+        <% if(chainModel) { %>
+            <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    public ${entity} set${field.capitalName}(String ${field.propertyName}) {
+            <% } else { %>
+    public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+            <% } %>
+        <% } else { %>
+            <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    public void set${field.capitalName}(String ${field.propertyName}) {
+            <% } else { %>
+    public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+            <% } %>
+        <% } %>
+        this.${field.propertyName} = ${field.propertyName};
+        <% if(chainModel){ %>
+        return this;
+        <% } %>
+    }
+
+    <% } %>
+<% } %>
+<% if(!entityLombokModel) { %>
+    @Override
+    public String toString() {
+        return "${entity}{" +
+        <% for(field in table.fields) { %>
+            <%
+            // 排除的字段
+            if(array.contain(cfg.paramExcludeFields, field.name)) {
+                continue;
+            }
+            %>
+            <% if(fieldLP.index == 0) { %>
+        "${field.propertyName}=" + ${field.propertyName} +
+            <% } else { %>
+        ", ${field.propertyName}=" + ${field.propertyName} +
+            <% } %>
+        <% } %>
+        "}";
+    }
+<% } %>
+}

redis-demo/src/test/java/com/gxwebsoft/generator/templates/service.java.btl

@@ -0,0 +1,55 @@
+<%
+var idPropertyName, idComment;
+for(field in table.fields) {
+    if(field.keyFlag) {
+        idPropertyName = field.propertyName;
+        idComment = field.comment;
+    }
+}
+%>
+package ${package.Service};
+
+import ${superServiceClassPackage};
+import ${cfg.packageName!}.common.core.web.PageResult;
+import ${package.Entity}.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+
+import java.util.List;
+
+/**
+ * ${table.comment!}Service
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(kotlin){ %>
+interface ${table.serviceName} : ${superServiceClass}<${entity}>
+<% }else{ %>
+public interface ${table.serviceName} extends ${superServiceClass}<${entity}> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<${entity}>
+     */
+    PageResult<${entity}> pageRel(${entity}Param param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<${entity}>
+     */
+    List<${entity}> listRel(${entity}Param param);
+
+    /**
+     * 根据id查询
+     *
+     * @param ${idPropertyName!} ${idComment!}
+     * @return ${entity}
+     */
+    ${entity} getByIdRel(Integer ${idPropertyName!});
+
+}
+<% } %>

redis-demo/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl

@@ -0,0 +1,62 @@
+<%
+var idPropertyName, idCapitalName;
+for(field in table.fields) {
+    if(field.keyFlag) {
+        idPropertyName = field.propertyName;
+        idCapitalName = field.capitalName;
+    }
+}
+%>
+package ${package.ServiceImpl};
+
+import ${superServiceImplClassPackage};
+import ${package.Mapper}.${table.mapperName};
+import ${package.Service}.${table.serviceName};
+import ${package.Entity}.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+import ${cfg.packageName!}.common.core.web.PageParam;
+import ${cfg.packageName!}.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * ${table.comment!}Service实现
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+@Service
+<% if(kotlin){ %>
+open class ${table.serviceImplName} : ${superServiceImplClass}<${table.mapperName}, ${entity}>(), ${table.serviceName} {
+
+}
+<% }else{ %>
+public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} {
+
+    @Override
+    public PageResult<${entity}> pageRel(${entity}Param param) {
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<${entity}> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<${entity}> listRel(${entity}Param param) {
+        List<${entity}> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public ${entity} getByIdRel(Integer ${idPropertyName!}) {
+        ${entity}Param param = new ${entity}Param();
+        param.set${idCapitalName!}(${idPropertyName!});
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+}
+<% } %>