From e9624d11df9c4d469905af5ba88e697bab21387d Mon Sep 17 00:00:00 2001
From: Fnckerpoi <382716335@qq.com>
Date: Mon, 15 May 2023 14:14:17 +0800
Subject: [PATCH 01/18] =?UTF-8?q?fixed=20d2cd8c5=20from=20https://gitee.co?=
 =?UTF-8?q?m/fnckerpoi/bootx-platform/pulls/27=20=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B7=AF=E5=BE=84=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bootx-start/src/main/resources/application-dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml
index ae78010b..2b178fd7 100644
--- a/bootx-start/src/main/resources/application-dev.yml
+++ b/bootx-start/src/main/resources/application-dev.yml
@@ -103,7 +103,7 @@ bootx:
         "[身份识别和管理]": cn.bootx.platform.iam
         "[消息服务]": cn.bootx.platform.notice
         "[演示模块]": cn.bootx.demo
-        "[可视化大屏]": cn.bootx.visualization
+        "[可视化大屏]": cn.bootx.platform.visualization
         "[第三方对接]":
           - cn.bootx.platform.starter.dingtalk
           - cn.bootx.platform.starter.wecom
-- 
Gitee


From 9c1ad1a8fddf48e2bf80f1c5021b735df6c9ad7c Mon Sep 17 00:00:00 2001
From: Fnckerpoi <382716335@qq.com>
Date: Mon, 15 May 2023 14:06:03 +0800
Subject: [PATCH 02/18] fixed cb2b1a4 from
 https://gitee.com/fnckerpoi/bootx-platform/pulls/27 Update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b28673a4..a482c7f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ out/
 target/
 build/
 logs/
+# jrebel
+rebel.xml
-- 
Gitee


From cba95c24b9ae93177294690aeb3381136e0ff25f Mon Sep 17 00:00:00 2001
From: Fnckerpoi <382716335@qq.com>
Date: Mon, 15 May 2023 13:36:16 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=E2=80=94=E2=80=94=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

分别对分页查询接口
代码生成接口进行参数追增
---
 .../gen/controller/DatabaseTableController.java  | 10 ++++++----
 .../code/gen/service/DatabaseTableService.java   | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
