From 93c2b17dcbcfde99c3117adc527f949d5814ef9f Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Fri, 11 Nov 2022 02:30:52 +0000
Subject: [PATCH 01/13] update README.md.

Signed-off-by: bootx <xxm1995@outlook.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cfff8b05..3f138412 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@
 ## 🍎特色功能
 - 支持单通道支付、聚合支付、组合支付、部分和全部退款等支付功能
 - 支持支付宝、微信、云闪付、现金、钱包、储值卡等多种支付方式
-- 支持对多终端、多登录方式进行分别的管理
+- 基于Sa-Token定制，支持对多终端、多登录方式进行分别的管理
 - 针对各类敏感信息，可以通过添加注解实现返回时自动脱敏
 - 针对重要信息，可以通过添加注解，实现在数据库中保密存储，配合数据脱敏使用可以更好的保护系统数据的安全
 - 支持多种范围的数据权限控制，如只能查看自己、只能查询指定部门、用户、可以查询全部的数据等等
-- 
Gitee


From bfcd0cf011a92a224c89a689bf80eb4403663195 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 13 Nov 2022 20:47:07 +0800
Subject: [PATCH 02/13] =?UTF-8?q?style=20Vue3=E6=A8=A1=E6=9D=BF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0,=20=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/codegen/template/vue3/edit.vue.vm  |  6 +++---
 .../main/resources/codegen/template/vue3/list.vue.vm  | 11 ++++++++---
 .../flowable/core/model/dao/BpmModelManager.java      |  2 ++
 3 files changed, 13 insertions(+), 6 deletions(-)

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 737489b2..82ab2aef 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
@@ -24,7 +24,7 @@
 #if($editType == "drawer")
     <a-spin :spinning="confirmLoading">
 #end
-      <a-form
+    <a-form
       class="small-from-item"
       ref="formRef"
       :model="form"
@@ -73,7 +73,7 @@
   import { BasicDrawer } from '/@/components/Drawer'
 #end
   const {
-    initFormModel,
+    initFormEditType,
     handleCancel,
     search,
     labelCol,
@@ -100,7 +100,7 @@
   const emits = defineEmits(['ok'])
   // 入口
   function init(id, editType: FormEditType) {
-    initFormModel(id, editType)
+    initFormEditType(editType)
     resetForm()
     getInfo(id, editType)
   }
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 f705b574..287e44d9 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
@@ -20,16 +20,21 @@
         <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <span>
-              <a href="javascript:" @click="show(row)">查看</a>
+              <a-link @click="show(row)">查看</a>
             </span>
             <a-divider type="vertical" />
             <span>
-              <a href="javascript:" @click="edit(row)">编辑</a>
+              <a-link @click="edit(row)">编辑</a>
             </span>
             <a-divider type="vertical" />
+#if($deleteType == "confirm")
+            <a-link danger >删除</a>
+#end
+#if($deleteType == "popconfirm")
             <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
-              <a href="javascript:" style="color: red">删除</a>
+              <a-link danger >删除</a>
             </a-popconfirm>
+#end
           </template>
         </vxe-column>
       </vxe-table>
diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelManager.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelManager.java
index 58d2c650..731e3094 100644
--- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelManager.java
+++ b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelManager.java
@@ -6,6 +6,7 @@ import cn.bootx.common.mybatisplus.impl.BaseManager;
 import cn.bootx.common.mybatisplus.util.MpUtil;
 import cn.bootx.starter.flowable.core.model.entity.BpmModel;
 import cn.bootx.starter.flowable.param.model.BpmModelParam;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -29,6 +30,7 @@ public class BpmModelManager extends BaseManager<BpmModelMapper, BpmModel> {
         Page<BpmModel> mpPage = MpUtil.getMpPage(pageParam, BpmModel.class);
         return this.lambdaQuery()
                 .select(this.getEntityClass(),MpUtil::excludeBigField)
+                .like(StrUtil.isNotBlank(param.getName()),BpmModel::getName,param.getName())
                 .orderByDesc(MpIdEntity::getId)
                 .page(mpPage);
     }
-- 
Gitee


From c68b16d7abe8911439db58aa908b3629a542a92f Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 14 Nov 2022 21:58:50 +0800
Subject: [PATCH 03/13] =?UTF-8?q?fix=20=E5=8E=BB=E9=99=A4=E8=AF=AF?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/bootx/starter/flowable/core/instance/entity/BpmTask.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmTask.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmTask.java
index 9f5bec00..38591ab1 100644
--- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmTask.java
+++ b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmTask.java
@@ -29,7 +29,6 @@ public class BpmTask extends MpDelEntity implements EntityBaseFunction<BpmTaskDt
     private String taskId;
 
     /** 任务节点id */
-    @TableField("任务节点")
     private String nodeId;
 
     /** 任务节点名称 */
-- 
Gitee


From feae4a44a47828f9087a04592ab2b28f7d124547 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Thu, 17 Nov 2022 16:56:20 +0800
Subject: [PATCH 04/13] =?UTF-8?q?perf=20=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/codegen/template/vue3/api.ts.vm      | 2 +-
 .../cn/bootx/notice/controller/SiteMessageController.java   | 6 +++---
 .../bootx/notice/core/site/service/SiteMessageService.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm
index ea4d5a72..225f4b7d 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm
+++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm
@@ -67,6 +67,6 @@ export function del(id) {
 export interface ${entityUpName} extends BaseEntity {
 #foreach ($column in $columns)
   // $column.comments
-  $column.name: $column.tsType
+  $column.name?: $column.tsType
 #end
 }
diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/SiteMessageController.java b/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/SiteMessageController.java
index 1fef8d69..fbf6c7ac 100644
--- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/SiteMessageController.java
+++ b/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/SiteMessageController.java
@@ -26,9 +26,9 @@ public class SiteMessageController {
     private final SiteMessageService siteMessageService;
 
     @Operation(summary = "保存站内信草稿")
-    @PostMapping("/save")
-    public ResResult<Void> save(@RequestBody SendSiteMessageParam param){
-        siteMessageService.save(param);
+    @PostMapping("/saveOrUpdate")
+    public ResResult<Void> saveOrUpdate(@RequestBody SendSiteMessageParam param){
+        siteMessageService.saveOrUpdate(param);
         return Res.ok();
     }
     @Operation(summary = "发送站内信")
diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/service/SiteMessageService.java b/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/service/SiteMessageService.java
index caa9605b..743b468f 100644
--- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/service/SiteMessageService.java
+++ b/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/service/SiteMessageService.java
@@ -50,10 +50,10 @@ public class SiteMessageService {
     private final UserWsNoticeService userWsNoticeService;
 
     /**
-     * 保存草稿
+     * 保存或更新草稿
      */
     @Transactional(rollbackFor = Exception.class)
-    public void save(SendSiteMessageParam param){
+    public void saveOrUpdate(SendSiteMessageParam param){
         SiteMessage siteMessage;
         if (Objects.nonNull(param.getId())){
             siteMessage = siteMessageManager.findById(param.getId()).orElseThrow(() -> new DataNotExistException("站内信信息不存在"));
-- 
Gitee


From ccee8cc926686f8eb15d90bde418d14b4e02ab20 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 19 Nov 2022 19:56:07 +0800
Subject: [PATCH 05/13] =?UTF-8?q?perf=20=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java     | 2 +-
 .../java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java   | 2 +-
 .../main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java | 2 +-
 .../main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java  | 2 +-
 .../java/cn/bootx/notice/core/site/dao/SiteMessageManager.java  | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java
index 4a8eadd4..ef187611 100644
--- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java
+++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java
@@ -15,7 +15,7 @@ import java.io.Serializable;
 @Getter
 @Setter
 @FieldNameConstants(innerTypeName = "Base")
-public class MpBaseEntity extends MpDelEntity implements Serializable {
+public abstract class MpBaseEntity extends MpDelEntity implements Serializable {
     private static final long serialVersionUID = -2699324766101179583L;
 
 
diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java
index 862d2604..c8a63df3 100644
--- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java
+++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java
@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @FieldNameConstants(innerTypeName="Create")
-public class MpCreateEntity extends MpIdEntity{
+public abstract class MpCreateEntity extends MpIdEntity{
 
     /** 创建者ID */
     @TableField(fill = FieldFill.INSERT)
diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java
index a388f59e..61243e0b 100644
--- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java
+++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java
@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @FieldNameConstants(innerTypeName="Del")
-public class MpDelEntity extends MpCreateEntity{
+public abstract class MpDelEntity extends MpCreateEntity{
 
     /** 最后修者ID */
     @TableField(fill = FieldFill.INSERT_UPDATE)
diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java
index 956560ec..cfe91e40 100644
--- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java
+++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java
@@ -16,7 +16,7 @@ import java.io.Serializable;
 @Getter
 @Setter
 @FieldNameConstants(innerTypeName = "Id")
-public class MpIdEntity implements Serializable {
+public abstract class MpIdEntity implements Serializable {
 
     private static final long serialVersionUID = 3982181843202226124L;
 
diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageManager.java
index 87b11618..acfd53ab 100644
--- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageManager.java
+++ b/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageManager.java
@@ -87,6 +87,7 @@ public class SiteMessageManager extends BaseManager<SiteMessageMapper, SiteMessa
                 .like(StrUtil.isNotBlank(query.getTitle()),SiteMessage::getSenderId,query.getTitle())
                 .eq(StrUtil.isNotBlank(query.getSendState()),SiteMessage::getSendState,query.getSendState())
                 .eq(StrUtil.isNotBlank(query.getReceiveType()),SiteMessage::getReceiveType,query.getReceiveType())
+                .orderByDesc(SiteMessage::getId)
                 .page(mpPage);
     }
 }
-- 
Gitee


From 84d391cba8c7a8ad86efa999bdc7052dd4a2841a Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 22 Nov 2022 21:52:23 +0800
Subject: [PATCH 06/13] =?UTF-8?q?style=20vue3=E6=A8=A1=E6=9D=BF=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/template/vue3/edit.vue.vm         | 36 +++++++++----------
 .../codegen/template/vue3/list.vue.vm         |  8 ++---
 .../notice/UserNoticeWebSocketHandler.java    |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

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 82ab2aef..c3b6fae6 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
@@ -24,24 +24,24 @@
 #if($editType == "drawer")
     <a-spin :spinning="confirmLoading">
 #end
-    <a-form
-      class="small-from-item"
-      ref="formRef"
-      :model="form"
-      :rules="rules"
-      :validate-trigger="['blur', 'change']"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
-      <a-form-item label="主键" :hidden="true">
-        <a-input v-model:value="form.id" :disabled="showable" />
-      </a-form-item>
-    #foreach ($column in $columns)
-      <a-form-item label="$column.comments" name="$column.name">
-        <a-input v-model:value="form.$column.name" :disabled="showable" placeholder="请输入$column.comments" />
-      </a-form-item>
-    #end
-    </a-form>
+      <a-form
+        class="small-from-item"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :validate-trigger="['blur', 'change']"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+      #foreach ($column in $columns)
+        <a-form-item label="$column.comments" name="$column.name">
+          <a-input v-model:value="form.$column.name" :disabled="showable" placeholder="请输入$column.comments" />
+        </a-form-item>
+      #end
+      </a-form>
 #if($editType == "drawer")
     </a-spin>
 #end
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 287e44d9..bcd1bbe9 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
@@ -20,19 +20,19 @@
         <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <span>
-              <a-link @click="show(row)">查看</a>
+              <a-link @click="show(row)">查看</a-link>
             </span>
             <a-divider type="vertical" />
             <span>
-              <a-link @click="edit(row)">编辑</a>
+              <a-link @click="edit(row)">编辑</a-link>
             </span>
             <a-divider type="vertical" />
 #if($deleteType == "confirm")
-            <a-link danger >删除</a>
+            <a-link danger >删除</a-link>
 #end
 #if($deleteType == "popconfirm")
             <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
-              <a-link danger >删除</a>
+              <a-link danger >删除</a-link>
             </a-popconfirm>
 #end
           </template>
diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketHandler.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketHandler.java
index ba7dc3c6..adc2ef3f 100644
--- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketHandler.java
+++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketHandler.java
@@ -57,7 +57,7 @@ public class UserNoticeWebSocketHandler extends TextWebSocketHandler {
     @Override
     public void handleTextMessage(WebSocketSession session, TextMessage message){
         // 不处理接收的消息, 通常只会接收到心跳请求
-        log.debug("心跳请求");
+//        log.debug("心跳请求");
     }
 
 
-- 
Gitee


From a934a80cbbb6b5904825a74be45680afa7e7e1c1 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Wed, 23 Nov 2022 21:26:28 +0800
Subject: [PATCH 07/13] =?UTF-8?q?style=20vue3=E6=A8=A1=E6=9D=BF=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/codegen/template/vue3/list.vue.vm      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 bcd1bbe9..4796d4fa 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,7 @@
             </span>
             <a-divider type="vertical" />
 #if($deleteType == "confirm")
-            <a-link danger >删除</a-link>
+            <a-link danger @click="remove(row)" >删除</a-link>
 #end
 #if($deleteType == "popconfirm")
             <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
@@ -125,8 +125,8 @@
         createMessage.success('删除成功')
         queryPage()
       })
-    }
     #end
+    }
 </script>
 
 <style lang="less" scoped></style>
-- 
Gitee


From 10887bcbb6c07d329e3363ea04b8f939f1f61a30 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 27 Nov 2022 19:12:08 +0800
Subject: [PATCH 08/13] build up spring boot

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

diff --git a/pom.xml b/pom.xml
index b224d42c..e7c62924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.5</version>
+        <version>2.7.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
-- 
Gitee


From 910b2354ecb13a4fe48eb8bc8fc3907febf9d589 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 28 Nov 2022 23:12:48 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix=20ts=E6=98=A0=E5=B0=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java | 2 +-
 .../src/main/resources/codegen/template/vue3/edit.vue.vm      | 2 +-
 .../src/main/resources/codegen/template/vue3/list.vue.vm      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java
index befa87b4..81c4af85 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java
@@ -34,7 +34,7 @@ public enum CodeGenColumnTypeEnum {
     LONGTEXT("longtext","String","string"),
     DATE("date","LocalDate","string"),
     DATETIME("datetime","LocalDateTime","string"),
-    TIME("time","LocalTime",""),
+    TIME("time","LocalTime","string"),
     TIMESTAMP("timestamp","LocalDateTime","string");
 
     private final String columnType;
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 c3b6fae6..ce6ffba6 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
@@ -118,7 +118,7 @@
   }
   // 保存
   function handleOk() {
-    formRef.validate().then(async () => {
+    formRef?.validate().then(async () => {
       confirmLoading.value = true
       if (formEditType.value === FormEditType.Add) {
         await add(form)
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 4796d4fa..310a0353 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
@@ -52,7 +52,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { onMounted, ref } from 'vue'
+  import { onMounted } from 'vue'
   import { $ref } from 'vue/macros'
   import { del, page } from './${entityUpName}.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
@@ -79,7 +79,7 @@
     queryPage()
   })
   function vxeBind() {
-    xTable.connect(xToolbar)
+    xTable?.connect(xToolbar as VxeToolbarInstance)
   }
 
   // 分页查询
-- 
Gitee


From 4a6402ce97ae04d81f0530a930464449ac618334 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 29 Nov 2022 23:09:08 +0800
Subject: [PATCH 10/13] =?UTF-8?q?doc=20swagger=E4=BB=A3=E7=A0=81=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/codegen/template/vue3/edit.vue.vm      | 4 ++--
 .../cn/bootx/common/swagger/SwaggerAutoConfiguration.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 ce6ffba6..bbd1f2bc 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
@@ -88,12 +88,12 @@
   } = useFormEdit()
   // 表单
   const formRef = $ref<FormInstance>()
-  let form = $ref({
+  let form = $ref<${entityUpName}>({
     id: null,
 #foreach ($column in $columns)
     $column.name: null,
 #end
-  } as ${entityUpName})
+  })
   // 校验
   const rules = reactive({} as Record<string, Rule[]>)
   // 事件
diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerAutoConfiguration.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerAutoConfiguration.java
index 0068c2e4..41c1e1cb 100644
--- a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerAutoConfiguration.java
+++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerAutoConfiguration.java
@@ -82,7 +82,7 @@ public class SwaggerAutoConfiguration implements BeanDefinitionRegistryPostProce
     }
 
     /**
-     * 手动注册swagger docket bean
+     * 手动注册swagger docket bean, 如果晚于swagger加载后, 再注入的bean将不会生效
      */
     @Override
     public void postProcessBeanDefinitionRegistry(@NotNull BeanDefinitionRegistry registry) throws BeansException {
@@ -103,7 +103,7 @@ public class SwaggerAutoConfiguration implements BeanDefinitionRegistryPostProce
     }
 
     /**
-     * 获取环境变量并设置到swaggerProperties对象中
+     * 获取环境变量并设置到swaggerProperties对象中, bean注册时, 参数还未进行绑定
      */
     @Override
     public void setEnvironment(@NotNull Environment environment) {
-- 
Gitee


From 2e4a8da37e6eb656a7bf6c917aaad53925f683a0 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Wed, 30 Nov 2022 20:40:44 +0800
Subject: [PATCH 11/13] =?UTF-8?q?ref=20=E4=BE=9D=E8=B5=96=E5=B0=8F?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7,=20redisson=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=9C=BA=E5=88=B6=E4=BF=AE=E6=94=B9,=20=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=A1=B9=E7=9B=AE=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=90=AF=E5=8A=A8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/template/vue3/list.vue.vm         |    2 +-
 bootx-commons/common-lock/pom.xml             |    5 -
 .../configurer/LockAutoConfiguration.java     |   45 -
 bootx-commons/common-redis-client/pom.xml     |    6 +
 .../redisson/RedissonClientTemporary.java     | 1226 +++++++++++++++++
 .../redis/redisson/RedissonConfiguration.java |   68 +
 .../redis/redisson/RedissonLoadListener.java  |   78 ++
 pom.xml                                       |   16 +-
 8 files changed, 1387 insertions(+), 59 deletions(-)
 create mode 100644 bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonClientTemporary.java
 create mode 100644 bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonConfiguration.java
 create mode 100644 bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonLoadListener.java

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 310a0353..3fd65e0b 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
@@ -32,7 +32,7 @@
 #end
 #if($deleteType == "popconfirm")
             <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
-              <a-link danger >删除</a-link>
+              <a-link danger>删除</a-link>
             </a-popconfirm>
 #end
           </template>
diff --git a/bootx-commons/common-lock/pom.xml b/bootx-commons/common-lock/pom.xml
index fe2eca1b..edb85da8 100644
--- a/bootx-commons/common-lock/pom.xml
+++ b/bootx-commons/common-lock/pom.xml
@@ -12,11 +12,6 @@
     <artifactId>common-lock</artifactId>
 
     <dependencies>
-        <!-- redisson 分布式锁依赖 -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-        </dependency>
         <!-- redis -->
         <dependency>
             <groupId>cn.bootx.platform</groupId>
diff --git a/bootx-commons/common-lock/src/main/java/cn/bootx/common/lock/configurer/LockAutoConfiguration.java b/bootx-commons/common-lock/src/main/java/cn/bootx/common/lock/configurer/LockAutoConfiguration.java
index 881f66ec..8af23cba 100644
--- a/bootx-commons/common-lock/src/main/java/cn/bootx/common/lock/configurer/LockAutoConfiguration.java
+++ b/bootx-commons/common-lock/src/main/java/cn/bootx/common/lock/configurer/LockAutoConfiguration.java
@@ -1,18 +1,9 @@
 package cn.bootx.common.lock.configurer;
 
 import cn.bootx.common.lock.handler.LockAspectHandler;
-import cn.hutool.core.collection.CollUtil;
 import lombok.RequiredArgsConstructor;
-import org.redisson.Redisson;
-import org.redisson.api.RedissonClient;
-import org.redisson.config.ClusterServersConfig;
-import org.redisson.config.Config;
-import org.redisson.config.SingleServerConfig;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
@@ -26,41 +17,5 @@ import org.springframework.context.annotation.Import;
 @Import({LockAspectHandler.class})
 @RequiredArgsConstructor
 public class LockAutoConfiguration {
-    private final RedisProperties redisProperties;
-    private final String REDIS_PREFIX = "redis://";
 
-    @Bean
-    @ConditionalOnMissingBean
-    public RedissonClient redisson() {
-        // 单机/集群
-        Config config = new Config();
-        RedisProperties.Cluster cluster = redisProperties.getCluster();
-        if (cluster == null || CollUtil.isEmpty(cluster.getNodes())) {
-            initSingleConfig(config.useSingleServer());
-        } else {
-            initClusterConfig(config.useClusterServers());
-        }
-
-        return Redisson.create(config);
-    }
-
-    /**
-     * 单节点模式
-     */
-    private void initSingleConfig(SingleServerConfig singleServerConfig){
-        singleServerConfig.setAddress(REDIS_PREFIX+redisProperties.getHost()+":"+redisProperties.getPort())
-                .setDatabase(redisProperties.getDatabase())
-                .setPassword(redisProperties.getPassword());
-    }
-
-    /**
-     * 集群模式
-     */
-    private void initClusterConfig(ClusterServersConfig clusterServersConfig){
-        String[] nodes = redisProperties.getCluster().getNodes().stream()
-                .map(node -> REDIS_PREFIX + node)
-                .toArray(String[]::new);
-        clusterServersConfig.setPassword(redisProperties.getPassword())
-                .addNodeAddress(nodes);
-    }
 }
diff --git a/bootx-commons/common-redis-client/pom.xml b/bootx-commons/common-redis-client/pom.xml
index de4e74be..5564bafc 100644
--- a/bootx-commons/common-redis-client/pom.xml
+++ b/bootx-commons/common-redis-client/pom.xml
@@ -13,10 +13,16 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <!-- spring data系列 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <!-- redisson 实现依赖 -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonClientTemporary.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonClientTemporary.java
new file mode 100644
index 00000000..b0a44e25
--- /dev/null
+++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonClientTemporary.java
@@ -0,0 +1,1226 @@
+package cn.bootx.common.redis.redisson;
+
+import org.redisson.api.*;
+import org.redisson.api.redisnode.BaseRedisNodes;
+import org.redisson.api.redisnode.RedisNodes;
+import org.redisson.client.codec.Codec;
+import org.redisson.codec.JsonCodec;
+import org.redisson.config.Config;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 只是在初始化时候使用一下，之后就会被替换
+ * @author xxm
+ * @date 2022/11/30
+ */
+public class RedissonClientTemporary implements RedissonClient {
+    /**
+     * @param s
+     * @param <V>
+     * @param <L>
+     * @return
+     */
+    @Override
+    public <V, L> RTimeSeries<V, L> getTimeSeries(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @param <L>
+     * @return
+     */
+    @Override
+    public <V, L> RTimeSeries<V, L> getTimeSeries(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RStream<K, V> getStream(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RStream<K, V> getStream(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RRateLimiter getRateLimiter(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RBinaryStream getBinaryStream(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RGeo<V> getGeo(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RGeo<V> getGeo(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RSetCache<V> getSetCache(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RSetCache<V> getSetCache(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMapCache<K, V> getMapCache(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param mapOptions
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMapCache<K, V> getMapCache(String s, Codec codec, MapOptions<K, V> mapOptions) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMapCache<K, V> getMapCache(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param mapOptions
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMapCache<K, V> getMapCache(String s, MapOptions<K, V> mapOptions) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBucket<V> getBucket(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBucket<V> getBucket(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RBuckets getBuckets() {
+        return null;
+    }
+
+    /**
+     * @param codec
+     * @return
+     */
+    @Override
+    public RBuckets getBuckets(Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param jsonCodec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RJsonBucket<V> getJsonBucket(String s, JsonCodec<V> jsonCodec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RHyperLogLog<V> getHyperLogLog(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RHyperLogLog<V> getHyperLogLog(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RList<V> getList(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RList<V> getList(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RListMultimap<K, V> getListMultimap(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RListMultimap<K, V> getListMultimap(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RListMultimapCache<K, V> getListMultimapCache(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RListMultimapCache<K, V> getListMultimapCache(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param localCachedMapOptions
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RLocalCachedMap<K, V> getLocalCachedMap(String s, LocalCachedMapOptions<K, V> localCachedMapOptions) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param localCachedMapOptions
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RLocalCachedMap<K, V> getLocalCachedMap(String s, Codec codec, LocalCachedMapOptions<K, V> localCachedMapOptions) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMap<K, V> getMap(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param mapOptions
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMap<K, V> getMap(String s, MapOptions<K, V> mapOptions) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMap<K, V> getMap(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param mapOptions
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RMap<K, V> getMap(String s, Codec codec, MapOptions<K, V> mapOptions) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RSetMultimap<K, V> getSetMultimap(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RSetMultimap<K, V> getSetMultimap(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RSetMultimapCache<K, V> getSetMultimapCache(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <K, V> RSetMultimapCache<K, V> getSetMultimapCache(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RSemaphore getSemaphore(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RPermitExpirableSemaphore getPermitExpirableSemaphore(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RLock getLock(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RLock getSpinLock(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param backOff
+     * @return
+     */
+    @Override
+    public RLock getSpinLock(String s, LockOptions.BackOff backOff) {
+        return null;
+    }
+
+    /**
+     * @param rLocks
+     * @return
+     */
+    @Override
+    public RLock getMultiLock(RLock... rLocks) {
+        return null;
+    }
+
+    /**
+     * @param rLocks
+     * @deprecated
+     */
+    @Override
+    public RLock getRedLock(RLock... rLocks) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RLock getFairLock(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RReadWriteLock getReadWriteLock(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RSet<V> getSet(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RSet<V> getSet(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RSortedSet<V> getSortedSet(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RSortedSet<V> getSortedSet(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RScoredSortedSet<V> getScoredSortedSet(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RScoredSortedSet<V> getScoredSortedSet(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RLexSortedSet getLexSortedSet(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RShardedTopic getShardedTopic(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @return
+     */
+    @Override
+    public RShardedTopic getShardedTopic(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RTopic getTopic(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @return
+     */
+    @Override
+    public RTopic getTopic(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RReliableTopic getReliableTopic(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @return
+     */
+    @Override
+    public RReliableTopic getReliableTopic(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RPatternTopic getPatternTopic(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @return
+     */
+    @Override
+    public RPatternTopic getPatternTopic(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RQueue<V> getQueue(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RTransferQueue<V> getTransferQueue(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RTransferQueue<V> getTransferQueue(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param rQueue
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RDelayedQueue<V> getDelayedQueue(RQueue<V> rQueue) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RQueue<V> getQueue(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RRingBuffer<V> getRingBuffer(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RRingBuffer<V> getRingBuffer(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityQueue<V> getPriorityQueue(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityQueue<V> getPriorityQueue(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityBlockingQueue<V> getPriorityBlockingQueue(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityBlockingQueue<V> getPriorityBlockingQueue(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityBlockingDeque<V> getPriorityBlockingDeque(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityBlockingDeque<V> getPriorityBlockingDeque(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityDeque<V> getPriorityDeque(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RPriorityDeque<V> getPriorityDeque(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBlockingQueue<V> getBlockingQueue(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBlockingQueue<V> getBlockingQueue(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBoundedBlockingQueue<V> getBoundedBlockingQueue(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBoundedBlockingQueue<V> getBoundedBlockingQueue(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RDeque<V> getDeque(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RDeque<V> getDeque(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBlockingDeque<V> getBlockingDeque(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBlockingDeque<V> getBlockingDeque(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RAtomicLong getAtomicLong(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RAtomicDouble getAtomicDouble(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RLongAdder getLongAdder(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RDoubleAdder getDoubleAdder(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RCountDownLatch getCountDownLatch(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RBitSet getBitSet(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBloomFilter<V> getBloomFilter(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param <V>
+     * @return
+     */
+    @Override
+    public <V> RBloomFilter<V> getBloomFilter(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RIdGenerator getIdGenerator(String s) {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RFunction getFunction() {
+        return null;
+    }
+
+    /**
+     * @param codec
+     * @return
+     */
+    @Override
+    public RFunction getFunction(Codec codec) {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RScript getScript() {
+        return null;
+    }
+
+    /**
+     * @param codec
+     * @return
+     */
+    @Override
+    public RScript getScript(Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RScheduledExecutorService getExecutorService(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param executorOptions
+     * @return
+     */
+    @Override
+    public RScheduledExecutorService getExecutorService(String s, ExecutorOptions executorOptions) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @return
+     */
+    @Override
+    public RScheduledExecutorService getExecutorService(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @param executorOptions
+     * @return
+     */
+    @Override
+    public RScheduledExecutorService getExecutorService(String s, Codec codec, ExecutorOptions executorOptions) {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RRemoteService getRemoteService() {
+        return null;
+    }
+
+    /**
+     * @param codec
+     * @return
+     */
+    @Override
+    public RRemoteService getRemoteService(Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @return
+     */
+    @Override
+    public RRemoteService getRemoteService(String s) {
+        return null;
+    }
+
+    /**
+     * @param s
+     * @param codec
+     * @return
+     */
+    @Override
+    public RRemoteService getRemoteService(String s, Codec codec) {
+        return null;
+    }
+
+    /**
+     * @param transactionOptions
+     * @return
+     */
+    @Override
+    public RTransaction createTransaction(TransactionOptions transactionOptions) {
+        return null;
+    }
+
+    /**
+     * @param batchOptions
+     * @return
+     */
+    @Override
+    public RBatch createBatch(BatchOptions batchOptions) {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RBatch createBatch() {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RKeys getKeys() {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RLiveObjectService getLiveObjectService() {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RedissonRxClient rxJava() {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public RedissonReactiveClient reactive() {
+        return null;
+    }
+
+    /**
+     *
+     */
+    @Override
+    public void shutdown() {
+
+    }
+
+    /**
+     * @param l
+     * @param l1
+     * @param timeUnit
+     */
+    @Override
+    public void shutdown(long l, long l1, TimeUnit timeUnit) {
+
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public Config getConfig() {
+        return null;
+    }
+
+    /**
+     * @param redisNodes
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T extends BaseRedisNodes> T getRedisNodes(RedisNodes<T> redisNodes) {
+        return null;
+    }
+
+    /**
+     * @deprecated
+     */
+    @Override
+    public NodesGroup<Node> getNodesGroup() {
+        return null;
+    }
+
+    /**
+     * @deprecated
+     */
+    @Override
+    public ClusterNodesGroup getClusterNodesGroup() {
+        return null;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public boolean isShutdown() {
+        return false;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public boolean isShuttingDown() {
+        return false;
+    }
+
+    /**
+     * @return
+     */
+    @Override
+    public String getId() {
+        return null;
+    }
+}
diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonConfiguration.java
new file mode 100644
index 00000000..3617a80c
--- /dev/null
+++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonConfiguration.java
@@ -0,0 +1,68 @@
+package cn.bootx.common.redis.redisson;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.AllArgsConstructor;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.ClusterServersConfig;
+import org.redisson.config.Config;
+import org.redisson.config.SingleServerConfig;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@AutoConfigureAfter(RedisAutoConfiguration.class)
+@AllArgsConstructor
+public class RedissonConfiguration {
+    private final RedisProperties redisProperties;
+    private final String REDIS_PREFIX = "redis://";
+
+    /**
+     * 配置一个临时的对象到spring容器中，不使用
+     * @return 一个RedissonClient的实现
+     */
+    @Bean
+    public RedissonClient redissonClient() {
+        return new RedissonClientTemporary();
+
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public RedissonClient redisson() {
+        // 单机/集群
+        Config config = new Config();
+        RedisProperties.Cluster cluster = redisProperties.getCluster();
+        if (cluster == null || CollUtil.isEmpty(cluster.getNodes())) {
+            initSingleConfig(config.useSingleServer());
+        } else {
+            initClusterConfig(config.useClusterServers());
+        }
+
+        return Redisson.create(config);
+    }
+
+    /**
+     * 单节点模式
+     */
+    private void initSingleConfig(SingleServerConfig singleServerConfig){
+        singleServerConfig.setAddress(REDIS_PREFIX+redisProperties.getHost()+":"+redisProperties.getPort())
+                .setDatabase(redisProperties.getDatabase())
+                .setPassword(redisProperties.getPassword());
+    }
+
+    /**
+     * 集群模式
+     */
+    private void initClusterConfig(ClusterServersConfig clusterServersConfig){
+        String[] nodes = redisProperties.getCluster().getNodes().stream()
+                .map(node -> REDIS_PREFIX + node)
+                .toArray(String[]::new);
+        clusterServersConfig.setPassword(redisProperties.getPassword())
+                .addNodeAddress(nodes);
+    }
+}
diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonLoadListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonLoadListener.java
new file mode 100644
index 00000000..b3f79ad2
--- /dev/null
+++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonLoadListener.java
@@ -0,0 +1,78 @@
+package cn.bootx.common.redis.redisson;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.ClusterServersConfig;
+import org.redisson.config.Config;
+import org.redisson.config.SingleServerConfig;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.stereotype.Component;
+
+/**   
+ * 项目启动时Redisson替换RedissonClient的实现, Redisson连接失败是会导致项目无法启动, 选择改为项目启动成功后, 替换掉原有的Bean
+ * @author xxm  
+ * @date 2022/11/30 
+ */
+@Component
+@RequiredArgsConstructor
+public class RedissonLoadListener implements ApplicationListener<ApplicationReadyEvent> {
+    private final ConfigurableApplicationContext configurableApplicationContext;
+
+    private final RedisProperties redisProperties;
+    private final String REDIS_PREFIX = "redis://";
+
+    @Override
+    public void onApplicationEvent(ApplicationReadyEvent event) {
+        // 单机/集群
+        Config config = new Config();
+        RedisProperties.Cluster cluster = redisProperties.getCluster();
+        if (cluster == null || CollUtil.isEmpty(cluster.getNodes())) {
+            initSingleConfig(config.useSingleServer());
+        } else {
+            initClusterConfig(config.useClusterServers());
+        }
+
+        BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder.rootBeanDefinition(Redisson.class);
+        beanDefinitionBuilder.addConstructorArgValue(config);
+
+        String redissonClientName = StrUtil.lowerFirst(RedissonClient.class.getSimpleName());
+
+        //创建一个Redisson对象, 替换掉原有的对象
+        BeanDefinitionRegistry beanDefinitionRegistry = (BeanDefinitionRegistry) configurableApplicationContext;
+        beanDefinitionRegistry.removeBeanDefinition(redissonClientName);
+        beanDefinitionRegistry.registerBeanDefinition(redissonClientName, beanDefinitionBuilder.getBeanDefinition());
+
+        //这里相当于初始化加载使用
+        configurableApplicationContext.getBean(redissonClientName);
+
+    }
+
+
+    /**
+     * 单节点模式
+     */
+    private void initSingleConfig(SingleServerConfig singleServerConfig){
+        singleServerConfig.setAddress(REDIS_PREFIX+redisProperties.getHost()+":"+redisProperties.getPort())
+                .setDatabase(redisProperties.getDatabase())
+                .setPassword(redisProperties.getPassword());
+    }
+
+    /**
+     * 集群模式
+     */
+    private void initClusterConfig(ClusterServersConfig clusterServersConfig){
+        String[] nodes = redisProperties.getCluster().getNodes().stream()
+                .map(node -> REDIS_PREFIX + node)
+                .toArray(String[]::new);
+        clusterServersConfig.setPassword(redisProperties.getPassword())
+                .addNodeAddress(nodes);
+    }
+}
diff --git a/pom.xml b/pom.xml
index e7c62924..88fcff4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
         <!-- 二方库版本 -->
         <bootx-platform.version>1.1.7</bootx-platform.version>
         <!-- 三方库 -->
-        <hutool.version>5.8.6</hutool.version>
-        <oshi.version>6.2.2</oshi.version>
+        <hutool.version>5.8.10</hutool.version>
+        <oshi.version>6.3.2</oshi.version>
         <jackson.version>2.12.3</jackson.version>
         <lang3.version>3.11</lang3.version>
         <collections4.version>4.4</collections4.version>
@@ -45,7 +45,7 @@
         <guava.version>31.1-jre</guava.version>
         <servlet-api.version>4.0.1</servlet-api.version>
         <slf4j.version>1.7.30</slf4j.version>
-        <ttl.version>2.14.0</ttl.version>
+        <ttl.version>2.14.2</ttl.version>
         <flyway.version>7.15.0</flyway.version>
         <xml-apis.version>1.4.01</xml-apis.version>
         <flowable.version>6.7.2</flowable.version>
@@ -53,18 +53,18 @@
         <logback-classic.version>1.2.11</logback-classic.version>
         <plumelog.version>3.5.3</plumelog.version>
         <xxl-job.version>2.3.1</xxl-job.version>
-        <IJPay.version>2.9.3</IJPay.version>
-        <sa-token.version>1.31.0</sa-token.version>
+        <IJPay.version>2.9.4</IJPay.version>
+        <sa-token.version>1.33.0</sa-token.version>
         <justauth.version>1.16.5</justauth.version>
         <justauth..spring.boot.version>1.4.0</justauth..spring.boot.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <dynamic-datasource.version>3.5.2</dynamic-datasource.version>
-        <springdoc.version>1.6.11</springdoc.version>
-        <redisson.version>3.17.6</redisson.version>
+        <springdoc.version>1.6.13</springdoc.version>
+        <redisson.version>3.18.0</redisson.version>
         <mapstruct.version>1.5.3.Final</mapstruct.version>
         <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
         <velocity.version>2.3</velocity.version>
-        <wxjava.version>4.4.1.B</wxjava.version>
+        <wxjava.version>4.4.5.B</wxjava.version>
         <ding-talk.version>1.3.81</ding-talk.version>
     </properties>
 
-- 
Gitee


From fc7ffd21be39d43536466d1eec6ab8d40f49620a Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 5 Dec 2022 21:44:10 +0800
Subject: [PATCH 12/13] =?UTF-8?q?style=20=E9=92=B1=E5=8C=85=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paymodel/voucher/service/VoucherQueryService.java  | 10 +++++-----
 .../core/paymodel/wallet/dao/WalletLogManager.java     |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherQueryService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherQueryService.java
index 3e34e5b7..12ce13c2 100644
--- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherQueryService.java
+++ b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherQueryService.java
@@ -12,10 +12,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-/**   
+/**
 * 储值卡查询
-* @author xxm  
-* @date 2022/3/14 
+* @author xxm
+* @date 2022/3/14
 */
 @Slf4j
 @Service
@@ -34,13 +34,13 @@ public class VoucherQueryService {
      * 根据id查询
      */
     public VoucherDto findById(Long id) {
-        return voucherManager.findById(id).map(Voucher::toDto).orElseThrow(DataNotExistException::new);
+        return voucherManager.findById(id).map(Voucher::toDto).orElseThrow(() -> new DataNotExistException("储值卡不存在"));
     }
 
     /**
      * 根据卡号查询
      */
     public VoucherDto findByCardNo(String cardNo){
-        return voucherManager.findByCardNo(cardNo).map(Voucher::toDto).orElseThrow(DataNotExistException::new);
+        return voucherManager.findByCardNo(cardNo).map(Voucher::toDto).orElseThrow(() -> new DataNotExistException("储值卡不存在"));
     }
 }
diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogManager.java
index f67db931..ab7db67c 100644
--- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogManager.java
+++ b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogManager.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -46,10 +47,12 @@ public class WalletLogManager extends BaseManager<WalletLogMapper,WalletLog> {
     /**
      * 分页查询
      */
-    public Page<WalletLog> page(PageParam pageParam, WalletLogQueryParam param) {
+    public Page<WalletLog> page(PageParam pageParam, WalletLogQueryParam query) {
         Page<WalletLog> mpPage = MpUtil.getMpPage(pageParam, WalletLog.class);
         return this.lambdaQuery()
                 .orderByDesc(MpIdEntity::getId)
+                .like(Objects.nonNull(query.getUserId()),WalletLog::getUserId,query.getUserId())
+                .like(Objects.nonNull(query.getWalletId()),WalletLog::getWalletId,query.getWalletId())
                 .page(mpPage);
     }
     /**
-- 
Gitee


From e867ceb33760361aec832d8610236c51dcfda90d Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 6 Dec 2022 16:42:42 +0800
Subject: [PATCH 13/13] =?UTF-8?q?build=201.1.8=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 21 ++---
 _config/sql/1.1.7/1.1.7_up_1.1.8.sql          | 89 +++++++++++++++++++
 _config/sql/bootx-platform.sql                | 58 ++++++++----
 _doc/ChangeLog.md                             | 40 +++++++++
 bootx-common-core/pom.xml                     |  2 +-
 .../common-starter-audit-log/pom.xml          |  2 +-
 .../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-flowable/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 +-
 .../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-lock/pom.xml             |  2 +-
 bootx-commons/common-log/pom.xml              |  2 +-
 bootx-commons/common-mongo/pom.xml            |  2 +-
 bootx-commons/common-mqtt/pom.xml             |  2 +-
 bootx-commons/common-mybatis-plus/pom.xml     |  2 +-
 bootx-commons/common-rabbitmq/pom.xml         |  2 +-
 bootx-commons/common-redis-client/pom.xml     |  2 +-
 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                            |  2 +-
 bootx-modules/module-eshop/pom.xml            |  2 +-
 bootx-modules/pom.xml                         |  2 +-
 bootx-services/pom.xml                        |  2 +-
 bootx-services/service-baseapi/pom.xml        |  2 +-
 bootx-services/service-goods/pom.xml          |  2 +-
 bootx-services/service-iam/pom.xml            |  2 +-
 bootx-services/service-notice/pom.xml         |  2 +-
 bootx-services/service-office/pom.xml         |  2 +-
 bootx-services/service-order/pom.xml          |  2 +-
 bootx-services/service-payment/pom.xml        |  2 +-
 bootx-services/service-sales/pom.xml          |  2 +-
 bootx-start/pom.xml                           |  2 +-
 ...release.sql => V1.1.8_221206__release.sql} | 58 ++++++++----
 pom.xml                                       |  4 +-
 51 files changed, 271 insertions(+), 89 deletions(-)
 create mode 100644 _config/sql/1.1.7/1.1.7_up_1.1.8.sql
 rename bootx-start/src/main/resources/db/migration/{V1.1.6_221102__release.sql => V1.1.8_221206__release.sql} (96%)

diff --git a/README.md b/README.md
index 3f138412..f6da68a5 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 <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.1.7-success.svg" alt="Build Status"/>
+ <img src="https://img.shields.io/badge/Boot%20Platform-1.1.8-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.5-blue.svg" alt="Downloads"/>
+ <img src="https://img.shields.io/badge/Spring%20Boot-2.7.6-blue.svg" alt="Downloads"/>
  <img src="https://img.shields.io/badge/license-Apache%20License%202.0-green.svg"/>
 </p>
 
@@ -58,9 +58,11 @@
   - [x] 更灵活的节点用户配置，可配置发起人、指定用户、指定角色等，关联消息通知
   - [x] 会签处理、串签处理、或签处理、驳回处理、任意节点退回、会签比例通过处理
 - Vue3版本前端
-  - [ ] 登录模块移植
-  - [x] 认证终端移植
-  - [ ] 组件移植和Mixin转换为Hooks、
+  - [x] 登录模块移植
+  - [x] 基础功能移植已完成
+  - [x] 组件移植和Mixin转换为Hooks、
+  - [x] 支付功能移植基本完成
+  - [ ] 工作流功能移植除流程设计器外已完成
 - Spring Cloud版本
   - [ ] 代码组织结构调整
   - [x] 网关定制开发
@@ -79,10 +81,9 @@
 | 备备注注组件 | 是否必须配置 | 备注                                          |
 | ------------ | ------------ |---------------------------------------------|
 | MySQL        | 是           | 不设置无法启动                                     |
-| Redis        | 是           | 不设置无法启动                                     |
-| RabbitMQ     | 否           | 支付消息通知在使用                                   |
+| Redis        | 是           | 不设置启动后无法正常使用                                |
+| RabbitMQ     | 否           | 支付消息通知在使用                             |
 | MongoDB      | 否           | 默认审计日志和文件管理使用持久化方式为Mono，可在配置文件中配置切换成其他持久化方式 |
-| MQTT         | 否           |                                             |
 | plumelog     | 是           | 默认项目自带lite版plumelog，不需要额外配置中间件，直接就可以使用      |
 
 ## 🥞项目整体结构
@@ -124,8 +125,8 @@ bootx-platform
        ├── common-websocket  -- websocket封装
        ├── common-xxl-job -- XXL-JOB定时任务
     ├── bootx-demo -- demo示例模块
-    ├── bootx-modules -- 业务系统（暂停）
-       ├── eshop -- 网上商城（暂停）
+    ├── bootx-modules -- 业务系统（停用）
+       ├── eshop -- 网上商城（停用）
     ├── bootx-services -- 业务服务模块
        ├── service-baseapi -- 基础api功能服务
        ├── service-goods -- 商品中心服务(停用)
diff --git a/_config/sql/1.1.7/1.1.7_up_1.1.8.sql b/_config/sql/1.1.7/1.1.7_up_1.1.8.sql
new file mode 100644
index 00000000..77a607e2
--- /dev/null
+++ b/_config/sql/1.1.7/1.1.7_up_1.1.8.sql
@@ -0,0 +1,89 @@
+SET FOREIGN_KEY_CHECKS = 0;
+
+INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1414143554414059520, '2022-11-07 16:00:27', 0, 1);
+
+INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0);
+
+INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0);
+
+INSERT INTO `base_dict_item` VALUES (1589528315672383488, 1589527951317389312, 'DataScopePerm', '5', '全部数据', 0.00, '', 1414143554414059520, '2022-11-07 16:00:57', 1414143554414059520, '2022-11-07 16:00:57', 0, 0);
+
+INSERT INTO `base_dict_item` VALUES (1589528340267782144, 1589527951317389312, 'DataScopePerm', '4', '部门和用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:03', 1414143554414059520, '2022-11-07 16:01:03', 0, 0);
+
+INSERT INTO `base_dict_item` VALUES (1589528367228768256, 1589527951317389312, 'DataScopePerm', '3', '部门范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:09', 1414143554414059520, '2022-11-07 16:01:09', 0, 0);
+
+INSERT INTO `base_dict_item` VALUES (1589528393292173312, 1589527951317389312, 'DataScopePerm', '2', '用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:16', 1414143554414059520, '2022-11-07 16:01:16', 0, 0);
+
+INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, 'DataScopePerm', '1', '自身数据', 0.00, '', 1414143554414059520, '2022-11-07 16:01:23', 1414143554414059520, '2022-11-07 16:01:23', 0, 0);
+
+DELETE FROM `iam_perm_menu` WHERE `id` = 1476489893513404416;
+
+DELETE FROM `iam_perm_menu` WHERE `id` = 1478002945936015360;
+
+DELETE FROM `iam_perm_menu` WHERE `id` = 1478004271512240128;
+
+INSERT INTO `iam_perm_menu` VALUES (1591689087570378752, 'adminv3', 1582276447602692096, '流程模型', 'BpmModelList', NULL, b'0', '', b'0', b'0', '/modules/bpm/model/BpmModelList.vue', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:05', 1414143554414059520, '2022-11-13 15:07:05', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1591689307427405824, 'adminv3', 1582276447602692096, '未处理任务', 'TodoTaskList', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/TodoTaskList.vue', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:58', 1414143554414059520, '2022-11-14 22:45:57', 2, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1591689479075102720, 'adminv3', 1582276447602692096, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/DoneTaskList.vue', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:08:39', 1414143554414059520, '2022-11-13 15:14:17', 3, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1591690820224778240, 'adminv3', 1582276447602692096, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', '/modules/bpm/instance/InstanceList.vue', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:13:58', 1414143554414059520, '2022-11-13 15:13:58', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1594586131247075328, 'adminv3', 1582275875424129024, 'ELK日志x', 'ELKx', NULL, b'0', '', b'0', b'0', 'Iframe', NULL, '/monitor/elk', 'https://www.antdv.com/components/overview-cn', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-21 14:58:54', 1414143554414059520, '2022-11-21 15:21:35', 6, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1595255743081025536, 'adminv3', 1580740450633101312, '菜单管理1', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:////system/menu?onlytab=1&__full__', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-23 11:19:42', 1414143554414059520, '2022-11-23 21:02:52', 20, 1);
+
+INSERT INTO `iam_perm_menu` VALUES (1597044371008516096, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 09:47:04', 1414143554414059520, '2022-11-28 09:47:04', 0, 1);
+
+INSERT INTO `iam_perm_menu` VALUES (1597102799370317824, 'adminv3', 1582276516905177088, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 13:39:15', 1414143554414059520, '2022-11-28 13:39:15', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1597210969883275264, 'adminv3', 1582276516905177088, '超级查询', 'SuperQueryDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/query/SuperQueryDemoList.vue', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 20:49:05', 1414143554414059520, '2022-11-28 21:00:14', 1, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1598306560788877312, 'adminv3', 1584383492338425856, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/list/WalletList.vue', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:22:34', 1414143554414059520, '2022-12-01 21:22:34', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1598306760764903424, 'adminv3', 1584383492338425856, '个人钱包', 'MyWallet', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/personal/MyWallet.vue', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:23:22', 1414143554414059520, '2022-12-01 21:23:22', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599337250200440832, 'adminv3', NULL, '关于', '', NULL, b'0', 'simple-icons:about-dot-me', b'0', b'0', '', NULL, '/about/index', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 17:38:09', 1414143554414059520, '2022-12-04 17:43:32', 3, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599378494880436224, 'adminv3', 1582276516905177088, 'WS演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:03', 1414143554414059520, '2022-12-04 20:22:03', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599378579513102336, 'adminv3', 1582276516905177088, '幂等请求演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:23', 1414143554414059520, '2022-12-04 20:22:23', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599378728490586112, 'adminv3', 1582276516905177088, '消息中间件演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:59', 1414143554414059520, '2022-12-04 20:23:12', 1, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599378838519762944, 'adminv3', 1582276516905177088, '富文本编辑', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:23:25', 1414143554414059520, '2022-12-04 20:23:25', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599378992811429888, 'adminv3', 1582276516905177088, '消息通知', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:02', 1414143554414059520, '2022-12-04 20:24:37', 1, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599379197124366336, 'adminv3', 1582276516905177088, '支付演示', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/pay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:50', 1414143554414059520, '2022-12-04 20:24:50', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599379348144476160, 'adminv3', 1599379197124366336, '收银台', 'SimpleCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/SimpleCashier.vue', NULL, '/demo/pay/cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:26', 1414143554414059520, '2022-12-05 21:28:10', 1, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599379428784164864, 'adminv3', 1599379197124366336, '组合支付', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/pay/combination', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:46', 1414143554414059520, '2022-12-04 20:25:46', 0, 0);
+
+INSERT INTO `iam_perm_menu` VALUES (1599379539232772096, 'adminv3', 1599379197124366336, '支付结算台演示', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:///cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:26:12', 1414143554414059520, '2022-12-04 20:26:34', 1, 0);
+
+UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1546850918849249280, `title` = '支付结算台演示', `name` = 'CashierDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/cashier', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-07-07 15:51:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-11-23 15:31:08', `version` = 4, `deleted` = 0 WHERE `id` = 1544952211901218816;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582275875424129024, `title` = '接口文档', `name` = 'ApiSwagger', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://127.0.0.1:9999/doc.html', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-20 20:35:02', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-23 13:59:09', `version` = 2, `deleted` = 0 WHERE `id` = 1583074308040925184;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582275875424129024, `title` = 'ELK日志', `name` = 'ELK', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://elk.dev.bootx.cn:5601/app/discover', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-20 20:45:15', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-21 15:04:13', `version` = 2, `deleted` = 0 WHERE `id` = 1583076878956339200;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584379704122744832, `title` = '企微机器人', `name` = 'WeComRobotConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/third/wecom/robot/WecomRobotConfigList.vue', `component_name` = NULL, `path` = '/third/wecom/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:07:54', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-12 20:58:25', `version` = 3, `deleted` = 0 WHERE `id` = 1584381134950834176;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584380087805091840, `title` = '钉钉机器人', `name` = 'DingRobotConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/third/dingtalk/robot/DingRobotConfigList.vue', `component_name` = NULL, `path` = '/third/dingTalk/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:08:38', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-12 20:58:37', `version` = 6, `deleted` = 0 WHERE `id` = 1584381322184564736;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584380087805091840, `title` = '钉钉配置', `name` = 'DingRobotConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = '/modules/third/dingtalk/config/DingTalkConfigList.vue', `component_name` = NULL, `path` = '/third/dingtalk/config', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:09:15', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-11 16:04:47', `version` = 1, `deleted` = 1 WHERE `id` = 1584381477986181120;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582274981055909888, `title` = '我的消息', `name` = 'SiteMessageListReceive', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/notice/site/receive/SiteMessageList.vue', `component_name` = NULL, `path` = '/person/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:10:44', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-17 09:08:02', `version` = 1, `deleted` = 0 WHERE `id` = 1584381848238366720;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582276184120709120, `title` = '储值卡', `name` = 'Voucher', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/voucher/VoucherList.vue', `component_name` = NULL, `path` = '/payment/voucher', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:17:51', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-12-01 22:17:39', `version` = 1, `deleted` = 0 WHERE `id` = 1584383640942616576;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584382569381830656, `title` = '支付宝', `name` = 'AliPayConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/channel/alipay/AlipayConfigList.vue', `component_name` = NULL, `path` = '/payment/channel/alipay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:18:43', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-22 15:20:37', `version` = 1, `deleted` = 0 WHERE `id` = 1584383859121922048;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584382569381830656, `title` = '微信支付', `name` = 'WeChatConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/channel/wechat/WechatPayConfigList.vue', `component_name` = NULL, `path` = '/payment/channel/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:19:20', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-22 22:22:07', `version` = 1, `deleted` = 0 WHERE `id` = 1584384015338774528;
+
+UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584382569381830656, `title` = '云闪付', `name` = 'UnionPayConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/channel/unionpay/UnionPayConfigList.vue', `component_name` = NULL, `path` = '/payment/channel/unionpay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:19:55', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-22 22:27:32', `version` = 1, `deleted` = 0 WHERE `id` = 1584384160574939136;
+
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/_config/sql/bootx-platform.sql b/_config/sql/bootx-platform.sql
index 606bfa86..858f22fc 100644
--- a/_config/sql/bootx-platform.sql
+++ b/_config/sql/bootx-platform.sql
@@ -1,7 +1,7 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : bootx
+ Source Server         : 阿里
  Source Server Type    : MySQL
  Source Server Version : 50735
 
@@ -9,7 +9,7 @@
  Target Server Version : 50735
  File Encoding         : 65001
 
- Date: 02/11/2022 22:11:15
+ Date: 06/12/2022 16:16:00
 */
 
 SET NAMES utf8mb4;
@@ -67,6 +67,7 @@ INSERT INTO `base_dict` VALUES (1563083969989423104, 'BpmTaskAssignType', '工
 INSERT INTO `base_dict` VALUES (1567091641298386944, 'BpmTaskState', '流程任务状态', '工作流', '流程任务状态', 1399985191002447872, '2022-09-06 18:05:37', 1399985191002447872, '2022-09-06 18:05:47', 0, 1);
 INSERT INTO `base_dict` VALUES (1570343684024705024, 'BpmTaskResult', '流程任务处理结果', '工作流', '流程任务处理结果', 1399985191002447872, '2022-09-15 17:28:05', 1414143554414059520, '2022-10-19 23:13:40', 0, 1);
 INSERT INTO `base_dict` VALUES (1570764395519111168, 'BpmInstanceState', '流程实例状态', '工作流', '流程实例状态', 1399985191002447872, '2022-09-16 21:19:50', 1414143554414059520, '2022-10-19 23:13:33', 0, 1);
+INSERT INTO `base_dict` VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1414143554414059520, '2022-11-07 16:00:27', 0, 1);
 
 -- ----------------------------
 -- Table structure for base_dict_item
@@ -217,6 +218,13 @@ INSERT INTO `base_dict_item` VALUES (1570764836319490048, 1570764395519111168, '
 INSERT INTO `base_dict_item` VALUES (1570784215744585728, 1570343684024705024, 'BpmTaskResult', 'cancel', '取消', 0.00, '', 1399985191002447872, '2022-09-16 22:38:35', 1399985191002447872, '2022-09-16 22:38:35', 0, 0);
 INSERT INTO `base_dict_item` VALUES (1570784331511570432, 1567091641298386944, 'BpmTaskState', 'cancel', '取消', 0.00, '', 1399985191002447872, '2022-09-16 22:39:03', 1399985191002447872, '2022-09-16 22:39:03', 0, 0);
 INSERT INTO `base_dict_item` VALUES (1573665422392098816, 1439961232651034624, 'MessageTemplateCode', '0', '站内信', -11.00, 'SITE', 1399985191002447872, '2022-09-24 21:27:29', 1399985191002447872, '2022-09-24 21:27:39', 0, 1);
+INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528315672383488, 1589527951317389312, 'DataScopePerm', '5', '全部数据', 0.00, '', 1414143554414059520, '2022-11-07 16:00:57', 1414143554414059520, '2022-11-07 16:00:57', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528340267782144, 1589527951317389312, 'DataScopePerm', '4', '部门和用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:03', 1414143554414059520, '2022-11-07 16:01:03', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528367228768256, 1589527951317389312, 'DataScopePerm', '3', '部门范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:09', 1414143554414059520, '2022-11-07 16:01:09', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528393292173312, 1589527951317389312, 'DataScopePerm', '2', '用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:16', 1414143554414059520, '2022-11-07 16:01:16', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, 'DataScopePerm', '1', '自身数据', 0.00, '', 1414143554414059520, '2022-11-07 16:01:23', 1414143554414059520, '2022-11-07 16:01:23', 0, 0);
 
 -- ----------------------------
 -- Table structure for base_dynamic_data_source
@@ -1153,9 +1161,6 @@ INSERT INTO `iam_perm_menu` VALUES (1452569691537256448, 'admin', 14145960524970
 INSERT INTO `iam_perm_menu` VALUES (1452571269199540224, 'admin', 1414596052497092608, '系统配置', 'systemConfig', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:42:33', 1399985191002447872, '2021-10-25 17:42:33', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1452638905302966272, 'admin', 1452571269199540224, '系统参数', 'SystemParam', '', NULL, '', b'0', b'0', 'system/param/SystemParamList', NULL, '/system/config/param', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 22:11:18', 1399985191002447872, '2021-10-25 22:11:18', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1474694545336676352, 'admin', 1452569339987472384, '数据范围权限', 'DataScope', '', NULL, '', b'0', b'0', 'system/scope/DataScopeList', NULL, '/system/permission/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-12-25 18:52:33', 1399985191002447872, '2021-12-25 18:52:33', 1, 0);
-INSERT INTO `iam_perm_menu` VALUES (1476489893513404416, 'admin', 1414596052497092608, '22', NULL, '22', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2021-12-30 17:46:37', 1399985191002447872, '2021-12-30 17:46:37', 4, 1);
-INSERT INTO `iam_perm_menu` VALUES (1478002945936015360, 'admin', 1414596052497092608, '1', NULL, '1', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2022-01-03 21:58:57', 1399985191002447872, '2022-01-03 21:58:57', 0, 1);
-INSERT INTO `iam_perm_menu` VALUES (1478004271512240128, 'admin', 1414596052497092608, '22', NULL, '22', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2022-01-03 22:04:13', 1399985191002447872, '2022-01-03 22:04:13', 0, 1);
 INSERT INTO `iam_perm_menu` VALUES (1480839877352476672, 'admin', 1452567897717321728, '数据版本日志', 'DataVersionLog', NULL, b'0', '', b'0', b'0', 'starter/log/DataVersionLogList', NULL, '/monitor/log/DataVersionLog', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-01-11 17:51:54', 1399985191002447872, '2022-10-20 20:38:18', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1490984296616263680, 'admin', 1552207982510706688, '文件管理', 'FIleUpLoad', NULL, b'0', '', b'0', b'0', 'develop/file/FileUploadList', NULL, '/develop/file', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-08 17:42:12', 1399985191002447872, '2022-07-28 09:16:56', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1495013564652429312, 'admin', 1552207982510706688, '代码生成', 'CodeGen', NULL, b'0', '', b'0', b'0', 'develop/codegen/CodeGenList', NULL, '/develop/codegen', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-19 20:33:04', 1399985191002447872, '2022-07-27 16:25:05', 1, 0);
@@ -1194,7 +1199,7 @@ INSERT INTO `iam_perm_menu` VALUES (1537735851818024960, 'admin', 15377324406325
 INSERT INTO `iam_perm_menu` VALUES (1538160478872625152, 'admin', 1495968302034210816, '富文本编辑', 'WangEditorDemo', NULL, b'0', '', b'0', b'0', 'demo/wangeditor/WangEditorDemo', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-18 22:03:30', 1399985191002447872, '2022-06-18 22:03:31', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1541355214204030976, 'admin', 1541427353886859264, '认证终端', 'Client', '', b'0', '', b'0', b'0', 'system/client/ClientList', NULL, '/system/config/client', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:37:08', 1399985191002447872, '2022-07-05 21:17:45', 3, 0);
 INSERT INTO `iam_perm_menu` VALUES (1541427353886859264, 'admin', 1414596052497092608, '认证管理', 'Auth', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-27 22:24:54', 1399985191002447872, '2022-06-27 22:24:54', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1544952211901218816, 'admin', 1546850918849249280, '支付结算台演示', 'CashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/cashier', '', 0, 1, NULL, b'0', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-07-07 15:51:26', 1399985191002447872, '2022-07-12 21:36:34', 2, 0);
+INSERT INTO `iam_perm_menu` VALUES (1544952211901218816, 'admin', 1546850918849249280, '支付结算台演示', 'CashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/cashier', '', 0, 1, NULL, b'0', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-07-07 15:51:26', 1399985191002447872, '2022-11-23 15:31:08', 4, 0);
 INSERT INTO `iam_perm_menu` VALUES (1546850918849249280, 'admin', 1495968302034210816, '支付演示', 'DemoPay', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/pay', '', 9, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-12 21:36:13', 1399985191002447872, '2022-08-03 14:49:16', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1551803592828932096, 'admin', 1450821877831254016, '企微机器人', 'WeComRobot', '', b'0', '', b'0', b'0', 'third/wecom/robot/WeComRobotConfigList', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-26 13:36:22', 1399985191002447872, '2022-10-24 11:07:27', 3, 0);
 INSERT INTO `iam_perm_menu` VALUES (1552207982510706688, 'admin', NULL, '开发管理', 'develop', NULL, b'0', 'gold', b'0', b'0', 'RouteView', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:23:16', 1399985191002447872, '2022-07-27 16:39:09', 1, 0);
@@ -1244,12 +1249,12 @@ INSERT INTO `iam_perm_menu` VALUES (1582632873244172288, 'adminv3', 158227634179
 INSERT INTO `iam_perm_menu` VALUES (1582633196587261952, 'adminv3', 1582276341792985088, '代码生成', 'CodeGenList', NULL, b'0', '', b'0', b'0', '/modules/develop/codegen/CodeGenList.vue', NULL, '/develop/codegen', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:22:13', 1414143554414059520, '2022-10-19 15:23:17', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1582633307786649600, 'adminv3', 1582276341792985088, '动态表单', 'DynamicFormList', NULL, b'0', '', b'0', b'0', '/modules/develop/dynamicform/DynamicFormList.vue', NULL, '/develop/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:22:39', 1414143554414059520, '2022-10-19 15:22:39', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1582633620321017856, 'adminv3', 1582276341792985088, '动态数据源', 'DynamicDataSourceList', NULL, b'0', '', b'0', b'0', '/modules/develop/dynamicsource/DynamicDataSourceList.vue', NULL, '/develop/source', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:23:54', 1414143554414059520, '2022-10-19 15:23:54', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1583074308040925184, 'adminv3', 1582275875424129024, '接口文档', 'ApiSwagger', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/doc.html', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:35:02', 1414143554414059520, '2022-10-20 20:35:02', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1583074308040925184, 'adminv3', 1582275875424129024, '接口文档', 'ApiSwagger', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/doc.html', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:35:02', 1414143554414059520, '2022-11-23 13:59:09', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583075229563068416, 'adminv3', 1582275875424129024, '审计日志', 'AuditLog', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/monitor/log', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:38:42', 1414143554414059520, '2022-10-20 20:41:38', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583076217481043968, 'adminv3', 1583075229563068416, '登录日志', 'LoginLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/login/LoginLogList.vue', NULL, '/monitor/log/login', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:42:37', 1414143554414059520, '2022-10-20 20:43:36', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583076424935514112, 'adminv3', 1583075229563068416, '操作日志', 'OperateLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/operate/OperateLogList.vue', NULL, '/monitor/log/operate', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:43:26', 1414143554414059520, '2022-10-20 20:43:26', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583076670881112064, 'adminv3', 1583075229563068416, '数据版本日志', 'DataVersionLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/data/DataVersionLogList.vue', NULL, '/monitor/log/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:44:25', 1414143554414059520, '2022-10-20 20:44:25', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1583076878956339200, 'adminv3', 1582275875424129024, 'ELK日志', 'ELK', NULL, b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:15', 1414143554414059520, '2022-10-20 20:45:15', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1583076878956339200, 'adminv3', 1582275875424129024, 'ELK日志', 'ELK', NULL, b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:15', 1414143554414059520, '2022-11-21 15:04:13', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583077015434797056, 'adminv3', 1582275875424129024, 'PlumeLog日志', 'PlumeLog', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/plumelog/#/', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:47', 1414143554414059520, '2022-10-20 20:45:47', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583077198772019200, 'adminv3', 1582275875424129024, '系统信息', 'SystemInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/system/SystemInfoMonitor.vue', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:46:31', 1414143554414059520, '2022-10-20 20:46:31', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583077360827342848, 'adminv3', 1582275875424129024, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/redis/RedisInfoMonitor.vue', NULL, '/monitor/redis', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:47:10', 1414143554414059520, '2022-10-20 20:47:10', 0, 0);
@@ -1262,10 +1267,10 @@ INSERT INTO `iam_perm_menu` VALUES (1584380087805091840, 'adminv3', 158227609203
 INSERT INTO `iam_perm_menu` VALUES (1584380527829524480, 'adminv3', 1584379602188574720, '消息模板', 'WechatTemplateList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/template/WechatTemplateList.vue', NULL, '/third/wechat/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:05:29', 1414143554414059520, '2022-10-26 15:58:56', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584380679478779904, 'adminv3', 1584379602188574720, '自定义菜单', 'WechatMenuList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/menu/WechatMenuList.vue', NULL, '/third/wechat/menu', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:06:05', 1414143554414059520, '2022-10-27 10:15:24', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584380824308097024, 'adminv3', 1584379602188574720, '素材管理', 'WechatMediaList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/media/WechatMediaList.vue', NULL, '/third/wechat/media', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:06:40', 1414143554414059520, '2022-10-27 16:38:47', 1, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'adminv3', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WeComRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-10-24 11:07:54', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'adminv3', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-10-24 11:08:38', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381477986181120, 'adminv3', 1584380087805091840, '钉钉配置', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/config/DingTalkConfigList.vue', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:09:15', 1414143554414059520, '2022-10-24 11:09:15', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381848238366720, 'adminv3', 1582274981055909888, '我的消息', 'SiteMessageList', NULL, b'0', '', b'0', b'0', '/modules/notice/site/receive/SiteMessageList.vue', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:10:44', 1414143554414059520, '2022-10-24 11:10:44', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'adminv3', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WecomRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-11-12 20:58:25', 3, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'adminv3', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-11-12 20:58:37', 6, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584381477986181120, 'adminv3', 1584380087805091840, '钉钉配置', 'DingRobotConfigList', NULL, b'0', '', b'1', b'0', '/modules/third/dingtalk/config/DingTalkConfigList.vue', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:09:15', 1414143554414059520, '2022-11-11 16:04:47', 1, 1);
+INSERT INTO `iam_perm_menu` VALUES (1584381848238366720, 'adminv3', 1582274981055909888, '我的消息', 'SiteMessageListReceive', NULL, b'0', '', b'0', b'0', '/modules/notice/site/receive/SiteMessageList.vue', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:10:44', 1414143554414059520, '2022-11-17 09:08:02', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584381976508571648, 'adminv3', 1582274981055909888, '待办任务', 'MyTodoList', NULL, b'0', '', b'0', b'0', '/modules/office/mytodo/MyTodoList.vue', NULL, '/person/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:14', 1414143554414059520, '2022-10-24 11:11:14', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584382091327643648, 'adminv3', 1582274981055909888, '已办任务', 'MyDoneList', NULL, b'0', '', b'0', b'0', '/modules/office/mydone/MyDoneList.vue', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:42', 1414143554414059520, '2022-10-24 11:12:29', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584382258307080192, 'adminv3', 1582274981055909888, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', '/modules/office/myapply/MyApplyList.vue', NULL, '/person/myApply', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:12:21', 1414143554414059520, '2022-10-24 11:12:21', 0, 0);
@@ -1273,12 +1278,33 @@ INSERT INTO `iam_perm_menu` VALUES (1584382569381830656, 'adminv3', 158227618412
 INSERT INTO `iam_perm_menu` VALUES (1584382723186958336, 'adminv3', 1582276184120709120, '支付订单', 'PayOrder', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:12', 1414143554414059520, '2022-10-24 11:14:12', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584382815407120384, 'adminv3', 1582276184120709120, '回调记录', 'PayNotify', NULL, b'0', '', b'0', b'0', '/modules/payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:34', 1414143554414059520, '2022-10-24 11:23:17', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584383492338425856, 'adminv3', 1582276184120709120, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:16', 1414143554414059520, '2022-10-24 11:17:16', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584383640942616576, 'adminv3', 1582276184120709120, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:51', 1414143554414059520, '2022-10-24 11:17:51', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584383859121922048, 'adminv3', 1584382569381830656, '支付宝', 'AliPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/alipay/AliPayConfigList.vue', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:18:43', 1414143554414059520, '2022-10-24 11:18:43', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584384015338774528, 'adminv3', 1584382569381830656, '微信支付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/wechat/WeChatConfigList.vue', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:20', 1414143554414059520, '2022-10-24 11:19:20', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584384160574939136, 'adminv3', 1584382569381830656, '云闪付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/unionpay/UnionPayConfigList.vue', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:55', 1414143554414059520, '2022-10-24 11:19:55', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584383640942616576, 'adminv3', 1582276184120709120, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', '/modules/payment/voucher/VoucherList.vue', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:51', 1414143554414059520, '2022-12-01 22:17:39', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584383859121922048, 'adminv3', 1584382569381830656, '支付宝', 'AliPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/alipay/AlipayConfigList.vue', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:18:43', 1414143554414059520, '2022-11-22 15:20:37', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584384015338774528, 'adminv3', 1584382569381830656, '微信支付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/wechat/WechatPayConfigList.vue', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:20', 1414143554414059520, '2022-11-22 22:22:07', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584384160574939136, 'adminv3', 1584382569381830656, '云闪付', 'UnionPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/unionpay/UnionPayConfigList.vue', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:55', 1414143554414059520, '2022-11-22 22:27:32', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584384526511185920, 'adminv3', 1584382723186958336, '支付订单', 'PaymentList', NULL, b'0', '', b'0', b'0', '/modules/payment/order/payment/PaymentList.vue', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:21:22', 1414143554414059520, '2022-10-24 11:21:22', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584384752940687360, 'adminv3', 1584382723186958336, '退款订单', 'ReturnOrder', NULL, b'0', '', b'0', b'0', '/modules/payment/order/refund/RefundRecordList.vue', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:22:16', 1414143554414059520, '2022-10-24 11:22:16', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591689087570378752, 'adminv3', 1582276447602692096, '流程模型', 'BpmModelList', NULL, b'0', '', b'0', b'0', '/modules/bpm/model/BpmModelList.vue', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:05', 1414143554414059520, '2022-11-13 15:07:05', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591689307427405824, 'adminv3', 1582276447602692096, '未处理任务', 'TodoTaskList', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/TodoTaskList.vue', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:58', 1414143554414059520, '2022-11-14 22:45:57', 2, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591689479075102720, 'adminv3', 1582276447602692096, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/DoneTaskList.vue', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:08:39', 1414143554414059520, '2022-11-13 15:14:17', 3, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591690820224778240, 'adminv3', 1582276447602692096, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', '/modules/bpm/instance/InstanceList.vue', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:13:58', 1414143554414059520, '2022-11-13 15:13:58', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1594586131247075328, 'adminv3', 1582275875424129024, 'ELK日志x', 'ELKx', NULL, b'0', '', b'0', b'0', 'Iframe', NULL, '/monitor/elk', 'https://www.antdv.com/components/overview-cn', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-21 14:58:54', 1414143554414059520, '2022-11-21 15:21:35', 6, 0);
+INSERT INTO `iam_perm_menu` VALUES (1595255743081025536, 'adminv3', 1580740450633101312, '菜单管理1', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:////system/menu?onlytab=1&__full__', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-23 11:19:42', 1414143554414059520, '2022-11-23 21:02:52', 20, 1);
+INSERT INTO `iam_perm_menu` VALUES (1597044371008516096, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 09:47:04', 1414143554414059520, '2022-11-28 09:47:04', 0, 1);
+INSERT INTO `iam_perm_menu` VALUES (1597102799370317824, 'adminv3', 1582276516905177088, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 13:39:15', 1414143554414059520, '2022-11-28 13:39:15', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1597210969883275264, 'adminv3', 1582276516905177088, '超级查询', 'SuperQueryDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/query/SuperQueryDemoList.vue', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 20:49:05', 1414143554414059520, '2022-11-28 21:00:14', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1598306560788877312, 'adminv3', 1584383492338425856, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/list/WalletList.vue', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:22:34', 1414143554414059520, '2022-12-01 21:22:34', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1598306760764903424, 'adminv3', 1584383492338425856, '个人钱包', 'MyWallet', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/personal/MyWallet.vue', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:23:22', 1414143554414059520, '2022-12-01 21:23:22', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599337250200440832, 'adminv3', NULL, '关于', '', NULL, b'0', 'simple-icons:about-dot-me', b'0', b'0', '', NULL, '/about/index', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 17:38:09', 1414143554414059520, '2022-12-04 17:43:32', 3, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378494880436224, 'adminv3', 1582276516905177088, 'WS演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:03', 1414143554414059520, '2022-12-04 20:22:03', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378579513102336, 'adminv3', 1582276516905177088, '幂等请求演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:23', 1414143554414059520, '2022-12-04 20:22:23', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378728490586112, 'adminv3', 1582276516905177088, '消息中间件演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:59', 1414143554414059520, '2022-12-04 20:23:12', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378838519762944, 'adminv3', 1582276516905177088, '富文本编辑', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:23:25', 1414143554414059520, '2022-12-04 20:23:25', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378992811429888, 'adminv3', 1582276516905177088, '消息通知', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:02', 1414143554414059520, '2022-12-04 20:24:37', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379197124366336, 'adminv3', 1582276516905177088, '支付演示', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/pay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:50', 1414143554414059520, '2022-12-04 20:24:50', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379348144476160, 'adminv3', 1599379197124366336, '收银台', 'SimpleCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/SimpleCashier.vue', NULL, '/demo/pay/cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:26', 1414143554414059520, '2022-12-05 21:28:10', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379428784164864, 'adminv3', 1599379197124366336, '组合支付', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/pay/combination', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:46', 1414143554414059520, '2022-12-04 20:25:46', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379539232772096, 'adminv3', 1599379197124366336, '支付结算台演示', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:///cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:26:12', 1414143554414059520, '2022-12-04 20:26:34', 1, 0);
 
 -- ----------------------------
 -- Table structure for iam_perm_path
diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md
index b6d476ad..c4ebd4de 100644
--- a/_doc/ChangeLog.md
+++ b/_doc/ChangeLog.md
@@ -1,4 +1,44 @@
 # CHANGELOG
+## [v1.1.7] 一号线-工研院
+**项目主要更新**
+- 优化: 升级基础依赖
+- 优化: redisson启动机制修改, 不再会导致项目无法启动
+- 优化: 钱包报错提示优化
+- 优化: vue3模板调整
+- fix ts映射字段类型缺失
+
+**Vue3进度**
+- 新增: 企业微信机器人和钉钉机器人配置
+- 新增: 新增a-link组件，替代`</a>`标签
+- 新增: 除流程图设计之外的流程基础配置
+- 新增: 消息通知查看和未读列表
+- 新增: 添加wangEditor组件
+- 新增: 用户全局websocket消息推送
+- 新增: 菜单支持配置单独打开内部页面
+- 新增: 菜单支持配置在内部打开外部页面
+- 新增: 消息模板渲染测试功能
+- 新增: 微信支付通道配置
+- 新增: 支付宝支付通道配置
+- 新增: 超级查询器及演示DEMO
+- 新增: 微信支付通道
+- 新增: 支付记录/退款记录/回调记录
+- 新增: 储值卡管理
+- 新增: 钱包管理
+- 新增: 简单复杂和简单结算台演示Demo
+- 优化: 字典初始化提早到项目加载时
+- 优化: 用户和角色选择器新增数据源属性配置项
+- 优化: basic-modal 最低高度为无限制
+- 优化: 项目路由配置,无用代码删除
+
+**Vue2更新**
+- 优化: 用户和角色选择器新增数据源属性配置
+- 优化: diffForm逻辑重构
+- 优化: 表单提示补全
+- 优化: 富文本功能样式优化
+- 优化: 部分请求地址变更
+- 优化: 错误命名和无用代码修正
+- 优化: 超级查询器文本更新, 菜单编辑校验格式优化
+
 ## [v1.1.7] 一号线-工研院
 **项目主要更新**
 - 优化: 用户权限相关配置逻辑修改
diff --git a/bootx-common-core/pom.xml b/bootx-common-core/pom.xml
index 2852dbbd..12932980 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</artifactId>
-        <version>1.1.7</version>
+        <version>1.1.8</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 753e76ab..bdaf0329 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-auth/pom.xml b/bootx-common-starters/common-starter-auth/pom.xml
index 446ed51a..6b29cf56 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.1.7</version>
+        <version>1.1.8</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 58f467c9..943bda7e 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.1.7</version>
+        <version>1.1.8</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 72b0a86c..3bec1544 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.1.7</version>
+        <version>1.1.8</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 6275924c..8ff044b8 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.1.7</version>
+        <version>1.1.8</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 cb61abec..3304f10c 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-common-starters/common-starter-flowable/pom.xml b/bootx-common-starters/common-starter-flowable/pom.xml
index c938541e..23630c05 100644
--- a/bootx-common-starters/common-starter-flowable/pom.xml
+++ b/bootx-common-starters/common-starter-flowable/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-common-starters</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</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 7fbf6a09..2c2601c5 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.1.7</version>
+        <version>1.1.8</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 855354d5..d6cc9e79 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.1.7</version>
+        <version>1.1.8</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 f4c516e1..a45e786f 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.1.7</version>
+        <version>1.1.8</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 19575566..bed43134 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.1.7</version>
+        <version>1.1.8</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 5d119454..350b771e 100644
--- a/bootx-common-starters/pom.xml
+++ b/bootx-common-starters/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-platform</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-cache/pom.xml b/bootx-commons/common-cache/pom.xml
index c0f48148..f42e49e4 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.1.7</version>
+        <version>1.1.8</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 2a929712..725f0e47 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.1.7</version>
+        <version>1.1.8</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 558123c0..bc5be463 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-idempotency/pom.xml b/bootx-commons/common-idempotency/pom.xml
index 0a19b2db..9637ff89 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-jackson/pom.xml b/bootx-commons/common-jackson/pom.xml
index f0938dbd..3efc5446 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-lock/pom.xml b/bootx-commons/common-lock/pom.xml
index edb85da8..2b0433a5 100644
--- a/bootx-commons/common-lock/pom.xml
+++ b/bootx-commons/common-lock/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-commons</artifactId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-log/pom.xml b/bootx-commons/common-log/pom.xml
index 98ee14bd..9b52a4df 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-mongo/pom.xml b/bootx-commons/common-mongo/pom.xml
index f31d75a7..49a87e7f 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common-mongo</artifactId>
diff --git a/bootx-commons/common-mqtt/pom.xml b/bootx-commons/common-mqtt/pom.xml
index a4295940..4022ef43 100644
--- a/bootx-commons/common-mqtt/pom.xml
+++ b/bootx-commons/common-mqtt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-commons</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-mybatis-plus/pom.xml b/bootx-commons/common-mybatis-plus/pom.xml
index e54b9850..bb34488e 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-rabbitmq/pom.xml b/bootx-commons/common-rabbitmq/pom.xml
index 9d8bb3d2..77e10c60 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.1.7</version>
+        <version>1.1.8</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 5564bafc..ef846a23 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-sequence/pom.xml b/bootx-commons/common-sequence/pom.xml
index 400c5ab1..5faaffe7 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-spring/pom.xml b/bootx-commons/common-spring/pom.xml
index 24aa8eea..f07fe3dd 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.1.7</version>
+        <version>1.1.8</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 21d6450c..cfbfe925 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-swagger/pom.xml b/bootx-commons/common-swagger/pom.xml
index 95a1128d..5b174b0f 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/common-websocket/pom.xml b/bootx-commons/common-websocket/pom.xml
index 37820797..d83a807b 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.1.7</version>
+        <version>1.1.8</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 e6c4116a..bfdb49ec 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml
index 1a589e24..987a2a76 100644
--- a/bootx-commons/pom.xml
+++ b/bootx-commons/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform</artifactId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
 
     <artifactId>bootx-commons</artifactId>
diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml
index 41401380..75498199 100644
--- a/bootx-demo/pom.xml
+++ b/bootx-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-platform</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-modules/module-eshop/pom.xml b/bootx-modules/module-eshop/pom.xml
index 45e5e8a5..8a8e535e 100644
--- a/bootx-modules/module-eshop/pom.xml
+++ b/bootx-modules/module-eshop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-modules</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-modules/pom.xml b/bootx-modules/pom.xml
index c87a972b..1b9bd81e 100644
--- a/bootx-modules/pom.xml
+++ b/bootx-modules/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-platform</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml
index acbaa329..90d4d449 100644
--- a/bootx-services/pom.xml
+++ b/bootx-services/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform</artifactId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/bootx-services/service-baseapi/pom.xml b/bootx-services/service-baseapi/pom.xml
index cc9683f8..5a1c76ae 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-goods/pom.xml b/bootx-services/service-goods/pom.xml
index c99ef42a..879d5e88 100644
--- a/bootx-services/service-goods/pom.xml
+++ b/bootx-services/service-goods/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-services</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml
index e562375a..c1a6770d 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml
index 31be38f1..05af1a23 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.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-office/pom.xml b/bootx-services/service-office/pom.xml
index b221fd07..7c58134f 100644
--- a/bootx-services/service-office/pom.xml
+++ b/bootx-services/service-office/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-services</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-order/pom.xml b/bootx-services/service-order/pom.xml
index 6dc67aad..a9520eb0 100644
--- a/bootx-services/service-order/pom.xml
+++ b/bootx-services/service-order/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-services</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-services/service-payment/pom.xml b/bootx-services/service-payment/pom.xml
index e02dceff..bf3f079e 100644
--- a/bootx-services/service-payment/pom.xml
+++ b/bootx-services/service-payment/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-services</artifactId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/bootx-services/service-sales/pom.xml b/bootx-services/service-sales/pom.xml
index a8d2498a..421c7e8d 100644
--- a/bootx-services/service-sales/pom.xml
+++ b/bootx-services/service-sales/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bootx-services</artifactId>
         <groupId>cn.bootx.platform</groupId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml
index 5f835290..e4e2ec21 100644
--- a/bootx-start/pom.xml
+++ b/bootx-start/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.bootx.platform</groupId>
         <artifactId>bootx-platform</artifactId>
-        <version>1.1.7</version>
+        <version>1.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bootx-start</artifactId>
diff --git a/bootx-start/src/main/resources/db/migration/V1.1.6_221102__release.sql b/bootx-start/src/main/resources/db/migration/V1.1.8_221206__release.sql
similarity index 96%
rename from bootx-start/src/main/resources/db/migration/V1.1.6_221102__release.sql
rename to bootx-start/src/main/resources/db/migration/V1.1.8_221206__release.sql
index 606bfa86..858f22fc 100644
--- a/bootx-start/src/main/resources/db/migration/V1.1.6_221102__release.sql
+++ b/bootx-start/src/main/resources/db/migration/V1.1.8_221206__release.sql
@@ -1,7 +1,7 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : bootx
+ Source Server         : 阿里
  Source Server Type    : MySQL
  Source Server Version : 50735
 
@@ -9,7 +9,7 @@
  Target Server Version : 50735
  File Encoding         : 65001
 
- Date: 02/11/2022 22:11:15
+ Date: 06/12/2022 16:16:00
 */
 
 SET NAMES utf8mb4;
@@ -67,6 +67,7 @@ INSERT INTO `base_dict` VALUES (1563083969989423104, 'BpmTaskAssignType', '工
 INSERT INTO `base_dict` VALUES (1567091641298386944, 'BpmTaskState', '流程任务状态', '工作流', '流程任务状态', 1399985191002447872, '2022-09-06 18:05:37', 1399985191002447872, '2022-09-06 18:05:47', 0, 1);
 INSERT INTO `base_dict` VALUES (1570343684024705024, 'BpmTaskResult', '流程任务处理结果', '工作流', '流程任务处理结果', 1399985191002447872, '2022-09-15 17:28:05', 1414143554414059520, '2022-10-19 23:13:40', 0, 1);
 INSERT INTO `base_dict` VALUES (1570764395519111168, 'BpmInstanceState', '流程实例状态', '工作流', '流程实例状态', 1399985191002447872, '2022-09-16 21:19:50', 1414143554414059520, '2022-10-19 23:13:33', 0, 1);
+INSERT INTO `base_dict` VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1414143554414059520, '2022-11-07 16:00:27', 0, 1);
 
 -- ----------------------------
 -- Table structure for base_dict_item
@@ -217,6 +218,13 @@ INSERT INTO `base_dict_item` VALUES (1570764836319490048, 1570764395519111168, '
 INSERT INTO `base_dict_item` VALUES (1570784215744585728, 1570343684024705024, 'BpmTaskResult', 'cancel', '取消', 0.00, '', 1399985191002447872, '2022-09-16 22:38:35', 1399985191002447872, '2022-09-16 22:38:35', 0, 0);
 INSERT INTO `base_dict_item` VALUES (1570784331511570432, 1567091641298386944, 'BpmTaskState', 'cancel', '取消', 0.00, '', 1399985191002447872, '2022-09-16 22:39:03', 1399985191002447872, '2022-09-16 22:39:03', 0, 0);
 INSERT INTO `base_dict_item` VALUES (1573665422392098816, 1439961232651034624, 'MessageTemplateCode', '0', '站内信', -11.00, 'SITE', 1399985191002447872, '2022-09-24 21:27:29', 1399985191002447872, '2022-09-24 21:27:39', 0, 1);
+INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528315672383488, 1589527951317389312, 'DataScopePerm', '5', '全部数据', 0.00, '', 1414143554414059520, '2022-11-07 16:00:57', 1414143554414059520, '2022-11-07 16:00:57', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528340267782144, 1589527951317389312, 'DataScopePerm', '4', '部门和用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:03', 1414143554414059520, '2022-11-07 16:01:03', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528367228768256, 1589527951317389312, 'DataScopePerm', '3', '部门范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:09', 1414143554414059520, '2022-11-07 16:01:09', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528393292173312, 1589527951317389312, 'DataScopePerm', '2', '用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:16', 1414143554414059520, '2022-11-07 16:01:16', 0, 0);
+INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, 'DataScopePerm', '1', '自身数据', 0.00, '', 1414143554414059520, '2022-11-07 16:01:23', 1414143554414059520, '2022-11-07 16:01:23', 0, 0);
 
 -- ----------------------------
 -- Table structure for base_dynamic_data_source
@@ -1153,9 +1161,6 @@ INSERT INTO `iam_perm_menu` VALUES (1452569691537256448, 'admin', 14145960524970
 INSERT INTO `iam_perm_menu` VALUES (1452571269199540224, 'admin', 1414596052497092608, '系统配置', 'systemConfig', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:42:33', 1399985191002447872, '2021-10-25 17:42:33', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1452638905302966272, 'admin', 1452571269199540224, '系统参数', 'SystemParam', '', NULL, '', b'0', b'0', 'system/param/SystemParamList', NULL, '/system/config/param', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 22:11:18', 1399985191002447872, '2021-10-25 22:11:18', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1474694545336676352, 'admin', 1452569339987472384, '数据范围权限', 'DataScope', '', NULL, '', b'0', b'0', 'system/scope/DataScopeList', NULL, '/system/permission/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-12-25 18:52:33', 1399985191002447872, '2021-12-25 18:52:33', 1, 0);
-INSERT INTO `iam_perm_menu` VALUES (1476489893513404416, 'admin', 1414596052497092608, '22', NULL, '22', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2021-12-30 17:46:37', 1399985191002447872, '2021-12-30 17:46:37', 4, 1);
-INSERT INTO `iam_perm_menu` VALUES (1478002945936015360, 'admin', 1414596052497092608, '1', NULL, '1', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2022-01-03 21:58:57', 1399985191002447872, '2022-01-03 21:58:57', 0, 1);
-INSERT INTO `iam_perm_menu` VALUES (1478004271512240128, 'admin', 1414596052497092608, '22', NULL, '22', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2022-01-03 22:04:13', 1399985191002447872, '2022-01-03 22:04:13', 0, 1);
 INSERT INTO `iam_perm_menu` VALUES (1480839877352476672, 'admin', 1452567897717321728, '数据版本日志', 'DataVersionLog', NULL, b'0', '', b'0', b'0', 'starter/log/DataVersionLogList', NULL, '/monitor/log/DataVersionLog', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-01-11 17:51:54', 1399985191002447872, '2022-10-20 20:38:18', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1490984296616263680, 'admin', 1552207982510706688, '文件管理', 'FIleUpLoad', NULL, b'0', '', b'0', b'0', 'develop/file/FileUploadList', NULL, '/develop/file', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-08 17:42:12', 1399985191002447872, '2022-07-28 09:16:56', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1495013564652429312, 'admin', 1552207982510706688, '代码生成', 'CodeGen', NULL, b'0', '', b'0', b'0', 'develop/codegen/CodeGenList', NULL, '/develop/codegen', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-19 20:33:04', 1399985191002447872, '2022-07-27 16:25:05', 1, 0);
@@ -1194,7 +1199,7 @@ INSERT INTO `iam_perm_menu` VALUES (1537735851818024960, 'admin', 15377324406325
 INSERT INTO `iam_perm_menu` VALUES (1538160478872625152, 'admin', 1495968302034210816, '富文本编辑', 'WangEditorDemo', NULL, b'0', '', b'0', b'0', 'demo/wangeditor/WangEditorDemo', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-18 22:03:30', 1399985191002447872, '2022-06-18 22:03:31', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1541355214204030976, 'admin', 1541427353886859264, '认证终端', 'Client', '', b'0', '', b'0', b'0', 'system/client/ClientList', NULL, '/system/config/client', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:37:08', 1399985191002447872, '2022-07-05 21:17:45', 3, 0);
 INSERT INTO `iam_perm_menu` VALUES (1541427353886859264, 'admin', 1414596052497092608, '认证管理', 'Auth', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-27 22:24:54', 1399985191002447872, '2022-06-27 22:24:54', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1544952211901218816, 'admin', 1546850918849249280, '支付结算台演示', 'CashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/cashier', '', 0, 1, NULL, b'0', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-07-07 15:51:26', 1399985191002447872, '2022-07-12 21:36:34', 2, 0);
+INSERT INTO `iam_perm_menu` VALUES (1544952211901218816, 'admin', 1546850918849249280, '支付结算台演示', 'CashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/cashier', '', 0, 1, NULL, b'0', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-07-07 15:51:26', 1399985191002447872, '2022-11-23 15:31:08', 4, 0);
 INSERT INTO `iam_perm_menu` VALUES (1546850918849249280, 'admin', 1495968302034210816, '支付演示', 'DemoPay', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/pay', '', 9, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-12 21:36:13', 1399985191002447872, '2022-08-03 14:49:16', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1551803592828932096, 'admin', 1450821877831254016, '企微机器人', 'WeComRobot', '', b'0', '', b'0', b'0', 'third/wecom/robot/WeComRobotConfigList', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-26 13:36:22', 1399985191002447872, '2022-10-24 11:07:27', 3, 0);
 INSERT INTO `iam_perm_menu` VALUES (1552207982510706688, 'admin', NULL, '开发管理', 'develop', NULL, b'0', 'gold', b'0', b'0', 'RouteView', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:23:16', 1399985191002447872, '2022-07-27 16:39:09', 1, 0);
@@ -1244,12 +1249,12 @@ INSERT INTO `iam_perm_menu` VALUES (1582632873244172288, 'adminv3', 158227634179
 INSERT INTO `iam_perm_menu` VALUES (1582633196587261952, 'adminv3', 1582276341792985088, '代码生成', 'CodeGenList', NULL, b'0', '', b'0', b'0', '/modules/develop/codegen/CodeGenList.vue', NULL, '/develop/codegen', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:22:13', 1414143554414059520, '2022-10-19 15:23:17', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1582633307786649600, 'adminv3', 1582276341792985088, '动态表单', 'DynamicFormList', NULL, b'0', '', b'0', b'0', '/modules/develop/dynamicform/DynamicFormList.vue', NULL, '/develop/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:22:39', 1414143554414059520, '2022-10-19 15:22:39', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1582633620321017856, 'adminv3', 1582276341792985088, '动态数据源', 'DynamicDataSourceList', NULL, b'0', '', b'0', b'0', '/modules/develop/dynamicsource/DynamicDataSourceList.vue', NULL, '/develop/source', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:23:54', 1414143554414059520, '2022-10-19 15:23:54', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1583074308040925184, 'adminv3', 1582275875424129024, '接口文档', 'ApiSwagger', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/doc.html', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:35:02', 1414143554414059520, '2022-10-20 20:35:02', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1583074308040925184, 'adminv3', 1582275875424129024, '接口文档', 'ApiSwagger', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/doc.html', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:35:02', 1414143554414059520, '2022-11-23 13:59:09', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583075229563068416, 'adminv3', 1582275875424129024, '审计日志', 'AuditLog', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/monitor/log', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:38:42', 1414143554414059520, '2022-10-20 20:41:38', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583076217481043968, 'adminv3', 1583075229563068416, '登录日志', 'LoginLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/login/LoginLogList.vue', NULL, '/monitor/log/login', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:42:37', 1414143554414059520, '2022-10-20 20:43:36', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583076424935514112, 'adminv3', 1583075229563068416, '操作日志', 'OperateLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/operate/OperateLogList.vue', NULL, '/monitor/log/operate', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:43:26', 1414143554414059520, '2022-10-20 20:43:26', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583076670881112064, 'adminv3', 1583075229563068416, '数据版本日志', 'DataVersionLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/data/DataVersionLogList.vue', NULL, '/monitor/log/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:44:25', 1414143554414059520, '2022-10-20 20:44:25', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1583076878956339200, 'adminv3', 1582275875424129024, 'ELK日志', 'ELK', NULL, b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:15', 1414143554414059520, '2022-10-20 20:45:15', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1583076878956339200, 'adminv3', 1582275875424129024, 'ELK日志', 'ELK', NULL, b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:15', 1414143554414059520, '2022-11-21 15:04:13', 2, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583077015434797056, 'adminv3', 1582275875424129024, 'PlumeLog日志', 'PlumeLog', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/plumelog/#/', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:47', 1414143554414059520, '2022-10-20 20:45:47', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583077198772019200, 'adminv3', 1582275875424129024, '系统信息', 'SystemInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/system/SystemInfoMonitor.vue', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:46:31', 1414143554414059520, '2022-10-20 20:46:31', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1583077360827342848, 'adminv3', 1582275875424129024, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/redis/RedisInfoMonitor.vue', NULL, '/monitor/redis', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:47:10', 1414143554414059520, '2022-10-20 20:47:10', 0, 0);
@@ -1262,10 +1267,10 @@ INSERT INTO `iam_perm_menu` VALUES (1584380087805091840, 'adminv3', 158227609203
 INSERT INTO `iam_perm_menu` VALUES (1584380527829524480, 'adminv3', 1584379602188574720, '消息模板', 'WechatTemplateList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/template/WechatTemplateList.vue', NULL, '/third/wechat/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:05:29', 1414143554414059520, '2022-10-26 15:58:56', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584380679478779904, 'adminv3', 1584379602188574720, '自定义菜单', 'WechatMenuList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/menu/WechatMenuList.vue', NULL, '/third/wechat/menu', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:06:05', 1414143554414059520, '2022-10-27 10:15:24', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584380824308097024, 'adminv3', 1584379602188574720, '素材管理', 'WechatMediaList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/media/WechatMediaList.vue', NULL, '/third/wechat/media', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:06:40', 1414143554414059520, '2022-10-27 16:38:47', 1, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'adminv3', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WeComRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-10-24 11:07:54', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'adminv3', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-10-24 11:08:38', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381477986181120, 'adminv3', 1584380087805091840, '钉钉配置', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/config/DingTalkConfigList.vue', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:09:15', 1414143554414059520, '2022-10-24 11:09:15', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584381848238366720, 'adminv3', 1582274981055909888, '我的消息', 'SiteMessageList', NULL, b'0', '', b'0', b'0', '/modules/notice/site/receive/SiteMessageList.vue', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:10:44', 1414143554414059520, '2022-10-24 11:10:44', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'adminv3', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WecomRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-11-12 20:58:25', 3, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'adminv3', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-11-12 20:58:37', 6, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584381477986181120, 'adminv3', 1584380087805091840, '钉钉配置', 'DingRobotConfigList', NULL, b'0', '', b'1', b'0', '/modules/third/dingtalk/config/DingTalkConfigList.vue', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:09:15', 1414143554414059520, '2022-11-11 16:04:47', 1, 1);
+INSERT INTO `iam_perm_menu` VALUES (1584381848238366720, 'adminv3', 1582274981055909888, '我的消息', 'SiteMessageListReceive', NULL, b'0', '', b'0', b'0', '/modules/notice/site/receive/SiteMessageList.vue', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:10:44', 1414143554414059520, '2022-11-17 09:08:02', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584381976508571648, 'adminv3', 1582274981055909888, '待办任务', 'MyTodoList', NULL, b'0', '', b'0', b'0', '/modules/office/mytodo/MyTodoList.vue', NULL, '/person/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:14', 1414143554414059520, '2022-10-24 11:11:14', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584382091327643648, 'adminv3', 1582274981055909888, '已办任务', 'MyDoneList', NULL, b'0', '', b'0', b'0', '/modules/office/mydone/MyDoneList.vue', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:42', 1414143554414059520, '2022-10-24 11:12:29', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584382258307080192, 'adminv3', 1582274981055909888, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', '/modules/office/myapply/MyApplyList.vue', NULL, '/person/myApply', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:12:21', 1414143554414059520, '2022-10-24 11:12:21', 0, 0);
@@ -1273,12 +1278,33 @@ INSERT INTO `iam_perm_menu` VALUES (1584382569381830656, 'adminv3', 158227618412
 INSERT INTO `iam_perm_menu` VALUES (1584382723186958336, 'adminv3', 1582276184120709120, '支付订单', 'PayOrder', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:12', 1414143554414059520, '2022-10-24 11:14:12', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584382815407120384, 'adminv3', 1582276184120709120, '回调记录', 'PayNotify', NULL, b'0', '', b'0', b'0', '/modules/payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:34', 1414143554414059520, '2022-10-24 11:23:17', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584383492338425856, 'adminv3', 1582276184120709120, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:16', 1414143554414059520, '2022-10-24 11:17:16', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584383640942616576, 'adminv3', 1582276184120709120, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:51', 1414143554414059520, '2022-10-24 11:17:51', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584383859121922048, 'adminv3', 1584382569381830656, '支付宝', 'AliPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/alipay/AliPayConfigList.vue', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:18:43', 1414143554414059520, '2022-10-24 11:18:43', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584384015338774528, 'adminv3', 1584382569381830656, '微信支付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/wechat/WeChatConfigList.vue', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:20', 1414143554414059520, '2022-10-24 11:19:20', 0, 0);
-INSERT INTO `iam_perm_menu` VALUES (1584384160574939136, 'adminv3', 1584382569381830656, '云闪付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/unionpay/UnionPayConfigList.vue', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:55', 1414143554414059520, '2022-10-24 11:19:55', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584383640942616576, 'adminv3', 1582276184120709120, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', '/modules/payment/voucher/VoucherList.vue', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:51', 1414143554414059520, '2022-12-01 22:17:39', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584383859121922048, 'adminv3', 1584382569381830656, '支付宝', 'AliPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/alipay/AlipayConfigList.vue', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:18:43', 1414143554414059520, '2022-11-22 15:20:37', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584384015338774528, 'adminv3', 1584382569381830656, '微信支付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/wechat/WechatPayConfigList.vue', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:20', 1414143554414059520, '2022-11-22 22:22:07', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1584384160574939136, 'adminv3', 1584382569381830656, '云闪付', 'UnionPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/unionpay/UnionPayConfigList.vue', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:55', 1414143554414059520, '2022-11-22 22:27:32', 1, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584384526511185920, 'adminv3', 1584382723186958336, '支付订单', 'PaymentList', NULL, b'0', '', b'0', b'0', '/modules/payment/order/payment/PaymentList.vue', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:21:22', 1414143554414059520, '2022-10-24 11:21:22', 0, 0);
 INSERT INTO `iam_perm_menu` VALUES (1584384752940687360, 'adminv3', 1584382723186958336, '退款订单', 'ReturnOrder', NULL, b'0', '', b'0', b'0', '/modules/payment/order/refund/RefundRecordList.vue', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:22:16', 1414143554414059520, '2022-10-24 11:22:16', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591689087570378752, 'adminv3', 1582276447602692096, '流程模型', 'BpmModelList', NULL, b'0', '', b'0', b'0', '/modules/bpm/model/BpmModelList.vue', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:05', 1414143554414059520, '2022-11-13 15:07:05', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591689307427405824, 'adminv3', 1582276447602692096, '未处理任务', 'TodoTaskList', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/TodoTaskList.vue', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:58', 1414143554414059520, '2022-11-14 22:45:57', 2, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591689479075102720, 'adminv3', 1582276447602692096, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/DoneTaskList.vue', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:08:39', 1414143554414059520, '2022-11-13 15:14:17', 3, 0);
+INSERT INTO `iam_perm_menu` VALUES (1591690820224778240, 'adminv3', 1582276447602692096, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', '/modules/bpm/instance/InstanceList.vue', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:13:58', 1414143554414059520, '2022-11-13 15:13:58', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1594586131247075328, 'adminv3', 1582275875424129024, 'ELK日志x', 'ELKx', NULL, b'0', '', b'0', b'0', 'Iframe', NULL, '/monitor/elk', 'https://www.antdv.com/components/overview-cn', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-21 14:58:54', 1414143554414059520, '2022-11-21 15:21:35', 6, 0);
+INSERT INTO `iam_perm_menu` VALUES (1595255743081025536, 'adminv3', 1580740450633101312, '菜单管理1', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:////system/menu?onlytab=1&__full__', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-23 11:19:42', 1414143554414059520, '2022-11-23 21:02:52', 20, 1);
+INSERT INTO `iam_perm_menu` VALUES (1597044371008516096, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 09:47:04', 1414143554414059520, '2022-11-28 09:47:04', 0, 1);
+INSERT INTO `iam_perm_menu` VALUES (1597102799370317824, 'adminv3', 1582276516905177088, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 13:39:15', 1414143554414059520, '2022-11-28 13:39:15', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1597210969883275264, 'adminv3', 1582276516905177088, '超级查询', 'SuperQueryDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/query/SuperQueryDemoList.vue', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 20:49:05', 1414143554414059520, '2022-11-28 21:00:14', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1598306560788877312, 'adminv3', 1584383492338425856, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/list/WalletList.vue', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:22:34', 1414143554414059520, '2022-12-01 21:22:34', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1598306760764903424, 'adminv3', 1584383492338425856, '个人钱包', 'MyWallet', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/personal/MyWallet.vue', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:23:22', 1414143554414059520, '2022-12-01 21:23:22', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599337250200440832, 'adminv3', NULL, '关于', '', NULL, b'0', 'simple-icons:about-dot-me', b'0', b'0', '', NULL, '/about/index', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 17:38:09', 1414143554414059520, '2022-12-04 17:43:32', 3, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378494880436224, 'adminv3', 1582276516905177088, 'WS演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:03', 1414143554414059520, '2022-12-04 20:22:03', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378579513102336, 'adminv3', 1582276516905177088, '幂等请求演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:23', 1414143554414059520, '2022-12-04 20:22:23', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378728490586112, 'adminv3', 1582276516905177088, '消息中间件演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:59', 1414143554414059520, '2022-12-04 20:23:12', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378838519762944, 'adminv3', 1582276516905177088, '富文本编辑', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:23:25', 1414143554414059520, '2022-12-04 20:23:25', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599378992811429888, 'adminv3', 1582276516905177088, '消息通知', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:02', 1414143554414059520, '2022-12-04 20:24:37', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379197124366336, 'adminv3', 1582276516905177088, '支付演示', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/pay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:50', 1414143554414059520, '2022-12-04 20:24:50', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379348144476160, 'adminv3', 1599379197124366336, '收银台', 'SimpleCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/SimpleCashier.vue', NULL, '/demo/pay/cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:26', 1414143554414059520, '2022-12-05 21:28:10', 1, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379428784164864, 'adminv3', 1599379197124366336, '组合支付', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/pay/combination', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:46', 1414143554414059520, '2022-12-04 20:25:46', 0, 0);
+INSERT INTO `iam_perm_menu` VALUES (1599379539232772096, 'adminv3', 1599379197124366336, '支付结算台演示', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:///cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:26:12', 1414143554414059520, '2022-12-04 20:26:34', 1, 0);
 
 -- ----------------------------
 -- Table structure for iam_perm_path
diff --git a/pom.xml b/pom.xml
index 88fcff4e..d196a96f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>cn.bootx.platform</groupId>
     <artifactId>bootx-platform</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
 
     <modules>
         <module>bootx-common-core</module>
@@ -33,7 +33,7 @@
         <java.version>1.8</java.version>
 
         <!-- 二方库版本 -->
-        <bootx-platform.version>1.1.7</bootx-platform.version>
+        <bootx-platform.version>1.1.8</bootx-platform.version>
         <!-- 三方库 -->
         <hutool.version>5.8.10</hutool.version>
         <oshi.version>6.3.2</oshi.version>
-- 
Gitee