index c1b31fce..15150796 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
@@ -39,8 +39,10 @@ public class DatabaseTableController {
     @Operation(summary = "表列表分页")
     @GetMapping("/page")
     public ResResult<Page<DatabaseTable>> page(@ParameterObject PageParam pageParam,
-            @ParameterObject DatabaseTable param) {
-        return Res.ok(databaseTableService.page(pageParam, param));
+            @ParameterObject DatabaseTable param,
+            @ParameterObject String dataSourceName)
+    {
+        return Res.ok(databaseTableService.page(pageParam, param,dataSourceName));
     }
 
     @Operation(summary = "获取表信息")
@@ -57,8 +59,8 @@ public class DatabaseTableController {
 
     @Operation(summary = "获取表相关的代码生成参数信息")
     @GetMapping("/getTableGenParam")
-    public ResResult<TableGenParamDto> getTableGenParam(String tableName) {
-        return Res.ok(databaseTableService.getTableGenParam(tableName));
+    public ResResult<TableGenParamDto> getTableGenParam(String dataBaseName, String tableName) {
+        return Res.ok(databaseTableService.getTableGenParam(dataBaseName,tableName));
     }
 
 }
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
index 67e40573..55bbdb72 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
@@ -9,6 +9,7 @@ import cn.bootx.platform.starter.code.gen.entity.DatabaseColumn;
 import cn.bootx.platform.starter.code.gen.entity.DatabaseTable;
 import cn.bootx.platform.starter.code.gen.util.CodeGenUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
@@ -16,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.stereotype.Service;
 
+import javax.sql.DataSource;
 import java.util.List;
 
 /**
@@ -30,6 +32,7 @@ import java.util.List;
 public class DatabaseTableService {
 
     private final DatabaseTableMapper databaseTableMapper;
+    private final DataSource bigScreen;
 
     /**
      * 查询全部
@@ -41,8 +44,9 @@ public class DatabaseTableService {
 
     /**
      * 分页
+     * TODO:根据数据源编码,切换数据源进行列表查询.
      */
-    public Page<DatabaseTable> page(PageParam pageParam, DatabaseTable param) {
+    public Page<DatabaseTable> page(PageParam pageParam, DatabaseTable param,String dataSourceName) {
         val mpPage = MpUtil.getMpPage(pageParam, DatabaseTable.class);
         QueryWrapper<DatabaseTable> wrapper = new QueryWrapper<>();
 
@@ -50,7 +54,11 @@ public class DatabaseTableService {
             .like(StrUtil.isNotBlank(param.getTableComment()), DatabaseTable.Fields.tableComment,
                     param.getTableComment())
             .orderByDesc(DatabaseTable.Fields.createTime, DatabaseTable.Fields.tableName);
-        return databaseTableMapper.page(mpPage, wrapper);
+
+        DynamicDataSourceContextHolder.push(dataSourceName);
+        Page<DatabaseTable> result = databaseTableMapper.page(mpPage, wrapper);
+        DynamicDataSourceContextHolder.poll();
+        return result;
     }
 
     /**
@@ -70,9 +78,11 @@ public class DatabaseTableService {
     /**
      * 获取表相关的代码生成参数信息
      */
-    public TableGenParamDto getTableGenParam(String tableName) {
+    public TableGenParamDto getTableGenParam(String dataBaseName, String tableName) {
+        DynamicDataSourceContextHolder.push(dataBaseName);
         DatabaseTable databaseTable = this.findByTableName(tableName);
         String entityName = CodeGenUtil.tableToJava(databaseTable.getTableName());
+        DynamicDataSourceContextHolder.poll();
         return new TableGenParamDto().setEntityName(entityName).setModule(entityName.toLowerCase());
     }
 
-- 
Gitee


From a07e51d8f8acd83067804449e4331d49a4ce7002 Mon Sep 17 00:00:00 2001
From: Fnckerpoi <382716335@qq.com>
Date: Mon, 15 May 2023 14:04:01 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=EF=BC=9A=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

通过DS注解避免调用DynamicDataSourceContextHolder来腐蚀功能业务
---
 .../code/gen/controller/DatabaseTableController.java   |  8 ++++----
 .../platform/starter/code/gen/param/CodeGenParam.java  |  3 +++
 .../starter/code/gen/service/CodeGeneratorService.java |  3 +++
 .../starter/code/gen/service/DatabaseTableService.java | 10 ++++------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
index 15150796..01fb17b8 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
@@ -40,9 +40,9 @@ public class DatabaseTableController {
     @GetMapping("/page")
     public ResResult<Page<DatabaseTable>> page(@ParameterObject PageParam pageParam,
             @ParameterObject DatabaseTable param,
-            @ParameterObject String dataSourceName)
+            @ParameterObject String dataSourceCode)
     {
-        return Res.ok(databaseTableService.page(pageParam, param,dataSourceName));
+        return Res.ok(databaseTableService.page(pageParam, param,dataSourceCode));
     }
 
     @Operation(summary = "获取表信息")
@@ -59,8 +59,8 @@ public class DatabaseTableController {
 
     @Operation(summary = "获取表相关的代码生成参数信息")
     @GetMapping("/getTableGenParam")
-    public ResResult<TableGenParamDto> getTableGenParam(String dataBaseName, String tableName) {
-        return Res.ok(databaseTableService.getTableGenParam(dataBaseName,tableName));
+    public ResResult<TableGenParamDto> getTableGenParam(String dataSourceCode, String tableName) {
+        return Res.ok(databaseTableService.getTableGenParam(dataSourceCode,tableName));
     }
 
 }
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java
index 04d30480..0111ce0c 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java
@@ -15,6 +15,9 @@ import lombok.experimental.Accessors;
 @Schema(title = "代码生成参数")
 public class CodeGenParam {
 
+    @Schema(description = "数据库源")
+    private String dataSourceCode;
+
     @Schema(description = "表名")
     private String tableName;
 
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java
index f8a31105..dfb9e3c8 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java
@@ -15,6 +15,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.NamingCase;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -135,6 +137,7 @@ public class CodeGeneratorService {
      * 生成代码文件压缩包
      */
     @SneakyThrows
+    @DS("#codeGenParam.getDataSourceCode()")
     public ResponseEntity<byte[]> genCodeZip(CodeGenParam codeGenParam) {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
index 55bbdb72..f4a4793a 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
@@ -9,6 +9,7 @@ import cn.bootx.platform.starter.code.gen.entity.DatabaseColumn;
 import cn.bootx.platform.starter.code.gen.entity.DatabaseTable;
 import cn.bootx.platform.starter.code.gen.util.CodeGenUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -46,6 +47,7 @@ public class DatabaseTableService {
      * 分页
      * TODO:根据数据源编码,切换数据源进行列表查询.
      */
+    @DS("#dataSourceName")
     public Page<DatabaseTable> page(PageParam pageParam, DatabaseTable param,String dataSourceName) {
         val mpPage = MpUtil.getMpPage(pageParam, DatabaseTable.class);
         QueryWrapper<DatabaseTable> wrapper = new QueryWrapper<>();
@@ -54,10 +56,7 @@ public class DatabaseTableService {
             .like(StrUtil.isNotBlank(param.getTableComment()), DatabaseTable.Fields.tableComment,
                     param.getTableComment())
             .orderByDesc(DatabaseTable.Fields.createTime, DatabaseTable.Fields.tableName);
-
-        DynamicDataSourceContextHolder.push(dataSourceName);
         Page<DatabaseTable> result = databaseTableMapper.page(mpPage, wrapper);
-        DynamicDataSourceContextHolder.poll();
         return result;
     }
 
@@ -78,11 +77,10 @@ public class DatabaseTableService {
     /**
      * 获取表相关的代码生成参数信息
      */
-    public TableGenParamDto getTableGenParam(String dataBaseName, String tableName) {
-        DynamicDataSourceContextHolder.push(dataBaseName);
+    @DS("#dataSourceCode")
+    public TableGenParamDto getTableGenParam(String dataSourceCode, String tableName) {
         DatabaseTable databaseTable = this.findByTableName(tableName);
         String entityName = CodeGenUtil.tableToJava(databaseTable.getTableName());
-        DynamicDataSourceContextHolder.poll();
         return new TableGenParamDto().setEntityName(entityName).setModule(entityName.toLowerCase());
     }
 
-- 
Gitee


From 53916c4661c8b8b724c1c9728a0b6549fc0c39b2 Mon Sep 17 00:00:00 2001
From: Fnckerpoi <382716335@qq.com>
Date: Mon, 15 May 2023 14:41:14 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/gen/controller/DatabaseTableController.java      | 7 ++++---
 .../starter/code/gen/service/DatabaseTableService.java    | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
index 01fb17b8..6efe27c9 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
@@ -1,5 +1,6 @@
 package cn.bootx.platform.starter.code.gen.controller;
 
+import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
@@ -38,9 +39,9 @@ public class DatabaseTableController {
 
     @Operation(summary = "表列表分页")
     @GetMapping("/page")
-    public ResResult<Page<DatabaseTable>> page(@ParameterObject PageParam pageParam,
-            @ParameterObject DatabaseTable param,
-            @ParameterObject String dataSourceCode)
+    public ResResult<PageResult<DatabaseTable>> page(@ParameterObject PageParam pageParam,
+                                                     @ParameterObject DatabaseTable param,
+                                                     @ParameterObject String dataSourceCode)
     {
         return Res.ok(databaseTableService.page(pageParam, param,dataSourceCode));
     }
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
index f4a4793a..562ae2b1 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
@@ -1,6 +1,7 @@
 package cn.bootx.platform.starter.code.gen.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
+import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.starter.code.gen.dao.DatabaseTableMapper;
@@ -45,10 +46,9 @@ public class DatabaseTableService {
 
     /**
      * 分页
-     * TODO:根据数据源编码,切换数据源进行列表查询.
      */
     @DS("#dataSourceName")
-    public Page<DatabaseTable> page(PageParam pageParam, DatabaseTable param,String dataSourceName) {
+    public PageResult<DatabaseTable> page(PageParam pageParam, DatabaseTable param, String dataSourceName) {
         val mpPage = MpUtil.getMpPage(pageParam, DatabaseTable.class);
         QueryWrapper<DatabaseTable> wrapper = new QueryWrapper<>();
 
@@ -56,8 +56,8 @@ public class DatabaseTableService {
             .like(StrUtil.isNotBlank(param.getTableComment()), DatabaseTable.Fields.tableComment,
                     param.getTableComment())
             .orderByDesc(DatabaseTable.Fields.createTime, DatabaseTable.Fields.tableName);
-        Page<DatabaseTable> result = databaseTableMapper.page(mpPage, wrapper);
-        return result;
+
+        return MpUtil.convert2PageResult(databaseTableMapper.page(mpPage, wrapper)) ;
     }
 
     /**
-- 
Gitee


From 857b123c0323c1ea5f0fcdb1c9ef1d9cb705ccb1 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Wed, 17 May 2023 15:13:02 +0800
Subject: [PATCH 06/18] =?UTF-8?q?feat=20=E5=8A=A8=E6=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=A2=9E=E5=8A=A0=E5=90=AF=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD,=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CodeGeneratorController.java   |  3 ---
 .../codegen/template/java/dto.java.vm         |  4 +++
 .../codegen/template/java/entity.java.vm      |  9 ++++++-
 .../codegen/template/vue3/list.vue.vm         |  3 ++-
 .../dao/DynamicDataSourceManager.java         |  8 ++++++
 .../entity/DynamicDataSource.java             |  3 +++
 .../service/DynamicDataSourceService.java     | 23 +++++++++-------
 .../DynamicDataSourceLoadHandler.java         | 26 +++++++++++++++++++
 8 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java
index 5128e98b..007db3f7 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java
@@ -1,6 +1,5 @@
 package cn.bootx.platform.starter.code.gen.controller;
 
-import cn.bootx.platform.common.core.function.SystemKeyValueService;
 import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.starter.code.gen.dto.CodeGenPreview;
@@ -31,8 +30,6 @@ public class CodeGeneratorController {
 
     private final CodeGeneratorService generatorService;
 
-    private final SystemKeyValueService systemKeyValueService;
-
     @Operation(summary = "预览生成代码")
     @PostMapping("/codeGenPreview")
     public ResResult<List<CodeGenPreview>> codeGenPreview(@RequestBody CodeGenParam param) {
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm
index 6440e3bc..95c4a8f5 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm
@@ -1,5 +1,9 @@
 package ${dtoPack};
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
 import cn.bootx.platform.common.core.rest.dto.BaseDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm
index d05ef1ff..dccc5fb7 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm
@@ -1,6 +1,13 @@
 package ${corePack}.entity;
 
-    ${baseClass};
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+import cn.bootx.platform.common.core.function.EntityBaseFunction;
+import cn.bootx.platform.common.mybatisplus.base.${baseClass};
+
 import com.baomidou.mybatisplus.annotation.TableName;
 import ${dtoPack}.${entityUpName}Dto;
 import ${paramPack}.${entityUpName}Param;
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm
index adfcfdb9..a715c769 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm
@@ -4,7 +4,7 @@
       <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
     </div>
     <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ query: queryPage }">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
         <template #buttons>
           <a-space>
             <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
@@ -91,6 +91,7 @@
     }).then(({ data }) => {
       pageQueryResHandel(data)
     })
+    return Promise.resolve()
   }
   // 新增
   function add() {
diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java
index b56ae56f..841a9249 100644
--- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java
+++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -50,4 +51,11 @@ public class DynamicDataSourceManager extends BaseManager<DynamicDataSourceMappe
             .page(mpPage);
     }
 
+    /**
+     * 查询开启自动加载的数据源
+     */
+    public List<DynamicDataSource>findAllByAutoLoad(){
+        return this.findAllByField(DynamicDataSource::isAutoLoad,true);
+    }
+
 }
diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java
index 2e5bcb81..e610a98c 100644
--- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java
+++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java
@@ -32,6 +32,9 @@ public class DynamicDataSource extends MpBaseEntity implements EntityBaseFunctio
     /** 数据库类型 */
     private String databaseType;
 
+    /** 是否启动自动加载 */
+    private boolean autoLoad;
+
     /** 驱动类 */
     private String dbDriver;
 
diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java
index 47fdf770..0862e520 100644
--- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java
+++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java
@@ -176,15 +176,6 @@ public class DynamicDataSourceService {
         this.addDynamicDataSource(dataSource);
     }
 
-    /**
-     * 根据编码进行添加
-     */
-    public void addDynamicDataSourceByCode(String code) {
-        DynamicDataSource dataSource = dynamicDataSourceManager.findByCode(code)
-            .orElseThrow(DataNotExistException::new);
-        this.addDynamicDataSource(dataSource);
-    }
-
     /**
      * 查询当前数据源列表
      */
@@ -211,4 +202,18 @@ public class DynamicDataSourceService {
         dynamicRoutingDataSource.removeDataSource(key);
     }
 
+    /**
+     * 启动时初始化加载
+     */
+    public void initLoad(){
+        for (DynamicDataSource dynamicDataSource : dynamicDataSourceManager.findAllByAutoLoad()) {
+            try {
+                addDynamicDataSource(dynamicDataSource);
+            } catch (Exception e){
+                String errorMsg = dynamicDataSource.getName()+"数据源加载失败";
+                log.error(errorMsg,e);
+            }
+        }
+    }
+
 }
diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java
new file mode 100644
index 00000000..6d9cf7f5
--- /dev/null
+++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java
@@ -0,0 +1,26 @@
+package cn.bootx.platform.baseapi.handler.dynamicsource;
+
+import cn.bootx.platform.baseapi.core.dynamicsource.service.DynamicDataSourceService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * 初始化数据源函数
+ * @author xxm
+ * @date 2023/5/17
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class DynamicDataSourceLoadHandler {
+    private final DynamicDataSourceService dynamicDataSourceService;
+
+    @PostConstruct
+    public void initLoad(){
+        dynamicDataSourceService.initLoad();
+    }
+
+}
-- 
Gitee


From 7ec41e138f830c62880c8e8c0d9b208129f70d87 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 21 May 2023 15:34:59 +0800
Subject: [PATCH 07/18] =?UTF-8?q?fix=20=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=A0=91=E6=97=B6=E5=AD=90=E5=AD=99=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E6=8E=92=E5=BA=8F=E6=9C=AA=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/bootx/platform/common/core/util/TreeBuildUtil.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java
index 3f85cd3b..d93c06a8 100644
--- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java
+++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java
@@ -48,7 +48,7 @@ public class TreeBuildUtil {
             return null;
         }
         for (T region : children) {
-            List<T> childrenList = build(list, getId.apply(region), getId, getPid, setChildren);
+            List<T> childrenList = build(list, getId.apply(region), getId, getPid, setChildren,comparator);
             setChildren.accept(region, childrenList);
         }
         // 排序
-- 
Gitee


From d65cc3c8c6b3574870d7797dc2c15e4d43cf126a Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 21 May 2023 20:52:14 +0800
Subject: [PATCH 08/18] =?UTF-8?q?style=20=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=89=88=E6=9C=AC=E8=AE=B0=E5=BD=95=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5SQL=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataChangeRecorderInnerInterceptor.java   | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java
index 5e678139..00b75369 100644
--- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java
+++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.JdbcParameter;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
@@ -85,7 +86,13 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
             long startTs = System.currentTimeMillis();
             DataVersionLog dataVersion;
             try {
-                Statement statement = CCJSqlParserUtil.parse(mpBs.sql());
+                Statement statement = null;
+                try {
+                    statement = CCJSqlParserUtil.parse(mpBs.sql());
+                } catch (JSQLParserException e) {
+                    log.warn("sql无法解析,可能是DDL相关语句, SQL语句:{}", mpBs.sql());
+                    return;
+                }
                 // 判断是否需要进行处理
                 dataVersion = this.getDataVersionAnno(statement);
                 if (Objects.isNull(dataVersion)) {
@@ -161,7 +168,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
     }
 
     public OperationResult processUpdate(Update updateStmt, MappedStatement mappedStatement, BoundSql boundSql,
-            Connection connection) {
+                                         Connection connection) {
         Expression where = updateStmt.getWhere();
         Select selectStmt = new Select();
         PlainSelect selectBody = new PlainSelect();
@@ -214,7 +221,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
      * @return
      */
     private List<ParameterMapping> prepareParameterMapping4Select(List<ParameterMapping> originalMappingList,
-            Update updateStmt) {
+                                                                  Update updateStmt) {
         List<Expression> updateValueExpressions = new ArrayList<>();
         for (UpdateSet updateSet : updateStmt.getUpdateSets()) {
             updateValueExpressions.addAll(updateSet.getExpressions());
@@ -234,7 +241,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
      * @return
      */
     private List<DataChangedRecord> compareAndGetUpdatedColumnDatas(String tableName, BoundSql updateSql,
-            Statement statement, OriginalDataObj originalDataObj) {
+                                                                    Statement statement, OriginalDataObj originalDataObj) {
         Map<String, Object> columnNameValMap = new HashMap<>(updateSql.getParameterMappings().size());
         List<Column> selectItemsFromUpdateSql = new ArrayList<>();
         if (statement instanceof Update) {
@@ -301,7 +308,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
     }
 
     private String buildOriginalData(Select selectStmt, MappedStatement mappedStatement, BoundSql boundSql,
-            Connection connection) {
+                                     Connection connection) {
         try (PreparedStatement statement = connection.prepareStatement(selectStmt.toString())) {
             DefaultParameterHandler parameterHandler = new DefaultParameterHandler(mappedStatement,
                     boundSql.getParameterObject(), boundSql);
@@ -339,7 +346,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
      * 构建原始对象数据
      */
     private OriginalDataObj buildOriginalObjectData(Select selectStmt, Column pk, MappedStatement mappedStatement,
-            BoundSql boundSql, Connection connection) {
+                                                    BoundSql boundSql, Connection connection) {
         try (PreparedStatement statement = connection.prepareStatement(selectStmt.toString())) {
 
             DefaultParameterHandler parameterHandler = new DefaultParameterHandler(mappedStatement,
@@ -414,7 +421,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
     }
 
     public OperationResult processDelete(Delete deleteStmt, MappedStatement mappedStatement, BoundSql boundSql,
-            Connection connection) {
+                                         Connection connection) {
         Table table = deleteStmt.getTable();
         Expression where = deleteStmt.getWhere();
         Select selectStmt = new Select();
@@ -617,15 +624,15 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
         public String generateDataStr() {
             StringBuilder sb = new StringBuilder();
             sb.append("\"")
-                .append(columnName)
-                .append("\"")
-                .append(":")
-                .append("\"")
-                .append(convertDoubleQuotes(originalValue))
-                .append("->")
-                .append(convertDoubleQuotes(updateValue))
-                .append("\"")
-                .append(",");
+                    .append(columnName)
+                    .append("\"")
+                    .append(":")
+                    .append("\"")
+                    .append(convertDoubleQuotes(originalValue))
+                    .append("->")
+                    .append(convertDoubleQuotes(updateValue))
+                    .append("\"")
+                    .append(",");
             return sb.toString();
         }
 
@@ -660,7 +667,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
         private List<DataColumnChangeResult> updatedColumns;
 
         public boolean hasUpdate(Map<String, Object> columnNameValMap, Set<String> ignoredColumns,
-                Set<String> ignoreAllColumns) {
+                                 Set<String> ignoreAllColumns) {
             if (originalColumns == null) {
                 return true;
             }
@@ -687,13 +694,13 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
             sb.append("{");
             if (pkColumnName != null) {
                 sb.append("\"")
-                    .append(pkColumnName)
-                    .append("\"")
-                    .append(":")
-                    .append("\"")
-                    .append(convertDoubleQuotes(pkColumnVal))
-                    .append("\"")
-                    .append(",");
+                        .append(pkColumnName)
+                        .append("\"")
+                        .append(":")
+                        .append("\"")
+                        .append(convertDoubleQuotes(pkColumnVal))
+                        .append("\"")
+                        .append(",");
             }
             for (DataColumnChangeResult update : updatedColumns) {
                 sb.append(update.generateDataStr());
-- 
Gitee


From 132ca706c0f4b09d9fab4450690e01646df20fdf Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 22 May 2023 22:25:51 +0800
Subject: [PATCH 09/18] =?UTF-8?q?fix=20=E8=B6=85=E7=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/codegen/template/java/manager.java.vm    | 10 +++++-----
 .../main/resources/codegen/template/java/param.java.vm |  2 +-
 .../bootx/platform/common/mybatisplus/util/MpUtil.java |  1 +
 .../query/generator/AnnotationQueryGenerator.java      |  5 ++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
index 59bb001d..05b24471 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
@@ -1,8 +1,8 @@
 package ${corePack}.dao;
 
-import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import ${paramPack}.${entityUpName}Param;
 import ${corePack}.entity.${entityUpName};
+import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
@@ -25,9 +25,9 @@ public class ${entityUpName}Manager extends BaseManager<${entityUpName}Mapper, $
     */
     public Page<${entityUpName}> page(PageParam pageParam, ${entityUpName}Param param) {
         Page<${entityUpName}> mpPage = MpUtil.getMpPage(pageParam, ${entityUpName}.class);
-        return this.lambdaQuery()
-                .select(this.getEntityClass(),MpUtil::excludeBigField)
-                .orderByDesc(MpIdEntity::getId)
-                .page(mpPage);
+        QueryWrapper<${entityUpName}> wrapper = QueryGenerator.generator(param, this.getEntityClass());
+        wrapper.select(this.getEntityClass(),MpUtil::excludeBigField)
+                .orderByDesc(MpUtil.getColumnName(${entityUpName}::getId));
+        return this.page(mpPage,wrapper);
     }
 }
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm
index 37055641..3317c54a 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm
@@ -26,4 +26,4 @@ public class ${entityUpName}Param {
     private $column.javaType $column.name;
 #end
 
-}
\ No newline at end of file
+}
diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java
index 81631810..d7b4811a 100644
--- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java
+++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java
@@ -97,6 +97,7 @@ public class MpUtil {
      * @param clazz 实体类类型. 辅助进行判断, 传多个只有第一个生效，可以为空, 为空时使用读取方法对应的Class类，
      * @return 字段名
      */
+    @SafeVarargs
     public static <T> String getColumnName(Method readMethod, Class<T>... clazz) {
         Class<?> beanClass;
         if (ArrayUtil.isNotEmpty(clazz)) {
diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java
index 6a640d89..bfebee8e 100644
--- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java
+++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java
@@ -198,7 +198,10 @@ public class AnnotationQueryGenerator {
         // 读取注解， 判断有没有自定义字段名, 有自定义字段名直接返回
         val queryParam = getQueryParamAnnotation(paramDescriptor, paramClass, entityDescriptor, entityClass);
         if (queryParam.map(QueryParam::fieldName).isPresent()) {
-            return queryParam.map(QueryParam::fieldName).get();
+            String fieldName = queryParam.map(QueryParam::fieldName).get();
+            if (StrUtil.isNotBlank(fieldName)){
+                return fieldName;
+            }
         }
         switch (namingCase) {
             case LAMBDA: {
-- 
Gitee


From f39180cf8732c36570002d99ab0c039535caf6a6 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 23 May 2023 08:46:04 +0800
Subject: [PATCH 10/18] =?UTF-8?q?fix=20maven-javadoc-plugin=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=88=B03.5.0=E7=89=88=E6=9C=AC,=20=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?macos=E4=B8=8B=E5=87=BA=E7=8E=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 295ba505..26a7071a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -443,17 +443,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.5.0</version>
                 <configuration>
-                    <!-- 忽略生成文档中的错误 -->
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                    <aggregate>true</aggregate>
-                    <!-- utf-8读取文件 -->
-                    <charset>UTF-8</charset>
-                    <!-- utf-8进行编码代码 -->
-                    <encoding>UTF-8</encoding>
-                    <!-- utf-8进行编码文档 -->
-                    <docencoding>UTF-8</docencoding>
+                    <failOnError>false</failOnError>
+                    <doclint>none</doclint>
                 </configuration>
                 <executions>
                     <execution>
@@ -461,6 +454,7 @@
                         <goals>
                             <goal>jar</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
-- 
Gitee


From 408a809394019db52a196e3cd7a392d3f0a8881e Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 23 May 2023 17:05:45 +0800
Subject: [PATCH 11/18] =?UTF-8?q?perf=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BC=A0=E9=80=92=E4=BE=9D=E8=B5=96,=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/template/java/manager.java.vm     |  1 +
 .../codegen/template/vue3/edit.vue.vm         | 19 ++++++++---
 .../codegen/template/vue3/list.vue.vm         | 33 +++++++++++++++----
 .../common-starter-monitor/pom.xml            |  1 +
 .../controller/SystemMonitorController.java   | 10 ------
 .../monitor/service/MongoMonitorService.java  | 30 -----------------
 .../range/mongo/MongoRangeHandler.java        |  2 ++
 bootx-demo/pom.xml                            |  4 +++
 bootx-services/pom.xml                        |  1 +
 9 files changed, 50 insertions(+), 51 deletions(-)
 delete mode 100644 bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/MongoMonitorService.java

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
index 05b24471..fdf34745 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
@@ -6,6 +6,7 @@ import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import lombok.RequiredArgsConstructor;
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm
index 833f003a..eab3f6b5 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm
@@ -98,13 +98,19 @@
   const rules = reactive({} as Record<string, Rule[]>)
   // 事件
   const emits = defineEmits(['ok'])
-  // 入口
+
+  /**
+   * 入口
+   */
   function init(id, editType: FormEditType) {
     initFormEditType(editType)
     resetForm()
     getInfo(id, editType)
   }
-  // 获取信息
+
+  /**
+   * 获取信息
+   */
   function getInfo(id, editType: FormEditType) {
     if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
       confirmLoading.value = true
@@ -116,7 +122,10 @@
       confirmLoading.value = false
     }
   }
-  // 保存
+
+  /**
+   * 保存
+   */
   function handleOk() {
     formRef?.validate().then(async () => {
       confirmLoading.value = true
@@ -131,7 +140,9 @@
     })
   }
 
-  // 重置表单
+  /**
+   * 重置表单
+   */
   function resetForm() {
     nextTick(() => {
       formRef?.resetFields()
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm
index a715c769..9edcc2a4 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm
@@ -28,7 +28,9 @@
             </span>
             <a-divider type="vertical" />
 #if($deleteType == "confirm")
-            <a-link danger @click="remove(row)" >删除</a-link>
+            <span>
+              <a-link danger @click="remove(row)" >删除</a-link>
+            </span>
 #end
 #if($deleteType == "popconfirm")
             <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
@@ -57,7 +59,7 @@
   import { del, page } from './${entityUpName}.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import ${entityUpName}Edit from './${entityUpName}Edit.vue'
-  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import { VxeTableInstance, VxeToolbarInstance, VxeTable, VxeColumn, VxePager, VxeToolbar } from 'vxe-table'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -78,11 +80,17 @@
     vxeBind()
     queryPage()
   })
+
+  /**
+   * 初始化绑定
+   */
   function vxeBind() {
     xTable?.connect(xToolbar as VxeToolbarInstance)
   }
 
-  // 分页查询
+  /**
+   * 分页查询
+   */
   function queryPage() {
     loading.value = true
     page({
@@ -93,20 +101,31 @@
     })
     return Promise.resolve()
   }
-  // 新增
+
+  /**
+   * 新增
+   */
   function add() {
     ${entityLowName}Edit.init(null, FormEditType.Add)
   }
-  // 编辑
+
+  /**
+   * 编辑
+   */
   function edit(record) {
     ${entityLowName}Edit.init(record.id, FormEditType.Edit)
   }
-  // 查看
+
+  /**
+   * 查看
+   */
   function show(record) {
     ${entityLowName}Edit.init(record.id, FormEditType.Show)
   }
 
-  // 删除
+  /**
+   * 删除
+   */
   function remove(record) {
     #if($deleteType == "confirm")
     createConfirm({
diff --git a/bootx-common-starters/common-starter-monitor/pom.xml b/bootx-common-starters/common-starter-monitor/pom.xml
index 431dbeb6..e66a7ef4 100644
--- a/bootx-common-starters/common-starter-monitor/pom.xml
+++ b/bootx-common-starters/common-starter-monitor/pom.xml
@@ -21,6 +21,7 @@
         <dependency>
             <groupId>cn.bootx.platform</groupId>
             <artifactId>common-mongo</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>
diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java
index 094b5bdf..3af32b7c 100644
--- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java
+++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java
@@ -2,10 +2,8 @@ package cn.bootx.platform.starter.monitor.controller;
 
 import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
-import cn.bootx.platform.starter.monitor.entity.MongoMonitorResult;
 import cn.bootx.platform.starter.monitor.entity.RedisMonitorResult;
 import cn.bootx.platform.starter.monitor.entity.SystemMonitorResult;
-import cn.bootx.platform.starter.monitor.service.MongoMonitorService;
 import cn.bootx.platform.starter.monitor.service.RedisMonitorService;
 import cn.bootx.platform.starter.monitor.service.SystemMonitorService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,8 +27,6 @@ public class SystemMonitorController {
 
     private final RedisMonitorService redisMonitorService;
 
-    private final MongoMonitorService mongoMonitorService;
-
     @Operation(summary = "获取系统消息")
     @GetMapping("/getSystemInfo")
     public ResResult<SystemMonitorResult> getSystemInfo() {
@@ -43,10 +39,4 @@ public class SystemMonitorController {
         return Res.ok(redisMonitorService.getRedisInfo());
     }
 
-    @Operation(summary = "获取MongoDB信息")
-    @GetMapping("/getMongoInfo")
-    public ResResult<MongoMonitorResult> getMongoInfo() {
-        return Res.ok(mongoMonitorService.getMongoInfo());
-    }
-
 }
diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/MongoMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/MongoMonitorService.java
deleted file mode 100644
index f8678aa5..00000000
--- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/MongoMonitorService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.bootx.platform.starter.monitor.service;
-
-import cn.bootx.platform.starter.monitor.entity.MongoMonitorResult;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.stereotype.Service;
-
-/**
- * MongoDb信息监控
- *
- * @author xxm
- * @date 2022/6/12
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class MongoMonitorService {
-
-    private final MongoTemplate mongoTemplate;
-
-    /**
-     * MongoDB信息监控
-     */
-    public MongoMonitorResult getMongoInfo() {
-        MongoMonitorResult result = new MongoMonitorResult();
-        return result;
-    }
-
-}
diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java
index 2820262f..7bb50705 100644
--- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java
+++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java
@@ -3,6 +3,7 @@ package cn.bootx.platform.common.sequence.range.mongo;
 import cn.bootx.platform.common.sequence.exception.SeqException;
 import cn.hutool.core.util.IdUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -16,6 +17,7 @@ import java.util.Optional;
  * @author xxm
  * @date 2022/1/21
  */
+@ConditionalOnClass(name="org.springframework.data.mongodb.core.MongoTemplate")
 @Repository
 @RequiredArgsConstructor
 public class MongoRangeHandler {
diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml
index 53ae7b75..45f42341 100644
--- a/bootx-demo/pom.xml
+++ b/bootx-demo/pom.xml
@@ -22,6 +22,10 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.bootx.platform</groupId>
             <artifactId>service-baseapi</artifactId>
diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml
index 635f03ab..0821a5ef 100644
--- a/bootx-services/pom.xml
+++ b/bootx-services/pom.xml
@@ -197,6 +197,7 @@
         <dependency>
             <groupId>cn.bootx.platform</groupId>
             <artifactId>common-mongo</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- 发号器 -->
-- 
Gitee


From f68acd3f4d1e2f76dfc83ad33b87c53fb2e7d661 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Wed, 24 May 2023 17:29:39 +0800
Subject: [PATCH 12/18] =?UTF-8?q?perf=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/codegen/template/java/manager.java.vm    | 1 +
 .../src/main/resources/codegen/template/java/service.java.vm    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
index fdf34745..bc113790 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm
@@ -6,6 +6,7 @@ import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
+import cn.bootx.platform.common.query.generator.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm
index 2788ee08..dca78757 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm
@@ -12,6 +12,8 @@ import ${corePack}.entity.${entityUpName};
 import ${corePack}.dao.${entityUpName}Manager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 
 import java.util.List;
 
-- 
Gitee


From 505ff0f36e752a8fe4261f8181ca5b7b0ddee036 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Thu, 25 May 2023 20:03:55 +0800
Subject: [PATCH 13/18] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BFid=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/codegen/template/vue3/edit.vue.vm        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm
index eab3f6b5..a97b146b 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/edit.vue.vm
@@ -33,7 +33,7 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-form-item label="主键" :hidden="true">
+        <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
       #foreach ($column in $columns)
-- 
Gitee


From 46c8c7163d5505a1e23b78bafca3cc18d96dce3d Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Wed, 31 May 2023 08:16:37 +0800
Subject: [PATCH 14/18] =?UTF-8?q?fix=20mongo=E7=9B=B8=E5=85=B3service?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=B3=A8=E5=85=A5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starter/file/configuration/FileUploadConfiguration.java     | 2 ++
 .../platform/starter/file/service/impl/MongoUploadService.java  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java
index af4b07fa..198f98c6 100644
--- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java
+++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java
@@ -1,6 +1,7 @@
 package cn.bootx.platform.starter.file.configuration;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.MongoDatabaseFactory;
@@ -14,6 +15,7 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate;
  * @date 2022/2/15
  */
 @Configuration
+@ConditionalOnClass(name="org.springframework.data.mongodb.gridfs.GridFsTemplate")
 @RequiredArgsConstructor
 public class FileUploadConfiguration {
 
diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java
index 974b0036..748a31ab 100644
--- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java
+++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java
@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.types.ObjectId;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.gridfs.GridFsResource;
@@ -32,6 +33,7 @@ import java.util.Optional;
  */
 @Slf4j
 @Service
+@ConditionalOnClass(name="org.springframework.data.mongodb.gridfs.GridFsTemplate")
 @RequiredArgsConstructor
 public class MongoUploadService implements UploadService {
 
-- 
Gitee


From c5868ec12926c95aa237c8b4c00eab68d515046b Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Wed, 7 Jun 2023 15:36:25 +0800
Subject: [PATCH 15/18] =?UTF-8?q?feat=20=E8=AE=B0=E5=BD=95ip=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=9C=B0=E5=9D=80=E6=97=B6=E5=81=B6=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86,=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  12 +-
 _config/sql/bootx-platform.sql                | 611 +----------------
 _doc/ChangeLog.md                             |  15 +-
 _doc/Task.md                                  |   1 -
 bootx-common-core/pom.xml                     |   2 +-
 .../common-starter-audit-log/pom.xml          |   2 +-
 .../log/ip2region/IpToRegionService.java      |   6 +-
 .../common-starter-auth/pom.xml               |   2 +-
 .../common-starter-code-gen/pom.xml           |   2 +-
 .../common-starter-data-perm/pom.xml          |   2 +-
 .../common-starter-dingtalk/pom.xml           |   2 +-
 .../common-starter-file/pom.xml               |   2 +-
 .../common-starter-monitor/pom.xml            |   2 +-
 .../common-starter-quartz/pom.xml             |   2 +-
 .../common-starter-wechat/pom.xml             |   2 +-
 .../common-starter-wecom/pom.xml              |   2 +-
 bootx-common-starters/pom.xml                 |   2 +-
 bootx-commons/common-cache/pom.xml            |   2 +-
 bootx-commons/common-data-translate/pom.xml   |   2 +-
 .../common-exception-handler/pom.xml          |   2 +-
 bootx-commons/common-header-holder/pom.xml    |   2 +-
 bootx-commons/common-idempotency/pom.xml      |   2 +-
 bootx-commons/common-jackson/pom.xml          |   2 +-
 bootx-commons/common-log/pom.xml              |   2 +-
 bootx-commons/common-mongo/pom.xml            |   2 +-
 bootx-commons/common-mybatis-plus/pom.xml     |   4 +-
 bootx-commons/common-rabbitmq/pom.xml         |   2 +-
 bootx-commons/common-redis-client/pom.xml     |   2 +-
 .../redisson/RedissonClientTemporary.java     |  17 +
 bootx-commons/common-sequence/pom.xml         |   2 +-
 bootx-commons/common-spring/pom.xml           |   2 +-
 bootx-commons/common-super-query/pom.xml      |   2 +-
 bootx-commons/common-swagger/pom.xml          |   2 +-
 bootx-commons/common-websocket/pom.xml        |   2 +-
 bootx-commons/common-xxl-job/pom.xml          |   2 +-
 bootx-commons/pom.xml                         |   2 +-
 bootx-demo/pom.xml                            |   4 +-
 bootx-services/pom.xml                        |   4 +-
 bootx-services/service-baseapi/pom.xml        |   2 +-
 bootx-services/service-iam/pom.xml            |   2 +-
 bootx-services/service-notice/pom.xml         |   2 +-
 bootx-services/service-visualization/pom.xml  |   2 +-
 bootx-start/pom.xml                           |   2 +-
 .../src/main/resources/application-dev.yml    |   2 +-
 ...release.sql => V1.3.1_230607__release.sql} | 612 +-----------------
 pom.xml                                       |  10 +-
 46 files changed, 150 insertions(+), 1216 deletions(-)
 delete mode 100644 _doc/Task.md
 rename bootx-start/src/main/resources/db/migration/{V1.3.0_230510__release.sql => V1.3.1_230607__release.sql} (91%)

diff --git a/README.md b/README.md
index 73b9dad4..a2ef91a3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Bootx-Platform (v1.3.0-园博园)
+# Bootx-Platform (v1.3.1-园博园)
 
 <p>
  <img src='https://gitee.com/bootx/bootx-platform/badge/star.svg?theme=dark' alt='star'/>
- <img src="https://img.shields.io/badge/Boot%20Platform-1.3.0-success.svg" alt="Build Status"/>
+ <img src="https://img.shields.io/badge/Boot%20Platform-1.3.1-success.svg" alt="Build Status"/>
  <img src="https://img.shields.io/badge/Author-Bootx-orange.svg" alt="Build Status"/>
  <img src="https://img.shields.io/badge/Spring%20Boot-2.7.11-blue.svg" alt="Downloads"/>
  <img src="https://img.shields.io/badge/license-Apache%20License%202.0-green.svg"/>
@@ -43,10 +43,10 @@
 
 ## 📚文档
 
-- 系统演示地址：[管理平台(vue2)](http://web.platform.bootx.cn/)、[管理平台(vue3)](http://v3.platform.bootx.cn/)、[可视化大屏](http://visualization.platform.bootx.cn/)
-- 前端项目地址：[前端项目(vue2)](https://gitee.com/bootx/bootx-platform-ui)、[前端项目(vue3)](https://gitee.com/bootx/bootx-platform-vue3)、[可视化大屏](https://gitee.com/bootx/bootx-platform-visualization)
+- 系统演示地址：[管理平台(vue3)](http://v3.platform.bootx.cn/)、[可视化大屏](http://visualization.platform.bootx.cn/)
+- 前端项目地址：[前端项目(vue3)](https://gitee.com/bootx/bootx-platform-vue3)、[可视化大屏](https://gitee.com/bootx/bootx-platform-visualization)、[前端项目(vue2只维护不再更新)](https://gitee.com/bootx/bootx-platform-ui)
 - 移动端项目地址：[移动端项目(taro+vue3+ts)](https://gitee.com/xucun/bootx-platform-mobile)
-- 日志收集：[ELK](http://elk.dev.bootx.cn:5601/app/discove)、[PlumeLog](http://platform.dev.bootx.cn:8080/plumelog/#/)
+- 日志收集：[[PlumeLog](http://platform.dev.bootx.cn:8080/plumelog/#/)
 - 项目文档：[项目文档(GITEE)](https://bootx.gitee.io/)、[项目文档(备用)](https://doc.bootx.cn/)
 - 更新日志：[更新日志](./_doc/ChangeLog.md)
 
@@ -60,8 +60,6 @@
 
 支持支付宝、微信、聚合支付、现金支付、储值卡支付、钱包，对各种支付方式抽象成策略类，通过模板模式进行串通，方便扩展新的支付方式或业务
 
-结算台演示地址：[http://web.platform.bootx.cn/cashier](http://web.platform.bootx.cn/cashier)
-
 ![](https://oscimg.oschina.net/oscnet/up-9f0044b76071d5a7f598ceab591c5fedb02.png)
 
 ## 🍎特色功能
diff --git a/_config/sql/bootx-platform.sql b/_config/sql/bootx-platform.sql
index c126cf17..0fb97592 100644
--- a/_config/sql/bootx-platform.sql
+++ b/_config/sql/bootx-platform.sql
@@ -1,7 +1,6 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : bootx
  Source Server Type    : MySQL
  Source Server Version : 50735
 
@@ -9,7 +8,7 @@
  Target Server Version : 50735
  File Encoding         : 65001
 
- Date: 10/05/2023 09:31:59
+ Date: 07/06/2023 15:15:39
 */
 
 SET NAMES utf8mb4;
@@ -3598,6 +3597,7 @@ CREATE TABLE `base_dynamic_data_source`  (
   `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据源编码',
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据源名称',
   `database_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库类型',
+  `auto_load` bit(1) NULL DEFAULT NULL COMMENT '是否启动自动加载',
   `db_driver` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '驱动类',
   `db_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库地址',
   `db_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库名称',
@@ -3740,6 +3740,31 @@ INSERT INTO `base_province` VALUES ('63', '青海省');
 INSERT INTO `base_province` VALUES ('64', '宁夏回族自治区');
 INSERT INTO `base_province` VALUES ('65', '新疆维吾尔自治区');
 
+-- ----------------------------
+-- Table structure for base_query_sql
+-- ----------------------------
+DROP TABLE IF EXISTS `base_query_sql`;
+CREATE TABLE `base_query_sql`  (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `database_id` bigint(20) NULL DEFAULT NULL COMMENT '数据源ID',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '名称',
+  `is_list` bit(1) NULL DEFAULT NULL COMMENT '是否集合',
+  `sql` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'sql语句',
+  `params` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询参数',
+  `fields` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询结果字段',
+  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID',
+  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
+  `version` int(11) NOT NULL COMMENT '乐观锁',
+  `deleted` bit(1) NOT NULL COMMENT '删除标志',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'SQL查询语句' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of base_query_sql
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for base_street
 -- ----------------------------
@@ -3772,141 +3797,6 @@ CREATE TABLE `base_village`  (
 -- Records of base_village
 -- ----------------------------
 
--- ----------------------------
--- Table structure for bpm_instance
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_instance`;
-CREATE TABLE `bpm_instance`  (
-  `id` bigint(20) NOT NULL,
-  `instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程实例的id',
-  `instance_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程标题',
-  `model_id` bigint(20) NULL DEFAULT NULL COMMENT '模型id',
-  `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义ID',
-  `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义名称',
-  `start_user_id` bigint(20) NULL DEFAULT NULL COMMENT '发起人',
-  `start_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发起人名称',
-  `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程实例的状态',
-  `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
-  `form_variables` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '提交的表单值',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  `version` int(8) NULL DEFAULT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程实例扩展' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_instance
--- ----------------------------
-
--- ----------------------------
--- Table structure for bpm_model
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_model`;
-CREATE TABLE `bpm_model`  (
-  `id` bigint(20) NOT NULL,
-  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '名称',
-  `model_type` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程类型',
-  `form_id` bigint(20) NULL DEFAULT NULL COMMENT '关联表单',
-  `publish` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发布状态',
-  `enable` bit(1) NULL DEFAULT NULL COMMENT '启用状态',
-  `deploy_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '部署id',
-  `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义id',
-  `def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程key',
-  `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称',
-  `def_remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程备注',
-  `main_process` bit(1) NULL DEFAULT NULL COMMENT '是否主流程',
-  `process_version` int(8) NULL DEFAULT NULL COMMENT '流程版本号',
-  `model_editor_xml` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '流程xml',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  `version` int(8) NULL DEFAULT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程模型' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_model
--- ----------------------------
-
--- ----------------------------
--- Table structure for bpm_model_node
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_model_node`;
-CREATE TABLE `bpm_model_node`  (
-  `id` bigint(20) NOT NULL,
-  `model_id` bigint(20) NOT NULL COMMENT '关联模型id',
-  `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义id',
-  `def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程key',
-  `node_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id',
-  `node_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称',
-  `multi` bit(1) NOT NULL COMMENT '是否多任务',
-  `sequential` bit(1) NULL DEFAULT NULL COMMENT '是否串签',
-  `or_sign` bit(1) NULL DEFAULT NULL COMMENT '是否是或签',
-  `ratio_pass` bit(1) NULL DEFAULT NULL COMMENT '是否比例通过',
-  `pass_ratio` int(3) NULL DEFAULT NULL COMMENT '通过比例',
-  `reject` bit(1) NOT NULL COMMENT '是否允许驳回',
-  `back` bit(1) NOT NULL COMMENT '是否允许回退',
-  `retrieve` bit(1) NOT NULL COMMENT '是否允许取回',
-  `skip` bit(1) NOT NULL COMMENT '是否跳过当前节点',
-  `form_id` bigint(20) NULL DEFAULT NULL COMMENT '关联表单',
-  `assign_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分配类型',
-  `assign_raw` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '分配的原始数据',
-  `assign_show` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '分配的数据的展示',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `version` int(8) NULL DEFAULT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '模型任务节点配置' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_model_node
--- ----------------------------
-
--- ----------------------------
--- Table structure for bpm_task
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_task`;
-CREATE TABLE `bpm_task`  (
-  `id` bigint(20) NOT NULL,
-  `task_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '任务ID',
-  `execution_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务执行 ID',
-  `multi_id` bigint(20) NULL DEFAULT NULL COMMENT '多实例关联id',
-  `instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程实例的id',
-  `instance_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称(业务标题)',
-  `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义名称',
-  `node_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id',
-  `node_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称',
-  `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理状态',
-  `result` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理结果',
-  `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理意见',
-  `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '当前处理人',
-  `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '当前处理人',
-  `start_user_id` bigint(20) NULL DEFAULT NULL COMMENT '发起人',
-  `start_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发起人名称',
-  `form_variables` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '提交的表单值',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `version` int(8) NOT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程任务扩展' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_task
--- ----------------------------
-
 -- ----------------------------
 -- Table structure for common_sequence_range
 -- ----------------------------
@@ -4297,7 +4187,7 @@ INSERT INTO `iam_perm_menu` VALUES (1511266086400524288, 'admin', 14508225110872
 INSERT INTO `iam_perm_menu` VALUES (1530120084482084864, 'admin', 1495968302034210816, '消息中间件演示', 'MQDemo', NULL, b'0', '', b'0', b'0', 'demo/mq/MqDemo', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:33:51', 1399985191002447872, '2022-05-31 15:12:15', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1530120684645044224, 'admin', 1530120084482084864, 'MQTT消息', 'MqttDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/mqtt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:14', 1399985191002447872, '2022-05-27 17:36:14', 0, 1);
 INSERT INTO `iam_perm_menu` VALUES (1530120821144473600, 'admin', 1530120084482084864, 'RabbitMQ', 'RabbitDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/rabbit', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:47', 1399985191002447872, '2022-05-27 17:36:47', 0, 1);
-INSERT INTO `iam_perm_menu` VALUES (1534000136370204672, 'admin', 1431152689832525824, 'ELK日志', 'ELK', '', b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 10:31:48', 1399985191002447872, '2022-06-07 10:31:48', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1534000136370204672, 'admin', 1431152689832525824, 'ELK日志', 'ELK', '', b'0', '', b'1', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 10:31:48', 1399985191002447872, '2022-06-07 10:31:48', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1534008203006652416, 'admin', 1431152689832525824, 'PlumeLog日志', 'PlumeLog', '', b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/plumelog/#/', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 11:03:51', 1399985191002447872, '2022-06-07 11:06:13', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1535451167008436224, 'admin', 1431152689832525824, '系统信息', 'SysInfo', NULL, b'0', '', b'0', b'0', 'starter/monitor/SystemInfoMonitor', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-11 10:37:40', 1399985191002447872, '2022-06-13 13:07:46', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1535965936371085312, 'admin', 1431152689832525824, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', 'starter/monitor/RedisInfoMonitor', NULL, '/monitor/redis', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-12 20:43:11', 1399985191002447872, '2022-06-13 13:07:38', 1, 0);
@@ -4675,8 +4565,6 @@ CREATE TABLE `notice_mail_config`  (
 -- ----------------------------
 -- Records of notice_mail_config
 -- ----------------------------
-INSERT INTO `notice_mail_config` VALUES (1554739296333955072, 'fox', 'foxmail邮箱', 'smtp.qq.com', 465, 'sJfAJDDviYlqZ3BtdjMZF8V5jVSYCaMa9DNdVGDbe/s=', '7AtgVwObaO7wrsRpLvKkoo5O+udeEcFP1ONq4gYwOj0=', 'bootx-platform平台', 'xxm1995@foxmail.com', 1, 3, 1399985191002447872, '2022-08-03 16:01:49', 1399985191002447872, '2022-08-03 16:14:55', 0, 8);
-INSERT INTO `notice_mail_config` VALUES (1584814372311744512, '11', '22', '33', 465, 'pwfAgEMJjGLjbVYEcgdXzA==', 'f3zJMwbPGmNRlNXpN5AMyA==', '666', '33333333@foxmail.com', 0, 1, 1414143554414059520, '2022-10-25 15:49:25', 1414143554414059520, '2022-10-25 16:27:12', 0, 10);
 
 -- ----------------------------
 -- Table structure for notice_message_template
@@ -4738,11 +4626,6 @@ CREATE TABLE `notice_site_message`  (
 -- ----------------------------
 -- Records of notice_site_message
 -- ----------------------------
-INSERT INTO `notice_site_message` VALUES (1424212599079161857, '测试消息', '<div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >55</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >6等非撒扥森<strong>速度扥三扥所</strong></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >6</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5<span style=\"background-color: rgb(255, 169, 64);\">撒扥森森的</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"font-family: 华文楷体;\">5撒扥岁送</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div>', 1399985191002447872, '小小明', '2021-08-08 11:34:11', 'all', 'cancel', NULL, '2022-08-21 23:01:16', 1399985191002447872, '2021-08-08 11:35:19', 1399985191002447872, '2022-08-21 23:01:16', 1, 0);
-INSERT INTO `notice_site_message` VALUES (1558781525200130048, '测试站内信', '<blockquote><span style=\"font-size: 24px;\"><strong>sdfsdfsdf</strong></span></blockquote><ol><li>333</li></ol><ul><li>4444</li><li>3443434</li></ul>', 0, '未知', '2022-08-14 19:44:11', NULL, 'sent', NULL, NULL, 0, '2022-08-14 19:44:11', 0, '2022-08-14 19:44:11', 0, 0);
-INSERT INTO `notice_site_message` VALUES (1561363288741085184, '测试消息', '<p>三扥广丰和扥撒扥撒扥东方</p>', 1399985191002447872, '小小明', '2022-08-21 22:59:45', 'all', 'draft', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 22:43:11', 1399985191002447872, '2022-08-21 23:23:03', 4, 1);
-INSERT INTO `notice_site_message` VALUES (1561365894804766720, '测试数据', '<p>234554通扥广森</p>', 1399985191002447872, '小小明', '2022-08-21 23:48:55', 'all', 'sent', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 22:53:33', 1399985191002447872, '2022-08-21 23:48:55', 1, 0);
-INSERT INTO `notice_site_message` VALUES (1561368170558623744, '测试数据', '<p>234554通扥广森</p><h3>DFF</h3><p><span style=\"background-color: rgb(225, 60, 57);\">撒扥萨芬的</span></p><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">11</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">33</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">44</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">风很高</span></div>', 1399985191002447872, '小小明', '2022-08-21 23:33:01', 'all', 'sent', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 23:02:35', 1399985191002447872, '2022-08-21 23:33:01', 7, 0);
 
 -- ----------------------------
 -- Table structure for notice_site_message_user
@@ -4848,440 +4731,6 @@ CREATE TABLE `notice_wechat_config`  (
 -- ----------------------------
 -- Records of notice_wechat_config
 -- ----------------------------
-INSERT INTO `notice_wechat_config` VALUES (181361815405135421, 0, 'test01', 'test01', 'ww9d6247559117d202', '8n6A3SzN-DJNkw8wyCcJnr8-SOjFFWSOlBqZN8vypKM', 1, 1415, '2018-11-20 11:07:07', 1415, '2018-11-20 11:07:07', 0, 0);
-
--- ----------------------------
--- Table structure for pay_ali_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_ali_payment`;
-CREATE TABLE `pay_ali_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '交易金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款余额',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id',
-  `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `trade_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付宝关联流水号',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NULL DEFAULT NULL COMMENT '版本',
-  `deleted` bit(1) NOT NULL COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付宝支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_ali_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_alipay_config
--- ----------------------------
-DROP TABLE IF EXISTS `pay_alipay_config`;
-CREATE TABLE `pay_alipay_config`  (
-  `id` bigint(20) NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
-  `app_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '支付宝商户appId',
-  `notify_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器异步通知页面路径',
-  `return_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '页面跳转同步通知页面路径',
-  `server_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '请求网关地址',
-  `auth_type` int(4) NOT NULL COMMENT '认证方式',
-  `sign_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签名类型',
-  `alipay_public_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝公钥',
-  `private_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '私钥',
-  `app_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '应用公钥',
-  `alipay_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝公钥证书',
-  `alipay_root_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝CA根证书',
-  `sandbox` bit(1) NOT NULL COMMENT '是否沙箱环境',
-  `expire_time` int(10) NOT NULL COMMENT '超时配置',
-  `pay_ways` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支持的支付类型',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `activity` bit(1) NOT NULL COMMENT '是否启用',
-  `state` int(11) NOT NULL COMMENT '状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付宝配置' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_alipay_config
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_cash_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_cash_payment`;
-CREATE TABLE `pay_cash_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付id',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '现金交易记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_cash_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_pay_notify_record
--- ----------------------------
-DROP TABLE IF EXISTS `pay_pay_notify_record`;
-CREATE TABLE `pay_pay_notify_record`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付号',
-  `notify_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '通知消息',
-  `pay_channel` int(11) NOT NULL COMMENT '支付通道',
-  `status` int(2) NOT NULL COMMENT '处理状态',
-  `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息',
-  `notify_time` datetime(6) NULL DEFAULT NULL COMMENT '回调时间',
-  `creator` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(6) NULL DEFAULT NULL,
-  `last_modifier` bigint(20) NULL DEFAULT NULL,
-  `last_modified_time` datetime(6) NULL DEFAULT NULL,
-  `version` int(11) NOT NULL,
-  `deleted` bit(1) NOT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付回调记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_pay_notify_record
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_pay_order_log
--- ----------------------------
-DROP TABLE IF EXISTS `pay_pay_order_log`;
-CREATE TABLE `pay_pay_order_log`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付id',
-  `business_pay_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '订单扩展业务参数',
-  `pay_order_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '订单参数',
-  `creator` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(6) NULL DEFAULT NULL,
-  `last_modifier` bigint(20) NULL DEFAULT NULL,
-  `last_modified_time` datetime(6) NULL DEFAULT NULL,
-  `version` int(11) NOT NULL,
-  `deleted` bit(1) NOT NULL,
-  `tid` bigint(20) NOT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付关联订单信息' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_pay_order_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_payment`;
-CREATE TABLE `pay_payment`  (
-  `id` bigint(20) NOT NULL,
-  `user_id` bigint(20) NOT NULL COMMENT '用户id',
-  `business_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id',
-  `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题',
-  `description` varchar(240) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
-  `amount` decimal(19, 2) NOT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款余额',
-  `pay_status` int(11) NOT NULL COMMENT '支付状态',
-  `error_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误码',
-  `error_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息',
-  `pay_type_info` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付信息',
-  `async_pay_mode` bit(1) NOT NULL COMMENT '是否是异步支付',
-  `async_pay_channel` int(11) NULL DEFAULT NULL COMMENT '异步支付方式',
-  `pay_channel_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付通道信息列表',
-  `refundable_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '可退款信息',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `expired_time` datetime(6) NULL DEFAULT NULL COMMENT '过期时间',
-  `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ip',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE INDEX `uniq_business_id`(`business_id`) USING BTREE COMMENT '业务编号id, 唯一ID'
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_refund_record
--- ----------------------------
-DROP TABLE IF EXISTS `pay_refund_record`;
-CREATE TABLE `pay_refund_record`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付记录id',
-  `business_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联业务id',
-  `refund_request_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '异步方式关联退款请求号',
-  `user_id` bigint(20) NOT NULL COMMENT '用户id',
-  `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题',
-  `amount` decimal(19, 2) NOT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '剩余可退款金额',
-  `refundable_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '可退款信息',
-  `refund_status` int(2) NULL DEFAULT NULL COMMENT '退款状态',
-  `refund_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ip',
-  `error_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误码',
-  `error_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '退款记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_refund_record
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_voucher
--- ----------------------------
-DROP TABLE IF EXISTS `pay_voucher`;
-CREATE TABLE `pay_voucher`  (
-  `id` bigint(20) NOT NULL,
-  `card_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '卡号',
-  `batch_no` bigint(20) NULL DEFAULT NULL COMMENT '批次号',
-  `face_value` decimal(15, 2) NULL DEFAULT NULL COMMENT '面值',
-  `balance` decimal(15, 2) NULL DEFAULT NULL COMMENT '余额',
-  `enduring` bit(1) NOT NULL COMMENT '是否长期有效',
-  `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
-  `status` int(2) NOT NULL COMMENT '状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_voucher
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_voucher_log
--- ----------------------------
-DROP TABLE IF EXISTS `pay_voucher_log`;
-CREATE TABLE `pay_voucher_log`  (
-  `id` bigint(20) NOT NULL,
-  `voucher_id` bigint(20) NOT NULL,
-  `voucher_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `amount` decimal(19, 2) NULL DEFAULT NULL,
-  `type` int(5) NOT NULL COMMENT '类型',
-  `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务ID',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡日志' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_voucher_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_voucher_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_voucher_payment`;
-CREATE TABLE `pay_voucher_payment`  (
-  `id` bigint(20) NOT NULL,
-  `voucher_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '储值卡id列表',
-  `payment_id` bigint(20) NOT NULL COMMENT '支付id',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_voucher_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wallet
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet`;
-CREATE TABLE `pay_wallet`  (
-  `id` bigint(20) NOT NULL,
-  `user_id` bigint(20) NOT NULL COMMENT '关联用户id',
-  `balance` decimal(19, 2) NOT NULL COMMENT '余额',
-  `status` int(11) NOT NULL COMMENT '状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE,
-  INDEX `pk_user_id`(`user_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wallet
--- ----------------------------
-INSERT INTO `pay_wallet` VALUES (1336489524259352576, 1399985191002447872, 999982.96, 1, NULL, '2022-03-11 21:37:33', 1399985191002447872, '2022-05-03 21:24:04', 29, 0);
-INSERT INTO `pay_wallet` VALUES (1502554238582968320, 1414143554414059520, 1019.00, 1, 1399985191002447872, '2022-03-12 15:57:01', 1399985191002447872, '2022-03-13 11:21:10', 2, 0);
-INSERT INTO `pay_wallet` VALUES (1502848353136791552, 1435894470432456704, 100.00, 1, 1399985191002447872, '2022-03-13 11:25:44', 1399985191002447872, '2022-03-24 13:22:37', 1, 0);
-
--- ----------------------------
--- Table structure for pay_wallet_log
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet_log`;
-CREATE TABLE `pay_wallet_log`  (
-  `id` bigint(20) NOT NULL,
-  `wallet_id` bigint(20) NOT NULL COMMENT '钱包id',
-  `user_id` bigint(20) NOT NULL COMMENT '用户id',
-  `type` int(11) NOT NULL COMMENT '类型',
-  `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID',
-  `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作终端ip',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务ID',
-  `operation_source` int(11) NOT NULL COMMENT '操作源',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包日志' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wallet_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wallet_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet_payment`;
-CREATE TABLE `pay_wallet_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '交易记录ID',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `wallet_id` bigint(20) NULL DEFAULT NULL COMMENT '钱包ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '交易金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `pay_status` int(11) NOT NULL COMMENT '支付状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包交易记录表' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wallet_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wechat_pay_config
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wechat_pay_config`;
-CREATE TABLE `pay_wechat_pay_config`  (
-  `id` bigint(20) NOT NULL COMMENT '主键',
-  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称',
-  `app_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信应用AppId',
-  `mch_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户号',
-  `api_version` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务商应用编号',
-  `api_key_v2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 APIv2 密钥',
-  `api_key_v3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 APIv3 密钥',
-  `app_secret` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'APPID对应的接口密码，用于获取接口调用凭证access_token时使用',
-  `p12` bigint(20) NULL DEFAULT NULL COMMENT 'p12的文件id',
-  `cert_pem` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'API 证书中的 cert.pem',
-  `key_pem` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'API 证书中的 key.pem',
-  `domain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应用域名，回调中会使用此参数',
-  `notify_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器异步通知页面路径',
-  `return_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '页面跳转同步通知页面路径',
-  `pay_ways` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支持的支付类型',
-  `sandbox` bit(1) NOT NULL COMMENT '是否沙箱环境',
-  `expire_time` int(10) NOT NULL COMMENT '超时配置',
-  `activity` bit(1) NOT NULL COMMENT '是否启用',
-  `state` int(11) NULL DEFAULT NULL COMMENT '状态',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信支付配置' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wechat_pay_config
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wechat_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wechat_payment`;
-CREATE TABLE `pay_wechat_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '交易记录ID',
-  `pay_status` int(11) NOT NULL COMMENT '支付状态',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `trade_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信交易号',
-  `amount` decimal(19, 2) NOT NULL COMMENT '交易金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wechat_payment
--- ----------------------------
 
 -- ----------------------------
 -- Table structure for qrtz_blob_triggers
@@ -5698,6 +5147,10 @@ CREATE TABLE `starter_file_upload_info`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of starter_file_upload_info
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for starter_quartz_job
 -- ----------------------------
diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md
index c0b53e64..36aa8b95 100644
--- a/_doc/ChangeLog.md
+++ b/_doc/ChangeLog.md
@@ -1,5 +1,18 @@
 # CHANGELOG
-
+##  [v1.3.1] 一号线-园博园
+- 新增: 代码生成器支持多数据源
+- 新增: 多数据源增加启动时自动加载配置
+- 优化: 可视化大屏同步GoVIew最新版本
+- 优化: 数据版本记录插件解析失败SQL时的报错提示
+- 优化: 调整减少部分传递依赖
+- 优化: 代码生成器模板更新
+- fix: 工具类构建树时子孙元素排序未生效
+- fix: 超级查询字段获取失败问题
+- fix: maven-javadoc-plugin升级到3.5.0版本, 避免macos下出现报错
+- fix: mongo相关service条件注入处理，避免在无Mongo依赖的情况下无法启动
+- fix: 记录ip对应地址时偶发的空指针处理
+- fix: 用户分配数据权限有误
+- fix: 系统参数配置值字段缺少
 ##  [v1.3.0] 一号线-园博园
 **项目主要更新**
 - 重构: 拆分支付模块为`dax-pay`子项目
diff --git a/_doc/Task.md b/_doc/Task.md
deleted file mode 100644
index 71bb1fac..00000000
--- a/_doc/Task.md
+++ /dev/null
@@ -1 +0,0 @@
-[ ] 
diff --git a/bootx-common-core/pom.xml b/bootx-common-core/pom.xml
index 36d12932..95059d54 100644
--- a/bootx-common-core/pom.xml
+++ b/bootx-common-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-audit-log/pom.xml b/bootx-common-starters/common-starter-audit-log/pom.xml
index 9420b6f1..5397f6ea 100644
--- a/bootx-common-starters/common-starter-audit-log/pom.xml
+++ b/bootx-common-starters/common-starter-audit-log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-common-starters</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java
index 9cc5416d..66e0d1a0 100644
--- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java
+++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java
@@ -80,7 +80,8 @@ public class IpToRegionService {
         // 判断IP是否合法
         Matcher matcher = PatternPool.IPV4.matcher(ip);
         if (!matcher.matches()) {
-            throw new BizException("IP非法");
+            log.warn("非法IPv4地址: {}",ip);
+            return null;
         }
 
         // 根据类型获取 Searcher 对象
@@ -101,6 +102,7 @@ public class IpToRegionService {
         }
         // 无法进行查询
         if (Objects.isNull(searcher)){
+            log.warn("");
             return null;
         }
 
@@ -130,7 +132,7 @@ public class IpToRegionService {
         IpRegion region = this.getRegionByIp(ip);
         // 未查询到
         if (Objects.isNull(region)){
-            location = "未知";
+            return  "未知";
         }
         // 中国 港澳台
         if (region.isBigChina()){
diff --git a/bootx-common-starters/common-starter-auth/pom.xml b/bootx-common-starters/common-starter-auth/pom.xml
index ee0987b1..09b1ebad 100644
--- a/bootx-common-starters/common-starter-auth/pom.xml
+++ b/bootx-common-starters/common-starter-auth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-common-starters</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common-starter-auth</artifactId>
diff --git a/bootx-common-starters/common-starter-code-gen/pom.xml b/bootx-common-starters/common-starter-code-gen/pom.xml
index 45307869..e1769a16 100644
--- a/bootx-common-starters/common-starter-code-gen/pom.xml
+++ b/bootx-common-starters/common-starter-code-gen/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-common-starters</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-data-perm/pom.xml b/bootx-common-starters/common-starter-data-perm/pom.xml
index 10770659..60e964eb 100644
--- a/bootx-common-starters/common-starter-data-perm/pom.xml
+++ b/bootx-common-starters/common-starter-data-perm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-common-starters</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-dingtalk/pom.xml b/bootx-common-starters/common-starter-dingtalk/pom.xml
index 79e32103..0119bbf3 100644
--- a/bootx-common-starters/common-starter-dingtalk/pom.xml
+++ b/bootx-common-starters/common-starter-dingtalk/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-common-starters</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml
index 59261aeb..09f2f3d7 100644
--- a/bootx-common-starters/common-starter-file/pom.xml
+++ b/bootx-common-starters/common-starter-file/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-common-starters</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-monitor/pom.xml b/bootx-common-starters/common-starter-monitor/pom.xml
index e66a7ef4..ea9c3e0e 100644
--- a/bootx-common-starters/common-starter-monitor/pom.xml
+++ b/bootx-common-starters/common-starter-monitor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-common-starters</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/bootx-common-starters/common-starter-quartz/pom.xml b/bootx-common-starters/common-starter-quartz/pom.xml
index 8ca96149..643b5a5e 100644
--- a/bootx-common-starters/common-starter-quartz/pom.xml
+++ b/bootx-common-starters/common-starter-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-common-starters</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-wechat/pom.xml b/bootx-common-starters/common-starter-wechat/pom.xml
index 3c8713e2..23b43cec 100644
--- a/bootx-common-starters/common-starter-wechat/pom.xml
+++ b/bootx-common-starters/common-starter-wechat/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-common-starters</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-wecom/pom.xml b/bootx-common-starters/common-starter-wecom/pom.xml
index 80c7d053..5eebd87d 100644
--- a/bootx-common-starters/common-starter-wecom/pom.xml
+++ b/bootx-common-starters/common-starter-wecom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-common-starters</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/bootx-common-starters/pom.xml b/bootx-common-starters/pom.xml
index d0fbb440..e86a0914 100644
--- a/bootx-common-starters/pom.xml
+++ b/bootx-common-starters/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-cache/pom.xml b/bootx-commons/common-cache/pom.xml
index eabf6f39..055d49a1 100644
--- a/bootx-commons/common-cache/pom.xml
+++ b/bootx-commons/common-cache/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-commons</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-data-translate/pom.xml b/bootx-commons/common-data-translate/pom.xml
index ea209174..bc1b0005 100644
--- a/bootx-commons/common-data-translate/pom.xml
+++ b/bootx-commons/common-data-translate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-commons</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/bootx-commons/common-exception-handler/pom.xml b/bootx-commons/common-exception-handler/pom.xml
index 3b2b2406..8d8c670c 100644
--- a/bootx-commons/common-exception-handler/pom.xml
+++ b/bootx-commons/common-exception-handler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common-exception-handler</artifactId>
diff --git a/bootx-commons/common-header-holder/pom.xml b/bootx-commons/common-header-holder/pom.xml
index 630ee952..97143b77 100644
--- a/bootx-commons/common-header-holder/pom.xml
+++ b/bootx-commons/common-header-holder/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-idempotency/pom.xml b/bootx-commons/common-idempotency/pom.xml
index f67d1baa..e4a6dc20 100644
--- a/bootx-commons/common-idempotency/pom.xml
+++ b/bootx-commons/common-idempotency/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-jackson/pom.xml b/bootx-commons/common-jackson/pom.xml
index d9cb9501..2669c223 100644
--- a/bootx-commons/common-jackson/pom.xml
+++ b/bootx-commons/common-jackson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-commons</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-log/pom.xml b/bootx-commons/common-log/pom.xml
index 6e5d64c7..f2bfc0be 100644
--- a/bootx-commons/common-log/pom.xml
+++ b/bootx-commons/common-log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-commons</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-mongo/pom.xml b/bootx-commons/common-mongo/pom.xml
index ed5df896..8d71312b 100644
--- a/bootx-commons/common-mongo/pom.xml
+++ b/bootx-commons/common-mongo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-commons</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common-mongo</artifactId>
diff --git a/bootx-commons/common-mybatis-plus/pom.xml b/bootx-commons/common-mybatis-plus/pom.xml
index 6131286d..b537d380 100644
--- a/bootx-commons/common-mybatis-plus/pom.xml
+++ b/bootx-commons/common-mybatis-plus/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>cn.bootx</groupId>
-            <artifactId>mybatis-table-modify</artifactId>
+            <artifactId>mybatis-table-modify-mysql-boot-starter</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/bootx-commons/common-rabbitmq/pom.xml b/bootx-commons/common-rabbitmq/pom.xml
index b5c766ef..e7101dad 100644
--- a/bootx-commons/common-rabbitmq/pom.xml
+++ b/bootx-commons/common-rabbitmq/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-redis-client/pom.xml b/bootx-commons/common-redis-client/pom.xml
index 079962ce..f19b6ef5 100644
--- a/bootx-commons/common-redis-client/pom.xml
+++ b/bootx-commons/common-redis-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java
index 27fe471d..c3307f86 100644
--- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java
+++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java
@@ -63,6 +63,23 @@ public class RedissonClientTemporary implements RedissonClient {
         return null;
     }
 
+    /**
+     * @return
+     */
+    @Override
+    public RSearch getSearch() {
+        return null;
+    }
+
+    /**
+     * @param codec
+     * @return
+     */
+    @Override
+    public RSearch getSearch(Codec codec) {
+        return null;
+    }
+
     /**
      * @param s
      * @return
diff --git a/bootx-commons/common-sequence/pom.xml b/bootx-commons/common-sequence/pom.xml
index 04a89d20..61434845 100644
--- a/bootx-commons/common-sequence/pom.xml
+++ b/bootx-commons/common-sequence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-spring/pom.xml b/bootx-commons/common-spring/pom.xml
index 9546528a..66ad0444 100644
--- a/bootx-commons/common-spring/pom.xml
+++ b/bootx-commons/common-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-super-query/pom.xml b/bootx-commons/common-super-query/pom.xml
index 0debaa8b..168c30a9 100644
--- a/bootx-commons/common-super-query/pom.xml
+++ b/bootx-commons/common-super-query/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-swagger/pom.xml b/bootx-commons/common-swagger/pom.xml
index e6c4574b..22529e79 100644
--- a/bootx-commons/common-swagger/pom.xml
+++ b/bootx-commons/common-swagger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-websocket/pom.xml b/bootx-commons/common-websocket/pom.xml
index 9267d428..1aa01f6a 100644
--- a/bootx-commons/common-websocket/pom.xml
+++ b/bootx-commons/common-websocket/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-xxl-job/pom.xml b/bootx-commons/common-xxl-job/pom.xml
index 7633c0d9..44d30301 100644
--- a/bootx-commons/common-xxl-job/pom.xml
+++ b/bootx-commons/common-xxl-job/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml
index 27a89e4c..51bc3b2f 100644
--- a/bootx-commons/pom.xml
+++ b/bootx-commons/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>bootx-commons</artifactId>
diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml
index 45f42341..68720a2d 100644
--- a/bootx-demo/pom.xml
+++ b/bootx-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>cn.bootx</groupId>
-            <artifactId>mybatis-table-modify</artifactId>
+            <artifactId>mybatis-table-modify-mysql-boot-starter</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml
index 0821a5ef..3eff6ee2 100644
--- a/bootx-services/pom.xml
+++ b/bootx-services/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -141,7 +141,7 @@
         <!-- 自动维护表结构 -->
         <dependency>
             <groupId>cn.bootx</groupId>
-            <artifactId>mybatis-table-modify</artifactId>
+            <artifactId>mybatis-table-modify-mysql-boot-starter</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/bootx-services/service-baseapi/pom.xml b/bootx-services/service-baseapi/pom.xml
index f1ccc346..248c2e1a 100644
--- a/bootx-services/service-baseapi/pom.xml
+++ b/bootx-services/service-baseapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-services</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml
index c4348825..0c27af07 100644
--- a/bootx-services/service-iam/pom.xml
+++ b/bootx-services/service-iam/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-services</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml
index dafb6f38..2d48973c 100644
--- a/bootx-services/service-notice/pom.xml
+++ b/bootx-services/service-notice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-services</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-visualization/pom.xml b/bootx-services/service-visualization/pom.xml
index a508caf4..0483d833 100644
--- a/bootx-services/service-visualization/pom.xml
+++ b/bootx-services/service-visualization/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-services</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml
index b439c57b..99efe995 100644
--- a/bootx-start/pom.xml
+++ b/bootx-start/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bootx-start</artifactId>
diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml
index 2b178fd7..ddd19a19 100644
--- a/bootx-start/src/main/resources/application-dev.yml
+++ b/bootx-start/src/main/resources/application-dev.yml
@@ -91,7 +91,7 @@ bootx:
     swagger:
       enabled: true
       author: bootx
-      version: 1.3.0
+      version: 1.3.1
       title: bootx开发平台单体版
       description: bootx-platform开发平台单体版
       # basic认证
diff --git a/bootx-start/src/main/resources/db/migration/V1.3.0_230510__release.sql b/bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql
similarity index 91%
rename from bootx-start/src/main/resources/db/migration/V1.3.0_230510__release.sql
rename to bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql
index a6d0ebcc..0fb97592 100644
--- a/bootx-start/src/main/resources/db/migration/V1.3.0_230510__release.sql
+++ b/bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql
@@ -1,16 +1,14 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : bootx
  Source Server Type    : MySQL
  Source Server Version : 50735
- Source Schema         : bootx-platform
 
  Target Server Type    : MySQL
  Target Server Version : 50735
  File Encoding         : 65001
 
- Date: 10/05/2023 09:31:59
+ Date: 07/06/2023 15:15:39
 */
 
 SET NAMES utf8mb4;
@@ -3599,6 +3597,7 @@ CREATE TABLE `base_dynamic_data_source`  (
   `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据源编码',
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据源名称',
   `database_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库类型',
+  `auto_load` bit(1) NULL DEFAULT NULL COMMENT '是否启动自动加载',
   `db_driver` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '驱动类',
   `db_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库地址',
   `db_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库名称',
@@ -3741,6 +3740,31 @@ INSERT INTO `base_province` VALUES ('63', '青海省');
 INSERT INTO `base_province` VALUES ('64', '宁夏回族自治区');
 INSERT INTO `base_province` VALUES ('65', '新疆维吾尔自治区');
 
+-- ----------------------------
+-- Table structure for base_query_sql
+-- ----------------------------
+DROP TABLE IF EXISTS `base_query_sql`;
+CREATE TABLE `base_query_sql`  (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `database_id` bigint(20) NULL DEFAULT NULL COMMENT '数据源ID',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '名称',
+  `is_list` bit(1) NULL DEFAULT NULL COMMENT '是否集合',
+  `sql` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'sql语句',
+  `params` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询参数',
+  `fields` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询结果字段',
+  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID',
+  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
+  `version` int(11) NOT NULL COMMENT '乐观锁',
+  `deleted` bit(1) NOT NULL COMMENT '删除标志',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'SQL查询语句' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of base_query_sql
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for base_street
 -- ----------------------------
@@ -3773,141 +3797,6 @@ CREATE TABLE `base_village`  (
 -- Records of base_village
 -- ----------------------------
 
--- ----------------------------
--- Table structure for bpm_instance
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_instance`;
-CREATE TABLE `bpm_instance`  (
-  `id` bigint(20) NOT NULL,
-  `instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程实例的id',
-  `instance_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程标题',
-  `model_id` bigint(20) NULL DEFAULT NULL COMMENT '模型id',
-  `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义ID',
-  `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义名称',
-  `start_user_id` bigint(20) NULL DEFAULT NULL COMMENT '发起人',
-  `start_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发起人名称',
-  `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程实例的状态',
-  `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
-  `form_variables` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '提交的表单值',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  `version` int(8) NULL DEFAULT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程实例扩展' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_instance
--- ----------------------------
-
--- ----------------------------
--- Table structure for bpm_model
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_model`;
-CREATE TABLE `bpm_model`  (
-  `id` bigint(20) NOT NULL,
-  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '名称',
-  `model_type` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程类型',
-  `form_id` bigint(20) NULL DEFAULT NULL COMMENT '关联表单',
-  `publish` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发布状态',
-  `enable` bit(1) NULL DEFAULT NULL COMMENT '启用状态',
-  `deploy_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '部署id',
-  `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义id',
-  `def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程key',
-  `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称',
-  `def_remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程备注',
-  `main_process` bit(1) NULL DEFAULT NULL COMMENT '是否主流程',
-  `process_version` int(8) NULL DEFAULT NULL COMMENT '流程版本号',
-  `model_editor_xml` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '流程xml',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  `version` int(8) NULL DEFAULT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程模型' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_model
--- ----------------------------
-
--- ----------------------------
--- Table structure for bpm_model_node
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_model_node`;
-CREATE TABLE `bpm_model_node`  (
-  `id` bigint(20) NOT NULL,
-  `model_id` bigint(20) NOT NULL COMMENT '关联模型id',
-  `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义id',
-  `def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程key',
-  `node_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id',
-  `node_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称',
-  `multi` bit(1) NOT NULL COMMENT '是否多任务',
-  `sequential` bit(1) NULL DEFAULT NULL COMMENT '是否串签',
-  `or_sign` bit(1) NULL DEFAULT NULL COMMENT '是否是或签',
-  `ratio_pass` bit(1) NULL DEFAULT NULL COMMENT '是否比例通过',
-  `pass_ratio` int(3) NULL DEFAULT NULL COMMENT '通过比例',
-  `reject` bit(1) NOT NULL COMMENT '是否允许驳回',
-  `back` bit(1) NOT NULL COMMENT '是否允许回退',
-  `retrieve` bit(1) NOT NULL COMMENT '是否允许取回',
-  `skip` bit(1) NOT NULL COMMENT '是否跳过当前节点',
-  `form_id` bigint(20) NULL DEFAULT NULL COMMENT '关联表单',
-  `assign_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分配类型',
-  `assign_raw` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '分配的原始数据',
-  `assign_show` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '分配的数据的展示',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `version` int(8) NULL DEFAULT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '模型任务节点配置' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_model_node
--- ----------------------------
-
--- ----------------------------
--- Table structure for bpm_task
--- ----------------------------
-DROP TABLE IF EXISTS `bpm_task`;
-CREATE TABLE `bpm_task`  (
-  `id` bigint(20) NOT NULL,
-  `task_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '任务ID',
-  `execution_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务执行 ID',
-  `multi_id` bigint(20) NULL DEFAULT NULL COMMENT '多实例关联id',
-  `instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程实例的id',
-  `instance_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称(业务标题)',
-  `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义名称',
-  `node_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id',
-  `node_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称',
-  `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理状态',
-  `result` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理结果',
-  `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理意见',
-  `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '当前处理人',
-  `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '当前处理人',
-  `start_user_id` bigint(20) NULL DEFAULT NULL COMMENT '发起人',
-  `start_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发起人名称',
-  `form_variables` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '提交的表单值',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `version` int(8) NOT NULL COMMENT '版本',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程任务扩展' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bpm_task
--- ----------------------------
-
 -- ----------------------------
 -- Table structure for common_sequence_range
 -- ----------------------------
@@ -4298,7 +4187,7 @@ INSERT INTO `iam_perm_menu` VALUES (1511266086400524288, 'admin', 14508225110872
 INSERT INTO `iam_perm_menu` VALUES (1530120084482084864, 'admin', 1495968302034210816, '消息中间件演示', 'MQDemo', NULL, b'0', '', b'0', b'0', 'demo/mq/MqDemo', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:33:51', 1399985191002447872, '2022-05-31 15:12:15', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1530120684645044224, 'admin', 1530120084482084864, 'MQTT消息', 'MqttDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/mqtt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:14', 1399985191002447872, '2022-05-27 17:36:14', 0, 1);
 INSERT INTO `iam_perm_menu` VALUES (1530120821144473600, 'admin', 1530120084482084864, 'RabbitMQ', 'RabbitDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/rabbit', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:47', 1399985191002447872, '2022-05-27 17:36:47', 0, 1);
-INSERT INTO `iam_perm_menu` VALUES (1534000136370204672, 'admin', 1431152689832525824, 'ELK日志', 'ELK', '', b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 10:31:48', 1399985191002447872, '2022-06-07 10:31:48', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1534000136370204672, 'admin', 1431152689832525824, 'ELK日志', 'ELK', '', b'0', '', b'1', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 10:31:48', 1399985191002447872, '2022-06-07 10:31:48', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1534008203006652416, 'admin', 1431152689832525824, 'PlumeLog日志', 'PlumeLog', '', b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/plumelog/#/', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 11:03:51', 1399985191002447872, '2022-06-07 11:06:13', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1535451167008436224, 'admin', 1431152689832525824, '系统信息', 'SysInfo', NULL, b'0', '', b'0', b'0', 'starter/monitor/SystemInfoMonitor', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-11 10:37:40', 1399985191002447872, '2022-06-13 13:07:46', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1535965936371085312, 'admin', 1431152689832525824, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', 'starter/monitor/RedisInfoMonitor', NULL, '/monitor/redis', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-12 20:43:11', 1399985191002447872, '2022-06-13 13:07:38', 1, 0);
@@ -4676,8 +4565,6 @@ CREATE TABLE `notice_mail_config`  (
 -- ----------------------------
 -- Records of notice_mail_config
 -- ----------------------------
-INSERT INTO `notice_mail_config` VALUES (1554739296333955072, 'fox', 'foxmail邮箱', 'smtp.qq.com', 465, 'sJfAJDDviYlqZ3BtdjMZF8V5jVSYCaMa9DNdVGDbe/s=', '7AtgVwObaO7wrsRpLvKkoo5O+udeEcFP1ONq4gYwOj0=', 'bootx-platform平台', 'xxm1995@foxmail.com', 1, 3, 1399985191002447872, '2022-08-03 16:01:49', 1399985191002447872, '2022-08-03 16:14:55', 0, 8);
-INSERT INTO `notice_mail_config` VALUES (1584814372311744512, '11', '22', '33', 465, 'pwfAgEMJjGLjbVYEcgdXzA==', 'f3zJMwbPGmNRlNXpN5AMyA==', '666', '33333333@foxmail.com', 0, 1, 1414143554414059520, '2022-10-25 15:49:25', 1414143554414059520, '2022-10-25 16:27:12', 0, 10);
 
 -- ----------------------------
 -- Table structure for notice_message_template
@@ -4739,11 +4626,6 @@ CREATE TABLE `notice_site_message`  (
 -- ----------------------------
 -- Records of notice_site_message
 -- ----------------------------
-INSERT INTO `notice_site_message` VALUES (1424212599079161857, '测试消息', '<div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >55</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >6等非撒扥森<strong>速度扥三扥所</strong></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >6</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5<span style=\"background-color: rgb(255, 169, 64);\">撒扥森森的</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >5</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"font-family: 华文楷体;\">5撒扥岁送</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled >8</div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ></div>', 1399985191002447872, '小小明', '2021-08-08 11:34:11', 'all', 'cancel', NULL, '2022-08-21 23:01:16', 1399985191002447872, '2021-08-08 11:35:19', 1399985191002447872, '2022-08-21 23:01:16', 1, 0);
-INSERT INTO `notice_site_message` VALUES (1558781525200130048, '测试站内信', '<blockquote><span style=\"font-size: 24px;\"><strong>sdfsdfsdf</strong></span></blockquote><ol><li>333</li></ol><ul><li>4444</li><li>3443434</li></ul>', 0, '未知', '2022-08-14 19:44:11', NULL, 'sent', NULL, NULL, 0, '2022-08-14 19:44:11', 0, '2022-08-14 19:44:11', 0, 0);
-INSERT INTO `notice_site_message` VALUES (1561363288741085184, '测试消息', '<p>三扥广丰和扥撒扥撒扥东方</p>', 1399985191002447872, '小小明', '2022-08-21 22:59:45', 'all', 'draft', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 22:43:11', 1399985191002447872, '2022-08-21 23:23:03', 4, 1);
-INSERT INTO `notice_site_message` VALUES (1561365894804766720, '测试数据', '<p>234554通扥广森</p>', 1399985191002447872, '小小明', '2022-08-21 23:48:55', 'all', 'sent', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 22:53:33', 1399985191002447872, '2022-08-21 23:48:55', 1, 0);
-INSERT INTO `notice_site_message` VALUES (1561368170558623744, '测试数据', '<p>234554通扥广森</p><h3>DFF</h3><p><span style=\"background-color: rgb(225, 60, 57);\">撒扥萨芬的</span></p><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">11</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">33</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">44</span></div><div data-w-e-type=\"todo\"><input type=\"checkbox\" disabled ><span style=\"background-color: rgb(225, 60, 57);\">风很高</span></div>', 1399985191002447872, '小小明', '2022-08-21 23:33:01', 'all', 'sent', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 23:02:35', 1399985191002447872, '2022-08-21 23:33:01', 7, 0);
 
 -- ----------------------------
 -- Table structure for notice_site_message_user
@@ -4849,440 +4731,6 @@ CREATE TABLE `notice_wechat_config`  (
 -- ----------------------------
 -- Records of notice_wechat_config
 -- ----------------------------
-INSERT INTO `notice_wechat_config` VALUES (181361815405135421, 0, 'test01', 'test01', 'ww9d6247559117d202', '8n6A3SzN-DJNkw8wyCcJnr8-SOjFFWSOlBqZN8vypKM', 1, 1415, '2018-11-20 11:07:07', 1415, '2018-11-20 11:07:07', 0, 0);
-
--- ----------------------------
--- Table structure for pay_ali_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_ali_payment`;
-CREATE TABLE `pay_ali_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '交易金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款余额',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id',
-  `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `trade_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付宝关联流水号',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NULL DEFAULT NULL COMMENT '版本',
-  `deleted` bit(1) NOT NULL COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付宝支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_ali_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_alipay_config
--- ----------------------------
-DROP TABLE IF EXISTS `pay_alipay_config`;
-CREATE TABLE `pay_alipay_config`  (
-  `id` bigint(20) NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
-  `app_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '支付宝商户appId',
-  `notify_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器异步通知页面路径',
-  `return_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '页面跳转同步通知页面路径',
-  `server_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '请求网关地址',
-  `auth_type` int(4) NOT NULL COMMENT '认证方式',
-  `sign_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签名类型',
-  `alipay_public_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝公钥',
-  `private_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '私钥',
-  `app_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '应用公钥',
-  `alipay_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝公钥证书',
-  `alipay_root_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝CA根证书',
-  `sandbox` bit(1) NOT NULL COMMENT '是否沙箱环境',
-  `expire_time` int(10) NOT NULL COMMENT '超时配置',
-  `pay_ways` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支持的支付类型',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `activity` bit(1) NOT NULL COMMENT '是否启用',
-  `state` int(11) NOT NULL COMMENT '状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付宝配置' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_alipay_config
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_cash_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_cash_payment`;
-CREATE TABLE `pay_cash_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付id',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '现金交易记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_cash_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_pay_notify_record
--- ----------------------------
-DROP TABLE IF EXISTS `pay_pay_notify_record`;
-CREATE TABLE `pay_pay_notify_record`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付号',
-  `notify_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '通知消息',
-  `pay_channel` int(11) NOT NULL COMMENT '支付通道',
-  `status` int(2) NOT NULL COMMENT '处理状态',
-  `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息',
-  `notify_time` datetime(6) NULL DEFAULT NULL COMMENT '回调时间',
-  `creator` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(6) NULL DEFAULT NULL,
-  `last_modifier` bigint(20) NULL DEFAULT NULL,
-  `last_modified_time` datetime(6) NULL DEFAULT NULL,
-  `version` int(11) NOT NULL,
-  `deleted` bit(1) NOT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付回调记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_pay_notify_record
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_pay_order_log
--- ----------------------------
-DROP TABLE IF EXISTS `pay_pay_order_log`;
-CREATE TABLE `pay_pay_order_log`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付id',
-  `business_pay_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '订单扩展业务参数',
-  `pay_order_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '订单参数',
-  `creator` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(6) NULL DEFAULT NULL,
-  `last_modifier` bigint(20) NULL DEFAULT NULL,
-  `last_modified_time` datetime(6) NULL DEFAULT NULL,
-  `version` int(11) NOT NULL,
-  `deleted` bit(1) NOT NULL,
-  `tid` bigint(20) NOT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付关联订单信息' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_pay_order_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_payment`;
-CREATE TABLE `pay_payment`  (
-  `id` bigint(20) NOT NULL,
-  `user_id` bigint(20) NOT NULL COMMENT '用户id',
-  `business_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id',
-  `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题',
-  `description` varchar(240) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
-  `amount` decimal(19, 2) NOT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款余额',
-  `pay_status` int(11) NOT NULL COMMENT '支付状态',
-  `error_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误码',
-  `error_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息',
-  `pay_type_info` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付信息',
-  `async_pay_mode` bit(1) NOT NULL COMMENT '是否是异步支付',
-  `async_pay_channel` int(11) NULL DEFAULT NULL COMMENT '异步支付方式',
-  `pay_channel_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付通道信息列表',
-  `refundable_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '可退款信息',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `expired_time` datetime(6) NULL DEFAULT NULL COMMENT '过期时间',
-  `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ip',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE INDEX `uniq_business_id`(`business_id`) USING BTREE COMMENT '业务编号id, 唯一ID'
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_refund_record
--- ----------------------------
-DROP TABLE IF EXISTS `pay_refund_record`;
-CREATE TABLE `pay_refund_record`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '支付记录id',
-  `business_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联业务id',
-  `refund_request_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '异步方式关联退款请求号',
-  `user_id` bigint(20) NOT NULL COMMENT '用户id',
-  `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题',
-  `amount` decimal(19, 2) NOT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '剩余可退款金额',
-  `refundable_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '可退款信息',
-  `refund_status` int(2) NULL DEFAULT NULL COMMENT '退款状态',
-  `refund_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ip',
-  `error_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误码',
-  `error_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '退款记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_refund_record
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_voucher
--- ----------------------------
-DROP TABLE IF EXISTS `pay_voucher`;
-CREATE TABLE `pay_voucher`  (
-  `id` bigint(20) NOT NULL,
-  `card_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '卡号',
-  `batch_no` bigint(20) NULL DEFAULT NULL COMMENT '批次号',
-  `face_value` decimal(15, 2) NULL DEFAULT NULL COMMENT '面值',
-  `balance` decimal(15, 2) NULL DEFAULT NULL COMMENT '余额',
-  `enduring` bit(1) NOT NULL COMMENT '是否长期有效',
-  `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
-  `status` int(2) NOT NULL COMMENT '状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_voucher
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_voucher_log
--- ----------------------------
-DROP TABLE IF EXISTS `pay_voucher_log`;
-CREATE TABLE `pay_voucher_log`  (
-  `id` bigint(20) NOT NULL,
-  `voucher_id` bigint(20) NOT NULL,
-  `voucher_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `amount` decimal(19, 2) NULL DEFAULT NULL,
-  `type` int(5) NOT NULL COMMENT '类型',
-  `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务ID',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡日志' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_voucher_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_voucher_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_voucher_payment`;
-CREATE TABLE `pay_voucher_payment`  (
-  `id` bigint(20) NOT NULL,
-  `voucher_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '储值卡id列表',
-  `payment_id` bigint(20) NOT NULL COMMENT '支付id',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_voucher_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wallet
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet`;
-CREATE TABLE `pay_wallet`  (
-  `id` bigint(20) NOT NULL,
-  `user_id` bigint(20) NOT NULL COMMENT '关联用户id',
-  `balance` decimal(19, 2) NOT NULL COMMENT '余额',
-  `status` int(11) NOT NULL COMMENT '状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE,
-  INDEX `pk_user_id`(`user_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wallet
--- ----------------------------
-INSERT INTO `pay_wallet` VALUES (1336489524259352576, 1399985191002447872, 999982.96, 1, NULL, '2022-03-11 21:37:33', 1399985191002447872, '2022-05-03 21:24:04', 29, 0);
-INSERT INTO `pay_wallet` VALUES (1502554238582968320, 1414143554414059520, 1019.00, 1, 1399985191002447872, '2022-03-12 15:57:01', 1399985191002447872, '2022-03-13 11:21:10', 2, 0);
-INSERT INTO `pay_wallet` VALUES (1502848353136791552, 1435894470432456704, 100.00, 1, 1399985191002447872, '2022-03-13 11:25:44', 1399985191002447872, '2022-03-24 13:22:37', 1, 0);
-
--- ----------------------------
--- Table structure for pay_wallet_log
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet_log`;
-CREATE TABLE `pay_wallet_log`  (
-  `id` bigint(20) NOT NULL,
-  `wallet_id` bigint(20) NOT NULL COMMENT '钱包id',
-  `user_id` bigint(20) NOT NULL COMMENT '用户id',
-  `type` int(11) NOT NULL COMMENT '类型',
-  `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID',
-  `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作终端ip',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务ID',
-  `operation_source` int(11) NOT NULL COMMENT '操作源',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包日志' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wallet_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wallet_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet_payment`;
-CREATE TABLE `pay_wallet_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '交易记录ID',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `wallet_id` bigint(20) NULL DEFAULT NULL COMMENT '钱包ID',
-  `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '交易金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `pay_status` int(11) NOT NULL COMMENT '支付状态',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包交易记录表' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wallet_payment
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wechat_pay_config
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wechat_pay_config`;
-CREATE TABLE `pay_wechat_pay_config`  (
-  `id` bigint(20) NOT NULL COMMENT '主键',
-  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称',
-  `app_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信应用AppId',
-  `mch_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户号',
-  `api_version` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务商应用编号',
-  `api_key_v2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 APIv2 密钥',
-  `api_key_v3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 APIv3 密钥',
-  `app_secret` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'APPID对应的接口密码，用于获取接口调用凭证access_token时使用',
-  `p12` bigint(20) NULL DEFAULT NULL COMMENT 'p12的文件id',
-  `cert_pem` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'API 证书中的 cert.pem',
-  `key_pem` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'API 证书中的 key.pem',
-  `domain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应用域名，回调中会使用此参数',
-  `notify_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器异步通知页面路径',
-  `return_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '页面跳转同步通知页面路径',
-  `pay_ways` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支持的支付类型',
-  `sandbox` bit(1) NOT NULL COMMENT '是否沙箱环境',
-  `expire_time` int(10) NOT NULL COMMENT '超时配置',
-  `activity` bit(1) NOT NULL COMMENT '是否启用',
-  `state` int(11) NULL DEFAULT NULL COMMENT '状态',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信支付配置' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wechat_pay_config
--- ----------------------------
-
--- ----------------------------
--- Table structure for pay_wechat_payment
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wechat_payment`;
-CREATE TABLE `pay_wechat_payment`  (
-  `id` bigint(20) NOT NULL,
-  `payment_id` bigint(20) NOT NULL COMMENT '交易记录ID',
-  `pay_status` int(11) NOT NULL COMMENT '支付状态',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `trade_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信交易号',
-  `amount` decimal(19, 2) NOT NULL COMMENT '交易金额',
-  `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额',
-  `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id',
-  `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间',
-  `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人',
-  `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间',
-  `version` int(11) NOT NULL COMMENT '版本',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信支付记录' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of pay_wechat_payment
--- ----------------------------
 
 -- ----------------------------
 -- Table structure for qrtz_blob_triggers
@@ -5699,6 +5147,10 @@ CREATE TABLE `starter_file_upload_info`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of starter_file_upload_info
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for starter_quartz_job
 -- ----------------------------
diff --git a/pom.xml b/pom.xml
index 26a7071a..ebe873ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>cn.bootx.platform</groupId>
     <artifactId>bootx-platform-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <!-- 项目信息 -->
     <name>bootx-platform</name>
@@ -83,7 +83,7 @@
         <java.version>1.8</java.version>
 
         <!-- 二方库版本 -->
-        <bootx-platform.version>1.3.0</bootx-platform.version>
+        <bootx-platform.version>1.3.1</bootx-platform.version>
         <!-- 三方库 -->
         <hutool.version>5.8.18</hutool.version>
         <oshi.version>6.4.0</oshi.version>
@@ -112,7 +112,7 @@
         <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
         <dynamic-datasource.version>3.6.1</dynamic-datasource.version>
         <springdoc.version>1.6.15</springdoc.version>
-        <redisson.version>3.20.0</redisson.version>
+        <redisson.version>3.21.1</redisson.version>
         <knife4j.version>4.0.0</knife4j.version>
         <mapstruct.version>1.5.3.Final</mapstruct.version>
         <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
@@ -126,7 +126,7 @@
         <ding-talk.version>1.3.81</ding-talk.version>
         <lock4j.version>2.2.4</lock4j.version>
         <ip2region.version>2.7.0</ip2region.version>
-        <mybatis-table-modify.version>1.5.1.beta3</mybatis-table-modify.version>
+        <mybatis-table-modify.version>1.5.3.alpha1</mybatis-table-modify.version>
     </properties>
 
     <!-- 项目依赖版本管理 -->
@@ -294,7 +294,7 @@
             <!-- 自动建表 -->
             <dependency>
                 <groupId>cn.bootx</groupId>
-                <artifactId>mybatis-table-modify</artifactId>
+                <artifactId>mybatis-table-modify-mysql-boot-starter</artifactId>
                 <version>${mybatis-table-modify.version}</version>
             </dependency>
             <!-- 数据翻译 -->
-- 
Gitee


From 7ebf1a6674a66a568f7f66ce29a388a9e6939da3 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Thu, 8 Jun 2023 09:24:12 +0800
Subject: [PATCH 16/18] =?UTF-8?q?feat=20=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ebe873ff..825db3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
         <ding-talk.version>1.3.81</ding-talk.version>
         <lock4j.version>2.2.4</lock4j.version>
         <ip2region.version>2.7.0</ip2region.version>
-        <mybatis-table-modify.version>1.5.3.alpha1</mybatis-table-modify.version>
+        <mybatis-table-modify.version>1.5.3.alpha2</mybatis-table-modify.version>
     </properties>
 
     <!-- 项目依赖版本管理 -->
-- 
Gitee


From 0cb72e2d06a87bffffe411e6f740ba0c7bd127d5 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Thu, 8 Jun 2023 11:12:40 +0800
Subject: [PATCH 17/18] =?UTF-8?q?fix=20=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=9C=BA=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?,=20=E4=B8=8Eflyway=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dynamicsource/DynamicDataSourceLoadHandler.java    | 10 ++++++----
 bootx-start/src/main/resources/application.yml         |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java
index 6d9cf7f5..f2b5897d 100644
--- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java
+++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java
@@ -3,10 +3,9 @@ package cn.bootx.platform.baseapi.handler.dynamicsource;
 import cn.bootx.platform.baseapi.core.dynamicsource.service.DynamicDataSourceService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 /**
  * 初始化数据源函数
  * @author xxm
@@ -18,8 +17,11 @@ import javax.annotation.PostConstruct;
 public class DynamicDataSourceLoadHandler {
     private final DynamicDataSourceService dynamicDataSourceService;
 
-    @PostConstruct
-    public void initLoad(){
+    /**
+     * 启动时初始化加载多数据源
+     */
+    @Bean
+    public void dynamicDataSourceService$initLoad(){
         dynamicDataSourceService.initLoad();
     }
 
diff --git a/bootx-start/src/main/resources/application.yml b/bootx-start/src/main/resources/application.yml
index 74216278..07257667 100644
--- a/bootx-start/src/main/resources/application.yml
+++ b/bootx-start/src/main/resources/application.yml
@@ -15,6 +15,8 @@ spring:
   flyway:
     # 默认不启用
     enabled: false
+    # 如果 flyway_schema_history 不存在自动创建
+    baseline-on-migrate: false
     # 对特殊占位符不进行替换
     placeholder-replacement: false
 # mp配置
@@ -34,4 +36,4 @@ sa-token:
 flowable:
   activityFontName: "宋体"
   annotation-font-name: "宋体"
-  label-font-name: "宋体"
\ No newline at end of file
+  label-font-name: "宋体"
-- 
Gitee


From c913c919a809a1d2574c4663d050b153eab04efb Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Thu, 15 Jun 2023 14:23:06 +0800
Subject: [PATCH 18/18] =?UTF-8?q?build=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/starter/file/service/impl/MinioUploadService.java | 3 +--
 pom.xml                                                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java
index 96160c66..6d9a6109 100644
--- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java
+++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java
@@ -92,8 +92,7 @@ public class MinioUploadService implements UploadService {
         FileUploadProperties.Minio minio = fileUploadProperties.getMinio();
         String storageId = updateFileInfo.getExternalStorageId();
         return client.getObject(GetObjectArgs.builder()
-            .bucket(minio.getBucket()) // bucket
-                                       // 必须传递
+            .bucket(minio.getBucket()) // bucket 必须传递
             .object(storageId) // 相对路径作为 key
             .build());
     }
diff --git a/pom.xml b/pom.xml
index 825db3cf..c6801773 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
         <ding-talk.version>1.3.81</ding-talk.version>
         <lock4j.version>2.2.4</lock4j.version>
         <ip2region.version>2.7.0</ip2region.version>
-        <mybatis-table-modify.version>1.5.3.alpha2</mybatis-table-modify.version>
+        <mybatis-table-modify.version>1.5.3</mybatis-table-modify.version>
     </properties>
 
     <!-- 项目依赖版本管理 -->
-- 
Gitee