From 007c3cb6282cc2eeb33007facd76e83528c5936f Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Fri, 1 Apr 2022 10:45:49 +0800
Subject: [PATCH 001/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=EF=BC=8C=E9=98=B2=E8=AF=AF=E8=A7=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-mobile-ui/mixins/form.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/diboot-mobile-ui/mixins/form.js b/diboot-mobile-ui/mixins/form.js
index e6bc6a62..090f5b56 100644
--- a/diboot-mobile-ui/mixins/form.js
+++ b/diboot-mobile-ui/mixins/form.js
@@ -144,6 +144,7 @@ export default {
 		 * @returns {Promise<void>}
 		 */
 		async onSubmit() {
+			this.confirmSubmit = true
 			uni.showLoading({
 			    title: '提交中...'
 			});
@@ -170,6 +171,7 @@ export default {
 				console.log(e)
 			} finally {
 				uni.hideLoading()
+				this.confirmSubmit = false
 			}
 		},
 		/** *
-- 
Gitee


From f15b5ee7ae4b4f7c567715508c00c5a86ee60015 Mon Sep 17 00:00:00 2001
From: emptypoint <e947S@J9qv4f>
Date: Mon, 11 Apr 2022 22:20:38 +0800
Subject: [PATCH 002/195] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BBV.java:=201.?=
 =?UTF-8?q?add=20=E6=96=B0=E5=A2=9Efalse=E5=88=A4=E6=96=AD=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95;=202.bugfix=20=E4=BF=AE=E5=A4=8Dequals=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=AF=B9=E4=BA=8ECollection=E5=92=8CMap=E7=9A=84?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83=E9=80=BB=E8=BE=91;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/core/util/V.java | 142 ++++++++++++++++--
 1 file changed, 129 insertions(+), 13 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/V.java b/diboot-core/src/main/java/com/diboot/core/util/V.java
index fa55b31a..d828adce 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/V.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/V.java
@@ -402,6 +402,17 @@ public class V {
         return TRUE_SET.contains(value);
     }
 
+    /**
+     * 是否是false
+     * <p>不要再写"xxx == false"了</p>
+     *
+     * @param expression bool表达式
+     * @return 入参为false时返回true
+     */
+    public static boolean isFalse(boolean expression) {
+        return !expression;
+    }
+
     /**
      * 根据指定规则校验字符串的值是否合法
      */
@@ -506,12 +517,22 @@ public class V {
                 // size相等，且一个为空集合
                 return true;
             }
-            // 已经确定两个集合的数量相等，如果相同位置的值不相等，则必定不相等
-            // 避免使用某些集合容器低效率的contains方法
-            Iterator<?> sourceIterator = sourceList.iterator();
-            Iterator<?> targetIterator = targetList.iterator();
-            while (sourceIterator.hasNext()) {
-                if (!equals(sourceIterator.next(), targetIterator.next())) {
+            if (source instanceof Set) {
+                //noinspection SuspiciousMethodCalls
+                return ((Set<?>) source).containsAll(targetList);
+            }
+
+            // copy from org.apache.commons.collections4.CollectionUtils.isEqualCollection()
+            // 分别统计 Collection中 元素对应的数量
+            CardinalityHelper<Object> helper = new CardinalityHelper<>(sourceList, targetList);
+            // 如果 两个Collection的统计结果 不一致
+            if (helper.cardinalityA.size() != helper.cardinalityB.size()) {
+                return false;
+            }
+            // 遍历统计结果
+            for (final Object obj : helper.cardinalityA.keySet()) {
+                // 相同元素 在两个Collection中的数量却不等
+                if (helper.freqA(obj) != helper.freqB(obj)) {
                     return false;
                 }
             }
@@ -523,13 +544,8 @@ public class V {
             } else if (sourceMap.isEmpty()) {
                 return true;
             }
-            Iterator<? extends Map.Entry<?, ?>> sourceIterator = sourceMap.entrySet().iterator();
-            Iterator<? extends Map.Entry<?, ?>> targetIterator = targetMap.entrySet().iterator();
-            while (sourceIterator.hasNext()) {
-                Map.Entry<?, ?> sourceEntry = sourceIterator.next();
-                Map.Entry<?, ?> targetEntry = targetIterator.next();
-                if (!equals(sourceEntry.getKey(), targetEntry.getKey())
-                        || !equals(sourceEntry.getValue(), targetEntry.getValue())) {
+            for (Map.Entry<?, ?> entry : sourceMap.entrySet()) {
+                if (!equals(entry.getValue(), targetMap.get(entry.getKey()))) {
                     return false;
                 }
             }
@@ -632,4 +648,104 @@ public class V {
         return S.join(allErrors);
     }
 
+    /**
+     * Helper class to easily access cardinality properties of two collections.
+     *
+     * @param <O> the element type
+     */
+    private static class CardinalityHelper<O> {
+
+        /**
+         * Contains the cardinality for each object in collection A.
+         */
+        final Map<O, Integer> cardinalityA;
+
+        /**
+         * Contains the cardinality for each object in collection B.
+         */
+        final Map<O, Integer> cardinalityB;
+
+        /**
+         * Create a new CardinalityHelper for two collections.
+         *
+         * @param a the first collection
+         * @param b the second collection
+         */
+        CardinalityHelper(final Iterable<? extends O> a, final Iterable<? extends O> b) {
+            cardinalityA = getCardinalityMap(a);
+            cardinalityB = getCardinalityMap(b);
+        }
+
+        /**
+         * Returns a {@link Map} mapping each unique element in the given
+         * {@link Collection} to an {@link Integer} representing the number
+         * of occurrences of that element in the {@link Collection}.
+         * <p>
+         * Only those elements present in the collection will appear as
+         * keys in the map.
+         * </p>
+         *
+         * @param <O>  the type of object in the returned {@link Map}. This is a super type of &lt;I&gt;.
+         * @param coll the collection to get the cardinality map for, must not be null
+         * @return the populated cardinality map
+         * @throws NullPointerException if coll is null
+         */
+        public static <O> Map<O, Integer> getCardinalityMap(final Iterable<? extends O> coll) {
+            Objects.requireNonNull(coll, "coll");
+            final Map<O, Integer> count = new HashMap<>();
+            for (final O obj : coll) {
+                count.merge(obj, 1, Integer::sum);
+            }
+            return count;
+        }
+
+        /**
+         * Returns the maximum frequency of an object.
+         *
+         * @param obj the object
+         * @return the maximum frequency of the object
+         */
+        public final int max(final Object obj) {
+            return Math.max(freqA(obj), freqB(obj));
+        }
+
+        /**
+         * Returns the minimum frequency of an object.
+         *
+         * @param obj the object
+         * @return the minimum frequency of the object
+         */
+        public final int min(final Object obj) {
+            return Math.min(freqA(obj), freqB(obj));
+        }
+
+        /**
+         * Returns the frequency of this object in collection A.
+         *
+         * @param obj the object
+         * @return the frequency of the object in collection A
+         */
+        public int freqA(final Object obj) {
+            return getFreq(obj, cardinalityA);
+        }
+
+        /**
+         * Returns the frequency of this object in collection B.
+         *
+         * @param obj the object
+         * @return the frequency of the object in collection B
+         */
+        public int freqB(final Object obj) {
+            return getFreq(obj, cardinalityB);
+        }
+
+        private int getFreq(final Object obj, final Map<?, Integer> freqMap) {
+            final Integer count = freqMap.get(obj);
+            if (count != null) {
+                return count;
+            }
+            return 0;
+        }
+    }
+
 }
-- 
Gitee


From 38b805948f057df295a210d1161e6e58d37e92d8 Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Wed, 13 Apr 2022 10:52:01 +0800
Subject: [PATCH 003/195] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E9=A1=B5=E5=A4=9A=E6=AC=A1=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-mobile-ui/mixins/list.js | 40 ++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/diboot-mobile-ui/mixins/list.js b/diboot-mobile-ui/mixins/list.js
index fdd9dadd..062a0995 100644
--- a/diboot-mobile-ui/mixins/list.js
+++ b/diboot-mobile-ui/mixins/list.js
@@ -17,7 +17,7 @@ export default {
 			// 与查询条件绑定的参数（会被查询表单重置和改变的参数）
 			queryParam: {},
 			// //下拉刷新的状态
-			triggered: false, 
+			triggered: false,
 			// load状态
 			status: 'loadmore',
 			loadText: {
@@ -29,7 +29,8 @@ export default {
 			page: {
 				pageIndex: 1,
 				pageSize: 20,
-				totalCount: 0
+				totalCount: 0,
+				totalPage: 0
 			},
 			// 激活的Index
 			activeIndex: -100,
@@ -54,12 +55,14 @@ export default {
 			// 是否允许访问详情
 			allowGoDetail: true,
 			// 状态栏高度
-			diStatusBarHeight: 0
+			diStatusBarHeight: 0,
+			// 阻止重复发送
+			keyMap: {}
 		}
 	},
 	onLoad() {
 		this.diStatusBarHeight = uni.getSystemInfoSync().statusBarHeight
-		
+
 	},
 	onShow() {
 		this.activeIndex = -100
@@ -85,7 +88,7 @@ export default {
 				url:`./detail?id=${id}`
 			})
 		},
-		/* 
+		/*
 		 * 编辑
 		 */
 		handleUpdate(id) {
@@ -113,10 +116,12 @@ export default {
 				console.log(e)
 				this.showToast('网络异常！')
 			} finally {
+				this.page.pageIndex = 1
+				this.setQueryParamPage()
 				this.getList(true)
 				this.handleCancelDel()
 			}
-			
+
 		},
 		/**
 		 * 取消删除
@@ -146,14 +151,25 @@ export default {
 			if (this.triggered) return
 			this.triggered = true
 			this.page.pageIndex = 1
+			this.setQueryParamPage()
 			this.getList(true)
 		},
 		/**
 		 * 触底加载
 		 */
 		handleOnreachBottom() {
+			// 将当前pageIndex制作成下标，并查看缓存中是否存在指定下标的值
+			const key = `_${this.page.pageIndex}`
+			const value = this.keyMap[key]
+			// 如果value存在，表示缓存有值，那么阻止请求
+			if(value) {
+				return
+			}
+			// value不存在，表示第一次请求,设置占位
+			this.keyMap[key] = 'temp'
 			this.status = 'nomore'
-			if (this.page.pageIndex < this.page.totalCount / this.page.pageSize) {
+			if (this.page.pageIndex <= this.page.totalPage) {
+				this.setQueryParamPage()
 				this.getList()
 			}
 		},
@@ -168,6 +184,7 @@ export default {
 					this.list = replace ? res.data : this.list.concat(res.data)
 					this.page = res.page
 					this.page.pageIndex++
+					console.log(this.page)
 				} else {
 					this.showToast(res.msg)
 				}
@@ -177,7 +194,10 @@ export default {
 				this.triggered = false
 				this.status = (this.list || []).length == this.page.totalCount ? 'nomore' : 'loadmore'
 			}
-			
+
+		},
+		setQueryParamPage() {
+			this.queryParam.pageIndex = this.page.pageIndex
 		},
 		/**
 		 * 展示提示
@@ -186,7 +206,7 @@ export default {
 		 */
 		showToast(title, icon = 'error') {
 			uni.showToast({
-			    title,
+				title,
 				icon
 			});
 		}
@@ -196,4 +216,4 @@ export default {
 			return `margin: ${this.list.length === 0 ? 0 : 20}rpx`
 		}
 	}
-}
+}
\ No newline at end of file
-- 
Gitee


From 3b30431089a2baa0d076a7a8b42e0d0d19f070d9 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 14 Apr 2022 10:13:57 +0800
Subject: [PATCH 004/195] =?UTF-8?q?*=20=E5=8D=87=E7=BA=A7shiro=E8=87=B3?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-iam-starter/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-iam-starter/pom.xml b/diboot-iam-starter/pom.xml
index 5938c465..2cdc1ff0 100644
--- a/diboot-iam-starter/pom.xml
+++ b/diboot-iam-starter/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-web-starter</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
-- 
Gitee


From 36059a4a13bc1fddf9d7e32d34db19e06cc1a2f5 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 14 Apr 2022 10:14:41 +0800
Subject: [PATCH 005/195] =?UTF-8?q?*=20=E5=8D=87=E7=BA=A7wxjava=E8=87=B3?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-mobile-starter/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-mobile-starter/pom.xml b/diboot-mobile-starter/pom.xml
index 8a4cf2d8..2cb11c09 100644
--- a/diboot-mobile-starter/pom.xml
+++ b/diboot-mobile-starter/pom.xml
@@ -15,7 +15,7 @@
     <description>diboot mobile starter project</description>
 
     <properties>
-        <weixin.java.version>4.2.0</weixin.java.version>
+        <weixin.java.version>4.3.0</weixin.java.version>
     </properties>
 
     <dependencies>
-- 
Gitee


From c813a7e848d26cf12acee6c1c00293f9b4349921 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 15 Apr 2022 09:59:06 +0800
Subject: [PATCH 006/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0readme=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 06ad8861..dc726f10 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-> 用上diboot，告别常规SQL和CRUD，写的更少，性能更好！ 
+> 用上diboot，告别常规SQL和CRUD，写的更少，性能更好！
 
-> 新用户指南: [手把手来体验](https://www.diboot.com/guide/newer/bootstrap.html) 、[看视频了解我](https://www.bilibili.com/video/BV17P4y1p7L4) 、[如何做到高性能](https://www.bilibili.com/video/BV1tL411p7CD)
+> 新用户指南: [手把手来体验](https://www.diboot.com/guide/beginner/bootstrap.html) 、[看视频了解我](https://www.bilibili.com/video/BV17P4y1p7L4) 、[如何做到高性能](https://www.bilibili.com/video/BV1tL411p7CD)
 
 # diboot - 基础组件化繁为简，高效工具以简驭繁
 <hr>
@@ -17,9 +17,9 @@
 
 ![diboot平台组成结构图](https://www.diboot.com/structure.png)
 
-> [diboot-cloud 微服务版本，看这里->](https://www.diboot.com/ent/service.html)
+> [diboot-cloud 微服务版本，看这里->](https://www.diboot.com/guide/diboot-cloud/introduce.html)
 
-> [diboot-workflow 工作流版本，看这里->](https://www.diboot.com/ent/service.html)
+> [diboot-workflow 工作流版本，看这里->](https://www.diboot.com/guide/diboot-workflow/introduce.html)
 
 ## diboot基础组件
 ### 1、 diboot-core: 精简优化内核：写的更少，性能更好
@@ -32,7 +32,7 @@
 * 其他常用工具类、状态码、异常处理的更优实践封装
 
 基于diboot-core的CRUD和常规关联的功能实现，代码量比传统Mybatis项目减少80%+，且性能更好更易维护。
-> 详细文档: [diboot-core文档](https://www.diboot.com/guide/diboot-core/introduce.html). 
+> 详细文档: [diboot-core文档](https://www.diboot.com/guide/diboot-core/introduce.html).
 
 ### 2、IAM 身份认证基础组件 及 配套VUE前端框架（diboot-antd-admin、diboot-element-admin）
 
@@ -43,20 +43,20 @@
 * 无缝适配redis，引入redis依赖即可启用shiro的redis缓存
 * 支持基于注解的数据权限实现、简化的Log注解记录操作日志等
 * 支持灵活的扩展能力（扩展多种登录方式、灵活替换用户实体类、自定义缓存等）
-> 详细文档: [diboot-iam文档](https://www.diboot.com/guide/diboot-iam/introduce.html). 
+> 详细文档: [diboot-iam文档](https://www.diboot.com/guide/diboot-iam/introduce.html).
 
 ### 3、diboot-file 文件相关处理组件
 
 * EasyExcel轻量封装，支持Java注解校验与@ExcelBind*注解实现字典及关联字段的name-value转换，并提供完善的校验错误提示
 * 文件存储接口化，预置本地存储，简单扩展OSS、分布式存储等实现
 * 封装常用的文件上传下载、图片压缩水印等常用处理
-> 详细文档: [diboot-file文档](https://www.diboot.com/guide/diboot-file/introduce.html). 
+> 详细文档: [diboot-file文档](https://www.diboot.com/guide/diboot-file/introduce.html).
 
 ### 4、diboot-scheduler 定时任务组件
 
 * Quartz定时任务统一管理及日志的最佳实践封装
 * @CollectThisJob注解提供定时任务定义，自动收集供前端选择
-> 详细文档: [diboot-scheduler文档](https://www.diboot.com/guide/diboot-scheduler/introduce.html). 
+> 详细文档: [diboot-scheduler文档](https://www.diboot.com/guide/diboot-scheduler/introduce.html).
 
 ### 5. diboot-message 消息通知组件
 
@@ -77,7 +77,7 @@
 * 代码标准（devtools标准化了数据结构定义与代码实现，降低维护成本）
 * 支持多库（MySQL、MariaDB、ORACLE、SQLServer、PostgreSQL）
 
-> 详细文档: [diboot-devtools文档](https://www.diboot.com/guide/diboot-devtools/introduce.html). 
+> 详细文档: [diboot-devtools文档](https://www.diboot.com/guide/diboot-devtools/introduce.html).
 
 ## 捐助支持
 <img src="https://www.diboot.com/wechat_donate.png" width = "200" height = "200" alt="捐助二维码" align=center />
@@ -89,6 +89,6 @@
 
 * **VIP技术支持QQ群**（捐助/付费用户尊享）: [931266830]()
 
-* 技术交流QQ群: [731690096]() 
+* 技术交流QQ群: [731690096]()
 
 * 技术交流微信群 加: [wx20201024]() (备注diboot)
-- 
Gitee


From 45fcc63dbd11056c79d2b173aaabd9dd7add0b85 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 15 Apr 2022 14:16:55 +0800
Subject: [PATCH 007/195] =?UTF-8?q?*=20IamOrgService=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/iam/data/DataAccessPermissionUserOrgImpl.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
index 20fc748d..24822ceb 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
@@ -17,12 +17,12 @@ package com.diboot.iam.data;
 
 import com.diboot.core.config.Cons;
 import com.diboot.core.data.access.DataAccessInterface;
+import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.V;
 import com.diboot.iam.entity.IamUser;
 import com.diboot.iam.service.IamOrgService;
 import com.diboot.iam.util.IamSecurityUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -39,9 +39,6 @@ import java.util.List;
 @Slf4j
 public class DataAccessPermissionUserOrgImpl implements DataAccessInterface {
 
-    @Autowired
-    private IamOrgService iamOrgService;
-
     @Override
     public List<Serializable> getAccessibleIds(Class<?> entityClass, String fieldName) {
         // 获取当前登录用户
@@ -62,7 +59,7 @@ public class DataAccessPermissionUserOrgImpl implements DataAccessInterface {
             //添加当前部门ID
             Long currentOrgId = currentUser.getOrgId();
             accessibleIds.add(currentOrgId);
-            List<Long> childOrgIds = iamOrgService.getChildOrgIds(currentOrgId);
+            List<Long> childOrgIds = ContextHelper.getBean(IamOrgService.class).getChildOrgIds(currentOrgId);
             if(V.notEmpty(childOrgIds)){
                 accessibleIds.addAll(childOrgIds);
             }
-- 
Gitee


From bb995df16efddcf3eca5921c97b247df2e709588 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 15 Apr 2022 16:52:00 +0800
Subject: [PATCH 008/195] =?UTF-8?q?*=20=E9=BB=98=E8=AE=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0createBy=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
index 24822ceb..178348c7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
@@ -64,7 +64,7 @@ public class DataAccessPermissionUserOrgImpl implements DataAccessInterface {
                 accessibleIds.addAll(childOrgIds);
             }
         }
-        else if(Cons.FieldName.userId.name().equals(fieldName)){
+        else if(Cons.FieldName.userId.name().equals(fieldName) || Cons.FieldName.createBy.name().equals(fieldName)){
             accessibleIds.add(currentUser.getId());
         }
         // ... 其他类型字段
-- 
Gitee


From 8739ef7595965d66b26652d63afa952e6333348c Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 18 Apr 2022 10:01:04 +0800
Subject: [PATCH 009/195] * add readme

---
 diboot-admin-ui/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 diboot-admin-ui/README.md

diff --git a/diboot-admin-ui/README.md b/diboot-admin-ui/README.md
new file mode 100644
index 00000000..eb44e7a1
--- /dev/null
+++ b/diboot-admin-ui/README.md
@@ -0,0 +1 @@
+diboot-admin-ui 前端项目
\ No newline at end of file
-- 
Gitee


From 5cf6278e01f7d7c2acd262c25897a53344626b5a Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 18 Apr 2022 16:28:51 +0800
Subject: [PATCH 010/195] =?UTF-8?q?*=20=E5=8D=87=E7=BA=A7=20spring-boot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 2e3b7cdc..e3576009 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.5</version>
+        <version>2.6.6</version>
         <relativePath/>
     </parent>
 
-- 
Gitee


From f162697200be4290f18f2c5e3d782c1732479207 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 19 Apr 2022 09:00:06 +0800
Subject: [PATCH 011/195] + create vite project

---
 diboot-admin-ui/.gitignore                    |   24 +
 diboot-admin-ui/.vscode/extensions.json       |    3 +
 diboot-admin-ui/README.md                     |   17 +-
 diboot-admin-ui/index.html                    |   13 +
 diboot-admin-ui/package.json                  |   19 +
 diboot-admin-ui/pnpm-lock.yaml                | 1245 +++++++++++++++++
 diboot-admin-ui/public/favicon.ico            |  Bin 0 -> 4286 bytes
 diboot-admin-ui/src/App.vue                   |   21 +
 diboot-admin-ui/src/assets/logo.png           |  Bin 0 -> 6849 bytes
 diboot-admin-ui/src/components/HelloWorld.vue |   52 +
 diboot-admin-ui/src/env.d.ts                  |    8 +
 diboot-admin-ui/src/main.ts                   |    4 +
 diboot-admin-ui/tsconfig.json                 |   17 +
 diboot-admin-ui/tsconfig.node.json            |    8 +
 diboot-admin-ui/vite.config.ts                |    7 +
 15 files changed, 1437 insertions(+), 1 deletion(-)
 create mode 100644 diboot-admin-ui/.gitignore
 create mode 100644 diboot-admin-ui/.vscode/extensions.json
 create mode 100644 diboot-admin-ui/index.html
 create mode 100644 diboot-admin-ui/package.json
 create mode 100644 diboot-admin-ui/pnpm-lock.yaml
 create mode 100644 diboot-admin-ui/public/favicon.ico
 create mode 100644 diboot-admin-ui/src/App.vue
 create mode 100644 diboot-admin-ui/src/assets/logo.png
 create mode 100644 diboot-admin-ui/src/components/HelloWorld.vue
 create mode 100644 diboot-admin-ui/src/env.d.ts
 create mode 100644 diboot-admin-ui/src/main.ts
 create mode 100644 diboot-admin-ui/tsconfig.json
 create mode 100644 diboot-admin-ui/tsconfig.node.json
 create mode 100644 diboot-admin-ui/vite.config.ts

diff --git a/diboot-admin-ui/.gitignore b/diboot-admin-ui/.gitignore
new file mode 100644
index 00000000..a547bf36
--- /dev/null
+++ b/diboot-admin-ui/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/diboot-admin-ui/.vscode/extensions.json b/diboot-admin-ui/.vscode/extensions.json
new file mode 100644
index 00000000..3dc5b08b
--- /dev/null
+++ b/diboot-admin-ui/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["johnsoncodehk.volar"]
+}
diff --git a/diboot-admin-ui/README.md b/diboot-admin-ui/README.md
index eb44e7a1..e4325167 100644
--- a/diboot-admin-ui/README.md
+++ b/diboot-admin-ui/README.md
@@ -1 +1,16 @@
-diboot-admin-ui 前端项目
\ No newline at end of file
+# Vue 3 + TypeScript + Vite
+
+This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
+
+## Recommended IDE Setup
+
+- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
+
+## Type Support For `.vue` Imports in TS
+
+Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's Take Over mode by following these steps:
+
+1. Run `Extensions: Show Built-in Extensions` from VS Code's command palette, look for `TypeScript and JavaScript Language Features`, then right click and select `Disable (Workspace)`. By default, Take Over mode will enable itself if the default TypeScript extension is disabled.
+2. Reload the VS Code window by running `Developer: Reload Window` from the command palette.
+
+You can learn more about Take Over mode [here](https://github.com/johnsoncodehk/volar/discussions/471).
diff --git a/diboot-admin-ui/index.html b/diboot-admin-ui/index.html
new file mode 100644
index 00000000..11603f87
--- /dev/null
+++ b/diboot-admin-ui/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
new file mode 100644
index 00000000..02d65be3
--- /dev/null
+++ b/diboot-admin-ui/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "vite-project",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "dev": "vite",
+    "build": "vue-tsc --noEmit && vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "vue": "^3.2.25"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^2.3.1",
+    "typescript": "^4.5.4",
+    "vite": "^2.9.2",
+    "vue-tsc": "^0.29.8"
+  }
+}
\ No newline at end of file
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
new file mode 100644
index 00000000..473b2274
--- /dev/null
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -0,0 +1,1245 @@
+lockfileVersion: 5.3
+
+specifiers:
+  '@vitejs/plugin-vue': ^2.3.1
+  typescript: ^4.5.4
+  vite: ^2.9.2
+  vue: ^3.2.25
+  vue-tsc: ^0.29.8
+
+dependencies:
+  vue: registry.npmmirror.com/vue/3.2.33
+
+devDependencies:
+  '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33
+  typescript: registry.npmmirror.com/typescript/4.6.3
+  vite: registry.npmmirror.com/vite/2.9.5
+  vue-tsc: registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3
+
+packages:
+
+  registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7:
+    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz}
+    name: '@babel/helper-validator-identifier'
+    version: 7.16.7
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  registry.npmmirror.com/@babel/parser/7.17.9:
+    resolution: {integrity: sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/parser/-/parser-7.17.9.tgz}
+    name: '@babel/parser'
+    version: 7.17.9
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  registry.npmmirror.com/@babel/types/7.17.0:
+    resolution: {integrity: sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/types/-/types-7.17.0.tgz}
+    name: '@babel/types'
+    version: 7.17.0
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7
+      to-fast-properties: registry.npmmirror.com/to-fast-properties/2.0.0
+    dev: true
+
+  registry.npmmirror.com/@emmetio/abbreviation/2.2.3:
+    resolution: {integrity: sha512-87pltuCPt99aL+y9xS6GPZ+Wmmyhll2WXH73gG/xpGcQ84DRnptBsI2r0BeIQ0EB/SQTOe2ANPqFqj3Rj5FOGA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@emmetio/abbreviation/-/abbreviation-2.2.3.tgz}
+    name: '@emmetio/abbreviation'
+    version: 2.2.3
+    dependencies:
+      '@emmetio/scanner': registry.npmmirror.com/@emmetio/scanner/1.0.0
+    dev: true
+
+  registry.npmmirror.com/@emmetio/css-abbreviation/2.1.4:
+    resolution: {integrity: sha512-qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz}
+    name: '@emmetio/css-abbreviation'
+    version: 2.1.4
+    dependencies:
+      '@emmetio/scanner': registry.npmmirror.com/@emmetio/scanner/1.0.0
+    dev: true
+
+  registry.npmmirror.com/@emmetio/scanner/1.0.0:
+    resolution: {integrity: sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@emmetio/scanner/-/scanner-1.0.0.tgz}
+    name: '@emmetio/scanner'
+    version: 1.0.0
+    dev: true
+
+  registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33:
+    resolution: {integrity: sha512-YNzBt8+jt6bSwpt7LP890U1UcTOIZZxfpE5WOJ638PNxSEKOqAi0+FSKS0nVeukfdZ0Ai/H7AFd6k3hayfGZqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-2.3.1.tgz}
+    id: registry.npmmirror.com/@vitejs/plugin-vue/2.3.1
+    name: '@vitejs/plugin-vue'
+    version: 2.3.1
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      vite: ^2.5.10
+      vue: ^3.2.25
+    dependencies:
+      vite: registry.npmmirror.com/vite/2.9.5
+      vue: registry.npmmirror.com/vue/3.2.33
+    dev: true
+
+  registry.npmmirror.com/@volar/code-gen/0.29.8:
+    resolution: {integrity: sha512-eohLLUqPChHRPDFT5gXn4V6pr/CeTri7Ou5GI26lUvBRRAbP8p+oYfQRcbMPGeKmVkYjfVj0chsxQGx6T8PQ4Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/code-gen/-/code-gen-0.29.8.tgz}
+    name: '@volar/code-gen'
+    version: 0.29.8
+    dependencies:
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
+    dev: true
+
+  registry.npmmirror.com/@volar/html2pug/0.29.8:
+    resolution: {integrity: sha512-bhSNXg8A2aD3w0B+CwmHjqCAaKtj5rORbE5C/q/UdGqptJbC6STCmi30KuRTdfPhR++Xb18Hauf3s/WCmtNAPA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/html2pug/-/html2pug-0.29.8.tgz}
+    name: '@volar/html2pug'
+    version: 0.29.8
+    dependencies:
+      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
+      domhandler: registry.npmmirror.com/domhandler/4.3.1
+      htmlparser2: registry.npmmirror.com/htmlparser2/7.2.0
+      pug: registry.npmmirror.com/pug/3.0.2
+    dev: true
+
+  registry.npmmirror.com/@volar/shared/0.29.8:
+    resolution: {integrity: sha512-Y1NN6irkIukD+T0wf4p/dHWYL90sacN2e2lYoDXxRlvoYxwANnHgw0J0Rcp+yw58ElWRScdG7/YntEIuZWeJsw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/shared/-/shared-0.29.8.tgz}
+    name: '@volar/shared'
+    version: 0.29.8
+    dependencies:
+      upath: registry.npmmirror.com/upath/2.0.1
+      vscode-jsonrpc: registry.npmmirror.com/vscode-jsonrpc/8.0.0-next.7
+      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
+    dev: true
+
+  registry.npmmirror.com/@volar/source-map/0.29.8:
+    resolution: {integrity: sha512-7w+UoYtnc6UQu30CgMVvx0YN4dzDgP4TIsSmUaW62AGmxU9Lxwp3Kkn/4N8efi91z8ma5Z78v/HddyJPwAC3LA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/source-map/-/source-map-0.29.8.tgz}
+    name: '@volar/source-map'
+    version: 0.29.8
+    dependencies:
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+    dev: true
+
+  registry.npmmirror.com/@volar/transforms/0.29.8:
+    resolution: {integrity: sha512-o2hRa8CoDwYTO1Mu5KA47+1elUnYUjDaVhCvbyKlRfd8qpHea2llotArq7B6OORSL2M9DVs1IRJ5NGURBFeZ3Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/transforms/-/transforms-0.29.8.tgz}
+    name: '@volar/transforms'
+    version: 0.29.8
+    dependencies:
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
+    dev: true
+
+  registry.npmmirror.com/@volar/vue-code-gen/0.29.8:
+    resolution: {integrity: sha512-E1e7P2oktNC/DzgDBditfla4s8+HlUlluZ+BtcLvEdbkl3QEjujkB0x1wxguWzXmpWgLIDPtrS3Jzll5cCOkTg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/vue-code-gen/-/vue-code-gen-0.29.8.tgz}
+    name: '@volar/vue-code-gen'
+    version: 0.29.8
+    dependencies:
+      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.29.8
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
+      '@vue/compiler-core': registry.npmmirror.com/@vue/compiler-core/3.2.33
+      '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+      upath: registry.npmmirror.com/upath/2.0.1
+    dev: true
+
+  registry.npmmirror.com/@vscode/emmet-helper/2.8.4:
+    resolution: {integrity: sha512-lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz}
+    name: '@vscode/emmet-helper'
+    version: 2.8.4
+    dependencies:
+      emmet: registry.npmmirror.com/emmet/2.3.6
+      jsonc-parser: registry.npmmirror.com/jsonc-parser/2.3.1
+      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
+      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
+      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
+      vscode-uri: registry.npmmirror.com/vscode-uri/2.1.2
+    dev: true
+
+  registry.npmmirror.com/@vue/compiler-core/3.2.33:
+    resolution: {integrity: sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.33.tgz}
+    name: '@vue/compiler-core'
+    version: 3.2.33
+    dependencies:
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+      estree-walker: registry.npmmirror.com/estree-walker/2.0.2
+      source-map: registry.npmmirror.com/source-map/0.6.1
+
+  registry.npmmirror.com/@vue/compiler-dom/3.2.33:
+    resolution: {integrity: sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz}
+    name: '@vue/compiler-dom'
+    version: 3.2.33
+    dependencies:
+      '@vue/compiler-core': registry.npmmirror.com/@vue/compiler-core/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+
+  registry.npmmirror.com/@vue/compiler-sfc/3.2.33:
+    resolution: {integrity: sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.33.tgz}
+    name: '@vue/compiler-sfc'
+    version: 3.2.33
+    dependencies:
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@vue/compiler-core': registry.npmmirror.com/@vue/compiler-core/3.2.33
+      '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.33
+      '@vue/compiler-ssr': registry.npmmirror.com/@vue/compiler-ssr/3.2.33
+      '@vue/reactivity-transform': registry.npmmirror.com/@vue/reactivity-transform/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+      estree-walker: registry.npmmirror.com/estree-walker/2.0.2
+      magic-string: registry.npmmirror.com/magic-string/0.25.9
+      postcss: registry.npmmirror.com/postcss/8.4.12
+      source-map: registry.npmmirror.com/source-map/0.6.1
+    dev: false
+
+  registry.npmmirror.com/@vue/compiler-ssr/3.2.33:
+    resolution: {integrity: sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.33.tgz}
+    name: '@vue/compiler-ssr'
+    version: 3.2.33
+    dependencies:
+      '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+    dev: false
+
+  registry.npmmirror.com/@vue/reactivity-transform/3.2.33:
+    resolution: {integrity: sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.33.tgz}
+    name: '@vue/reactivity-transform'
+    version: 3.2.33
+    dependencies:
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@vue/compiler-core': registry.npmmirror.com/@vue/compiler-core/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+      estree-walker: registry.npmmirror.com/estree-walker/2.0.2
+      magic-string: registry.npmmirror.com/magic-string/0.25.9
+    dev: false
+
+  registry.npmmirror.com/@vue/reactivity/3.2.33:
+    resolution: {integrity: sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.33.tgz}
+    name: '@vue/reactivity'
+    version: 3.2.33
+    dependencies:
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+
+  registry.npmmirror.com/@vue/runtime-core/3.2.33:
+    resolution: {integrity: sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.33.tgz}
+    name: '@vue/runtime-core'
+    version: 3.2.33
+    dependencies:
+      '@vue/reactivity': registry.npmmirror.com/@vue/reactivity/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+    dev: false
+
+  registry.npmmirror.com/@vue/runtime-dom/3.2.33:
+    resolution: {integrity: sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.33.tgz}
+    name: '@vue/runtime-dom'
+    version: 3.2.33
+    dependencies:
+      '@vue/runtime-core': registry.npmmirror.com/@vue/runtime-core/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+      csstype: registry.npmmirror.com/csstype/2.6.20
+    dev: false
+
+  registry.npmmirror.com/@vue/server-renderer/3.2.33_vue@3.2.33:
+    resolution: {integrity: sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.33.tgz}
+    id: registry.npmmirror.com/@vue/server-renderer/3.2.33
+    name: '@vue/server-renderer'
+    version: 3.2.33
+    peerDependencies:
+      vue: 3.2.33
+    dependencies:
+      '@vue/compiler-ssr': registry.npmmirror.com/@vue/compiler-ssr/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+      vue: registry.npmmirror.com/vue/3.2.33
+    dev: false
+
+  registry.npmmirror.com/@vue/shared/3.2.33:
+    resolution: {integrity: sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/shared/-/shared-3.2.33.tgz}
+    name: '@vue/shared'
+    version: 3.2.33
+
+  registry.npmmirror.com/acorn/7.4.1:
+    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz}
+    name: acorn
+    version: 7.4.1
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+    dev: true
+
+  registry.npmmirror.com/asap/2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asap/-/asap-2.0.6.tgz}
+    name: asap
+    version: 2.0.6
+    dev: true
+
+  registry.npmmirror.com/assert-never/1.2.1:
+    resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/assert-never/-/assert-never-1.2.1.tgz}
+    name: assert-never
+    version: 1.2.1
+    dev: true
+
+  registry.npmmirror.com/babel-walk/3.0.0-canary-5:
+    resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz}
+    name: babel-walk
+    version: 3.0.0-canary-5
+    engines: {node: '>= 10.0.0'}
+    dependencies:
+      '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
+    dev: true
+
+  registry.npmmirror.com/call-bind/1.0.2:
+    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz}
+    name: call-bind
+    version: 1.0.2
+    dependencies:
+      function-bind: registry.npmmirror.com/function-bind/1.1.1
+      get-intrinsic: registry.npmmirror.com/get-intrinsic/1.1.1
+    dev: true
+
+  registry.npmmirror.com/character-parser/2.2.0:
+    resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/character-parser/-/character-parser-2.2.0.tgz}
+    name: character-parser
+    version: 2.2.0
+    dependencies:
+      is-regex: registry.npmmirror.com/is-regex/1.1.4
+    dev: true
+
+  registry.npmmirror.com/constantinople/4.0.1:
+    resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/constantinople/-/constantinople-4.0.1.tgz}
+    name: constantinople
+    version: 4.0.1
+    dependencies:
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
+    dev: true
+
+  registry.npmmirror.com/csstype/2.6.20:
+    resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz}
+    name: csstype
+    version: 2.6.20
+    dev: false
+
+  registry.npmmirror.com/doctypes/1.1.0:
+    resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/doctypes/-/doctypes-1.1.0.tgz}
+    name: doctypes
+    version: 1.1.0
+    dev: true
+
+  registry.npmmirror.com/dom-serializer/1.4.1:
+    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz}
+    name: dom-serializer
+    version: 1.4.1
+    dependencies:
+      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
+      domhandler: registry.npmmirror.com/domhandler/4.3.1
+      entities: registry.npmmirror.com/entities/2.2.0
+    dev: true
+
+  registry.npmmirror.com/domelementtype/2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz}
+    name: domelementtype
+    version: 2.3.0
+    dev: true
+
+  registry.npmmirror.com/domhandler/4.3.1:
+    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz}
+    name: domhandler
+    version: 4.3.1
+    engines: {node: '>= 4'}
+    dependencies:
+      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
+    dev: true
+
+  registry.npmmirror.com/domutils/2.8.0:
+    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz}
+    name: domutils
+    version: 2.8.0
+    dependencies:
+      dom-serializer: registry.npmmirror.com/dom-serializer/1.4.1
+      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
+      domhandler: registry.npmmirror.com/domhandler/4.3.1
+    dev: true
+
+  registry.npmmirror.com/emmet/2.3.6:
+    resolution: {integrity: sha512-pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/emmet/-/emmet-2.3.6.tgz}
+    name: emmet
+    version: 2.3.6
+    dependencies:
+      '@emmetio/abbreviation': registry.npmmirror.com/@emmetio/abbreviation/2.2.3
+      '@emmetio/css-abbreviation': registry.npmmirror.com/@emmetio/css-abbreviation/2.1.4
+    dev: true
+
+  registry.npmmirror.com/entities/2.2.0:
+    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz}
+    name: entities
+    version: 2.2.0
+    dev: true
+
+  registry.npmmirror.com/entities/3.0.1:
+    resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz}
+    name: entities
+    version: 3.0.1
+    engines: {node: '>=0.12'}
+    dev: true
+
+  registry.npmmirror.com/esbuild-android-64/0.14.36:
+    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
+    name: esbuild-android-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-android-arm64/0.14.36:
+    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
+    name: esbuild-android-arm64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-darwin-64/0.14.36:
+    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
+    name: esbuild-darwin-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-darwin-arm64/0.14.36:
+    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
+    name: esbuild-darwin-arm64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-freebsd-64/0.14.36:
+    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
+    name: esbuild-freebsd-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-freebsd-arm64/0.14.36:
+    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
+    name: esbuild-freebsd-arm64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-32/0.14.36:
+    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
+    name: esbuild-linux-32
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-64/0.14.36:
+    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
+    name: esbuild-linux-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-arm/0.14.36:
+    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
+    name: esbuild-linux-arm
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-arm64/0.14.36:
+    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
+    name: esbuild-linux-arm64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-mips64le/0.14.36:
+    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
+    name: esbuild-linux-mips64le
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-ppc64le/0.14.36:
+    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
+    name: esbuild-linux-ppc64le
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-riscv64/0.14.36:
+    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
+    name: esbuild-linux-riscv64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-linux-s390x/0.14.36:
+    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
+    name: esbuild-linux-s390x
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-netbsd-64/0.14.36:
+    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
+    name: esbuild-netbsd-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-openbsd-64/0.14.36:
+    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
+    name: esbuild-openbsd-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-sunos-64/0.14.36:
+    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
+    name: esbuild-sunos-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-windows-32/0.14.36:
+    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
+    name: esbuild-windows-32
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-windows-64/0.14.36:
+    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
+    name: esbuild-windows-64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild-windows-arm64/0.14.36:
+    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
+    name: esbuild-windows-arm64
+    version: 0.14.36
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/esbuild/0.14.36:
+    resolution: {integrity: sha512-HhFHPiRXGYOCRlrhpiVDYKcFJRdO0sBElZ668M4lh2ER0YgnkLxECuFe7uWCf23FrcLc59Pqr7dHkTqmRPDHmw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.14.36.tgz}
+    name: esbuild
+    version: 0.14.36
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      esbuild-android-64: registry.npmmirror.com/esbuild-android-64/0.14.36
+      esbuild-android-arm64: registry.npmmirror.com/esbuild-android-arm64/0.14.36
+      esbuild-darwin-64: registry.npmmirror.com/esbuild-darwin-64/0.14.36
+      esbuild-darwin-arm64: registry.npmmirror.com/esbuild-darwin-arm64/0.14.36
+      esbuild-freebsd-64: registry.npmmirror.com/esbuild-freebsd-64/0.14.36
+      esbuild-freebsd-arm64: registry.npmmirror.com/esbuild-freebsd-arm64/0.14.36
+      esbuild-linux-32: registry.npmmirror.com/esbuild-linux-32/0.14.36
+      esbuild-linux-64: registry.npmmirror.com/esbuild-linux-64/0.14.36
+      esbuild-linux-arm: registry.npmmirror.com/esbuild-linux-arm/0.14.36
+      esbuild-linux-arm64: registry.npmmirror.com/esbuild-linux-arm64/0.14.36
+      esbuild-linux-mips64le: registry.npmmirror.com/esbuild-linux-mips64le/0.14.36
+      esbuild-linux-ppc64le: registry.npmmirror.com/esbuild-linux-ppc64le/0.14.36
+      esbuild-linux-riscv64: registry.npmmirror.com/esbuild-linux-riscv64/0.14.36
+      esbuild-linux-s390x: registry.npmmirror.com/esbuild-linux-s390x/0.14.36
+      esbuild-netbsd-64: registry.npmmirror.com/esbuild-netbsd-64/0.14.36
+      esbuild-openbsd-64: registry.npmmirror.com/esbuild-openbsd-64/0.14.36
+      esbuild-sunos-64: registry.npmmirror.com/esbuild-sunos-64/0.14.36
+      esbuild-windows-32: registry.npmmirror.com/esbuild-windows-32/0.14.36
+      esbuild-windows-64: registry.npmmirror.com/esbuild-windows-64/0.14.36
+      esbuild-windows-arm64: registry.npmmirror.com/esbuild-windows-arm64/0.14.36
+    dev: true
+
+  registry.npmmirror.com/estree-walker/2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz}
+    name: estree-walker
+    version: 2.0.2
+
+  registry.npmmirror.com/fsevents/2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
+    name: fsevents
+    version: 2.3.2
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/function-bind/1.1.1:
+    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz}
+    name: function-bind
+    version: 1.1.1
+    dev: true
+
+  registry.npmmirror.com/get-intrinsic/1.1.1:
+    resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz}
+    name: get-intrinsic
+    version: 1.1.1
+    dependencies:
+      function-bind: registry.npmmirror.com/function-bind/1.1.1
+      has: registry.npmmirror.com/has/1.0.3
+      has-symbols: registry.npmmirror.com/has-symbols/1.0.3
+    dev: true
+
+  registry.npmmirror.com/has-symbols/1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz}
+    name: has-symbols
+    version: 1.0.3
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  registry.npmmirror.com/has-tostringtag/1.0.0:
+    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz}
+    name: has-tostringtag
+    version: 1.0.0
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-symbols: registry.npmmirror.com/has-symbols/1.0.3
+    dev: true
+
+  registry.npmmirror.com/has/1.0.3:
+    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has/-/has-1.0.3.tgz}
+    name: has
+    version: 1.0.3
+    engines: {node: '>= 0.4.0'}
+    dependencies:
+      function-bind: registry.npmmirror.com/function-bind/1.1.1
+    dev: true
+
+  registry.npmmirror.com/htmlparser2/7.2.0:
+    resolution: {integrity: sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/htmlparser2/-/htmlparser2-7.2.0.tgz}
+    name: htmlparser2
+    version: 7.2.0
+    dependencies:
+      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
+      domhandler: registry.npmmirror.com/domhandler/4.3.1
+      domutils: registry.npmmirror.com/domutils/2.8.0
+      entities: registry.npmmirror.com/entities/3.0.1
+    dev: true
+
+  registry.npmmirror.com/is-core-module/2.8.1:
+    resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz}
+    name: is-core-module
+    version: 2.8.1
+    dependencies:
+      has: registry.npmmirror.com/has/1.0.3
+    dev: true
+
+  registry.npmmirror.com/is-expression/4.0.0:
+    resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-expression/-/is-expression-4.0.0.tgz}
+    name: is-expression
+    version: 4.0.0
+    dependencies:
+      acorn: registry.npmmirror.com/acorn/7.4.1
+      object-assign: registry.npmmirror.com/object-assign/4.1.1
+    dev: true
+
+  registry.npmmirror.com/is-promise/2.2.2:
+    resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz}
+    name: is-promise
+    version: 2.2.2
+    dev: true
+
+  registry.npmmirror.com/is-regex/1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-regex/-/is-regex-1.1.4.tgz}
+    name: is-regex
+    version: 1.1.4
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: registry.npmmirror.com/call-bind/1.0.2
+      has-tostringtag: registry.npmmirror.com/has-tostringtag/1.0.0
+    dev: true
+
+  registry.npmmirror.com/js-stringify/1.0.2:
+    resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-stringify/-/js-stringify-1.0.2.tgz}
+    name: js-stringify
+    version: 1.0.2
+    dev: true
+
+  registry.npmmirror.com/jsonc-parser/2.3.1:
+    resolution: {integrity: sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz}
+    name: jsonc-parser
+    version: 2.3.1
+    dev: true
+
+  registry.npmmirror.com/jsonc-parser/3.0.0:
+    resolution: {integrity: sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz}
+    name: jsonc-parser
+    version: 3.0.0
+    dev: true
+
+  registry.npmmirror.com/jstransformer/1.0.0:
+    resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jstransformer/-/jstransformer-1.0.0.tgz}
+    name: jstransformer
+    version: 1.0.0
+    dependencies:
+      is-promise: registry.npmmirror.com/is-promise/2.2.2
+      promise: registry.npmmirror.com/promise/7.3.1
+    dev: true
+
+  registry.npmmirror.com/lru-cache/6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz}
+    name: lru-cache
+    version: 6.0.0
+    engines: {node: '>=10'}
+    dependencies:
+      yallist: registry.npmmirror.com/yallist/4.0.0
+    dev: true
+
+  registry.npmmirror.com/magic-string/0.25.9:
+    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz}
+    name: magic-string
+    version: 0.25.9
+    dependencies:
+      sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
+    dev: false
+
+  registry.npmmirror.com/nanoid/3.3.2:
+    resolution: {integrity: sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-3.3.2.tgz}
+    name: nanoid
+    version: 3.3.2
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  registry.npmmirror.com/object-assign/4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz}
+    name: object-assign
+    version: 4.1.1
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/path-parse/1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz}
+    name: path-parse
+    version: 1.0.7
+    dev: true
+
+  registry.npmmirror.com/picocolors/1.0.0:
+    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz}
+    name: picocolors
+    version: 1.0.0
+
+  registry.npmmirror.com/postcss/8.4.12:
+    resolution: {integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss/-/postcss-8.4.12.tgz}
+    name: postcss
+    version: 8.4.12
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: registry.npmmirror.com/nanoid/3.3.2
+      picocolors: registry.npmmirror.com/picocolors/1.0.0
+      source-map-js: registry.npmmirror.com/source-map-js/1.0.2
+
+  registry.npmmirror.com/promise/7.3.1:
+    resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise/-/promise-7.3.1.tgz}
+    name: promise
+    version: 7.3.1
+    dependencies:
+      asap: registry.npmmirror.com/asap/2.0.6
+    dev: true
+
+  registry.npmmirror.com/pug-attrs/3.0.0:
+    resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-attrs/-/pug-attrs-3.0.0.tgz}
+    name: pug-attrs
+    version: 3.0.0
+    dependencies:
+      constantinople: registry.npmmirror.com/constantinople/4.0.1
+      js-stringify: registry.npmmirror.com/js-stringify/1.0.2
+      pug-runtime: registry.npmmirror.com/pug-runtime/3.0.1
+    dev: true
+
+  registry.npmmirror.com/pug-code-gen/3.0.2:
+    resolution: {integrity: sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz}
+    name: pug-code-gen
+    version: 3.0.2
+    dependencies:
+      constantinople: registry.npmmirror.com/constantinople/4.0.1
+      doctypes: registry.npmmirror.com/doctypes/1.1.0
+      js-stringify: registry.npmmirror.com/js-stringify/1.0.2
+      pug-attrs: registry.npmmirror.com/pug-attrs/3.0.0
+      pug-error: registry.npmmirror.com/pug-error/2.0.0
+      pug-runtime: registry.npmmirror.com/pug-runtime/3.0.1
+      void-elements: registry.npmmirror.com/void-elements/3.1.0
+      with: registry.npmmirror.com/with/7.0.2
+    dev: true
+
+  registry.npmmirror.com/pug-error/2.0.0:
+    resolution: {integrity: sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-error/-/pug-error-2.0.0.tgz}
+    name: pug-error
+    version: 2.0.0
+    dev: true
+
+  registry.npmmirror.com/pug-filters/4.0.0:
+    resolution: {integrity: sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-filters/-/pug-filters-4.0.0.tgz}
+    name: pug-filters
+    version: 4.0.0
+    dependencies:
+      constantinople: registry.npmmirror.com/constantinople/4.0.1
+      jstransformer: registry.npmmirror.com/jstransformer/1.0.0
+      pug-error: registry.npmmirror.com/pug-error/2.0.0
+      pug-walk: registry.npmmirror.com/pug-walk/2.0.0
+      resolve: registry.npmmirror.com/resolve/1.22.0
+    dev: true
+
+  registry.npmmirror.com/pug-lexer/5.0.1:
+    resolution: {integrity: sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-lexer/-/pug-lexer-5.0.1.tgz}
+    name: pug-lexer
+    version: 5.0.1
+    dependencies:
+      character-parser: registry.npmmirror.com/character-parser/2.2.0
+      is-expression: registry.npmmirror.com/is-expression/4.0.0
+      pug-error: registry.npmmirror.com/pug-error/2.0.0
+    dev: true
+
+  registry.npmmirror.com/pug-linker/4.0.0:
+    resolution: {integrity: sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-linker/-/pug-linker-4.0.0.tgz}
+    name: pug-linker
+    version: 4.0.0
+    dependencies:
+      pug-error: registry.npmmirror.com/pug-error/2.0.0
+      pug-walk: registry.npmmirror.com/pug-walk/2.0.0
+    dev: true
+
+  registry.npmmirror.com/pug-load/3.0.0:
+    resolution: {integrity: sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-load/-/pug-load-3.0.0.tgz}
+    name: pug-load
+    version: 3.0.0
+    dependencies:
+      object-assign: registry.npmmirror.com/object-assign/4.1.1
+      pug-walk: registry.npmmirror.com/pug-walk/2.0.0
+    dev: true
+
+  registry.npmmirror.com/pug-parser/6.0.0:
+    resolution: {integrity: sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-parser/-/pug-parser-6.0.0.tgz}
+    name: pug-parser
+    version: 6.0.0
+    dependencies:
+      pug-error: registry.npmmirror.com/pug-error/2.0.0
+      token-stream: registry.npmmirror.com/token-stream/1.0.0
+    dev: true
+
+  registry.npmmirror.com/pug-runtime/3.0.1:
+    resolution: {integrity: sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-runtime/-/pug-runtime-3.0.1.tgz}
+    name: pug-runtime
+    version: 3.0.1
+    dev: true
+
+  registry.npmmirror.com/pug-strip-comments/2.0.0:
+    resolution: {integrity: sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz}
+    name: pug-strip-comments
+    version: 2.0.0
+    dependencies:
+      pug-error: registry.npmmirror.com/pug-error/2.0.0
+    dev: true
+
+  registry.npmmirror.com/pug-walk/2.0.0:
+    resolution: {integrity: sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-walk/-/pug-walk-2.0.0.tgz}
+    name: pug-walk
+    version: 2.0.0
+    dev: true
+
+  registry.npmmirror.com/pug/3.0.2:
+    resolution: {integrity: sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug/-/pug-3.0.2.tgz}
+    name: pug
+    version: 3.0.2
+    dependencies:
+      pug-code-gen: registry.npmmirror.com/pug-code-gen/3.0.2
+      pug-filters: registry.npmmirror.com/pug-filters/4.0.0
+      pug-lexer: registry.npmmirror.com/pug-lexer/5.0.1
+      pug-linker: registry.npmmirror.com/pug-linker/4.0.0
+      pug-load: registry.npmmirror.com/pug-load/3.0.0
+      pug-parser: registry.npmmirror.com/pug-parser/6.0.0
+      pug-runtime: registry.npmmirror.com/pug-runtime/3.0.1
+      pug-strip-comments: registry.npmmirror.com/pug-strip-comments/2.0.0
+    dev: true
+
+  registry.npmmirror.com/request-light/0.5.8:
+    resolution: {integrity: sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/request-light/-/request-light-0.5.8.tgz}
+    name: request-light
+    version: 0.5.8
+    dev: true
+
+  registry.npmmirror.com/resolve/1.22.0:
+    resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve/-/resolve-1.22.0.tgz}
+    name: resolve
+    version: 1.22.0
+    hasBin: true
+    dependencies:
+      is-core-module: registry.npmmirror.com/is-core-module/2.8.1
+      path-parse: registry.npmmirror.com/path-parse/1.0.7
+      supports-preserve-symlinks-flag: registry.npmmirror.com/supports-preserve-symlinks-flag/1.0.0
+    dev: true
+
+  registry.npmmirror.com/rollup/2.70.2:
+    resolution: {integrity: sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rollup/-/rollup-2.70.2.tgz}
+    name: rollup
+    version: 2.70.2
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+    optionalDependencies:
+      fsevents: registry.npmmirror.com/fsevents/2.3.2
+    dev: true
+
+  registry.npmmirror.com/semver/7.3.7:
+    resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz}
+    name: semver
+    version: 7.3.7
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: registry.npmmirror.com/lru-cache/6.0.0
+    dev: true
+
+  registry.npmmirror.com/source-map-js/1.0.2:
+    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz}
+    name: source-map-js
+    version: 1.0.2
+    engines: {node: '>=0.10.0'}
+
+  registry.npmmirror.com/source-map/0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz}
+    name: source-map
+    version: 0.6.1
+    engines: {node: '>=0.10.0'}
+
+  registry.npmmirror.com/sourcemap-codec/1.4.8:
+    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz}
+    name: sourcemap-codec
+    version: 1.4.8
+    dev: false
+
+  registry.npmmirror.com/supports-preserve-symlinks-flag/1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz}
+    name: supports-preserve-symlinks-flag
+    version: 1.0.0
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  registry.npmmirror.com/to-fast-properties/2.0.0:
+    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz}
+    name: to-fast-properties
+    version: 2.0.0
+    engines: {node: '>=4'}
+    dev: true
+
+  registry.npmmirror.com/token-stream/1.0.0:
+    resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/token-stream/-/token-stream-1.0.0.tgz}
+    name: token-stream
+    version: 1.0.0
+    dev: true
+
+  registry.npmmirror.com/typescript/4.6.3:
+    resolution: {integrity: sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/typescript/-/typescript-4.6.3.tgz}
+    name: typescript
+    version: 4.6.3
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+    dev: true
+
+  registry.npmmirror.com/upath/2.0.1:
+    resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/upath/-/upath-2.0.1.tgz}
+    name: upath
+    version: 2.0.1
+    engines: {node: '>=4'}
+    dev: true
+
+  registry.npmmirror.com/vite/2.9.5:
+    resolution: {integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-2.9.5.tgz}
+    name: vite
+    version: 2.9.5
+    engines: {node: '>=12.2.0'}
+    hasBin: true
+    peerDependencies:
+      less: '*'
+      sass: '*'
+      stylus: '*'
+    peerDependenciesMeta:
+      less:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+    dependencies:
+      esbuild: registry.npmmirror.com/esbuild/0.14.36
+      postcss: registry.npmmirror.com/postcss/8.4.12
+      resolve: registry.npmmirror.com/resolve/1.22.0
+      rollup: registry.npmmirror.com/rollup/2.70.2
+    optionalDependencies:
+      fsevents: registry.npmmirror.com/fsevents/2.3.2
+    dev: true
+
+  registry.npmmirror.com/void-elements/3.1.0:
+    resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/void-elements/-/void-elements-3.1.0.tgz}
+    name: void-elements
+    version: 3.1.0
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/vscode-css-languageservice/5.4.1:
+    resolution: {integrity: sha512-W7D3GKFXf97ReAaU4EZ2nxVO1kQhztbycJgc1b/Ipr0h8zYWr88BADmrXu02z+lsCS84D7Sr4hoUzDKeaFn2Kg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-css-languageservice/-/vscode-css-languageservice-5.4.1.tgz}
+    name: vscode-css-languageservice
+    version: 5.4.1
+    dependencies:
+      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
+      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
+      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
+      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
+    dev: true
+
+  registry.npmmirror.com/vscode-html-languageservice/4.2.4:
+    resolution: {integrity: sha512-1HqvXKOq9WlZyW4HTD+0XzrjZoZ/YFrgQY2PZqktbRloHXVAUKm6+cAcvZi4YqKPVn05/CK7do+KBHfuSaEdbg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-html-languageservice/-/vscode-html-languageservice-4.2.4.tgz}
+    name: vscode-html-languageservice
+    version: 4.2.4
+    dependencies:
+      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
+      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
+      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
+      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
+    dev: true
+
+  registry.npmmirror.com/vscode-json-languageservice/4.2.1:
+    resolution: {integrity: sha512-xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-json-languageservice/-/vscode-json-languageservice-4.2.1.tgz}
+    name: vscode-json-languageservice
+    version: 4.2.1
+    dependencies:
+      jsonc-parser: registry.npmmirror.com/jsonc-parser/3.0.0
+      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
+      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
+      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
+      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
+    dev: true
+
+  registry.npmmirror.com/vscode-jsonrpc/8.0.0-next.7:
+    resolution: {integrity: sha512-JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.7.tgz}
+    name: vscode-jsonrpc
+    version: 8.0.0-next.7
+    engines: {node: '>=14.0.0'}
+    dev: true
+
+  registry.npmmirror.com/vscode-languageserver-protocol/3.17.0-next.16:
+    resolution: {integrity: sha512-tx4DnXw9u3N7vw+bx6n2NKp6FoxoNwiP/biH83AS30I2AnTGyLd7afSeH6Oewn2E8jvB7K15bs12sMppkKOVeQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.16.tgz}
+    name: vscode-languageserver-protocol
+    version: 3.17.0-next.16
+    dependencies:
+      vscode-jsonrpc: registry.npmmirror.com/vscode-jsonrpc/8.0.0-next.7
+      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.17.0-next.9
+    dev: true
+
+  registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4:
+    resolution: {integrity: sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz}
+    name: vscode-languageserver-textdocument
+    version: 1.0.4
+    dev: true
+
+  registry.npmmirror.com/vscode-languageserver-types/3.16.0:
+    resolution: {integrity: sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz}
+    name: vscode-languageserver-types
+    version: 3.16.0
+    dev: true
+
+  registry.npmmirror.com/vscode-languageserver-types/3.17.0-next.9:
+    resolution: {integrity: sha512-9/PeDNPYduaoXRUzYpqmu4ZV9L01HGo0wH9FUt+sSHR7IXwA7xoXBfNUlv8gB9H0D2WwEmMomSy1NmhjKQyn3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.9.tgz}
+    name: vscode-languageserver-types
+    version: 3.17.0-next.9
+    dev: true
+
+  registry.npmmirror.com/vscode-languageserver/8.0.0-next.10:
+    resolution: {integrity: sha512-sdjldl9ipuBSWVw5ENVMRcOVQwF0o+J6+lNA7FrB8MiLmzflnfjRoJMqA5tCEY8S/J/+P56ZR/dqiQnRYg5m8w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver/-/vscode-languageserver-8.0.0-next.10.tgz}
+    name: vscode-languageserver
+    version: 8.0.0-next.10
+    hasBin: true
+    dependencies:
+      vscode-languageserver-protocol: registry.npmmirror.com/vscode-languageserver-protocol/3.17.0-next.16
+    dev: true
+
+  registry.npmmirror.com/vscode-nls/5.0.0:
+    resolution: {integrity: sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-nls/-/vscode-nls-5.0.0.tgz}
+    name: vscode-nls
+    version: 5.0.0
+    dev: true
+
+  registry.npmmirror.com/vscode-pug-languageservice/0.29.8:
+    resolution: {integrity: sha512-QHYAzDSJLg7GOLxCZ12qsM0dAM0dPeMSS1t4kKfzLsfpErmZpFzkAIXbidVrNMdMffGZMtTuIlcpEyWHbx96Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-pug-languageservice/-/vscode-pug-languageservice-0.29.8.tgz}
+    name: vscode-pug-languageservice
+    version: 0.29.8
+    deprecated: 'WARNING: This project has been renamed to @volar/pug-language-service. Install using @volar/pug-language-service instead.'
+    dependencies:
+      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.29.8
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
+      '@volar/transforms': registry.npmmirror.com/@volar/transforms/0.29.8
+      pug-lexer: registry.npmmirror.com/pug-lexer/5.0.1
+      pug-parser: registry.npmmirror.com/pug-parser/6.0.0
+      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
+    dev: true
+
+  registry.npmmirror.com/vscode-typescript-languageservice/0.29.8:
+    resolution: {integrity: sha512-eecDqHk4WjEvy6VHQ6teHczppQ9yJO2wExCy7yu7WiFj35qbw0h4G6Erv46MvP3ClL8FggFzD7s1qM6vdqJUfw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.29.8.tgz}
+    name: vscode-typescript-languageservice
+    version: 0.29.8
+    deprecated: 'WARNING: This project has been renamed to @volar/typescript-language-service. Install using @volar/typescript-language-service instead.'
+    dependencies:
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+      semver: registry.npmmirror.com/semver/7.3.7
+      upath: registry.npmmirror.com/upath/2.0.1
+      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
+      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
+    dev: true
+
+  registry.npmmirror.com/vscode-uri/2.1.2:
+    resolution: {integrity: sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-uri/-/vscode-uri-2.1.2.tgz}
+    name: vscode-uri
+    version: 2.1.2
+    dev: true
+
+  registry.npmmirror.com/vscode-uri/3.0.3:
+    resolution: {integrity: sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.0.3.tgz}
+    name: vscode-uri
+    version: 3.0.3
+    dev: true
+
+  registry.npmmirror.com/vscode-vue-languageservice/0.29.8:
+    resolution: {integrity: sha512-qSJdvW5ttyGUB/8uWDKgo8vnIoFnXYlBP4Z/cn54btsRn6ZMw7IJGJU1381e7p/yGvMTLeGbugD53SghbnSa6g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-vue-languageservice/-/vscode-vue-languageservice-0.29.8.tgz}
+    name: vscode-vue-languageservice
+    version: 0.29.8
+    deprecated: 'WARNING: This project has been renamed to @volar/vue-language-service. Install using @volar/vue-language-service instead.'
+    dependencies:
+      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.29.8
+      '@volar/html2pug': registry.npmmirror.com/@volar/html2pug/0.29.8
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
+      '@volar/transforms': registry.npmmirror.com/@volar/transforms/0.29.8
+      '@volar/vue-code-gen': registry.npmmirror.com/@volar/vue-code-gen/0.29.8
+      '@vscode/emmet-helper': registry.npmmirror.com/@vscode/emmet-helper/2.8.4
+      '@vue/reactivity': registry.npmmirror.com/@vue/reactivity/3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+      request-light: registry.npmmirror.com/request-light/0.5.8
+      upath: registry.npmmirror.com/upath/2.0.1
+      vscode-css-languageservice: registry.npmmirror.com/vscode-css-languageservice/5.4.1
+      vscode-html-languageservice: registry.npmmirror.com/vscode-html-languageservice/4.2.4
+      vscode-json-languageservice: registry.npmmirror.com/vscode-json-languageservice/4.2.1
+      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
+      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
+      vscode-pug-languageservice: registry.npmmirror.com/vscode-pug-languageservice/0.29.8
+      vscode-typescript-languageservice: registry.npmmirror.com/vscode-typescript-languageservice/0.29.8
+    dev: true
+
+  registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3:
+    resolution: {integrity: sha512-pT0wLRjvRuSmB+J4WJT6uuV9mO0KtSSXEAtaVXZQzyk5+DJdbLIQTbRce/TXSkfqt1l1WogO78RjtOJFiMCgfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.29.8.tgz}
+    id: registry.npmmirror.com/vue-tsc/0.29.8
+    name: vue-tsc
+    version: 0.29.8
+    hasBin: true
+    peerDependencies:
+      typescript: '*'
+    dependencies:
+      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
+      typescript: registry.npmmirror.com/typescript/4.6.3
+      vscode-vue-languageservice: registry.npmmirror.com/vscode-vue-languageservice/0.29.8
+    dev: true
+
+  registry.npmmirror.com/vue/3.2.33:
+    resolution: {integrity: sha512-si1ExAlDUrLSIg/V7D/GgA4twJwfsfgG+t9w10z38HhL/HA07132pUQ2KuwAo8qbCyMJ9e6OqrmWrOCr+jW7ZQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue/-/vue-3.2.33.tgz}
+    name: vue
+    version: 3.2.33
+    dependencies:
+      '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.33
+      '@vue/compiler-sfc': registry.npmmirror.com/@vue/compiler-sfc/3.2.33
+      '@vue/runtime-dom': registry.npmmirror.com/@vue/runtime-dom/3.2.33
+      '@vue/server-renderer': registry.npmmirror.com/@vue/server-renderer/3.2.33_vue@3.2.33
+      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
+    dev: false
+
+  registry.npmmirror.com/with/7.0.2:
+    resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/with/-/with-7.0.2.tgz}
+    name: with
+    version: 7.0.2
+    engines: {node: '>= 10.0.0'}
+    dependencies:
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
+      assert-never: registry.npmmirror.com/assert-never/1.2.1
+      babel-walk: registry.npmmirror.com/babel-walk/3.0.0-canary-5
+    dev: true
+
+  registry.npmmirror.com/yallist/4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz}
+    name: yallist
+    version: 4.0.0
+    dev: true
diff --git a/diboot-admin-ui/public/favicon.ico b/diboot-admin-ui/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..df36fcfb72584e00488330b560ebcf34a41c64c2
GIT binary patch
literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

literal 0
HcmV?d00001

diff --git a/diboot-admin-ui/src/App.vue b/diboot-admin-ui/src/App.vue
new file mode 100644
index 00000000..1503baf9
--- /dev/null
+++ b/diboot-admin-ui/src/App.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+// This starter template is using Vue 3 <script setup> SFCs
+// Check out https://vuejs.org/api/sfc-script-setup.html#script-setup
+import HelloWorld from './components/HelloWorld.vue'
+</script>
+
+<template>
+  <img alt="Vue logo" src="./assets/logo.png" />
+  <HelloWorld msg="Hello Vue 3 + TypeScript + Vite" />
+</template>
+
+<style>
+#app {
+  font-family: Avenir, Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-align: center;
+  color: #2c3e50;
+  margin-top: 60px;
+}
+</style>
diff --git a/diboot-admin-ui/src/assets/logo.png b/diboot-admin-ui/src/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43
GIT binary patch
literal 6849
zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC&
zL0ag7$U(XW5YR7p&Ux?s<Na=)C)s<=p5LrlQ`Vj}i8j!?Lr2R_OGZXUr=_WGNV*Q3
zf2k=+zm;ZH`J@Y*r-qrQk(;BZj~xa<rsClC5CPOe**PH$5q1uK9)k!4GBOHYq_LT&
znXV4h-VG&gcg`d3i*hHS$;cFxeBJHrT@aqYhX^Mm8V1^F=>P$d4lvMt8C^+TcQu4F
zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}&
zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj
zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1
zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA
zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh
z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q
z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM
zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G
zwDA8AR)VCA#JOkxm#6<Fk;3Qv_CIk;8vG~n5ol7lV@Ppr$`vO}M#g$eOI^j-clMjL
zOPuv5uLtX1JFT#MwySH_RJ4r>oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G
zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%<lxjl%Ocl~M2y2lP|
zbFM`Z-*dEp9W{5_I?FqgKOqcjrGzul_KvvA0B9o^)C&!8LQLB95vnvr20|)KwER)3
zg@AiPX~4f9{zIy9K63eeK%_eUy<Xj$!il}`M9Aai_i>+_bCw_<t<K-?r^}*l>{<&~
zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj<EWM
zKtfCf^Zg1tRdj=Xm)|^7J1pa)+-CDvXj&R?416f(tgg8|WBR8cdxDx?*Yn+_9!KKY
zYfc;GQgX!L+9q}en#aZ8FKqby@Ji7SuT!4)GFKidFyC9wMywvB3c%^>1fo(ce4l-9
z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL
zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ
z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7<UU2Y^EpY^fzuq-h_rtLL
zw8{`NN~<)$oMx`|^gGr>sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P
zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4
z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m
zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^
zn$5}Q$G!@fTwD$e(x-~aWP0h+4N<q|;xEwzsU+0W)#|>Rz$Kln<bW)%U3n>O_H2c<
z(XX#lPuW_%H#Q+c&(nRyX1-Ia<yTsbNAz3PBfuh9@JU{>dKR-%$4FYC0fsCmL9ky3
zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#`
z2QhvH5w&V;wER?mopu+nqu*n8p~(%Q<o-E#HMmv_6Lr(S<y?zXl02$twV54+g=p_C
zbPW!;qljHcIPw~aX95_u!itzF%xKBH?y!MCRe^`1V@8<G!;_`~Q-@-mUm7r`3Jc*<
zW|jM!A9`X|osT!srEU-27h+^5j<OqNPj-EFHPokG&HB5WAG01lt!13`S9niUI^dz+
zrPE=GX-SXL@wqVGe*HT?V{#O~&~?uH#PoV2h;Vj@x`#d8)T&F})!(j^f1!z+l?Jjx
zylKosI<}}<nHbsk7I?v<<vXs6tPoozmJ}avD&{J7$vR$!Ni~Q@;tH>kwSs&*0eJwa
zMXR05`OSFpfyRb!<VB&Y0bEEVE$hSNXH(0mbzS-;?|O<AG)<R8gmLSuf>Y_+H@O%Y
z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL
zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY
z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W
zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6
zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o
z$=#_=aBkhe(ifX}MLT()@5?<tMQW)|T904`EDIN{(*~?7PZ%vrUEuUf@Om1Lh8V<U
zqvVYpe+tw_sKHyj#O-VCO5S%E1lshLO74De`Gk2E(7WE#<PpDtbvmnFnSOqG1oI3d
zYC<jZo_G~2KIE6{8;7bJFfC?E4zS>OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{
z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd
zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX
zoI=B}+$R22&IL`NCYUYjrdhwjnM<dIpta11b@>x_v=-Qcx-jmtN>!Zqf|n1^SWrHy
zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b
z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez
z={AM*r-bQs6*z$!*V<pNyBZpFi*F}aPuOZk!oD1sov}{rrxFZa@)!5H(|DKR-T0B*
zk=XmkSgqtSP+yWN@0aMgOdP>A4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd
zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz!
z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K
zXQr#6H}>a-GYs9^bG<C4b$CvneP46N2fi^kmcJjoTXRGgd^g1b&uQ5spV5+b#%y`#
zrU;H~D)utn!YWIi=j;?C-zcJ^D5xZF+#(?rMdp;)?KT1xBnMkmoV;zh&S;rXW6QQx
zWTQ2K14`6wG0eo+=1oSxjIHJc9Zkw+()XT69~5<`ZtDM}Z2bxUwYy3m%<I&~-0+^1
zYtu2vJf--MIxlG~PPDn;z8t5-=$6>P2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q
z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9
zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(<oDDN)6%Ctygl~O
zyPZcr9YCj-jDP7@YK23SJG!MDFZ1)E9`{R$R<J$u)%oUM9#k)$atlYczfhesFXL-4
zvsoG-9l@uTA8QI2Z$HsSvPZlMpB!@DV{4Bs(b)t!a<<4O@H~uuN{fO$vY>LgacooD
z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM
zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0
zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH;
zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK<ll>=t#
z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky
zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG
z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V
zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS
zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB
zHBol<PMLlw!1W2AX{4`0(aI-^)x1d_zq-0U*e!X=g^kk>OHYBas@&{PT=R+?d8pZu
zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ
zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86
z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q
z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1
zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX
zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~
zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T
z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC
z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0F<zVqs?Raxz=2A>B
z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb
zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o
zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c
z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se
zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M
z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y
z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh
zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem
zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72yd<aYLC-(YWFHR=3p2C;o@
zP>rFvm`R<qZaNijJ?9e0Ao@J0FQbg1c%wi*X&vhQIV{0-tqBevRs?R)1sbxUT&}HJ
z*KdKSzTFX7&Aa4>j-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc#
z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S<m;S)8!_N`GikUqEGHdRcGU-QPEbp3se
zE7LrqZLNv81NNuz!tDCc*XEM9tD}O}AA<wr-O|Mp0pzPgSb{6jitn>)4^*t8Va3HR
zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i
zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r
zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOM<s@Z}LbUcXA@TIG=Q@myo%l9hl^&h34x
zu6;dv<5;?t)>lK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C
z3HR9ssH7a&Vr<6waJrU<Uz3;wi7<=4xfd1VLN$2P7x}BBS2io@ltlrnmzyIDtt<yX
zAPcqxp4#$=Z%yky_m)4l_cnk`*u)Ahtuv8K{6vhAKMH6ow@c&kpm#&qGLE(Nu?A^>
zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N
zQUR>oadnG17#hNc$pkTp+9<O}Jes}mOYA)lX@8ntoYG-_HA4-;x|^l1dmnFbnH;3A
zo7RmzjAt!StB&)wt}}Vz$Tx7{+QOd#U@!|=V-Oy>lW+MBKHRZ~7<Tp{OpB;sNJVcO
zP9gJmH&Z2nt++Wk^~d|9`p`s~@#e4h2h+!@-1=fBDgb_osGReiQgZ>4XWUryd)4yd
zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR
zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T
z9rrj=?I<GKR}2`GsAAn<o<uOC`pid<%}8(c`p&zgnk&0rnZ{7Rb)^0-DfYcASTQ0s
zKO0S&yqP5xyM1crewennx~2nl$+FH?k$&4izqT?3*7J(SmJOw`dZb5FYs=|K5XN*~
z@!QVYGRE&)UH{eRL^>H*qI5{G@Rn&}^Z{+TW}mQe<Ew(X_9Cg%_)${IZP(Sf(i}}#
zbP^Uyd)|N;rJ4rvPkN0$CN?X?Bu3o`sBkNx9e)Hk<|kZoor>b9=8b<_a`&Cm#n%n~
zU47MvCBsdXFB1+adOO)03+nczfWa#vwk<X*p?NEOGFg@VXR_YfNi3ZWGup*ZMYLrd
zivdVFWx1f#$rH$D0S;+?%}dLVO}~LftMC3)E?;ORtVD#gO@_oLGdOsk#uT@)CP$RI
z#-#zp;&|vD_rYnvw~2N0Wp+nQ+xVJ$IH9kk(&N_Uad`)ORc-o<^o9v_z)$2HD4jGQ
zI}WMPN93Rji|(>#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A
zrRQ~(Ygh_ebltHo1VC<XI}!-0hb>bJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L
zFlJ_th0vxO7;-opU@WA<a+$A0VKV&CD~?Y9W`bM2k~*P|j8E*2CoV8)Cu!IV5;k=`
zm0lA9424u4MQ;9hkajM?rCu<5Nio0ru*d*6!O7wLB^>Fe;<}?!2q?RBrFK5U{<mA*
z;WN^+Hz{=MA9j{=Q!Qyy7=i0XTx(4nT94X=`8CIvSzRT*3@ox%j?(gLc30~Knc##R
z`(0eGu62$+sd#-(+!IS_v$FsA^Q8gK0r%Y15^&Pc`)3fzUE9X{;k8eN8;R}9b;E)`
zT8R>*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u
z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l
zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16
zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^<V!az}@c{ARa+_X}NO~a$=9p
za)_Ly?(LOnFWV{rQbS?1K7hP~fC?!$z}<pP%6*k1O(nj^MX2}V?0EMJUI;+4&As(@
zxYB>4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?-<xQqj`npk`D=fcL`B%EgjfC99(LE
z!z(C4-ap+uQYSIckaE<2uA^ag^t_eaYn_Jfq@U?vzOdv%t*)||aVad7PZ((`gpV!x
rZ$0M!)qwuD?ff?h#CY04MnNVFTnmG)-+p%fr;?V2o_dw4E$;sThR3J6

literal 0
HcmV?d00001

diff --git a/diboot-admin-ui/src/components/HelloWorld.vue b/diboot-admin-ui/src/components/HelloWorld.vue
new file mode 100644
index 00000000..38dae707
--- /dev/null
+++ b/diboot-admin-ui/src/components/HelloWorld.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+defineProps<{ msg: string }>()
+
+const count = ref(0)
+</script>
+
+<template>
+  <h1>{{ msg }}</h1>
+
+  <p>
+    Recommended IDE setup:
+    <a href="https://code.visualstudio.com/" target="_blank">VS Code</a>
+    +
+    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
+  </p>
+
+  <p>See <code>README.md</code> for more information.</p>
+
+  <p>
+    <a href="https://vitejs.dev/guide/features.html" target="_blank">
+      Vite Docs
+    </a>
+    |
+    <a href="https://v3.vuejs.org/" target="_blank">Vue 3 Docs</a>
+  </p>
+
+  <button type="button" @click="count++">count is: {{ count }}</button>
+  <p>
+    Edit
+    <code>components/HelloWorld.vue</code> to test hot module replacement.
+  </p>
+</template>
+
+<style scoped>
+a {
+  color: #42b983;
+}
+
+label {
+  margin: 0 0.5em;
+  font-weight: bold;
+}
+
+code {
+  background-color: #eee;
+  padding: 2px 4px;
+  border-radius: 4px;
+  color: #304455;
+}
+</style>
diff --git a/diboot-admin-ui/src/env.d.ts b/diboot-admin-ui/src/env.d.ts
new file mode 100644
index 00000000..aafef950
--- /dev/null
+++ b/diboot-admin-ui/src/env.d.ts
@@ -0,0 +1,8 @@
+/// <reference types="vite/client" />
+
+declare module '*.vue' {
+  import type { DefineComponent } from 'vue'
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  const component: DefineComponent<{}, {}, any>
+  export default component
+}
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
new file mode 100644
index 00000000..01433bca
--- /dev/null
+++ b/diboot-admin-ui/src/main.ts
@@ -0,0 +1,4 @@
+import { createApp } from 'vue'
+import App from './App.vue'
+
+createApp(App).mount('#app')
diff --git a/diboot-admin-ui/tsconfig.json b/diboot-admin-ui/tsconfig.json
new file mode 100644
index 00000000..52205ea0
--- /dev/null
+++ b/diboot-admin-ui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "useDefineForClassFields": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "strict": true,
+    "jsx": "preserve",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "lib": ["esnext", "dom"]
+  },
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}
diff --git a/diboot-admin-ui/tsconfig.node.json b/diboot-admin-ui/tsconfig.node.json
new file mode 100644
index 00000000..e993792c
--- /dev/null
+++ b/diboot-admin-ui/tsconfig.node.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
new file mode 100644
index 00000000..315212d6
--- /dev/null
+++ b/diboot-admin-ui/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [vue()]
+})
-- 
Gitee


From 46c2eb2f3534e669eeb59e5a099234d27d820812 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 19 Apr 2022 12:06:22 +0800
Subject: [PATCH 012/195] + eslint init

---
 diboot-admin-ui/.eslintignore  |   19 +
 diboot-admin-ui/.eslintrc.js   |   30 +
 diboot-admin-ui/package.json   |   14 +-
 diboot-admin-ui/pnpm-lock.yaml | 1158 ++++++++++++++++++++++++++++++++
 diboot-admin-ui/vite.config.ts |    9 +-
 5 files changed, 1224 insertions(+), 6 deletions(-)
 create mode 100644 diboot-admin-ui/.eslintignore
 create mode 100644 diboot-admin-ui/.eslintrc.js

diff --git a/diboot-admin-ui/.eslintignore b/diboot-admin-ui/.eslintignore
new file mode 100644
index 00000000..0dc990b0
--- /dev/null
+++ b/diboot-admin-ui/.eslintignore
@@ -0,0 +1,19 @@
+node_modules
+public
+dist
+
+/bin
+/docs
+
+.vscode
+.idea
+
+*.sh
+*.md
+*.woff
+*.ttf
+.husky
+.local
+.eslintrc.js
+
+/src/mock/*
diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
new file mode 100644
index 00000000..febfb403
--- /dev/null
+++ b/diboot-admin-ui/.eslintrc.js
@@ -0,0 +1,30 @@
+module.exports = {
+    env: {
+        browser: true,
+        es2021: true,
+        node: true
+    },
+    parser: "vue-eslint-parser",
+    extends: [
+        "eslint:recommended",
+        "plugin:vue/vue3-recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    parserOptions: {
+        ecmaVersion: "latest",
+        parser: "@typescript-eslint/parser",
+        sourceType: "module"
+    },
+    plugins: [
+        "vue",
+        "@typescript-eslint"
+    ],
+    globals: {
+        defineProps: 'readonly',
+        defineEmits: 'readonly',
+        defineExpose: 'readonly',
+        withDefaults: 'readonly',
+    },
+    rules: {
+    }
+}
diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 02d65be3..4ac6beaf 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -1,19 +1,25 @@
 {
-  "name": "vite-project",
+  "name": "diboot-admin-ui",
   "private": true,
-  "version": "0.0.0",
+  "version": "3.0.0",
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "lint": "eslint --ext ./src"
   },
   "dependencies": {
     "vue": "^3.2.25"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.20.0",
+    "@typescript-eslint/parser": "^5.20.0",
     "@vitejs/plugin-vue": "^2.3.1",
+    "eslint": "^8.13.0",
+    "eslint-plugin-vue": "^8.6.0",
     "typescript": "^4.5.4",
     "vite": "^2.9.2",
+    "vite-plugin-eslint": "^1.4.0",
     "vue-tsc": "^0.29.8"
   }
-}
\ No newline at end of file
+}
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 473b2274..0dba4f0e 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -1,9 +1,14 @@
 lockfileVersion: 5.3
 
 specifiers:
+  '@typescript-eslint/eslint-plugin': ^5.20.0
+  '@typescript-eslint/parser': ^5.20.0
   '@vitejs/plugin-vue': ^2.3.1
+  eslint: ^8.13.0
+  eslint-plugin-vue: ^8.6.0
   typescript: ^4.5.4
   vite: ^2.9.2
+  vite-plugin-eslint: ^1.4.0
   vue: ^3.2.25
   vue-tsc: ^0.29.8
 
@@ -11,9 +16,14 @@ dependencies:
   vue: registry.npmmirror.com/vue/3.2.33
 
 devDependencies:
+  '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf
+  '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
   '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33
+  eslint: registry.npmmirror.com/eslint/8.13.0
+  eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0
   typescript: registry.npmmirror.com/typescript/4.6.3
   vite: registry.npmmirror.com/vite/2.9.5
+  vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
   vue-tsc: registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3
 
 packages:
@@ -64,6 +74,234 @@ packages:
     version: 1.0.0
     dev: true
 
+  registry.npmmirror.com/@eslint/eslintrc/1.2.1:
+    resolution: {integrity: sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz}
+    name: '@eslint/eslintrc'
+    version: 1.2.1
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      ajv: registry.npmmirror.com/ajv/6.12.6
+      debug: registry.npmmirror.com/debug/4.3.4
+      espree: registry.npmmirror.com/espree/9.3.1
+      globals: registry.npmmirror.com/globals/13.13.0
+      ignore: registry.npmmirror.com/ignore/5.2.0
+      import-fresh: registry.npmmirror.com/import-fresh/3.3.0
+      js-yaml: registry.npmmirror.com/js-yaml/4.1.0
+      minimatch: registry.npmmirror.com/minimatch/3.1.2
+      strip-json-comments: registry.npmmirror.com/strip-json-comments/3.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/@humanwhocodes/config-array/0.9.5:
+    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz}
+    name: '@humanwhocodes/config-array'
+    version: 0.9.5
+    engines: {node: '>=10.10.0'}
+    dependencies:
+      '@humanwhocodes/object-schema': registry.npmmirror.com/@humanwhocodes/object-schema/1.2.1
+      debug: registry.npmmirror.com/debug/4.3.4
+      minimatch: registry.npmmirror.com/minimatch/3.1.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/@humanwhocodes/object-schema/1.2.1:
+    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz}
+    name: '@humanwhocodes/object-schema'
+    version: 1.2.1
+    dev: true
+
+  registry.npmmirror.com/@nodelib/fs.scandir/2.1.5:
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz}
+    name: '@nodelib/fs.scandir'
+    version: 2.1.5
+    engines: {node: '>= 8'}
+    dependencies:
+      '@nodelib/fs.stat': registry.npmmirror.com/@nodelib/fs.stat/2.0.5
+      run-parallel: registry.npmmirror.com/run-parallel/1.2.0
+    dev: true
+
+  registry.npmmirror.com/@nodelib/fs.stat/2.0.5:
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz}
+    name: '@nodelib/fs.stat'
+    version: 2.0.5
+    engines: {node: '>= 8'}
+    dev: true
+
+  registry.npmmirror.com/@nodelib/fs.walk/1.2.8:
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz}
+    name: '@nodelib/fs.walk'
+    version: 1.2.8
+    engines: {node: '>= 8'}
+    dependencies:
+      '@nodelib/fs.scandir': registry.npmmirror.com/@nodelib/fs.scandir/2.1.5
+      fastq: registry.npmmirror.com/fastq/1.13.0
+    dev: true
+
+  registry.npmmirror.com/@rollup/pluginutils/4.2.1:
+    resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz}
+    name: '@rollup/pluginutils'
+    version: 4.2.1
+    engines: {node: '>= 8.0.0'}
+    dependencies:
+      estree-walker: registry.npmmirror.com/estree-walker/2.0.2
+      picomatch: registry.npmmirror.com/picomatch/2.3.1
+    dev: true
+
+  registry.npmmirror.com/@types/json-schema/7.0.11:
+    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz}
+    name: '@types/json-schema'
+    version: 7.0.11
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf:
+    resolution: {integrity: sha512-fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0
+    name: '@typescript-eslint/eslint-plugin'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
+      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0
+      '@typescript-eslint/type-utils': registry.npmmirror.com/@typescript-eslint/type-utils/5.20.0_eslint@8.13.0+typescript@4.6.3
+      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.20.0_eslint@8.13.0+typescript@4.6.3
+      debug: registry.npmmirror.com/debug/4.3.4
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      functional-red-black-tree: registry.npmmirror.com/functional-red-black-tree/1.0.1
+      ignore: registry.npmmirror.com/ignore/5.2.0
+      regexpp: registry.npmmirror.com/regexpp/3.2.0
+      semver: registry.npmmirror.com/semver/7.3.7
+      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3
+      typescript: registry.npmmirror.com/typescript/4.6.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3:
+    resolution: {integrity: sha512-UWKibrCZQCYvobmu3/N8TWbEeo/EPQbS41Ux1F9XqPzGuV7pfg6n50ZrFo6hryynD8qOTTfLHtHjjdQtxJ0h/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.20.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/parser/5.20.0
+    name: '@typescript-eslint/parser'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
+      '@typescript-eslint/typescript-estree': registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0_typescript@4.6.3
+      debug: registry.npmmirror.com/debug/4.3.4
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      typescript: registry.npmmirror.com/typescript/4.6.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0:
+    resolution: {integrity: sha512-h9KtuPZ4D/JuX7rpp1iKg3zOH0WNEa+ZIXwpW/KWmEFDxlA/HSfCMhiyF1HS/drTICjIbpA6OqkAhrP/zkCStg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.20.0.tgz}
+    name: '@typescript-eslint/scope-manager'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
+      '@typescript-eslint/visitor-keys': registry.npmmirror.com/@typescript-eslint/visitor-keys/5.20.0
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/type-utils/5.20.0_eslint@8.13.0+typescript@4.6.3:
+    resolution: {integrity: sha512-WxNrCwYB3N/m8ceyoGCgbLmuZwupvzN0rE8NBuwnl7APgjv24ZJIjkNzoFBXPRCGzLNkoU/WfanW0exvp/+3Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.20.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/type-utils/5.20.0
+    name: '@typescript-eslint/type-utils'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.20.0_eslint@8.13.0+typescript@4.6.3
+      debug: registry.npmmirror.com/debug/4.3.4
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3
+      typescript: registry.npmmirror.com/typescript/4.6.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/types/5.20.0:
+    resolution: {integrity: sha512-+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.20.0.tgz}
+    name: '@typescript-eslint/types'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0_typescript@4.6.3:
+    resolution: {integrity: sha512-36xLjP/+bXusLMrT9fMMYy1KJAGgHhlER2TqpUVDYUQg4w0q/NW/sg4UGAgVwAqb8V4zYg43KMUpM8vV2lve6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.20.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0
+    name: '@typescript-eslint/typescript-estree'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
+      '@typescript-eslint/visitor-keys': registry.npmmirror.com/@typescript-eslint/visitor-keys/5.20.0
+      debug: registry.npmmirror.com/debug/4.3.4
+      globby: registry.npmmirror.com/globby/11.1.0
+      is-glob: registry.npmmirror.com/is-glob/4.0.3
+      semver: registry.npmmirror.com/semver/7.3.7
+      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3
+      typescript: registry.npmmirror.com/typescript/4.6.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/utils/5.20.0_eslint@8.13.0+typescript@4.6.3:
+    resolution: {integrity: sha512-lHONGJL1LIO12Ujyx8L8xKbwWSkoUKFSO+0wDAqGXiudWB2EO7WEUT+YZLtVbmOmSllAjLb9tpoIPwpRe5Tn6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.20.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/utils/5.20.0
+    name: '@typescript-eslint/utils'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@types/json-schema': registry.npmmirror.com/@types/json-schema/7.0.11
+      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
+      '@typescript-eslint/typescript-estree': registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0_typescript@4.6.3
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint-scope: registry.npmmirror.com/eslint-scope/5.1.1
+      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  registry.npmmirror.com/@typescript-eslint/visitor-keys/5.20.0:
+    resolution: {integrity: sha512-1flRpNF+0CAQkMNlTJ6L/Z5jiODG/e5+7mk6XwtPOUS3UrTz3UOiAg9jG2VtKsWI6rZQfy4C6a232QNRZTRGlg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.20.0.tgz}
+    name: '@typescript-eslint/visitor-keys'
+    version: 5.20.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
+      eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
+    dev: true
+
   registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33:
     resolution: {integrity: sha512-YNzBt8+jt6bSwpt7LP890U1UcTOIZZxfpE5WOJ638PNxSEKOqAi0+FSKS0nVeukfdZ0Ai/H7AFd6k3hayfGZqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-2.3.1.tgz}
     id: registry.npmmirror.com/@vitejs/plugin-vue/2.3.1
@@ -252,6 +490,17 @@ packages:
     name: '@vue/shared'
     version: 3.2.33
 
+  registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.0:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz}
+    id: registry.npmmirror.com/acorn-jsx/5.3.2
+    name: acorn-jsx
+    version: 5.3.2
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      acorn: registry.npmmirror.com/acorn/8.7.0
+    dev: true
+
   registry.npmmirror.com/acorn/7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz}
     name: acorn
@@ -260,6 +509,54 @@ packages:
     hasBin: true
     dev: true
 
+  registry.npmmirror.com/acorn/8.7.0:
+    resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn/-/acorn-8.7.0.tgz}
+    name: acorn
+    version: 8.7.0
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+    dev: true
+
+  registry.npmmirror.com/ajv/6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz}
+    name: ajv
+    version: 6.12.6
+    dependencies:
+      fast-deep-equal: registry.npmmirror.com/fast-deep-equal/3.1.3
+      fast-json-stable-stringify: registry.npmmirror.com/fast-json-stable-stringify/2.1.0
+      json-schema-traverse: registry.npmmirror.com/json-schema-traverse/0.4.1
+      uri-js: registry.npmmirror.com/uri-js/4.4.1
+    dev: true
+
+  registry.npmmirror.com/ansi-regex/5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz}
+    name: ansi-regex
+    version: 5.0.1
+    engines: {node: '>=8'}
+    dev: true
+
+  registry.npmmirror.com/ansi-styles/4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz}
+    name: ansi-styles
+    version: 4.3.0
+    engines: {node: '>=8'}
+    dependencies:
+      color-convert: registry.npmmirror.com/color-convert/2.0.1
+    dev: true
+
+  registry.npmmirror.com/argparse/2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz}
+    name: argparse
+    version: 2.0.1
+    dev: true
+
+  registry.npmmirror.com/array-union/2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz}
+    name: array-union
+    version: 2.1.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/asap/2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asap/-/asap-2.0.6.tgz}
     name: asap
@@ -281,6 +578,30 @@ packages:
       '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
     dev: true
 
+  registry.npmmirror.com/balanced-match/1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz}
+    name: balanced-match
+    version: 1.0.2
+    dev: true
+
+  registry.npmmirror.com/brace-expansion/1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz}
+    name: brace-expansion
+    version: 1.1.11
+    dependencies:
+      balanced-match: registry.npmmirror.com/balanced-match/1.0.2
+      concat-map: registry.npmmirror.com/concat-map/0.0.1
+    dev: true
+
+  registry.npmmirror.com/braces/3.0.2:
+    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz}
+    name: braces
+    version: 3.0.2
+    engines: {node: '>=8'}
+    dependencies:
+      fill-range: registry.npmmirror.com/fill-range/7.0.1
+    dev: true
+
   registry.npmmirror.com/call-bind/1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz}
     name: call-bind
@@ -290,6 +611,23 @@ packages:
       get-intrinsic: registry.npmmirror.com/get-intrinsic/1.1.1
     dev: true
 
+  registry.npmmirror.com/callsites/3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz}
+    name: callsites
+    version: 3.1.0
+    engines: {node: '>=6'}
+    dev: true
+
+  registry.npmmirror.com/chalk/4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz}
+    name: chalk
+    version: 4.1.2
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-styles: registry.npmmirror.com/ansi-styles/4.3.0
+      supports-color: registry.npmmirror.com/supports-color/7.2.0
+    dev: true
+
   registry.npmmirror.com/character-parser/2.2.0:
     resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/character-parser/-/character-parser-2.2.0.tgz}
     name: character-parser
@@ -298,6 +636,27 @@ packages:
       is-regex: registry.npmmirror.com/is-regex/1.1.4
     dev: true
 
+  registry.npmmirror.com/color-convert/2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz}
+    name: color-convert
+    version: 2.0.1
+    engines: {node: '>=7.0.0'}
+    dependencies:
+      color-name: registry.npmmirror.com/color-name/1.1.4
+    dev: true
+
+  registry.npmmirror.com/color-name/1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz}
+    name: color-name
+    version: 1.1.4
+    dev: true
+
+  registry.npmmirror.com/concat-map/0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz}
+    name: concat-map
+    version: 0.0.1
+    dev: true
+
   registry.npmmirror.com/constantinople/4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/constantinople/-/constantinople-4.0.1.tgz}
     name: constantinople
@@ -307,12 +666,61 @@ packages:
       '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
     dev: true
 
+  registry.npmmirror.com/cross-spawn/7.0.3:
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz}
+    name: cross-spawn
+    version: 7.0.3
+    engines: {node: '>= 8'}
+    dependencies:
+      path-key: registry.npmmirror.com/path-key/3.1.1
+      shebang-command: registry.npmmirror.com/shebang-command/2.0.0
+      which: registry.npmmirror.com/which/2.0.2
+    dev: true
+
   registry.npmmirror.com/csstype/2.6.20:
     resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz}
     name: csstype
     version: 2.6.20
     dev: false
 
+  registry.npmmirror.com/debug/4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz}
+    name: debug
+    version: 4.3.4
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: registry.npmmirror.com/ms/2.1.2
+    dev: true
+
+  registry.npmmirror.com/deep-is/0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz}
+    name: deep-is
+    version: 0.1.4
+    dev: true
+
+  registry.npmmirror.com/dir-glob/3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz}
+    name: dir-glob
+    version: 3.0.1
+    engines: {node: '>=8'}
+    dependencies:
+      path-type: registry.npmmirror.com/path-type/4.0.0
+    dev: true
+
+  registry.npmmirror.com/doctrine/3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz}
+    name: doctrine
+    version: 3.0.0
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      esutils: registry.npmmirror.com/esutils/2.0.3
+    dev: true
+
   registry.npmmirror.com/doctypes/1.1.0:
     resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/doctypes/-/doctypes-1.1.0.tgz}
     name: doctypes
@@ -626,11 +1034,258 @@ packages:
       esbuild-windows-arm64: registry.npmmirror.com/esbuild-windows-arm64/0.14.36
     dev: true
 
+  registry.npmmirror.com/escape-string-regexp/4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}
+    name: escape-string-regexp
+    version: 4.0.0
+    engines: {node: '>=10'}
+    dev: true
+
+  registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0:
+    resolution: {integrity: sha512-abXiF2J18n/7ZPy9foSlJyouKf54IqpKlNvNmzhM93N0zs3QUxZG/oBd3tVPOJTKg7SlhBUtPxugpqzNbgGpQQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.6.0.tgz}
+    id: registry.npmmirror.com/eslint-plugin-vue/8.6.0
+    name: eslint-plugin-vue
+    version: 8.6.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0
+      natural-compare: registry.npmmirror.com/natural-compare/1.4.0
+      semver: registry.npmmirror.com/semver/7.3.7
+      vue-eslint-parser: registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.13.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/eslint-scope/5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz}
+    name: eslint-scope
+    version: 5.1.1
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      esrecurse: registry.npmmirror.com/esrecurse/4.3.0
+      estraverse: registry.npmmirror.com/estraverse/4.3.0
+    dev: true
+
+  registry.npmmirror.com/eslint-scope/7.1.1:
+    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.1.1.tgz}
+    name: eslint-scope
+    version: 7.1.1
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      esrecurse: registry.npmmirror.com/esrecurse/4.3.0
+      estraverse: registry.npmmirror.com/estraverse/5.3.0
+    dev: true
+
+  registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0:
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-utils/-/eslint-utils-3.0.0.tgz}
+    id: registry.npmmirror.com/eslint-utils/3.0.0
+    name: eslint-utils
+    version: 3.0.0
+    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
+    peerDependencies:
+      eslint: '>=5'
+    dependencies:
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/2.1.0
+    dev: true
+
+  registry.npmmirror.com/eslint-visitor-keys/2.1.0:
+    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz}
+    name: eslint-visitor-keys
+    version: 2.1.0
+    engines: {node: '>=10'}
+    dev: true
+
+  registry.npmmirror.com/eslint-visitor-keys/3.3.0:
+    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz}
+    name: eslint-visitor-keys
+    version: 3.3.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  registry.npmmirror.com/eslint/8.13.0:
+    resolution: {integrity: sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint/-/eslint-8.13.0.tgz}
+    name: eslint
+    version: 8.13.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      '@eslint/eslintrc': registry.npmmirror.com/@eslint/eslintrc/1.2.1
+      '@humanwhocodes/config-array': registry.npmmirror.com/@humanwhocodes/config-array/0.9.5
+      ajv: registry.npmmirror.com/ajv/6.12.6
+      chalk: registry.npmmirror.com/chalk/4.1.2
+      cross-spawn: registry.npmmirror.com/cross-spawn/7.0.3
+      debug: registry.npmmirror.com/debug/4.3.4
+      doctrine: registry.npmmirror.com/doctrine/3.0.0
+      escape-string-regexp: registry.npmmirror.com/escape-string-regexp/4.0.0
+      eslint-scope: registry.npmmirror.com/eslint-scope/7.1.1
+      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0
+      eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
+      espree: registry.npmmirror.com/espree/9.3.1
+      esquery: registry.npmmirror.com/esquery/1.4.0
+      esutils: registry.npmmirror.com/esutils/2.0.3
+      fast-deep-equal: registry.npmmirror.com/fast-deep-equal/3.1.3
+      file-entry-cache: registry.npmmirror.com/file-entry-cache/6.0.1
+      functional-red-black-tree: registry.npmmirror.com/functional-red-black-tree/1.0.1
+      glob-parent: registry.npmmirror.com/glob-parent/6.0.2
+      globals: registry.npmmirror.com/globals/13.13.0
+      ignore: registry.npmmirror.com/ignore/5.2.0
+      import-fresh: registry.npmmirror.com/import-fresh/3.3.0
+      imurmurhash: registry.npmmirror.com/imurmurhash/0.1.4
+      is-glob: registry.npmmirror.com/is-glob/4.0.3
+      js-yaml: registry.npmmirror.com/js-yaml/4.1.0
+      json-stable-stringify-without-jsonify: registry.npmmirror.com/json-stable-stringify-without-jsonify/1.0.1
+      levn: registry.npmmirror.com/levn/0.4.1
+      lodash.merge: registry.npmmirror.com/lodash.merge/4.6.2
+      minimatch: registry.npmmirror.com/minimatch/3.1.2
+      natural-compare: registry.npmmirror.com/natural-compare/1.4.0
+      optionator: registry.npmmirror.com/optionator/0.9.1
+      regexpp: registry.npmmirror.com/regexpp/3.2.0
+      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
+      strip-json-comments: registry.npmmirror.com/strip-json-comments/3.1.1
+      text-table: registry.npmmirror.com/text-table/0.2.0
+      v8-compile-cache: registry.npmmirror.com/v8-compile-cache/2.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/espree/9.3.1:
+    resolution: {integrity: sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/espree/-/espree-9.3.1.tgz}
+    name: espree
+    version: 9.3.1
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      acorn: registry.npmmirror.com/acorn/8.7.0
+      acorn-jsx: registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.0
+      eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
+    dev: true
+
+  registry.npmmirror.com/esquery/1.4.0:
+    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esquery/-/esquery-1.4.0.tgz}
+    name: esquery
+    version: 1.4.0
+    engines: {node: '>=0.10'}
+    dependencies:
+      estraverse: registry.npmmirror.com/estraverse/5.3.0
+    dev: true
+
+  registry.npmmirror.com/esrecurse/4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz}
+    name: esrecurse
+    version: 4.3.0
+    engines: {node: '>=4.0'}
+    dependencies:
+      estraverse: registry.npmmirror.com/estraverse/5.3.0
+    dev: true
+
+  registry.npmmirror.com/estraverse/4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz}
+    name: estraverse
+    version: 4.3.0
+    engines: {node: '>=4.0'}
+    dev: true
+
+  registry.npmmirror.com/estraverse/5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz}
+    name: estraverse
+    version: 5.3.0
+    engines: {node: '>=4.0'}
+    dev: true
+
   registry.npmmirror.com/estree-walker/2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz}
     name: estree-walker
     version: 2.0.2
 
+  registry.npmmirror.com/esutils/2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz}
+    name: esutils
+    version: 2.0.3
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/fast-deep-equal/3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz}
+    name: fast-deep-equal
+    version: 3.1.3
+    dev: true
+
+  registry.npmmirror.com/fast-glob/3.2.11:
+    resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.11.tgz}
+    name: fast-glob
+    version: 3.2.11
+    engines: {node: '>=8.6.0'}
+    dependencies:
+      '@nodelib/fs.stat': registry.npmmirror.com/@nodelib/fs.stat/2.0.5
+      '@nodelib/fs.walk': registry.npmmirror.com/@nodelib/fs.walk/1.2.8
+      glob-parent: registry.npmmirror.com/glob-parent/5.1.2
+      merge2: registry.npmmirror.com/merge2/1.4.1
+      micromatch: registry.npmmirror.com/micromatch/4.0.5
+    dev: true
+
+  registry.npmmirror.com/fast-json-stable-stringify/2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz}
+    name: fast-json-stable-stringify
+    version: 2.1.0
+    dev: true
+
+  registry.npmmirror.com/fast-levenshtein/2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz}
+    name: fast-levenshtein
+    version: 2.0.6
+    dev: true
+
+  registry.npmmirror.com/fastq/1.13.0:
+    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fastq/-/fastq-1.13.0.tgz}
+    name: fastq
+    version: 1.13.0
+    dependencies:
+      reusify: registry.npmmirror.com/reusify/1.0.4
+    dev: true
+
+  registry.npmmirror.com/file-entry-cache/6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz}
+    name: file-entry-cache
+    version: 6.0.1
+    engines: {node: ^10.12.0 || >=12.0.0}
+    dependencies:
+      flat-cache: registry.npmmirror.com/flat-cache/3.0.4
+    dev: true
+
+  registry.npmmirror.com/fill-range/7.0.1:
+    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz}
+    name: fill-range
+    version: 7.0.1
+    engines: {node: '>=8'}
+    dependencies:
+      to-regex-range: registry.npmmirror.com/to-regex-range/5.0.1
+    dev: true
+
+  registry.npmmirror.com/flat-cache/3.0.4:
+    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flat-cache/-/flat-cache-3.0.4.tgz}
+    name: flat-cache
+    version: 3.0.4
+    engines: {node: ^10.12.0 || >=12.0.0}
+    dependencies:
+      flatted: registry.npmmirror.com/flatted/3.2.5
+      rimraf: registry.npmmirror.com/rimraf/3.0.2
+    dev: true
+
+  registry.npmmirror.com/flatted/3.2.5:
+    resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flatted/-/flatted-3.2.5.tgz}
+    name: flatted
+    version: 3.2.5
+    dev: true
+
+  registry.npmmirror.com/fs.realpath/1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz}
+    name: fs.realpath
+    version: 1.0.0
+    dev: true
+
   registry.npmmirror.com/fsevents/2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
     name: fsevents
@@ -647,6 +1302,12 @@ packages:
     version: 1.1.1
     dev: true
 
+  registry.npmmirror.com/functional-red-black-tree/1.0.1:
+    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz}
+    name: functional-red-black-tree
+    version: 1.0.1
+    dev: true
+
   registry.npmmirror.com/get-intrinsic/1.1.1:
     resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz}
     name: get-intrinsic
@@ -657,6 +1318,67 @@ packages:
       has-symbols: registry.npmmirror.com/has-symbols/1.0.3
     dev: true
 
+  registry.npmmirror.com/glob-parent/5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz}
+    name: glob-parent
+    version: 5.1.2
+    engines: {node: '>= 6'}
+    dependencies:
+      is-glob: registry.npmmirror.com/is-glob/4.0.3
+    dev: true
+
+  registry.npmmirror.com/glob-parent/6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz}
+    name: glob-parent
+    version: 6.0.2
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      is-glob: registry.npmmirror.com/is-glob/4.0.3
+    dev: true
+
+  registry.npmmirror.com/glob/7.2.0:
+    resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob/-/glob-7.2.0.tgz}
+    name: glob
+    version: 7.2.0
+    dependencies:
+      fs.realpath: registry.npmmirror.com/fs.realpath/1.0.0
+      inflight: registry.npmmirror.com/inflight/1.0.6
+      inherits: registry.npmmirror.com/inherits/2.0.4
+      minimatch: registry.npmmirror.com/minimatch/3.1.2
+      once: registry.npmmirror.com/once/1.4.0
+      path-is-absolute: registry.npmmirror.com/path-is-absolute/1.0.1
+    dev: true
+
+  registry.npmmirror.com/globals/13.13.0:
+    resolution: {integrity: sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globals/-/globals-13.13.0.tgz}
+    name: globals
+    version: 13.13.0
+    engines: {node: '>=8'}
+    dependencies:
+      type-fest: registry.npmmirror.com/type-fest/0.20.2
+    dev: true
+
+  registry.npmmirror.com/globby/11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globby/-/globby-11.1.0.tgz}
+    name: globby
+    version: 11.1.0
+    engines: {node: '>=10'}
+    dependencies:
+      array-union: registry.npmmirror.com/array-union/2.1.0
+      dir-glob: registry.npmmirror.com/dir-glob/3.0.1
+      fast-glob: registry.npmmirror.com/fast-glob/3.2.11
+      ignore: registry.npmmirror.com/ignore/5.2.0
+      merge2: registry.npmmirror.com/merge2/1.4.1
+      slash: registry.npmmirror.com/slash/3.0.0
+    dev: true
+
+  registry.npmmirror.com/has-flag/4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz}
+    name: has-flag
+    version: 4.0.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/has-symbols/1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz}
     name: has-symbols
@@ -693,6 +1415,45 @@ packages:
       entities: registry.npmmirror.com/entities/3.0.1
     dev: true
 
+  registry.npmmirror.com/ignore/5.2.0:
+    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ignore/-/ignore-5.2.0.tgz}
+    name: ignore
+    version: 5.2.0
+    engines: {node: '>= 4'}
+    dev: true
+
+  registry.npmmirror.com/import-fresh/3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz}
+    name: import-fresh
+    version: 3.3.0
+    engines: {node: '>=6'}
+    dependencies:
+      parent-module: registry.npmmirror.com/parent-module/1.0.1
+      resolve-from: registry.npmmirror.com/resolve-from/4.0.0
+    dev: true
+
+  registry.npmmirror.com/imurmurhash/0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz}
+    name: imurmurhash
+    version: 0.1.4
+    engines: {node: '>=0.8.19'}
+    dev: true
+
+  registry.npmmirror.com/inflight/1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz}
+    name: inflight
+    version: 1.0.6
+    dependencies:
+      once: registry.npmmirror.com/once/1.4.0
+      wrappy: registry.npmmirror.com/wrappy/1.0.2
+    dev: true
+
+  registry.npmmirror.com/inherits/2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz}
+    name: inherits
+    version: 2.0.4
+    dev: true
+
   registry.npmmirror.com/is-core-module/2.8.1:
     resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz}
     name: is-core-module
@@ -710,6 +1471,29 @@ packages:
       object-assign: registry.npmmirror.com/object-assign/4.1.1
     dev: true
 
+  registry.npmmirror.com/is-extglob/2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz}
+    name: is-extglob
+    version: 2.1.1
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/is-glob/4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz}
+    name: is-glob
+    version: 4.0.3
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-extglob: registry.npmmirror.com/is-extglob/2.1.1
+    dev: true
+
+  registry.npmmirror.com/is-number/7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz}
+    name: is-number
+    version: 7.0.0
+    engines: {node: '>=0.12.0'}
+    dev: true
+
   registry.npmmirror.com/is-promise/2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz}
     name: is-promise
@@ -726,12 +1510,39 @@ packages:
       has-tostringtag: registry.npmmirror.com/has-tostringtag/1.0.0
     dev: true
 
+  registry.npmmirror.com/isexe/2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz}
+    name: isexe
+    version: 2.0.0
+    dev: true
+
   registry.npmmirror.com/js-stringify/1.0.2:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-stringify/-/js-stringify-1.0.2.tgz}
     name: js-stringify
     version: 1.0.2
     dev: true
 
+  registry.npmmirror.com/js-yaml/4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.0.tgz}
+    name: js-yaml
+    version: 4.1.0
+    hasBin: true
+    dependencies:
+      argparse: registry.npmmirror.com/argparse/2.0.1
+    dev: true
+
+  registry.npmmirror.com/json-schema-traverse/0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz}
+    name: json-schema-traverse
+    version: 0.4.1
+    dev: true
+
+  registry.npmmirror.com/json-stable-stringify-without-jsonify/1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz}
+    name: json-stable-stringify-without-jsonify
+    version: 1.0.1
+    dev: true
+
   registry.npmmirror.com/jsonc-parser/2.3.1:
     resolution: {integrity: sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz}
     name: jsonc-parser
@@ -753,6 +1564,28 @@ packages:
       promise: registry.npmmirror.com/promise/7.3.1
     dev: true
 
+  registry.npmmirror.com/levn/0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz}
+    name: levn
+    version: 0.4.1
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      prelude-ls: registry.npmmirror.com/prelude-ls/1.2.1
+      type-check: registry.npmmirror.com/type-check/0.4.0
+    dev: true
+
+  registry.npmmirror.com/lodash.merge/4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz}
+    name: lodash.merge
+    version: 4.6.2
+    dev: true
+
+  registry.npmmirror.com/lodash/4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz}
+    name: lodash
+    version: 4.17.21
+    dev: true
+
   registry.npmmirror.com/lru-cache/6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz}
     name: lru-cache
@@ -770,6 +1603,37 @@ packages:
       sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
     dev: false
 
+  registry.npmmirror.com/merge2/1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz}
+    name: merge2
+    version: 1.4.1
+    engines: {node: '>= 8'}
+    dev: true
+
+  registry.npmmirror.com/micromatch/4.0.5:
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz}
+    name: micromatch
+    version: 4.0.5
+    engines: {node: '>=8.6'}
+    dependencies:
+      braces: registry.npmmirror.com/braces/3.0.2
+      picomatch: registry.npmmirror.com/picomatch/2.3.1
+    dev: true
+
+  registry.npmmirror.com/minimatch/3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz}
+    name: minimatch
+    version: 3.1.2
+    dependencies:
+      brace-expansion: registry.npmmirror.com/brace-expansion/1.1.11
+    dev: true
+
+  registry.npmmirror.com/ms/2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz}
+    name: ms
+    version: 2.1.2
+    dev: true
+
   registry.npmmirror.com/nanoid/3.3.2:
     resolution: {integrity: sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-3.3.2.tgz}
     name: nanoid
@@ -777,6 +1641,12 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  registry.npmmirror.com/natural-compare/1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz}
+    name: natural-compare
+    version: 1.4.0
+    dev: true
+
   registry.npmmirror.com/object-assign/4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz}
     name: object-assign
@@ -784,17 +1654,76 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  registry.npmmirror.com/once/1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/once/-/once-1.4.0.tgz}
+    name: once
+    version: 1.4.0
+    dependencies:
+      wrappy: registry.npmmirror.com/wrappy/1.0.2
+    dev: true
+
+  registry.npmmirror.com/optionator/0.9.1:
+    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/optionator/-/optionator-0.9.1.tgz}
+    name: optionator
+    version: 0.9.1
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      deep-is: registry.npmmirror.com/deep-is/0.1.4
+      fast-levenshtein: registry.npmmirror.com/fast-levenshtein/2.0.6
+      levn: registry.npmmirror.com/levn/0.4.1
+      prelude-ls: registry.npmmirror.com/prelude-ls/1.2.1
+      type-check: registry.npmmirror.com/type-check/0.4.0
+      word-wrap: registry.npmmirror.com/word-wrap/1.2.3
+    dev: true
+
+  registry.npmmirror.com/parent-module/1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz}
+    name: parent-module
+    version: 1.0.1
+    engines: {node: '>=6'}
+    dependencies:
+      callsites: registry.npmmirror.com/callsites/3.1.0
+    dev: true
+
+  registry.npmmirror.com/path-is-absolute/1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz}
+    name: path-is-absolute
+    version: 1.0.1
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/path-key/3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz}
+    name: path-key
+    version: 3.1.1
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/path-parse/1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz}
     name: path-parse
     version: 1.0.7
     dev: true
 
+  registry.npmmirror.com/path-type/4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz}
+    name: path-type
+    version: 4.0.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/picocolors/1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz}
     name: picocolors
     version: 1.0.0
 
+  registry.npmmirror.com/picomatch/2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz}
+    name: picomatch
+    version: 2.3.1
+    engines: {node: '>=8.6'}
+    dev: true
+
   registry.npmmirror.com/postcss/8.4.12:
     resolution: {integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss/-/postcss-8.4.12.tgz}
     name: postcss
@@ -805,6 +1734,13 @@ packages:
       picocolors: registry.npmmirror.com/picocolors/1.0.0
       source-map-js: registry.npmmirror.com/source-map-js/1.0.2
 
+  registry.npmmirror.com/prelude-ls/1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz}
+    name: prelude-ls
+    version: 1.2.1
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
   registry.npmmirror.com/promise/7.3.1:
     resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise/-/promise-7.3.1.tgz}
     name: promise
@@ -928,12 +1864,39 @@ packages:
       pug-strip-comments: registry.npmmirror.com/pug-strip-comments/2.0.0
     dev: true
 
+  registry.npmmirror.com/punycode/2.1.1:
+    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/punycode/-/punycode-2.1.1.tgz}
+    name: punycode
+    version: 2.1.1
+    engines: {node: '>=6'}
+    dev: true
+
+  registry.npmmirror.com/queue-microtask/1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz}
+    name: queue-microtask
+    version: 1.2.3
+    dev: true
+
+  registry.npmmirror.com/regexpp/3.2.0:
+    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz}
+    name: regexpp
+    version: 3.2.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/request-light/0.5.8:
     resolution: {integrity: sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/request-light/-/request-light-0.5.8.tgz}
     name: request-light
     version: 0.5.8
     dev: true
 
+  registry.npmmirror.com/resolve-from/4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz}
+    name: resolve-from
+    version: 4.0.0
+    engines: {node: '>=4'}
+    dev: true
+
   registry.npmmirror.com/resolve/1.22.0:
     resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve/-/resolve-1.22.0.tgz}
     name: resolve
@@ -945,6 +1908,22 @@ packages:
       supports-preserve-symlinks-flag: registry.npmmirror.com/supports-preserve-symlinks-flag/1.0.0
     dev: true
 
+  registry.npmmirror.com/reusify/1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz}
+    name: reusify
+    version: 1.0.4
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/rimraf/3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz}
+    name: rimraf
+    version: 3.0.2
+    hasBin: true
+    dependencies:
+      glob: registry.npmmirror.com/glob/7.2.0
+    dev: true
+
   registry.npmmirror.com/rollup/2.70.2:
     resolution: {integrity: sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rollup/-/rollup-2.70.2.tgz}
     name: rollup
@@ -955,6 +1934,14 @@ packages:
       fsevents: registry.npmmirror.com/fsevents/2.3.2
     dev: true
 
+  registry.npmmirror.com/run-parallel/1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz}
+    name: run-parallel
+    version: 1.2.0
+    dependencies:
+      queue-microtask: registry.npmmirror.com/queue-microtask/1.2.3
+    dev: true
+
   registry.npmmirror.com/semver/7.3.7:
     resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz}
     name: semver
@@ -965,6 +1952,29 @@ packages:
       lru-cache: registry.npmmirror.com/lru-cache/6.0.0
     dev: true
 
+  registry.npmmirror.com/shebang-command/2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz}
+    name: shebang-command
+    version: 2.0.0
+    engines: {node: '>=8'}
+    dependencies:
+      shebang-regex: registry.npmmirror.com/shebang-regex/3.0.0
+    dev: true
+
+  registry.npmmirror.com/shebang-regex/3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz}
+    name: shebang-regex
+    version: 3.0.0
+    engines: {node: '>=8'}
+    dev: true
+
+  registry.npmmirror.com/slash/3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz}
+    name: slash
+    version: 3.0.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/source-map-js/1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz}
     name: source-map-js
@@ -983,6 +1993,31 @@ packages:
     version: 1.4.8
     dev: false
 
+  registry.npmmirror.com/strip-ansi/6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz}
+    name: strip-ansi
+    version: 6.0.1
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-regex: registry.npmmirror.com/ansi-regex/5.0.1
+    dev: true
+
+  registry.npmmirror.com/strip-json-comments/3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz}
+    name: strip-json-comments
+    version: 3.1.1
+    engines: {node: '>=8'}
+    dev: true
+
+  registry.npmmirror.com/supports-color/7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz}
+    name: supports-color
+    version: 7.2.0
+    engines: {node: '>=8'}
+    dependencies:
+      has-flag: registry.npmmirror.com/has-flag/4.0.0
+    dev: true
+
   registry.npmmirror.com/supports-preserve-symlinks-flag/1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz}
     name: supports-preserve-symlinks-flag
@@ -990,6 +2025,12 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
+  registry.npmmirror.com/text-table/0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz}
+    name: text-table
+    version: 0.2.0
+    dev: true
+
   registry.npmmirror.com/to-fast-properties/2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz}
     name: to-fast-properties
@@ -997,12 +2038,56 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  registry.npmmirror.com/to-regex-range/5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz}
+    name: to-regex-range
+    version: 5.0.1
+    engines: {node: '>=8.0'}
+    dependencies:
+      is-number: registry.npmmirror.com/is-number/7.0.0
+    dev: true
+
   registry.npmmirror.com/token-stream/1.0.0:
     resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/token-stream/-/token-stream-1.0.0.tgz}
     name: token-stream
     version: 1.0.0
     dev: true
 
+  registry.npmmirror.com/tslib/1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz}
+    name: tslib
+    version: 1.14.1
+    dev: true
+
+  registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tsutils/-/tsutils-3.21.0.tgz}
+    id: registry.npmmirror.com/tsutils/3.21.0
+    name: tsutils
+    version: 3.21.0
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/1.14.1
+      typescript: registry.npmmirror.com/typescript/4.6.3
+    dev: true
+
+  registry.npmmirror.com/type-check/0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz}
+    name: type-check
+    version: 0.4.0
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      prelude-ls: registry.npmmirror.com/prelude-ls/1.2.1
+    dev: true
+
+  registry.npmmirror.com/type-fest/0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz}
+    name: type-fest
+    version: 0.20.2
+    engines: {node: '>=10'}
+    dev: true
+
   registry.npmmirror.com/typescript/4.6.3:
     resolution: {integrity: sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/typescript/-/typescript-4.6.3.tgz}
     name: typescript
@@ -1018,6 +2103,35 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  registry.npmmirror.com/uri-js/4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz}
+    name: uri-js
+    version: 4.4.1
+    dependencies:
+      punycode: registry.npmmirror.com/punycode/2.1.1
+    dev: true
+
+  registry.npmmirror.com/v8-compile-cache/2.3.0:
+    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz}
+    name: v8-compile-cache
+    version: 2.3.0
+    dev: true
+
+  registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5:
+    resolution: {integrity: sha512-EeA09UuA2E66WbbcgOFkfvEZ/SJVrTxP+syRwrX+L+jeMMPpi1W1ZIR5mMtPr4I8evaD4WrszWkPZPOW8amFpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-eslint/-/vite-plugin-eslint-1.4.0.tgz}
+    id: registry.npmmirror.com/vite-plugin-eslint/1.4.0
+    name: vite-plugin-eslint
+    version: 1.4.0
+    peerDependencies:
+      eslint: ^7.0.0
+      vite: ^2.0.0
+    dependencies:
+      '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      rollup: registry.npmmirror.com/rollup/2.70.2
+      vite: registry.npmmirror.com/vite/2.9.5
+    dev: true
+
   registry.npmmirror.com/vite/2.9.5:
     resolution: {integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-2.9.5.tgz}
     name: vite
@@ -1200,6 +2314,27 @@ packages:
       vscode-typescript-languageservice: registry.npmmirror.com/vscode-typescript-languageservice/0.29.8
     dev: true
 
+  registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.13.0:
+    resolution: {integrity: sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz}
+    id: registry.npmmirror.com/vue-eslint-parser/8.3.0
+    name: vue-eslint-parser
+    version: 8.3.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=6.0.0'
+    dependencies:
+      debug: registry.npmmirror.com/debug/4.3.4
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint-scope: registry.npmmirror.com/eslint-scope/7.1.1
+      eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
+      espree: registry.npmmirror.com/espree/9.3.1
+      esquery: registry.npmmirror.com/esquery/1.4.0
+      lodash: registry.npmmirror.com/lodash/4.17.21
+      semver: registry.npmmirror.com/semver/7.3.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3:
     resolution: {integrity: sha512-pT0wLRjvRuSmB+J4WJT6uuV9mO0KtSSXEAtaVXZQzyk5+DJdbLIQTbRce/TXSkfqt1l1WogO78RjtOJFiMCgfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.29.8.tgz}
     id: registry.npmmirror.com/vue-tsc/0.29.8
@@ -1226,6 +2361,16 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
     dev: false
 
+  registry.npmmirror.com/which/2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/which/-/which-2.0.2.tgz}
+    name: which
+    version: 2.0.2
+    engines: {node: '>= 8'}
+    hasBin: true
+    dependencies:
+      isexe: registry.npmmirror.com/isexe/2.0.0
+    dev: true
+
   registry.npmmirror.com/with/7.0.2:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/with/-/with-7.0.2.tgz}
     name: with
@@ -1238,6 +2383,19 @@ packages:
       babel-walk: registry.npmmirror.com/babel-walk/3.0.0-canary-5
     dev: true
 
+  registry.npmmirror.com/word-wrap/1.2.3:
+    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz}
+    name: word-wrap
+    version: 1.2.3
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/wrappy/1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz}
+    name: wrappy
+    version: 1.0.2
+    dev: true
+
   registry.npmmirror.com/yallist/4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz}
     name: yallist
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 315212d6..053c8ecf 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -1,7 +1,12 @@
-import { defineConfig } from 'vite'
+import {defineConfig} from 'vite'
 import vue from '@vitejs/plugin-vue'
+import eslintPlugin from "vite-plugin-eslint/dist";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [vue()]
+    plugins: [
+        vue(),
+        // eslint 自动修复
+        eslintPlugin({fix: true}),
+    ]
 })
-- 
Gitee


From a47f6ee45d9dc6df465712b3fd0e00085e7d47fe Mon Sep 17 00:00:00 2001
From: Zjp <1215582715@qq.com>
Date: Tue, 19 Apr 2022 13:57:17 +0800
Subject: [PATCH 013/195] =?UTF-8?q?=E4=BC=98=E5=8C=96BindingCacheManager.j?=
 =?UTF-8?q?ava=E7=BC=93=E5=AD=98=E7=AE=A1=E7=90=86,=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E5=8D=95=E4=BE=8B=E5=92=8C=E7=A1=AE=E4=BF=9D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/cache/BindingCacheManager.java    | 185 +++++++++---------
 1 file changed, 90 insertions(+), 95 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index 21d37b70..80663e4e 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -25,6 +25,7 @@ import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.context.annotation.Primary;
@@ -41,12 +42,9 @@ import java.util.*;
  * @version v2.2.1
  * @date 2021/04/17
  */
+@SuppressWarnings({"JavaDoc","rawtypes", "unchecked"})
 @Slf4j
 public class BindingCacheManager {
-    /**
-     * 实体相关定义缓存管理器
-     */
-    private static StaticMemoryCacheManager cacheManager;
     /**
      * 类-EntityInfo缓存key
      */
@@ -72,17 +70,87 @@ public class BindingCacheManager {
      */
     private static final String CACHE_NAME_CLASS_NAME2FLDMAP = "CLASS_NAME2FLDMAP";
 
-    private static StaticMemoryCacheManager getCacheManager(){
-        if(cacheManager == null){
-            cacheManager = new StaticMemoryCacheManager(
-                    CACHE_NAME_CLASS_ENTITY,
-                    CACHE_NAME_TABLE_ENTITY,
-                    CACHE_NAME_CLASS_PROP,
-                    CACHE_NAME_ENTITYNAME_CLASS,
-                    CACHE_NAME_CLASS_FIELDS,
-                    CACHE_NAME_CLASS_NAME2FLDMAP);
+    /**
+     * 保证单例,以及彻底加载完缓存数据后再返回
+     */
+    private static class Singleton {
+        /**
+         * 实体相关定义缓存管理器
+         */
+        static StaticMemoryCacheManager cacheManager = new StaticMemoryCacheManager(
+                CACHE_NAME_CLASS_ENTITY,
+                CACHE_NAME_TABLE_ENTITY,
+                CACHE_NAME_CLASS_PROP,
+                CACHE_NAME_ENTITYNAME_CLASS,
+                CACHE_NAME_CLASS_FIELDS,
+                CACHE_NAME_CLASS_NAME2FLDMAP
+        );
+
+        static {
+            // 初始化有service的entity缓存
+            Map<String, IService> serviceMap = ContextHelper.getApplicationContext().getBeansOfType(IService.class);
+            Set<String> uniqueEntitySet = new HashSet<>();
+            if (V.notEmpty(serviceMap)) {
+                for (Map.Entry<String, IService> entry : serviceMap.entrySet()) {
+                    Class<?> entityClass = BeanUtils.getGenericityClass(entry.getValue(), 1);
+                    if (entityClass != null) {
+                        IService<?> entityService = entry.getValue();
+                        if (uniqueEntitySet.contains(entityClass.getName())) {
+                            if (entityService.getClass().getAnnotation(Primary.class) != null) {
+                                EntityInfoCache entityInfoCache = cacheManager.getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), EntityInfoCache.class);
+                                if (entityInfoCache != null) {
+                                    entityInfoCache.setService(entry.getKey());
+                                }
+                            } else {
+                                log.warn("Entity: {} 存在多个service实现类，可能导致调用实例与预期不一致!", entityClass.getName());
+                            }
+                        } else {
+                            EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, entry.getKey());
+                            cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
+                            cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
+                            cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
+                            uniqueEntitySet.add(entityClass.getName());
+                        }
+                    }
+                }
+            } else {
+                log.debug("未获取到任何有效@Service.");
+            }
+            // 初始化没有service的table-mapper缓存
+            SqlSessionFactory sqlSessionFactory = ContextHelper.getBean(SqlSessionFactory.class);
+            Objects.requireNonNull(sqlSessionFactory, "sqlSessionFactory");
+            Collection<Class<?>> mappers = sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers();
+            if (V.notEmpty(mappers)) {
+                for (Class<?> mapperClass : mappers) {
+                    Type[] types = mapperClass.getGenericInterfaces();
+                    try {
+                        if (types.length > 0 && types[0] != null) {
+                            ParameterizedType genericType = (ParameterizedType) types[0];
+                            Type[] superTypes = genericType.getActualTypeArguments();
+                            if (superTypes != null && superTypes.length > 0 && superTypes[0] != null) {
+                                String entityClassName = superTypes[0].getTypeName();
+                                if (!uniqueEntitySet.contains(entityClassName) && entityClassName.length() > 1) {
+                                    Class<?> entityClass = Class.forName(entityClassName);
+                                    EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, null);
+                                    entityInfoCache.setBaseMapper((Class<? extends BaseMapper>) mapperClass);
+                                    cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
+                                    cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
+                                    cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
+                                    uniqueEntitySet.add(entityClass.getName());
+                                }
+                            }
+                        }
+                    } catch (Exception e) {
+                        log.warn("解析mapper异常", e);
+                    }
+                }
+            }
         }
-        return cacheManager;
+    }
+
+    @SneakyThrows
+    private static StaticMemoryCacheManager getCacheManager() {
+        return Singleton.cacheManager;
     }
 
     /**
@@ -91,7 +159,6 @@ public class BindingCacheManager {
      * @return
      */
     public static EntityInfoCache getEntityInfoByTable(String tableName){
-        initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_TABLE_ENTITY, tableName, EntityInfoCache.class);
     }
 
@@ -101,7 +168,6 @@ public class BindingCacheManager {
      * @return
      */
     public static EntityInfoCache getEntityInfoByClass(Class<?> entityClazz){
-        initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClazz.getName(), EntityInfoCache.class);
     }
 
@@ -148,7 +214,6 @@ public class BindingCacheManager {
      * @return
      */
     public static Class<?> getEntityClassBySimpleName(String classSimpleName){
-        initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_ENTITYNAME_CLASS, classSimpleName, Class.class);
     }
 
@@ -222,78 +287,6 @@ public class BindingCacheManager {
         return fieldsMap;
     }
 
-    /**
-     * 初始化
-     */
-    private static void initEntityInfoCache(){
-        StaticMemoryCacheManager cacheManager = getCacheManager();
-        if(cacheManager.isUninitializedCache(CACHE_NAME_CLASS_ENTITY) == false){
-            return;
-        }
-        // 初始化有service的entity缓存
-        Map<String, IService> serviceMap = ContextHelper.getApplicationContext().getBeansOfType(IService.class);
-        Set<String> uniqueEntitySet = new HashSet<>();
-        if(V.notEmpty(serviceMap)){
-            for(Map.Entry<String, IService> entry : serviceMap.entrySet()){
-                Class entityClass = BeanUtils.getGenericityClass(entry.getValue(), 1);
-                if(entityClass != null){
-                    IService entityIService = entry.getValue();
-                    if(uniqueEntitySet.contains(entityClass.getName())){
-                        if(entityIService.getClass().getAnnotation(Primary.class) != null){
-                            EntityInfoCache entityInfoCache = cacheManager.getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), EntityInfoCache.class);
-                            if(entityInfoCache != null){
-                                entityInfoCache.setService(entry.getKey());
-                            }
-                        }
-                        else{
-                            log.warn("Entity: {} 存在多个service实现类，可能导致调用实例与预期不一致!", entityClass.getName());
-                        }
-                    }
-                    else{
-                        EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, entry.getKey());
-                        cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
-                        cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
-                        cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
-                        uniqueEntitySet.add(entityClass.getName());
-                    }
-                }
-            }
-        }
-        else{
-            log.debug("未获取到任何有效@Service.");
-        }
-        // 初始化没有service的table-mapper缓存
-        SqlSessionFactory sqlSessionFactory = ContextHelper.getBean(SqlSessionFactory.class);
-        Collection<Class<?>> mappers = sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers();
-        if(V.notEmpty(mappers)){
-            for(Class<?> mapperClass : mappers){
-                Type[] types = mapperClass.getGenericInterfaces();
-                try{
-                    if(types != null && types.length > 0 && types[0] != null){
-                        ParameterizedType genericType = (ParameterizedType) types[0];
-                        Type[] superTypes = genericType.getActualTypeArguments();
-                        if(superTypes != null && superTypes.length > 0 && superTypes[0] != null){
-                            String entityClassName = superTypes[0].getTypeName();
-                            if(!uniqueEntitySet.contains(entityClassName) && entityClassName.length() > 1){
-                                Class<?> entityClass = Class.forName(entityClassName);
-                                EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, null);
-                                entityInfoCache.setBaseMapper((Class<? extends BaseMapper>) mapperClass);
-                                cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
-                                cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
-                                cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
-                                uniqueEntitySet.add(entityClass.getName());
-                            }
-                        }
-                    }
-                }
-                catch (Exception e){
-                    log.warn("解析mapper异常", e);
-                }
-            }
-        }
-        uniqueEntitySet = null;
-    }
-
     /**
      * 初始化bean的属性缓存
      * @param beanClazz
@@ -329,14 +322,16 @@ public class BindingCacheManager {
             return;
         }
         Field[] fields = beanClazz.getDeclaredFields();
-        if(V.notEmpty(fields)){ //被重写属性，以子类override的为准
-            Arrays.stream(fields).forEach((field)->{
-                if(!fieldNameSet.contains(field.getName()) &&
-                        (annotation == null || field.getAnnotation(annotation) != null)){
+        if (V.notEmpty(fields)) {
+            for (Field field : fields) {
+                // 被重写属性，以子类的为准
+                if (!fieldNameSet.add(field.getName())) {
+                    continue;
+                }
+                if (annotation == null || field.getAnnotation(annotation) != null) {
                     fieldList.add(field);
-                    fieldNameSet.add(field.getName());
                 }
-            });
+            }
         }
         loopFindFields(beanClazz.getSuperclass(), annotation, fieldList, fieldNameSet);
     }
-- 
Gitee


From 8cf1b83d3ae7abfc681ad9f89b0971a9c3bc655c Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 19 Apr 2022 14:30:17 +0800
Subject: [PATCH 014/195] + prettier

---
 diboot-admin-ui/.eslintrc.js                  | 64 ++++++++-------
 diboot-admin-ui/.prettierignore               |  9 +++
 diboot-admin-ui/.prettierrc                   | 20 +++++
 diboot-admin-ui/package.json                  |  6 +-
 diboot-admin-ui/pnpm-lock.yaml                | 80 ++++++++++++++++++-
 diboot-admin-ui/src/components/HelloWorld.vue |  4 +-
 6 files changed, 150 insertions(+), 33 deletions(-)
 create mode 100644 diboot-admin-ui/.prettierignore
 create mode 100644 diboot-admin-ui/.prettierrc

diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index febfb403..24a9c8b3 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -1,30 +1,38 @@
 module.exports = {
-    env: {
-        browser: true,
-        es2021: true,
-        node: true
-    },
-    parser: "vue-eslint-parser",
-    extends: [
-        "eslint:recommended",
-        "plugin:vue/vue3-recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    parserOptions: {
-        ecmaVersion: "latest",
-        parser: "@typescript-eslint/parser",
-        sourceType: "module"
-    },
-    plugins: [
-        "vue",
-        "@typescript-eslint"
-    ],
-    globals: {
-        defineProps: 'readonly',
-        defineEmits: 'readonly',
-        defineExpose: 'readonly',
-        withDefaults: 'readonly',
-    },
-    rules: {
-    }
+  env: {
+    browser: true,
+    es2021: true,
+    node: true
+  },
+  parser: 'vue-eslint-parser',
+  extends: [
+    'eslint:recommended',
+    'plugin:vue/vue3-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier',
+    'plugin:prettier/recommended'
+  ],
+  parserOptions: {
+    ecmaVersion: 'latest',
+    parser: '@typescript-eslint/parser',
+    sourceType: 'module'
+  },
+  plugins: ['vue', '@typescript-eslint', 'prettier'],
+  globals: {
+    defineProps: 'readonly',
+    defineEmits: 'readonly',
+    defineExpose: 'readonly',
+    withDefaults: 'readonly'
+  },
+  rules: {
+    '@typescript-eslint/no-explicit-any': 0,
+    'comma-dangle': ['warn', 'only-multiline'],
+    'vue/html-self-closing': ['warn', { html: { void: 'always' } }],
+    'no-undef': 'off',
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'prettier/prettier': 'warn',
+    'arrow-body-style': 'off',
+    'prefer-arrow-callback': 'off'
+  }
 }
diff --git a/diboot-admin-ui/.prettierignore b/diboot-admin-ui/.prettierignore
new file mode 100644
index 00000000..d3e76973
--- /dev/null
+++ b/diboot-admin-ui/.prettierignore
@@ -0,0 +1,9 @@
+/node_modules/**
+/public/*
+/dist/*
+
+.local
+.output.js
+
+**/*.svg
+**/*.sh
diff --git a/diboot-admin-ui/.prettierrc b/diboot-admin-ui/.prettierrc
new file mode 100644
index 00000000..78f239ac
--- /dev/null
+++ b/diboot-admin-ui/.prettierrc
@@ -0,0 +1,20 @@
+# 配置文档：https://prettier.io/docs/en/options.html
+
+# 声明结尾使用分号(默认true)
+semi: false
+# 每行代码长度（默认80）
+printWidth: 120
+# 每个tab相当于多少个空格（默认2）
+tabWidth: 2
+# 是否使用tab进行缩进（默认false）
+useTabs: false
+# 使用单引号（默认false）
+singleQuote: true
+# 对象字面量的大括号间使用空格（默认true）
+bracketSpacing: true
+# 包括单箭头函数参数周围的括号（默认always）
+arrowParens: 'avoid'
+# 尾部跟随逗号（默认 es5）
+trailingComma: 'none'
+# 自动换行（默认 preserve）
+proseWrap: 'never'
diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 4ac6beaf..478ca7da 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -15,8 +15,12 @@
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
     "@vitejs/plugin-vue": "^2.3.1",
-    "eslint": "^8.13.0",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^8.6.0",
+    "prettier": "2.6.2",
     "typescript": "^4.5.4",
     "vite": "^2.9.2",
     "vite-plugin-eslint": "^1.4.0",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 0dba4f0e..4beaccec 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -4,8 +4,12 @@ specifiers:
   '@typescript-eslint/eslint-plugin': ^5.20.0
   '@typescript-eslint/parser': ^5.20.0
   '@vitejs/plugin-vue': ^2.3.1
-  eslint: ^8.13.0
+  '@vue/eslint-config-prettier': ^7.0.0
+  eslint: ^8.12.0
+  eslint-config-prettier: ^8.5.0
+  eslint-plugin-prettier: ^4.0.0
   eslint-plugin-vue: ^8.6.0
+  prettier: 2.6.2
   typescript: ^4.5.4
   vite: ^2.9.2
   vite-plugin-eslint: ^1.4.0
@@ -19,8 +23,12 @@ devDependencies:
   '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf
   '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
   '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33
+  '@vue/eslint-config-prettier': registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.13.0+prettier@2.6.2
   eslint: registry.npmmirror.com/eslint/8.13.0
+  eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0
+  eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_1815ac95b7fb26c13c7d48a8eef62d0f
   eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0
+  prettier: registry.npmmirror.com/prettier/2.6.2
   typescript: registry.npmmirror.com/typescript/4.6.3
   vite: registry.npmmirror.com/vite/2.9.5
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
@@ -434,6 +442,21 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
     dev: false
 
+  registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.13.0+prettier@2.6.2:
+    resolution: {integrity: sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz}
+    id: registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0
+    name: '@vue/eslint-config-prettier'
+    version: 7.0.0
+    peerDependencies:
+      eslint: '>= 7.28.0'
+      prettier: '>= 2.0.0'
+    dependencies:
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0
+      eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_1815ac95b7fb26c13c7d48a8eef62d0f
+      prettier: registry.npmmirror.com/prettier/2.6.2
+    dev: true
+
   registry.npmmirror.com/@vue/reactivity-transform/3.2.33:
     resolution: {integrity: sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.33.tgz}
     name: '@vue/reactivity-transform'
@@ -1041,6 +1064,38 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0:
+    resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz}
+    id: registry.npmmirror.com/eslint-config-prettier/8.5.0
+    name: eslint-config-prettier
+    version: 8.5.0
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+    dependencies:
+      eslint: registry.npmmirror.com/eslint/8.13.0
+    dev: true
+
+  registry.npmmirror.com/eslint-plugin-prettier/4.0.0_1815ac95b7fb26c13c7d48a8eef62d0f:
+    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz}
+    id: registry.npmmirror.com/eslint-plugin-prettier/4.0.0
+    name: eslint-plugin-prettier
+    version: 4.0.0
+    engines: {node: '>=6.0.0'}
+    peerDependencies:
+      eslint: '>=7.28.0'
+      eslint-config-prettier: '*'
+      prettier: '>=2.0.0'
+    peerDependenciesMeta:
+      eslint-config-prettier:
+        optional: true
+    dependencies:
+      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0
+      prettier: registry.npmmirror.com/prettier/2.6.2
+      prettier-linter-helpers: registry.npmmirror.com/prettier-linter-helpers/1.0.0
+    dev: true
+
   registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0:
     resolution: {integrity: sha512-abXiF2J18n/7ZPy9foSlJyouKf54IqpKlNvNmzhM93N0zs3QUxZG/oBd3tVPOJTKg7SlhBUtPxugpqzNbgGpQQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.6.0.tgz}
     id: registry.npmmirror.com/eslint-plugin-vue/8.6.0
@@ -1213,6 +1268,12 @@ packages:
     version: 3.1.3
     dev: true
 
+  registry.npmmirror.com/fast-diff/1.2.0:
+    resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz}
+    name: fast-diff
+    version: 1.2.0
+    dev: true
+
   registry.npmmirror.com/fast-glob/3.2.11:
     resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.11.tgz}
     name: fast-glob
@@ -1741,6 +1802,23 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  registry.npmmirror.com/prettier-linter-helpers/1.0.0:
+    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz}
+    name: prettier-linter-helpers
+    version: 1.0.0
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      fast-diff: registry.npmmirror.com/fast-diff/1.2.0
+    dev: true
+
+  registry.npmmirror.com/prettier/2.6.2:
+    resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prettier/-/prettier-2.6.2.tgz}
+    name: prettier
+    version: 2.6.2
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    dev: true
+
   registry.npmmirror.com/promise/7.3.1:
     resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise/-/promise-7.3.1.tgz}
     name: promise
diff --git a/diboot-admin-ui/src/components/HelloWorld.vue b/diboot-admin-ui/src/components/HelloWorld.vue
index 38dae707..72bcbd10 100644
--- a/diboot-admin-ui/src/components/HelloWorld.vue
+++ b/diboot-admin-ui/src/components/HelloWorld.vue
@@ -19,9 +19,7 @@ const count = ref(0)
   <p>See <code>README.md</code> for more information.</p>
 
   <p>
-    <a href="https://vitejs.dev/guide/features.html" target="_blank">
-      Vite Docs
-    </a>
+    <a href="https://vitejs.dev/guide/features.html" target="_blank"> Vite Docs </a>
     |
     <a href="https://v3.vuejs.org/" target="_blank">Vue 3 Docs</a>
   </p>
-- 
Gitee


From b0bd53912729366246589f744993ad37f29132fa Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 19 Apr 2022 18:15:17 +0800
Subject: [PATCH 015/195] + element-plus

---
 diboot-admin-ui/.eslintrc.js                  |   6 -
 diboot-admin-ui/package.json                  |   4 +
 diboot-admin-ui/pnpm-lock.yaml                | 414 +++++++++++++++++-
 diboot-admin-ui/src/App.vue                   |   2 +-
 diboot-admin-ui/src/components/HelloWorld.vue |   2 -
 diboot-admin-ui/tsconfig.json                 |  32 +-
 diboot-admin-ui/types/auto-imports.d.ts       |  52 +++
 diboot-admin-ui/types/components.d.ts         |  13 +
 diboot-admin-ui/vite.config.ts                |  42 +-
 9 files changed, 543 insertions(+), 24 deletions(-)
 create mode 100644 diboot-admin-ui/types/auto-imports.d.ts
 create mode 100644 diboot-admin-ui/types/components.d.ts

diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index 24a9c8b3..feed4427 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -18,12 +18,6 @@ module.exports = {
     sourceType: 'module'
   },
   plugins: ['vue', '@typescript-eslint', 'prettier'],
-  globals: {
-    defineProps: 'readonly',
-    defineEmits: 'readonly',
-    defineExpose: 'readonly',
-    withDefaults: 'readonly'
-  },
   rules: {
     '@typescript-eslint/no-explicit-any': 0,
     'comma-dangle': ['warn', 'only-multiline'],
diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 478ca7da..f8a8970f 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -9,9 +9,11 @@
     "lint": "eslint --ext ./src"
   },
   "dependencies": {
+    "element-plus": "^2.1.10",
     "vue": "^3.2.25"
   },
   "devDependencies": {
+    "@types/node": "^17.0.25",
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
     "@vitejs/plugin-vue": "^2.3.1",
@@ -22,6 +24,8 @@
     "eslint-plugin-vue": "^8.6.0",
     "prettier": "2.6.2",
     "typescript": "^4.5.4",
+    "unplugin-auto-import": "^0.7.1",
+    "unplugin-vue-components": "^0.19.3",
     "vite": "^2.9.2",
     "vite-plugin-eslint": "^1.4.0",
     "vue-tsc": "^0.29.8"
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 4beaccec..747da1f6 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -1,25 +1,31 @@
 lockfileVersion: 5.3
 
 specifiers:
+  '@types/node': ^17.0.25
   '@typescript-eslint/eslint-plugin': ^5.20.0
   '@typescript-eslint/parser': ^5.20.0
   '@vitejs/plugin-vue': ^2.3.1
   '@vue/eslint-config-prettier': ^7.0.0
+  element-plus: ^2.1.10
   eslint: ^8.12.0
   eslint-config-prettier: ^8.5.0
   eslint-plugin-prettier: ^4.0.0
   eslint-plugin-vue: ^8.6.0
   prettier: 2.6.2
   typescript: ^4.5.4
+  unplugin-auto-import: ^0.7.1
+  unplugin-vue-components: ^0.19.3
   vite: ^2.9.2
   vite-plugin-eslint: ^1.4.0
   vue: ^3.2.25
   vue-tsc: ^0.29.8
 
 dependencies:
+  element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
   vue: registry.npmmirror.com/vue/3.2.33
 
 devDependencies:
+  '@types/node': registry.npmmirror.com/@types/node/17.0.25
   '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf
   '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
   '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33
@@ -30,12 +36,20 @@ devDependencies:
   eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0
   prettier: registry.npmmirror.com/prettier/2.6.2
   typescript: registry.npmmirror.com/typescript/4.6.3
+  unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_vite@2.9.5
+  unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33
   vite: registry.npmmirror.com/vite/2.9.5
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
   vue-tsc: registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3
 
 packages:
 
+  registry.npmmirror.com/@antfu/utils/0.5.1:
+    resolution: {integrity: sha512-8Afo0+xvYe1K8Wm4xHTymfTkpzy36aaqDvhXIayUwl+mecMG9Xzl3XjXa6swG6Bk8FBeQ646RyvmsYt6+2Be9g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@antfu/utils/-/utils-0.5.1.tgz}
+    name: '@antfu/utils'
+    version: 0.5.1
+    dev: true
+
   registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7:
     resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz}
     name: '@babel/helper-validator-identifier'
@@ -60,6 +74,24 @@ packages:
       to-fast-properties: registry.npmmirror.com/to-fast-properties/2.0.0
     dev: true
 
+  registry.npmmirror.com/@ctrl/tinycolor/3.4.1:
+    resolution: {integrity: sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz}
+    name: '@ctrl/tinycolor'
+    version: 3.4.1
+    engines: {node: '>=10'}
+    dev: false
+
+  registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33:
+    resolution: {integrity: sha512-Iz/nHqdp1sFPmdzRwHkEQQA3lKvoObk8azgABZ81QUOpW9s/lUyQVUSh0tNtEPZXQlKwlSh7SPgoVxzrE0uuVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-1.1.4.tgz}
+    id: registry.npmmirror.com/@element-plus/icons-vue/1.1.4
+    name: '@element-plus/icons-vue'
+    version: 1.1.4
+    peerDependencies:
+      vue: ^3.2.0
+    dependencies:
+      vue: registry.npmmirror.com/vue/3.2.33
+    dev: false
+
   registry.npmmirror.com/@emmetio/abbreviation/2.2.3:
     resolution: {integrity: sha512-87pltuCPt99aL+y9xS6GPZ+Wmmyhll2WXH73gG/xpGcQ84DRnptBsI2r0BeIQ0EB/SQTOe2ANPqFqj3Rj5FOGA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@emmetio/abbreviation/-/abbreviation-2.2.3.tgz}
     name: '@emmetio/abbreviation'
@@ -101,6 +133,20 @@ packages:
       - supports-color
     dev: true
 
+  registry.npmmirror.com/@floating-ui/core/0.6.2:
+    resolution: {integrity: sha512-jktYRmZwmau63adUG3GKOAVCofBXkk55S/zQ94XOorAHhwqFIOFAy1rSp2N0Wp6/tGbe9V3u/ExlGZypyY17rg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@floating-ui/core/-/core-0.6.2.tgz}
+    name: '@floating-ui/core'
+    version: 0.6.2
+    dev: false
+
+  registry.npmmirror.com/@floating-ui/dom/0.4.5:
+    resolution: {integrity: sha512-b+prvQgJt8pieaKYMSJBXHxX/DYwdLsAWxKYqnO5dO2V4oo/TYBZJAUQCVNjTWWsrs6o4VDrNcP9+E70HAhJdw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@floating-ui/dom/-/dom-0.4.5.tgz}
+    name: '@floating-ui/dom'
+    version: 0.4.5
+    dependencies:
+      '@floating-ui/core': registry.npmmirror.com/@floating-ui/core/0.6.2
+    dev: false
+
   registry.npmmirror.com/@humanwhocodes/config-array/0.9.5:
     resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz}
     name: '@humanwhocodes/config-array'
@@ -147,6 +193,12 @@ packages:
       fastq: registry.npmmirror.com/fastq/1.13.0
     dev: true
 
+  registry.npmmirror.com/@popperjs/core/2.11.5:
+    resolution: {integrity: sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@popperjs/core/-/core-2.11.5.tgz}
+    name: '@popperjs/core'
+    version: 2.11.5
+    dev: false
+
   registry.npmmirror.com/@rollup/pluginutils/4.2.1:
     resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz}
     name: '@rollup/pluginutils'
@@ -163,6 +215,26 @@ packages:
     version: 7.0.11
     dev: true
 
+  registry.npmmirror.com/@types/lodash-es/4.17.6:
+    resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.6.tgz}
+    name: '@types/lodash-es'
+    version: 4.17.6
+    dependencies:
+      '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
+    dev: false
+
+  registry.npmmirror.com/@types/lodash/4.14.182:
+    resolution: {integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.182.tgz}
+    name: '@types/lodash'
+    version: 4.14.182
+    dev: false
+
+  registry.npmmirror.com/@types/node/17.0.25:
+    resolution: {integrity: sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.25.tgz}
+    name: '@types/node'
+    version: 17.0.25
+    dev: true
+
   registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf:
     resolution: {integrity: sha512-fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz}
     id: registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0
@@ -513,6 +585,50 @@ packages:
     name: '@vue/shared'
     version: 3.2.33
 
+  registry.npmmirror.com/@vueuse/core/8.2.6_vue@3.2.33:
+    resolution: {integrity: sha512-fzlpM3B5oVe+UhCT1mXlhG1Zxdq2lq1Z2AvddSB8+RxrsSFzII7DKfsQEz8Vop7Lzc++4m8drTNbhPovYoFqHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/core/-/core-8.2.6.tgz}
+    id: registry.npmmirror.com/@vueuse/core/8.2.6
+    name: '@vueuse/core'
+    version: 8.2.6
+    peerDependencies:
+      '@vue/composition-api': ^1.1.0
+      vue: ^2.6.0 || ^3.2.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+      vue:
+        optional: true
+    dependencies:
+      '@vueuse/metadata': registry.npmmirror.com/@vueuse/metadata/8.2.6
+      '@vueuse/shared': registry.npmmirror.com/@vueuse/shared/8.2.6_vue@3.2.33
+      vue: registry.npmmirror.com/vue/3.2.33
+      vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
+    dev: false
+
+  registry.npmmirror.com/@vueuse/metadata/8.2.6:
+    resolution: {integrity: sha512-OBKtafCt+4RcEJlYDCjp1vl65pBCL2g4TmipEtdZ8/qphKlW6nakJbkY7XRN5grPmjqU99/ahJGtyGk5NHS2hw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.2.6.tgz}
+    name: '@vueuse/metadata'
+    version: 8.2.6
+    dev: false
+
+  registry.npmmirror.com/@vueuse/shared/8.2.6_vue@3.2.33:
+    resolution: {integrity: sha512-J/W4CMfdL8TahELuSOgtfVO4eQXTjhigp7dVWIBsLUVFCeY9d49gvHUcQN3y5xYLZ6iNP57TjTQjMMT/zhklkw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/shared/-/shared-8.2.6.tgz}
+    id: registry.npmmirror.com/@vueuse/shared/8.2.6
+    name: '@vueuse/shared'
+    version: 8.2.6
+    peerDependencies:
+      '@vue/composition-api': ^1.1.0
+      vue: ^2.6.0 || ^3.2.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+      vue:
+        optional: true
+    dependencies:
+      vue: registry.npmmirror.com/vue/3.2.33
+      vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
+    dev: false
+
   registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz}
     id: registry.npmmirror.com/acorn-jsx/5.3.2
@@ -567,6 +683,16 @@ packages:
       color-convert: registry.npmmirror.com/color-convert/2.0.1
     dev: true
 
+  registry.npmmirror.com/anymatch/3.1.2:
+    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz}
+    name: anymatch
+    version: 3.1.2
+    engines: {node: '>= 8'}
+    dependencies:
+      normalize-path: registry.npmmirror.com/normalize-path/3.0.0
+      picomatch: registry.npmmirror.com/picomatch/2.3.1
+    dev: true
+
   registry.npmmirror.com/argparse/2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz}
     name: argparse
@@ -592,6 +718,12 @@ packages:
     version: 1.2.1
     dev: true
 
+  registry.npmmirror.com/async-validator/4.0.7:
+    resolution: {integrity: sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-validator/-/async-validator-4.0.7.tgz}
+    name: async-validator
+    version: 4.0.7
+    dev: false
+
   registry.npmmirror.com/babel-walk/3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz}
     name: babel-walk
@@ -607,6 +739,13 @@ packages:
     version: 1.0.2
     dev: true
 
+  registry.npmmirror.com/binary-extensions/2.2.0:
+    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz}
+    name: binary-extensions
+    version: 2.2.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/brace-expansion/1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz}
     name: brace-expansion
@@ -616,6 +755,14 @@ packages:
       concat-map: registry.npmmirror.com/concat-map/0.0.1
     dev: true
 
+  registry.npmmirror.com/brace-expansion/2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz}
+    name: brace-expansion
+    version: 2.0.1
+    dependencies:
+      balanced-match: registry.npmmirror.com/balanced-match/1.0.2
+    dev: true
+
   registry.npmmirror.com/braces/3.0.2:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz}
     name: braces
@@ -659,6 +806,23 @@ packages:
       is-regex: registry.npmmirror.com/is-regex/1.1.4
     dev: true
 
+  registry.npmmirror.com/chokidar/3.5.3:
+    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz}
+    name: chokidar
+    version: 3.5.3
+    engines: {node: '>= 8.10.0'}
+    dependencies:
+      anymatch: registry.npmmirror.com/anymatch/3.1.2
+      braces: registry.npmmirror.com/braces/3.0.2
+      glob-parent: registry.npmmirror.com/glob-parent/5.1.2
+      is-binary-path: registry.npmmirror.com/is-binary-path/2.1.0
+      is-glob: registry.npmmirror.com/is-glob/4.0.3
+      normalize-path: registry.npmmirror.com/normalize-path/3.0.0
+      readdirp: registry.npmmirror.com/readdirp/3.6.0
+    optionalDependencies:
+      fsevents: registry.npmmirror.com/fsevents/2.3.2
+    dev: true
+
   registry.npmmirror.com/color-convert/2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz}
     name: color-convert
@@ -706,6 +870,12 @@ packages:
     version: 2.6.20
     dev: false
 
+  registry.npmmirror.com/dayjs/1.11.1:
+    resolution: {integrity: sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.1.tgz}
+    name: dayjs
+    version: 1.11.1
+    dev: false
+
   registry.npmmirror.com/debug/4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz}
     name: debug
@@ -785,6 +955,34 @@ packages:
       domhandler: registry.npmmirror.com/domhandler/4.3.1
     dev: true
 
+  registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33:
+    resolution: {integrity: sha512-sS9OMgP20dlYipmzHlEEgCJU+ID7+03YpRpoJWNQEH736C6ArmDMLnGFe8DUjPvwbUEXRA2d0Eo5d0apFgkSqg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.1.10.tgz}
+    id: registry.npmmirror.com/element-plus/2.1.10
+    name: element-plus
+    version: 2.1.10
+    peerDependencies:
+      vue: ^3.2.0
+    dependencies:
+      '@ctrl/tinycolor': registry.npmmirror.com/@ctrl/tinycolor/3.4.1
+      '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
+      '@floating-ui/dom': registry.npmmirror.com/@floating-ui/dom/0.4.5
+      '@popperjs/core': registry.npmmirror.com/@popperjs/core/2.11.5
+      '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
+      '@types/lodash-es': registry.npmmirror.com/@types/lodash-es/4.17.6
+      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.2.6_vue@3.2.33
+      async-validator: registry.npmmirror.com/async-validator/4.0.7
+      dayjs: registry.npmmirror.com/dayjs/1.11.1
+      escape-html: registry.npmmirror.com/escape-html/1.0.3
+      lodash: registry.npmmirror.com/lodash/4.17.21
+      lodash-es: registry.npmmirror.com/lodash-es/4.17.21
+      lodash-unified: registry.npmmirror.com/lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd
+      memoize-one: registry.npmmirror.com/memoize-one/6.0.0
+      normalize-wheel-es: registry.npmmirror.com/normalize-wheel-es/1.1.2
+      vue: registry.npmmirror.com/vue/3.2.33
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+    dev: false
+
   registry.npmmirror.com/emmet/2.3.6:
     resolution: {integrity: sha512-pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/emmet/-/emmet-2.3.6.tgz}
     name: emmet
@@ -1057,6 +1255,12 @@ packages:
       esbuild-windows-arm64: registry.npmmirror.com/esbuild-windows-arm64/0.14.36
     dev: true
 
+  registry.npmmirror.com/escape-html/1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz}
+    name: escape-html
+    version: 1.0.3
+    dev: false
+
   registry.npmmirror.com/escape-string-regexp/4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}
     name: escape-string-regexp
@@ -1515,6 +1719,15 @@ packages:
     version: 2.0.4
     dev: true
 
+  registry.npmmirror.com/is-binary-path/2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz}
+    name: is-binary-path
+    version: 2.1.0
+    engines: {node: '>=8'}
+    dependencies:
+      binary-extensions: registry.npmmirror.com/binary-extensions/2.2.0
+    dev: true
+
   registry.npmmirror.com/is-core-module/2.8.1:
     resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz}
     name: is-core-module
@@ -1635,6 +1848,34 @@ packages:
       type-check: registry.npmmirror.com/type-check/0.4.0
     dev: true
 
+  registry.npmmirror.com/local-pkg/0.4.1:
+    resolution: {integrity: sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.1.tgz}
+    name: local-pkg
+    version: 0.4.1
+    engines: {node: '>=14'}
+    dev: true
+
+  registry.npmmirror.com/lodash-es/4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz}
+    name: lodash-es
+    version: 4.17.21
+    dev: false
+
+  registry.npmmirror.com/lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd:
+    resolution: {integrity: sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.2.tgz}
+    id: registry.npmmirror.com/lodash-unified/1.0.2
+    name: lodash-unified
+    version: 1.0.2
+    peerDependencies:
+      '@types/lodash-es': '*'
+      lodash: '*'
+      lodash-es: '*'
+    dependencies:
+      '@types/lodash-es': registry.npmmirror.com/@types/lodash-es/4.17.6
+      lodash: registry.npmmirror.com/lodash/4.17.21
+      lodash-es: registry.npmmirror.com/lodash-es/4.17.21
+    dev: false
+
   registry.npmmirror.com/lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz}
     name: lodash.merge
@@ -1645,7 +1886,6 @@ packages:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz}
     name: lodash
     version: 4.17.21
-    dev: true
 
   registry.npmmirror.com/lru-cache/6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz}
@@ -1664,6 +1904,21 @@ packages:
       sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
     dev: false
 
+  registry.npmmirror.com/magic-string/0.26.1:
+    resolution: {integrity: sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/magic-string/-/magic-string-0.26.1.tgz}
+    name: magic-string
+    version: 0.26.1
+    engines: {node: '>=12'}
+    dependencies:
+      sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
+    dev: true
+
+  registry.npmmirror.com/memoize-one/6.0.0:
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz}
+    name: memoize-one
+    version: 6.0.0
+    dev: false
+
   registry.npmmirror.com/merge2/1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz}
     name: merge2
@@ -1689,16 +1944,25 @@ packages:
       brace-expansion: registry.npmmirror.com/brace-expansion/1.1.11
     dev: true
 
+  registry.npmmirror.com/minimatch/5.0.1:
+    resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-5.0.1.tgz}
+    name: minimatch
+    version: 5.0.1
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: registry.npmmirror.com/brace-expansion/2.0.1
+    dev: true
+
   registry.npmmirror.com/ms/2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz}
     name: ms
     version: 2.1.2
     dev: true
 
-  registry.npmmirror.com/nanoid/3.3.2:
-    resolution: {integrity: sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-3.3.2.tgz}
+  registry.npmmirror.com/nanoid/3.3.3:
+    resolution: {integrity: sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-3.3.3.tgz}
     name: nanoid
-    version: 3.3.2
+    version: 3.3.3
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -1708,6 +1972,19 @@ packages:
     version: 1.4.0
     dev: true
 
+  registry.npmmirror.com/normalize-path/3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz}
+    name: normalize-path
+    version: 3.0.0
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/normalize-wheel-es/1.1.2:
+    resolution: {integrity: sha512-scX83plWJXYH1J4+BhAuIHadROzxX0UBF3+HuZNY2Ks8BciE7tSTQ+5JhTsvzjaO0/EJdm4JBGrfObKxFf3Png==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.1.2.tgz}
+    name: normalize-wheel-es
+    version: 1.1.2
+    dev: false
+
   registry.npmmirror.com/object-assign/4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz}
     name: object-assign
@@ -1791,7 +2068,7 @@ packages:
     version: 8.4.12
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: registry.npmmirror.com/nanoid/3.3.2
+      nanoid: registry.npmmirror.com/nanoid/3.3.3
       picocolors: registry.npmmirror.com/picocolors/1.0.0
       source-map-js: registry.npmmirror.com/source-map-js/1.0.2
 
@@ -1955,6 +2232,15 @@ packages:
     version: 1.2.3
     dev: true
 
+  registry.npmmirror.com/readdirp/3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz}
+    name: readdirp
+    version: 3.6.0
+    engines: {node: '>=8.10.0'}
+    dependencies:
+      picomatch: registry.npmmirror.com/picomatch/2.3.1
+    dev: true
+
   registry.npmmirror.com/regexpp/3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz}
     name: regexpp
@@ -2069,7 +2355,6 @@ packages:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz}
     name: sourcemap-codec
     version: 1.4.8
-    dev: false
 
   registry.npmmirror.com/strip-ansi/6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz}
@@ -2174,6 +2459,92 @@ packages:
     hasBin: true
     dev: true
 
+  registry.npmmirror.com/unplugin-auto-import/0.7.1_vite@2.9.5:
+    resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.7.1.tgz}
+    id: registry.npmmirror.com/unplugin-auto-import/0.7.1
+    name: unplugin-auto-import
+    version: 0.7.1
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@vueuse/core': '*'
+    peerDependenciesMeta:
+      '@vueuse/core':
+        optional: true
+    dependencies:
+      '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.5.1
+      '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
+      local-pkg: registry.npmmirror.com/local-pkg/0.4.1
+      magic-string: registry.npmmirror.com/magic-string/0.26.1
+      resolve: registry.npmmirror.com/resolve/1.22.0
+      unplugin: registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5
+    transitivePeerDependencies:
+      - esbuild
+      - rollup
+      - vite
+      - webpack
+    dev: true
+
+  registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33:
+    resolution: {integrity: sha512-z/kpYJnqrJuWglDNs7fy0YRHr41oLc07y2TkP3by6DqPb1GG9xGC9SFigeFwd4J7GVTqyFVsnjoeup7uK7I2dA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.19.3.tgz}
+    id: registry.npmmirror.com/unplugin-vue-components/0.19.3
+    name: unplugin-vue-components
+    version: 0.19.3
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/parser': ^7.15.8
+      '@babel/traverse': ^7.15.4
+      vue: 2 || 3
+    peerDependenciesMeta:
+      '@babel/parser':
+        optional: true
+      '@babel/traverse':
+        optional: true
+    dependencies:
+      '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.5.1
+      '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
+      chokidar: registry.npmmirror.com/chokidar/3.5.3
+      debug: registry.npmmirror.com/debug/4.3.4
+      fast-glob: registry.npmmirror.com/fast-glob/3.2.11
+      local-pkg: registry.npmmirror.com/local-pkg/0.4.1
+      magic-string: registry.npmmirror.com/magic-string/0.26.1
+      minimatch: registry.npmmirror.com/minimatch/5.0.1
+      resolve: registry.npmmirror.com/resolve/1.22.0
+      unplugin: registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5
+      vue: registry.npmmirror.com/vue/3.2.33
+    transitivePeerDependencies:
+      - esbuild
+      - rollup
+      - supports-color
+      - vite
+      - webpack
+    dev: true
+
+  registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5:
+    resolution: {integrity: sha512-+QONc2uBFQbeo4x5mlJHjTKjR6pmuchMpGVrWhwdGFFMb4ttFZ4E9KqhOOrNcm3Q8NNyB1vJ4s5e36IZC7UWYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin/-/unplugin-0.6.2.tgz}
+    id: registry.npmmirror.com/unplugin/0.6.2
+    name: unplugin
+    version: 0.6.2
+    peerDependencies:
+      esbuild: '>=0.13'
+      rollup: ^2.50.0
+      vite: ^2.3.0
+      webpack: 4 || 5
+    peerDependenciesMeta:
+      esbuild:
+        optional: true
+      rollup:
+        optional: true
+      vite:
+        optional: true
+      webpack:
+        optional: true
+    dependencies:
+      chokidar: registry.npmmirror.com/chokidar/3.5.3
+      vite: registry.npmmirror.com/vite/2.9.5
+      webpack-sources: registry.npmmirror.com/webpack-sources/3.2.3
+      webpack-virtual-modules: registry.npmmirror.com/webpack-virtual-modules/0.4.3
+    dev: true
+
   registry.npmmirror.com/upath/2.0.1:
     resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/upath/-/upath-2.0.1.tgz}
     name: upath
@@ -2392,6 +2763,24 @@ packages:
       vscode-typescript-languageservice: registry.npmmirror.com/vscode-typescript-languageservice/0.29.8
     dev: true
 
+  registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33:
+    resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz}
+    id: registry.npmmirror.com/vue-demi/0.12.5
+    name: vue-demi
+    version: 0.12.5
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+    dependencies:
+      vue: registry.npmmirror.com/vue/3.2.33
+    dev: false
+
   registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.13.0:
     resolution: {integrity: sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz}
     id: registry.npmmirror.com/vue-eslint-parser/8.3.0
@@ -2439,6 +2828,19 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
     dev: false
 
+  registry.npmmirror.com/webpack-sources/3.2.3:
+    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz}
+    name: webpack-sources
+    version: 3.2.3
+    engines: {node: '>=10.13.0'}
+    dev: true
+
+  registry.npmmirror.com/webpack-virtual-modules/0.4.3:
+    resolution: {integrity: sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz}
+    name: webpack-virtual-modules
+    version: 0.4.3
+    dev: true
+
   registry.npmmirror.com/which/2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/which/-/which-2.0.2.tgz}
     name: which
diff --git a/diboot-admin-ui/src/App.vue b/diboot-admin-ui/src/App.vue
index 1503baf9..118a2977 100644
--- a/diboot-admin-ui/src/App.vue
+++ b/diboot-admin-ui/src/App.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 // This starter template is using Vue 3 <script setup> SFCs
 // Check out https://vuejs.org/api/sfc-script-setup.html#script-setup
-import HelloWorld from './components/HelloWorld.vue'
 </script>
 
 <template>
   <img alt="Vue logo" src="./assets/logo.png" />
   <HelloWorld msg="Hello Vue 3 + TypeScript + Vite" />
+  <el-button>element 按钮</el-button>
 </template>
 
 <style>
diff --git a/diboot-admin-ui/src/components/HelloWorld.vue b/diboot-admin-ui/src/components/HelloWorld.vue
index 72bcbd10..d78234dc 100644
--- a/diboot-admin-ui/src/components/HelloWorld.vue
+++ b/diboot-admin-ui/src/components/HelloWorld.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { ref } from 'vue'
-
 defineProps<{ msg: string }>()
 
 const count = ref(0)
diff --git a/diboot-admin-ui/tsconfig.json b/diboot-admin-ui/tsconfig.json
index 52205ea0..f5085435 100644
--- a/diboot-admin-ui/tsconfig.json
+++ b/diboot-admin-ui/tsconfig.json
@@ -10,8 +10,34 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "esModuleInterop": true,
-    "lib": ["esnext", "dom"]
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ],
+      "#/*": [
+        "types/*"
+      ]
+    },
+    "types": [
+      "element-plus/global"
+    ]
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "types/**/*.ts",
+    "types/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
 }
diff --git a/diboot-admin-ui/types/auto-imports.d.ts b/diboot-admin-ui/types/auto-imports.d.ts
new file mode 100644
index 00000000..753c2752
--- /dev/null
+++ b/diboot-admin-ui/types/auto-imports.d.ts
@@ -0,0 +1,52 @@
+// Generated by 'unplugin-auto-import'
+// We suggest you to commit this file into source control
+declare global {
+  const computed: typeof import('vue')['computed']
+  const createApp: typeof import('vue')['createApp']
+  const customRef: typeof import('vue')['customRef']
+  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
+  const defineComponent: typeof import('vue')['defineComponent']
+  const effectScope: typeof import('vue')['effectScope']
+  const EffectScope: typeof import('vue')['EffectScope']
+  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
+  const getCurrentScope: typeof import('vue')['getCurrentScope']
+  const h: typeof import('vue')['h']
+  const inject: typeof import('vue')['inject']
+  const isReadonly: typeof import('vue')['isReadonly']
+  const isRef: typeof import('vue')['isRef']
+  const markRaw: typeof import('vue')['markRaw']
+  const nextTick: typeof import('vue')['nextTick']
+  const onActivated: typeof import('vue')['onActivated']
+  const onBeforeMount: typeof import('vue')['onBeforeMount']
+  const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
+  const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
+  const onDeactivated: typeof import('vue')['onDeactivated']
+  const onErrorCaptured: typeof import('vue')['onErrorCaptured']
+  const onMounted: typeof import('vue')['onMounted']
+  const onRenderTracked: typeof import('vue')['onRenderTracked']
+  const onRenderTriggered: typeof import('vue')['onRenderTriggered']
+  const onScopeDispose: typeof import('vue')['onScopeDispose']
+  const onServerPrefetch: typeof import('vue')['onServerPrefetch']
+  const onUnmounted: typeof import('vue')['onUnmounted']
+  const onUpdated: typeof import('vue')['onUpdated']
+  const provide: typeof import('vue')['provide']
+  const reactive: typeof import('vue')['reactive']
+  const readonly: typeof import('vue')['readonly']
+  const ref: typeof import('vue')['ref']
+  const resolveComponent: typeof import('vue')['resolveComponent']
+  const shallowReactive: typeof import('vue')['shallowReactive']
+  const shallowReadonly: typeof import('vue')['shallowReadonly']
+  const shallowRef: typeof import('vue')['shallowRef']
+  const toRaw: typeof import('vue')['toRaw']
+  const toRef: typeof import('vue')['toRef']
+  const toRefs: typeof import('vue')['toRefs']
+  const triggerRef: typeof import('vue')['triggerRef']
+  const unref: typeof import('vue')['unref']
+  const useAttrs: typeof import('vue')['useAttrs']
+  const useCssModule: typeof import('vue')['useCssModule']
+  const useCssVars: typeof import('vue')['useCssVars']
+  const useSlots: typeof import('vue')['useSlots']
+  const watch: typeof import('vue')['watch']
+  const watchEffect: typeof import('vue')['watchEffect']
+}
+export {}
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
new file mode 100644
index 00000000..b3a49ff5
--- /dev/null
+++ b/diboot-admin-ui/types/components.d.ts
@@ -0,0 +1,13 @@
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/vue-next/pull/3399
+import '@vue/runtime-core'
+
+declare module '@vue/runtime-core' {
+  export interface GlobalComponents {
+    ElButton: typeof import('element-plus/es')['ElButton']
+    HelloWorld: typeof import('@/components/HelloWorld.vue')['default']
+  }
+}
+
+export {}
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 053c8ecf..0ce544ae 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -1,12 +1,42 @@
-import {defineConfig} from 'vite'
+import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import eslintPlugin from "vite-plugin-eslint/dist";
+import eslintPlugin from 'vite-plugin-eslint/dist'
+import AutoImport from 'unplugin-auto-import/vite'
+import Components from 'unplugin-vue-components/vite'
+import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
+import { resolve } from 'path'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-    plugins: [
-        vue(),
-        // eslint 自动修复
-        eslintPlugin({fix: true}),
+  plugins: [
+    vue(),
+    // eslint 自动修复
+    eslintPlugin({ fix: true }),
+    AutoImport({
+      // 解析器
+      resolvers: [ElementPlusResolver()],
+      // 自动导入Api
+      imports: ['vue'],
+      // 为true时在项目根目录自动创建
+      dts: 'types/auto-imports.d.ts'
+    }),
+    Components({
+      // 解析器
+      resolvers: [ElementPlusResolver()],
+      // 自动加载的组件目录，默认值为 ['src/components']
+      dirs: ['src/components'],
+      // 组件名称包含目录，防止同名组件冲突
+      directoryAsNamespace: true,
+      // 指定类型声明文件，为true时在项目根目录创建
+      dts: 'types/components.d.ts',
+      // 导入路径变换
+      importPathTransform: path => path.replace(/^.+\/src/g, '@')
+    })
+  ],
+  resolve: {
+    alias: [
+      { find: '@', replacement: resolve(__dirname, 'src') },
+      { find: '#', replacement: resolve(__dirname, 'types') }
     ]
+  }
 })
-- 
Gitee


From 9edfcd927e6a29e76cfc95267f5486341f508286 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 20 Apr 2022 17:47:30 +0800
Subject: [PATCH 016/195] =?UTF-8?q?*=20authType=20=E4=BB=8EDTO=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E4=BB=A5=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/iam/dto/IamUserAccountDTO.java   | 4 ++++
 .../java/com/diboot/iam/service/impl/IamUserServiceImpl.java  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/IamUserAccountDTO.java b/diboot-iam-starter/src/main/java/com/diboot/iam/dto/IamUserAccountDTO.java
index 195baa24..30dd8329 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/IamUserAccountDTO.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/dto/IamUserAccountDTO.java
@@ -15,6 +15,7 @@
  */
 package com.diboot.iam.dto;
 
+import com.diboot.iam.config.Cons;
 import com.diboot.iam.entity.IamUser;
 import lombok.Getter;
 import lombok.Setter;
@@ -33,6 +34,9 @@ import java.util.List;
 @Accessors(chain = true)
 public class IamUserAccountDTO extends IamUser {
 
+    // 认证方式
+    private String authType = Cons.DICTCODE_AUTH_TYPE.PWD.name();
+
     private String username;
 
     private String password;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
index 526a9015..33befb01 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
@@ -186,7 +186,7 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
                 .setUserId(userAccountDTO.getId())
                 .setAuthAccount(userAccountDTO.getUsername())
                 .setAuthSecret(userAccountDTO.getPassword())
-                .setAuthType(Cons.DICTCODE_AUTH_TYPE.PWD.name())
+                .setAuthType(userAccountDTO.getAuthType())
                 .setStatus(userAccountDTO.getStatus());
         // 保存账号
         iamAccountService.createEntity(iamAccount);
-- 
Gitee


From 7f7915e6d8cd82da42bb3ba428e52ec3d5e58b89 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 20 Apr 2022 18:08:25 +0800
Subject: [PATCH 017/195] + vue-router

---
 diboot-admin-ui/package.json                  |  5 +-
 diboot-admin-ui/pnpm-lock.yaml                | 20 +++++
 diboot-admin-ui/src/App.vue                   | 22 +++--
 diboot-admin-ui/src/components/HelloWorld.vue |  2 +-
 diboot-admin-ui/src/env.d.ts                  |  6 ++
 diboot-admin-ui/src/layout/index.vue          | 12 +++
 diboot-admin-ui/src/main.ts                   |  6 +-
 diboot-admin-ui/src/router/index.ts           | 88 +++++++++++++++++++
 diboot-admin-ui/src/router/typings.d.ts       | 16 ++++
 diboot-admin-ui/src/views/dashboard/index.vue | 11 +++
 diboot-admin-ui/src/views/exception/404.vue   | 38 ++++++++
 diboot-admin-ui/src/views/exception/500.vue   | 18 ++++
 diboot-admin-ui/src/views/login/index.vue     | 54 ++++++++++++
 diboot-admin-ui/types/auto-imports.d.ts       |  2 +
 diboot-admin-ui/types/components.d.ts         |  6 ++
 diboot-admin-ui/vite.config.ts                |  2 +-
 16 files changed, 290 insertions(+), 18 deletions(-)
 create mode 100644 diboot-admin-ui/src/layout/index.vue
 create mode 100644 diboot-admin-ui/src/router/index.ts
 create mode 100644 diboot-admin-ui/src/router/typings.d.ts
 create mode 100644 diboot-admin-ui/src/views/dashboard/index.vue
 create mode 100644 diboot-admin-ui/src/views/exception/404.vue
 create mode 100644 diboot-admin-ui/src/views/exception/500.vue
 create mode 100644 diboot-admin-ui/src/views/login/index.vue

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index f8a8970f..96faec2c 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -6,11 +6,12 @@
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
-    "lint": "eslint --ext ./src"
+    "lint": "eslint --ext .{js,jsx,ts,tsx,vue} ./src"
   },
   "dependencies": {
     "element-plus": "^2.1.10",
-    "vue": "^3.2.25"
+    "vue": "^3.2.25",
+    "vue-router": "^4.0.14"
   },
   "devDependencies": {
     "@types/node": "^17.0.25",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 747da1f6..fbc57efa 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -18,11 +18,13 @@ specifiers:
   vite: ^2.9.2
   vite-plugin-eslint: ^1.4.0
   vue: ^3.2.25
+  vue-router: ^4.0.14
   vue-tsc: ^0.29.8
 
 dependencies:
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
   vue: registry.npmmirror.com/vue/3.2.33
+  vue-router: registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33
 
 devDependencies:
   '@types/node': registry.npmmirror.com/@types/node/17.0.25
@@ -514,6 +516,12 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
     dev: false
 
+  registry.npmmirror.com/@vue/devtools-api/6.1.4:
+    resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz}
+    name: '@vue/devtools-api'
+    version: 6.1.4
+    dev: false
+
   registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.13.0+prettier@2.6.2:
     resolution: {integrity: sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz}
     id: registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0
@@ -2802,6 +2810,18 @@ packages:
       - supports-color
     dev: true
 
+  registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33:
+    resolution: {integrity: sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-router/-/vue-router-4.0.14.tgz}
+    id: registry.npmmirror.com/vue-router/4.0.14
+    name: vue-router
+    version: 4.0.14
+    peerDependencies:
+      vue: ^3.2.0
+    dependencies:
+      '@vue/devtools-api': registry.npmmirror.com/@vue/devtools-api/6.1.4
+      vue: registry.npmmirror.com/vue/3.2.33
+    dev: false
+
   registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3:
     resolution: {integrity: sha512-pT0wLRjvRuSmB+J4WJT6uuV9mO0KtSSXEAtaVXZQzyk5+DJdbLIQTbRce/TXSkfqt1l1WogO78RjtOJFiMCgfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.29.8.tgz}
     id: registry.npmmirror.com/vue-tsc/0.29.8
diff --git a/diboot-admin-ui/src/App.vue b/diboot-admin-ui/src/App.vue
index 118a2977..0e90e619 100644
--- a/diboot-admin-ui/src/App.vue
+++ b/diboot-admin-ui/src/App.vue
@@ -1,21 +1,19 @@
 <script setup lang="ts">
-// This starter template is using Vue 3 <script setup> SFCs
-// Check out https://vuejs.org/api/sfc-script-setup.html#script-setup
+import zhCn from 'element-plus/lib/locale/lang/zh-cn'
+
+const size = ref<'default' | 'small' | 'large'>('default')
+const locale = reactive(zhCn)
 </script>
 
 <template>
-  <img alt="Vue logo" src="./assets/logo.png" />
-  <HelloWorld msg="Hello Vue 3 + TypeScript + Vite" />
-  <el-button>element 按钮</el-button>
+  <el-config-provider :locale="locale" :size="size">
+    <router-view />
+  </el-config-provider>
 </template>
 
 <style>
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
+body {
+  margin: 0;
+  padding: 0;
 }
 </style>
diff --git a/diboot-admin-ui/src/components/HelloWorld.vue b/diboot-admin-ui/src/components/HelloWorld.vue
index d78234dc..be419899 100644
--- a/diboot-admin-ui/src/components/HelloWorld.vue
+++ b/diboot-admin-ui/src/components/HelloWorld.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-defineProps<{ msg: string }>()
+withDefaults(defineProps<{ msg: string }>(), { msg: 'Hello Vue 3 + TypeScript + Vite' })
 
 const count = ref(0)
 </script>
diff --git a/diboot-admin-ui/src/env.d.ts b/diboot-admin-ui/src/env.d.ts
index aafef950..355b4447 100644
--- a/diboot-admin-ui/src/env.d.ts
+++ b/diboot-admin-ui/src/env.d.ts
@@ -6,3 +6,9 @@ declare module '*.vue' {
   const component: DefineComponent<{}, {}, any>
   export default component
 }
+
+interface ImportMetaEnv {
+  readonly VITE_PORT: string
+  readonly VITE_OPEN: string
+  readonly VITE_APP_BASE_URL: string
+}
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
new file mode 100644
index 00000000..b2847381
--- /dev/null
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -0,0 +1,12 @@
+<script setup lang="ts">
+console.log('Layout')
+</script>
+
+<template>
+  <h2 style="text-align: center">布局容器</h2>
+  <div>
+    <router-view />
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index 01433bca..9f2b935b 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -1,4 +1,6 @@
-import { createApp } from 'vue'
 import App from './App.vue'
+import router from './router'
 
-createApp(App).mount('#app')
+const app = createApp(App)
+app.use(router)
+app.mount('#app')
diff --git a/diboot-admin-ui/src/router/index.ts b/diboot-admin-ui/src/router/index.ts
new file mode 100644
index 00000000..52b2f883
--- /dev/null
+++ b/diboot-admin-ui/src/router/index.ts
@@ -0,0 +1,88 @@
+import { createRouter, createWebHashHistory, RouteRecordRaw, RouterView } from 'vue-router'
+import Layout from '@/layout/index.vue'
+
+/**
+ * constantRoutes
+ * a base page that does not have permission requirements
+ * all roles can be accessed
+ */
+export const constantRoutes: RouteRecordRaw[] = [
+  {
+    path: '/redirect',
+    name: 'Redirect',
+    component: Layout,
+    children: [
+      {
+        path: ':path(.*)*', // '/redirect/:path(.*)*'
+        name: 'Redirect',
+        redirect: to => {
+          const path = to.params.path
+          return { path: `/${Array.isArray(path) ? path.join('/') : path}`, query: to.query, replace: true }
+        }
+      }
+    ]
+  },
+  {
+    path: '/exception',
+    name: 'Exception',
+    component: RouterView,
+    meta: { title: 'Exception' },
+    children: [
+      {
+        path: '404',
+        name: '404',
+        component: () => import('@/views/exception/404.vue'),
+        meta: { title: '404' }
+      },
+      {
+        path: '500',
+        name: '500',
+        component: () => import('@/views/exception/500.vue'),
+        meta: { title: '500' }
+      }
+    ]
+  },
+  {
+    path: '/:path(.*)*',
+    name: 'ErrorPage',
+    redirect: to => {
+      return { name: '404', query: { path: to.path }, replace: true }
+    }
+  },
+  {
+    path: '/login',
+    name: 'Login',
+    component: () => import('@/views/login/index.vue'),
+    meta: { hidden: true }
+  }
+]
+
+/**
+ * 创建路由
+ */
+const router = createRouter({
+  history: createWebHashHistory(import.meta.env.BASE_URL), // hash 模式
+  // history: createWebHistory(import.meta.env.BASE_URL), // HTML5 模式
+  routes: constantRoutes
+})
+
+// home route
+const homeRoute: RouteRecordRaw = {
+  path: '/',
+  name: 'Home',
+  component: Layout,
+  redirect: '/dashboard',
+  meta: { title: '首页' },
+  children: [
+    {
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index.vue'),
+      meta: { title: '仪表盘', ignoreAuth: true }
+    }
+  ]
+}
+
+router.addRoute(homeRoute)
+
+export default router
diff --git a/diboot-admin-ui/src/router/typings.d.ts b/diboot-admin-ui/src/router/typings.d.ts
new file mode 100644
index 00000000..7a21a9c8
--- /dev/null
+++ b/diboot-admin-ui/src/router/typings.d.ts
@@ -0,0 +1,16 @@
+import 'vue-router'
+
+declare module 'vue-router' {
+  interface RouteMeta {
+    title?: string
+    icon?: string
+    module?: string
+    ignoreAuth?: boolean
+    keepAlive?: boolean
+    hidden?: boolean
+    hollow?: boolean
+    hideFooter?: boolean
+    borderless?: boolean
+    hideBreadcrumb?: boolean
+  }
+}
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
new file mode 100644
index 00000000..69942308
--- /dev/null
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+console.log('Dashboard')
+</script>
+
+<template>
+  Dashboard
+
+  <el-button @click="$router.push({ name: 'Login' })">跳转登录页面</el-button>
+</template>
+
+<style scoped></style>
diff --git a/diboot-admin-ui/src/views/exception/404.vue b/diboot-admin-ui/src/views/exception/404.vue
new file mode 100644
index 00000000..272144b9
--- /dev/null
+++ b/diboot-admin-ui/src/views/exception/404.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+const router = useRouter()
+// 返回首页
+const goHome = () => {
+  router.push({ name: 'Home', replace: true })
+}
+
+// 倒数
+const countDown = ref(5)
+// 计时器
+let timer: NodeJS.Timeout
+
+// 重置计时器
+function resetTimer() {
+  timer = setTimeout(() => {
+    clearTimeout(timer)
+    if (--countDown.value === 0) goHome()
+    else resetTimer()
+  }, 1000)
+}
+
+resetTimer()
+</script>
+
+<template>
+  <div class="content">
+    <h1>404</h1>
+    <h3>页面不存在或无权访问</h3>
+    <el-button @click="goHome">返回首页（{{ countDown }}s）</el-button>
+  </div>
+</template>
+
+<style scoped>
+.content {
+  text-align: center;
+  margin: calc(50vh - 100px) 0;
+}
+</style>
diff --git a/diboot-admin-ui/src/views/exception/500.vue b/diboot-admin-ui/src/views/exception/500.vue
new file mode 100644
index 00000000..f71d867d
--- /dev/null
+++ b/diboot-admin-ui/src/views/exception/500.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+console.log('500')
+</script>
+
+<template>
+  <div class="content">
+    <h1>500</h1>
+    <h3>服务异常</h3>
+    <el-button @click="$router.replace({ name: 'Home' })">首页</el-button>
+  </div>
+</template>
+
+<style scoped>
+.content {
+  text-align: center;
+  margin: calc(50vh - 100px) 0;
+}
+</style>
diff --git a/diboot-admin-ui/src/views/login/index.vue b/diboot-admin-ui/src/views/login/index.vue
new file mode 100644
index 00000000..e0b4eda6
--- /dev/null
+++ b/diboot-admin-ui/src/views/login/index.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import { FormInstance } from 'element-plus'
+
+const formRef = ref<FormInstance>()
+const form = reactive({ username: 'admin', password: '123456' })
+const rules = {
+  username: { required: true, message: '不能为空', trigger: 'blur' },
+  password: { required: true, message: '不能为空', trigger: 'blur' }
+}
+const router = useRouter()
+
+const submitForm = async () => {
+  await formRef.value?.validate((valid, fields) => {
+    if (valid) {
+      console.log('submit!')
+      router.push('/')
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+</script>
+
+<template>
+  <div class="content">
+    <h2 style="text-align: center">Diboot Admin UI</h2>
+    <el-form ref="formRef" :model="form" :rules="rules">
+      <el-form-item prop="username" label="">
+        <el-input v-model="form.username">
+          <template #prefix>
+            <span style="width: 50px">用户名</span>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input v-model="form.password" show-password>
+          <template #prefix>
+            <span style="width: 50px">密 码 </span>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button style="width: 100%" type="primary" plain @click="submitForm">登 陆</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<style scoped>
+.content {
+  width: 300px;
+  margin: 25vh auto;
+}
+</style>
diff --git a/diboot-admin-ui/types/auto-imports.d.ts b/diboot-admin-ui/types/auto-imports.d.ts
index 753c2752..85282753 100644
--- a/diboot-admin-ui/types/auto-imports.d.ts
+++ b/diboot-admin-ui/types/auto-imports.d.ts
@@ -45,6 +45,8 @@ declare global {
   const useAttrs: typeof import('vue')['useAttrs']
   const useCssModule: typeof import('vue')['useCssModule']
   const useCssVars: typeof import('vue')['useCssVars']
+  const useRoute: typeof import('vue-router')['useRoute']
+  const useRouter: typeof import('vue-router')['useRouter']
   const useSlots: typeof import('vue')['useSlots']
   const watch: typeof import('vue')['watch']
   const watchEffect: typeof import('vue')['watchEffect']
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index b3a49ff5..d4dbb5e1 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -6,7 +6,13 @@ import '@vue/runtime-core'
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElInput: typeof import('element-plus/es')['ElInput']
     HelloWorld: typeof import('@/components/HelloWorld.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
   }
 }
 
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 0ce544ae..adaed34a 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -16,7 +16,7 @@ export default defineConfig({
       // 解析器
       resolvers: [ElementPlusResolver()],
       // 自动导入Api
-      imports: ['vue'],
+      imports: ['vue', 'vue-router'],
       // 为true时在项目根目录自动创建
       dts: 'types/auto-imports.d.ts'
     }),
-- 
Gitee


From efb8d31f20a6abd365e5c60c9e8af68a71298916 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 20 Apr 2022 18:13:02 +0800
Subject: [PATCH 018/195] + pinia

---
 diboot-admin-ui/package.json            |  1 +
 diboot-admin-ui/pnpm-lock.yaml          | 23 +++++++++++++++++++++++
 diboot-admin-ui/src/main.ts             |  1 +
 diboot-admin-ui/types/auto-imports.d.ts | 12 ++++++++++++
 diboot-admin-ui/vite.config.ts          |  2 +-
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 96faec2c..bd854eed 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "element-plus": "^2.1.10",
+    "pinia": "^2.0.13",
     "vue": "^3.2.25",
     "vue-router": "^4.0.14"
   },
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index fbc57efa..13682dae 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -11,6 +11,7 @@ specifiers:
   eslint-config-prettier: ^8.5.0
   eslint-plugin-prettier: ^4.0.0
   eslint-plugin-vue: ^8.6.0
+  pinia: ^2.0.13
   prettier: 2.6.2
   typescript: ^4.5.4
   unplugin-auto-import: ^0.7.1
@@ -23,6 +24,7 @@ specifiers:
 
 dependencies:
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
+  pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
   vue: registry.npmmirror.com/vue/3.2.33
   vue-router: registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33
 
@@ -2070,6 +2072,27 @@ packages:
     engines: {node: '>=8.6'}
     dev: true
 
+  registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33:
+    resolution: {integrity: sha512-B7rSqm1xNpwcPMnqns8/gVBfbbi7lWTByzS6aPZ4JOXSJD4Y531rZHDCoYWBwLyHY/8hWnXljgiXp6rRyrofcw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia/-/pinia-2.0.13.tgz}
+    id: registry.npmmirror.com/pinia/2.0.13
+    name: pinia
+    version: 2.0.13
+    peerDependencies:
+      '@vue/composition-api': ^1.4.0
+      typescript: '>=4.4.4'
+      vue: ^2.6.14 || ^3.2.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+      typescript:
+        optional: true
+    dependencies:
+      '@vue/devtools-api': registry.npmmirror.com/@vue/devtools-api/6.1.4
+      typescript: registry.npmmirror.com/typescript/4.6.3
+      vue: registry.npmmirror.com/vue/3.2.33
+      vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
+    dev: false
+
   registry.npmmirror.com/postcss/8.4.12:
     resolution: {integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss/-/postcss-8.4.12.tgz}
     name: postcss
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index 9f2b935b..97ab1ea8 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -3,4 +3,5 @@ import router from './router'
 
 const app = createApp(App)
 app.use(router)
+app.use(createPinia())
 app.mount('#app')
diff --git a/diboot-admin-ui/types/auto-imports.d.ts b/diboot-admin-ui/types/auto-imports.d.ts
index 85282753..05943a7d 100644
--- a/diboot-admin-ui/types/auto-imports.d.ts
+++ b/diboot-admin-ui/types/auto-imports.d.ts
@@ -1,19 +1,28 @@
 // Generated by 'unplugin-auto-import'
 // We suggest you to commit this file into source control
 declare global {
+  const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
+  const createPinia: typeof import('pinia')['createPinia']
   const customRef: typeof import('vue')['customRef']
   const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
   const defineComponent: typeof import('vue')['defineComponent']
+  const defineStore: typeof import('pinia')['defineStore']
   const effectScope: typeof import('vue')['effectScope']
   const EffectScope: typeof import('vue')['EffectScope']
+  const getActivePinia: typeof import('pinia')['getActivePinia']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
   const h: typeof import('vue')['h']
   const inject: typeof import('vue')['inject']
   const isReadonly: typeof import('vue')['isReadonly']
   const isRef: typeof import('vue')['isRef']
+  const mapActions: typeof import('pinia')['mapActions']
+  const mapGetters: typeof import('pinia')['mapGetters']
+  const mapState: typeof import('pinia')['mapState']
+  const mapStores: typeof import('pinia')['mapStores']
+  const mapWritableState: typeof import('pinia')['mapWritableState']
   const markRaw: typeof import('vue')['markRaw']
   const nextTick: typeof import('vue')['nextTick']
   const onActivated: typeof import('vue')['onActivated']
@@ -34,9 +43,12 @@ declare global {
   const readonly: typeof import('vue')['readonly']
   const ref: typeof import('vue')['ref']
   const resolveComponent: typeof import('vue')['resolveComponent']
+  const setActivePinia: typeof import('pinia')['setActivePinia']
+  const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']
   const shallowReactive: typeof import('vue')['shallowReactive']
   const shallowReadonly: typeof import('vue')['shallowReadonly']
   const shallowRef: typeof import('vue')['shallowRef']
+  const storeToRefs: typeof import('pinia')['storeToRefs']
   const toRaw: typeof import('vue')['toRaw']
   const toRef: typeof import('vue')['toRef']
   const toRefs: typeof import('vue')['toRefs']
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index adaed34a..1535fb41 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -16,7 +16,7 @@ export default defineConfig({
       // 解析器
       resolvers: [ElementPlusResolver()],
       // 自动导入Api
-      imports: ['vue', 'vue-router'],
+      imports: ['vue', 'vue-router', 'pinia'],
       // 为true时在项目根目录自动创建
       dts: 'types/auto-imports.d.ts'
     }),
-- 
Gitee


From 11072adea044b7c8da1352d5375a0fbd6cd663b6 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 20 Apr 2022 18:45:04 +0800
Subject: [PATCH 019/195] =?UTF-8?q?+=20add:=20axios=E3=80=81qs=E3=80=81lod?=
 =?UTF-8?q?ash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/package.json            |   5 +
 diboot-admin-ui/pnpm-lock.yaml          |  69 +++++++-
 diboot-admin-ui/src/utils/auth.ts       |  15 ++
 diboot-admin-ui/src/utils/request.ts    | 215 ++++++++++++++++++++++++
 diboot-admin-ui/types/auto-imports.d.ts |   3 +
 diboot-admin-ui/vite.config.ts          |   2 +-
 6 files changed, 302 insertions(+), 7 deletions(-)
 create mode 100644 diboot-admin-ui/src/utils/auth.ts
 create mode 100644 diboot-admin-ui/src/utils/request.ts

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index bd854eed..d85da1d5 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -9,13 +9,18 @@
     "lint": "eslint --ext .{js,jsx,ts,tsx,vue} ./src"
   },
   "dependencies": {
+    "axios": "^0.26.1",
     "element-plus": "^2.1.10",
+    "lodash": "^4.17.21",
     "pinia": "^2.0.13",
+    "qs": "^6.10.3",
     "vue": "^3.2.25",
     "vue-router": "^4.0.14"
   },
   "devDependencies": {
+    "@types/lodash": "^4.14.182",
     "@types/node": "^17.0.25",
+    "@types/qs": "^6.9.7",
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
     "@vitejs/plugin-vue": "^2.3.1",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 13682dae..751254cf 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -1,18 +1,23 @@
 lockfileVersion: 5.3
 
 specifiers:
+  '@types/lodash': ^4.14.182
   '@types/node': ^17.0.25
+  '@types/qs': ^6.9.7
   '@typescript-eslint/eslint-plugin': ^5.20.0
   '@typescript-eslint/parser': ^5.20.0
   '@vitejs/plugin-vue': ^2.3.1
   '@vue/eslint-config-prettier': ^7.0.0
+  axios: ^0.26.1
   element-plus: ^2.1.10
   eslint: ^8.12.0
   eslint-config-prettier: ^8.5.0
   eslint-plugin-prettier: ^4.0.0
   eslint-plugin-vue: ^8.6.0
+  lodash: ^4.17.21
   pinia: ^2.0.13
   prettier: 2.6.2
+  qs: ^6.10.3
   typescript: ^4.5.4
   unplugin-auto-import: ^0.7.1
   unplugin-vue-components: ^0.19.3
@@ -23,13 +28,18 @@ specifiers:
   vue-tsc: ^0.29.8
 
 dependencies:
+  axios: registry.npmmirror.com/axios/0.26.1
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
+  lodash: registry.npmmirror.com/lodash/4.17.21
   pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
+  qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
   vue-router: registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33
 
 devDependencies:
+  '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
   '@types/node': registry.npmmirror.com/@types/node/17.0.25
+  '@types/qs': registry.npmmirror.com/@types/qs/6.9.7
   '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf
   '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
   '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33
@@ -231,7 +241,6 @@ packages:
     resolution: {integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.182.tgz}
     name: '@types/lodash'
     version: 4.14.182
-    dev: false
 
   registry.npmmirror.com/@types/node/17.0.25:
     resolution: {integrity: sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.25.tgz}
@@ -239,6 +248,12 @@ packages:
     version: 17.0.25
     dev: true
 
+  registry.npmmirror.com/@types/qs/6.9.7:
+    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz}
+    name: '@types/qs'
+    version: 6.9.7
+    dev: true
+
   registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf:
     resolution: {integrity: sha512-fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz}
     id: registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0
@@ -734,6 +749,16 @@ packages:
     version: 4.0.7
     dev: false
 
+  registry.npmmirror.com/axios/0.26.1:
+    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/axios/-/axios-0.26.1.tgz}
+    name: axios
+    version: 0.26.1
+    dependencies:
+      follow-redirects: registry.npmmirror.com/follow-redirects/1.14.9
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
   registry.npmmirror.com/babel-walk/3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz}
     name: babel-walk
@@ -789,7 +814,6 @@ packages:
     dependencies:
       function-bind: registry.npmmirror.com/function-bind/1.1.1
       get-intrinsic: registry.npmmirror.com/get-intrinsic/1.1.1
-    dev: true
 
   registry.npmmirror.com/callsites/3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz}
@@ -1555,6 +1579,18 @@ packages:
     version: 3.2.5
     dev: true
 
+  registry.npmmirror.com/follow-redirects/1.14.9:
+    resolution: {integrity: sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.14.9.tgz}
+    name: follow-redirects
+    version: 1.14.9
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dev: false
+
   registry.npmmirror.com/fs.realpath/1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz}
     name: fs.realpath
@@ -1575,7 +1611,6 @@ packages:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz}
     name: function-bind
     version: 1.1.1
-    dev: true
 
   registry.npmmirror.com/functional-red-black-tree/1.0.1:
     resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz}
@@ -1591,7 +1626,6 @@ packages:
       function-bind: registry.npmmirror.com/function-bind/1.1.1
       has: registry.npmmirror.com/has/1.0.3
       has-symbols: registry.npmmirror.com/has-symbols/1.0.3
-    dev: true
 
   registry.npmmirror.com/glob-parent/5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz}
@@ -1659,7 +1693,6 @@ packages:
     name: has-symbols
     version: 1.0.3
     engines: {node: '>= 0.4'}
-    dev: true
 
   registry.npmmirror.com/has-tostringtag/1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz}
@@ -1677,7 +1710,6 @@ packages:
     engines: {node: '>= 0.4.0'}
     dependencies:
       function-bind: registry.npmmirror.com/function-bind/1.1.1
-    dev: true
 
   registry.npmmirror.com/htmlparser2/7.2.0:
     resolution: {integrity: sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/htmlparser2/-/htmlparser2-7.2.0.tgz}
@@ -2002,6 +2034,12 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  registry.npmmirror.com/object-inspect/1.12.0:
+    resolution: {integrity: sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.0.tgz}
+    name: object-inspect
+    version: 1.12.0
+    dev: false
+
   registry.npmmirror.com/once/1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/once/-/once-1.4.0.tgz}
     name: once
@@ -2257,6 +2295,15 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  registry.npmmirror.com/qs/6.10.3:
+    resolution: {integrity: sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qs/-/qs-6.10.3.tgz}
+    name: qs
+    version: 6.10.3
+    engines: {node: '>=0.6'}
+    dependencies:
+      side-channel: registry.npmmirror.com/side-channel/1.0.4
+    dev: false
+
   registry.npmmirror.com/queue-microtask/1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz}
     name: queue-microtask
@@ -2363,6 +2410,16 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  registry.npmmirror.com/side-channel/1.0.4:
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz}
+    name: side-channel
+    version: 1.0.4
+    dependencies:
+      call-bind: registry.npmmirror.com/call-bind/1.0.2
+      get-intrinsic: registry.npmmirror.com/get-intrinsic/1.1.1
+      object-inspect: registry.npmmirror.com/object-inspect/1.12.0
+    dev: false
+
   registry.npmmirror.com/slash/3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz}
     name: slash
diff --git a/diboot-admin-ui/src/utils/auth.ts b/diboot-admin-ui/src/utils/auth.ts
new file mode 100644
index 00000000..baf1bdd2
--- /dev/null
+++ b/diboot-admin-ui/src/utils/auth.ts
@@ -0,0 +1,15 @@
+const TOKEN_KEY = 'token'
+
+export const AUTH_HEADER_KEY = 'Authorization'
+
+export default {
+  getToken(): string | null {
+    return sessionStorage.getItem(TOKEN_KEY)
+  },
+  setToken(token: string) {
+    sessionStorage.setItem(TOKEN_KEY, token)
+  },
+  cleanToken() {
+    sessionStorage.removeItem(TOKEN_KEY)
+  }
+}
diff --git a/diboot-admin-ui/src/utils/request.ts b/diboot-admin-ui/src/utils/request.ts
new file mode 100644
index 00000000..afd9289a
--- /dev/null
+++ b/diboot-admin-ui/src/utils/request.ts
@@ -0,0 +1,215 @@
+import axios, { AxiosRequestHeaders, AxiosResponse } from 'axios'
+import auth, { AUTH_HEADER_KEY } from './auth'
+import router from '@/router'
+import qs from 'qs'
+
+// baseURL
+const BASE_URL = import.meta.env.VITE_APP_BASE_URL
+// 创建 axios 实例
+const service = axios.create({
+  // API 请求的默认前缀
+  baseURL: BASE_URL,
+  timeout: 30_000 // 请求超时时间
+})
+
+// 添加请求拦截器
+service.interceptors.request.use(config => {
+  // 让每个请求携带自定义 token 请根据实际情况自行修改
+  if (auth.getToken()) (config.headers as AxiosRequestHeaders)[AUTH_HEADER_KEY] = 'Bearer ' + auth.getToken()
+
+  // 只针对get方式进行序列化
+  if (config.method === 'get') config.paramsSerializer = params => qs.stringify(params, { arrayFormat: 'repeat' })
+
+  return config
+})
+
+// 添加响应拦截器
+service.interceptors.response.use(
+  response => {
+    // 检查是否携带有新的token
+    const newToken = response.headers[AUTH_HEADER_KEY]
+    if (newToken) auth.setToken(newToken)
+
+    // 如果请求成功，则重置心跳定时器
+    if (response.status === 200) resetPingTimer()
+
+    // 如果返回的自定义状态码为 4001， 则token过期，需要清理掉token并跳转至登录页面重新登录
+    if (response.data && response.data.code === 4001) {
+      auth.cleanToken()
+      router.push({ name: 'Login' }).finally()
+      throw new Error('登录过期，请重新登录')
+    }
+
+    return response
+  },
+  error => {
+    let message
+    if (error && error.response && error.response.status) {
+      switch (error.response.status) {
+        case 500:
+          message = '服务器好像开小差了，重试下吧！'
+          break
+        case 400:
+          message = '提交数据出错'
+          break
+        case 401:
+          message = '没有权限'
+          break
+        case 403:
+          message = '无权访问'
+          break
+        case 404:
+          message = '请求资源不存在'
+          break
+        default:
+          message = '网络可能出现问题'
+      }
+      console.log(message)
+    }
+    return Promise.reject(error)
+  }
+)
+
+// token 自动刷新（发送心跳）的时间间隔（分钟）
+const TOKEN_REFRESH_EXPIRE = 10
+// 心跳计时器
+let pingTimer: NodeJS.Timeout
+resetPingTimer()
+
+/**
+ * 重置心跳定时器
+ */
+function resetPingTimer() {
+  clearTimeout(pingTimer)
+  pingTimer = setTimeout(() => {
+    service.get('/ping').then()
+    resetPingTimer()
+  }, TOKEN_REFRESH_EXPIRE * 60 * 1000)
+}
+
+interface ApiData<T> {
+  ok: boolean
+  code: number
+  msg: string
+  data?: T
+  page?: Pagination
+}
+
+interface Pagination {
+  pageIndex: number
+  pageSize: number
+  totalCount: number
+}
+
+/**
+ * 请求拆包
+ * @param request 请求
+ */
+function unpack<T>(request: Promise<AxiosResponse<ApiData<T>>>): Promise<ApiData<T>> {
+  return new Promise((resolve, reject) => {
+    request
+      .then(res => {
+        // 操作成功时（code = 0）【其他情况自行调整】
+        if (res.data.code === 0) {
+          resolve(res.data)
+        } else {
+          reject(res.data)
+        }
+      })
+      .catch(err => {
+        reject(err)
+      })
+  })
+}
+
+const api = {
+  get<T>(url: string, params: any) {
+    return unpack(service.get<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, { params }))
+  },
+  post<T>(url: string, data: any) {
+    return unpack(
+      service.post<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8'
+        }
+      })
+    )
+  },
+  put<T>(url: string, data: any) {
+    return unpack(
+      service.put<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8'
+        }
+      })
+    )
+  },
+  patch<T>(url: string, data: any) {
+    return unpack(
+      service.patch<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8'
+        }
+      })
+    )
+  },
+  delete<T>(url: string, params: any) {
+    return unpack(
+      service.delete<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, {
+        params,
+        headers: {
+          'X-Requested-With': 'XMLHttpRequest',
+          'Content-Type': 'application/json;charset=UTF-8'
+        },
+        withCredentials: true
+      })
+    )
+  },
+  /**
+   * 上传文件接口
+   *
+   * @param url
+   * @param formData
+   */
+  upload<T>(url: string, formData: FormData) {
+    return unpack(service.post<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, formData))
+  },
+  /**
+   * GET下载文件
+   *
+   * @param url
+   * @param params
+   */
+  download(url: string, params: any) {
+    return unpack(
+      service.get<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, any>(url, {
+        responseType: 'arraybuffer',
+        params,
+        headers: {
+          'X-Requested-With': 'XMLHttpRequest',
+          'Content-Type': 'application/json;charset=UTF-8'
+        },
+        withCredentials: true
+      })
+    )
+  },
+  /**
+   * POST下载文件（常用于提交json数据下载文件）
+   * @param url
+   * @param data
+   */
+  postDownload(url: string, data: any) {
+    return unpack(
+      service.post<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, any>(url, JSON.stringify(data), {
+        responseType: 'arraybuffer',
+        headers: {
+          'X-Requested-With': 'XMLHttpRequest',
+          'Content-Type': 'application/json;charset=UTF-8'
+        },
+        withCredentials: true
+      })
+    )
+  }
+}
+
+export { BASE_URL as baseURL, service as axios, api }
diff --git a/diboot-admin-ui/types/auto-imports.d.ts b/diboot-admin-ui/types/auto-imports.d.ts
index 05943a7d..12dc046e 100644
--- a/diboot-admin-ui/types/auto-imports.d.ts
+++ b/diboot-admin-ui/types/auto-imports.d.ts
@@ -1,7 +1,10 @@
 // Generated by 'unplugin-auto-import'
 // We suggest you to commit this file into source control
 declare global {
+  const _: typeof import('lodash')
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
+  const api: typeof import('@/utils/request')['api']
+  const baseURL: typeof import('@/utils/request')['baseURL']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
   const createPinia: typeof import('pinia')['createPinia']
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 1535fb41..fb89f3a0 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -16,7 +16,7 @@ export default defineConfig({
       // 解析器
       resolvers: [ElementPlusResolver()],
       // 自动导入Api
-      imports: ['vue', 'vue-router', 'pinia'],
+      imports: ['vue', 'vue-router', 'pinia', { lodash: [['*', '_']] }, { '@/utils/request': ['api', 'baseURL'] }],
       // 为true时在项目根目录自动创建
       dts: 'types/auto-imports.d.ts'
     }),
-- 
Gitee


From ef1bc99e3f232da2b38a366784882cbe344421b9 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 21 Apr 2022 17:39:55 +0800
Subject: [PATCH 020/195] + mockjs and vite-plugin-mock

---
 diboot-admin-ui/.env.development          |   2 +
 diboot-admin-ui/.env.production           |   2 +
 diboot-admin-ui/mock/_prodServer.ts       |  18 ++
 diboot-admin-ui/mock/_util.ts             | 119 ++++++++++++
 diboot-admin-ui/mock/auth/index.ts        |  60 ++++++
 diboot-admin-ui/package.json              |   2 +
 diboot-admin-ui/pnpm-lock.yaml            | 227 +++++++++++++++++++++-
 diboot-admin-ui/src/main.ts               |   2 +
 diboot-admin-ui/src/store/user.ts         |  54 +++++
 diboot-admin-ui/src/utils/request.ts      |  16 +-
 diboot-admin-ui/src/views/login/index.vue |  12 +-
 diboot-admin-ui/tsconfig.json             |   1 +
 diboot-admin-ui/vite.config.ts            |  79 +++++---
 13 files changed, 549 insertions(+), 45 deletions(-)
 create mode 100644 diboot-admin-ui/.env.development
 create mode 100644 diboot-admin-ui/.env.production
 create mode 100644 diboot-admin-ui/mock/_prodServer.ts
 create mode 100644 diboot-admin-ui/mock/_util.ts
 create mode 100644 diboot-admin-ui/mock/auth/index.ts
 create mode 100644 diboot-admin-ui/src/store/user.ts

diff --git a/diboot-admin-ui/.env.development b/diboot-admin-ui/.env.development
new file mode 100644
index 00000000..a435ff63
--- /dev/null
+++ b/diboot-admin-ui/.env.development
@@ -0,0 +1,2 @@
+# BASE_URL
+VITE_APP_BASE_URL=/api
diff --git a/diboot-admin-ui/.env.production b/diboot-admin-ui/.env.production
new file mode 100644
index 00000000..a435ff63
--- /dev/null
+++ b/diboot-admin-ui/.env.production
@@ -0,0 +1,2 @@
+# BASE_URL
+VITE_APP_BASE_URL=/api
diff --git a/diboot-admin-ui/mock/_prodServer.ts b/diboot-admin-ui/mock/_prodServer.ts
new file mode 100644
index 00000000..9242ea29
--- /dev/null
+++ b/diboot-admin-ui/mock/_prodServer.ts
@@ -0,0 +1,18 @@
+import { createProdMockServer } from 'vite-plugin-mock/es/createProdMockServer'
+
+const modules = import.meta.globEager('./**/*.ts')
+
+const mockModules: any[] = []
+Object.keys(modules).forEach(key => {
+  if (key.includes('/_')) {
+    return
+  }
+  mockModules.push(...modules[key].default)
+})
+
+/**
+ * Used in a production environment. Need to manually import all modules
+ */
+export function setupProdMockServer() {
+  createProdMockServer(mockModules)
+}
diff --git a/diboot-admin-ui/mock/_util.ts b/diboot-admin-ui/mock/_util.ts
new file mode 100644
index 00000000..736ab40b
--- /dev/null
+++ b/diboot-admin-ui/mock/_util.ts
@@ -0,0 +1,119 @@
+import Mock from 'mockjs'
+
+// 分页
+export const pagination = <T = any>(pageNo: number, pageSize: number, array: T[]): T[] => {
+  const offset = (pageNo - 1) * Number(pageSize)
+  return offset + Number(pageSize) >= array.length
+    ? array.slice(offset, array.length)
+    : array.slice(offset, offset + Number(pageSize))
+}
+
+const resultJson = (code: number, msg: string, data?: any, ext = {}) =>
+  Mock.mock({
+    ...ext,
+    code,
+    data,
+    msg
+  })
+
+class JsonResult {
+  /**
+   * 操作成功
+   */
+  OK(data?: any, msg = '操作成功') {
+    return resultJson(0, msg, data)
+  }
+
+  /**
+   * 数据分页
+   */
+  PAGINATION<T = any>(page: number, pageSize: number, list: T[] = []) {
+    return resultJson(0, '操作成功', pagination(page, pageSize, list), { page, pageSize, total: list.length })
+  }
+
+  /**
+   * 部分成功（一般用于批量处理场景，只处理筛选后的合法数据）
+   */
+  WARN_PARTIAL_SUCCESS(msg?: string) {
+    return resultJson(1001, '部分成功' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 有潜在的性能问题
+   */
+  WARN_PERFORMANCE_ISSUE(msg?: string) {
+    return resultJson(1002, '潜在的性能问题' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 传入参数不对
+   */
+  FAIL_INVALID_PARAM(msg?: string) {
+    return resultJson(4000, '请求参数不匹配' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * Token无效或已过期
+   */
+  FAIL_INVALID_TOKEN(msg?: string) {
+    return resultJson(4001, 'Token无效或已过期' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 没有权限执行该操作
+   */
+  FAIL_NO_PERMISSION(msg?: string) {
+    return resultJson(4003, '无权执行该操作' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 请求资源不存在
+   */
+  FAIL_NOT_FOUND(msg?: string) {
+    return resultJson(4004, '请求资源不存在' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 数据校验不通过
+   */
+  FAIL_VALIDATION(msg?: string) {
+    return resultJson(4005, '数据校验不通过' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 操作执行失败
+   */
+  FAIL_OPERATION(msg?: string) {
+    return resultJson(4006, '操作执行失败' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 请求连接超时
+   */
+  FAIL_REQUEST_TIMEOUT(msg?: string) {
+    return resultJson(4008, '请求连接超时' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 认证不通过（用户名密码错误等认证失败场景）
+   */
+  FAIL_AUTHENTICATION(msg?: string) {
+    return resultJson(4009, '认证不通过' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 系统异常
+   */
+  FAIL_EXCEPTION(msg?: string) {
+    return resultJson(5000, '系统异常' + (msg ? `:${msg}` : ''))
+  }
+
+  /**
+   * 服务不可用
+   */
+  FAIL_SERVICE_UNAVAILABLE(msg?: string) {
+    return resultJson(5003, '服务不可用' + (msg ? `:${msg}` : ''))
+  }
+}
+
+export default new JsonResult()
diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
new file mode 100644
index 00000000..3218fb2d
--- /dev/null
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -0,0 +1,60 @@
+import { MockMethod } from 'vite-plugin-mock'
+import JsonResult from '../_util'
+import { Random } from 'mockjs'
+
+const baseUrl = '/api/auth'
+
+export default [
+  {
+    url: `${baseUrl}/captcha`,
+    timeout: Random.natural(50, 100),
+    method: 'get',
+    // response: () => Random.dataImage('200x100', 'Diboot')
+    rawResponse: (req, res) => {
+      res.setHeader('Content-Type', 'image/gif')
+      res.setHeader('Pragma', 'No-cache')
+      res.setHeader('Cache-Control', 'no-cache')
+      res.write(Random.dataImage('200x100', 'Diboot'))
+    }
+  },
+  {
+    url: `${baseUrl}/login`,
+    timeout: Random.natural(50, 300),
+    method: 'post',
+    response: ({ body }: any) => {
+      if (body.username === 'admin' && body.password === '123456') {
+        return JsonResult.OK({ token: Random.string('lower', 32, 32) })
+      }
+      return JsonResult.FAIL_OPERATION('用户名或密码错误')
+    }
+  },
+  {
+    url: `${baseUrl}/userInfo`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    response: () => {
+      return JsonResult.OK({
+        realname: Random.cname(),
+        email: Random.email(),
+        avatar: Random.image('250x250')
+      })
+    }
+  },
+  {
+    url: `${baseUrl}/logout`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    response: () => {
+      return JsonResult.OK()
+    }
+  },
+  {
+    url: `${baseUrl}/ping`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    rawResponse: (req, res) => {
+      res.setHeader('Authorization', Random.string('lower', 32, 32))
+      res.end()
+    }
+  }
+] as MockMethod[]
diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index d85da1d5..3440815a 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -12,6 +12,7 @@
     "axios": "^0.26.1",
     "element-plus": "^2.1.10",
     "lodash": "^4.17.21",
+    "mockjs": "^1.1.0",
     "pinia": "^2.0.13",
     "qs": "^6.10.3",
     "vue": "^3.2.25",
@@ -35,6 +36,7 @@
     "unplugin-vue-components": "^0.19.3",
     "vite": "^2.9.2",
     "vite-plugin-eslint": "^1.4.0",
+    "vite-plugin-mock": "^2.9.6",
     "vue-tsc": "^0.29.8"
   }
 }
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 751254cf..f2142ec4 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -15,6 +15,7 @@ specifiers:
   eslint-plugin-prettier: ^4.0.0
   eslint-plugin-vue: ^8.6.0
   lodash: ^4.17.21
+  mockjs: ^1.1.0
   pinia: ^2.0.13
   prettier: 2.6.2
   qs: ^6.10.3
@@ -23,6 +24,7 @@ specifiers:
   unplugin-vue-components: ^0.19.3
   vite: ^2.9.2
   vite-plugin-eslint: ^1.4.0
+  vite-plugin-mock: ^2.9.6
   vue: ^3.2.25
   vue-router: ^4.0.14
   vue-tsc: ^0.29.8
@@ -31,6 +33,7 @@ dependencies:
   axios: registry.npmmirror.com/axios/0.26.1
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
   lodash: registry.npmmirror.com/lodash/4.17.21
+  mockjs: registry.npmmirror.com/mockjs/1.1.0
   pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
@@ -54,6 +57,7 @@ devDependencies:
   unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33
   vite: registry.npmmirror.com/vite/2.9.5
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
+  vite-plugin-mock: registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.5
   vue-tsc: registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3
 
 packages:
@@ -213,6 +217,35 @@ packages:
     version: 2.11.5
     dev: false
 
+  registry.npmmirror.com/@rollup/plugin-node-resolve/13.2.1:
+    resolution: {integrity: sha512-btX7kzGvp1JwShQI9V6IM841YKNPYjKCvUbNrQ2EcVYbULtUd/GH6wZ/qdqH13j9pOHBER+EZXNN2L8RSJhVRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.2.1.tgz}
+    name: '@rollup/plugin-node-resolve'
+    version: 13.2.1
+    engines: {node: '>= 10.0.0'}
+    peerDependencies:
+      rollup: ^2.42.0
+    dependencies:
+      '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/3.1.0
+      '@types/resolve': registry.npmmirror.com/@types/resolve/1.17.1
+      builtin-modules: registry.npmmirror.com/builtin-modules/3.2.0
+      deepmerge: registry.npmmirror.com/deepmerge/4.2.2
+      is-module: registry.npmmirror.com/is-module/1.0.0
+      resolve: registry.npmmirror.com/resolve/1.22.0
+    dev: true
+
+  registry.npmmirror.com/@rollup/pluginutils/3.1.0:
+    resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz}
+    name: '@rollup/pluginutils'
+    version: 3.1.0
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0
+    dependencies:
+      '@types/estree': registry.npmmirror.com/@types/estree/0.0.39
+      estree-walker: registry.npmmirror.com/estree-walker/1.0.1
+      picomatch: registry.npmmirror.com/picomatch/2.3.1
+    dev: true
+
   registry.npmmirror.com/@rollup/pluginutils/4.2.1:
     resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz}
     name: '@rollup/pluginutils'
@@ -223,6 +256,12 @@ packages:
       picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
+  registry.npmmirror.com/@types/estree/0.0.39:
+    resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/estree/-/estree-0.0.39.tgz}
+    name: '@types/estree'
+    version: 0.0.39
+    dev: true
+
   registry.npmmirror.com/@types/json-schema/7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz}
     name: '@types/json-schema'
@@ -242,6 +281,12 @@ packages:
     name: '@types/lodash'
     version: 4.14.182
 
+  registry.npmmirror.com/@types/mockjs/1.0.6:
+    resolution: {integrity: sha512-Yu5YlqbYZyqsd6LjO4e8ONJDN9pTSnciHDcRP4teNOh/au2b8helFhgRx+3w8xsTFEnwr9jtfTVJbAx+eYmlHA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/mockjs/-/mockjs-1.0.6.tgz}
+    name: '@types/mockjs'
+    version: 1.0.6
+    dev: true
+
   registry.npmmirror.com/@types/node/17.0.25:
     resolution: {integrity: sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.25.tgz}
     name: '@types/node'
@@ -254,6 +299,14 @@ packages:
     version: 6.9.7
     dev: true
 
+  registry.npmmirror.com/@types/resolve/1.17.1:
+    resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/resolve/-/resolve-1.17.1.tgz}
+    name: '@types/resolve'
+    version: 1.17.1
+    dependencies:
+      '@types/node': registry.npmmirror.com/@types/node/17.0.25
+    dev: true
+
   registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf:
     resolution: {integrity: sha512-fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz}
     id: registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0
@@ -807,6 +860,13 @@ packages:
       fill-range: registry.npmmirror.com/fill-range/7.0.1
     dev: true
 
+  registry.npmmirror.com/builtin-modules/3.2.0:
+    resolution: {integrity: sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/builtin-modules/-/builtin-modules-3.2.0.tgz}
+    name: builtin-modules
+    version: 3.2.0
+    engines: {node: '>=6'}
+    dev: true
+
   registry.npmmirror.com/call-bind/1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz}
     name: call-bind
@@ -872,12 +932,31 @@ packages:
     version: 1.1.4
     dev: true
 
+  registry.npmmirror.com/commander/9.2.0:
+    resolution: {integrity: sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/commander/-/commander-9.2.0.tgz}
+    name: commander
+    version: 9.2.0
+    engines: {node: ^12.20.0 || >=14}
+    dev: false
+
   registry.npmmirror.com/concat-map/0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz}
     name: concat-map
     version: 0.0.1
     dev: true
 
+  registry.npmmirror.com/connect/3.7.0:
+    resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/connect/-/connect-3.7.0.tgz}
+    name: connect
+    version: 3.7.0
+    engines: {node: '>= 0.10.0'}
+    dependencies:
+      debug: registry.npmmirror.com/debug/2.6.9
+      finalhandler: registry.npmmirror.com/finalhandler/1.1.2
+      parseurl: registry.npmmirror.com/parseurl/1.3.3
+      utils-merge: registry.npmmirror.com/utils-merge/1.0.1
+    dev: true
+
   registry.npmmirror.com/constantinople/4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/constantinople/-/constantinople-4.0.1.tgz}
     name: constantinople
@@ -910,6 +989,14 @@ packages:
     version: 1.11.1
     dev: false
 
+  registry.npmmirror.com/debug/2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz}
+    name: debug
+    version: 2.6.9
+    dependencies:
+      ms: registry.npmmirror.com/ms/2.0.0
+    dev: true
+
   registry.npmmirror.com/debug/4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz}
     name: debug
@@ -930,6 +1017,13 @@ packages:
     version: 0.1.4
     dev: true
 
+  registry.npmmirror.com/deepmerge/4.2.2:
+    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz}
+    name: deepmerge
+    version: 4.2.2
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   registry.npmmirror.com/dir-glob/3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz}
     name: dir-glob
@@ -989,6 +1083,12 @@ packages:
       domhandler: registry.npmmirror.com/domhandler/4.3.1
     dev: true
 
+  registry.npmmirror.com/ee-first/1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz}
+    name: ee-first
+    version: 1.1.1
+    dev: true
+
   registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33:
     resolution: {integrity: sha512-sS9OMgP20dlYipmzHlEEgCJU+ID7+03YpRpoJWNQEH736C6ArmDMLnGFe8DUjPvwbUEXRA2d0Eo5d0apFgkSqg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.1.10.tgz}
     id: registry.npmmirror.com/element-plus/2.1.10
@@ -1026,6 +1126,13 @@ packages:
       '@emmetio/css-abbreviation': registry.npmmirror.com/@emmetio/css-abbreviation/2.1.4
     dev: true
 
+  registry.npmmirror.com/encodeurl/1.0.2:
+    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz}
+    name: encodeurl
+    version: 1.0.2
+    engines: {node: '>= 0.8'}
+    dev: true
+
   registry.npmmirror.com/entities/2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz}
     name: entities
@@ -1259,6 +1366,14 @@ packages:
     dev: true
     optional: true
 
+  registry.npmmirror.com/esbuild/0.11.3:
+    resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.11.3.tgz}
+    name: esbuild
+    version: 0.11.3
+    hasBin: true
+    requiresBuild: true
+    dev: true
+
   registry.npmmirror.com/esbuild/0.14.36:
     resolution: {integrity: sha512-HhFHPiRXGYOCRlrhpiVDYKcFJRdO0sBElZ668M4lh2ER0YgnkLxECuFe7uWCf23FrcLc59Pqr7dHkTqmRPDHmw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.14.36.tgz}
     name: esbuild
@@ -1293,7 +1408,6 @@ packages:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz}
     name: escape-html
     version: 1.0.3
-    dev: false
 
   registry.npmmirror.com/escape-string-regexp/4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}
@@ -1488,6 +1602,12 @@ packages:
     engines: {node: '>=4.0'}
     dev: true
 
+  registry.npmmirror.com/estree-walker/1.0.1:
+    resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-1.0.1.tgz}
+    name: estree-walker
+    version: 1.0.1
+    dev: true
+
   registry.npmmirror.com/estree-walker/2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz}
     name: estree-walker
@@ -1563,6 +1683,21 @@ packages:
       to-regex-range: registry.npmmirror.com/to-regex-range/5.0.1
     dev: true
 
+  registry.npmmirror.com/finalhandler/1.1.2:
+    resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/finalhandler/-/finalhandler-1.1.2.tgz}
+    name: finalhandler
+    version: 1.1.2
+    engines: {node: '>= 0.8'}
+    dependencies:
+      debug: registry.npmmirror.com/debug/2.6.9
+      encodeurl: registry.npmmirror.com/encodeurl/1.0.2
+      escape-html: registry.npmmirror.com/escape-html/1.0.3
+      on-finished: registry.npmmirror.com/on-finished/2.3.0
+      parseurl: registry.npmmirror.com/parseurl/1.3.3
+      statuses: registry.npmmirror.com/statuses/1.5.0
+      unpipe: registry.npmmirror.com/unpipe/1.0.0
+    dev: true
+
   registry.npmmirror.com/flat-cache/3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flat-cache/-/flat-cache-3.0.4.tgz}
     name: flat-cache
@@ -1803,6 +1938,12 @@ packages:
       is-extglob: registry.npmmirror.com/is-extglob/2.1.1
     dev: true
 
+  registry.npmmirror.com/is-module/1.0.0:
+    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-module/-/is-module-1.0.0.tgz}
+    name: is-module
+    version: 1.0.0
+    dev: true
+
   registry.npmmirror.com/is-number/7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz}
     name: is-number
@@ -1995,6 +2136,21 @@ packages:
       brace-expansion: registry.npmmirror.com/brace-expansion/2.0.1
     dev: true
 
+  registry.npmmirror.com/mockjs/1.1.0:
+    resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz}
+    name: mockjs
+    version: 1.1.0
+    hasBin: true
+    dependencies:
+      commander: registry.npmmirror.com/commander/9.2.0
+    dev: false
+
+  registry.npmmirror.com/ms/2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz}
+    name: ms
+    version: 2.0.0
+    dev: true
+
   registry.npmmirror.com/ms/2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz}
     name: ms
@@ -2040,6 +2196,15 @@ packages:
     version: 1.12.0
     dev: false
 
+  registry.npmmirror.com/on-finished/2.3.0:
+    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz}
+    name: on-finished
+    version: 2.3.0
+    engines: {node: '>= 0.8'}
+    dependencies:
+      ee-first: registry.npmmirror.com/ee-first/1.1.1
+    dev: true
+
   registry.npmmirror.com/once/1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/once/-/once-1.4.0.tgz}
     name: once
@@ -2071,6 +2236,13 @@ packages:
       callsites: registry.npmmirror.com/callsites/3.1.0
     dev: true
 
+  registry.npmmirror.com/parseurl/1.3.3:
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz}
+    name: parseurl
+    version: 1.3.3
+    engines: {node: '>= 0.8'}
+    dev: true
+
   registry.npmmirror.com/path-is-absolute/1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz}
     name: path-is-absolute
@@ -2091,6 +2263,12 @@ packages:
     version: 1.0.7
     dev: true
 
+  registry.npmmirror.com/path-to-regexp/6.2.0:
+    resolution: {integrity: sha512-f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-6.2.0.tgz}
+    name: path-to-regexp
+    version: 6.2.0
+    dev: true
+
   registry.npmmirror.com/path-type/4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz}
     name: path-type
@@ -2444,6 +2622,13 @@ packages:
     name: sourcemap-codec
     version: 1.4.8
 
+  registry.npmmirror.com/statuses/1.5.0:
+    resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz}
+    name: statuses
+    version: 1.5.0
+    engines: {node: '>= 0.6'}
+    dev: true
+
   registry.npmmirror.com/strip-ansi/6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz}
     name: strip-ansi
@@ -2547,6 +2732,13 @@ packages:
     hasBin: true
     dev: true
 
+  registry.npmmirror.com/unpipe/1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz}
+    name: unpipe
+    version: 1.0.0
+    engines: {node: '>= 0.8'}
+    dev: true
+
   registry.npmmirror.com/unplugin-auto-import/0.7.1_vite@2.9.5:
     resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.7.1.tgz}
     id: registry.npmmirror.com/unplugin-auto-import/0.7.1
@@ -2648,6 +2840,13 @@ packages:
       punycode: registry.npmmirror.com/punycode/2.1.1
     dev: true
 
+  registry.npmmirror.com/utils-merge/1.0.1:
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz}
+    name: utils-merge
+    version: 1.0.1
+    engines: {node: '>= 0.4.0'}
+    dev: true
+
   registry.npmmirror.com/v8-compile-cache/2.3.0:
     resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz}
     name: v8-compile-cache
@@ -2669,6 +2868,32 @@ packages:
       vite: registry.npmmirror.com/vite/2.9.5
     dev: true
 
+  registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.5:
+    resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-mock/-/vite-plugin-mock-2.9.6.tgz}
+    id: registry.npmmirror.com/vite-plugin-mock/2.9.6
+    name: vite-plugin-mock
+    version: 2.9.6
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      mockjs: '>=1.1.0'
+      vite: '>=2.0.0'
+    dependencies:
+      '@rollup/plugin-node-resolve': registry.npmmirror.com/@rollup/plugin-node-resolve/13.2.1
+      '@types/mockjs': registry.npmmirror.com/@types/mockjs/1.0.6
+      chalk: registry.npmmirror.com/chalk/4.1.2
+      chokidar: registry.npmmirror.com/chokidar/3.5.3
+      connect: registry.npmmirror.com/connect/3.7.0
+      debug: registry.npmmirror.com/debug/4.3.4
+      esbuild: registry.npmmirror.com/esbuild/0.11.3
+      fast-glob: registry.npmmirror.com/fast-glob/3.2.11
+      mockjs: registry.npmmirror.com/mockjs/1.1.0
+      path-to-regexp: registry.npmmirror.com/path-to-regexp/6.2.0
+      vite: registry.npmmirror.com/vite/2.9.5
+    transitivePeerDependencies:
+      - rollup
+      - supports-color
+    dev: true
+
   registry.npmmirror.com/vite/2.9.5:
     resolution: {integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-2.9.5.tgz}
     name: vite
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index 97ab1ea8..6826bc86 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -5,3 +5,5 @@ const app = createApp(App)
 app.use(router)
 app.use(createPinia())
 app.mount('#app')
+
+import 'element-plus/es/components/message/style/css'
diff --git a/diboot-admin-ui/src/store/user.ts b/diboot-admin-ui/src/store/user.ts
new file mode 100644
index 00000000..5d850aa6
--- /dev/null
+++ b/diboot-admin-ui/src/store/user.ts
@@ -0,0 +1,54 @@
+import auth from '@/utils/auth'
+import { ElMessage } from 'element-plus'
+
+interface IUserInfo {
+  realname: string
+  email: string
+  avatar: string
+}
+
+export default defineStore('user', {
+  state: () => {
+    return <IUserInfo>{
+      realname: '游客',
+      avatar: ''
+    }
+  },
+  actions: {
+    login: (account: any) => {
+      return new Promise((resolve, reject) => {
+        api
+          .post<{ token: string }>('/auth/login', account)
+          .then(res => {
+            if (res.data) {
+              auth.setToken(res.data.token)
+              resolve(res.data)
+            }
+          })
+          .catch(err => {
+            ElMessage.error(err.message || err.msg || '稍后重试')
+            reject()
+          })
+      })
+    },
+    getInfo: () => {
+      return new Promise((resolve, reject) => {
+        api
+          .get('/auth/userInfo')
+          .then(res => {
+            if (res.data) resolve(res.data)
+            else reject()
+          })
+          .catch(err => {
+            reject(err)
+          })
+      })
+    },
+    logout: () => {
+      // this.realname = 'asd'
+      api.post('/auth/logout').finally(() => {
+        auth.cleanToken()
+      })
+    }
+  }
+})
diff --git a/diboot-admin-ui/src/utils/request.ts b/diboot-admin-ui/src/utils/request.ts
index afd9289a..4c43eb53 100644
--- a/diboot-admin-ui/src/utils/request.ts
+++ b/diboot-admin-ui/src/utils/request.ts
@@ -82,7 +82,7 @@ resetPingTimer()
 function resetPingTimer() {
   clearTimeout(pingTimer)
   pingTimer = setTimeout(() => {
-    service.get('/ping').then()
+    service.get('/auth/ping').then()
     resetPingTimer()
   }, TOKEN_REFRESH_EXPIRE * 60 * 1000)
 }
@@ -123,10 +123,10 @@ function unpack<T>(request: Promise<AxiosResponse<ApiData<T>>>): Promise<ApiData
 }
 
 const api = {
-  get<T>(url: string, params: any) {
+  get<T>(url: string, params?: any) {
     return unpack(service.get<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, { params }))
   },
-  post<T>(url: string, data: any) {
+  post<T>(url: string, data?: any) {
     return unpack(
       service.post<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
         headers: {
@@ -135,7 +135,7 @@ const api = {
       })
     )
   },
-  put<T>(url: string, data: any) {
+  put<T>(url: string, data?: any) {
     return unpack(
       service.put<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
         headers: {
@@ -144,7 +144,7 @@ const api = {
       })
     )
   },
-  patch<T>(url: string, data: any) {
+  patch<T>(url: string, data?: any) {
     return unpack(
       service.patch<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
         headers: {
@@ -153,7 +153,7 @@ const api = {
       })
     )
   },
-  delete<T>(url: string, params: any) {
+  delete<T>(url: string, params?: any) {
     return unpack(
       service.delete<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, {
         params,
@@ -180,7 +180,7 @@ const api = {
    * @param url
    * @param params
    */
-  download(url: string, params: any) {
+  download(url: string, params?: any) {
     return unpack(
       service.get<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, any>(url, {
         responseType: 'arraybuffer',
@@ -198,7 +198,7 @@ const api = {
    * @param url
    * @param data
    */
-  postDownload(url: string, data: any) {
+  postDownload(url: string, data?: any) {
     return unpack(
       service.post<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, any>(url, JSON.stringify(data), {
         responseType: 'arraybuffer',
diff --git a/diboot-admin-ui/src/views/login/index.vue b/diboot-admin-ui/src/views/login/index.vue
index e0b4eda6..6776f9ac 100644
--- a/diboot-admin-ui/src/views/login/index.vue
+++ b/diboot-admin-ui/src/views/login/index.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
 import { FormInstance } from 'element-plus'
+import useUserStore from '@/store/user'
+
+const userStore = useUserStore()
 
 const formRef = ref<FormInstance>()
 const form = reactive({ username: 'admin', password: '123456' })
@@ -10,12 +13,11 @@ const rules = {
 const router = useRouter()
 
 const submitForm = async () => {
-  await formRef.value?.validate((valid, fields) => {
+  await formRef.value?.validate(valid => {
     if (valid) {
-      console.log('submit!')
-      router.push('/')
-    } else {
-      console.log('error submit!', fields)
+      userStore.login(form).then(() => {
+        router.push('/')
+      })
     }
   })
 }
diff --git a/diboot-admin-ui/tsconfig.json b/diboot-admin-ui/tsconfig.json
index f5085435..daf82714 100644
--- a/diboot-admin-ui/tsconfig.json
+++ b/diboot-admin-ui/tsconfig.json
@@ -24,6 +24,7 @@
       ]
     },
     "types": [
+      "vite/client",
       "element-plus/global"
     ]
   },
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index fb89f3a0..31172c3e 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -4,39 +4,56 @@ import eslintPlugin from 'vite-plugin-eslint/dist'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
+import { viteMockServe } from 'vite-plugin-mock'
 import { resolve } from 'path'
 
 // https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [
-    vue(),
-    // eslint 自动修复
-    eslintPlugin({ fix: true }),
-    AutoImport({
-      // 解析器
-      resolvers: [ElementPlusResolver()],
-      // 自动导入Api
-      imports: ['vue', 'vue-router', 'pinia', { lodash: [['*', '_']] }, { '@/utils/request': ['api', 'baseURL'] }],
-      // 为true时在项目根目录自动创建
-      dts: 'types/auto-imports.d.ts'
-    }),
-    Components({
-      // 解析器
-      resolvers: [ElementPlusResolver()],
-      // 自动加载的组件目录，默认值为 ['src/components']
-      dirs: ['src/components'],
-      // 组件名称包含目录，防止同名组件冲突
-      directoryAsNamespace: true,
-      // 指定类型声明文件，为true时在项目根目录创建
-      dts: 'types/components.d.ts',
-      // 导入路径变换
-      importPathTransform: path => path.replace(/^.+\/src/g, '@')
-    })
-  ],
-  resolve: {
-    alias: [
-      { find: '@', replacement: resolve(__dirname, 'src') },
-      { find: '#', replacement: resolve(__dirname, 'types') }
-    ]
+export default defineConfig(({ command }) => {
+  return {
+    plugins: [
+      vue(),
+      // eslint 自动修复
+      eslintPlugin({ fix: true }),
+      AutoImport({
+        // 解析器
+        resolvers: [ElementPlusResolver()],
+        // 自动导入Api
+        imports: ['vue', 'vue-router', 'pinia', { lodash: [['*', '_']] }, { '@/utils/request': ['api', 'baseURL'] }],
+        // 为true时在项目根目录自动创建
+        dts: 'types/auto-imports.d.ts'
+      }),
+      Components({
+        // 解析器
+        resolvers: [ElementPlusResolver()],
+        // 自动加载的组件目录，默认值为 ['src/components']
+        dirs: ['src/components'],
+        // 组件名称包含目录，防止同名组件冲突
+        directoryAsNamespace: true,
+        // 指定类型声明文件，为true时在项目根目录创建
+        dts: 'types/components.d.ts',
+        // 导入路径变换
+        importPathTransform: path => path.replace(/^.+\/src/g, '@')
+      }),
+      viteMockServe({
+        // 忽略以_开头文件
+        ignore: /^_/,
+        // 开发打包开关(默认开启)
+        localEnabled: command === 'serve',
+        // 生产打包开关(默认不打包)
+        prodEnabled: command !== 'serve',
+        // 注入代码(用于生产需要mock)
+        injectCode: `
+        import { setupProdMockServer } from '../mock/_prodServer';
+        
+        setupProdMockServer();
+        `
+      })
+    ],
+    resolve: {
+      alias: [
+        { find: '@', replacement: resolve(__dirname, 'src') },
+        { find: '#', replacement: resolve(__dirname, 'types') }
+      ]
+    }
   }
 })
-- 
Gitee


From 811c479ce57ad49a26f031f97e22886d0e4263cf Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 21 Apr 2022 21:29:50 +0800
Subject: [PATCH 021/195] * mockjs config

---
 diboot-admin-ui/mock/_prodServer.ts | 9 +++------
 diboot-admin-ui/vite.config.ts      | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/diboot-admin-ui/mock/_prodServer.ts b/diboot-admin-ui/mock/_prodServer.ts
index 9242ea29..52521a45 100644
--- a/diboot-admin-ui/mock/_prodServer.ts
+++ b/diboot-admin-ui/mock/_prodServer.ts
@@ -3,12 +3,9 @@ import { createProdMockServer } from 'vite-plugin-mock/es/createProdMockServer'
 const modules = import.meta.globEager('./**/*.ts')
 
 const mockModules: any[] = []
-Object.keys(modules).forEach(key => {
-  if (key.includes('/_')) {
-    return
-  }
-  mockModules.push(...modules[key].default)
-})
+Object.keys(modules)
+  .filter(path => !path.includes('/_')) // Ignore files and directories starting with _
+  .forEach(key => mockModules.push(...modules[key].default))
 
 /**
  * Used in a production environment. Need to manually import all modules
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 31172c3e..987976c0 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -35,8 +35,8 @@ export default defineConfig(({ command }) => {
         importPathTransform: path => path.replace(/^.+\/src/g, '@')
       }),
       viteMockServe({
-        // 忽略以_开头文件
-        ignore: /^_/,
+        // 忽略以_开头的文件及目录
+        ignore: /^_|\/_/,
         // 开发打包开关(默认开启)
         localEnabled: command === 'serve',
         // 生产打包开关(默认不打包)
-- 
Gitee


From 00779654774630b89f767cfe0df344af67608ce1 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 15:34:22 +0800
Subject: [PATCH 022/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-core-starter/pom.xml      | 4 ++--
 diboot-core/pom.xml              | 4 ++--
 diboot-file-starter/pom.xml      | 4 ++--
 diboot-iam-starter/pom.xml       | 4 ++--
 diboot-message-starter/pom.xml   | 4 ++--
 diboot-mobile-starter/pom.xml    | 2 +-
 diboot-scheduler-starter/pom.xml | 4 ++--
 pom.xml                          | 6 +++---
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/diboot-core-starter/pom.xml b/diboot-core-starter/pom.xml
index 0f9f9385..86bf86c0 100644
--- a/diboot-core-starter/pom.xml
+++ b/diboot-core-starter/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>com.diboot</groupId>
         <artifactId>diboot-root</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>diboot-core-spring-boot-starter</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>jar</packaging>
     <description>diboot core starter project</description>
 
diff --git a/diboot-core/pom.xml b/diboot-core/pom.xml
index e3ea9cd8..3b3f4fbc 100644
--- a/diboot-core/pom.xml
+++ b/diboot-core/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>com.diboot</groupId>
         <artifactId>diboot-root</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>diboot-core</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>jar</packaging>
     <description>diboot core project</description>
 
diff --git a/diboot-file-starter/pom.xml b/diboot-file-starter/pom.xml
index c9835598..6a7bbdb2 100644
--- a/diboot-file-starter/pom.xml
+++ b/diboot-file-starter/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>diboot-root</artifactId>
         <groupId>com.diboot</groupId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>diboot-file-spring-boot-starter</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>jar</packaging>
     <description>diboot file component project</description>
 
diff --git a/diboot-iam-starter/pom.xml b/diboot-iam-starter/pom.xml
index 2cdc1ff0..51bf7716 100644
--- a/diboot-iam-starter/pom.xml
+++ b/diboot-iam-starter/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>com.diboot</groupId>
         <artifactId>diboot-root</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>diboot-iam-spring-boot-starter</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>jar</packaging>
     <description>diboot IAM project</description>
 
diff --git a/diboot-message-starter/pom.xml b/diboot-message-starter/pom.xml
index f34c8f6b..85948a3c 100644
--- a/diboot-message-starter/pom.xml
+++ b/diboot-message-starter/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>diboot-root</artifactId>
         <groupId>com.diboot</groupId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>diboot-message-spring-boot-starter</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>jar</packaging>
     <description>diboot消息组件</description>
 
diff --git a/diboot-mobile-starter/pom.xml b/diboot-mobile-starter/pom.xml
index 2cb11c09..189fdf04 100644
--- a/diboot-mobile-starter/pom.xml
+++ b/diboot-mobile-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>diboot-root</artifactId>
         <groupId>com.diboot</groupId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <groupId>com.diboot</groupId>
diff --git a/diboot-scheduler-starter/pom.xml b/diboot-scheduler-starter/pom.xml
index 88c1760f..c00bb9c2 100644
--- a/diboot-scheduler-starter/pom.xml
+++ b/diboot-scheduler-starter/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>diboot-root</artifactId>
         <groupId>com.diboot</groupId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.diboot</groupId>
     <artifactId>diboot-scheduler-spring-boot-starter</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
 
     <dependencies>
         <!-- 依赖core -->
diff --git a/pom.xml b/pom.xml
index e3576009..63fe43a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.6</version>
+        <version>2.6.7</version>
         <relativePath/>
     </parent>
 
     <groupId>com.diboot</groupId>
     <artifactId>diboot-root</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -32,7 +32,7 @@
         <okhttp.version>4.9.3</okhttp.version>
         <aspectjweaver.version>1.9.9</aspectjweaver.version>
         <commons-io.version>2.11.0</commons-io.version>
-        <diboot.version>2.5.0</diboot.version>
+        <diboot.version>2.6.0</diboot.version>
     </properties>
 
     <dependencies>
-- 
Gitee


From 724df5922e4fb10e9ba5d58645aff7fdba871d0a Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 15:37:50 +0800
Subject: [PATCH 023/195] =?UTF-8?q?*=20=E5=A2=9E=E5=8A=A0ApiUri=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E4=BC=98=E5=8C=96=E6=8F=90=E5=8F=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/holder/AnnotationRestApiHolder.java  | 13 ++---
 .../com/diboot/core/util/AnnotationUtils.java |  7 +--
 .../main/java/com/diboot/core/vo/ApiUri.java  | 51 +++++++++++++++++++
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java

diff --git a/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java b/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java
index 3caf4cc4..2277cd46 100644
--- a/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java
+++ b/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java
@@ -24,6 +24,7 @@ import com.diboot.core.util.AnnotationUtils;
 import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.V;
+import com.diboot.core.vo.ApiUri;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -161,12 +162,12 @@ public class AnnotationRestApiHolder {
                 // 处理Annotation注解
                 CollectThisApi restApiAnno = AnnotationUtils.getAnnotation(method, CollectThisApi.class);
                 // 提取方法上的注解url
-                String[] methodAndUrl = AnnotationUtils.extractRequestMethodAndMappingUrl(method);
-                if(methodAndUrl[0] == null || methodAndUrl[1] == null){
+                ApiUri apiUri = AnnotationUtils.extractRequestMethodAndMappingUrl(method);
+                if(apiUri.isEmpty()){
                     continue;
                 }
                 // 提取请求url-注解的关系
-                buildRestApi(wrapper, urlPrefix, methodAndUrl, restApiAnno);
+                buildRestApi(wrapper, urlPrefix, apiUri, restApiAnno);
             }
         }
     }
@@ -175,10 +176,10 @@ public class AnnotationRestApiHolder {
      * 构建restApiList
      * @param wrapper
      * @param urlPrefix
-     * @param methodAndUrl
+     * @param apiUri
      */
-    private static void buildRestApi(RestApiWrapper wrapper, String urlPrefix, String[] methodAndUrl, CollectThisApi annotation){
-        String requestMethod = methodAndUrl[0], url = methodAndUrl[1];
+    private static void buildRestApi(RestApiWrapper wrapper, String urlPrefix, ApiUri apiUri, CollectThisApi annotation){
+        String requestMethod = apiUri.getMethod(), url = apiUri.getUri();
         for(String m : requestMethod.split(Cons.SEPARATOR_COMMA)){
             for(String u : url.split(Cons.SEPARATOR_COMMA)){
                 if(V.notEmpty(urlPrefix)){
diff --git a/diboot-core/src/main/java/com/diboot/core/util/AnnotationUtils.java b/diboot-core/src/main/java/com/diboot/core/util/AnnotationUtils.java
index ea2ad538..74778bc0 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/AnnotationUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/AnnotationUtils.java
@@ -15,6 +15,7 @@
  */
 package com.diboot.core.util;
 
+import com.diboot.core.vo.ApiUri;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,7 +40,7 @@ public class AnnotationUtils extends org.springframework.core.annotation.Annotat
      * @param method
      * @return
      */
-    public static String[] extractRequestMethodAndMappingUrl(Method method){
+    public static ApiUri extractRequestMethodAndMappingUrl(Method method){
         String requestMethod = null, url = null;
         if(method.getAnnotation(GetMapping.class) != null){
             GetMapping anno = AnnotationUtils.getAnnotation(method, GetMapping.class);
@@ -73,14 +74,14 @@ public class AnnotationUtils extends org.springframework.core.annotation.Annotat
                 requestMethod = S.join(methods);
             }
             else{
-                requestMethod = "GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS,TRACE";
+                requestMethod = "GET,POST";
             }
             url = getNotEmptyStr(anno.value(), anno.path());
         }
         else{
             log.warn("无法识别到URL Mapping相关注解: "+method.getName());
         }
-        return new String[]{requestMethod, url};
+        return new ApiUri(requestMethod, url);
     }
 
     /**
diff --git a/diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java b/diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java
new file mode 100644
index 00000000..54e935b1
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java
@@ -0,0 +1,51 @@
+package com.diboot.core.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * API接口地址
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/21
+ * Copyright © diboot.com
+ */
+@Getter
+@Setter
+public class ApiUri implements Serializable {
+    private static final long serialVersionUID = 662520281067250572L;
+
+    public ApiUri(String method, String uri){
+        this.method = method;
+        this.uri = uri;
+    }
+
+    public ApiUri(String method, String uri, String label){
+        this.method = method;
+        this.uri = uri;
+        this.label = label;
+    }
+
+    /**
+     * 接口Method
+     */
+    private String method;
+
+    /**
+     * 接口URI
+     */
+    private String uri;
+
+    /**
+     * 接口备注
+     */
+    private String label;
+
+    @JsonIgnore
+    public boolean isEmpty(){
+        return method == null || uri == null;
+    }
+}
-- 
Gitee


From 12dc8beeab8e9424c021f6ba912a4ce09038ff7f Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 15:49:07 +0800
Subject: [PATCH 024/195] =?UTF-8?q?*=20=E6=8E=A5=E5=8F=A3=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=A0=81=E5=AD=98=E5=8F=96=E4=B8=8E=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/BindPermissionAspect.java         |  72 +++----
 ...ApiPermission.java => PermissionCode.java} |  68 ++++---
 ...ctor.java => PermissionCodeExtractor.java} | 178 +++++++-----------
 ...rapper.java => PermissionCodeWrapper.java} |  35 ++--
 .../com/diboot/iam/auth/IamCustomize.java     |  16 --
 .../iam/auth/impl/IamCustomizeImpl.java       |  27 ---
 .../com/diboot/iam/cache/IamCacheManager.java | 120 ++++--------
 .../iam/entity/IamResourcePermission.java     |  28 +--
 .../java/com/diboot/iam/jwt/BaseJwtRealm.java |  24 +--
 .../service/IamResourcePermissionService.java |  12 --
 .../iam/service/IamRoleResourceService.java   |   8 +
 .../IamResourcePermissionServiceImpl.java     |  59 ------
 .../impl/IamRoleResourceServiceImpl.java      |  29 ++-
 13 files changed, 250 insertions(+), 426 deletions(-)
 rename diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/{ApiPermission.java => PermissionCode.java} (46%)
 rename diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/{ApiPermissionExtractor.java => PermissionCodeExtractor.java} (36%)
 rename diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/{ApiPermissionWrapper.java => PermissionCodeWrapper.java} (52%)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
index 74513be0..5711aaba 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
@@ -16,13 +16,16 @@
 package com.diboot.iam.annotation.process;
 
 import com.diboot.core.util.AnnotationUtils;
-import com.diboot.core.util.S;
 import com.diboot.core.util.V;
+import com.diboot.core.vo.Status;
 import com.diboot.iam.annotation.BindPermission;
-import com.diboot.iam.auth.IamCustomize;
 import com.diboot.iam.cache.IamCacheManager;
 import com.diboot.iam.config.Cons;
+import com.diboot.iam.exception.PermissionException;
+import com.diboot.iam.starter.IamProperties;
+import com.diboot.iam.util.IamSecurityUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.UnauthenticatedException;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -30,14 +33,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.HandlerMapping;
-
-import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
-import java.util.Map;
 
 /**
  * BindPermission注解的切面处理
@@ -49,8 +45,8 @@ import java.util.Map;
 @Component
 @Slf4j
 public class BindPermissionAspect {
-    @Autowired(required = false)
-    private IamCustomize iamCustomize;
+    @Autowired
+    private IamProperties iamProperties;
 
     /**
      * 注解切面
@@ -64,51 +60,33 @@ public class BindPermissionAspect {
      */
     @Before("pointCut()")
     public void before(JoinPoint joinPoint) {
-        if(iamCustomize.isEnablePermissionCheck() == false){
-            log.debug("BindPermission权限检查已停用，如需启用请删除配置项: diboot.iam.enable-permission-check");
+        if(iamProperties.isEnablePermissionCheck() == false){
+            log.debug("BindPermission权限检查已停用，如需启用请删除配置项: diboot.iam.enable-permission-check=false");
             return;
         }
         // 超级管理员 权限放过
-        if (iamCustomize.checkCurrentUserHasRole(Cons.ROLE_SUPER_ADMIN)) {
-            return;
-        }
-        // 获取当前uri
-        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
-        HttpServletRequest request = ((ServletRequestAttributes) ra).getRequest();
-        // 根据uri获取对应权限标识
-        String uriMapping = formatUriMapping(request);
-        String permissionCode = IamCacheManager.getPermissionCode(request.getMethod(), uriMapping);
-        if (permissionCode == null){
+        if (IamSecurityUtils.getSubject().hasRole(Cons.ROLE_SUPER_ADMIN)) {
             return;
         }
         // 需要验证
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
-        BindPermission bindPermission = AnnotationUtils.getAnnotation(method, BindPermission.class);
-        if(permissionCode.endsWith(":"+bindPermission.code())){
-            iamCustomize.checkPermission(permissionCode);
+        BindPermission methodAnno = AnnotationUtils.getAnnotation(method, BindPermission.class);
+        String permissionCode = methodAnno.code();
+        Class<?> controllerClass = joinPoint.getTarget().getClass();
+        PermissionCodeWrapper classAnno = IamCacheManager.getPermissionCodeWrapper(controllerClass);
+        if(classAnno != null && V.notEmpty(classAnno.getCode())){
+            permissionCode = classAnno.getCode() + ":" + permissionCode;
         }
-    }
-
-    /**
-     * 格式化URL，将当前url转换为Mapping定义中参数化url
-     * @param request
-     * @return
-     */
-    private String formatUriMapping(HttpServletRequest request){
-        boolean hasContextPath = (V.notEmpty(request.getContextPath()) && !request.getContextPath().equals("/"));
-        String url = hasContextPath? S.substringAfter(request.getRequestURI(), request.getContextPath()) : request.getRequestURI();
-        Map<String, Object> map = (Map) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-        if(V.notEmpty(map)){
-            for(Map.Entry<String, Object> entry : map.entrySet()){
-                if(url.endsWith("/"+entry.getValue())){
-                    url = S.substringBeforeLast(url,"/"+entry.getValue()) + "/{"+entry.getKey()+"}";
-                }
-                else if(url.contains("/"+entry.getValue()+"/")){
-                    url = S.replace(url,"/"+entry.getValue()+"/","/{"+entry.getKey()+"}/");
-                }
-            }
+        try{
+            IamSecurityUtils.getSubject().checkPermission(permissionCode);
+        }
+        catch (UnauthenticatedException e){
+            throw new PermissionException(Status.FAIL_INVALID_TOKEN, e);
+        }
+        catch (Exception e){
+            throw new PermissionException(Status.FAIL_NO_PERMISSION, e);
         }
-        return url;
     }
+
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermission.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCode.java
similarity index 46%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermission.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCode.java
index 3ccf812d..4eb7a870 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermission.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCode.java
@@ -15,50 +15,58 @@
  */
 package com.diboot.iam.annotation.process;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.diboot.core.util.BeanUtils;
+import com.diboot.core.util.S;
+import com.diboot.core.util.V;
+import com.diboot.core.vo.ApiUri;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
 * 权限 Entity定义
-* @author mazc@dibo.ltd
-* @version 2.0
-* @date 2019-12-03
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/21
+ * Copyright © diboot.com
 */
 @Getter @Setter @Accessors(chain = true)
-public class ApiPermission implements Serializable {
-    private static final long serialVersionUID = -1234249053749049729L;
-
-    // 类别
-    @JsonIgnore
-    private String className;
-
-    // 类别标题
-    @JsonIgnore
-    private String classTitle;
-
-    // 接口名称
-    private String apiName;
+public class PermissionCode implements Serializable {
+    private static final long serialVersionUID = -17224355139977969L;
 
+    public PermissionCode(String code){
+        this.code = code;
+    }
     /**
-     * 接口Method
+     * 权限编码
      */
-    private String apiMethod;
-
-    // 接口URI
-    private String apiUri;
-
-    // ID标识
-    private String value;
+    private String code;
+    /**
+     * 接口地址定义
+     */
+    private List<ApiUri> apiUriList;
 
-    // 权限许可编码
-    @JsonIgnore
-    private String permissionCode;
+    public List<ApiUri> getApiUriList(){
+        if(apiUriList == null){
+            apiUriList = new ArrayList<>();
+        }
+        return apiUriList;
+    }
 
-    public String buildUniqueKey(){
-        return className + "," + apiMethod + "," + apiUri + "," + permissionCode;
+    /**
+     * 权限码的备注
+     * @return
+     */
+    public String getLabel(){
+        if(V.isEmpty(apiUriList)){
+            return null;
+        }
+        List<String> labels = BeanUtils.collectToList(apiUriList, ApiUri::getLabel);
+        return S.join(labels);
     }
+
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeExtractor.java
similarity index 36%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeExtractor.java
index abef013b..39e2ea2f 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -16,8 +16,9 @@
 package com.diboot.iam.annotation.process;
 
 import com.diboot.core.util.*;
+import com.diboot.core.vo.ApiUri;
 import com.diboot.iam.annotation.BindPermission;
-import com.diboot.iam.auth.IamCustomize;
+import com.diboot.iam.cache.IamCacheManager;
 import com.diboot.iam.config.Cons;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -26,24 +27,22 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
- * 注解提取器
- * @author mazc@dibo.ltd
- * @version v2.0
- * @date 2019/12/23
+ * 权限码注解提取器
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/21
+ * Copyright © diboot.com
  */
 @Slf4j
-public class ApiPermissionExtractor {
+public class PermissionCodeExtractor {
 
     /**
      * 接口权限缓存
      */
-    private static List<ApiPermissionWrapper> API_PERMISSION_CACHE = null;
+    private static List<PermissionCodeWrapper> API_PERMISSION_CACHE = null;
     /**
      * 唯一KEY
      */
@@ -53,7 +52,7 @@ public class ApiPermissionExtractor {
      * 提取所有的权限定义
      * @return
      */
-    public static List<ApiPermissionWrapper> extractAllApiPermissions(){
+    public static List<PermissionCodeWrapper> extractAllApiPermissions(){
         if(API_PERMISSION_CACHE == null){
             API_PERMISSION_CACHE = new ArrayList<>();
             UNIQUE_KEY_SET = new HashSet<>();
@@ -78,31 +77,13 @@ public class ApiPermissionExtractor {
         }
         for (Object obj : controllerList) {
             Class controllerClass = BeanUtils.getTargetClass(obj);
-            String title = null;
-            // 提取类信息
-            String codePrefix = null;
-            // 注解
-            BindPermission bindPermission = AnnotationUtils.findAnnotation(controllerClass, BindPermission.class);
-            if(bindPermission != null){
-                // 当前资源权限
-                codePrefix = bindPermission.code();
-                if(V.isEmpty(codePrefix)){
-                    Class<?> entityClazz = BeanUtils.getGenericityClass(controllerClass, 0);
-                    if(entityClazz != null){
-                        codePrefix = entityClazz.getSimpleName();
-                    }
-                    else{
-                        log.warn("无法获取{}相关的Entity，请指定注解BindPermission.code参数！", controllerClass.getName());
-                    }
-                }
-                title = bindPermission.name();
+            if(UNIQUE_KEY_SET.contains(controllerClass.getName())){
+               continue;
             }
-            else{
-                title = S.substringBeforeLast(controllerClass.getSimpleName(), "Controller");
-            }
-            ApiPermissionWrapper wrapper = new ApiPermissionWrapper(controllerClass.getSimpleName(), title);
-            buildApiPermissionsInClass(wrapper, controllerClass, codePrefix);
-            if(V.notEmpty(wrapper.getChildren())){
+            UNIQUE_KEY_SET.add(controllerClass.getName());
+            PermissionCodeWrapper wrapper = IamCacheManager.getPermissionCodeWrapper(controllerClass);
+            buildApiPermissionsInClass(wrapper, controllerClass);
+            if(wrapper.notEmpty()){
                 API_PERMISSION_CACHE.add(wrapper);
             }
         }
@@ -112,104 +93,77 @@ public class ApiPermissionExtractor {
      * 构建controller中的Api权限
      * @param wrapper
      * @param controllerClass
-     * @param codePrefix
      */
-    private static void buildApiPermissionsInClass(ApiPermissionWrapper wrapper, Class controllerClass, String codePrefix) {
+    private static void buildApiPermissionsInClass(PermissionCodeWrapper wrapper, Class controllerClass) {
+        List<Method> annoMethods = AnnotationUtils.extractAnnotationMethods(controllerClass, BindPermission.class);
+        if(V.isEmpty(annoMethods)){
+            return;
+        }
         String urlPrefix = "";
         RequestMapping requestMapping = AnnotationUtils.findAnnotation(controllerClass, RequestMapping.class);
         if(requestMapping != null){
             urlPrefix = AnnotationUtils.getNotEmptyStr(requestMapping.value(), requestMapping.path());
         }
-        List<Method> annoMethods = AnnotationUtils.extractAnnotationMethods(controllerClass, BindPermission.class);
-        if(V.notEmpty(annoMethods)){
-            List<ApiPermission> apiPermissions = new ArrayList<>();
-            for(Method method : annoMethods){
-                // 忽略私有方法
-                if(Modifier.isPrivate(method.getModifiers())){
-                    continue;
-                }
-                // 处理BindPermission注解
-                BindPermission bindPermission = AnnotationUtils.getAnnotation(method, BindPermission.class);
-                String[] permissionCodes = getExtPermissionCodes(method);
-                if(bindPermission == null && permissionCodes == null){
-                    continue;
-                }
-                // 提取方法上的注解url
-                String[] methodAndUrl = AnnotationUtils.extractRequestMethodAndMappingUrl(method);
-                if(methodAndUrl[0] == null || methodAndUrl[1] == null){
+        List<PermissionCode> apiPermissions = new ArrayList<>();
+        Map<String, PermissionCode> tempCode2ObjMap = new HashMap<>();
+        for(Method method : annoMethods){
+            // 忽略私有方法
+            if(Modifier.isPrivate(method.getModifiers())){
+                continue;
+            }
+            // 处理BindPermission注解
+            BindPermission bindPermission = AnnotationUtils.getAnnotation(method, BindPermission.class);
+            if(bindPermission == null){
+                continue;
+            }
+            // 提取方法上的注解url
+            ApiUri apiUriCombo = AnnotationUtils.extractRequestMethodAndMappingUrl(method);
+            if(apiUriCombo.isEmpty()){
+                continue;
+            }
+            if(bindPermission != null){
+                if(V.isEmpty(bindPermission.code())){
+                    log.warn("忽略无效的权限配置(未指定code): {}.{}", controllerClass.getClass().getSimpleName(), method.getName());
                     continue;
                 }
-                if(bindPermission != null){
-                    String permissionCode = (codePrefix != null)? codePrefix+":"+bindPermission.code() : bindPermission.code();
-                    if (":".equals(permissionCode)) {
-                        continue;
-                    }
-                    // 提取请求url-permission code的关系
-                    buildApiPermission(apiPermissions, controllerClass, urlPrefix, wrapper.getClassTitle(), permissionCode, methodAndUrl, bindPermission.name());
-                }
-                // 处理RequirePermissions注解
-                else if(V.notEmpty(permissionCodes)){
-                    for(String permissionCode : permissionCodes){
-                        // 提取请求url-permission code的关系
-                        buildApiPermission(apiPermissions, controllerClass, urlPrefix, wrapper.getClassTitle(), permissionCode, methodAndUrl, null);
-                    }
+                String name = bindPermission.name();
+                String code = (wrapper.getCode() != null)? wrapper.getCode()+":"+bindPermission.code() : bindPermission.code();
+                PermissionCode permissionCode = tempCode2ObjMap.get(code);
+                if(permissionCode == null){
+                    permissionCode = new PermissionCode(code);
+                    tempCode2ObjMap.put(code, permissionCode);
+                    apiPermissions.add(permissionCode);
                 }
+                apiUriCombo.setLabel(name);
+                // 提取请求url-permission code的关系
+                buildApiPermission(permissionCode, urlPrefix, apiUriCombo);
             }
-            // 添加至wrapper
-            if(apiPermissions.size() > 0){
-                wrapper.setChildren(apiPermissions);
-            }
+        }
+        // 添加至wrapper
+        if(apiPermissions.size() > 0){
+            wrapper.setPermissionCodeList(apiPermissions);
         }
     }
 
     /**
      * 构建ApiPermission
-     * @param apiPermissions
-     * @param controllerClass
-     * @param urlPrefix
-     * @param title
      * @param permissionCode
-     * @param methodAndUrl
-     * @param apiName
+     * @param urlPrefix
+     * @param apiUriCombo
      */
-    private static void buildApiPermission(List<ApiPermission> apiPermissions, Class controllerClass, String urlPrefix, String title,
-                                    String permissionCode, String[] methodAndUrl, String apiName){
-        String requestMethod = methodAndUrl[0], url = methodAndUrl[1];
+    private static void buildApiPermission(PermissionCode permissionCode, String urlPrefix, ApiUri apiUriCombo){
+        String requestMethod = apiUriCombo.getMethod(), url = apiUriCombo.getUri();
+        List<ApiUri> apiUriList = permissionCode.getApiUriList();
         for(String m : requestMethod.split(Cons.SEPARATOR_COMMA)){
             for(String u : url.split(Cons.SEPARATOR_COMMA)){
+                String uri = u;
                 if(V.notEmpty(urlPrefix)){
-                    for(String path : urlPrefix.split(Cons.SEPARATOR_COMMA)){
-                        ApiPermission apiPermission = new ApiPermission().setClassName(controllerClass.getName()).setClassTitle(title);
-                        apiPermission.setApiMethod(m).setApiName(apiName).setApiUri(path + u).setPermissionCode(permissionCode).setValue(m + ":" + path + u);
-                        if(!UNIQUE_KEY_SET.contains(apiPermission.buildUniqueKey())){
-                            apiPermissions.add(apiPermission);
-                            UNIQUE_KEY_SET.add(apiPermission.buildUniqueKey());
-                        }
-                    }
-                }
-                else{
-                    ApiPermission apiPermission = new ApiPermission().setClassName(controllerClass.getName()).setClassTitle(title);
-                    apiPermission.setApiMethod(m).setApiName(apiName).setApiUri(u).setPermissionCode(permissionCode).setValue(m + ":" + u);
-                    if(!UNIQUE_KEY_SET.contains(apiPermission.buildUniqueKey())){
-                        apiPermissions.add(apiPermission);
-                        UNIQUE_KEY_SET.add(apiPermission.buildUniqueKey());
-                    }
+                    uri = urlPrefix + u;
                 }
+                ApiUri apiUri = new ApiUri(m, uri, apiUriCombo.getLabel());
+                apiUriList.add(apiUri);
             }
         }
     }
 
-    /**
-     * 获取扩展的待检查的权限码
-     * @param method
-     * @return
-     */
-    private static String[] getExtPermissionCodes(Method method){
-        IamCustomize iamCustomize = ContextHelper.getBean(IamCustomize.class);
-        if(iamCustomize != null){
-            return iamCustomize.getOrignPermissionCodes(method);
-        }
-        return null;
-    }
-
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionWrapper.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeWrapper.java
similarity index 52%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionWrapper.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeWrapper.java
index 6615c469..f159233b 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionWrapper.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -15,6 +15,8 @@
  */
 package com.diboot.iam.annotation.process;
 
+import com.diboot.core.util.V;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,34 +25,39 @@ import java.util.List;
 
 /**
  * 接口权限wrapper
- * @author Mazhicheng
- * @version v2.0
- * @date 2020/02/28
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/21
+ * Copyright © diboot.com
  */
 @Getter @Setter
-public class ApiPermissionWrapper implements Serializable {
-    private static final long serialVersionUID = 544405101900928328L;
+public class PermissionCodeWrapper implements Serializable {
+    private static final long serialVersionUID = 7795636645748631729L;
 
-    public ApiPermissionWrapper(){}
+    public PermissionCodeWrapper(){}
 
-    public ApiPermissionWrapper(String className, String classTitle){
-        this.className = className;
-        this.classTitle = classTitle;
+    public PermissionCodeWrapper(String name, String code){
+        this.name = name;
+        this.code = code;
     }
 
     /**
      * 类名
      */
-    private String className;
+    private String name;
 
     /**
      * 类别标题
       */
-    private String classTitle;
+    private String code;
 
     /**
-     * 子节点
+     * 子节点权限码集合
      */
-    private List<ApiPermission> children;
+    private List<PermissionCode> permissionCodeList;
 
+    @JsonIgnore
+    public boolean notEmpty(){
+        return V.notEmpty(code) && V.notEmpty(permissionCodeList);
+    }
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java
index b46c3e9d..c8763f78 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java
@@ -69,20 +69,4 @@ public interface IamCustomize {
      */
     void clearAuthorizationCache(String username);
 
-    /**
-     * 清空所有权限
-     */
-    void clearAllAuthorizationCache();
-
-    /**
-     * 是否启用权限检查
-     * @return
-     */
-    boolean isEnablePermissionCheck();
-
-    /**
-     * 获取原生的权限码
-     * @return
-     */
-    String[] getOrignPermissionCodes(Method method);
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamCustomizeImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamCustomizeImpl.java
index e1135410..24b6ff85 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamCustomizeImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamCustomizeImpl.java
@@ -15,21 +15,15 @@
  */
 package com.diboot.iam.auth.impl;
 
-import com.diboot.core.util.AnnotationUtils;
 import com.diboot.core.vo.Status;
 import com.diboot.iam.auth.IamCustomize;
 import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
 import com.diboot.iam.exception.PermissionException;
-import com.diboot.iam.starter.IamProperties;
 import com.diboot.iam.util.IamSecurityUtils;
 import org.apache.shiro.authz.UnauthenticatedException;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Method;
-
 /**
  * IAM自定义扩展
  * @author JerryMa
@@ -38,8 +32,6 @@ import java.lang.reflect.Method;
  */
 @Service
 public class IamCustomizeImpl implements IamCustomize {
-    @Autowired
-    private IamProperties iamProperties;
 
     @Override
     public BaseLoginUser getCurrentUser() {
@@ -83,23 +75,4 @@ public class IamCustomizeImpl implements IamCustomize {
         IamSecurityUtils.clearAuthorizationCache(username);
     }
 
-    @Override
-    public void clearAllAuthorizationCache() {
-        IamSecurityUtils.clearAllAuthorizationCache();
-    }
-
-    @Override
-    public boolean isEnablePermissionCheck() {
-        return iamProperties.isEnablePermissionCheck();
-    }
-
-    @Override
-    public String[] getOrignPermissionCodes(Method method) {
-        RequiresPermissions requiresPermissions = AnnotationUtils.getAnnotation(method, RequiresPermissions.class);
-        if(requiresPermissions != null){
-            return requiresPermissions.value();
-        }
-        return null;
-    }
-
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java b/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
index bfe50a32..b8e048ea 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
@@ -15,11 +15,13 @@
  */
 package com.diboot.iam.cache;
 
-import com.diboot.core.cache.StaticMemoryCacheManager;
+import com.diboot.core.util.AnnotationUtils;
+import com.diboot.core.util.BeanUtils;
+import com.diboot.core.util.S;
 import com.diboot.core.util.V;
-import com.diboot.iam.annotation.process.ApiPermission;
-import com.diboot.iam.annotation.process.ApiPermissionExtractor;
-import com.diboot.iam.annotation.process.ApiPermissionWrapper;
+import com.diboot.iam.annotation.BindPermission;
+import com.diboot.iam.annotation.process.*;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 import java.util.Map;
@@ -32,99 +34,57 @@ import java.util.concurrent.ConcurrentHashMap;
  * @date 2021/4/22
  * Copyright © diboot.com
  */
+@Slf4j
 public class IamCacheManager {
 
     /**
-     * 接口相关定义缓存管理器
+     * controller-权限码 缓存
      */
-    private static StaticMemoryCacheManager iamMemoryCacheManager;
-    /**
-     * controller-API 权限
-     */
-    private static final String CACHE_NAME_CONTROLLER_API = "CONTROLLER_API";
-    /**
-     * url-permission 缓存
-     */
-    private static Map<String, String> URL_PERMISSIONCODE_CACHE = new ConcurrentHashMap<>(8);
-
-    private static StaticMemoryCacheManager getCacheManager(){
-        if(iamMemoryCacheManager == null){
-            iamMemoryCacheManager = new StaticMemoryCacheManager(
-                    CACHE_NAME_CONTROLLER_API);
-            URL_PERMISSIONCODE_CACHE.clear();
-        }
-        return iamMemoryCacheManager;
-    }
+    private static Map<String, PermissionCodeWrapper> CLASS_PERMISSIONCODE_CACHE = new ConcurrentHashMap<>();
 
     /**
-     * 读取缓存permission
-     * @param requestMethodAndUrl
+     * 返回全部接口权限码ApiPermission
      * @return
      */
-    public static String getPermissionCode(String requestMethodAndUrl){
-        return getUrlPermissionCacheMap().get(requestMethodAndUrl);
-    }
-
-    /**
-     * 读取缓存permission
-     * @param requestMethod
-     * @param url
-     * @return
-     */
-    public static String getPermissionCode(String requestMethod, String url){
-        return getUrlPermissionCacheMap().get(requestMethod.toUpperCase()+":"+url);
-    }
-
-    /**
-     * 返回全部ApiPermissionVO
-     * @return
-     */
-    public static List<ApiPermissionWrapper> getApiPermissionVoList(){
-        return ApiPermissionExtractor.extractAllApiPermissions();
-    }
-
-    /**
-     * 获取接口权限wrapper
-     * @param className
-     * @return
-     */
-    public static ApiPermissionWrapper getApiPermissionWrapper(String className){
-        initApiPermissionCache();
-        return getCacheManager().getCacheObj(CACHE_NAME_CONTROLLER_API, className, ApiPermissionWrapper.class);
+    public static List<PermissionCodeWrapper> getApiPermissionVoList(){
+        return PermissionCodeExtractor.extractAllApiPermissions();
     }
 
     /**
      * 缓存全部permissions
      */
-    private static Map<String, String> getUrlPermissionCacheMap(){
-        if(V.notEmpty(URL_PERMISSIONCODE_CACHE)){
-            return URL_PERMISSIONCODE_CACHE;
+    public static PermissionCodeWrapper getPermissionCodeWrapper(Class<?> controllerClass){
+        // 优先从缓存中读取
+        PermissionCodeWrapper wrapper = CLASS_PERMISSIONCODE_CACHE.get(controllerClass.getName());
+        if(wrapper != null){
+            return wrapper;
         }
-        initApiPermissionCache();
-        return URL_PERMISSIONCODE_CACHE;
-    }
-
-    /**
-     * 初始化
-     */
-    private static synchronized void initApiPermissionCache() {
-        StaticMemoryCacheManager cacheManager = getCacheManager();
-        if (cacheManager.isUninitializedCache(CACHE_NAME_CONTROLLER_API) == false) {
-            return;
-        }
-        List<ApiPermissionWrapper> permissions = ApiPermissionExtractor.extractAllApiPermissions();
-        if(V.notEmpty(permissions)){
-            for(ApiPermissionWrapper wrapper : permissions){
-                if(wrapper.getChildren() != null){
-                    for(ApiPermission apiPermission : wrapper.getChildren()){
-                        // 缓存url-permission
-                        URL_PERMISSIONCODE_CACHE.put(apiPermission.getApiMethod().toUpperCase()+":"+apiPermission.getApiUri(), apiPermission.getPermissionCode());
-                        // 缓存class-api
-                        cacheManager.putCacheObj(CACHE_NAME_CONTROLLER_API, wrapper.getClassName(), wrapper);
-                    }
+        // 从controller中解析
+        String name = null;
+        // 提取类信息
+        String codePrefix = null;
+        // 注解
+        BindPermission bindPermission = AnnotationUtils.findAnnotation(controllerClass, BindPermission.class);
+        if(bindPermission != null){
+            // 当前资源权限
+            name = bindPermission.name();
+            codePrefix = bindPermission.code();
+            if(V.isEmpty(codePrefix)){
+                Class<?> entityClazz = BeanUtils.getGenericityClass(controllerClass, 0);
+                if(entityClazz != null){
+                    codePrefix = entityClazz.getSimpleName();
+                }
+                else{
+                    log.warn("无法获取{}相关的Entity，请指定注解BindPermission.code参数！", controllerClass.getName());
                 }
             }
         }
+        else{
+            name = S.substringBeforeLast(controllerClass.getSimpleName(), "Controller");
+        }
+        wrapper = new PermissionCodeWrapper(name, codePrefix);
+        CLASS_PERMISSIONCODE_CACHE.put(controllerClass.getName(), wrapper);
+        return wrapper;
     }
 
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
index d66b13d8..653bf1be 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
@@ -80,10 +80,11 @@ public class IamResourcePermission extends BaseEntity {
     @TableField()
     private String resourceCode;
 
-    // 接口列表
-    @Length(max=5000, message="接口列表长度应小于5000")
+    // 权限编码
+    @NotNull(message = "权限编码不能为空")
+    @Length(max=100, message="权限编码长度应小于100")
     @TableField()
-    private String apiSet;
+    private String permissionCode;
 
     // 排序号
     @TableField
@@ -93,27 +94,26 @@ public class IamResourcePermission extends BaseEntity {
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
-
     /***
-     * 获取接口列表
+     * 获取权限码列表
      * @return
      */
-    public String[] getApiSetList() {
-        if (V.isEmpty(this.getApiSet())){
+    public String[] getPermissionCodes() {
+        if (V.isEmpty(permissionCode)){
             return null;
         }
-        return S.split(this.getApiSet(), ",");
+        return S.split(permissionCode);
     }
 
     /***
-     * 设置接口列表
-     * @param apiSetList
+     * 设置权限码列表
+     * @param permissionCodes
      */
-    public void setApiSetList(List<String> apiSetList) {
-        if (V.isEmpty(apiSetList)){
-            this.setApiSet(null);
+    public void setPermissionCodes(List<String> permissionCodes) {
+        if (V.isEmpty(permissionCodes)){
+            this.setPermissionCode(null);
         }
-        this.setApiSet(S.join(apiSetList, ","));
+        this.setPermissionCode(S.join(permissionCodes));
     }
 
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtRealm.java b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtRealm.java
index 56e28c20..6248106a 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtRealm.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtRealm.java
@@ -17,12 +17,12 @@ package com.diboot.iam.jwt;
 
 import com.diboot.core.service.BaseService;
 import com.diboot.core.util.ContextHelper;
+import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.LabelValue;
 import com.diboot.iam.auth.AuthService;
 import com.diboot.iam.auth.AuthServiceFactory;
 import com.diboot.iam.auth.IamExtensible;
-import com.diboot.iam.cache.IamCacheManager;
 import com.diboot.iam.config.Cons;
 import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
@@ -147,22 +147,24 @@ public class BaseJwtRealm extends AuthorizingRealm {
             allRoleCodes.add(role.getCode());
             roleIds.add(role.getId());
         });
+        authorizationInfo.setRoles(allRoleCodes);
         // 整理所有权限许可列表，从缓存匹配
-        Set<String> allPermissionCodes = new HashSet<>();
-        List<String> apiUrlList = getIamRoleResourceService().getApiUrlList(Cons.APPLICATION, roleIds);
-        if(V.notEmpty(apiUrlList)){
-            apiUrlList.stream().forEach(set->{
-                for(String uri : set.split(Cons.SEPARATOR_COMMA)){
-                    String permissionCode = IamCacheManager.getPermissionCode(uri);
-                    if(permissionCode != null){
-                        allPermissionCodes.add(permissionCode);
+        List<String> allPermissionCodes = getIamRoleResourceService().getPermissionCodeList(Cons.APPLICATION, roleIds);
+        Set<String> permissionCodesSet = new HashSet<>();
+        if(V.notEmpty(allPermissionCodes)){
+            allPermissionCodes.forEach(permCodeStr -> {
+                if(!permCodeStr.contains(Cons.SEPARATOR_COMMA)){
+                    permissionCodesSet.add(permCodeStr);
+                }
+                else{
+                    for(String permCode : S.split(permCodeStr)){
+                        permissionCodesSet.add(permCode);
                     }
                 }
             });
         }
         // 将所有角色和权限许可授权给用户
-        authorizationInfo.setRoles(allRoleCodes);
-        authorizationInfo.setStringPermissions(allPermissionCodes);
+        authorizationInfo.setStringPermissions(permissionCodesSet);
         return authorizationInfo;
     }
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java
index b9f9ec3b..ba835826 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java
@@ -77,16 +77,4 @@ public interface IamResourcePermissionService extends BaseIamService<IamResource
      */
     void sortList(List<IamResourcePermission> permissionList);
 
-    /***
-     * 提取代码中的权限和已经存在数据库的权限不同的数据
-     *
-     * 1、获取DB存储的API<br/>
-     * 2、获取代码中的API<br/>
-     * 3、对比，提出返回结果<br/>
-     * 结果返回：数据库中无效的API、数据库无效的记录id
-     *
-     * @param application
-     * @return
-     */
-    Map<String, Object> extractCodeDiffDbPermissions(String application);
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamRoleResourceService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamRoleResourceService.java
index 13bc8714..78d99e40 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamRoleResourceService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamRoleResourceService.java
@@ -62,6 +62,14 @@ public interface IamRoleResourceService extends BaseIamService<IamRoleResource>
      */
     List<String> getApiUrlList(String appModule, List<Long> roleIds);
 
+    /**
+     * 获取指定角色集合对应的权限码集合
+     * @param appModule
+     * @param roleIds
+     * @return
+     */
+    List<String> getPermissionCodeList(String appModule, List<Long> roleIds);
+
     /**
      * 获取资源角色VO集合
      * @return
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
index 15629b3b..c61d2503 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
@@ -100,10 +100,6 @@ public class IamResourcePermissionServiceImpl extends BaseIamServiceImpl<IamReso
         if (V.equals(iamResourcePermissionDTO.getId(), iamResourcePermissionDTO.getParentId())){
             throw new BusinessException(Status.FAIL_OPERATION, "不可设置父级菜单资源为自身");
         }
-        // 设置menu的接口列表
-        if (V.notEmpty(iamResourcePermissionDTO.getApiSetList())){
-            iamResourcePermissionDTO.setApiSet(S.join(iamResourcePermissionDTO.getApiSetList(), ","));
-        }
         // 更新menu
         this.updateEntity(iamResourcePermissionDTO);
         List<IamResourcePermissionDTO> permissionList = iamResourcePermissionDTO.getPermissionList();
@@ -220,61 +216,6 @@ public class IamResourcePermissionServiceImpl extends BaseIamServiceImpl<IamReso
         }
     }
 
-    @Override
-    public Map<String, Object> extractCodeDiffDbPermissions(String application) {
-        List<IamResourcePermission> allResourcePermissions = getEntityList(Wrappers.<IamResourcePermission>lambdaQuery()
-                .orderByDesc(IamResourcePermission::getSortId, IamResourcePermission::getId));
-        if(V.isEmpty(allResourcePermissions)){
-           return Collections.emptyMap();
-        }
-        List<InvalidResourcePermissionVO> voList = RelationsBinder.convertAndBind(allResourcePermissions, InvalidResourcePermissionVO.class);
-        Map<Long, InvalidResourcePermissionVO> resultMap = new HashMap<>(32);
-        for (InvalidResourcePermissionVO invalidIamResourcePermission : voList) {
-            if (V.isEmpty(invalidIamResourcePermission.getApiSet())) {
-               continue;
-            }
-            for(String uri : invalidIamResourcePermission.getApiSetList()){
-                // 根据uri获取code
-                String permissionCode = IamCacheManager.getPermissionCode(uri);
-                // code存在，表示该URI有效，否则无效
-                if(V.isEmpty(permissionCode)){
-                    invalidIamResourcePermission.addInvalidApiSet(uri);
-                    resultMap.put(invalidIamResourcePermission.getId(), invalidIamResourcePermission);
-                }
-
-            }
-        }
-        if (V.isEmpty(resultMap)) {
-            return Collections.emptyMap();
-        }
-        List<InvalidResourcePermissionVO> outerPermissionList = new ArrayList<>();
-        for (Map.Entry<Long, InvalidResourcePermissionVO> invalidResourcePermissionVOEntry : resultMap.entrySet()) {
-            InvalidResourcePermissionVO invalidResourcePermissionVO = invalidResourcePermissionVOEntry.getValue();
-            // 获取当前权限的上级元素
-            Long parentId = invalidResourcePermissionVO.getParentId();
-            InvalidResourcePermissionVO parentInvalidResourcePermissionVO = resultMap.get(parentId);
-            // 如果上级元素不存在，表示，当前对象为最外层元素
-            if (V.isEmpty(parentInvalidResourcePermissionVO)) {
-                outerPermissionList.add(invalidResourcePermissionVO);
-            }
-        }
-        List<InvalidResourcePermissionVO> result = new ArrayList<>(resultMap.values());
-        List<Long> diffDataIdList = new ArrayList<>();
-        for (InvalidResourcePermissionVO value : result) {
-            List<InvalidResourcePermissionVO> childNodeChildren =  BeanUtils.buildTreeChildren(value.getId(), result, Cons.FieldName.parentId.name(), Cons.FieldName.children.name());
-
-            if(childNodeChildren == null) {
-                childNodeChildren = new ArrayList<>();
-            }
-            BeanUtils.setProperty(value,  Cons.FieldName.children.name(), childNodeChildren);
-            diffDataIdList.add(value.getId());
-        }
-        return new HashMap<String, Object>() {{
-            put("diffDataList", outerPermissionList);
-            put("diffDataIdList", diffDataIdList);
-        }};
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteMenuAndPermissions(List<Long> idList) {
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamRoleResourceServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamRoleResourceServiceImpl.java
index fb9cacab..3e1272b2 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamRoleResourceServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamRoleResourceServiceImpl.java
@@ -97,22 +97,43 @@ public class IamRoleResourceServiceImpl extends BaseIamServiceImpl<IamRoleResour
         // 查询权限
         List<IamResourcePermission> resourcePermissions = iamResourcePermissionService.getEntityList(
                 Wrappers.<IamResourcePermission>lambdaQuery()
-                        .select(IamResourcePermission::getApiSet)
+                        .select(IamResourcePermission::getPermissionCodes)
                         .in(IamResourcePermission::getId, permissionIds)
-                        .isNotNull(IamResourcePermission::getApiSet)
+                        .isNotNull(IamResourcePermission::getPermissionCode)
         );
         if(resourcePermissions == null){
             return Collections.emptyList();
         }
         // 转换为string list
-        List<String> list = BeanUtils.collectToList(resourcePermissions, IamResourcePermission::getApiSet);
+        List<String> list = BeanUtils.collectToList(resourcePermissions, IamResourcePermission::getPermissionCode);
         return list;
     }
 
+    @Override
+    public List<String> getPermissionCodeList(String appModule, List<Long> roleIds) {
+        if (V.isEmpty(roleIds)) {
+            return Collections.emptyList();
+        }
+        List<Long> permissionIds = getPermissionIdsByRoleIds(appModule, roleIds);
+        if (V.isEmpty(permissionIds)) {
+            return Collections.emptyList();
+        }
+        // 查询权限
+        LambdaQueryWrapper<IamResourcePermission> queryWrapper = Wrappers.<IamResourcePermission>lambdaQuery()
+                .select(IamResourcePermission::getPermissionCode)
+                .in(IamResourcePermission::getId, permissionIds)
+                .isNotNull(IamResourcePermission::getPermissionCode);
+        // 仅查询PermissionCode字段
+        List<String> resourcePermissions = iamResourcePermissionService.getValuesOfField(
+                queryWrapper, IamResourcePermission::getPermissionCode
+        );
+        return resourcePermissions;
+    }
+
     @Override
     public List<ResourceRoleVO> getAllResourceRoleVOList() {
         LambdaQueryWrapper<IamResourcePermission> wrapper = Wrappers.<IamResourcePermission>lambdaQuery()
-                .isNotNull(IamResourcePermission::getApiSet);
+                .isNotNull(IamResourcePermission::getPermissionCode);
         List<IamResourcePermission> list = iamResourcePermissionService.getEntityList(wrapper);
         if(list == null){
             list = Collections.emptyList();
-- 
Gitee


From 7c461b106d75d6c25134c0bad9854e9b49aa83f6 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 15:50:07 +0800
Subject: [PATCH 025/195] =?UTF-8?q?*=20=E7=A7=BB=E9=99=A4=E5=BA=9F?=
 =?UTF-8?q?=E5=BC=83=E7=9A=84class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/iam/annotation/Operation.java  | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/annotation/Operation.java

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/Operation.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/Operation.java
deleted file mode 100644
index c0a1a629..00000000
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/Operation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.iam.annotation;
-
-/**
- * 权限-操作 类型定义
- * @author mazc@dibo.ltd
- * @version v2.0
- * @date 2019/12/23
- */
-@Deprecated
-public class Operation extends OperationCons {
-
-}
-- 
Gitee


From 57d689b2a77d7af33db6161113198cd499b6abc9 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 15:54:40 +0800
Subject: [PATCH 026/195] =?UTF-8?q?*=20=E7=A7=BB=E9=99=A4=E5=BA=9F?=
 =?UTF-8?q?=E5=BC=83=E7=9A=84class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iam/auth/impl/SSOAuthServiceImpl.java     | 192 ------------------
 .../dto/ModifyIamResourcePermissionDTO.java   |  57 ------
 .../com/diboot/iam/dto/SSOCredential.java     |  65 ------
 3 files changed, 314 deletions(-)
 delete mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/SSOAuthServiceImpl.java
 delete mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/dto/ModifyIamResourcePermissionDTO.java
 delete mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/dto/SSOCredential.java

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/SSOAuthServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/SSOAuthServiceImpl.java
deleted file mode 100644
index 01df07bb..00000000
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/SSOAuthServiceImpl.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.iam.auth.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.diboot.core.config.BaseConfig;
-import com.diboot.core.exception.BusinessException;
-import com.diboot.core.exception.InvalidUsageException;
-import com.diboot.core.util.S;
-import com.diboot.core.util.V;
-import com.diboot.core.vo.Status;
-import com.diboot.iam.auth.AuthService;
-import com.diboot.iam.config.Cons;
-import com.diboot.iam.dto.AuthCredential;
-import com.diboot.iam.dto.SSOCredential;
-import com.diboot.iam.entity.BaseLoginUser;
-import com.diboot.iam.entity.IamAccount;
-import com.diboot.iam.entity.IamLoginTrace;
-import com.diboot.iam.jwt.BaseJwtAuthToken;
-import com.diboot.iam.service.IamAccountService;
-import com.diboot.iam.service.IamLoginTraceService;
-import com.diboot.iam.util.HttpHelper;
-import com.diboot.iam.util.IamSecurityUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 用户名SSO认证的service实现
- * @author mazc@dibo.ltd
- * @version v2.0
- * @date 2019/12/25
- */
-@Slf4j
-@Deprecated
-public class SSOAuthServiceImpl implements AuthService {
-    @Autowired
-    private HttpServletRequest request;
-    @Autowired
-    private IamAccountService accountService;
-    @Autowired
-    private IamLoginTraceService iamLoginTraceService;
-    // cas server url
-    private String casUrlPrefix;
-
-    private String getCasUrlPrefix(){
-        if(this.casUrlPrefix == null){
-            this.casUrlPrefix = BaseConfig.getProperty("cas.server-url-prefix");
-        }
-        if(V.isEmpty(this.casUrlPrefix)){
-            throw new InvalidUsageException("未配置cas参数: cas.server-url-prefix");
-        }
-        if(!this.casUrlPrefix.endsWith("/")){
-            this.casUrlPrefix += "/";
-        }
-        return this.casUrlPrefix;
-    }
-
-    @Override
-    public String getAuthType() {
-        return Cons.DICTCODE_AUTH_TYPE.SSO.name();
-    }
-
-    @Override
-    public IamAccount getAccount(BaseJwtAuthToken jwtToken) throws AuthenticationException {
-        // 查询最新的记录
-        LambdaQueryWrapper<IamAccount> queryWrapper = new LambdaQueryWrapper<IamAccount>()
-                .select(IamAccount::getAuthAccount, IamAccount::getUserType, IamAccount::getUserId, IamAccount::getStatus)
-                .eq(IamAccount::getUserType, jwtToken.getUserType())
-                .eq(IamAccount::getTenantId, jwtToken.getTenantId())
-                //.eq(IamAccount::getAuthType, jwtToken.getAuthType()) SSO只检查用户名，支持任意类型账号
-                .eq(IamAccount::getAuthAccount, jwtToken.getAuthAccount())
-                .orderByDesc(IamAccount::getId);
-        IamAccount latestAccount = accountService.getSingleEntity(queryWrapper);
-        if(latestAccount == null){
-            return null;
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.I.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已禁用! account="+jwtToken.getAuthAccount());
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.L.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已锁定! account="+jwtToken.getAuthAccount());
-        }
-        return latestAccount;
-    }
-
-    @Override
-    public String applyToken(AuthCredential credential) {
-        BaseJwtAuthToken authToken = initBaseJwtAuthToken(credential);
-        try {
-            Subject subject = SecurityUtils.getSubject();
-            subject.login(authToken);
-            if (subject.isAuthenticated()) {
-                log.debug("申请token成功！authtoken={}", authToken.getCredentials());
-                saveLoginTrace(authToken, true);
-                // 跳转到首页
-                return (String) authToken.getCredentials();
-            }
-            else {
-                log.error("认证失败");
-                saveLoginTrace(authToken, false);
-                throw new BusinessException(Status.FAIL_OPERATION, "认证失败");
-            }
-        } catch (Exception e) {
-            log.error("登录异常", e);
-            saveLoginTrace(authToken, false);
-            throw new BusinessException(Status.FAIL_OPERATION, e.getMessage());
-        }
-    }
-
-    /**
-     * 初始化JwtAuthToken实例
-     * @param credential
-     * @return
-     */
-    private BaseJwtAuthToken initBaseJwtAuthToken(AuthCredential credential){
-        // 通过CAS得到账号
-        SSOCredential ssoCredential = (SSOCredential)credential;
-        BaseJwtAuthToken token = new BaseJwtAuthToken(getAuthType(), ssoCredential.getUserTypeClass());
-        String username = parseCasTicket(ssoCredential);
-        ssoCredential.setAuthAccount(username);
-        // 设置账号密码
-        token.setAuthAccount(ssoCredential.getAuthAccount());
-        token.setTenantId(credential.getTenantId());
-        token.setRememberMe(ssoCredential.isRememberMe());
-        // 生成token
-        return token.generateAuthtoken(getExpiresInMinutes());
-    }
-
-    /**
-     * 保存登录日志
-     * @param authToken
-     * @param isSuccess
-     */
-    protected void saveLoginTrace(BaseJwtAuthToken authToken, boolean isSuccess){
-        IamLoginTrace loginTrace = new IamLoginTrace();
-        loginTrace.setAuthType(getAuthType()).setAuthAccount(authToken.getAuthAccount()).setUserType(authToken.getUserType()).setSuccess(isSuccess);
-        BaseLoginUser currentUser = IamSecurityUtils.getCurrentUser();
-        if(currentUser != null){
-            Long userId = currentUser.getId();
-            loginTrace.setUserId(userId);
-        }
-        // 记录客户端信息
-        String userAgent = request.getHeader("user-agent");
-        String ipAddress = IamSecurityUtils.getRequestIp(request);
-        loginTrace.setUserAgent(userAgent).setIpAddress(ipAddress);
-        try{
-            iamLoginTraceService.createEntity(loginTrace);
-        }
-        catch (Exception e){
-            log.warn("保存登录日志异常", e);
-        }
-    }
-
-    /**
-     * 解析CAS ticket，提取username
-     * @param ssoCredential
-     */
-    protected String parseCasTicket(SSOCredential ssoCredential) {
-        String casServiceValidateUrl =  this.getCasUrlPrefix() + "p3/serviceValidate?service="+ssoCredential.getServiceUrl()+"&ticket="+ssoCredential.getTicket();
-        String responseBody = HttpHelper.callGet(casServiceValidateUrl, null);
-        // 检查结果
-        String errorMsg = S.substringBetween(responseBody, "<cas:authenticationFailure", "</cas:authenticationFailure>");
-        if(V.notEmpty(errorMsg)){
-            errorMsg = S.substringAfter(errorMsg, ">");
-            throw new BusinessException("CAS登录失败:" + errorMsg);
-        }
-        // 提取用户名
-        String username = S.substringBetween(responseBody, "<cas:user>", "</cas:user>");
-
-        log.debug("CAS ticket {}, user = {}", ssoCredential.getTicket(), username);
-        return username;
-    }
-
-}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/ModifyIamResourcePermissionDTO.java b/diboot-iam-starter/src/main/java/com/diboot/iam/dto/ModifyIamResourcePermissionDTO.java
deleted file mode 100644
index 21187fdd..00000000
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/ModifyIamResourcePermissionDTO.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.iam.dto;
-
-import com.diboot.core.util.S;
-import com.diboot.core.util.V;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 修改权限DTO
- *
- * @author : uu
- * @version : v1.0
- * @Date 2021/5/8  12:49
- * @copyright www.diboot.com
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-public class ModifyIamResourcePermissionDTO implements Serializable {
-    private static final long serialVersionUID = 211276433727981441L;
-
-    private Long id;
-
-    private String apiSet;
-
-    private List<String> apiSetList;
-
-    /***
-     * 设置接口列表
-     * @param apiSetList
-     */
-    public void setApiSetList(List<String> apiSetList) {
-        if (V.isEmpty(apiSetList)){
-            this.setApiSet(null);
-        }
-        this.setApiSet(S.join(apiSetList, ","));
-    }
-}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/SSOCredential.java b/diboot-iam-starter/src/main/java/com/diboot/iam/dto/SSOCredential.java
deleted file mode 100644
index 900cda74..00000000
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/SSOCredential.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.iam.dto;
-
-import com.diboot.iam.config.Cons;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * 登录凭证
- * @author mazc@dibo.ltd
- * @version v2.0
- * @date 2019/12/18
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@Deprecated
-public class SSOCredential extends AuthCredential {
-    private static final long serialVersionUID = -5020652642432896556L;
-
-    public SSOCredential(){
-        setAuthType(Cons.DICTCODE_AUTH_TYPE.SSO.name());
-    }
-
-    public SSOCredential(String serviceUrl, String ticket){
-        this.serviceUrl = serviceUrl;
-        this.ticket = ticket;
-        setAuthType(Cons.DICTCODE_AUTH_TYPE.SSO.name());
-    }
-
-    // serviceUrl
-    private String serviceUrl;
-
-    // CAS ticket
-    private String ticket;
-
-    // auth account账号
-    private String authAccount;
-
-    @Override
-    public String getAuthAccount() {
-        return this.authAccount;
-    }
-
-    @Override
-    public String getAuthSecret() {
-        return null;
-    }
-
-}
-- 
Gitee


From 11568ac1d8bd83f21b5dfcff780b07a6098974cc Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 15:55:10 +0800
Subject: [PATCH 027/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=9D=83=E9=99=90SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/META-INF/sql/init-iam-mysql.sql        | 2 +-
 .../src/main/resources/META-INF/sql/init-iam-oracle.sql       | 4 ++--
 .../src/main/resources/META-INF/sql/init-iam-postgresql.sql   | 4 ++--
 .../src/main/resources/META-INF/sql/init-iam-sqlserver.sql    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
index d5f22aa8..f58a3a38 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
@@ -83,7 +83,7 @@ create table iam_resource_permission
   display_type  varchar(20)                          not null comment '展现类型',
   display_name  varchar(100)                         not null comment '显示名称',
   resource_code varchar(100)                         not null comment '前端编码',
-  api_set       varchar(3000)                        null comment '接口列表',
+  permission_code varchar(100)                         not null comment '权限编码',
   sort_id       bigint                               null comment '排序号',
   is_deleted     tinyint(1)  default 0                 not null comment '是否删除',
   create_time    datetime   default CURRENT_TIMESTAMP not null comment '创建时间',
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
index 45de878b..0f6bd94f 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
@@ -133,7 +133,7 @@ create table ${SCHEMA}.iam_resource_permission
     display_type VARCHAR2(20) not null,
     display_name VARCHAR2(100) not null,
     resource_code VARCHAR2(100)   null,
-    api_set VARCHAR2(3000)   null,
+    permission_code VARCHAR2(100)   null,
     sort_id NUMBER(20)  null,
     is_deleted NUMBER(1) DEFAULT 0   not null,
     create_time timestamp default CURRENT_TIMESTAMP   not null,
@@ -147,7 +147,7 @@ comment on column ${SCHEMA}.iam_resource_permission.parent_id is '父资源ID';
 comment on column ${SCHEMA}.iam_resource_permission.display_type is '展现类型';
 comment on column ${SCHEMA}.iam_resource_permission.display_name is '显示名称';
 comment on column ${SCHEMA}.iam_resource_permission.resource_code is '前端编码';
-comment on column ${SCHEMA}.iam_resource_permission.api_set is '接口列表';
+comment on column ${SCHEMA}.iam_resource_permission.permission_code is '权限码';
 comment on column ${SCHEMA}.iam_resource_permission.sort_id is '排序号';
 comment on column ${SCHEMA}.iam_resource_permission.is_deleted is '是否删除';
 comment on column ${SCHEMA}.iam_resource_permission.create_time is '创建时间';
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql
index ca19b7cd..5d9f8fd5 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql
@@ -130,7 +130,7 @@ create table iam_resource_permission
   display_type varchar(20) not null,
   display_name varchar(100) not null,
   resource_code varchar(100)   null,
-  api_set varchar(3000)   null,
+  permission_code varchar(100)   null,
   sort_id bigint    null,
   is_deleted BOOLEAN default FALSE not null,
   create_time timestamp default CURRENT_TIMESTAMP not null,
@@ -144,7 +144,7 @@ comment on column iam_resource_permission.parent_id is '父资源ID';
 comment on column iam_resource_permission.display_type is '展现类型';
 comment on column iam_resource_permission.display_name is '显示名称';
 comment on column iam_resource_permission.resource_code is '前端编码';
-comment on column iam_resource_permission.api_set is '接口列表';
+comment on column iam_resource_permission.permission_code is '权限码';
 comment on column iam_resource_permission.sort_id is '排序号';
 comment on column iam_resource_permission.is_deleted is '是否删除';
 comment on column iam_resource_permission.create_time is '创建时间';
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql
index 39e76d17..8a9960f6 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql
@@ -134,7 +134,7 @@ create table ${SCHEMA}.iam_resource_permission
     display_type varchar(20) not null,
     display_name varchar(100) not null,
     resource_code varchar(100)   null,
-    api_set varchar(3000)   null,
+    permission_code varchar(100)   null,
     sort_id bigint   null,
     is_deleted tinyint default 0 not null,
     create_time datetime default CURRENT_TIMESTAMP not null,
@@ -148,7 +148,7 @@ execute sp_addextendedproperty 'MS_Description', N'父资源ID', 'SCHEMA', '${SC
 execute sp_addextendedproperty 'MS_Description', N'展现类型', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'display_type';
 execute sp_addextendedproperty 'MS_Description', N'显示名称', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'display_name';
 execute sp_addextendedproperty 'MS_Description', N'前端编码', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'resource_code';
-execute sp_addextendedproperty 'MS_Description', N'接口列表', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'api_set';
+execute sp_addextendedproperty 'MS_Description', N'权限码', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'permission_code';
 execute sp_addextendedproperty 'MS_Description', N'排序号', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'sort_id';
 execute sp_addextendedproperty 'MS_Description', N'是否删除', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'is_deleted';
 execute sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', '${SCHEMA}', 'table', iam_resource_permission, 'column', 'create_time';
-- 
Gitee


From f7be5b635f99594c1afcae6a81a681cbd0e1841d Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 17:19:53 +0800
Subject: [PATCH 028/195] =?UTF-8?q?*=20=E7=A7=BB=E9=99=A4=E5=BA=9F?=
 =?UTF-8?q?=E5=BC=83=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/core/controller/BaseController.java    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/controller/BaseController.java b/diboot-core/src/main/java/com/diboot/core/controller/BaseController.java
index a7213218..99c6d45e 100644
--- a/diboot-core/src/main/java/com/diboot/core/controller/BaseController.java
+++ b/diboot-core/src/main/java/com/diboot/core/controller/BaseController.java
@@ -61,17 +61,6 @@ public class BaseController {
 	@Autowired(required = false)
 	protected DictionaryService dictionaryService;
 
-	/***
-	 * 构建查询QueryWrapper (根据BindQuery注解构建相应的查询条件)
-	 * @param entityOrDto Entity对象或者DTO对象 (属性若无BindQuery注解，默认构建为为EQ相等条件)
-	 * @see #buildQueryWrapperByDTO #buildQueryWrapperByQueryParams
-	 * @return
-	 */
-	@Deprecated
-    protected <DTO> QueryWrapper<DTO> buildQueryWrapper(DTO entityOrDto) throws Exception{
-		return buildQueryWrapperByQueryParams(entityOrDto);
-	}
-
 	/***
 	 * 根据DTO构建查询QueryWrapper (根据BindQuery注解构建相应的查询条件，DTO中的非空属性均参与构建)
 	 * @param entityOrDto Entity对象或者DTO对象 (属性若无BindQuery注解，默认构建为为EQ相等条件)
-- 
Gitee


From 2bac02c2dc2987e8ee33d59f087055667da70cd5 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Fri, 22 Apr 2022 18:22:52 +0800
Subject: [PATCH 029/195] * add router-guards

---
 diboot-admin-ui/mock/auth/index.ts            | 44 ++++++++--
 diboot-admin-ui/src/layout/footer/index.vue   |  9 +++
 diboot-admin-ui/src/layout/header/index.vue   | 22 +++++
 diboot-admin-ui/src/layout/index.vue          | 28 +++++--
 diboot-admin-ui/src/layout/main/index.vue     | 32 ++++++++
 diboot-admin-ui/src/layout/memu/index.vue     | 11 +++
 diboot-admin-ui/src/layout/memu/subMenu.vue   | 29 +++++++
 diboot-admin-ui/src/router/index.ts           | 66 +++++++--------
 diboot-admin-ui/src/router/router-guards.ts   | 67 +++++++++++++++
 diboot-admin-ui/src/router/typings.d.ts       |  2 +
 diboot-admin-ui/src/store/asyncRoute.ts       | 81 +++++++++++++++++++
 .../src/store/{user.ts => auth.ts}            | 44 +++++-----
 diboot-admin-ui/src/store/tabsView.ts         | 27 +++++++
 diboot-admin-ui/src/utils/auth.ts             |  6 +-
 diboot-admin-ui/src/utils/request.ts          |  1 -
 diboot-admin-ui/src/views/dashboard/index.vue |  6 +-
 diboot-admin-ui/src/views/login/index.vue     | 19 ++++-
 diboot-admin-ui/types/components.d.ts         |  7 ++
 18 files changed, 418 insertions(+), 83 deletions(-)
 create mode 100644 diboot-admin-ui/src/layout/footer/index.vue
 create mode 100644 diboot-admin-ui/src/layout/header/index.vue
 create mode 100644 diboot-admin-ui/src/layout/main/index.vue
 create mode 100644 diboot-admin-ui/src/layout/memu/index.vue
 create mode 100644 diboot-admin-ui/src/layout/memu/subMenu.vue
 create mode 100644 diboot-admin-ui/src/router/router-guards.ts
 create mode 100644 diboot-admin-ui/src/store/asyncRoute.ts
 rename diboot-admin-ui/src/store/{user.ts => auth.ts} (52%)
 create mode 100644 diboot-admin-ui/src/store/tabsView.ts

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index 3218fb2d..8e5e490b 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -32,18 +32,21 @@ export default [
     url: `${baseUrl}/userInfo`,
     timeout: Random.natural(50, 300),
     method: 'get',
-    response: () => {
-      return JsonResult.OK({
-        realname: Random.cname(),
-        email: Random.email(),
-        avatar: Random.image('250x250')
-      })
+    response: ({ headers }: any) => {
+      const token = headers.authorization
+      if (token && token.length >= 32)
+        return JsonResult.OK({
+          realname: Random.cname(),
+          email: Random.email(),
+          avatar: Random.image('250x250')
+        })
+      return JsonResult.FAIL_INVALID_TOKEN()
     }
   },
   {
     url: `${baseUrl}/logout`,
     timeout: Random.natural(50, 300),
-    method: 'get',
+    method: 'post',
     response: () => {
       return JsonResult.OK()
     }
@@ -53,8 +56,33 @@ export default [
     timeout: Random.natural(50, 300),
     method: 'get',
     rawResponse: (req, res) => {
-      res.setHeader('Authorization', Random.string('lower', 32, 32))
+      const token = req.headers.authorization
+      if (token && token.length >= 32) res.setHeader('Authorization', Random.string('lower', 32, 32))
       res.end()
     }
+  },
+  {
+    url: `${baseUrl}/menu`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    response: () => {
+      return JsonResult.OK(authMenu)
+    }
   }
 ] as MockMethod[]
+
+// 授权菜单
+const authMenu = [
+  {
+    path: '/demo',
+    name: 'Demo',
+    meta: { title: 'Demo', component: 'layout' },
+    children: [
+      {
+        path: 'hello',
+        name: 'Hello',
+        meta: { title: '仪表盘', component: `dashboard/index` }
+      }
+    ]
+  }
+]
diff --git a/diboot-admin-ui/src/layout/footer/index.vue b/diboot-admin-ui/src/layout/footer/index.vue
new file mode 100644
index 00000000..62c7946d
--- /dev/null
+++ b/diboot-admin-ui/src/layout/footer/index.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+console.log('footer')
+</script>
+
+<template>
+  <h5 style="text-align: center">footer</h5>
+</template>
+
+<style scoped></style>
diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
new file mode 100644
index 00000000..6e616b57
--- /dev/null
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import useAuthauthStore from '@/store/auth'
+import { useRouter } from 'vue-router'
+const authStore = useAuthauthStore()
+const router = useRouter()
+const logout = async () => {
+  await authStore.logout()
+  router.push({ name: 'Login' }).finally()
+}
+</script>
+
+<template>
+  <div style="display: flex; justify-content: space-between">
+    <span>.</span>
+    <h2>
+      <el-button @click="logout">退出登录</el-button>
+      {{ authStore.realname }}
+    </h2>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index b2847381..5402c541 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -1,12 +1,30 @@
 <script setup lang="ts">
-console.log('Layout')
+import AppHeader from './header/index.vue'
+import AppMenu from '@/layout/memu/index.vue'
+import AppMain from './main/index.vue'
+import AppFooter from './footer/index.vue'
 </script>
 
 <template>
-  <h2 style="text-align: center">布局容器</h2>
-  <div>
-    <router-view />
-  </div>
+  <el-container>
+    <el-header>
+      <app-header />
+    </el-header>
+    <el-container>
+      <el-aside width="200px">
+        <app-menu />
+      </el-aside>
+      <el-container>
+        <el-main>
+          <app-main>
+            <template #footer>
+              <app-footer />
+            </template>
+          </app-main>
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
 </template>
 
 <style scoped></style>
diff --git a/diboot-admin-ui/src/layout/main/index.vue b/diboot-admin-ui/src/layout/main/index.vue
new file mode 100644
index 00000000..6aa0898d
--- /dev/null
+++ b/diboot-admin-ui/src/layout/main/index.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import useRouteStore from '@/store/tabsView'
+const routeStore = useRouteStore()
+</script>
+
+<template>
+  <router-view v-slot="{ Component, route }">
+    <transition :name="route.meta.transition" mode="out-in">
+      <keep-alive :include="routeStore.cachedViews">
+        <div :key="route.fullPath" class="content">
+          <div :class="route.meta.hollow ? '' : 'bounded'">
+            <component :is="Component" />
+          </div>
+          <slot v-if="!route.meta.hideFooter" name="footer" />
+        </div>
+      </keep-alive>
+    </transition>
+  </router-view>
+</template>
+
+<style scoped>
+.content {
+  padding: 10px;
+  background-color: rgba(125, 125, 125, 0.1);
+}
+
+.content > .bounded {
+  padding: 10px 15px;
+  border-radius: 5px 5px 0 0;
+  background-color: #fff;
+}
+</style>
diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
new file mode 100644
index 00000000..999e4d27
--- /dev/null
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import SubMenu from './subMenu.vue'
+import useAsyncRouteStore from '@/store/asyncRoute'
+
+const asyncRouteStore = useAsyncRouteStore()
+</script>
+<template>
+  <el-menu router>
+    <SubMenu :menu-list="asyncRouteStore.menus" />
+  </el-menu>
+</template>
diff --git a/diboot-admin-ui/src/layout/memu/subMenu.vue b/diboot-admin-ui/src/layout/memu/subMenu.vue
new file mode 100644
index 00000000..412ec905
--- /dev/null
+++ b/diboot-admin-ui/src/layout/memu/subMenu.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { RouteRecordRaw } from 'vue-router'
+
+defineProps<{ menuList: RouteRecordRaw[] }>()
+
+const router = useRouter()
+
+const goto = (name: string) => {
+  router.push({ name })
+}
+</script>
+
+<template>
+  <template v-for="(item, index) in menuList" :key="index">
+    <el-sub-menu v-if="item.children?.length > 0" :index="item.path">
+      <template #title>
+        图标：
+        <span>{{ item.meta.title }}</span>
+      </template>
+      <sub-menu :menu-list="item.children" />
+    </el-sub-menu>
+    <el-menu-item v-else :index="item.path">
+      图标：
+      <span>{{ item.meta.title }}</span>
+    </el-menu-item>
+  </template>
+</template>
+
+<style scoped></style>
diff --git a/diboot-admin-ui/src/router/index.ts b/diboot-admin-ui/src/router/index.ts
index 52b2f883..75a2002f 100644
--- a/diboot-admin-ui/src/router/index.ts
+++ b/diboot-admin-ui/src/router/index.ts
@@ -1,5 +1,5 @@
 import { createRouter, createWebHashHistory, RouteRecordRaw, RouterView } from 'vue-router'
-import Layout from '@/layout/index.vue'
+import { createRouterGuard } from '@/router/router-guards'
 
 /**
  * constantRoutes
@@ -8,43 +8,39 @@ import Layout from '@/layout/index.vue'
  */
 export const constantRoutes: RouteRecordRaw[] = [
   {
-    path: '/redirect',
+    path: '/redirect/:path(.*)*',
     name: 'Redirect',
-    component: Layout,
-    children: [
-      {
-        path: ':path(.*)*', // '/redirect/:path(.*)*'
-        name: 'Redirect',
-        redirect: to => {
-          const path = to.params.path
-          return { path: `/${Array.isArray(path) ? path.join('/') : path}`, query: to.query, replace: true }
-        }
-      }
-    ]
+    meta: { hidden: true, ignoreAuth: true },
+    redirect: to => {
+      const path = to.params.path
+      return { path: `/${Array.isArray(path) ? path.join('/') : path}`, query: to.query, replace: true }
+    }
   },
   {
     path: '/exception',
     name: 'Exception',
+    redirect: '404',
     component: RouterView,
-    meta: { title: 'Exception' },
+    meta: { title: 'Exception', hidden: true, ignoreAuth: true },
     children: [
       {
         path: '404',
         name: '404',
         component: () => import('@/views/exception/404.vue'),
-        meta: { title: '404' }
+        meta: { title: '404', ignoreAuth: true }
       },
       {
         path: '500',
         name: '500',
         component: () => import('@/views/exception/500.vue'),
-        meta: { title: '500' }
+        meta: { title: '500', ignoreAuth: true }
       }
     ]
   },
   {
     path: '/:path(.*)*',
     name: 'ErrorPage',
+    meta: { hidden: true, ignoreAuth: true },
     redirect: to => {
       return { name: '404', query: { path: to.path }, replace: true }
     }
@@ -53,7 +49,22 @@ export const constantRoutes: RouteRecordRaw[] = [
     path: '/login',
     name: 'Login',
     component: () => import('@/views/login/index.vue'),
-    meta: { hidden: true }
+    meta: { hidden: true, ignoreAuth: true }
+  },
+  {
+    path: '/',
+    name: 'Home',
+    redirect: '/dashboard',
+    component: () => import('@/layout/index.vue'),
+    meta: { title: '首页' },
+    children: [
+      {
+        path: 'dashboard',
+        name: 'Dashboard',
+        component: () => import('@/views/dashboard/index.vue'),
+        meta: { title: '仪表盘' }
+      }
+    ]
   }
 ]
 
@@ -66,23 +77,8 @@ const router = createRouter({
   routes: constantRoutes
 })
 
-// home route
-const homeRoute: RouteRecordRaw = {
-  path: '/',
-  name: 'Home',
-  component: Layout,
-  redirect: '/dashboard',
-  meta: { title: '首页' },
-  children: [
-    {
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index.vue'),
-      meta: { title: '仪表盘', ignoreAuth: true }
-    }
-  ]
-}
-
-router.addRoute(homeRoute)
+createRouterGuard(router)
 
 export default router
+
+setTimeout(() => console.log(router.getRoutes()), 1000)
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
new file mode 100644
index 00000000..da76be92
--- /dev/null
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -0,0 +1,67 @@
+import { isNavigationFailure, Router, RouteRecordRaw, RouterView } from 'vue-router'
+import useUserStore from '@/store/auth'
+import useRouteStore from '@/store/asyncRoute'
+import useTabsViewStore from '@/store/tabsView'
+import auth from '@/utils/auth'
+
+/**
+ * 路由守卫函数
+ * @param router - 路由实例
+ */
+export function createRouterGuard(router: Router) {
+  router.beforeEach(async (to, from, next) => {
+    // 未登录
+    if (auth.getToken()) {
+      const userStore = useUserStore()
+      // 已加载完基本数据
+      if (userStore.info) {
+        next()
+        return
+      }
+      const routeStore = useRouteStore()
+
+      try {
+        await userStore.getInfo()
+
+        // 加载异步路由
+        await routeStore.generateRoutes(router)
+
+        const redirectPath = (from.query.redirect || to.path) as string
+        const redirect = decodeURIComponent(redirectPath)
+        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        next(nextData)
+        return
+      } catch (e) {
+        // 获取数据异常
+        console.log('加载授权路由失败', e)
+      }
+    }
+
+    // You can access without permissions. You need to set the routing meta.ignoreAuth to true
+    if (to.meta.ignoreAuth) {
+      next()
+      return
+    }
+    // redirect login page
+    const redirectData = {
+      name: 'Login',
+      replace: true,
+      query: to.query
+    }
+    if (to.path) {
+      redirectData.query.redirect = to.path
+    }
+    next(redirectData)
+  })
+
+  router.afterEach((to, from, failure) => {
+    if (isNavigationFailure(failure)) {
+      return
+    }
+    useTabsViewStore().addView(to)
+  })
+
+  router.onError(error => {
+    console.log('路由错误', error)
+  })
+}
diff --git a/diboot-admin-ui/src/router/typings.d.ts b/diboot-admin-ui/src/router/typings.d.ts
index 7a21a9c8..2b842535 100644
--- a/diboot-admin-ui/src/router/typings.d.ts
+++ b/diboot-admin-ui/src/router/typings.d.ts
@@ -5,12 +5,14 @@ declare module 'vue-router' {
     title?: string
     icon?: string
     module?: string
+    component?: string
     ignoreAuth?: boolean
     keepAlive?: boolean
     hidden?: boolean
     hollow?: boolean
     hideFooter?: boolean
     borderless?: boolean
+    openNewWindow?: boolean
     hideBreadcrumb?: boolean
   }
 }
diff --git a/diboot-admin-ui/src/store/asyncRoute.ts b/diboot-admin-ui/src/store/asyncRoute.ts
new file mode 100644
index 00000000..21eef260
--- /dev/null
+++ b/diboot-admin-ui/src/store/asyncRoute.ts
@@ -0,0 +1,81 @@
+import { Router, RouteRecordRaw, RouterView } from 'vue-router'
+import Layout from '@/layout/index.vue'
+
+export interface IRouteState {
+  menus: RouteRecordRaw[]
+}
+
+export default defineStore({
+  id: 'async-route',
+  state: (): IRouteState => ({
+    menus: []
+  }),
+  actions: {
+    async generateRoutes(router: Router) {
+      // 加载异步路由
+      const res = await api.get<Array<any>>('/auth/menu')
+      if (res.data?.length) {
+        const asyncRoutes = filterAsyncRouter(res.data)
+        asyncRoutes.forEach(e => router.addRoute(e))
+        this.menus = filterAsyncMenu(asyncRoutes)
+      }
+    }
+  }
+})
+
+// 加载所有页面
+const pages = import.meta.globEager('@/views/**/*.vue')
+
+/**
+ * <h2>过滤异步路由</h2>
+ * 加载component及自动丢弃无用路由
+ * @param asyncRoutes
+ */
+function filterAsyncRouter(asyncRoutes: RouteRecordRaw[]) {
+  return asyncRoutes.filter(route => {
+    if (route.children?.length && (route.children = filterAsyncRouter(route.children)).length) {
+      const component = route.meta?.component
+      if (component?.toLowerCase() === 'layout' || component?.toLowerCase() === 'layout/index') {
+        route.component = Layout
+      } else if (!component) {
+        route.component = RouterView
+      } else {
+        route.component = pages[`../views/${component}.vue`]
+      }
+      // 父级目录重定向首个子菜单
+      const childrenPath = route.children[0].path
+      route.redirect = /^\//.exec(childrenPath) ? childrenPath : `${route.path}/${childrenPath}`
+    } else {
+      delete route.children
+      if (route.meta?.component) {
+        route.component = pages[`../views/${route.meta?.component}.vue`]
+      } else return false
+    }
+    return true
+  })
+}
+
+/**
+ * 过滤菜单
+ *
+ * @param asyncRoutes
+ * @param parent
+ */
+function filterAsyncMenu(asyncRoutes: RouteRecordRaw[], parent?: RouteRecordRaw) {
+  const routes: RouteRecordRaw[] = []
+  for (const route of asyncRoutes) {
+    if (route.meta?.hidden) continue
+    if (parent && !/^\//.exec(route.path)) route.path = `${parent.path === '/' ? '' : parent.path}/${route.path}`
+    if (!route.children) {
+      routes.push(route)
+    } else if (!route.meta?.title && route.children.length === 1) {
+      const child = route.children[0]
+      child.path = route.redirect as string
+      routes.push(child)
+    } else {
+      route.children = filterAsyncMenu(route.children, route)
+      routes.push(route)
+    }
+  }
+  return routes
+}
diff --git a/diboot-admin-ui/src/store/user.ts b/diboot-admin-ui/src/store/auth.ts
similarity index 52%
rename from diboot-admin-ui/src/store/user.ts
rename to diboot-admin-ui/src/store/auth.ts
index 5d850aa6..263ec425 100644
--- a/diboot-admin-ui/src/store/user.ts
+++ b/diboot-admin-ui/src/store/auth.ts
@@ -1,21 +1,23 @@
 import auth from '@/utils/auth'
 import { ElMessage } from 'element-plus'
 
-interface IUserInfo {
+interface IAuthStore {
   realname: string
   email: string
   avatar: string
+  info: any
 }
 
-export default defineStore('user', {
+export default defineStore('auth', {
   state: () => {
-    return <IUserInfo>{
-      realname: '游客',
-      avatar: ''
+    return <IAuthStore>{
+      realname: '',
+      avatar: '',
+      info: null
     }
   },
   actions: {
-    login: (account: any) => {
+    login(account: any) {
       return new Promise((resolve, reject) => {
         api
           .post<{ token: string }>('/auth/login', account)
@@ -31,24 +33,22 @@ export default defineStore('user', {
           })
       })
     },
-    getInfo: () => {
-      return new Promise((resolve, reject) => {
-        api
-          .get('/auth/userInfo')
-          .then(res => {
-            if (res.data) resolve(res.data)
-            else reject()
-          })
-          .catch(err => {
-            reject(err)
-          })
-      })
+    getInfo: async function () {
+      try {
+        const res = await api.get<{ realname: string }>('/auth/userInfo')
+        this.info = res.data
+        this.realname = `${res.data?.realname}`
+      } catch (e) {
+        throw new Error('获取登录者信息异常')
+      }
     },
-    logout: () => {
-      // this.realname = 'asd'
-      api.post('/auth/logout').finally(() => {
+    async logout() {
+      try {
+        await api.post('/auth/logout')
+      } finally {
         auth.cleanToken()
-      })
+        this.$reset()
+      }
     }
   }
 })
diff --git a/diboot-admin-ui/src/store/tabsView.ts b/diboot-admin-ui/src/store/tabsView.ts
new file mode 100644
index 00000000..cd94c38f
--- /dev/null
+++ b/diboot-admin-ui/src/store/tabsView.ts
@@ -0,0 +1,27 @@
+import { RouteLocationNormalizedLoaded } from 'vue-router'
+
+interface ITagsViewStore {
+  visitedViews: RouteLocationNormalizedLoaded[]
+  cachedViews: string[]
+}
+
+export default defineStore('tags-view', {
+  state() {
+    return <ITagsViewStore>{
+      visitedViews: [],
+      cachedViews: []
+    }
+  },
+  actions: {
+    addView(view: RouteLocationNormalizedLoaded) {
+      if (!this.visitedViews.includes(view)) {
+        return
+      }
+      this.visitedViews.push(view)
+      if (view.meta.keepAlive !== false) this.cachedViews.push(view.name as string)
+    },
+    delView(view: RouteLocationNormalizedLoaded) {
+      console.log(view)
+    }
+  }
+})
diff --git a/diboot-admin-ui/src/utils/auth.ts b/diboot-admin-ui/src/utils/auth.ts
index baf1bdd2..70a54dee 100644
--- a/diboot-admin-ui/src/utils/auth.ts
+++ b/diboot-admin-ui/src/utils/auth.ts
@@ -4,12 +4,12 @@ export const AUTH_HEADER_KEY = 'Authorization'
 
 export default {
   getToken(): string | null {
-    return sessionStorage.getItem(TOKEN_KEY)
+    return localStorage.getItem(TOKEN_KEY)
   },
   setToken(token: string) {
-    sessionStorage.setItem(TOKEN_KEY, token)
+    localStorage.setItem(TOKEN_KEY, token)
   },
   cleanToken() {
-    sessionStorage.removeItem(TOKEN_KEY)
+    localStorage.removeItem(TOKEN_KEY)
   }
 }
diff --git a/diboot-admin-ui/src/utils/request.ts b/diboot-admin-ui/src/utils/request.ts
index 4c43eb53..d7bd9a33 100644
--- a/diboot-admin-ui/src/utils/request.ts
+++ b/diboot-admin-ui/src/utils/request.ts
@@ -88,7 +88,6 @@ function resetPingTimer() {
 }
 
 interface ApiData<T> {
-  ok: boolean
   code: number
   msg: string
   data?: T
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
index 69942308..ff06a7a4 100644
--- a/diboot-admin-ui/src/views/dashboard/index.vue
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -2,10 +2,6 @@
 console.log('Dashboard')
 </script>
 
-<template>
-  Dashboard
-
-  <el-button @click="$router.push({ name: 'Login' })">跳转登录页面</el-button>
-</template>
+<template>Dashboard</template>
 
 <style scoped></style>
diff --git a/diboot-admin-ui/src/views/login/index.vue b/diboot-admin-ui/src/views/login/index.vue
index 6776f9ac..cca765b8 100644
--- a/diboot-admin-ui/src/views/login/index.vue
+++ b/diboot-admin-ui/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { FormInstance } from 'element-plus'
-import useUserStore from '@/store/user'
+import useAuthStore from '@/store/auth'
 
-const userStore = useUserStore()
+const authStore = useAuthStore()
 
 const formRef = ref<FormInstance>()
 const form = reactive({ username: 'admin', password: '123456' })
@@ -12,11 +12,22 @@ const rules = {
 }
 const router = useRouter()
 
+const redirect = () => {
+  const query = router.currentRoute.value.query
+  const redirect = query.redirect
+  if (redirect) {
+    delete query.redirect
+    router.push({ path: '/redirect' + redirect, query })
+  } else {
+    router.push('/')
+  }
+}
+
 const submitForm = async () => {
   await formRef.value?.validate(valid => {
     if (valid) {
-      userStore.login(form).then(() => {
-        router.push('/')
+      authStore.login(form).then(() => {
+        redirect()
       })
     }
   })
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index d4dbb5e1..8611f9cc 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -5,11 +5,18 @@ import '@vue/runtime-core'
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    ElAside: typeof import('element-plus/es')['ElAside']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElMain: typeof import('element-plus/es')['ElMain']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     HelloWorld: typeof import('@/components/HelloWorld.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-- 
Gitee


From 2053a2f97423f182925bc898e3c0c8f0adcf336c Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 22 Apr 2022 18:57:05 +0800
Subject: [PATCH 030/195] * rename cleanToken

---
 diboot-admin-ui/src/store/auth.ts    | 2 +-
 diboot-admin-ui/src/utils/auth.ts    | 2 +-
 diboot-admin-ui/src/utils/request.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/diboot-admin-ui/src/store/auth.ts b/diboot-admin-ui/src/store/auth.ts
index 263ec425..887818cf 100644
--- a/diboot-admin-ui/src/store/auth.ts
+++ b/diboot-admin-ui/src/store/auth.ts
@@ -46,7 +46,7 @@ export default defineStore('auth', {
       try {
         await api.post('/auth/logout')
       } finally {
-        auth.cleanToken()
+        auth.clearToken()
         this.$reset()
       }
     }
diff --git a/diboot-admin-ui/src/utils/auth.ts b/diboot-admin-ui/src/utils/auth.ts
index 70a54dee..50911ab9 100644
--- a/diboot-admin-ui/src/utils/auth.ts
+++ b/diboot-admin-ui/src/utils/auth.ts
@@ -9,7 +9,7 @@ export default {
   setToken(token: string) {
     localStorage.setItem(TOKEN_KEY, token)
   },
-  cleanToken() {
+  clearToken() {
     localStorage.removeItem(TOKEN_KEY)
   }
 }
diff --git a/diboot-admin-ui/src/utils/request.ts b/diboot-admin-ui/src/utils/request.ts
index d7bd9a33..5e82973d 100644
--- a/diboot-admin-ui/src/utils/request.ts
+++ b/diboot-admin-ui/src/utils/request.ts
@@ -35,7 +35,7 @@ service.interceptors.response.use(
 
     // 如果返回的自定义状态码为 4001， 则token过期，需要清理掉token并跳转至登录页面重新登录
     if (response.data && response.data.code === 4001) {
-      auth.cleanToken()
+      auth.clearToken()
       router.push({ name: 'Login' }).finally()
       throw new Error('登录过期，请重新登录')
     }
-- 
Gitee


From 5f19fb8764b698a413c7f6c8512ff2210f7506df Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Fri, 22 Apr 2022 19:50:17 +0800
Subject: [PATCH 031/195] * resolveComponent

---
 diboot-admin-ui/src/store/asyncRoute.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/diboot-admin-ui/src/store/asyncRoute.ts b/diboot-admin-ui/src/store/asyncRoute.ts
index 21eef260..6c4443a1 100644
--- a/diboot-admin-ui/src/store/asyncRoute.ts
+++ b/diboot-admin-ui/src/store/asyncRoute.ts
@@ -25,6 +25,16 @@ export default defineStore({
 
 // 加载所有页面
 const pages = import.meta.globEager('@/views/**/*.vue')
+// 获取组件
+const resolveComponent = (name: any) => {
+  const importPage = pages[`../views/${name}.vue`]
+
+  if (!importPage) {
+    throw new Error(`Unknown page ${name}. Is it located under Pages with a .vue extension?`)
+  }
+
+  return importPage.default
+}
 
 /**
  * <h2>过滤异步路由</h2>
@@ -40,7 +50,7 @@ function filterAsyncRouter(asyncRoutes: RouteRecordRaw[]) {
       } else if (!component) {
         route.component = RouterView
       } else {
-        route.component = pages[`../views/${component}.vue`]
+        route.component = resolveComponent(component)
       }
       // 父级目录重定向首个子菜单
       const childrenPath = route.children[0].path
@@ -48,7 +58,7 @@ function filterAsyncRouter(asyncRoutes: RouteRecordRaw[]) {
     } else {
       delete route.children
       if (route.meta?.component) {
-        route.component = pages[`../views/${route.meta?.component}.vue`]
+        route.component = resolveComponent(route.meta?.component)
       } else return false
     }
     return true
-- 
Gitee


From 9dcde9aa15ecd28e0f07edb963e4eabeb3c950da Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 23 Apr 2022 00:29:17 +0800
Subject: [PATCH 032/195] * fix async-route 404

---
 diboot-admin-ui/src/router/index.ts         | 2 +-
 diboot-admin-ui/src/router/router-guards.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-admin-ui/src/router/index.ts b/diboot-admin-ui/src/router/index.ts
index 75a2002f..8100d520 100644
--- a/diboot-admin-ui/src/router/index.ts
+++ b/diboot-admin-ui/src/router/index.ts
@@ -19,7 +19,7 @@ export const constantRoutes: RouteRecordRaw[] = [
   {
     path: '/exception',
     name: 'Exception',
-    redirect: '404',
+    redirect: '/exception/404',
     component: RouterView,
     meta: { title: 'Exception', hidden: true, ignoreAuth: true },
     children: [
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
index da76be92..bcdab672 100644
--- a/diboot-admin-ui/src/router/router-guards.ts
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -26,7 +26,7 @@ export function createRouterGuard(router: Router) {
         // 加载异步路由
         await routeStore.generateRoutes(router)
 
-        const redirectPath = (from.query.redirect || to.path) as string
+        const redirectPath = ((to.name === '404' && to.query.path) || from.query.redirect || to.path) as string
         const redirect = decodeURIComponent(redirectPath)
         const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
         next(nextData)
-- 
Gitee


From d66e39dc137b5494480555b5a127e12fc774deb1 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 23 Apr 2022 00:30:38 +0800
Subject: [PATCH 033/195] + nprogress

---
 diboot-admin-ui/package.json                |  2 ++
 diboot-admin-ui/pnpm-lock.yaml              | 16 ++++++++++++++++
 diboot-admin-ui/src/main.ts                 |  1 +
 diboot-admin-ui/src/router/router-guards.ts |  6 +++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 3440815a..ee2b35cc 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -13,6 +13,7 @@
     "element-plus": "^2.1.10",
     "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
     "pinia": "^2.0.13",
     "qs": "^6.10.3",
     "vue": "^3.2.25",
@@ -21,6 +22,7 @@
   "devDependencies": {
     "@types/lodash": "^4.14.182",
     "@types/node": "^17.0.25",
+    "@types/nprogress": "^0.2.0",
     "@types/qs": "^6.9.7",
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index f2142ec4..4105d491 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -3,6 +3,7 @@ lockfileVersion: 5.3
 specifiers:
   '@types/lodash': ^4.14.182
   '@types/node': ^17.0.25
+  '@types/nprogress': ^0.2.0
   '@types/qs': ^6.9.7
   '@typescript-eslint/eslint-plugin': ^5.20.0
   '@typescript-eslint/parser': ^5.20.0
@@ -16,6 +17,7 @@ specifiers:
   eslint-plugin-vue: ^8.6.0
   lodash: ^4.17.21
   mockjs: ^1.1.0
+  nprogress: ^0.2.0
   pinia: ^2.0.13
   prettier: 2.6.2
   qs: ^6.10.3
@@ -34,6 +36,7 @@ dependencies:
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
   lodash: registry.npmmirror.com/lodash/4.17.21
   mockjs: registry.npmmirror.com/mockjs/1.1.0
+  nprogress: registry.npmmirror.com/nprogress/0.2.0
   pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
@@ -42,6 +45,7 @@ dependencies:
 devDependencies:
   '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
   '@types/node': registry.npmmirror.com/@types/node/17.0.25
+  '@types/nprogress': registry.npmmirror.com/@types/nprogress/0.2.0
   '@types/qs': registry.npmmirror.com/@types/qs/6.9.7
   '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf
   '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
@@ -293,6 +297,12 @@ packages:
     version: 17.0.25
     dev: true
 
+  registry.npmmirror.com/@types/nprogress/0.2.0:
+    resolution: {integrity: sha512-1cYJrqq9GezNFPsWTZpFut/d4CjpZqA0vhqDUPFWYKF1oIyBz5qnoYMzR+0C/T96t3ebLAC1SSnwrVOm5/j74A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.0.tgz}
+    name: '@types/nprogress'
+    version: 0.2.0
+    dev: true
+
   registry.npmmirror.com/@types/qs/6.9.7:
     resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz}
     name: '@types/qs'
@@ -2183,6 +2193,12 @@ packages:
     version: 1.1.2
     dev: false
 
+  registry.npmmirror.com/nprogress/0.2.0:
+    resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz}
+    name: nprogress
+    version: 0.2.0
+    dev: false
+
   registry.npmmirror.com/object-assign/4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz}
     name: object-assign
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index 6826bc86..24b07459 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -7,3 +7,4 @@ app.use(createPinia())
 app.mount('#app')
 
 import 'element-plus/es/components/message/style/css'
+import 'nprogress/nprogress.css'
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
index bcdab672..f5d8b44b 100644
--- a/diboot-admin-ui/src/router/router-guards.ts
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -1,4 +1,5 @@
-import { isNavigationFailure, Router, RouteRecordRaw, RouterView } from 'vue-router'
+import { isNavigationFailure, Router } from 'vue-router'
+import nProgress from 'nprogress'
 import useUserStore from '@/store/auth'
 import useRouteStore from '@/store/asyncRoute'
 import useTabsViewStore from '@/store/tabsView'
@@ -10,6 +11,7 @@ import auth from '@/utils/auth'
  */
 export function createRouterGuard(router: Router) {
   router.beforeEach(async (to, from, next) => {
+    nProgress.start()
     // 未登录
     if (auth.getToken()) {
       const userStore = useUserStore()
@@ -56,8 +58,10 @@ export function createRouterGuard(router: Router) {
 
   router.afterEach((to, from, failure) => {
     if (isNavigationFailure(failure)) {
+      nProgress.remove()
       return
     }
+    nProgress.done()
     useTabsViewStore().addView(to)
   })
 
-- 
Gitee


From f361b0f07b4fc10cb8c4ce5e8089e1c564752316 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 23 Apr 2022 01:55:09 +0800
Subject: [PATCH 034/195] * parent menu redirect

---
 diboot-admin-ui/src/store/asyncRoute.ts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/diboot-admin-ui/src/store/asyncRoute.ts b/diboot-admin-ui/src/store/asyncRoute.ts
index 6c4443a1..1a1d0fe0 100644
--- a/diboot-admin-ui/src/store/asyncRoute.ts
+++ b/diboot-admin-ui/src/store/asyncRoute.ts
@@ -40,10 +40,12 @@ const resolveComponent = (name: any) => {
  * <h2>过滤异步路由</h2>
  * 加载component及自动丢弃无用路由
  * @param asyncRoutes
+ * @param parentPath
  */
-function filterAsyncRouter(asyncRoutes: RouteRecordRaw[]) {
+function filterAsyncRouter(asyncRoutes: RouteRecordRaw[], parentPath?: string) {
   return asyncRoutes.filter(route => {
-    if (route.children?.length && (route.children = filterAsyncRouter(route.children)).length) {
+    const fullPath = buildFullPath(route.path, parentPath)
+    if (route.children?.length && (route.children = filterAsyncRouter(route.children, fullPath)).length) {
       const component = route.meta?.component
       if (component?.toLowerCase() === 'layout' || component?.toLowerCase() === 'layout/index') {
         route.component = Layout
@@ -53,8 +55,7 @@ function filterAsyncRouter(asyncRoutes: RouteRecordRaw[]) {
         route.component = resolveComponent(component)
       }
       // 父级目录重定向首个子菜单
-      const childrenPath = route.children[0].path
-      route.redirect = /^\//.exec(childrenPath) ? childrenPath : `${route.path}/${childrenPath}`
+      route.redirect = buildFullPath(route.children[0].path, fullPath)
     } else {
       delete route.children
       if (route.meta?.component) {
@@ -65,6 +66,15 @@ function filterAsyncRouter(asyncRoutes: RouteRecordRaw[]) {
   })
 }
 
+/**
+ * 构建全路径
+ *
+ * @param path
+ * @param parentPath
+ */
+const buildFullPath = (path: string, parentPath = '/') =>
+  /^\//.exec(path) ? path : `${parentPath === '/' ? '' : parentPath}/${path}`
+
 /**
  * 过滤菜单
  *
@@ -75,7 +85,7 @@ function filterAsyncMenu(asyncRoutes: RouteRecordRaw[], parent?: RouteRecordRaw)
   const routes: RouteRecordRaw[] = []
   for (const route of asyncRoutes) {
     if (route.meta?.hidden) continue
-    if (parent && !/^\//.exec(route.path)) route.path = `${parent.path === '/' ? '' : parent.path}/${route.path}`
+    if (parent) route.path = buildFullPath(route.path, parent.path)
     if (!route.children) {
       routes.push(route)
     } else if (!route.meta?.title && route.children.length === 1) {
-- 
Gitee


From 8d6f9fb35fc95101aaa6c33d065edabcb4fc4b71 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 23 Apr 2022 01:59:04 +0800
Subject: [PATCH 035/195] * menu hidden

---
 diboot-admin-ui/src/store/asyncRoute.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-admin-ui/src/store/asyncRoute.ts b/diboot-admin-ui/src/store/asyncRoute.ts
index 1a1d0fe0..9c5b85ee 100644
--- a/diboot-admin-ui/src/store/asyncRoute.ts
+++ b/diboot-admin-ui/src/store/asyncRoute.ts
@@ -94,7 +94,7 @@ function filterAsyncMenu(asyncRoutes: RouteRecordRaw[], parent?: RouteRecordRaw)
       routes.push(child)
     } else {
       route.children = filterAsyncMenu(route.children, route)
-      routes.push(route)
+      route.children.length && routes.push(route)
     }
   }
   return routes
-- 
Gitee


From bf94f0d29cbc17377973a1709b9b55816e47789e Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 23 Apr 2022 15:10:34 +0800
Subject: [PATCH 036/195] * refactor menuTree

---
 diboot-admin-ui/.eslintrc.js                |   1 +
 diboot-admin-ui/src/layout/memu/index.vue   |   7 +-
 diboot-admin-ui/src/layout/memu/subMenu.vue |  16 +--
 diboot-admin-ui/src/router/index.ts         |   4 +-
 diboot-admin-ui/src/router/router-guards.ts |  13 ++-
 diboot-admin-ui/src/router/typings.d.ts     |   1 +
 diboot-admin-ui/src/store/asyncRoute.ts     | 101 -----------------
 diboot-admin-ui/src/utils/route.ts          | 119 ++++++++++++++++++++
 8 files changed, 137 insertions(+), 125 deletions(-)
 delete mode 100644 diboot-admin-ui/src/store/asyncRoute.ts
 create mode 100644 diboot-admin-ui/src/utils/route.ts

diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index feed4427..8979339a 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -19,6 +19,7 @@ module.exports = {
   },
   plugins: ['vue', '@typescript-eslint', 'prettier'],
   rules: {
+    '@typescript-eslint/ban-ts-comment': 0,
     '@typescript-eslint/no-explicit-any': 0,
     'comma-dangle': ['warn', 'only-multiline'],
     'vue/html-self-closing': ['warn', { html: { void: 'always' } }],
diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index 999e4d27..ab9c4190 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import SubMenu from './subMenu.vue'
-import useAsyncRouteStore from '@/store/asyncRoute'
+import { buildMenuTree } from '@/utils/route'
 
-const asyncRouteStore = useAsyncRouteStore()
+const menuTree = buildMenuTree(useRouter().getRoutes())
 </script>
+
 <template>
   <el-menu router>
-    <SubMenu :menu-list="asyncRouteStore.menus" />
+    <sub-menu :menu-tree="menuTree" />
   </el-menu>
 </template>
diff --git a/diboot-admin-ui/src/layout/memu/subMenu.vue b/diboot-admin-ui/src/layout/memu/subMenu.vue
index 412ec905..bfcea011 100644
--- a/diboot-admin-ui/src/layout/memu/subMenu.vue
+++ b/diboot-admin-ui/src/layout/memu/subMenu.vue
@@ -1,23 +1,17 @@
 <script setup lang="ts">
 import { RouteRecordRaw } from 'vue-router'
 
-defineProps<{ menuList: RouteRecordRaw[] }>()
-
-const router = useRouter()
-
-const goto = (name: string) => {
-  router.push({ name })
-}
+defineProps<{ menuTree: RouteRecordRaw[] }>()
 </script>
 
 <template>
-  <template v-for="(item, index) in menuList" :key="index">
-    <el-sub-menu v-if="item.children?.length > 0" :index="item.path">
+  <template v-for="(item, index) in menuTree" :key="index">
+    <el-sub-menu v-if="item.children?.length" :index="item.path">
       <template #title>
         图标：
         <span>{{ item.meta.title }}</span>
       </template>
-      <sub-menu :menu-list="item.children" />
+      <sub-menu :menu-tree="item.children" />
     </el-sub-menu>
     <el-menu-item v-else :index="item.path">
       图标：
@@ -25,5 +19,3 @@ const goto = (name: string) => {
     </el-menu-item>
   </template>
 </template>
-
-<style scoped></style>
diff --git a/diboot-admin-ui/src/router/index.ts b/diboot-admin-ui/src/router/index.ts
index 8100d520..000b529c 100644
--- a/diboot-admin-ui/src/router/index.ts
+++ b/diboot-admin-ui/src/router/index.ts
@@ -56,7 +56,7 @@ export const constantRoutes: RouteRecordRaw[] = [
     name: 'Home',
     redirect: '/dashboard',
     component: () => import('@/layout/index.vue'),
-    meta: { title: '首页' },
+    meta: { title: '首页', sort: -1 },
     children: [
       {
         path: 'dashboard',
@@ -80,5 +80,3 @@ const router = createRouter({
 createRouterGuard(router)
 
 export default router
-
-setTimeout(() => console.log(router.getRoutes()), 1000)
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
index f5d8b44b..2b72b883 100644
--- a/diboot-admin-ui/src/router/router-guards.ts
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -1,8 +1,8 @@
 import { isNavigationFailure, Router } from 'vue-router'
 import nProgress from 'nprogress'
 import useUserStore from '@/store/auth'
-import useRouteStore from '@/store/asyncRoute'
 import useTabsViewStore from '@/store/tabsView'
+import { buildAsyncRoutes } from '@/utils/route'
 import auth from '@/utils/auth'
 
 /**
@@ -20,13 +20,15 @@ export function createRouterGuard(router: Router) {
         next()
         return
       }
-      const routeStore = useRouteStore()
 
       try {
         await userStore.getInfo()
 
         // 加载异步路由
-        await routeStore.generateRoutes(router)
+        const res = await api.get<Array<any>>('/auth/menu')
+        if (res.data?.length) {
+          buildAsyncRoutes(res.data).forEach(e => router.addRoute(e))
+        }
 
         const redirectPath = ((to.name === '404' && to.query.path) || from.query.redirect || to.path) as string
         const redirect = decodeURIComponent(redirectPath)
@@ -44,15 +46,14 @@ export function createRouterGuard(router: Router) {
       next()
       return
     }
+
     // redirect login page
     const redirectData = {
       name: 'Login',
       replace: true,
       query: to.query
     }
-    if (to.path) {
-      redirectData.query.redirect = to.path
-    }
+    redirectData.query.redirect = to.path
     next(redirectData)
   })
 
diff --git a/diboot-admin-ui/src/router/typings.d.ts b/diboot-admin-ui/src/router/typings.d.ts
index 2b842535..c763e430 100644
--- a/diboot-admin-ui/src/router/typings.d.ts
+++ b/diboot-admin-ui/src/router/typings.d.ts
@@ -6,6 +6,7 @@ declare module 'vue-router' {
     icon?: string
     module?: string
     component?: string
+    sort?: number
     ignoreAuth?: boolean
     keepAlive?: boolean
     hidden?: boolean
diff --git a/diboot-admin-ui/src/store/asyncRoute.ts b/diboot-admin-ui/src/store/asyncRoute.ts
deleted file mode 100644
index 9c5b85ee..00000000
--- a/diboot-admin-ui/src/store/asyncRoute.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Router, RouteRecordRaw, RouterView } from 'vue-router'
-import Layout from '@/layout/index.vue'
-
-export interface IRouteState {
-  menus: RouteRecordRaw[]
-}
-
-export default defineStore({
-  id: 'async-route',
-  state: (): IRouteState => ({
-    menus: []
-  }),
-  actions: {
-    async generateRoutes(router: Router) {
-      // 加载异步路由
-      const res = await api.get<Array<any>>('/auth/menu')
-      if (res.data?.length) {
-        const asyncRoutes = filterAsyncRouter(res.data)
-        asyncRoutes.forEach(e => router.addRoute(e))
-        this.menus = filterAsyncMenu(asyncRoutes)
-      }
-    }
-  }
-})
-
-// 加载所有页面
-const pages = import.meta.globEager('@/views/**/*.vue')
-// 获取组件
-const resolveComponent = (name: any) => {
-  const importPage = pages[`../views/${name}.vue`]
-
-  if (!importPage) {
-    throw new Error(`Unknown page ${name}. Is it located under Pages with a .vue extension?`)
-  }
-
-  return importPage.default
-}
-
-/**
- * <h2>过滤异步路由</h2>
- * 加载component及自动丢弃无用路由
- * @param asyncRoutes
- * @param parentPath
- */
-function filterAsyncRouter(asyncRoutes: RouteRecordRaw[], parentPath?: string) {
-  return asyncRoutes.filter(route => {
-    const fullPath = buildFullPath(route.path, parentPath)
-    if (route.children?.length && (route.children = filterAsyncRouter(route.children, fullPath)).length) {
-      const component = route.meta?.component
-      if (component?.toLowerCase() === 'layout' || component?.toLowerCase() === 'layout/index') {
-        route.component = Layout
-      } else if (!component) {
-        route.component = RouterView
-      } else {
-        route.component = resolveComponent(component)
-      }
-      // 父级目录重定向首个子菜单
-      route.redirect = buildFullPath(route.children[0].path, fullPath)
-    } else {
-      delete route.children
-      if (route.meta?.component) {
-        route.component = resolveComponent(route.meta?.component)
-      } else return false
-    }
-    return true
-  })
-}
-
-/**
- * 构建全路径
- *
- * @param path
- * @param parentPath
- */
-const buildFullPath = (path: string, parentPath = '/') =>
-  /^\//.exec(path) ? path : `${parentPath === '/' ? '' : parentPath}/${path}`
-
-/**
- * 过滤菜单
- *
- * @param asyncRoutes
- * @param parent
- */
-function filterAsyncMenu(asyncRoutes: RouteRecordRaw[], parent?: RouteRecordRaw) {
-  const routes: RouteRecordRaw[] = []
-  for (const route of asyncRoutes) {
-    if (route.meta?.hidden) continue
-    if (parent) route.path = buildFullPath(route.path, parent.path)
-    if (!route.children) {
-      routes.push(route)
-    } else if (!route.meta?.title && route.children.length === 1) {
-      const child = route.children[0]
-      child.path = route.redirect as string
-      routes.push(child)
-    } else {
-      route.children = filterAsyncMenu(route.children, route)
-      route.children.length && routes.push(route)
-    }
-  }
-  return routes
-}
diff --git a/diboot-admin-ui/src/utils/route.ts b/diboot-admin-ui/src/utils/route.ts
new file mode 100644
index 00000000..6a8f3480
--- /dev/null
+++ b/diboot-admin-ui/src/utils/route.ts
@@ -0,0 +1,119 @@
+import { RouteRecord, RouteRecordName, RouteRecordRaw } from 'vue-router'
+import Layout from '@/layout/index.vue'
+
+const RouterView = defineComponent({
+  name: 'RouteView',
+  render: () => h('router-view')
+})
+
+/**
+ * 构建异步路由
+ *
+ * @param asyncRoutes
+ */
+export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
+  // 加载所有页面
+  const pages = import.meta.globEager('@/views/**/*.vue')
+  // 获取组件
+  const resolveComponent = (name: any) => {
+    const importPage = pages[`../views/${name}.vue`]
+
+    if (importPage) return importPage.default
+
+    throw new Error(`Unknown page ${name}. Is it located under Pages with a .vue extension?`)
+  }
+
+  /**
+   * 构建全路径
+   *
+   * @param path
+   * @param parentPath
+   */
+  const buildFullPath = (path: string, parentPath = '/') =>
+    /^\//.exec(path) ? path : `${parentPath === '/' ? '' : parentPath}/${path}`
+
+  /**
+   * 构建路由
+   *
+   * @param routes
+   * @param parentPath
+   */
+  function buildRouter(routes: RouteRecordRaw[], parentPath?: string) {
+    return routes.filter(route => {
+      const fullPath = buildFullPath(route.path, parentPath)
+      if (route.children?.length && (route.children = buildRouter(route.children, fullPath)).length) {
+        const component = route.meta?.component
+        if (component?.toLowerCase() === 'layout' || component?.toLowerCase() === 'layout/index') {
+          route.component = Layout
+        } else if (!component) {
+          route.component = RouterView
+        } else {
+          route.component = resolveComponent(component)
+        }
+        // 父级目录重定向首个子菜单
+        route.redirect = buildFullPath(route.children[0].path, fullPath)
+      } else {
+        delete route.children
+        if (route.meta?.component) {
+          route.component = resolveComponent(route.meta?.component)
+        } else return false
+      }
+      return true
+    })
+  }
+
+  return buildRouter(asyncRoutes)
+}
+
+/**
+ * 构建菜单Tree
+ *
+ * @param routes 路由列表
+ */
+export const buildMenuTree = (routes: RouteRecord[]) => {
+  const routeTree: RouteRecord[] = []
+
+  const findByNameAndCollect = (name: RouteRecordName | undefined, arr: RouteRecord[]) => {
+    if (!name) return
+    const index = routeTree.findIndex(e => e.name === name)
+    const find = index > -1 ? routeTree.splice(index, 1)[0] : routes.find(e => e.name === name)
+    // @ts-ignore
+    find && arr.push(find) && find.children?.length === 0 && delete find.children
+  }
+
+  for (const route of routes) {
+    const children = route.children
+    if (!route.meta.title && children.length === 1) {
+      findByNameAndCollect(children[0].name, routeTree)
+    } else if (children.length) {
+      const newChildren: RouteRecord[] = []
+      children.forEach(child => findByNameAndCollect(child.name, newChildren))
+      route.children = newChildren
+      routeTree.push(route)
+    }
+  }
+
+  // 菜单排序
+  const menuSort = (e1: RouteRecordRaw, e2: RouteRecordRaw) => (e1.meta?.sort || 0) - (e2.meta?.sort || 0)
+
+  // 过滤菜单（隐藏菜单、无 title 时减少层级）
+  function filterMenu(routeTree: RouteRecordRaw[]) {
+    const routes: RouteRecordRaw[] = []
+    for (const route of routeTree.sort(menuSort)) {
+      if (route.meta?.hidden) continue
+      if (!route.children) {
+        routes.push(route)
+      } else if (!route.meta?.title && route.children.length === 1) {
+        const child = route.children[0]
+        child.path = route.redirect as string
+        routes.push(child)
+      } else {
+        route.children = filterMenu(route.children)
+        route.children.length && routes.push(route)
+      }
+    }
+    return routes
+  }
+
+  return filterMenu(routeTree)
+}
-- 
Gitee


From 9aa753589f402622711c60bd37524def9f8c8356 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 23 Apr 2022 20:20:08 +0800
Subject: [PATCH 037/195] * perf buildMenuTree

---
 diboot-admin-ui/.eslintrc.js       | 1 -
 diboot-admin-ui/src/utils/route.ts | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index 8979339a..feed4427 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -19,7 +19,6 @@ module.exports = {
   },
   plugins: ['vue', '@typescript-eslint', 'prettier'],
   rules: {
-    '@typescript-eslint/ban-ts-comment': 0,
     '@typescript-eslint/no-explicit-any': 0,
     'comma-dangle': ['warn', 'only-multiline'],
     'vue/html-self-closing': ['warn', { html: { void: 'always' } }],
diff --git a/diboot-admin-ui/src/utils/route.ts b/diboot-admin-ui/src/utils/route.ts
index 6a8f3480..f91f2e09 100644
--- a/diboot-admin-ui/src/utils/route.ts
+++ b/diboot-admin-ui/src/utils/route.ts
@@ -77,8 +77,7 @@ export const buildMenuTree = (routes: RouteRecord[]) => {
     if (!name) return
     const index = routeTree.findIndex(e => e.name === name)
     const find = index > -1 ? routeTree.splice(index, 1)[0] : routes.find(e => e.name === name)
-    // @ts-ignore
-    find && arr.push(find) && find.children?.length === 0 && delete find.children
+    find && arr.push(find)
   }
 
   for (const route of routes) {
@@ -94,14 +93,14 @@ export const buildMenuTree = (routes: RouteRecord[]) => {
   }
 
   // 菜单排序
-  const menuSort = (e1: RouteRecordRaw, e2: RouteRecordRaw) => (e1.meta?.sort || 0) - (e2.meta?.sort || 0)
+  const menuSort = (e1: RouteRecordRaw, e2: RouteRecordRaw) => (e1.meta?.sort ?? 0) - (e2.meta?.sort ?? 0)
 
   // 过滤菜单（隐藏菜单、无 title 时减少层级）
   function filterMenu(routeTree: RouteRecordRaw[]) {
     const routes: RouteRecordRaw[] = []
     for (const route of routeTree.sort(menuSort)) {
       if (route.meta?.hidden) continue
-      if (!route.children) {
+      if (!route.children || route.children.length === 0) {
         routes.push(route)
       } else if (!route.meta?.title && route.children.length === 1) {
         const child = route.children[0]
-- 
Gitee


From b1367e55d676d3935f6a22599c3429e442c4b417 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 24 Apr 2022 00:50:13 +0800
Subject: [PATCH 038/195] + add vite-plugin-vue-setup-extend

---
 diboot-admin-ui/mock/auth/index.ts            |  4 +-
 diboot-admin-ui/package.json                  |  1 +
 diboot-admin-ui/pnpm-lock.yaml                | 19 ++++++--
 diboot-admin-ui/src/layout/memu/index.vue     |  6 +--
 diboot-admin-ui/src/router/router-guards.ts   |  2 +-
 diboot-admin-ui/src/router/typings.d.ts       |  2 +-
 diboot-admin-ui/src/utils/route.ts            | 48 +++++++++----------
 diboot-admin-ui/src/views/dashboard/index.vue |  2 +-
 diboot-admin-ui/src/views/exception/404.vue   |  2 +-
 diboot-admin-ui/src/views/exception/500.vue   |  2 +-
 diboot-admin-ui/src/views/login/index.vue     |  2 +-
 diboot-admin-ui/vite.config.ts                |  2 +
 12 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index 8e5e490b..7ff6c64f 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -76,12 +76,12 @@ const authMenu = [
   {
     path: '/demo',
     name: 'Demo',
-    meta: { title: 'Demo', component: 'layout' },
+    meta: { title: 'Demo', componentName: 'Layout' },
     children: [
       {
         path: 'hello',
         name: 'Hello',
-        meta: { title: '仪表盘', component: `dashboard/index` }
+        meta: { title: 'Hello', componentName: 'Dashboard' }
       }
     ]
   }
diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index ee2b35cc..098e3c38 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -39,6 +39,7 @@
     "vite": "^2.9.2",
     "vite-plugin-eslint": "^1.4.0",
     "vite-plugin-mock": "^2.9.6",
+    "vite-plugin-vue-setup-extend": "^0.4.0",
     "vue-tsc": "^0.29.8"
   }
 }
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 4105d491..09339b9e 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -27,6 +27,7 @@ specifiers:
   vite: ^2.9.2
   vite-plugin-eslint: ^1.4.0
   vite-plugin-mock: ^2.9.6
+  vite-plugin-vue-setup-extend: ^0.4.0
   vue: ^3.2.25
   vue-router: ^4.0.14
   vue-tsc: ^0.29.8
@@ -62,6 +63,7 @@ devDependencies:
   vite: registry.npmmirror.com/vite/2.9.5
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
   vite-plugin-mock: registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.5
+  vite-plugin-vue-setup-extend: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.9.5
   vue-tsc: registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3
 
 packages:
@@ -585,7 +587,6 @@ packages:
       magic-string: registry.npmmirror.com/magic-string/0.25.9
       postcss: registry.npmmirror.com/postcss/8.4.12
       source-map: registry.npmmirror.com/source-map/0.6.1
-    dev: false
 
   registry.npmmirror.com/@vue/compiler-ssr/3.2.33:
     resolution: {integrity: sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.33.tgz}
@@ -594,7 +595,6 @@ packages:
     dependencies:
       '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.33
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
-    dev: false
 
   registry.npmmirror.com/@vue/devtools-api/6.1.4:
     resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz}
@@ -627,7 +627,6 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
       estree-walker: registry.npmmirror.com/estree-walker/2.0.2
       magic-string: registry.npmmirror.com/magic-string/0.25.9
-    dev: false
 
   registry.npmmirror.com/@vue/reactivity/3.2.33:
     resolution: {integrity: sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.33.tgz}
@@ -2095,7 +2094,6 @@ packages:
     version: 0.25.9
     dependencies:
       sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
-    dev: false
 
   registry.npmmirror.com/magic-string/0.26.1:
     resolution: {integrity: sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/magic-string/-/magic-string-0.26.1.tgz}
@@ -2910,6 +2908,19 @@ packages:
       - supports-color
     dev: true
 
+  registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.9.5:
+    resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-vue-setup-extend/-/vite-plugin-vue-setup-extend-0.4.0.tgz}
+    id: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0
+    name: vite-plugin-vue-setup-extend
+    version: 0.4.0
+    peerDependencies:
+      vite: '>=2.0.0'
+    dependencies:
+      '@vue/compiler-sfc': registry.npmmirror.com/@vue/compiler-sfc/3.2.33
+      magic-string: registry.npmmirror.com/magic-string/0.25.9
+      vite: registry.npmmirror.com/vite/2.9.5
+    dev: true
+
   registry.npmmirror.com/vite/2.9.5:
     resolution: {integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-2.9.5.tgz}
     name: vite
diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index ab9c4190..dec6833b 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
 import SubMenu from './subMenu.vue'
-import { buildMenuTree } from '@/utils/route'
-
-const menuTree = buildMenuTree(useRouter().getRoutes())
+import { getMenuTree } from '@/utils/route'
 </script>
 
 <template>
   <el-menu router>
-    <sub-menu :menu-tree="menuTree" />
+    <sub-menu :menu-tree="getMenuTree()" />
   </el-menu>
 </template>
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
index 2b72b883..419fdc5c 100644
--- a/diboot-admin-ui/src/router/router-guards.ts
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -37,7 +37,7 @@ export function createRouterGuard(router: Router) {
         return
       } catch (e) {
         // 获取数据异常
-        console.log('加载授权路由失败', e)
+        console.log('动态加载授权路由失败', e)
       }
     }
 
diff --git a/diboot-admin-ui/src/router/typings.d.ts b/diboot-admin-ui/src/router/typings.d.ts
index c763e430..2d6266f1 100644
--- a/diboot-admin-ui/src/router/typings.d.ts
+++ b/diboot-admin-ui/src/router/typings.d.ts
@@ -5,7 +5,7 @@ declare module 'vue-router' {
     title?: string
     icon?: string
     module?: string
-    component?: string
+    componentName?: string
     sort?: number
     ignoreAuth?: boolean
     keepAlive?: boolean
diff --git a/diboot-admin-ui/src/utils/route.ts b/diboot-admin-ui/src/utils/route.ts
index f91f2e09..99f38473 100644
--- a/diboot-admin-ui/src/utils/route.ts
+++ b/diboot-admin-ui/src/utils/route.ts
@@ -13,22 +13,23 @@ const RouterView = defineComponent({
  */
 export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
   // 加载所有页面
-  const pages = import.meta.globEager('@/views/**/*.vue')
+  const viewComponents = Object.values(import.meta.globEager('@/views/**/*.{vue,tsx}'))
+    .map(e => e.default)
+    .filter(e => e.name)
+    .reduce(
+      (components, view) => {
+        components[view.name ?? '_'] = view
+        return components
+      },
+      { Layout }
+    )
   // 获取组件
   const resolveComponent = (name: any) => {
-    const importPage = pages[`../views/${name}.vue`]
-
-    if (importPage) return importPage.default
-
-    throw new Error(`Unknown page ${name}. Is it located under Pages with a .vue extension?`)
+    if (viewComponents[name]) return viewComponents[name]
+    throw new Error(`Unknown component '${name}'. Is it located under 'views' with extension?`)
   }
 
-  /**
-   * 构建全路径
-   *
-   * @param path
-   * @param parentPath
-   */
+  // 构建完整路径
   const buildFullPath = (path: string, parentPath = '/') =>
     /^\//.exec(path) ? path : `${parentPath === '/' ? '' : parentPath}/${path}`
 
@@ -42,20 +43,18 @@ export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
     return routes.filter(route => {
       const fullPath = buildFullPath(route.path, parentPath)
       if (route.children?.length && (route.children = buildRouter(route.children, fullPath)).length) {
-        const component = route.meta?.component
-        if (component?.toLowerCase() === 'layout' || component?.toLowerCase() === 'layout/index') {
-          route.component = Layout
-        } else if (!component) {
-          route.component = RouterView
+        const componentName = route.meta?.componentName
+        if (componentName) {
+          route.component = resolveComponent(componentName)
         } else {
-          route.component = resolveComponent(component)
+          route.component = RouterView
         }
         // 父级目录重定向首个子菜单
         route.redirect = buildFullPath(route.children[0].path, fullPath)
       } else {
         delete route.children
-        if (route.meta?.component) {
-          route.component = resolveComponent(route.meta?.component)
+        if (route.meta?.componentName) {
+          route.component = resolveComponent(route.meta?.componentName)
         } else return false
       }
       return true
@@ -66,11 +65,10 @@ export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
 }
 
 /**
- * 构建菜单Tree
- *
- * @param routes 路由列表
+ * 获取菜单Tree
  */
-export const buildMenuTree = (routes: RouteRecord[]) => {
+export const getMenuTree = () => {
+  const routes = useRouter().getRoutes()
   const routeTree: RouteRecord[] = []
 
   const findByNameAndCollect = (name: RouteRecordName | undefined, arr: RouteRecord[]) => {
@@ -89,6 +87,8 @@ export const buildMenuTree = (routes: RouteRecord[]) => {
       children.forEach(child => findByNameAndCollect(child.name, newChildren))
       route.children = newChildren
       routeTree.push(route)
+    } else {
+      routeTree.push(route)
     }
   }
 
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
index ff06a7a4..a105f34b 100644
--- a/diboot-admin-ui/src/views/dashboard/index.vue
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts" name="Dashboard">
 console.log('Dashboard')
 </script>
 
diff --git a/diboot-admin-ui/src/views/exception/404.vue b/diboot-admin-ui/src/views/exception/404.vue
index 272144b9..5d0fd8f6 100644
--- a/diboot-admin-ui/src/views/exception/404.vue
+++ b/diboot-admin-ui/src/views/exception/404.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts" name="404">
 const router = useRouter()
 // 返回首页
 const goHome = () => {
diff --git a/diboot-admin-ui/src/views/exception/500.vue b/diboot-admin-ui/src/views/exception/500.vue
index f71d867d..e0b8651b 100644
--- a/diboot-admin-ui/src/views/exception/500.vue
+++ b/diboot-admin-ui/src/views/exception/500.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts" name="500">
 console.log('500')
 </script>
 
diff --git a/diboot-admin-ui/src/views/login/index.vue b/diboot-admin-ui/src/views/login/index.vue
index cca765b8..a54f2cc1 100644
--- a/diboot-admin-ui/src/views/login/index.vue
+++ b/diboot-admin-ui/src/views/login/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts" name="Login">
 import { FormInstance } from 'element-plus'
 import useAuthStore from '@/store/auth'
 
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 987976c0..8425e30d 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -1,5 +1,6 @@
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
+import VueSetupExtend from 'vite-plugin-vue-setup-extend'
 import eslintPlugin from 'vite-plugin-eslint/dist'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
@@ -12,6 +13,7 @@ export default defineConfig(({ command }) => {
   return {
     plugins: [
       vue(),
+      VueSetupExtend(),
       // eslint 自动修复
       eslintPlugin({ fix: true }),
       AutoImport({
-- 
Gitee


From e67b0c5f0604d4e01f9e2291c6e1bc832de1d967 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 24 Apr 2022 09:01:43 +0800
Subject: [PATCH 039/195] + viewComponents add suffix .jsx

---
 diboot-admin-ui/src/utils/route.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-admin-ui/src/utils/route.ts b/diboot-admin-ui/src/utils/route.ts
index 99f38473..0b720576 100644
--- a/diboot-admin-ui/src/utils/route.ts
+++ b/diboot-admin-ui/src/utils/route.ts
@@ -13,12 +13,12 @@ const RouterView = defineComponent({
  */
 export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
   // 加载所有页面
-  const viewComponents = Object.values(import.meta.globEager('@/views/**/*.{vue,tsx}'))
+  const viewComponents = Object.values(import.meta.globEager('@/views/**/*.{vue,tsx,jsx}'))
     .map(e => e.default)
     .filter(e => e.name)
     .reduce(
       (components, view) => {
-        components[view.name ?? '_'] = view
+        components[view.name || '_'] = view
         return components
       },
       { Layout }
-- 
Gitee


From 1ae85e936662eadd70c30487b040c9f6c0aba21a Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 24 Apr 2022 10:55:35 +0800
Subject: [PATCH 040/195] * rename useAuthStore

---
 diboot-admin-ui/src/layout/header/index.vue | 4 ++--
 diboot-admin-ui/src/router/router-guards.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 6e616b57..a34a8a1c 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import useAuthauthStore from '@/store/auth'
+import useAuthStore from '@/store/auth'
 import { useRouter } from 'vue-router'
-const authStore = useAuthauthStore()
+const authStore = useAuthStore()
 const router = useRouter()
 const logout = async () => {
   await authStore.logout()
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
index 419fdc5c..264e0956 100644
--- a/diboot-admin-ui/src/router/router-guards.ts
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -1,6 +1,6 @@
 import { isNavigationFailure, Router } from 'vue-router'
 import nProgress from 'nprogress'
-import useUserStore from '@/store/auth'
+import useAuthStore from '@/store/auth'
 import useTabsViewStore from '@/store/tabsView'
 import { buildAsyncRoutes } from '@/utils/route'
 import auth from '@/utils/auth'
@@ -14,7 +14,7 @@ export function createRouterGuard(router: Router) {
     nProgress.start()
     // 未登录
     if (auth.getToken()) {
-      const userStore = useUserStore()
+      const userStore = useAuthStore()
       // 已加载完基本数据
       if (userStore.info) {
         next()
-- 
Gitee


From 141224aecd6d05031afcc650281d50417e1fd2f1 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sun, 24 Apr 2022 14:43:05 +0800
Subject: [PATCH 041/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PermissionCode.java => ApiPermission.java} |  4 +--
 ...actor.java => ApiPermissionExtractor.java} | 34 +++++++++----------
 ...Wrapper.java => ApiPermissionWrapper.java} | 10 +++---
 .../process/BindPermissionAspect.java         |  2 +-
 .../com/diboot/iam/cache/IamCacheManager.java | 12 +++----
 5 files changed, 31 insertions(+), 31 deletions(-)
 rename diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/{PermissionCode.java => ApiPermission.java} (95%)
 rename diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/{PermissionCodeExtractor.java => ApiPermissionExtractor.java} (81%)
 rename diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/{PermissionCodeWrapper.java => ApiPermissionWrapper.java} (82%)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCode.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermission.java
similarity index 95%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCode.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermission.java
index 4eb7a870..f5d310fa 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCode.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermission.java
@@ -35,10 +35,10 @@ import java.util.List;
  * Copyright © diboot.com
 */
 @Getter @Setter @Accessors(chain = true)
-public class PermissionCode implements Serializable {
+public class ApiPermission implements Serializable {
     private static final long serialVersionUID = -17224355139977969L;
 
-    public PermissionCode(String code){
+    public ApiPermission(String code){
         this.code = code;
     }
     /**
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeExtractor.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
similarity index 81%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeExtractor.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
index 39e2ea2f..57487bf7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeExtractor.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
@@ -37,12 +37,12 @@ import java.util.*;
  * Copyright © diboot.com
  */
 @Slf4j
-public class PermissionCodeExtractor {
+public class ApiPermissionExtractor {
 
     /**
      * 接口权限缓存
      */
-    private static List<PermissionCodeWrapper> API_PERMISSION_CACHE = null;
+    private static List<ApiPermissionWrapper> API_PERMISSION_CACHE = null;
     /**
      * 唯一KEY
      */
@@ -52,7 +52,7 @@ public class PermissionCodeExtractor {
      * 提取所有的权限定义
      * @return
      */
-    public static List<PermissionCodeWrapper> extractAllApiPermissions(){
+    public static List<ApiPermissionWrapper> extractAllApiPermissions(){
         if(API_PERMISSION_CACHE == null){
             API_PERMISSION_CACHE = new ArrayList<>();
             UNIQUE_KEY_SET = new HashSet<>();
@@ -81,7 +81,7 @@ public class PermissionCodeExtractor {
                continue;
             }
             UNIQUE_KEY_SET.add(controllerClass.getName());
-            PermissionCodeWrapper wrapper = IamCacheManager.getPermissionCodeWrapper(controllerClass);
+            ApiPermissionWrapper wrapper = IamCacheManager.getPermissionCodeWrapper(controllerClass);
             buildApiPermissionsInClass(wrapper, controllerClass);
             if(wrapper.notEmpty()){
                 API_PERMISSION_CACHE.add(wrapper);
@@ -94,7 +94,7 @@ public class PermissionCodeExtractor {
      * @param wrapper
      * @param controllerClass
      */
-    private static void buildApiPermissionsInClass(PermissionCodeWrapper wrapper, Class controllerClass) {
+    private static void buildApiPermissionsInClass(ApiPermissionWrapper wrapper, Class controllerClass) {
         List<Method> annoMethods = AnnotationUtils.extractAnnotationMethods(controllerClass, BindPermission.class);
         if(V.isEmpty(annoMethods)){
             return;
@@ -104,8 +104,8 @@ public class PermissionCodeExtractor {
         if(requestMapping != null){
             urlPrefix = AnnotationUtils.getNotEmptyStr(requestMapping.value(), requestMapping.path());
         }
-        List<PermissionCode> apiPermissions = new ArrayList<>();
-        Map<String, PermissionCode> tempCode2ObjMap = new HashMap<>();
+        List<ApiPermission> apiPermissions = new ArrayList<>();
+        Map<String, ApiPermission> tempCode2ObjMap = new HashMap<>();
         for(Method method : annoMethods){
             // 忽略私有方法
             if(Modifier.isPrivate(method.getModifiers())){
@@ -128,32 +128,32 @@ public class PermissionCodeExtractor {
                 }
                 String name = bindPermission.name();
                 String code = (wrapper.getCode() != null)? wrapper.getCode()+":"+bindPermission.code() : bindPermission.code();
-                PermissionCode permissionCode = tempCode2ObjMap.get(code);
-                if(permissionCode == null){
-                    permissionCode = new PermissionCode(code);
-                    tempCode2ObjMap.put(code, permissionCode);
-                    apiPermissions.add(permissionCode);
+                ApiPermission apiPermission = tempCode2ObjMap.get(code);
+                if(apiPermission == null){
+                    apiPermission = new ApiPermission(code);
+                    tempCode2ObjMap.put(code, apiPermission);
+                    apiPermissions.add(apiPermission);
                 }
                 apiUriCombo.setLabel(name);
                 // 提取请求url-permission code的关系
-                buildApiPermission(permissionCode, urlPrefix, apiUriCombo);
+                buildApiPermission(apiPermission, urlPrefix, apiUriCombo);
             }
         }
         // 添加至wrapper
         if(apiPermissions.size() > 0){
-            wrapper.setPermissionCodeList(apiPermissions);
+            wrapper.setApiPermissionList(apiPermissions);
         }
     }
 
     /**
      * 构建ApiPermission
-     * @param permissionCode
+     * @param apiPermission
      * @param urlPrefix
      * @param apiUriCombo
      */
-    private static void buildApiPermission(PermissionCode permissionCode, String urlPrefix, ApiUri apiUriCombo){
+    private static void buildApiPermission(ApiPermission apiPermission, String urlPrefix, ApiUri apiUriCombo){
         String requestMethod = apiUriCombo.getMethod(), url = apiUriCombo.getUri();
-        List<ApiUri> apiUriList = permissionCode.getApiUriList();
+        List<ApiUri> apiUriList = apiPermission.getApiUriList();
         for(String m : requestMethod.split(Cons.SEPARATOR_COMMA)){
             for(String u : url.split(Cons.SEPARATOR_COMMA)){
                 String uri = u;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeWrapper.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionWrapper.java
similarity index 82%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeWrapper.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionWrapper.java
index f159233b..bc692392 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/PermissionCodeWrapper.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionWrapper.java
@@ -31,12 +31,12 @@ import java.util.List;
  * Copyright © diboot.com
  */
 @Getter @Setter
-public class PermissionCodeWrapper implements Serializable {
+public class ApiPermissionWrapper implements Serializable {
     private static final long serialVersionUID = 7795636645748631729L;
 
-    public PermissionCodeWrapper(){}
+    public ApiPermissionWrapper(){}
 
-    public PermissionCodeWrapper(String name, String code){
+    public ApiPermissionWrapper(String name, String code){
         this.name = name;
         this.code = code;
     }
@@ -54,10 +54,10 @@ public class PermissionCodeWrapper implements Serializable {
     /**
      * 子节点权限码集合
      */
-    private List<PermissionCode> permissionCodeList;
+    private List<ApiPermission> apiPermissionList;
 
     @JsonIgnore
     public boolean notEmpty(){
-        return V.notEmpty(code) && V.notEmpty(permissionCodeList);
+        return V.notEmpty(code) && V.notEmpty(apiPermissionList);
     }
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
index 5711aaba..5dfc7cf8 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
@@ -74,7 +74,7 @@ public class BindPermissionAspect {
         BindPermission methodAnno = AnnotationUtils.getAnnotation(method, BindPermission.class);
         String permissionCode = methodAnno.code();
         Class<?> controllerClass = joinPoint.getTarget().getClass();
-        PermissionCodeWrapper classAnno = IamCacheManager.getPermissionCodeWrapper(controllerClass);
+        ApiPermissionWrapper classAnno = IamCacheManager.getPermissionCodeWrapper(controllerClass);
         if(classAnno != null && V.notEmpty(classAnno.getCode())){
             permissionCode = classAnno.getCode() + ":" + permissionCode;
         }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java b/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
index b8e048ea..bf26e71f 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
@@ -40,22 +40,22 @@ public class IamCacheManager {
     /**
      * controller-权限码 缓存
      */
-    private static Map<String, PermissionCodeWrapper> CLASS_PERMISSIONCODE_CACHE = new ConcurrentHashMap<>();
+    private static Map<String, ApiPermissionWrapper> CLASS_PERMISSIONCODE_CACHE = new ConcurrentHashMap<>();
 
     /**
      * 返回全部接口权限码ApiPermission
      * @return
      */
-    public static List<PermissionCodeWrapper> getApiPermissionVoList(){
-        return PermissionCodeExtractor.extractAllApiPermissions();
+    public static List<ApiPermissionWrapper> getApiPermissionVoList(){
+        return ApiPermissionExtractor.extractAllApiPermissions();
     }
 
     /**
      * 缓存全部permissions
      */
-    public static PermissionCodeWrapper getPermissionCodeWrapper(Class<?> controllerClass){
+    public static ApiPermissionWrapper getPermissionCodeWrapper(Class<?> controllerClass){
         // 优先从缓存中读取
-        PermissionCodeWrapper wrapper = CLASS_PERMISSIONCODE_CACHE.get(controllerClass.getName());
+        ApiPermissionWrapper wrapper = CLASS_PERMISSIONCODE_CACHE.get(controllerClass.getName());
         if(wrapper != null){
             return wrapper;
         }
@@ -82,7 +82,7 @@ public class IamCacheManager {
         else{
             name = S.substringBeforeLast(controllerClass.getSimpleName(), "Controller");
         }
-        wrapper = new PermissionCodeWrapper(name, codePrefix);
+        wrapper = new ApiPermissionWrapper(name, codePrefix);
         CLASS_PERMISSIONCODE_CACHE.put(controllerClass.getName(), wrapper);
         return wrapper;
     }
-- 
Gitee


From 1627abb824871d3b048a53f4b6a98c22f3902ca3 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 24 Apr 2022 23:40:08 +0800
Subject: [PATCH 042/195] + add sass

---
 diboot-admin-ui/package.json   |    3 +
 diboot-admin-ui/pnpm-lock.yaml | 1790 +++++++++++++++++++++++++++++++-
 2 files changed, 1786 insertions(+), 7 deletions(-)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 098e3c38..ccce4282 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -32,7 +32,10 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^8.6.0",
+    "node-sass": "^7.0.1",
     "prettier": "2.6.2",
+    "sass": "^1.50.1",
+    "sass-loader": "^12.6.0",
     "typescript": "^4.5.4",
     "unplugin-auto-import": "^0.7.1",
     "unplugin-vue-components": "^0.19.3",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 09339b9e..df0eb798 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -17,10 +17,13 @@ specifiers:
   eslint-plugin-vue: ^8.6.0
   lodash: ^4.17.21
   mockjs: ^1.1.0
+  node-sass: ^7.0.1
   nprogress: ^0.2.0
   pinia: ^2.0.13
   prettier: 2.6.2
   qs: ^6.10.3
+  sass: ^1.50.1
+  sass-loader: ^12.6.0
   typescript: ^4.5.4
   unplugin-auto-import: ^0.7.1
   unplugin-vue-components: ^0.19.3
@@ -56,11 +59,14 @@ devDependencies:
   eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0
   eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_1815ac95b7fb26c13c7d48a8eef62d0f
   eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0
+  node-sass: registry.npmmirror.com/node-sass/7.0.1
   prettier: registry.npmmirror.com/prettier/2.6.2
+  sass: registry.npmmirror.com/sass/1.50.1
+  sass-loader: registry.npmmirror.com/sass-loader/12.6.0_node-sass@7.0.1+sass@1.50.1
   typescript: registry.npmmirror.com/typescript/4.6.3
   unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_vite@2.9.5
   unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33
-  vite: registry.npmmirror.com/vite/2.9.5
+  vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
   vite-plugin-mock: registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.5
   vite-plugin-vue-setup-extend: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.9.5
@@ -74,6 +80,15 @@ packages:
     version: 0.5.1
     dev: true
 
+  registry.npmmirror.com/@babel/code-frame/7.16.7:
+    resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.16.7.tgz}
+    name: '@babel/code-frame'
+    version: 7.16.7
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': registry.npmmirror.com/@babel/highlight/7.17.9
+    dev: true
+
   registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7:
     resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz}
     name: '@babel/helper-validator-identifier'
@@ -81,6 +96,17 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
+  registry.npmmirror.com/@babel/highlight/7.17.9:
+    resolution: {integrity: sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/highlight/-/highlight-7.17.9.tgz}
+    name: '@babel/highlight'
+    version: 7.17.9
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7
+      chalk: registry.npmmirror.com/chalk/2.4.2
+      js-tokens: registry.npmmirror.com/js-tokens/4.0.0
+    dev: true
+
   registry.npmmirror.com/@babel/parser/7.17.9:
     resolution: {integrity: sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/parser/-/parser-7.17.9.tgz}
     name: '@babel/parser'
@@ -171,6 +197,12 @@ packages:
       '@floating-ui/core': registry.npmmirror.com/@floating-ui/core/0.6.2
     dev: false
 
+  registry.npmmirror.com/@gar/promisify/1.1.3:
+    resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz}
+    name: '@gar/promisify'
+    version: 1.1.3
+    dev: true
+
   registry.npmmirror.com/@humanwhocodes/config-array/0.9.5:
     resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz}
     name: '@humanwhocodes/config-array'
@@ -217,6 +249,25 @@ packages:
       fastq: registry.npmmirror.com/fastq/1.13.0
     dev: true
 
+  registry.npmmirror.com/@npmcli/fs/1.1.1:
+    resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@npmcli/fs/-/fs-1.1.1.tgz}
+    name: '@npmcli/fs'
+    version: 1.1.1
+    dependencies:
+      '@gar/promisify': registry.npmmirror.com/@gar/promisify/1.1.3
+      semver: registry.npmmirror.com/semver/7.3.7
+    dev: true
+
+  registry.npmmirror.com/@npmcli/move-file/1.1.2:
+    resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz}
+    name: '@npmcli/move-file'
+    version: 1.1.2
+    engines: {node: '>=10'}
+    dependencies:
+      mkdirp: registry.npmmirror.com/mkdirp/1.0.4
+      rimraf: registry.npmmirror.com/rimraf/3.0.2
+    dev: true
+
   registry.npmmirror.com/@popperjs/core/2.11.5:
     resolution: {integrity: sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@popperjs/core/-/core-2.11.5.tgz}
     name: '@popperjs/core'
@@ -262,6 +313,13 @@ packages:
       picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
+  registry.npmmirror.com/@tootallnate/once/1.1.2:
+    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@tootallnate/once/-/once-1.1.2.tgz}
+    name: '@tootallnate/once'
+    version: 1.1.2
+    engines: {node: '>= 6'}
+    dev: true
+
   registry.npmmirror.com/@types/estree/0.0.39:
     resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/estree/-/estree-0.0.39.tgz}
     name: '@types/estree'
@@ -287,6 +345,12 @@ packages:
     name: '@types/lodash'
     version: 4.14.182
 
+  registry.npmmirror.com/@types/minimist/1.2.2:
+    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz}
+    name: '@types/minimist'
+    version: 1.2.2
+    dev: true
+
   registry.npmmirror.com/@types/mockjs/1.0.6:
     resolution: {integrity: sha512-Yu5YlqbYZyqsd6LjO4e8ONJDN9pTSnciHDcRP4teNOh/au2b8helFhgRx+3w8xsTFEnwr9jtfTVJbAx+eYmlHA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/mockjs/-/mockjs-1.0.6.tgz}
     name: '@types/mockjs'
@@ -299,6 +363,12 @@ packages:
     version: 17.0.25
     dev: true
 
+  registry.npmmirror.com/@types/normalize-package-data/2.4.1:
+    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz}
+    name: '@types/normalize-package-data'
+    version: 2.4.1
+    dev: true
+
   registry.npmmirror.com/@types/nprogress/0.2.0:
     resolution: {integrity: sha512-1cYJrqq9GezNFPsWTZpFut/d4CjpZqA0vhqDUPFWYKF1oIyBz5qnoYMzR+0C/T96t3ebLAC1SSnwrVOm5/j74A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.0.tgz}
     name: '@types/nprogress'
@@ -476,7 +546,7 @@ packages:
       vite: ^2.5.10
       vue: ^3.2.25
     dependencies:
-      vite: registry.npmmirror.com/vite/2.9.5
+      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
       vue: registry.npmmirror.com/vue/3.2.33
     dev: true
 
@@ -716,6 +786,12 @@ packages:
       vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
     dev: false
 
+  registry.npmmirror.com/abbrev/1.1.1:
+    resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/abbrev/-/abbrev-1.1.1.tgz}
+    name: abbrev
+    version: 1.1.1
+    dev: true
+
   registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz}
     id: registry.npmmirror.com/acorn-jsx/5.3.2
@@ -743,6 +819,40 @@ packages:
     hasBin: true
     dev: true
 
+  registry.npmmirror.com/agent-base/6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz}
+    name: agent-base
+    version: 6.0.2
+    engines: {node: '>= 6.0.0'}
+    dependencies:
+      debug: registry.npmmirror.com/debug/4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/agentkeepalive/4.2.1:
+    resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz}
+    name: agentkeepalive
+    version: 4.2.1
+    engines: {node: '>= 8.0.0'}
+    dependencies:
+      debug: registry.npmmirror.com/debug/4.3.4
+      depd: registry.npmmirror.com/depd/1.1.2
+      humanize-ms: registry.npmmirror.com/humanize-ms/1.2.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/aggregate-error/3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz}
+    name: aggregate-error
+    version: 3.1.0
+    engines: {node: '>=8'}
+    dependencies:
+      clean-stack: registry.npmmirror.com/clean-stack/2.2.0
+      indent-string: registry.npmmirror.com/indent-string/4.0.0
+    dev: true
+
   registry.npmmirror.com/ajv/6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz}
     name: ajv
@@ -761,6 +871,15 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  registry.npmmirror.com/ansi-styles/3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz}
+    name: ansi-styles
+    version: 3.2.1
+    engines: {node: '>=4'}
+    dependencies:
+      color-convert: registry.npmmirror.com/color-convert/1.9.3
+    dev: true
+
   registry.npmmirror.com/ansi-styles/4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz}
     name: ansi-styles
@@ -780,6 +899,32 @@ packages:
       picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
+  registry.npmmirror.com/aproba/2.0.0:
+    resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aproba/-/aproba-2.0.0.tgz}
+    name: aproba
+    version: 2.0.0
+    dev: true
+
+  registry.npmmirror.com/are-we-there-yet/2.0.0:
+    resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz}
+    name: are-we-there-yet
+    version: 2.0.0
+    engines: {node: '>=10'}
+    dependencies:
+      delegates: registry.npmmirror.com/delegates/1.0.0
+      readable-stream: registry.npmmirror.com/readable-stream/3.6.0
+    dev: true
+
+  registry.npmmirror.com/are-we-there-yet/3.0.0:
+    resolution: {integrity: sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz}
+    name: are-we-there-yet
+    version: 3.0.0
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16}
+    dependencies:
+      delegates: registry.npmmirror.com/delegates/1.0.0
+      readable-stream: registry.npmmirror.com/readable-stream/3.6.0
+    dev: true
+
   registry.npmmirror.com/argparse/2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz}
     name: argparse
@@ -793,24 +938,70 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  registry.npmmirror.com/arrify/1.0.1:
+    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/arrify/-/arrify-1.0.1.tgz}
+    name: arrify
+    version: 1.0.1
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   registry.npmmirror.com/asap/2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asap/-/asap-2.0.6.tgz}
     name: asap
     version: 2.0.6
     dev: true
 
+  registry.npmmirror.com/asn1/0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asn1/-/asn1-0.2.6.tgz}
+    name: asn1
+    version: 0.2.6
+    dependencies:
+      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
+    dev: true
+
   registry.npmmirror.com/assert-never/1.2.1:
     resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/assert-never/-/assert-never-1.2.1.tgz}
     name: assert-never
     version: 1.2.1
     dev: true
 
+  registry.npmmirror.com/assert-plus/1.0.0:
+    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz}
+    name: assert-plus
+    version: 1.0.0
+    engines: {node: '>=0.8'}
+    dev: true
+
+  registry.npmmirror.com/async-foreach/0.1.3:
+    resolution: {integrity: sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz}
+    name: async-foreach
+    version: 0.1.3
+    dev: true
+
   registry.npmmirror.com/async-validator/4.0.7:
     resolution: {integrity: sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-validator/-/async-validator-4.0.7.tgz}
     name: async-validator
     version: 4.0.7
     dev: false
 
+  registry.npmmirror.com/asynckit/0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz}
+    name: asynckit
+    version: 0.4.0
+    dev: true
+
+  registry.npmmirror.com/aws-sign2/0.7.0:
+    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aws-sign2/-/aws-sign2-0.7.0.tgz}
+    name: aws-sign2
+    version: 0.7.0
+    dev: true
+
+  registry.npmmirror.com/aws4/1.11.0:
+    resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aws4/-/aws4-1.11.0.tgz}
+    name: aws4
+    version: 1.11.0
+    dev: true
+
   registry.npmmirror.com/axios/0.26.1:
     resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/axios/-/axios-0.26.1.tgz}
     name: axios
@@ -836,6 +1027,14 @@ packages:
     version: 1.0.2
     dev: true
 
+  registry.npmmirror.com/bcrypt-pbkdf/1.0.2:
+    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz}
+    name: bcrypt-pbkdf
+    version: 1.0.2
+    dependencies:
+      tweetnacl: registry.npmmirror.com/tweetnacl/0.14.5
+    dev: true
+
   registry.npmmirror.com/binary-extensions/2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz}
     name: binary-extensions
@@ -876,6 +1075,32 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  registry.npmmirror.com/cacache/15.3.0:
+    resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cacache/-/cacache-15.3.0.tgz}
+    name: cacache
+    version: 15.3.0
+    engines: {node: '>= 10'}
+    dependencies:
+      '@npmcli/fs': registry.npmmirror.com/@npmcli/fs/1.1.1
+      '@npmcli/move-file': registry.npmmirror.com/@npmcli/move-file/1.1.2
+      chownr: registry.npmmirror.com/chownr/2.0.0
+      fs-minipass: registry.npmmirror.com/fs-minipass/2.1.0
+      glob: registry.npmmirror.com/glob/7.2.0
+      infer-owner: registry.npmmirror.com/infer-owner/1.0.4
+      lru-cache: registry.npmmirror.com/lru-cache/6.0.0
+      minipass: registry.npmmirror.com/minipass/3.1.6
+      minipass-collect: registry.npmmirror.com/minipass-collect/1.0.2
+      minipass-flush: registry.npmmirror.com/minipass-flush/1.0.5
+      minipass-pipeline: registry.npmmirror.com/minipass-pipeline/1.2.4
+      mkdirp: registry.npmmirror.com/mkdirp/1.0.4
+      p-map: registry.npmmirror.com/p-map/4.0.0
+      promise-inflight: registry.npmmirror.com/promise-inflight/1.0.1
+      rimraf: registry.npmmirror.com/rimraf/3.0.2
+      ssri: registry.npmmirror.com/ssri/8.0.1
+      tar: registry.npmmirror.com/tar/6.1.11
+      unique-filename: registry.npmmirror.com/unique-filename/1.1.1
+    dev: true
+
   registry.npmmirror.com/call-bind/1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz}
     name: call-bind
@@ -891,6 +1116,41 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  registry.npmmirror.com/camelcase-keys/6.2.2:
+    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz}
+    name: camelcase-keys
+    version: 6.2.2
+    engines: {node: '>=8'}
+    dependencies:
+      camelcase: registry.npmmirror.com/camelcase/5.3.1
+      map-obj: registry.npmmirror.com/map-obj/4.3.0
+      quick-lru: registry.npmmirror.com/quick-lru/4.0.1
+    dev: true
+
+  registry.npmmirror.com/camelcase/5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz}
+    name: camelcase
+    version: 5.3.1
+    engines: {node: '>=6'}
+    dev: true
+
+  registry.npmmirror.com/caseless/0.12.0:
+    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz}
+    name: caseless
+    version: 0.12.0
+    dev: true
+
+  registry.npmmirror.com/chalk/2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz}
+    name: chalk
+    version: 2.4.2
+    engines: {node: '>=4'}
+    dependencies:
+      ansi-styles: registry.npmmirror.com/ansi-styles/3.2.1
+      escape-string-regexp: registry.npmmirror.com/escape-string-regexp/1.0.5
+      supports-color: registry.npmmirror.com/supports-color/5.5.0
+    dev: true
+
   registry.npmmirror.com/chalk/4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz}
     name: chalk
@@ -926,6 +1186,38 @@ packages:
       fsevents: registry.npmmirror.com/fsevents/2.3.2
     dev: true
 
+  registry.npmmirror.com/chownr/2.0.0:
+    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz}
+    name: chownr
+    version: 2.0.0
+    engines: {node: '>=10'}
+    dev: true
+
+  registry.npmmirror.com/clean-stack/2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/clean-stack/-/clean-stack-2.2.0.tgz}
+    name: clean-stack
+    version: 2.2.0
+    engines: {node: '>=6'}
+    dev: true
+
+  registry.npmmirror.com/cliui/7.0.4:
+    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz}
+    name: cliui
+    version: 7.0.4
+    dependencies:
+      string-width: registry.npmmirror.com/string-width/4.2.3
+      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
+      wrap-ansi: registry.npmmirror.com/wrap-ansi/7.0.0
+    dev: true
+
+  registry.npmmirror.com/color-convert/1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz}
+    name: color-convert
+    version: 1.9.3
+    dependencies:
+      color-name: registry.npmmirror.com/color-name/1.1.3
+    dev: true
+
   registry.npmmirror.com/color-convert/2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz}
     name: color-convert
@@ -935,12 +1227,34 @@ packages:
       color-name: registry.npmmirror.com/color-name/1.1.4
     dev: true
 
+  registry.npmmirror.com/color-name/1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz}
+    name: color-name
+    version: 1.1.3
+    dev: true
+
   registry.npmmirror.com/color-name/1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz}
     name: color-name
     version: 1.1.4
     dev: true
 
+  registry.npmmirror.com/color-support/1.1.3:
+    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-support/-/color-support-1.1.3.tgz}
+    name: color-support
+    version: 1.1.3
+    hasBin: true
+    dev: true
+
+  registry.npmmirror.com/combined-stream/1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz}
+    name: combined-stream
+    version: 1.0.8
+    engines: {node: '>= 0.8'}
+    dependencies:
+      delayed-stream: registry.npmmirror.com/delayed-stream/1.0.0
+    dev: true
+
   registry.npmmirror.com/commander/9.2.0:
     resolution: {integrity: sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/commander/-/commander-9.2.0.tgz}
     name: commander
@@ -966,6 +1280,12 @@ packages:
       utils-merge: registry.npmmirror.com/utils-merge/1.0.1
     dev: true
 
+  registry.npmmirror.com/console-control-strings/1.1.0:
+    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/console-control-strings/-/console-control-strings-1.1.0.tgz}
+    name: console-control-strings
+    version: 1.1.0
+    dev: true
+
   registry.npmmirror.com/constantinople/4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/constantinople/-/constantinople-4.0.1.tgz}
     name: constantinople
@@ -975,6 +1295,18 @@ packages:
       '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
     dev: true
 
+  registry.npmmirror.com/core-util-is/1.0.2:
+    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz}
+    name: core-util-is
+    version: 1.0.2
+    dev: true
+
+  registry.npmmirror.com/core-util-is/1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz}
+    name: core-util-is
+    version: 1.0.3
+    dev: true
+
   registry.npmmirror.com/cross-spawn/7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz}
     name: cross-spawn
@@ -992,6 +1324,15 @@ packages:
     version: 2.6.20
     dev: false
 
+  registry.npmmirror.com/dashdash/1.14.1:
+    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz}
+    name: dashdash
+    version: 1.14.1
+    engines: {node: '>=0.10'}
+    dependencies:
+      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
+    dev: true
+
   registry.npmmirror.com/dayjs/1.11.1:
     resolution: {integrity: sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.1.tgz}
     name: dayjs
@@ -1020,6 +1361,23 @@ packages:
       ms: registry.npmmirror.com/ms/2.1.2
     dev: true
 
+  registry.npmmirror.com/decamelize-keys/1.1.0:
+    resolution: {integrity: sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz}
+    name: decamelize-keys
+    version: 1.1.0
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      decamelize: registry.npmmirror.com/decamelize/1.2.0
+      map-obj: registry.npmmirror.com/map-obj/1.0.1
+    dev: true
+
+  registry.npmmirror.com/decamelize/1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz}
+    name: decamelize
+    version: 1.2.0
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   registry.npmmirror.com/deep-is/0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz}
     name: deep-is
@@ -1033,6 +1391,26 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  registry.npmmirror.com/delayed-stream/1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz}
+    name: delayed-stream
+    version: 1.0.0
+    engines: {node: '>=0.4.0'}
+    dev: true
+
+  registry.npmmirror.com/delegates/1.0.0:
+    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz}
+    name: delegates
+    version: 1.0.0
+    dev: true
+
+  registry.npmmirror.com/depd/1.1.2:
+    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz}
+    name: depd
+    version: 1.1.2
+    engines: {node: '>= 0.6'}
+    dev: true
+
   registry.npmmirror.com/dir-glob/3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz}
     name: dir-glob
@@ -1092,6 +1470,15 @@ packages:
       domhandler: registry.npmmirror.com/domhandler/4.3.1
     dev: true
 
+  registry.npmmirror.com/ecc-jsbn/0.1.2:
+    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz}
+    name: ecc-jsbn
+    version: 0.1.2
+    dependencies:
+      jsbn: registry.npmmirror.com/jsbn/0.1.1
+      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
+    dev: true
+
   registry.npmmirror.com/ee-first/1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz}
     name: ee-first
@@ -1135,6 +1522,12 @@ packages:
       '@emmetio/css-abbreviation': registry.npmmirror.com/@emmetio/css-abbreviation/2.1.4
     dev: true
 
+  registry.npmmirror.com/emoji-regex/8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz}
+    name: emoji-regex
+    version: 8.0.0
+    dev: true
+
   registry.npmmirror.com/encodeurl/1.0.2:
     resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz}
     name: encodeurl
@@ -1142,6 +1535,16 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
+  registry.npmmirror.com/encoding/0.1.13:
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
+    name: encoding
+    version: 0.1.13
+    requiresBuild: true
+    dependencies:
+      iconv-lite: registry.npmmirror.com/iconv-lite/0.6.3
+    dev: true
+    optional: true
+
   registry.npmmirror.com/entities/2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz}
     name: entities
@@ -1155,6 +1558,27 @@ packages:
     engines: {node: '>=0.12'}
     dev: true
 
+  registry.npmmirror.com/env-paths/2.2.1:
+    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/env-paths/-/env-paths-2.2.1.tgz}
+    name: env-paths
+    version: 2.2.1
+    engines: {node: '>=6'}
+    dev: true
+
+  registry.npmmirror.com/err-code/2.0.3:
+    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/err-code/-/err-code-2.0.3.tgz}
+    name: err-code
+    version: 2.0.3
+    dev: true
+
+  registry.npmmirror.com/error-ex/1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz}
+    name: error-ex
+    version: 1.3.2
+    dependencies:
+      is-arrayish: registry.npmmirror.com/is-arrayish/0.2.1
+    dev: true
+
   registry.npmmirror.com/esbuild-android-64/0.14.36:
     resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
     name: esbuild-android-64
@@ -1413,11 +1837,25 @@ packages:
       esbuild-windows-arm64: registry.npmmirror.com/esbuild-windows-arm64/0.14.36
     dev: true
 
+  registry.npmmirror.com/escalade/3.1.1:
+    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz}
+    name: escalade
+    version: 3.1.1
+    engines: {node: '>=6'}
+    dev: true
+
   registry.npmmirror.com/escape-html/1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz}
     name: escape-html
     version: 1.0.3
 
+  registry.npmmirror.com/escape-string-regexp/1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz}
+    name: escape-string-regexp
+    version: 1.0.5
+    engines: {node: '>=0.8.0'}
+    dev: true
+
   registry.npmmirror.com/escape-string-regexp/4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}
     name: escape-string-regexp
@@ -1629,6 +2067,19 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  registry.npmmirror.com/extend/3.0.2:
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz}
+    name: extend
+    version: 3.0.2
+    dev: true
+
+  registry.npmmirror.com/extsprintf/1.3.0:
+    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/extsprintf/-/extsprintf-1.3.0.tgz}
+    name: extsprintf
+    version: 1.3.0
+    engines: {'0': node >=0.6.0}
+    dev: true
+
   registry.npmmirror.com/fast-deep-equal/3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz}
     name: fast-deep-equal
@@ -1707,6 +2158,16 @@ packages:
       unpipe: registry.npmmirror.com/unpipe/1.0.0
     dev: true
 
+  registry.npmmirror.com/find-up/4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz}
+    name: find-up
+    version: 4.1.0
+    engines: {node: '>=8'}
+    dependencies:
+      locate-path: registry.npmmirror.com/locate-path/5.0.0
+      path-exists: registry.npmmirror.com/path-exists/4.0.0
+    dev: true
+
   registry.npmmirror.com/flat-cache/3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flat-cache/-/flat-cache-3.0.4.tgz}
     name: flat-cache
@@ -1735,6 +2196,32 @@ packages:
         optional: true
     dev: false
 
+  registry.npmmirror.com/forever-agent/0.6.1:
+    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/forever-agent/-/forever-agent-0.6.1.tgz}
+    name: forever-agent
+    version: 0.6.1
+    dev: true
+
+  registry.npmmirror.com/form-data/2.3.3:
+    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/form-data/-/form-data-2.3.3.tgz}
+    name: form-data
+    version: 2.3.3
+    engines: {node: '>= 0.12'}
+    dependencies:
+      asynckit: registry.npmmirror.com/asynckit/0.4.0
+      combined-stream: registry.npmmirror.com/combined-stream/1.0.8
+      mime-types: registry.npmmirror.com/mime-types/2.1.35
+    dev: true
+
+  registry.npmmirror.com/fs-minipass/2.1.0:
+    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz}
+    name: fs-minipass
+    version: 2.1.0
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+    dev: true
+
   registry.npmmirror.com/fs.realpath/1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz}
     name: fs.realpath
@@ -1762,6 +2249,55 @@ packages:
     version: 1.0.1
     dev: true
 
+  registry.npmmirror.com/gauge/3.0.2:
+    resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/gauge/-/gauge-3.0.2.tgz}
+    name: gauge
+    version: 3.0.2
+    engines: {node: '>=10'}
+    dependencies:
+      aproba: registry.npmmirror.com/aproba/2.0.0
+      color-support: registry.npmmirror.com/color-support/1.1.3
+      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
+      has-unicode: registry.npmmirror.com/has-unicode/2.0.1
+      object-assign: registry.npmmirror.com/object-assign/4.1.1
+      signal-exit: registry.npmmirror.com/signal-exit/3.0.7
+      string-width: registry.npmmirror.com/string-width/4.2.3
+      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
+      wide-align: registry.npmmirror.com/wide-align/1.1.5
+    dev: true
+
+  registry.npmmirror.com/gauge/4.0.4:
+    resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/gauge/-/gauge-4.0.4.tgz}
+    name: gauge
+    version: 4.0.4
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    dependencies:
+      aproba: registry.npmmirror.com/aproba/2.0.0
+      color-support: registry.npmmirror.com/color-support/1.1.3
+      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
+      has-unicode: registry.npmmirror.com/has-unicode/2.0.1
+      signal-exit: registry.npmmirror.com/signal-exit/3.0.7
+      string-width: registry.npmmirror.com/string-width/4.2.3
+      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
+      wide-align: registry.npmmirror.com/wide-align/1.1.5
+    dev: true
+
+  registry.npmmirror.com/gaze/1.1.3:
+    resolution: {integrity: sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz}
+    name: gaze
+    version: 1.1.3
+    engines: {node: '>= 4.0.0'}
+    dependencies:
+      globule: registry.npmmirror.com/globule/1.3.3
+    dev: true
+
+  registry.npmmirror.com/get-caller-file/2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz}
+    name: get-caller-file
+    version: 2.0.5
+    engines: {node: 6.* || 8.* || >= 10.*}
+    dev: true
+
   registry.npmmirror.com/get-intrinsic/1.1.1:
     resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz}
     name: get-intrinsic
@@ -1771,6 +2307,21 @@ packages:
       has: registry.npmmirror.com/has/1.0.3
       has-symbols: registry.npmmirror.com/has-symbols/1.0.3
 
+  registry.npmmirror.com/get-stdin/4.0.1:
+    resolution: {integrity: sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz}
+    name: get-stdin
+    version: 4.0.1
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/getpass/0.1.7:
+    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/getpass/-/getpass-0.1.7.tgz}
+    name: getpass
+    version: 0.1.7
+    dependencies:
+      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
+    dev: true
+
   registry.npmmirror.com/glob-parent/5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz}
     name: glob-parent
@@ -1789,6 +2340,19 @@ packages:
       is-glob: registry.npmmirror.com/is-glob/4.0.3
     dev: true
 
+  registry.npmmirror.com/glob/7.1.7:
+    resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz}
+    name: glob
+    version: 7.1.7
+    dependencies:
+      fs.realpath: registry.npmmirror.com/fs.realpath/1.0.0
+      inflight: registry.npmmirror.com/inflight/1.0.6
+      inherits: registry.npmmirror.com/inherits/2.0.4
+      minimatch: registry.npmmirror.com/minimatch/3.1.2
+      once: registry.npmmirror.com/once/1.4.0
+      path-is-absolute: registry.npmmirror.com/path-is-absolute/1.0.1
+    dev: true
+
   registry.npmmirror.com/glob/7.2.0:
     resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob/-/glob-7.2.0.tgz}
     name: glob
@@ -1825,6 +2389,55 @@ packages:
       slash: registry.npmmirror.com/slash/3.0.0
     dev: true
 
+  registry.npmmirror.com/globule/1.3.3:
+    resolution: {integrity: sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globule/-/globule-1.3.3.tgz}
+    name: globule
+    version: 1.3.3
+    engines: {node: '>= 0.10'}
+    dependencies:
+      glob: registry.npmmirror.com/glob/7.1.7
+      lodash: registry.npmmirror.com/lodash/4.17.21
+      minimatch: registry.npmmirror.com/minimatch/3.0.8
+    dev: true
+
+  registry.npmmirror.com/graceful-fs/4.2.10:
+    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
+    name: graceful-fs
+    version: 4.2.10
+    dev: true
+
+  registry.npmmirror.com/har-schema/2.0.0:
+    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz}
+    name: har-schema
+    version: 2.0.0
+    engines: {node: '>=4'}
+    dev: true
+
+  registry.npmmirror.com/har-validator/5.1.5:
+    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/har-validator/-/har-validator-5.1.5.tgz}
+    name: har-validator
+    version: 5.1.5
+    engines: {node: '>=6'}
+    deprecated: this library is no longer supported
+    dependencies:
+      ajv: registry.npmmirror.com/ajv/6.12.6
+      har-schema: registry.npmmirror.com/har-schema/2.0.0
+    dev: true
+
+  registry.npmmirror.com/hard-rejection/2.1.0:
+    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/hard-rejection/-/hard-rejection-2.1.0.tgz}
+    name: hard-rejection
+    version: 2.1.0
+    engines: {node: '>=6'}
+    dev: true
+
+  registry.npmmirror.com/has-flag/3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz}
+    name: has-flag
+    version: 3.0.0
+    engines: {node: '>=4'}
+    dev: true
+
   registry.npmmirror.com/has-flag/4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz}
     name: has-flag
@@ -1847,6 +2460,12 @@ packages:
       has-symbols: registry.npmmirror.com/has-symbols/1.0.3
     dev: true
 
+  registry.npmmirror.com/has-unicode/2.0.1:
+    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-unicode/-/has-unicode-2.0.1.tgz}
+    name: has-unicode
+    version: 2.0.1
+    dev: true
+
   registry.npmmirror.com/has/1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has/-/has-1.0.3.tgz}
     name: has
@@ -1855,6 +2474,21 @@ packages:
     dependencies:
       function-bind: registry.npmmirror.com/function-bind/1.1.1
 
+  registry.npmmirror.com/hosted-git-info/2.8.9:
+    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz}
+    name: hosted-git-info
+    version: 2.8.9
+    dev: true
+
+  registry.npmmirror.com/hosted-git-info/4.1.0:
+    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz}
+    name: hosted-git-info
+    version: 4.1.0
+    engines: {node: '>=10'}
+    dependencies:
+      lru-cache: registry.npmmirror.com/lru-cache/6.0.0
+    dev: true
+
   registry.npmmirror.com/htmlparser2/7.2.0:
     resolution: {integrity: sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/htmlparser2/-/htmlparser2-7.2.0.tgz}
     name: htmlparser2
@@ -1866,6 +2500,66 @@ packages:
       entities: registry.npmmirror.com/entities/3.0.1
     dev: true
 
+  registry.npmmirror.com/http-cache-semantics/4.1.0:
+    resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz}
+    name: http-cache-semantics
+    version: 4.1.0
+    dev: true
+
+  registry.npmmirror.com/http-proxy-agent/4.0.1:
+    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz}
+    name: http-proxy-agent
+    version: 4.0.1
+    engines: {node: '>= 6'}
+    dependencies:
+      '@tootallnate/once': registry.npmmirror.com/@tootallnate/once/1.1.2
+      agent-base: registry.npmmirror.com/agent-base/6.0.2
+      debug: registry.npmmirror.com/debug/4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/http-signature/1.2.0:
+    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz}
+    name: http-signature
+    version: 1.2.0
+    engines: {node: '>=0.8', npm: '>=1.3.7'}
+    dependencies:
+      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
+      jsprim: registry.npmmirror.com/jsprim/1.4.2
+      sshpk: registry.npmmirror.com/sshpk/1.17.0
+    dev: true
+
+  registry.npmmirror.com/https-proxy-agent/5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz}
+    name: https-proxy-agent
+    version: 5.0.1
+    engines: {node: '>= 6'}
+    dependencies:
+      agent-base: registry.npmmirror.com/agent-base/6.0.2
+      debug: registry.npmmirror.com/debug/4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/humanize-ms/1.2.1:
+    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/humanize-ms/-/humanize-ms-1.2.1.tgz}
+    name: humanize-ms
+    version: 1.2.1
+    dependencies:
+      ms: registry.npmmirror.com/ms/2.1.2
+    dev: true
+
+  registry.npmmirror.com/iconv-lite/0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz}
+    name: iconv-lite
+    version: 0.6.3
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
+    dev: true
+    optional: true
+
   registry.npmmirror.com/ignore/5.2.0:
     resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ignore/-/ignore-5.2.0.tgz}
     name: ignore
@@ -1873,6 +2567,12 @@ packages:
     engines: {node: '>= 4'}
     dev: true
 
+  registry.npmmirror.com/immutable/4.0.0:
+    resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/immutable/-/immutable-4.0.0.tgz}
+    name: immutable
+    version: 4.0.0
+    dev: true
+
   registry.npmmirror.com/import-fresh/3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz}
     name: import-fresh
@@ -1890,6 +2590,19 @@ packages:
     engines: {node: '>=0.8.19'}
     dev: true
 
+  registry.npmmirror.com/indent-string/4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/indent-string/-/indent-string-4.0.0.tgz}
+    name: indent-string
+    version: 4.0.0
+    engines: {node: '>=8'}
+    dev: true
+
+  registry.npmmirror.com/infer-owner/1.0.4:
+    resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/infer-owner/-/infer-owner-1.0.4.tgz}
+    name: infer-owner
+    version: 1.0.4
+    dev: true
+
   registry.npmmirror.com/inflight/1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz}
     name: inflight
@@ -1905,6 +2618,18 @@ packages:
     version: 2.0.4
     dev: true
 
+  registry.npmmirror.com/ip/1.1.5:
+    resolution: {integrity: sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ip/-/ip-1.1.5.tgz}
+    name: ip
+    version: 1.1.5
+    dev: true
+
+  registry.npmmirror.com/is-arrayish/0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz}
+    name: is-arrayish
+    version: 0.2.1
+    dev: true
+
   registry.npmmirror.com/is-binary-path/2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz}
     name: is-binary-path
@@ -1938,6 +2663,13 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  registry.npmmirror.com/is-fullwidth-code-point/3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz}
+    name: is-fullwidth-code-point
+    version: 3.0.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/is-glob/4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz}
     name: is-glob
@@ -1947,6 +2679,12 @@ packages:
       is-extglob: registry.npmmirror.com/is-extglob/2.1.1
     dev: true
 
+  registry.npmmirror.com/is-lambda/1.0.1:
+    resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-lambda/-/is-lambda-1.0.1.tgz}
+    name: is-lambda
+    version: 1.0.1
+    dev: true
+
   registry.npmmirror.com/is-module/1.0.0:
     resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-module/-/is-module-1.0.0.tgz}
     name: is-module
@@ -1960,6 +2698,13 @@ packages:
     engines: {node: '>=0.12.0'}
     dev: true
 
+  registry.npmmirror.com/is-plain-obj/1.1.0:
+    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz}
+    name: is-plain-obj
+    version: 1.1.0
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   registry.npmmirror.com/is-promise/2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz}
     name: is-promise
@@ -1976,18 +2721,48 @@ packages:
       has-tostringtag: registry.npmmirror.com/has-tostringtag/1.0.0
     dev: true
 
+  registry.npmmirror.com/is-typedarray/1.0.0:
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz}
+    name: is-typedarray
+    version: 1.0.0
+    dev: true
+
+  registry.npmmirror.com/isarray/1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz}
+    name: isarray
+    version: 1.0.0
+    dev: true
+
   registry.npmmirror.com/isexe/2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz}
     name: isexe
     version: 2.0.0
     dev: true
 
+  registry.npmmirror.com/isstream/0.1.2:
+    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz}
+    name: isstream
+    version: 0.1.2
+    dev: true
+
+  registry.npmmirror.com/js-base64/2.6.4:
+    resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz}
+    name: js-base64
+    version: 2.6.4
+    dev: true
+
   registry.npmmirror.com/js-stringify/1.0.2:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-stringify/-/js-stringify-1.0.2.tgz}
     name: js-stringify
     version: 1.0.2
     dev: true
 
+  registry.npmmirror.com/js-tokens/4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz}
+    name: js-tokens
+    version: 4.0.0
+    dev: true
+
   registry.npmmirror.com/js-yaml/4.1.0:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.0.tgz}
     name: js-yaml
@@ -1997,18 +2772,42 @@ packages:
       argparse: registry.npmmirror.com/argparse/2.0.1
     dev: true
 
+  registry.npmmirror.com/jsbn/0.1.1:
+    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsbn/-/jsbn-0.1.1.tgz}
+    name: jsbn
+    version: 0.1.1
+    dev: true
+
+  registry.npmmirror.com/json-parse-even-better-errors/2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz}
+    name: json-parse-even-better-errors
+    version: 2.3.1
+    dev: true
+
   registry.npmmirror.com/json-schema-traverse/0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz}
     name: json-schema-traverse
     version: 0.4.1
     dev: true
 
+  registry.npmmirror.com/json-schema/0.4.0:
+    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema/-/json-schema-0.4.0.tgz}
+    name: json-schema
+    version: 0.4.0
+    dev: true
+
   registry.npmmirror.com/json-stable-stringify-without-jsonify/1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz}
     name: json-stable-stringify-without-jsonify
     version: 1.0.1
     dev: true
 
+  registry.npmmirror.com/json-stringify-safe/5.0.1:
+    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz}
+    name: json-stringify-safe
+    version: 5.0.1
+    dev: true
+
   registry.npmmirror.com/jsonc-parser/2.3.1:
     resolution: {integrity: sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz}
     name: jsonc-parser
@@ -2021,6 +2820,18 @@ packages:
     version: 3.0.0
     dev: true
 
+  registry.npmmirror.com/jsprim/1.4.2:
+    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz}
+    name: jsprim
+    version: 1.4.2
+    engines: {node: '>=0.6.0'}
+    dependencies:
+      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
+      extsprintf: registry.npmmirror.com/extsprintf/1.3.0
+      json-schema: registry.npmmirror.com/json-schema/0.4.0
+      verror: registry.npmmirror.com/verror/1.10.0
+    dev: true
+
   registry.npmmirror.com/jstransformer/1.0.0:
     resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jstransformer/-/jstransformer-1.0.0.tgz}
     name: jstransformer
@@ -2030,6 +2841,20 @@ packages:
       promise: registry.npmmirror.com/promise/7.3.1
     dev: true
 
+  registry.npmmirror.com/kind-of/6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz}
+    name: kind-of
+    version: 6.0.3
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/klona/2.0.5:
+    resolution: {integrity: sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz}
+    name: klona
+    version: 2.0.5
+    engines: {node: '>= 8'}
+    dev: true
+
   registry.npmmirror.com/levn/0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz}
     name: levn
@@ -2040,6 +2865,12 @@ packages:
       type-check: registry.npmmirror.com/type-check/0.4.0
     dev: true
 
+  registry.npmmirror.com/lines-and-columns/1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz}
+    name: lines-and-columns
+    version: 1.2.4
+    dev: true
+
   registry.npmmirror.com/local-pkg/0.4.1:
     resolution: {integrity: sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.1.tgz}
     name: local-pkg
@@ -2047,6 +2878,15 @@ packages:
     engines: {node: '>=14'}
     dev: true
 
+  registry.npmmirror.com/locate-path/5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz}
+    name: locate-path
+    version: 5.0.0
+    engines: {node: '>=8'}
+    dependencies:
+      p-locate: registry.npmmirror.com/p-locate/4.1.0
+    dev: true
+
   registry.npmmirror.com/lodash-es/4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz}
     name: lodash-es
@@ -2104,12 +2944,72 @@ packages:
       sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
     dev: true
 
+  registry.npmmirror.com/make-fetch-happen/9.1.0:
+    resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz}
+    name: make-fetch-happen
+    version: 9.1.0
+    engines: {node: '>= 10'}
+    dependencies:
+      agentkeepalive: registry.npmmirror.com/agentkeepalive/4.2.1
+      cacache: registry.npmmirror.com/cacache/15.3.0
+      http-cache-semantics: registry.npmmirror.com/http-cache-semantics/4.1.0
+      http-proxy-agent: registry.npmmirror.com/http-proxy-agent/4.0.1
+      https-proxy-agent: registry.npmmirror.com/https-proxy-agent/5.0.1
+      is-lambda: registry.npmmirror.com/is-lambda/1.0.1
+      lru-cache: registry.npmmirror.com/lru-cache/6.0.0
+      minipass: registry.npmmirror.com/minipass/3.1.6
+      minipass-collect: registry.npmmirror.com/minipass-collect/1.0.2
+      minipass-fetch: registry.npmmirror.com/minipass-fetch/1.4.1
+      minipass-flush: registry.npmmirror.com/minipass-flush/1.0.5
+      minipass-pipeline: registry.npmmirror.com/minipass-pipeline/1.2.4
+      negotiator: registry.npmmirror.com/negotiator/0.6.3
+      promise-retry: registry.npmmirror.com/promise-retry/2.0.1
+      socks-proxy-agent: registry.npmmirror.com/socks-proxy-agent/6.2.0
+      ssri: registry.npmmirror.com/ssri/8.0.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/map-obj/1.0.1:
+    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/map-obj/-/map-obj-1.0.1.tgz}
+    name: map-obj
+    version: 1.0.1
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  registry.npmmirror.com/map-obj/4.3.0:
+    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/map-obj/-/map-obj-4.3.0.tgz}
+    name: map-obj
+    version: 4.3.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/memoize-one/6.0.0:
     resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz}
     name: memoize-one
     version: 6.0.0
     dev: false
 
+  registry.npmmirror.com/meow/9.0.0:
+    resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz}
+    name: meow
+    version: 9.0.0
+    engines: {node: '>=10'}
+    dependencies:
+      '@types/minimist': registry.npmmirror.com/@types/minimist/1.2.2
+      camelcase-keys: registry.npmmirror.com/camelcase-keys/6.2.2
+      decamelize: registry.npmmirror.com/decamelize/1.2.0
+      decamelize-keys: registry.npmmirror.com/decamelize-keys/1.1.0
+      hard-rejection: registry.npmmirror.com/hard-rejection/2.1.0
+      minimist-options: registry.npmmirror.com/minimist-options/4.1.0
+      normalize-package-data: registry.npmmirror.com/normalize-package-data/3.0.3
+      read-pkg-up: registry.npmmirror.com/read-pkg-up/7.0.1
+      redent: registry.npmmirror.com/redent/3.0.0
+      trim-newlines: registry.npmmirror.com/trim-newlines/3.0.1
+      type-fest: registry.npmmirror.com/type-fest/0.18.1
+      yargs-parser: registry.npmmirror.com/yargs-parser/20.2.9
+    dev: true
+
   registry.npmmirror.com/merge2/1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz}
     name: merge2
@@ -2127,6 +3027,37 @@ packages:
       picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
+  registry.npmmirror.com/mime-db/1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz}
+    name: mime-db
+    version: 1.52.0
+    engines: {node: '>= 0.6'}
+    dev: true
+
+  registry.npmmirror.com/mime-types/2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz}
+    name: mime-types
+    version: 2.1.35
+    engines: {node: '>= 0.6'}
+    dependencies:
+      mime-db: registry.npmmirror.com/mime-db/1.52.0
+    dev: true
+
+  registry.npmmirror.com/min-indent/1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/min-indent/-/min-indent-1.0.1.tgz}
+    name: min-indent
+    version: 1.0.1
+    engines: {node: '>=4'}
+    dev: true
+
+  registry.npmmirror.com/minimatch/3.0.8:
+    resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz}
+    name: minimatch
+    version: 3.0.8
+    dependencies:
+      brace-expansion: registry.npmmirror.com/brace-expansion/1.1.11
+    dev: true
+
   registry.npmmirror.com/minimatch/3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz}
     name: minimatch
@@ -2144,6 +3075,93 @@ packages:
       brace-expansion: registry.npmmirror.com/brace-expansion/2.0.1
     dev: true
 
+  registry.npmmirror.com/minimist-options/4.1.0:
+    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimist-options/-/minimist-options-4.1.0.tgz}
+    name: minimist-options
+    version: 4.1.0
+    engines: {node: '>= 6'}
+    dependencies:
+      arrify: registry.npmmirror.com/arrify/1.0.1
+      is-plain-obj: registry.npmmirror.com/is-plain-obj/1.1.0
+      kind-of: registry.npmmirror.com/kind-of/6.0.3
+    dev: true
+
+  registry.npmmirror.com/minipass-collect/1.0.2:
+    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-collect/-/minipass-collect-1.0.2.tgz}
+    name: minipass-collect
+    version: 1.0.2
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+    dev: true
+
+  registry.npmmirror.com/minipass-fetch/1.4.1:
+    resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz}
+    name: minipass-fetch
+    version: 1.4.1
+    engines: {node: '>=8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+      minipass-sized: registry.npmmirror.com/minipass-sized/1.0.3
+      minizlib: registry.npmmirror.com/minizlib/2.1.2
+    optionalDependencies:
+      encoding: registry.npmmirror.com/encoding/0.1.13
+    dev: true
+
+  registry.npmmirror.com/minipass-flush/1.0.5:
+    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-flush/-/minipass-flush-1.0.5.tgz}
+    name: minipass-flush
+    version: 1.0.5
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+    dev: true
+
+  registry.npmmirror.com/minipass-pipeline/1.2.4:
+    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz}
+    name: minipass-pipeline
+    version: 1.2.4
+    engines: {node: '>=8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+    dev: true
+
+  registry.npmmirror.com/minipass-sized/1.0.3:
+    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-sized/-/minipass-sized-1.0.3.tgz}
+    name: minipass-sized
+    version: 1.0.3
+    engines: {node: '>=8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+    dev: true
+
+  registry.npmmirror.com/minipass/3.1.6:
+    resolution: {integrity: sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass/-/minipass-3.1.6.tgz}
+    name: minipass
+    version: 3.1.6
+    engines: {node: '>=8'}
+    dependencies:
+      yallist: registry.npmmirror.com/yallist/4.0.0
+    dev: true
+
+  registry.npmmirror.com/minizlib/2.1.2:
+    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz}
+    name: minizlib
+    version: 2.1.2
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+      yallist: registry.npmmirror.com/yallist/4.0.0
+    dev: true
+
+  registry.npmmirror.com/mkdirp/1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz}
+    name: mkdirp
+    version: 1.0.4
+    engines: {node: '>=10'}
+    hasBin: true
+    dev: true
+
   registry.npmmirror.com/mockjs/1.1.0:
     resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz}
     name: mockjs
@@ -2165,6 +3183,12 @@ packages:
     version: 2.1.2
     dev: true
 
+  registry.npmmirror.com/nan/2.15.0:
+    resolution: {integrity: sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nan/-/nan-2.15.0.tgz}
+    name: nan
+    version: 2.15.0
+    dev: true
+
   registry.npmmirror.com/nanoid/3.3.3:
     resolution: {integrity: sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-3.3.3.tgz}
     name: nanoid
@@ -2178,6 +3202,100 @@ packages:
     version: 1.4.0
     dev: true
 
+  registry.npmmirror.com/negotiator/0.6.3:
+    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz}
+    name: negotiator
+    version: 0.6.3
+    engines: {node: '>= 0.6'}
+    dev: true
+
+  registry.npmmirror.com/neo-async/2.6.2:
+    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz}
+    name: neo-async
+    version: 2.6.2
+    dev: true
+
+  registry.npmmirror.com/node-gyp/8.4.1:
+    resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/node-gyp/-/node-gyp-8.4.1.tgz}
+    name: node-gyp
+    version: 8.4.1
+    engines: {node: '>= 10.12.0'}
+    hasBin: true
+    dependencies:
+      env-paths: registry.npmmirror.com/env-paths/2.2.1
+      glob: registry.npmmirror.com/glob/7.2.0
+      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      make-fetch-happen: registry.npmmirror.com/make-fetch-happen/9.1.0
+      nopt: registry.npmmirror.com/nopt/5.0.0
+      npmlog: registry.npmmirror.com/npmlog/6.0.2
+      rimraf: registry.npmmirror.com/rimraf/3.0.2
+      semver: registry.npmmirror.com/semver/7.3.7
+      tar: registry.npmmirror.com/tar/6.1.11
+      which: registry.npmmirror.com/which/2.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/node-sass/7.0.1:
+    resolution: {integrity: sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/node-sass/-/node-sass-7.0.1.tgz}
+    name: node-sass
+    version: 7.0.1
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    dependencies:
+      async-foreach: registry.npmmirror.com/async-foreach/0.1.3
+      chalk: registry.npmmirror.com/chalk/4.1.2
+      cross-spawn: registry.npmmirror.com/cross-spawn/7.0.3
+      gaze: registry.npmmirror.com/gaze/1.1.3
+      get-stdin: registry.npmmirror.com/get-stdin/4.0.1
+      glob: registry.npmmirror.com/glob/7.2.0
+      lodash: registry.npmmirror.com/lodash/4.17.21
+      meow: registry.npmmirror.com/meow/9.0.0
+      nan: registry.npmmirror.com/nan/2.15.0
+      node-gyp: registry.npmmirror.com/node-gyp/8.4.1
+      npmlog: registry.npmmirror.com/npmlog/5.0.1
+      request: registry.npmmirror.com/request/2.88.2
+      sass-graph: registry.npmmirror.com/sass-graph/4.0.0
+      stdout-stream: registry.npmmirror.com/stdout-stream/1.4.1
+      true-case-path: registry.npmmirror.com/true-case-path/1.0.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/nopt/5.0.0:
+    resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz}
+    name: nopt
+    version: 5.0.0
+    engines: {node: '>=6'}
+    hasBin: true
+    dependencies:
+      abbrev: registry.npmmirror.com/abbrev/1.1.1
+    dev: true
+
+  registry.npmmirror.com/normalize-package-data/2.5.0:
+    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz}
+    name: normalize-package-data
+    version: 2.5.0
+    dependencies:
+      hosted-git-info: registry.npmmirror.com/hosted-git-info/2.8.9
+      resolve: registry.npmmirror.com/resolve/1.22.0
+      semver: registry.npmmirror.com/semver/5.7.1
+      validate-npm-package-license: registry.npmmirror.com/validate-npm-package-license/3.0.4
+    dev: true
+
+  registry.npmmirror.com/normalize-package-data/3.0.3:
+    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz}
+    name: normalize-package-data
+    version: 3.0.3
+    engines: {node: '>=10'}
+    dependencies:
+      hosted-git-info: registry.npmmirror.com/hosted-git-info/4.1.0
+      is-core-module: registry.npmmirror.com/is-core-module/2.8.1
+      semver: registry.npmmirror.com/semver/7.3.7
+      validate-npm-package-license: registry.npmmirror.com/validate-npm-package-license/3.0.4
+    dev: true
+
   registry.npmmirror.com/normalize-path/3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz}
     name: normalize-path
@@ -2191,12 +3309,41 @@ packages:
     version: 1.1.2
     dev: false
 
+  registry.npmmirror.com/npmlog/5.0.1:
+    resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/npmlog/-/npmlog-5.0.1.tgz}
+    name: npmlog
+    version: 5.0.1
+    dependencies:
+      are-we-there-yet: registry.npmmirror.com/are-we-there-yet/2.0.0
+      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
+      gauge: registry.npmmirror.com/gauge/3.0.2
+      set-blocking: registry.npmmirror.com/set-blocking/2.0.0
+    dev: true
+
+  registry.npmmirror.com/npmlog/6.0.2:
+    resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/npmlog/-/npmlog-6.0.2.tgz}
+    name: npmlog
+    version: 6.0.2
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    dependencies:
+      are-we-there-yet: registry.npmmirror.com/are-we-there-yet/3.0.0
+      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
+      gauge: registry.npmmirror.com/gauge/4.0.4
+      set-blocking: registry.npmmirror.com/set-blocking/2.0.0
+    dev: true
+
   registry.npmmirror.com/nprogress/0.2.0:
     resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz}
     name: nprogress
     version: 0.2.0
     dev: false
 
+  registry.npmmirror.com/oauth-sign/0.9.0:
+    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/oauth-sign/-/oauth-sign-0.9.0.tgz}
+    name: oauth-sign
+    version: 0.9.0
+    dev: true
+
   registry.npmmirror.com/object-assign/4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz}
     name: object-assign
@@ -2241,6 +3388,40 @@ packages:
       word-wrap: registry.npmmirror.com/word-wrap/1.2.3
     dev: true
 
+  registry.npmmirror.com/p-limit/2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz}
+    name: p-limit
+    version: 2.3.0
+    engines: {node: '>=6'}
+    dependencies:
+      p-try: registry.npmmirror.com/p-try/2.2.0
+    dev: true
+
+  registry.npmmirror.com/p-locate/4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz}
+    name: p-locate
+    version: 4.1.0
+    engines: {node: '>=8'}
+    dependencies:
+      p-limit: registry.npmmirror.com/p-limit/2.3.0
+    dev: true
+
+  registry.npmmirror.com/p-map/4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-map/-/p-map-4.0.0.tgz}
+    name: p-map
+    version: 4.0.0
+    engines: {node: '>=10'}
+    dependencies:
+      aggregate-error: registry.npmmirror.com/aggregate-error/3.1.0
+    dev: true
+
+  registry.npmmirror.com/p-try/2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz}
+    name: p-try
+    version: 2.2.0
+    engines: {node: '>=6'}
+    dev: true
+
   registry.npmmirror.com/parent-module/1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz}
     name: parent-module
@@ -2250,6 +3431,18 @@ packages:
       callsites: registry.npmmirror.com/callsites/3.1.0
     dev: true
 
+  registry.npmmirror.com/parse-json/5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz}
+    name: parse-json
+    version: 5.2.0
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/code-frame': registry.npmmirror.com/@babel/code-frame/7.16.7
+      error-ex: registry.npmmirror.com/error-ex/1.3.2
+      json-parse-even-better-errors: registry.npmmirror.com/json-parse-even-better-errors/2.3.1
+      lines-and-columns: registry.npmmirror.com/lines-and-columns/1.2.4
+    dev: true
+
   registry.npmmirror.com/parseurl/1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz}
     name: parseurl
@@ -2257,6 +3450,13 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
+  registry.npmmirror.com/path-exists/4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz}
+    name: path-exists
+    version: 4.0.0
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/path-is-absolute/1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz}
     name: path-is-absolute
@@ -2290,6 +3490,12 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  registry.npmmirror.com/performance-now/2.1.0:
+    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz}
+    name: performance-now
+    version: 2.1.0
+    dev: true
+
   registry.npmmirror.com/picocolors/1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz}
     name: picocolors
@@ -2357,6 +3563,28 @@ packages:
     hasBin: true
     dev: true
 
+  registry.npmmirror.com/process-nextick-args/2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz}
+    name: process-nextick-args
+    version: 2.0.1
+    dev: true
+
+  registry.npmmirror.com/promise-inflight/1.0.1:
+    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz}
+    name: promise-inflight
+    version: 1.0.1
+    dev: true
+
+  registry.npmmirror.com/promise-retry/2.0.1:
+    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise-retry/-/promise-retry-2.0.1.tgz}
+    name: promise-retry
+    version: 2.0.1
+    engines: {node: '>=10'}
+    dependencies:
+      err-code: registry.npmmirror.com/err-code/2.0.3
+      retry: registry.npmmirror.com/retry/0.12.0
+    dev: true
+
   registry.npmmirror.com/promise/7.3.1:
     resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise/-/promise-7.3.1.tgz}
     name: promise
@@ -2365,6 +3593,12 @@ packages:
       asap: registry.npmmirror.com/asap/2.0.6
     dev: true
 
+  registry.npmmirror.com/psl/1.8.0:
+    resolution: {integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/psl/-/psl-1.8.0.tgz}
+    name: psl
+    version: 1.8.0
+    dev: true
+
   registry.npmmirror.com/pug-attrs/3.0.0:
     resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-attrs/-/pug-attrs-3.0.0.tgz}
     name: pug-attrs
@@ -2496,12 +3730,74 @@ packages:
       side-channel: registry.npmmirror.com/side-channel/1.0.4
     dev: false
 
+  registry.npmmirror.com/qs/6.5.3:
+    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz}
+    name: qs
+    version: 6.5.3
+    engines: {node: '>=0.6'}
+    dev: true
+
   registry.npmmirror.com/queue-microtask/1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz}
     name: queue-microtask
     version: 1.2.3
     dev: true
 
+  registry.npmmirror.com/quick-lru/4.0.1:
+    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/quick-lru/-/quick-lru-4.0.1.tgz}
+    name: quick-lru
+    version: 4.0.1
+    engines: {node: '>=8'}
+    dev: true
+
+  registry.npmmirror.com/read-pkg-up/7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz}
+    name: read-pkg-up
+    version: 7.0.1
+    engines: {node: '>=8'}
+    dependencies:
+      find-up: registry.npmmirror.com/find-up/4.1.0
+      read-pkg: registry.npmmirror.com/read-pkg/5.2.0
+      type-fest: registry.npmmirror.com/type-fest/0.8.1
+    dev: true
+
+  registry.npmmirror.com/read-pkg/5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz}
+    name: read-pkg
+    version: 5.2.0
+    engines: {node: '>=8'}
+    dependencies:
+      '@types/normalize-package-data': registry.npmmirror.com/@types/normalize-package-data/2.4.1
+      normalize-package-data: registry.npmmirror.com/normalize-package-data/2.5.0
+      parse-json: registry.npmmirror.com/parse-json/5.2.0
+      type-fest: registry.npmmirror.com/type-fest/0.6.0
+    dev: true
+
+  registry.npmmirror.com/readable-stream/2.3.7:
+    resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz}
+    name: readable-stream
+    version: 2.3.7
+    dependencies:
+      core-util-is: registry.npmmirror.com/core-util-is/1.0.3
+      inherits: registry.npmmirror.com/inherits/2.0.4
+      isarray: registry.npmmirror.com/isarray/1.0.0
+      process-nextick-args: registry.npmmirror.com/process-nextick-args/2.0.1
+      safe-buffer: registry.npmmirror.com/safe-buffer/5.1.2
+      string_decoder: registry.npmmirror.com/string_decoder/1.1.1
+      util-deprecate: registry.npmmirror.com/util-deprecate/1.0.2
+    dev: true
+
+  registry.npmmirror.com/readable-stream/3.6.0:
+    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz}
+    name: readable-stream
+    version: 3.6.0
+    engines: {node: '>= 6'}
+    dependencies:
+      inherits: registry.npmmirror.com/inherits/2.0.4
+      string_decoder: registry.npmmirror.com/string_decoder/1.3.0
+      util-deprecate: registry.npmmirror.com/util-deprecate/1.0.2
+    dev: true
+
   registry.npmmirror.com/readdirp/3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz}
     name: readdirp
@@ -2511,6 +3807,16 @@ packages:
       picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
+  registry.npmmirror.com/redent/3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz}
+    name: redent
+    version: 3.0.0
+    engines: {node: '>=8'}
+    dependencies:
+      indent-string: registry.npmmirror.com/indent-string/4.0.0
+      strip-indent: registry.npmmirror.com/strip-indent/3.0.0
+    dev: true
+
   registry.npmmirror.com/regexpp/3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz}
     name: regexpp
@@ -2524,6 +3830,42 @@ packages:
     version: 0.5.8
     dev: true
 
+  registry.npmmirror.com/request/2.88.2:
+    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/request/-/request-2.88.2.tgz}
+    name: request
+    version: 2.88.2
+    engines: {node: '>= 6'}
+    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
+    dependencies:
+      aws-sign2: registry.npmmirror.com/aws-sign2/0.7.0
+      aws4: registry.npmmirror.com/aws4/1.11.0
+      caseless: registry.npmmirror.com/caseless/0.12.0
+      combined-stream: registry.npmmirror.com/combined-stream/1.0.8
+      extend: registry.npmmirror.com/extend/3.0.2
+      forever-agent: registry.npmmirror.com/forever-agent/0.6.1
+      form-data: registry.npmmirror.com/form-data/2.3.3
+      har-validator: registry.npmmirror.com/har-validator/5.1.5
+      http-signature: registry.npmmirror.com/http-signature/1.2.0
+      is-typedarray: registry.npmmirror.com/is-typedarray/1.0.0
+      isstream: registry.npmmirror.com/isstream/0.1.2
+      json-stringify-safe: registry.npmmirror.com/json-stringify-safe/5.0.1
+      mime-types: registry.npmmirror.com/mime-types/2.1.35
+      oauth-sign: registry.npmmirror.com/oauth-sign/0.9.0
+      performance-now: registry.npmmirror.com/performance-now/2.1.0
+      qs: registry.npmmirror.com/qs/6.5.3
+      safe-buffer: registry.npmmirror.com/safe-buffer/5.2.1
+      tough-cookie: registry.npmmirror.com/tough-cookie/2.5.0
+      tunnel-agent: registry.npmmirror.com/tunnel-agent/0.6.0
+      uuid: registry.npmmirror.com/uuid/3.4.0
+    dev: true
+
+  registry.npmmirror.com/require-directory/2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz}
+    name: require-directory
+    version: 2.1.1
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   registry.npmmirror.com/resolve-from/4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz}
     name: resolve-from
@@ -2542,6 +3884,13 @@ packages:
       supports-preserve-symlinks-flag: registry.npmmirror.com/supports-preserve-symlinks-flag/1.0.0
     dev: true
 
+  registry.npmmirror.com/retry/0.12.0:
+    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/retry/-/retry-0.12.0.tgz}
+    name: retry
+    version: 0.12.0
+    engines: {node: '>= 4'}
+    dev: true
+
   registry.npmmirror.com/reusify/1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz}
     name: reusify
@@ -2576,6 +3925,93 @@ packages:
       queue-microtask: registry.npmmirror.com/queue-microtask/1.2.3
     dev: true
 
+  registry.npmmirror.com/safe-buffer/5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz}
+    name: safe-buffer
+    version: 5.1.2
+    dev: true
+
+  registry.npmmirror.com/safe-buffer/5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz}
+    name: safe-buffer
+    version: 5.2.1
+    dev: true
+
+  registry.npmmirror.com/safer-buffer/2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz}
+    name: safer-buffer
+    version: 2.1.2
+    dev: true
+
+  registry.npmmirror.com/sass-graph/4.0.0:
+    resolution: {integrity: sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass-graph/-/sass-graph-4.0.0.tgz}
+    name: sass-graph
+    version: 4.0.0
+    engines: {node: '>=12'}
+    hasBin: true
+    dependencies:
+      glob: registry.npmmirror.com/glob/7.2.0
+      lodash: registry.npmmirror.com/lodash/4.17.21
+      scss-tokenizer: registry.npmmirror.com/scss-tokenizer/0.3.0
+      yargs: registry.npmmirror.com/yargs/17.4.1
+    dev: true
+
+  registry.npmmirror.com/sass-loader/12.6.0_node-sass@7.0.1+sass@1.50.1:
+    resolution: {integrity: sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass-loader/-/sass-loader-12.6.0.tgz}
+    id: registry.npmmirror.com/sass-loader/12.6.0
+    name: sass-loader
+    version: 12.6.0
+    engines: {node: '>= 12.13.0'}
+    peerDependencies:
+      fibers: '>= 3.1.0'
+      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+      sass: ^1.3.0
+      sass-embedded: '*'
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      fibers:
+        optional: true
+      node-sass:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+    dependencies:
+      klona: registry.npmmirror.com/klona/2.0.5
+      neo-async: registry.npmmirror.com/neo-async/2.6.2
+      node-sass: registry.npmmirror.com/node-sass/7.0.1
+      sass: registry.npmmirror.com/sass/1.50.1
+    dev: true
+
+  registry.npmmirror.com/sass/1.50.1:
+    resolution: {integrity: sha512-noTnY41KnlW2A9P8sdwESpDmo+KBNkukI1i8+hOK3footBUcohNHtdOJbckp46XO95nuvcHDDZ+4tmOnpK3hjw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass/-/sass-1.50.1.tgz}
+    name: sass
+    version: 1.50.1
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+    dependencies:
+      chokidar: registry.npmmirror.com/chokidar/3.5.3
+      immutable: registry.npmmirror.com/immutable/4.0.0
+      source-map-js: registry.npmmirror.com/source-map-js/1.0.2
+    dev: true
+
+  registry.npmmirror.com/scss-tokenizer/0.3.0:
+    resolution: {integrity: sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz}
+    name: scss-tokenizer
+    version: 0.3.0
+    dependencies:
+      js-base64: registry.npmmirror.com/js-base64/2.6.4
+      source-map: registry.npmmirror.com/source-map/0.7.3
+    dev: true
+
+  registry.npmmirror.com/semver/5.7.1:
+    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz}
+    name: semver
+    version: 5.7.1
+    hasBin: true
+    dev: true
+
   registry.npmmirror.com/semver/7.3.7:
     resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz}
     name: semver
@@ -2586,6 +4022,12 @@ packages:
       lru-cache: registry.npmmirror.com/lru-cache/6.0.0
     dev: true
 
+  registry.npmmirror.com/set-blocking/2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz}
+    name: set-blocking
+    version: 2.0.0
+    dev: true
+
   registry.npmmirror.com/shebang-command/2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz}
     name: shebang-command
@@ -2612,6 +4054,12 @@ packages:
       object-inspect: registry.npmmirror.com/object-inspect/1.12.0
     dev: false
 
+  registry.npmmirror.com/signal-exit/3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz}
+    name: signal-exit
+    version: 3.0.7
+    dev: true
+
   registry.npmmirror.com/slash/3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz}
     name: slash
@@ -2619,6 +4067,36 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  registry.npmmirror.com/smart-buffer/4.2.0:
+    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/smart-buffer/-/smart-buffer-4.2.0.tgz}
+    name: smart-buffer
+    version: 4.2.0
+    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
+    dev: true
+
+  registry.npmmirror.com/socks-proxy-agent/6.2.0:
+    resolution: {integrity: sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz}
+    name: socks-proxy-agent
+    version: 6.2.0
+    engines: {node: '>= 10'}
+    dependencies:
+      agent-base: registry.npmmirror.com/agent-base/6.0.2
+      debug: registry.npmmirror.com/debug/4.3.4
+      socks: registry.npmmirror.com/socks/2.6.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  registry.npmmirror.com/socks/2.6.2:
+    resolution: {integrity: sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/socks/-/socks-2.6.2.tgz}
+    name: socks
+    version: 2.6.2
+    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
+    dependencies:
+      ip: registry.npmmirror.com/ip/1.1.5
+      smart-buffer: registry.npmmirror.com/smart-buffer/4.2.0
+    dev: true
+
   registry.npmmirror.com/source-map-js/1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz}
     name: source-map-js
@@ -2631,11 +4109,75 @@ packages:
     version: 0.6.1
     engines: {node: '>=0.10.0'}
 
+  registry.npmmirror.com/source-map/0.7.3:
+    resolution: {integrity: sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map/-/source-map-0.7.3.tgz}
+    name: source-map
+    version: 0.7.3
+    engines: {node: '>= 8'}
+    dev: true
+
   registry.npmmirror.com/sourcemap-codec/1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz}
     name: sourcemap-codec
     version: 1.4.8
 
+  registry.npmmirror.com/spdx-correct/3.1.1:
+    resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.1.1.tgz}
+    name: spdx-correct
+    version: 3.1.1
+    dependencies:
+      spdx-expression-parse: registry.npmmirror.com/spdx-expression-parse/3.0.1
+      spdx-license-ids: registry.npmmirror.com/spdx-license-ids/3.0.11
+    dev: true
+
+  registry.npmmirror.com/spdx-exceptions/2.3.0:
+    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz}
+    name: spdx-exceptions
+    version: 2.3.0
+    dev: true
+
+  registry.npmmirror.com/spdx-expression-parse/3.0.1:
+    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz}
+    name: spdx-expression-parse
+    version: 3.0.1
+    dependencies:
+      spdx-exceptions: registry.npmmirror.com/spdx-exceptions/2.3.0
+      spdx-license-ids: registry.npmmirror.com/spdx-license-ids/3.0.11
+    dev: true
+
+  registry.npmmirror.com/spdx-license-ids/3.0.11:
+    resolution: {integrity: sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz}
+    name: spdx-license-ids
+    version: 3.0.11
+    dev: true
+
+  registry.npmmirror.com/sshpk/1.17.0:
+    resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz}
+    name: sshpk
+    version: 1.17.0
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+    dependencies:
+      asn1: registry.npmmirror.com/asn1/0.2.6
+      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
+      bcrypt-pbkdf: registry.npmmirror.com/bcrypt-pbkdf/1.0.2
+      dashdash: registry.npmmirror.com/dashdash/1.14.1
+      ecc-jsbn: registry.npmmirror.com/ecc-jsbn/0.1.2
+      getpass: registry.npmmirror.com/getpass/0.1.7
+      jsbn: registry.npmmirror.com/jsbn/0.1.1
+      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
+      tweetnacl: registry.npmmirror.com/tweetnacl/0.14.5
+    dev: true
+
+  registry.npmmirror.com/ssri/8.0.1:
+    resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz}
+    name: ssri
+    version: 8.0.1
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: registry.npmmirror.com/minipass/3.1.6
+    dev: true
+
   registry.npmmirror.com/statuses/1.5.0:
     resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz}
     name: statuses
@@ -2643,6 +4185,41 @@ packages:
     engines: {node: '>= 0.6'}
     dev: true
 
+  registry.npmmirror.com/stdout-stream/1.4.1:
+    resolution: {integrity: sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz}
+    name: stdout-stream
+    version: 1.4.1
+    dependencies:
+      readable-stream: registry.npmmirror.com/readable-stream/2.3.7
+    dev: true
+
+  registry.npmmirror.com/string-width/4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz}
+    name: string-width
+    version: 4.2.3
+    engines: {node: '>=8'}
+    dependencies:
+      emoji-regex: registry.npmmirror.com/emoji-regex/8.0.0
+      is-fullwidth-code-point: registry.npmmirror.com/is-fullwidth-code-point/3.0.0
+      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
+    dev: true
+
+  registry.npmmirror.com/string_decoder/1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz}
+    name: string_decoder
+    version: 1.1.1
+    dependencies:
+      safe-buffer: registry.npmmirror.com/safe-buffer/5.1.2
+    dev: true
+
+  registry.npmmirror.com/string_decoder/1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz}
+    name: string_decoder
+    version: 1.3.0
+    dependencies:
+      safe-buffer: registry.npmmirror.com/safe-buffer/5.2.1
+    dev: true
+
   registry.npmmirror.com/strip-ansi/6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz}
     name: strip-ansi
@@ -2652,6 +4229,15 @@ packages:
       ansi-regex: registry.npmmirror.com/ansi-regex/5.0.1
     dev: true
 
+  registry.npmmirror.com/strip-indent/3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-indent/-/strip-indent-3.0.0.tgz}
+    name: strip-indent
+    version: 3.0.0
+    engines: {node: '>=8'}
+    dependencies:
+      min-indent: registry.npmmirror.com/min-indent/1.0.1
+    dev: true
+
   registry.npmmirror.com/strip-json-comments/3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz}
     name: strip-json-comments
@@ -2659,6 +4245,15 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  registry.npmmirror.com/supports-color/5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz}
+    name: supports-color
+    version: 5.5.0
+    engines: {node: '>=4'}
+    dependencies:
+      has-flag: registry.npmmirror.com/has-flag/3.0.0
+    dev: true
+
   registry.npmmirror.com/supports-color/7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz}
     name: supports-color
@@ -2675,6 +4270,20 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
+  registry.npmmirror.com/tar/6.1.11:
+    resolution: {integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tar/-/tar-6.1.11.tgz}
+    name: tar
+    version: 6.1.11
+    engines: {node: '>= 10'}
+    dependencies:
+      chownr: registry.npmmirror.com/chownr/2.0.0
+      fs-minipass: registry.npmmirror.com/fs-minipass/2.1.0
+      minipass: registry.npmmirror.com/minipass/3.1.6
+      minizlib: registry.npmmirror.com/minizlib/2.1.2
+      mkdirp: registry.npmmirror.com/mkdirp/1.0.4
+      yallist: registry.npmmirror.com/yallist/4.0.0
+    dev: true
+
   registry.npmmirror.com/text-table/0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz}
     name: text-table
@@ -2703,6 +4312,31 @@ packages:
     version: 1.0.0
     dev: true
 
+  registry.npmmirror.com/tough-cookie/2.5.0:
+    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz}
+    name: tough-cookie
+    version: 2.5.0
+    engines: {node: '>=0.8'}
+    dependencies:
+      psl: registry.npmmirror.com/psl/1.8.0
+      punycode: registry.npmmirror.com/punycode/2.1.1
+    dev: true
+
+  registry.npmmirror.com/trim-newlines/3.0.1:
+    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/trim-newlines/-/trim-newlines-3.0.1.tgz}
+    name: trim-newlines
+    version: 3.0.1
+    engines: {node: '>=8'}
+    dev: true
+
+  registry.npmmirror.com/true-case-path/1.0.3:
+    resolution: {integrity: sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/true-case-path/-/true-case-path-1.0.3.tgz}
+    name: true-case-path
+    version: 1.0.3
+    dependencies:
+      glob: registry.npmmirror.com/glob/7.2.0
+    dev: true
+
   registry.npmmirror.com/tslib/1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz}
     name: tslib
@@ -2722,6 +4356,20 @@ packages:
       typescript: registry.npmmirror.com/typescript/4.6.3
     dev: true
 
+  registry.npmmirror.com/tunnel-agent/0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz}
+    name: tunnel-agent
+    version: 0.6.0
+    dependencies:
+      safe-buffer: registry.npmmirror.com/safe-buffer/5.2.1
+    dev: true
+
+  registry.npmmirror.com/tweetnacl/0.14.5:
+    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz}
+    name: tweetnacl
+    version: 0.14.5
+    dev: true
+
   registry.npmmirror.com/type-check/0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz}
     name: type-check
@@ -2731,6 +4379,13 @@ packages:
       prelude-ls: registry.npmmirror.com/prelude-ls/1.2.1
     dev: true
 
+  registry.npmmirror.com/type-fest/0.18.1:
+    resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz}
+    name: type-fest
+    version: 0.18.1
+    engines: {node: '>=10'}
+    dev: true
+
   registry.npmmirror.com/type-fest/0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz}
     name: type-fest
@@ -2738,6 +4393,20 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  registry.npmmirror.com/type-fest/0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz}
+    name: type-fest
+    version: 0.6.0
+    engines: {node: '>=8'}
+    dev: true
+
+  registry.npmmirror.com/type-fest/0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz}
+    name: type-fest
+    version: 0.8.1
+    engines: {node: '>=8'}
+    dev: true
+
   registry.npmmirror.com/typescript/4.6.3:
     resolution: {integrity: sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/typescript/-/typescript-4.6.3.tgz}
     name: typescript
@@ -2746,6 +4415,22 @@ packages:
     hasBin: true
     dev: true
 
+  registry.npmmirror.com/unique-filename/1.1.1:
+    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unique-filename/-/unique-filename-1.1.1.tgz}
+    name: unique-filename
+    version: 1.1.1
+    dependencies:
+      unique-slug: registry.npmmirror.com/unique-slug/2.0.2
+    dev: true
+
+  registry.npmmirror.com/unique-slug/2.0.2:
+    resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unique-slug/-/unique-slug-2.0.2.tgz}
+    name: unique-slug
+    version: 2.0.2
+    dependencies:
+      imurmurhash: registry.npmmirror.com/imurmurhash/0.1.4
+    dev: true
+
   registry.npmmirror.com/unpipe/1.0.0:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz}
     name: unpipe
@@ -2834,7 +4519,7 @@ packages:
         optional: true
     dependencies:
       chokidar: registry.npmmirror.com/chokidar/3.5.3
-      vite: registry.npmmirror.com/vite/2.9.5
+      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
       webpack-sources: registry.npmmirror.com/webpack-sources/3.2.3
       webpack-virtual-modules: registry.npmmirror.com/webpack-virtual-modules/0.4.3
     dev: true
@@ -2854,6 +4539,12 @@ packages:
       punycode: registry.npmmirror.com/punycode/2.1.1
     dev: true
 
+  registry.npmmirror.com/util-deprecate/1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz}
+    name: util-deprecate
+    version: 1.0.2
+    dev: true
+
   registry.npmmirror.com/utils-merge/1.0.1:
     resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz}
     name: utils-merge
@@ -2861,12 +4552,40 @@ packages:
     engines: {node: '>= 0.4.0'}
     dev: true
 
+  registry.npmmirror.com/uuid/3.4.0:
+    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz}
+    name: uuid
+    version: 3.4.0
+    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
+    hasBin: true
+    dev: true
+
   registry.npmmirror.com/v8-compile-cache/2.3.0:
     resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz}
     name: v8-compile-cache
     version: 2.3.0
     dev: true
 
+  registry.npmmirror.com/validate-npm-package-license/3.0.4:
+    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz}
+    name: validate-npm-package-license
+    version: 3.0.4
+    dependencies:
+      spdx-correct: registry.npmmirror.com/spdx-correct/3.1.1
+      spdx-expression-parse: registry.npmmirror.com/spdx-expression-parse/3.0.1
+    dev: true
+
+  registry.npmmirror.com/verror/1.10.0:
+    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/verror/-/verror-1.10.0.tgz}
+    name: verror
+    version: 1.10.0
+    engines: {'0': node >=0.6.0}
+    dependencies:
+      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
+      core-util-is: registry.npmmirror.com/core-util-is/1.0.2
+      extsprintf: registry.npmmirror.com/extsprintf/1.3.0
+    dev: true
+
   registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5:
     resolution: {integrity: sha512-EeA09UuA2E66WbbcgOFkfvEZ/SJVrTxP+syRwrX+L+jeMMPpi1W1ZIR5mMtPr4I8evaD4WrszWkPZPOW8amFpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-eslint/-/vite-plugin-eslint-1.4.0.tgz}
     id: registry.npmmirror.com/vite-plugin-eslint/1.4.0
@@ -2879,7 +4598,7 @@ packages:
       '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
       eslint: registry.npmmirror.com/eslint/8.13.0
       rollup: registry.npmmirror.com/rollup/2.70.2
-      vite: registry.npmmirror.com/vite/2.9.5
+      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
     dev: true
 
   registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.5:
@@ -2902,7 +4621,7 @@ packages:
       fast-glob: registry.npmmirror.com/fast-glob/3.2.11
       mockjs: registry.npmmirror.com/mockjs/1.1.0
       path-to-regexp: registry.npmmirror.com/path-to-regexp/6.2.0
-      vite: registry.npmmirror.com/vite/2.9.5
+      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -2918,11 +4637,12 @@ packages:
     dependencies:
       '@vue/compiler-sfc': registry.npmmirror.com/@vue/compiler-sfc/3.2.33
       magic-string: registry.npmmirror.com/magic-string/0.25.9
-      vite: registry.npmmirror.com/vite/2.9.5
+      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
     dev: true
 
-  registry.npmmirror.com/vite/2.9.5:
+  registry.npmmirror.com/vite/2.9.5_sass@1.50.1:
     resolution: {integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-2.9.5.tgz}
+    id: registry.npmmirror.com/vite/2.9.5
     name: vite
     version: 2.9.5
     engines: {node: '>=12.2.0'}
@@ -2943,6 +4663,7 @@ packages:
       postcss: registry.npmmirror.com/postcss/8.4.12
       resolve: registry.npmmirror.com/resolve/1.22.0
       rollup: registry.npmmirror.com/rollup/2.70.2
+      sass: registry.npmmirror.com/sass/1.50.1
     optionalDependencies:
       fsevents: registry.npmmirror.com/fsevents/2.3.2
     dev: true
@@ -3203,6 +4924,14 @@ packages:
       isexe: registry.npmmirror.com/isexe/2.0.0
     dev: true
 
+  registry.npmmirror.com/wide-align/1.1.5:
+    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wide-align/-/wide-align-1.1.5.tgz}
+    name: wide-align
+    version: 1.1.5
+    dependencies:
+      string-width: registry.npmmirror.com/string-width/4.2.3
+    dev: true
+
   registry.npmmirror.com/with/7.0.2:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/with/-/with-7.0.2.tgz}
     name: with
@@ -3222,14 +4951,61 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  registry.npmmirror.com/wrap-ansi/7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz}
+    name: wrap-ansi
+    version: 7.0.0
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-styles: registry.npmmirror.com/ansi-styles/4.3.0
+      string-width: registry.npmmirror.com/string-width/4.2.3
+      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
+    dev: true
+
   registry.npmmirror.com/wrappy/1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz}
     name: wrappy
     version: 1.0.2
     dev: true
 
+  registry.npmmirror.com/y18n/5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz}
+    name: y18n
+    version: 5.0.8
+    engines: {node: '>=10'}
+    dev: true
+
   registry.npmmirror.com/yallist/4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz}
     name: yallist
     version: 4.0.0
     dev: true
+
+  registry.npmmirror.com/yargs-parser/20.2.9:
+    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz}
+    name: yargs-parser
+    version: 20.2.9
+    engines: {node: '>=10'}
+    dev: true
+
+  registry.npmmirror.com/yargs-parser/21.0.1:
+    resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yargs-parser/-/yargs-parser-21.0.1.tgz}
+    name: yargs-parser
+    version: 21.0.1
+    engines: {node: '>=12'}
+    dev: true
+
+  registry.npmmirror.com/yargs/17.4.1:
+    resolution: {integrity: sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yargs/-/yargs-17.4.1.tgz}
+    name: yargs
+    version: 17.4.1
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: registry.npmmirror.com/cliui/7.0.4
+      escalade: registry.npmmirror.com/escalade/3.1.1
+      get-caller-file: registry.npmmirror.com/get-caller-file/2.0.5
+      require-directory: registry.npmmirror.com/require-directory/2.1.1
+      string-width: registry.npmmirror.com/string-width/4.2.3
+      y18n: registry.npmmirror.com/y18n/5.0.8
+      yargs-parser: registry.npmmirror.com/yargs-parser/21.0.1
+    dev: true
-- 
Gitee


From cd35163f9ff41c99c640cd00ce43a3a7e442293d Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 24 Apr 2022 23:40:47 +0800
Subject: [PATCH 043/195] + add unplugin-element-plus

---
 diboot-admin-ui/package.json   |  1 +
 diboot-admin-ui/pnpm-lock.yaml | 26 ++++++++++++++++++++++++++
 diboot-admin-ui/src/main.ts    |  1 -
 diboot-admin-ui/vite.config.ts |  2 ++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index ccce4282..076b03f4 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -38,6 +38,7 @@
     "sass-loader": "^12.6.0",
     "typescript": "^4.5.4",
     "unplugin-auto-import": "^0.7.1",
+    "unplugin-element-plus": "^0.4.0",
     "unplugin-vue-components": "^0.19.3",
     "vite": "^2.9.2",
     "vite-plugin-eslint": "^1.4.0",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index df0eb798..8a630dbc 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -26,6 +26,7 @@ specifiers:
   sass-loader: ^12.6.0
   typescript: ^4.5.4
   unplugin-auto-import: ^0.7.1
+  unplugin-element-plus: ^0.4.0
   unplugin-vue-components: ^0.19.3
   vite: ^2.9.2
   vite-plugin-eslint: ^1.4.0
@@ -65,6 +66,7 @@ devDependencies:
   sass-loader: registry.npmmirror.com/sass-loader/12.6.0_node-sass@7.0.1+sass@1.50.1
   typescript: registry.npmmirror.com/typescript/4.6.3
   unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_vite@2.9.5
+  unplugin-element-plus: registry.npmmirror.com/unplugin-element-plus/0.4.0_vite@2.9.5
   unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33
   vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
@@ -1579,6 +1581,12 @@ packages:
       is-arrayish: registry.npmmirror.com/is-arrayish/0.2.1
     dev: true
 
+  registry.npmmirror.com/es-module-lexer/0.10.5:
+    resolution: {integrity: sha512-+7IwY/kiGAacQfY+YBhKMvEmyAJnw5grTUgjG85Pe7vcUI/6b7pZjZG8nQ7+48YhzEAEqrEgD2dCz/JIK+AYvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.10.5.tgz}
+    name: es-module-lexer
+    version: 0.10.5
+    dev: true
+
   registry.npmmirror.com/esbuild-android-64/0.14.36:
     resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
     name: esbuild-android-64
@@ -4463,6 +4471,24 @@ packages:
       - webpack
     dev: true
 
+  registry.npmmirror.com/unplugin-element-plus/0.4.0_vite@2.9.5:
+    resolution: {integrity: sha512-iE4EZu8pp5Vz/qb9r45sCNSz9Px6KOthBpe6gFBV1E60g9A45HS+JhwAaj4Zki8HZ0YGW3LyrsBCrd+XhOypnQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-element-plus/-/unplugin-element-plus-0.4.0.tgz}
+    id: registry.npmmirror.com/unplugin-element-plus/0.4.0
+    name: unplugin-element-plus
+    version: 0.4.0
+    engines: {node: '>=14.17.0'}
+    dependencies:
+      '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
+      es-module-lexer: registry.npmmirror.com/es-module-lexer/0.10.5
+      magic-string: registry.npmmirror.com/magic-string/0.26.1
+      unplugin: registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5
+    transitivePeerDependencies:
+      - esbuild
+      - rollup
+      - vite
+      - webpack
+    dev: true
+
   registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33:
     resolution: {integrity: sha512-z/kpYJnqrJuWglDNs7fy0YRHr41oLc07y2TkP3by6DqPb1GG9xGC9SFigeFwd4J7GVTqyFVsnjoeup7uK7I2dA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.19.3.tgz}
     id: registry.npmmirror.com/unplugin-vue-components/0.19.3
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index 24b07459..246ac44f 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -6,5 +6,4 @@ app.use(router)
 app.use(createPinia())
 app.mount('#app')
 
-import 'element-plus/es/components/message/style/css'
 import 'nprogress/nprogress.css'
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 8425e30d..c2225ac4 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -5,6 +5,7 @@ import eslintPlugin from 'vite-plugin-eslint/dist'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
+import ElementPlus from 'unplugin-element-plus/vite'
 import { viteMockServe } from 'vite-plugin-mock'
 import { resolve } from 'path'
 
@@ -36,6 +37,7 @@ export default defineConfig(({ command }) => {
         // 导入路径变换
         importPathTransform: path => path.replace(/^.+\/src/g, '@')
       }),
+      ElementPlus({ useSource: false }),
       viteMockServe({
         // 忽略以_开头的文件及目录
         ignore: /^_|\/_/,
-- 
Gitee


From 7dcc53ec2489c25e3fa8e206ce9b1a3bc442c76d Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Mon, 25 Apr 2022 16:16:20 +0800
Subject: [PATCH 044/195] =?UTF-8?q?*=20iam=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9D=83=E9=99=90code=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/diboot/iam/starter/IamPluginInitializer.java     | 4 ++--
 .../src/main/resources/META-INF/sql/init-iam-mysql.sql        | 2 +-
 diboot-mobile-ui/pages/component-page/index.vue               | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
index 64b2a0c0..94ab4b9a 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
@@ -99,8 +99,8 @@ public class IamPluginInitializer implements ApplicationRunner {
         IamResourcePermissionService resourcePermissionService = ContextHelper.getBean(IamResourcePermissionService.class);
         if(resourcePermissionService != null && !resourcePermissionService.exists(IamResourcePermission::getResourceCode, "system")){
             String[] RESOURCE_PERMISSION_DATA = {
-                    "{\"displayType\":\"MENU\",\"displayName\":\"系统管理\",\"resourceCode\":\"system\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"数据字典管理\",\"resourceCode\":\"Dictionary\",\"apiSet\":\"GET:/dictionary/list\",\"sortId\":\"10030\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/dictionary/{id}\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/dictionary/\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/dictionary/{id},GET:/dictionary/{id}\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/dictionary/{id}\",\"sortId\":\"3\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统用户管理\",\"resourceCode\":\"IamUser\",\"apiSet\":\"GET:/iam/user/list\",\"sortId\":\"10029\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"部门查看\",\"resourceCode\":\"orgTree\",\"apiSet\":\"GET:/iam/org/tree\",\"sortId\":\"12\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/user/{id}\",\"sortId\":\"11\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/user/\",\"sortId\":\"10\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/user/{id},GET:/iam/user/{id}\",\"sortId\":\"9\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/user/{id}\",\"sortId\":\"8\"}]},{\"displayType\":\"MENU\",\"displayName\":\"角色资源管理\",\"resourceCode\":\"IamRole\",\"apiSet\":\"GET:/iam/role/list\",\"sortId\":\"10023\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/role/{id}\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/role/\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/role/{id},GET:/iam/role/{id},GET:/iam/resourcePermission/list\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/role/{id}\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"资源权限管理\",\"resourceCode\":\"IamResourcePermission\",\"apiSet\":\"GET:/iam/resourcePermission/list\",\"sortId\":\"10017\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/resourcePermission/{id}\",\"sortId\":\"23\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/resourcePermission/\",\"sortId\":\"21\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/resourcePermission/{id},GET:/iam/resourcePermission/{id}\",\"sortId\":\"20\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/resourcePermission/{id}\",\"sortId\":\"19\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"apiSet\":\"POST:/iam/resourcePermission/sortList\",\"sortId\":\"18\"}]},{\"displayType\":\"MENU\",\"displayName\":\"定时任务管理\",\"resourceCode\":\"ScheduleJob\",\"apiSet\":\"GET:/scheduleJob/list\",\"sortId\":\"10012\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/scheduleJob/{id}\",\"sortId\":\"7\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/scheduleJob/{id}/{action},GET:/scheduleJob/{id}\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/scheduleJob/\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/scheduleJob/{id},GET:/scheduleJob/log/list,GET:/scheduleJob/log/{id}\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"运行一次\",\"resourceCode\":\"executeOnce\",\"apiSet\":\"PUT:/scheduleJob/executeOnce/{id}\",\"sortId\":\"3\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志记录\",\"resourceCode\":\"logList\",\"apiSet\":\"GET:/scheduleJob/log/list,GET:/scheduleJob/log/{id}\",\"sortId\":\"2\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志删除\",\"resourceCode\":\"logDelete\",\"apiSet\":\"DELETE:/scheduleJob/log/{id}\",\"sortId\":\"1\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息模板管理\",\"resourceCode\":\"MessageTemplate\",\"apiSet\":\"GET:/messageTemplate/list\",\"sortId\":\"10010\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/messageTemplate/{id}\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/messageTemplate/\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/messageTemplate/{id},GET:/messageTemplate/{id}\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/messageTemplate/{id}\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息记录管理\",\"resourceCode\":\"Message\",\"apiSet\":\"GET:/message/list\",\"sortId\":\"10009\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/message/{id}\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"上传文件管理\",\"resourceCode\":\"UploadFile\",\"apiSet\":\"GET:/uploadFile/list\",\"sortId\":\"10008\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/uploadFile/{id}\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/uploadFile/{id},GET:/uploadFile/{id}\",\"sortId\":\"14\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统配置管理\",\"resourceCode\":\"SystemConfig\",\"apiSet\":\"GET:/systemConfig/typeList,GET:/systemConfig/{type}\",\"sortId\":\"10007\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"POST:/systemConfig,DELETE:/systemConfig/{type},DELETE:/systemConfig/{type}/{prop},POST:/systemConfig/{type}\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"操作日志查看\",\"resourceCode\":\"IamOperationLog\",\"apiSet\":\"GET:/iam/operationLog/list\",\"sortId\":\"10006\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/operationLog/{id}\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"登录日志查看\",\"resourceCode\":\"IamLoginTrace\",\"apiSet\":\"GET:/iam/loginTrace/list\",\"sortId\":\"10001\",\"children\":[]}]}",
-                    "{\"displayType\":\"MENU\",\"displayName\":\"组织机构\",\"resourceCode\":\"orgStructure\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"组织机构管理\",\"resourceCode\":\"IamOrg\",\"apiSet\":\"POST:/iam/org/sortList,GET:/iam/org/tree,GET:/iam/org/tree/{parentNodeId},GET:/iam/org/list\",\"sortId\":\"10044\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"apiSet\":\"POST:/iam/org/sortList\",\"sortId\":\"106\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/org/{id}\",\"sortId\":\"105\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/org/{id},GET:/iam/org/{id}\",\"sortId\":\"104\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/org/\",\"sortId\":\"103\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/org/{id}\",\"sortId\":\"102\"}]},{\"displayType\":\"MENU\",\"displayName\":\"岗位管理\",\"resourceCode\":\"IamPosition\",\"apiSet\":\"GET:/iam/position/list\",\"sortId\":\"10038\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/position/{id}\",\"sortId\":\"112\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/position/{id}\",\"sortId\":\"111\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/position/{id},GET:/iam/position/{id}\",\"sortId\":\"110\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/position/\",\"sortId\":\"108\"}]},{\"displayType\":\"MENU\",\"displayName\":\"组织人员管理\",\"resourceCode\":\"IamOrgUser\",\"apiSet\":\"GET:/iam/org/tree,GET:/iam/user/list\",\"sortId\":\"10032\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/user/\",\"sortId\":\"40\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/user/{id},GET:/iam/user/{id}\",\"sortId\":\"39\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/user/{id}\",\"sortId\":\"38\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/user/{id}\",\"sortId\":\"37\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导入\",\"resourceCode\":\"import\",\"apiSet\":\"POST:/iam/user/excel/previewSave,POST:/iam/user/excel/upload,POST:/iam/user/excel/preview,GET:/iam/user/excel/downloadExample\",\"sortId\":\"36\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导出\",\"resourceCode\":\"export\",\"apiSet\":\"GET:/iam/user/excel/export\",\"sortId\":\"35\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"人员岗位设置\",\"resourceCode\":\"position\",\"apiSet\":\"POST:/iam/position/batchUpdateUserPositionRelations,GET:/iam/position/listUserPositions/{userType}/{userId}\",\"sortId\":\"34\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"添加岗位\",\"resourceCode\":\"addPosition\",\"apiSet\":\"POST:/iam/position/\",\"sortId\":\"33\"}]}]}"
+                    "{\"displayType\":\"MENU\",\"displayName\":\"系统管理\",\"resourceCode\":\"system\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"数据字典管理\",\"resourceCode\":\"Dictionary\",\"permissionCode\":\"Dictionary:list\",\"sortId\":\"10030\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Dictionary:detail\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"Dictionary:create\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"Dictionary:update,Dictionary:detail\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"Dictionary:delete\",\"sortId\":\"3\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统用户管理\",\"resourceCode\":\"IamUser\",\"permissionCode\":\"IamUser:list\",\"sortId\":\"10029\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"部门查看\",\"resourceCode\":\"orgTree\",\"permissionCode\":\"IamUser:tree\",\"sortId\":\"12\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:detail\",\"sortId\":\"11\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:create\",\"sortId\":\"10\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:update,IamUser:detail\",\"sortId\":\"9\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:delete\",\"sortId\":\"8\"}]},{\"displayType\":\"MENU\",\"displayName\":\"角色资源管理\",\"resourceCode\":\"IamRole\",\"permissionCode\":\"IamRole:list\",\"sortId\":\"10023\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamRole:detail\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamRole:create\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamRole:update,IamRole:detail,IamResourcePermission:list\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamRole:delete\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"资源权限管理\",\"resourceCode\":\"IamResourcePermission\",\"permissionCode\":\"IamResourcePermission:list\",\"sortId\":\"10017\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamResourcePermission:detail\",\"sortId\":\"23\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamResourcePermission:create\",\"sortId\":\"21\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamResourcePermission:update,IamResourcePermission:detail\",\"sortId\":\"20\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamResourcePermission:delete\",\"sortId\":\"19\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamResourcePermission:update\",\"sortId\":\"18\"}]},{\"displayType\":\"MENU\",\"displayName\":\"定时任务管理\",\"resourceCode\":\"ScheduleJob\",\"permissionCode\":\"ScheduleJob:list\",\"sortId\":\"10012\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"ScheduleJob:delete\",\"sortId\":\"7\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"ScheduleJob:update,ScheduleJob:detail\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"ScheduleJob:create\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"ScheduleJob:detail,ScheduleJob:JOB_LOG_LIST,ScheduleJob:JOB_LOG_DETAIL\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"运行一次\",\"resourceCode\":\"executeOnce\",\"permissionCode\":\"ScheduleJob:EXECUTE_ONCE_JOB\",\"sortId\":\"3\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志记录\",\"resourceCode\":\"logList\",\"permissionCode\":\"ScheduleJob:JOB_LOG_LIST,ScheduleJob:JOB_LOG_DETAIL\",\"sortId\":\"2\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志删除\",\"resourceCode\":\"logDelete\",\"permissionCode\":\"ScheduleJob:JOB_LOG_DELETE\",\"sortId\":\"1\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息模板管理\",\"resourceCode\":\"MessageTemplate\",\"permissionCode\":\"MessageTemplate:list\",\"sortId\":\"10010\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"MessageTemplate:detail\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"MessageTemplate:create\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"MessageTemplate:update,MessageTemplate:detail\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"MessageTemplate:delete\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息记录管理\",\"resourceCode\":\"Message\",\"permissionCode\":\"Message:list\",\"sortId\":\"10009\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Message:detail\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"上传文件管理\",\"resourceCode\":\"UploadFile\",\"permissionCode\":\"UploadFile:list\",\"sortId\":\"10008\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"UploadFile:detail\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"UploadFile:update,UploadFile:detail\",\"sortId\":\"14\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统配置管理\",\"resourceCode\":\"SystemConfig\",\"permissionCode\":\"SystemConfig:list,SystemConfig:detail\",\"sortId\":\"10007\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"SystemConfig:update\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"操作日志查看\",\"resourceCode\":\"IamOperationLog\",\"permissionCode\":\"IamOperationLog:list\",\"sortId\":\"10006\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOperationLog:detail\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"登录日志查看\",\"resourceCode\":\"IamLoginTrace\",\"permissionCode\":\"IamLoginTrace:list\",\"sortId\":\"10001\",\"children\":[]}]}",
+                    "{\"displayType\":\"MENU\",\"displayName\":\"组织机构\",\"resourceCode\":\"orgStructure\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"组织机构管理\",\"resourceCode\":\"IamOrg\",\"permissionCode\":\"IamOrg:sort,IamOrg:tree,IamOrg:subTree,IamOrg:list\",\"sortId\":\"10044\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamOrg:sort\",\"sortId\":\"106\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamOrg:delete\",\"sortId\":\"105\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamOrg:update,IamOrg:detail\",\"sortId\":\"104\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamOrg:create\",\"sortId\":\"103\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOrg:detail\",\"sortId\":\"102\"}]},{\"displayType\":\"MENU\",\"displayName\":\"岗位管理\",\"resourceCode\":\"IamPosition\",\"permissionCode\":\"IamPosition:list\",\"sortId\":\"10038\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamPosition:delete\",\"sortId\":\"112\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamPosition:detail\",\"sortId\":\"111\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamPosition:update,IamPosition:detail\",\"sortId\":\"110\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamPosition:create\",\"sortId\":\"108\"}]},{\"displayType\":\"MENU\",\"displayName\":\"组织人员管理\",\"resourceCode\":\"IamOrgUser\",\"permissionCode\":\"IamOrg:tree,IamUser:list\",\"sortId\":\"10032\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:create\",\"sortId\":\"40\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:update,IamUser:detail\",\"sortId\":\"39\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:delete\",\"sortId\":\"38\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:detail\",\"sortId\":\"37\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导入\",\"resourceCode\":\"import\",\"permissionCode\":\"IamUserExcel:import\",\"sortId\":\"36\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导出\",\"resourceCode\":\"export\",\"permissionCode\":\"IamUserExcel:export\",\"sortId\":\"35\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"人员岗位设置\",\"resourceCode\":\"position\",\"permissionCode\":\"IamPosition:update,IamPosition:listByUserInfo\",\"sortId\":\"34\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"添加岗位\",\"resourceCode\":\"addPosition\",\"permissionCode\":\"IamPosition:create\",\"sortId\":\"33\"}]}]}"
             };
             // 插入多层级资源权限初始数据
             try {
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
index f58a3a38..8ee0641c 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
@@ -83,7 +83,7 @@ create table iam_resource_permission
   display_type  varchar(20)                          not null comment '展现类型',
   display_name  varchar(100)                         not null comment '显示名称',
   resource_code varchar(100)                         not null comment '前端编码',
-  permission_code varchar(100)                         not null comment '权限编码',
+  permission_code varchar(100)                       null comment '权限编码',
   sort_id       bigint                               null comment '排序号',
   is_deleted     tinyint(1)  default 0                 not null comment '是否删除',
   create_time    datetime   default CURRENT_TIMESTAMP not null comment '创建时间',
diff --git a/diboot-mobile-ui/pages/component-page/index.vue b/diboot-mobile-ui/pages/component-page/index.vue
index 50839c1b..47a4b2fe 100644
--- a/diboot-mobile-ui/pages/component-page/index.vue
+++ b/diboot-mobile-ui/pages/component-page/index.vue
@@ -36,7 +36,8 @@
 					},
 					{
 						icon: require('@/static/logo.png'),
-						title: '测试'
+						title: '测试',
+						path: '/pages/testPage/list'
 					},
 					{
 						icon: require('@/static/logo.png'),
-- 
Gitee


From 594f125e57903b2833d22566b64b19daddcaa35b Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Mon, 25 Apr 2022 16:18:05 +0800
Subject: [PATCH 045/195] =?UTF-8?q?-=20=E7=A7=BB=E9=99=A4mobile-ui?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-mobile-ui/pages/component-page/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/diboot-mobile-ui/pages/component-page/index.vue b/diboot-mobile-ui/pages/component-page/index.vue
index 47a4b2fe..50839c1b 100644
--- a/diboot-mobile-ui/pages/component-page/index.vue
+++ b/diboot-mobile-ui/pages/component-page/index.vue
@@ -36,8 +36,7 @@
 					},
 					{
 						icon: require('@/static/logo.png'),
-						title: '测试',
-						path: '/pages/testPage/list'
+						title: '测试'
 					},
 					{
 						icon: require('@/static/logo.png'),
-- 
Gitee


From 6375b6e63dca9c2d7dfa4fb13cc2a44baf572dd9 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 25 Apr 2022 16:43:32 +0800
Subject: [PATCH 046/195] =?UTF-8?q?*=20=E6=8E=A5=E5=8F=A3=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/iam/annotation/process/ApiPermissionExtractor.java   | 2 +-
 .../main/java/com/diboot/iam/entity/IamResourcePermission.java  | 2 +-
 .../main/java/com/diboot/iam/starter/IamPluginInitializer.java  | 1 +
 .../src/main/resources/META-INF/sql/init-iam-mysql.sql          | 2 +-
 .../src/main/resources/META-INF/sql/init-iam-oracle.sql         | 2 +-
 .../src/main/resources/META-INF/sql/init-iam-postgresql.sql     | 2 +-
 .../src/main/resources/META-INF/sql/init-iam-sqlserver.sql      | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
index 57487bf7..7bdfddb0 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
@@ -123,7 +123,7 @@ public class ApiPermissionExtractor {
             }
             if(bindPermission != null){
                 if(V.isEmpty(bindPermission.code())){
-                    log.warn("忽略无效的权限配置(未指定code): {}.{}", controllerClass.getClass().getSimpleName(), method.getName());
+                    log.warn("忽略无效的权限配置(未指定code): {}.{}", controllerClass.getSimpleName(), method.getName());
                     continue;
                 }
                 String name = bindPermission.name();
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
index 653bf1be..f4864323 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
@@ -82,7 +82,7 @@ public class IamResourcePermission extends BaseEntity {
 
     // 权限编码
     @NotNull(message = "权限编码不能为空")
-    @Length(max=100, message="权限编码长度应小于100")
+    @Length(max=200, message="权限编码长度应小于200")
     @TableField()
     private String permissionCode;
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
index 64b2a0c0..c6118d3d 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
@@ -99,6 +99,7 @@ public class IamPluginInitializer implements ApplicationRunner {
         IamResourcePermissionService resourcePermissionService = ContextHelper.getBean(IamResourcePermissionService.class);
         if(resourcePermissionService != null && !resourcePermissionService.exists(IamResourcePermission::getResourceCode, "system")){
             String[] RESOURCE_PERMISSION_DATA = {
+                    // TODO 更新权限码
                     "{\"displayType\":\"MENU\",\"displayName\":\"系统管理\",\"resourceCode\":\"system\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"数据字典管理\",\"resourceCode\":\"Dictionary\",\"apiSet\":\"GET:/dictionary/list\",\"sortId\":\"10030\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/dictionary/{id}\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/dictionary/\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/dictionary/{id},GET:/dictionary/{id}\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/dictionary/{id}\",\"sortId\":\"3\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统用户管理\",\"resourceCode\":\"IamUser\",\"apiSet\":\"GET:/iam/user/list\",\"sortId\":\"10029\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"部门查看\",\"resourceCode\":\"orgTree\",\"apiSet\":\"GET:/iam/org/tree\",\"sortId\":\"12\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/user/{id}\",\"sortId\":\"11\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/user/\",\"sortId\":\"10\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/user/{id},GET:/iam/user/{id}\",\"sortId\":\"9\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/user/{id}\",\"sortId\":\"8\"}]},{\"displayType\":\"MENU\",\"displayName\":\"角色资源管理\",\"resourceCode\":\"IamRole\",\"apiSet\":\"GET:/iam/role/list\",\"sortId\":\"10023\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/role/{id}\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/role/\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/role/{id},GET:/iam/role/{id},GET:/iam/resourcePermission/list\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/role/{id}\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"资源权限管理\",\"resourceCode\":\"IamResourcePermission\",\"apiSet\":\"GET:/iam/resourcePermission/list\",\"sortId\":\"10017\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/resourcePermission/{id}\",\"sortId\":\"23\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/resourcePermission/\",\"sortId\":\"21\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/resourcePermission/{id},GET:/iam/resourcePermission/{id}\",\"sortId\":\"20\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/resourcePermission/{id}\",\"sortId\":\"19\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"apiSet\":\"POST:/iam/resourcePermission/sortList\",\"sortId\":\"18\"}]},{\"displayType\":\"MENU\",\"displayName\":\"定时任务管理\",\"resourceCode\":\"ScheduleJob\",\"apiSet\":\"GET:/scheduleJob/list\",\"sortId\":\"10012\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/scheduleJob/{id}\",\"sortId\":\"7\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/scheduleJob/{id}/{action},GET:/scheduleJob/{id}\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/scheduleJob/\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/scheduleJob/{id},GET:/scheduleJob/log/list,GET:/scheduleJob/log/{id}\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"运行一次\",\"resourceCode\":\"executeOnce\",\"apiSet\":\"PUT:/scheduleJob/executeOnce/{id}\",\"sortId\":\"3\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志记录\",\"resourceCode\":\"logList\",\"apiSet\":\"GET:/scheduleJob/log/list,GET:/scheduleJob/log/{id}\",\"sortId\":\"2\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志删除\",\"resourceCode\":\"logDelete\",\"apiSet\":\"DELETE:/scheduleJob/log/{id}\",\"sortId\":\"1\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息模板管理\",\"resourceCode\":\"MessageTemplate\",\"apiSet\":\"GET:/messageTemplate/list\",\"sortId\":\"10010\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/messageTemplate/{id}\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/messageTemplate/\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/messageTemplate/{id},GET:/messageTemplate/{id}\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/messageTemplate/{id}\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息记录管理\",\"resourceCode\":\"Message\",\"apiSet\":\"GET:/message/list\",\"sortId\":\"10009\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/message/{id}\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"上传文件管理\",\"resourceCode\":\"UploadFile\",\"apiSet\":\"GET:/uploadFile/list\",\"sortId\":\"10008\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/uploadFile/{id}\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/uploadFile/{id},GET:/uploadFile/{id}\",\"sortId\":\"14\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统配置管理\",\"resourceCode\":\"SystemConfig\",\"apiSet\":\"GET:/systemConfig/typeList,GET:/systemConfig/{type}\",\"sortId\":\"10007\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"POST:/systemConfig,DELETE:/systemConfig/{type},DELETE:/systemConfig/{type}/{prop},POST:/systemConfig/{type}\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"操作日志查看\",\"resourceCode\":\"IamOperationLog\",\"apiSet\":\"GET:/iam/operationLog/list\",\"sortId\":\"10006\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/operationLog/{id}\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"登录日志查看\",\"resourceCode\":\"IamLoginTrace\",\"apiSet\":\"GET:/iam/loginTrace/list\",\"sortId\":\"10001\",\"children\":[]}]}",
                     "{\"displayType\":\"MENU\",\"displayName\":\"组织机构\",\"resourceCode\":\"orgStructure\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"组织机构管理\",\"resourceCode\":\"IamOrg\",\"apiSet\":\"POST:/iam/org/sortList,GET:/iam/org/tree,GET:/iam/org/tree/{parentNodeId},GET:/iam/org/list\",\"sortId\":\"10044\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"apiSet\":\"POST:/iam/org/sortList\",\"sortId\":\"106\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/org/{id}\",\"sortId\":\"105\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/org/{id},GET:/iam/org/{id}\",\"sortId\":\"104\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/org/\",\"sortId\":\"103\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/org/{id}\",\"sortId\":\"102\"}]},{\"displayType\":\"MENU\",\"displayName\":\"岗位管理\",\"resourceCode\":\"IamPosition\",\"apiSet\":\"GET:/iam/position/list\",\"sortId\":\"10038\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/position/{id}\",\"sortId\":\"112\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/position/{id}\",\"sortId\":\"111\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/position/{id},GET:/iam/position/{id}\",\"sortId\":\"110\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/position/\",\"sortId\":\"108\"}]},{\"displayType\":\"MENU\",\"displayName\":\"组织人员管理\",\"resourceCode\":\"IamOrgUser\",\"apiSet\":\"GET:/iam/org/tree,GET:/iam/user/list\",\"sortId\":\"10032\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"apiSet\":\"POST:/iam/user/\",\"sortId\":\"40\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"apiSet\":\"PUT:/iam/user/{id},GET:/iam/user/{id}\",\"sortId\":\"39\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"apiSet\":\"DELETE:/iam/user/{id}\",\"sortId\":\"38\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"apiSet\":\"GET:/iam/user/{id}\",\"sortId\":\"37\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导入\",\"resourceCode\":\"import\",\"apiSet\":\"POST:/iam/user/excel/previewSave,POST:/iam/user/excel/upload,POST:/iam/user/excel/preview,GET:/iam/user/excel/downloadExample\",\"sortId\":\"36\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导出\",\"resourceCode\":\"export\",\"apiSet\":\"GET:/iam/user/excel/export\",\"sortId\":\"35\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"人员岗位设置\",\"resourceCode\":\"position\",\"apiSet\":\"POST:/iam/position/batchUpdateUserPositionRelations,GET:/iam/position/listUserPositions/{userType}/{userId}\",\"sortId\":\"34\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"添加岗位\",\"resourceCode\":\"addPosition\",\"apiSet\":\"POST:/iam/position/\",\"sortId\":\"33\"}]}]}"
             };
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
index f58a3a38..9cb7d975 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
@@ -83,7 +83,7 @@ create table iam_resource_permission
   display_type  varchar(20)                          not null comment '展现类型',
   display_name  varchar(100)                         not null comment '显示名称',
   resource_code varchar(100)                         not null comment '前端编码',
-  permission_code varchar(100)                         not null comment '权限编码',
+  permission_code varchar(200)                         not null comment '权限编码',
   sort_id       bigint                               null comment '排序号',
   is_deleted     tinyint(1)  default 0                 not null comment '是否删除',
   create_time    datetime   default CURRENT_TIMESTAMP not null comment '创建时间',
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
index 0f6bd94f..513228dd 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
@@ -133,7 +133,7 @@ create table ${SCHEMA}.iam_resource_permission
     display_type VARCHAR2(20) not null,
     display_name VARCHAR2(100) not null,
     resource_code VARCHAR2(100)   null,
-    permission_code VARCHAR2(100)   null,
+    permission_code VARCHAR2(200)   null,
     sort_id NUMBER(20)  null,
     is_deleted NUMBER(1) DEFAULT 0   not null,
     create_time timestamp default CURRENT_TIMESTAMP   not null,
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql
index 5d9f8fd5..1362073d 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-postgresql.sql
@@ -130,7 +130,7 @@ create table iam_resource_permission
   display_type varchar(20) not null,
   display_name varchar(100) not null,
   resource_code varchar(100)   null,
-  permission_code varchar(100)   null,
+  permission_code varchar(200)   null,
   sort_id bigint    null,
   is_deleted BOOLEAN default FALSE not null,
   create_time timestamp default CURRENT_TIMESTAMP not null,
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql
index 8a9960f6..aabbe4b4 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-sqlserver.sql
@@ -134,7 +134,7 @@ create table ${SCHEMA}.iam_resource_permission
     display_type varchar(20) not null,
     display_name varchar(100) not null,
     resource_code varchar(100)   null,
-    permission_code varchar(100)   null,
+    permission_code varchar(200)   null,
     sort_id bigint   null,
     is_deleted tinyint default 0 not null,
     create_time datetime default CURRENT_TIMESTAMP not null,
-- 
Gitee


From 4e0487198efc5678bd6da46fdf3383b6b2ade67a Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 25 Apr 2022 16:44:01 +0800
Subject: [PATCH 047/195] =?UTF-8?q?*=20=E6=B7=BB=E5=8A=A0=E8=AF=BB?=
 =?UTF-8?q?=E5=86=99=E6=9D=83=E9=99=90=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/iam/annotation/OperationCons.java  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/OperationCons.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/OperationCons.java
index f011c1cc..58a2c973 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/OperationCons.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/OperationCons.java
@@ -22,6 +22,15 @@ package com.diboot.iam.annotation;
  * @date 2019/12/23
  */
 public class OperationCons {
+    /**
+     * 操作权限类型 - 读数据
+     */
+    public static final String CODE_READ = "read";
+    /**
+     * 操作权限类型 - 写数据
+     */
+    public static final String CODE_WRITE = "write";
+
     /**
      * 操作权限类型 - 首页
      */
@@ -66,6 +75,16 @@ public class OperationCons {
      * 操作权限类型 - 导出
      */
     public static final String CODE_EXPORT = "export";
+
+    /**
+     * 操作权限类型描述 - 读数据
+     */
+    public static final String LABEL_READ = "读权限";
+    /**
+     * 操作权限类型描述 - 写数据
+     */
+    public static final String LABEL_WRITE = "写权限";
+
     /**
      * 操作权限类型描述 - 查看首页
      */
-- 
Gitee


From 64696346b0a69b03b0db60e82f502468dd3b4884 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 25 Apr 2022 16:44:21 +0800
Subject: [PATCH 048/195] =?UTF-8?q?*=20=E5=8D=87=E7=BA=A7aspectjweaver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 63fe43a5..24cbffb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <hibernate-validator.version>6.2.3.Final</hibernate-validator.version>
         <mybatis-plus.version>3.5.1</mybatis-plus.version>
         <okhttp.version>4.9.3</okhttp.version>
-        <aspectjweaver.version>1.9.9</aspectjweaver.version>
+        <aspectjweaver.version>1.9.9.1</aspectjweaver.version>
         <commons-io.version>2.11.0</commons-io.version>
         <diboot.version>2.6.0</diboot.version>
     </properties>
-- 
Gitee


From c3a8b11bbc50db55bf7769e17931ded4ed49214c Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 25 Apr 2022 22:39:24 +0800
Subject: [PATCH 049/195] + add @element-plus/icons-vue

---
 diboot-admin-ui/package.json   | 1 +
 diboot-admin-ui/pnpm-lock.yaml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 076b03f4..0632d236 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -9,6 +9,7 @@
     "lint": "eslint --ext .{js,jsx,ts,tsx,vue} ./src"
   },
   "dependencies": {
+    "@element-plus/icons-vue": "^1.1.4",
     "axios": "^0.26.1",
     "element-plus": "^2.1.10",
     "lodash": "^4.17.21",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 8a630dbc..da717658 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -1,6 +1,7 @@
 lockfileVersion: 5.3
 
 specifiers:
+  '@element-plus/icons-vue': ^1.1.4
   '@types/lodash': ^4.14.182
   '@types/node': ^17.0.25
   '@types/nprogress': ^0.2.0
@@ -37,6 +38,7 @@ specifiers:
   vue-tsc: ^0.29.8
 
 dependencies:
+  '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
   axios: registry.npmmirror.com/axios/0.26.1
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
   lodash: registry.npmmirror.com/lodash/4.17.21
-- 
Gitee


From 9551b8aef2ff6b7724c47b1937c3f6ac46a42a7a Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 26 Apr 2022 00:50:05 +0800
Subject: [PATCH 050/195] * opt header

---
 diboot-admin-ui/mock/auth/index.ts          |   8 +++--
 diboot-admin-ui/src/assets/logo.png         | Bin 6849 -> 10405 bytes
 diboot-admin-ui/src/layout/header/index.vue |  31 +++++++++++++++-----
 diboot-admin-ui/src/store/auth.ts           |   3 +-
 diboot-admin-ui/types/components.d.ts       |   5 ++++
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index 7ff6c64f..1e3a3080 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -34,12 +34,14 @@ export default [
     method: 'get',
     response: ({ headers }: any) => {
       const token = headers.authorization
-      if (token && token.length >= 32)
+      if (token && token.length >= 32) {
+        const name = Random.cname()
         return JsonResult.OK({
-          realname: Random.cname(),
+          realname: name,
           email: Random.email(),
-          avatar: Random.image('250x250')
+          avatar: Random.image('50x50', Random.color(), Random.color(), name[0])
         })
+      }
       return JsonResult.FAIL_INVALID_TOKEN()
     }
   },
diff --git a/diboot-admin-ui/src/assets/logo.png b/diboot-admin-ui/src/assets/logo.png
index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..186302198e8d93fdc3145a79d148f5e7d0aacb3a 100644
GIT binary patch
literal 10405
zcmcI~byQSs+wTnBjesZ&okQnHhcqHBAT={|3?;2YH`1+i36c`hUD6<3N{fVmbe!>h
zp7%N5I_o>%dH*@H)}CG0{kwlx&c3fb5n7r`gm@3}0001?in4+>YVY-D!@)v*i^D`F
zQ9E3O@(VWr0H6HN1_WeeQ3C*&UADT0?uHub5U8^wj|I%x63*l0h(JjL020z(2n(n^
z+#O^Ix3+bXWISwcX9U^8BpD5aHTX0T@^BklWgl0#j*q4;)W;qw4r7#-0!es5Pymi_
zcMFi0ql1$h#7mO#U$_v|@t@1QjG%vsxZ6uI%Kn)UWT>G9l6Q86gM@iRz)*f60g$LT
z55EYXxPTBhNPv%Dl$TGGmtPRf#}DBXfe4C&{{AqcW^;vEL9`W~{yi7!Op?*Y-5mkp
z<@NOR<na{badx%l<rfzh=j9XN6%YWUB*1RoPVN?7U?(@Ge<LWs-Jq_v2zOg&C(s{6
z3rlAYcS%MR)4x=3MEnEm<o36jPzK}mvOw_i^YHyq>ED7H8vnDXqvJo)ZtjY&P_z8a
z_rC>p)AdHcd9~qg&K|B%xZ*3glRMMDCxb!%8H@06b@-R2FeoqF0q%$rb3+m1|7R+M
zjkCM6n~n4TMUQ`O|Dz28BJT>faCdgqb#`|6x1+TFjRKOF2eBL2I>DSh-8la6`CA;W
zVBrpzWJLK)49qV8=I7JpNBK+;A|%4aCkEl;`%6><6$LO0cZ>f_*coPP<^7+CYG^=I
zoZQ?koS<+O1xZE}DIQx}7)01g)CwkIVF4BtfLVaWt%R(=;zAZeU^vuDP+UMnP#7*M
z^e<kh@e0mRk3YuyGybojg*ih}82{J@!Y9B7wG_3m1jAsK0$@~x{z2mx0*hLTSc(aX
zS;3&fe`$$Ad**73${P!Z|BCvD6%2(aD1ed|hKqwm`9ws)mQW!$3da%(7PYeEw-6N*
zwi361GJ;@Gh?TReqXjBTY#lAE;k*bZYevxjW+U(H;Owg53`5ym@J}qG&{6X$+q$6~
z=lyqf=)hh6K60=H{VU`k7SKPDF3AY}<6=0B@$bvF|BdzjGoF9JdfLEIp#OvO{}OX^
zwsQBhaD~fSqb&XZ2rb_K8+A8}SN}8d|IF?G--!QhQmBoElQkSwGI<&QsKWcFxcuc1
z-v85A|GM{I3emsCQPu6w;Xh>+b@ESPhC894T~TEh^0<}}0AP$zQIOU3%3AjK&Z7L9
ze&(hLK3`c0u-boW^n5ArsZu^`4@O!QuiaCbak0m<{8rOxFd<E{cIVfLJH_c~el&>_
zyn$$Ffvg~KIMUc&h`g^+fhqpuF6IuVPpcYu`#S$X+vA7s*H-_-eXQ*3vV#vg#hR_#
z65IY`z9}CVqxk^<28?VLhdo0hpgECD1pvW-<N!P^9A$H(#T-Y^q3Un}?1OC35f~jn
zz%}3}6A0Tn)~AmevWt&>{DR5LzJGEMaDZMF4Ip*l_B54rbAA_&c0t{N4Y;H2c!IIf
znx6lD;yAfs?qZmvrOqE0$Z!t4AVtO*NVxF0;fB0B6$SnT90?#jtz(S7)KGX19HoOU
zde2zMki|f5bTLb`<4u1N>q%nZ9LAbBpmOYC-OOq0FOqMyaz|qTzy3Wxp5W&1)-F#;
zd`K|LfH$vZO6soBoedSTPBBD3@wQ>;XQt_3MXEG`gMl`Hqc1PM+MA6UHKKj5l{xYO
zL@92E6NA5BoCO7Do=F2QJOP<jdc-e{{k6$k3jM3`%6!RzH+YgkvWcc*;8nu4_w%UX
zUsU2`1BrSyBC$eGI!S<PkDEl#Sq`%A!3nfb^Jw7N2v^14UF>)}`drx}q~i9rKGvRX
zGi^P~MVoxMqpwD{vk;#ycJeX7?%g>z^==g4EY<O`T6^tBXlau1Xl=iW1|L!z$=gAp
zf;O4Ro{_?2J*h@>BnYT<M7b!{c&0YUBw8U1FQatt<u6lag2zp^$be4e2PF#Z><l@<
za=B!>oW_|2AZCvA`m}JBtwkNu!PonrnM9y%M32zhFxGBAK2~$i&}lt*F{XeWkeIP1
z1)f=1SWQ0h2qsZrrX+o#sDPKNj?2Ut=1BB)O?fN?Vc-*-gl^bg2i@%j9AxUWR)C<Z
zY;{zvHMaVVpWB)2@P^GR;&2qx$z(s1$%Z_XHPrr=Bcmmuc)HL4ytvAm*u!>hGE7<-
zRObWS^slzLmpqG_c>r0CE6Cy04dtw(D0H>6S<FUcoAYSu!*AIDZrib@tM4^nyjgsj
z`cTi?99V?%4`MtpKA?w?PzfvcTjKi2#nGJXC&EYaOVcfn8@oKe@?cf%p`s@LWU#-=
z9)TLPihjXT{&@jchs$7N>Fnml+3c#oAWD;?5rL-rfrXl~LMFuM`?!Mj?q=m~{U>P*
zKL4r=iSma_b1&cUBKHBKSbSI=IgmRR*PY|I0tI}IOsXbw^to9#YI+ahZ#Ji5>Q)*L
z;mdj_<L-1K`*)AfeM@uwT`tWx9*YFhHt*469O;O0ornji?9J$SdgzrFn&GI~WigYh
zJNC+TO;1d&Mi4g><vHfyW4VnH9T#-VLR|UxsnF);#@h@B^+qii8mpV{iUD_u2)l8s
zGZcouAq}T^g95JS0>^`UJOf+;tM5l0{5OSrAR^*NYWAOSyzMU4v2K(qjtRv(W0rrP
z0~%-7PhVUX_}ed6w8B-r<lrS6#KDH^xWU$m9h6$(s^)y;j_5Bhb_~fOmXblVnE0%>
zvEcov%CSQA(CI<DpB3#`$W`SLT9gG%zInL%@5$-q9tVA324l$kbto@2dfgN?D7w69
zJuF-OF_9-dt1ih^yOqaKRv~;M5jnsxouaqcWT?5ppG<=}5OUHlajl|1OGx>LTPm6t
zrOX_g(e?BYCG?`>_ecCMx}5hl>M<t8+Tt39x^F$lDohPFljqj2t#$he_d`s<KIyxb
z+~=L~OI$#Ck4Ch0)u(cKoqYn>lb+;j$CpqM44x}mvOkt*>&U=<oT_*lkD~nu9qI8A
zUn!LNQgl;w!!BefmL@f6_Xz~y*YzDYbMc1kX5?;HFwe(t1W8A~NA*ks97n5=EK?}J
zn)3E(slONn&Zk>ouymFAaOgcH^Ro$Dr=JzXK(EIgR5dLdCm(O$h3TohcwV7kHK?11
zbX-d1>O8YKPpwR^D&@}%re74@Z$|g|8PJ%UY{e0Uf2kW-9ZyP4Ug{dWDc4BJ@|Xj-
zc7q8OxybmDi>SHdtzq(9MADg!)9hU;dKA=r<kW>I<t14at%8ntXw<9L=kZ*xZ7U_T
zb5nGqagrs=RaLV{;_Wwy8^*S_GsIthVw!-8&G}-m3QnfGXbQ7#Gx$LUM7A~H=5H~F
zjMWKI)Z2k6_V-GFL-aY~Jq|Q-8J2QjYz9!Wn#Hci32dOslOHH&6)3qEZgCa<HHhry
z7rJ0qhV4y}+1r=JnW5*w%}Na0L2(6n6@CO1oK21oxJ2JQe*k_|>ry-08mW2|wXaq|
zH@;4#nq&$J(9B7S%>|Llg%j|lMY90XNI8UJ7Y+^;+36GbPA`7`sC%tx45E|fgTlJT
zMNW6CcS~yq(xv+7v5IrFa6LBHb5zr57G-&6Z@G{s4`P=~qP|o3NqNaH=4Hwy9Pfuy
zK#Y@Ng}T*4t7U{5nBJ6Nayr8&xbpU+1}nxtUcCaQ{W8P0GI{uQJu}b8vOJrRR8{3d
z9>}nym|<)F=Fnm~`K_X|cF%56;)86J(D#^Y5C9iuJYI1p?PA4^OFG%5se*pu7n>X0
z-;iA;cKYTg6YXa|T-uFA#3Fhxez)05A5P_Y{umyvmO<kTz=m<=qD-QjF<B=IMiG`7
zeJS)R-<}%m%x3>`uS<n+Kg#$66D4slyijO>!!>#kGCKd5;LD=<5~ZI}hOI<=<&DJM
z?k9tT3W8)mDaO)$Q=Y_z&S8Idbx}g0-}UmMBkpZCE!=kwPow6)GL{}QdZAF&o_;9w
zRoy%a&IL`sPqBKqkbs+MHmLNPcS*Zp@0N^3sKNy7jeExbjP}Wrg=w;kAmOJ|&mzih
zan-@pT((`$$OAE(z}Y(P5}MK!kq-%ZM3}j2lM%ZS%R$MKv?z?Jn;F~6(F$#~!xS8N
z7Z2$-Q86xHO(h1p&m*P$WlaW$`LV#$(st?N-zOJ-1Q~1L<!uGZH4xok0iNgjOY<E<
zPER~$^ONlc4fHr!F5G1OEx&&N+$FDhwGg)&O)D9EV>buxHhhLXicYL+^Y|9XA3row
zdM)ncv}gg4bI0H;7-Wy{lVzX;^?cBQ(8?_Rlxv@eG+hS~JXq)TEZii3i_slsn{o?|
ztfQiom3ZgZy$ZDtCU3;~^H)`7Or()b$NX_PmA(p9+j4BkUj{M0Qj$+4OPsV7h;Adr
zncWg{;sn%j{3)SddGpjW!ht7zO}`~~CeHK6Y~%txn4Dh8TH}iGP!zDp4apO$45<>h
zQYu$87CLROun`TXsmq-85IQPsMb|d=h8&vV{+vx4?wPO=?Msec8?~;mT%uY0oevle
z{;iPj!DB#Zy4r-;+ClWHS;}&-hHmHZwBTS+fPcNT(P#;Moj=bp2g0RPlz6|B-45&8
z!XhAjFUFS-v186+b`v0c8g*ILml`V<v8|g=g###W^I1CC6<^O<T#GA^;I@;8Ye(XL
zIqcqzFBHqTU|RXnM(dkrKW;7L`ziO}jCxndQQB#8ao32CUH3}*^A-dBl1W1?6L&~a
ziSF+2<DwcHA528wPW0Ja7BQRG`B3Si!@)^drRv*&Erp|n6wI$It``z390@8IRLQGv
zRWAwr#_zK)O73xcM&9R<4AF<M{LVrZSifQ*ehez_+>-`!@hLf3T6|h%c|5c*$JHN8
za)fa;Y`=RduohK%l!cSRaVx4S<HdWPHMyw8`Str)t8{n#g)uv8uHQ!%0P{HgR>E7k
zwXLSdzG@rev+N9VQIB>k@M%1;JlL)t!M6w6rFY%5pNNw_N||PfJ*DQ;|4fjd996}8
z^$7CmJW|u9=}YngU_iHtGu4j*uVH%MuT_`m&8qLx5WOra2Q*IY@5%xsmG4!5_|0Hc
z+P_4+Fw|Cp;jMBmO)(lU*wJ;~*;w^`m<v9pR4$slKxsDZaH6fe<nyCKNi}I)vs#bn
z?lJ%{_`3Rf8ym}{rh0#f41^sBXS_v<eoj7yC8-L}(J!NsU&WCQS*IAiM2b_h4g`<t
zmHI99x;&77AxjBzvQbVuNbdl2Q36uY#7Q0{B-#3X&;J_LX}*TIA(mHVZ*-?dXWywJ
z^>bSuRZ!M`K&sUk<J6%A*TMv0+#0DH^1Q<NbYlrp3!JSVZdXX&5HOWj8nFJ>c*h|m
z!nYAz<e4C!6THz-1TjNp@yYM-aw%RrgInrT<DJ9>tW&S20cknvy%!R3ES-4CZwBny
zSr~MOigN{j0Yihd+CGCo@(X%ovW%xj=|en~>{?OimTA!p7R+m~^k2<>^QIUul`7Ru
zTZxdbLztjAgzlmwckr=oKn{0i3kA98?7ng^^JQ4DAvs~GhS;%%`~wZ)yiiuq#KF%-
zW$D}bdPP-Gr@b-Nux6&UaYEg<-9H(pw3yAHBU7SUmJ?SKNd5!CLoG8G@e2}(il;mE
z+=TU3GP%h>PGDH$H<R^IV>RHe0CgEYH$}4Q{Q*0yPm3Wt)^5|UW%0Ts4gkQJdfr&_
z{Ygo}Gi<=8-qk)||F@myF3nAgcaaP~$@u!)bz8i&OhfVT^bV#q+>#}^OYGP4l9*mt
zW2vVhDj*(x-wtJvg8sr6=_!}i3MD@AFXe%eZeM;(6#7SZ|MKj4h`APc{A6+it>a=G
zE>;WM%@LknUJ=`?v~8Wc4(<SZJkc-Hh1d~)X?R8ex@2W2rrqPlW~1gCOf^p)qP@&;
zf4Xa#q`Lm=^(s`q+KNognSvo&d+F^}>~mgj>Rg_ao;lO@76M^rPRWNqO~grcf$rTT
zJ~}JGwMNhW6zj%f1)_J(yf->sX7Vq+i0-CO_^x8|-#eCc3Voq)t7_80WSoA*fF3kB
z_vV`Fay&3lg84befoNIWUK39Y&FGD<P)~jLLk5%!w#In$<cN!LP(IY({VkU7&VM&|
zLhjBgb?gyIP4F|Sso3V6$l;Z89C5CGVtlCyfrGtFIx&aSheZoc-K%#7W1@~JK`Ezm
zfdo^*ItG|n3oj7sCYm!%DVGf??D73L)kP{#Ijz4fP5LN|XtqrJe%Uh&MYGSA{h)nQ
z_vUe)6<c4K8FEnQQS^Stw+kmFbuT(``E*YVJ^-sA`Rt5?_pDO61rYPr0HAjJy-}m?
zNia*$aP&xRue<&mo*2?y%Ex1$c&PKWc0ZGe3+V+$^8Z-<mUQI4!yW5C0p6LEdbK)N
zJRPFZW<SQJNH2Gpm|@$}fU2!yzN}B8FMi+I?uXjyU-#l3SLuKNPeZxT*5{6Fje?ZQ
z5{dLV$-77)4;hR?OxH<XolD@w{KmxBW|nK!UdzvjmfZD@vIteT36dSAeH37VRr4!H
zXKN0|TGIXN_dcgyA?|^?kR+M4(tYx?>2;@W)e=gZkcZK>1V0VlH$1W;k)vk@iHf;0
ztW6~=y;U_QWF<9*aM$i>N^BUqpF1peop&YpwCx<Q;pN_lFALRkfAqEpD8^v}ysmv?
zG;BV6q9gqva6|}Qt27DOlrqgKyVM+;mSJo1A>AjnyIUjC{v6TTG%Iq*v%9&#<Xs3l
zO{=Az66s9CeWhbQNFd0*^M38u)=x{=jSbKtB<=gC?9p*XsG<5S&rCY$6H?sG>v2}W
z2HvuHSLUkVFq+`FeM_{@UIDZL&APXJH5j!jU+ihm`lEYv-=$}qF!D@TfToGa)kSHz
zcJlLk(HJ()yLc*(D9L2kUov_n@(68xv3vNcKc?prOVE-=E}k;CqO;}`frtQR@G)!w
zSED#tM3SJ$R;s1kO6|ZIo&G^pgTyWwp@UeT<Ps&4*UV+l@!c=~8Vik+mS1?ut9m6u
zA|5JRmapGFTW$B;_MF*I6F;;TsJ~yxpwc{1xeM-I$F@36kH%d&Sl@1Idd?ZPw9NUo
zSQ`h8^(J*z<dbcYDXr+I$EFW6;)g!wYUZ|%fGcxfxqYk0QMWdqy4jE-m6ai~-ZQzR
zaWV}8&S}tUw-Op|U!$@88NH)sZ+c-gJnkfvM)So)QYiSCBV)M5>BUG&kgRJq0#vYU
zFCcA9Y%B!&zP*a9Hk>KrO#SNMEnu;ePZoL>IJjh{!u}xlj6$Q2&Pac%O3FC>88b;$
zy^zI{U95w?dqKs?5n^&}l#Z%mN4d@P{*mEZrq_@<S4DgPccmjWpbCL9f=W_cGFhPk
zNu%$wtYZmvp#J;=bL2-O)7suWa2*>^xz_C9Wm2TF=7Tz8|BJmTrDY!1hs}G%oj&K2
z*j1)<3#fJNz1*>XA^^ErM~Gedab7?}Fh+G``c0wWi4B9$G~I+$%s_`F#?St)1aTD^
z<d&a-JM-!;dpTQHb^_;bo-nFq6oR5*L8NKtH7+u$SifS2JgYln%NvS|5XHIV1d1n;
zXv<D&KB~RlEO6cTv1{%_?xoH;h;wM1IupO%=Si&2-cH0~VZPjG?;ogbjxGPLamqxJ
zh!3zvYkZ76@?Js_Q|f5l@zwa!63+@nwS{t%u+u8anCnvOF7*NB##0i`KaLkdoqeB5
z27Ie&qRZF`8RkwX8CJgPc$GQxDFU^^;YCMyBclb;MxU6cJtc;23H1RIfvixzG+W0a
z;5(W@DAx9MmcP>Qf#H<IVV&^EiDud}G&sINs`8r2CHSbyGk%GL+9qedqI2F4D0sX1
zHd&(<7paDWAi{Y%KgJS*3rxdaYf(4k3~c5!cH~i`Lg$4vcwz!C-BB(&L4^uVW;8ho
z^KCzN^jq1V_lA%-wiinQU7bRmsMV;u=&M<JG`@-LyJp~8Y0*3<QdAaEea%XD_b85a
z#(qgrrrFS8Z>bbxuA#_#MI4oG5I>j{gN)3ibIti^@*B)51NXKhMI#Ml`!A~lhV0Yz
zs+C&;65ZkfkGBIb42`-v+mrPnr2j@AjXI7DuEyD|!-EA8OQ?Xz0?c6y<*7C`OHB;E
zvf=WU&Nn|*g}%vXJ31t&5LeFEcfvZP-mmq8?%dUgk#EwBK3ft4miSzZxqzmg#Cf>k
z9zDvP>6E?&(|~44s6h41$s!wvLxx0G@Mmj}lO^&D7@Gb&4%+*X*2V;TUvHk?g2Ru}
zn}xwaYo*CtbErlBd56#GkrLoFaE%C%hzgy#t_VMJq*HT?ewB`KYj_>zyugM9rVNOb
zV_vapc7FPZg|@Rp%5+MivM1j!j6OPxamJu}r3wAQ@1#4iVt)*9?ECKMgS=Z2a1Kju
zvho?C`1`~`0{4Q0ESxV5cUk@QN}TweEF+AU1vYfNK-Jo=DXeZdAygZJR6l|o&PuBO
zW)1wN6?@$-ZhQUg_=lZ|w96hBXyYNkMcR>2pu1kD!u~Q*AU7@|>#S+tW8QoVmS~|Q
z<<0p3X8`B<Vutu(>n{zRl$V9eGQbrofB*fcOk6%H88Zl1kWhE5{k|hv*6dJHQM+e{
zwUPDJC%qB3Hwn&dcoA%wRztyY2$94~KTKtNUbm?|`9|C|Vwr%pCfAqyQO$s3INBsP
z>r6k*y6|#ed##*UrCtd}gzCVK%hPNR`F2l~u`4MUoiV$H-J@V(1D{<TdM;1ff~?KD
zq+47jzevgerOVu2I(BCRP4EIePx!lA>V00~%aNo|*yEOht)qdgGVW7zHBH_JxZmC5
zFJC+{c%(qze9A20c4WlqBpY^}f~u8d_DQ>&of#Iu<k6#Pgz2%Lf;N!kxvz;8-<cf4
ziKwC0ngB1Fw{ZQvp)1bpn_uMCAHeU;YL=U;4E3kRv2*H3ti=42VAGlo5cFV1#<GKG
zv~hLEs~=mRqwwDKo5<owJ`tSZc5+lSDi^#ynLWtH{thrzc}#KB`T+G{5(c~p^4NG)
z?{MESwFw~;F*!)0<dn@7AS>GX0kJKrM(Y?bIo48^m=`*6BV&kleo~F(;ZTuEu;-f+
zyhnPmry^T?+?Hblrd>#_U<0W@Z6jqt2lDsMpQj9x*=OwJSMsMdpgmJzTM~wiH=9^!
zuFX%l&6#GxAPReZK|b9C4nen#YZ$1Wl3b<*ueMG|e1@@Rt4yXSJfn2A4rRBhmXI(q
z0p7Vf*R7ZUIF{RFKsvt{{iFw=-EFCTO`K6|s^a6kSNB=9fweYW58i`fQUHTWz_35@
z_z&7lhQxI7H*}I_DE75Rd6OKBPxgw$PNoR%;9PVWUlNHNp1mFf$5`4RVr-b3NUYLu
zls6xL))vn?WpzZyh?W(Maeg3D+?fNC&MRHQVLee)9qx$Z6L$I}jxcBPuD%xEwfxi>
z+bWk~A!XuTD8~|<kR9RXGyQZIl_{Y~Fx4I5Q4-#F8hU6TCp+8Y#(4$|l9f(?K|>Yw
z7t>+O42x#UqlaW*J;q(M>U(#qC7mi0EOW)Fay1Ih7<|`~pM2Eva<h_pNo-k6x4#xO
zmp8BKb@<iYb*e|I@(}_Js@W<YnUnA&?x4op?A9OSOD$4LnP6tQ*YPoKaOuch7bV_V
zD9%Cvtg5g4vmaID8Z6#3(lJzr^oEshXrpQ$csAWqt&+C3XCBg*s3BNJ!D+^+{epK}
zRg|#IJ_)O`tgS%$<XLgsBx6G1+DmLS2dtxP1bcd&8Uq8f9)p|`gF07kx6kw-3}U&(
zPe8pdbG7f?b2jUZK0$NG&K(9~xw2qZ3erwCv+g4Uyd{zf>x{$kk0!Izq09V1+JJfk
zcDn0g(8zUIPn|B=)v-1|#w*r28@)PRlj}H9i(2@k3(-O4s6gsUGKHIQD%22KWFMBf
zfaEQEsOk_&kzTlRzJ&ncy9FhiSm8W_XRq(m=k71b?N{-?a9(|yK5^BLr!I1NW#RU-
zC$i`ToHLo~iTo`L>#B}gz3;d0x6g60=*DkQ{k^-dYVQNdTTn|&7c$&;MyxT|K@sTa
zyg>{c62I8O067YsIGY6OkvEcz?#yS3wBv>TjN$vWsY@L3@;hp;eQ^LC$Y5LD3W$(F
z+w1R9UC;8i@gv5IndQ(^LDr$#9tyvMnS6UlyNRfF9|8}~o1e+zuFSpK+y%U%=9Vfo
zmNv)DI5?W`bw8LND-vo{yT(akPouuWd&;qGdDyX~u1H$grRRtiSXB@hSTyn}xeXWV
z6%Delb6YnW^-I|o#=JQ+t*V9Hh@8GLaAy1g87s%BZ={Pr-W;DznJ#a$>2zk5$2c0q
zqF0f36v%mZvrf72HIZZIFFvQe6JU>@A{88^Y3xEYK^auOEm0KU@Q5+1icY|q*IkQn
z+DT8D^TyNTQ@#M5Vi);;Iroa8RlUJaC<S3SJ2Y#vcAQ{{6^^g)1^iA~kguL4Wz<Wj
z2KE%?1s4u)CkeO}mGflZL{`<<&IE>2H1(9>4?tz!GFiczKEBYvhN!gf85g(CJZ3hK
zRTpB|XkL47e=OKtid@QK4W-_5kLOJ4e-#v0j_jqeMtdP!Ol%-DlE<Lpy#Nj~lp2|y
zNUUnpT{j?<C_)FW^*&*3ujiqiKW4r7+-;!8aH*R+VEaAL;XW{8^Brq;(mTqbR}ckw
zS>NJ!fzWWS011$eZ4f7iUTM$%8iznyM1^6cu;#&zK*Z8hQEEeMByDX9crje6F$IvE
zF3(?W`rUe+@Vek<Io{}-L3A`#ZY8ddq!@Sf7{fp=;t?Z?_^)OA=WbuD1NcKn4T(>u
z721MsKRL)2te)-<R??5^x3%E1cKqy0xA0_~PqT1oO1Fn|zNqXT3#O-H&0x|O8u<{Z
zoLe_7-$$Vx?9t~lm9O{S-{j3C{pI$cv%`>L9~y~z5dv8MMjjg48m=MBI6XsU1(K0%
zJ0wX+TINiCxwRt6*o$gnD^7>IebW?2SAK)p;s1Ha5Qp5cfO&A90H5<NXSk~0Bi5_F
zKA!9<md};Qa9P4rM?wE%YW3%<MostL>+#C|jv&uG1#jiP3yhB0Ly6m%ENtszwzM@U
zTGo>#D?=~G8p%)3dbH5aVj_%B9&UJDjc3uPa>R#>W=6a#8#R0@oF?1yq5bw@?(7np
z`RKdib{7Y}nyqDGR#2uF+GW13;doB)tq&U7brOYV>3yAv*^)VywoqBZf_P(=5en_6
zvq4Eb_L4PD)+D*Rg0BOUUOH*iqX!cnd{yF}@9+BVI){wI17fX#ei;lMvhi-Vs$?r0
z%uGf4uMw$M!f(~RH~`?^vK&~!;WuaIf>+bI;<Kq-h3%lh!?)g!fbMSr(80G)e0eHe
z$PQRr(K}9?HJxwFtB%nyK^H^SV=OobCK+|?Ub+GwGJE6W_?UXDgY{|smB2KDaRSMC
zDyuk_-HFbPlT!KG$}%lRE*3c)>(ob?ozzBGPxy2C*J@i>!%xwptG}GEP_d6|ZRS;v
zwQ3?4L#GIQU&N)wzhEIv`MN^O>a>_{fA?NW=-N2hZg+~Tkm&1Xf9m>Ew6LoM(prCx
z>A*Bo;>lGE#O1Pe%cX6FYou1yU}y+bR0<gA++~#cWW&m^Q7P`slm;1IP%$cOR+hOf
zWkkt&ovgr4%G+6ukXU)U)uw4LSsMd(9-(}HDU4pU>fe|7f*6LuP|0?q==E(!*bJ@e
zL4CvTf~e)(`796`c~&eH-`k&fwU2K;Hd8*ABuXAy2-ouN6=ikuI5)sBoEK6fR8fVd
zlYQ>tec!46h)yh2YD8RYOMD(gbO7oYSruRZxN6O0%)@?>QI2}K(t^9@hH=4*R+Y=w
z9UK*>Dp+A3Zs)>>mBbO>U&C^adJ4BrE{*Trv>Rk$e5c{)Z$yFZ6Wcg|>1P$T^rMBY
z!@Czm#U6;YSY7D<3ll)c*umYeaWbvnPdB@==u%So_+7Ors_8k3O8Jzp#$NiuW4E>;
zM#uj1^+l1M;qFt)K7*y!Ef}tt>r7~_vywV1KH}GEu1e3dXVayx=Fb7cPBvzKG)Q`q
zxXYuOBJVVd=OHT851TAobAqb`SOlb%XNohd-aTgwYe?n%206z`#6-P#w`|>s_F%g0
zb3pUr4kh0}2Ow}}XruL)1vkO38T31!>k@ALvb;_htTMInc?|4hcK%5*;K}PoB6L;P
zP)xWS@j5zIcjbOWr{1@%77Cv#uaetj`|@>wEM2*aH7eknVGA*;#eWdiC9y%Sd<H~@
z0n6`KlB63Slu+Tzt0M4>pQLbBtw29hboimoN$JOD(mZ%ML3!AFx589Hlv>$jI~nWj
zHCX+@`v9F%b;DFoTQ1MrBr$y_@;sMm27P4OO`vCx+66!>dvp(IIcw!`#wIYKq?12Z
z-qcrfs{}CU0HU$AFbi&fv;!Kc2g>29Ok9@lD!hl4b4t(IKge%BTNbkImp+~~e8_eC
zNdb2i)eBbdt<gJ5i<hx3r|Mt#kHz$DVK}Rj#04zUQ~^7-4zn-MTvFHM!}IKpX3ki2
z01`xUZQmP94^6i~2(qpRGUnpazOfBI3RN%eXxSV+TV}6Naj{*NaNPbS=}01ENZ=6C
zOZdldkD|`qrhH!P?y~_*v5o|Qrk8i=ho?SDkBuk{f^aXv$WoctD^>lJu@!Yr4{Z((
zmvnMdxNrM)>Ra&vT$xtSbW7aL6!a@OlDmm`jZp1qTmIAC=cmkAB%(r6znLE;9uRbx
zBK>gI`~im~YwzBOpS){f<%^84%-q?I_&WO@BZmwGm$|bNyL=WT40?mnf!%6!`ZXWD
z-yjBD+O&mgS`u^WHYw*GvnQr22ogSuLA}Ya38%$X_>Cc?)4(=|o<lFgi|zybgf5n)
t-kc1$?x>>gX!9Mrf_A1{6JXv+bIzFI=D85H{`n)JilU}Mg`9cd{{pov(c=IB

delta 6416
zcmZ{JXIK+mw>C)VqDYk@gc3lCNT{I+2oaDbO{#zpAkqoF1w)Yzp-Pt~B1K9h^dh||
zB1j7*G$RkvF@S)6@p<2KUEhy$e$4FId+xRNJu`ciy{6((udHsok--B7I!-z=GBO4o
zZB1iRJN);cp(34YE$WI$4TqnWg`bI+vtOWtFN{px$?GW$sN><_0yBm=I0gHRz?8|z
zC<M@oX#TrWGC+CA9VuBkd5F9?5KQVz-c^tU-<7xvQIwTdybDI}_+=!JOHdfYoHHEA
zc{1k6uK`Hc0vYDy5(?h>`ih!fj{Y7nPd^<^75*R(?>kO#Cq)QEPD4WhsxB`lB_}1N
zC9AF=qon}Vkdl*uNXdaU6*B%@;RgN}1o=Nf`d5UJ`VNk8Pd_h&>ur8jpfXAS-x*=P
z@Bo+-)Yr=ci0~tkQG|OU{2V+TVgJJcPU0XZE2l06COwuM1We)}4UtlSC}=|NYCsk4
zYstvV@&8xW>3`w>Us-i|j{i$oGNXr54QbAkBuYlcE~BHVZW^@k!`3ay_N)IBg8yEJ
zN)gBPO<QWZ7G>`FRTvF<rE$cDVfn@P;@_^*_y)(t=yVHTzH7AC`Pf%6(MEB%Sfbz1
z#{)#saCMp+t<PVl(E#B652+kOds19}v>vsbD7STm6AN#?Y#{jTscbK{t77_3myw7G
zOP8I?!b^p7+?Y;!Gz;CpxVJ2TE`~|7#0VwAqRSYgL0f7hqRv7Giqj|oJQB$S{^#a@
zhZ<Z@-ToXAsn7lp>Ic%f5m#P__`Eru3cS5&%^#@K^XJoCRotz8ThY4jm!Z#&A`JO7
zzR^goO}peJnd@CfY#{BDCY}tc9&N5q(ownu8V}88o2)gavic-Ct2AT7a0xZ6k82z>
zJh6to!AmS%D%oG;x7)reW@ZW`Ku7a0o7%dv=Y9!urrbB^E!)TUI}<P8aoed?lEX$e
zw-NJ-g*>1kQRA|cYo$N^FZe#mUVEy{`e-!|wsDjp1Z8XzibG~t1-&}Pj%WszL<#$h
zU)71`Jg4Ga6$`8TRUEwC3yTM9&6g&@e%k)lyyji@OMxT(WWzB(X=ID|CTIx=(fKt!
zvM3R8MR@&2%wFo{v`@@Q{ha(MjooTf+)UKiX9ta!;LS!Y4*KNP&j(S*F7ribi=G3T
z6SK#6O7Lq>cCpB8Ex^?6HkNCKHf+h}UH@RtUvmje;<>`2-|bs!2K#dSvdI=P$*eW<
zy~x?@A98Mp)odFzEQroeU3)(^yhS6D%k-J29X=}>)_v@l@N|f!vA!<rAU<4Lb#29y
zD0>6;0_@)I$??rj^O(lD_t#db>TX})eDgzht@JX!U_t=W_#h$TxAmY2HO0#J)QqUf
z{r=h%uOa^T^>3(R8>pGDboD+s6)ocyGwtYD$*joqEg(O!xKr+FcXI48gtT<xa<=C8
zc+J#wONMQ7E_LPgscUY*oqI<d<>lNNxK&V0;<*86h0CBayeXBH@@9}`Wv1Qv`tu-V
z-vU&=3S>|N>6^py#;p&cY0Cqu(B@Z9X=G^B|2U0GyIjlXx4v=hjkLw9HTIU^!5#xO
zTg`#Qlo$g)?=`!n9-a2znGHViAJ|U;D`4Rlg=o!O)_dLKnI%TPWcew=LwW%6h(Y4p
zVREIw_jEZYkG!9x22To>Ru33%dn32RlutXpFt#$8Aeo$<vRV`wyO>ma<vA#h5`v3k
z8t-$^fvEqv=qu**{N%f@h{i^ehvYxh;@K!k)zA8oe<SJM-P4*5yM+-Ir0)K5@5r#X
z2eJ1QMcyF!O30U^q$Xk3ccNlRf6PdzuGmM_IXlYk>3Qq0xl_5`Z!Hy;8Y|ICR`ti*
zpZgOwT#;wno|RrtK9%^&O`qnq$er&8?rUkzzFi3Mwmf4$dD+Ok5Tg8vc<+dhW}iWi
zC80elPA~AvRM*X85HmUsByyAcF)^#z1R|P;)bw#=nB8z|y8g$V>K{+ycCC?|h(IRm
zsGhw?qillQCo7Eb>FNXb6?TaIJ+}0~0BY7c&b!Da0j8Pz5UtcT0TWwgg)SWY2-4_z
z|F5Dy%;%qJ?F7ePm$(~2MZ_|5KhLb2Th9{o8Sw$l6l<Qey^=Ae9dC;-q?K;-Ff)bi
zelsPeuB7Qfi*@P+LH_T5$GRQJo-O2q?W(MItbB4`{i~)VQSlLWPr-qJ-!MbV#Ub6b
z>YLxl-<|4muJRMKFEq#JjWX_X;o_;=w|+(Y|1h6NtXs7R)k!@4CaRnBuIxWLYKN#4
zY5fUIABE?MaoqK(u`FSpw<*N{`sZx6e*Sfvb)Rw;Q7+Ej+?57{ghAOgbd}_4p6`sc
znO-iSIwudzq?@AB>^b$6_6l;ifH<H;z3a(7do8bmH>jx)@`}Tu`vb-LJ-!M30o|K-
zXZtRWFIImaP=8cnq}{G<xoX7bG0R}glonTYIxxM}%Cy1Ie2c%`>H>2(u~+(`BD~QG
z-Iw74<<$?Xe7%iPbx;UAUhNMoy`SNt^GwBvZJE+GbJ(`_oY}h44a$hbLz`)RunDlM
zCg`ob5DJg2NTUxJNu?WI_W~X;33VFaD;|D!`|A5Dbb!#`>XW>MaJj5sn=89I?)%DD
z+>A!{6Y)CY&S-E!P?AT}uz5KPI@F5my{$@G7yC#^N0I3)JS*xu{<Jf?GStk*jJ~hc
zJ3>{y&fy6iU5iUU4=fVds6E)9q9TWDvq7N9?mZ1PS(Fg2N|LsideD35nNT4fKXi(Z
z`m!SUU`#Aod3Ib?A^;LvFzPxqnuA~DH$^!YatHcDh$0jMso9X)#J13t4n>NeoQpDT
zkx9zfG5KxG+x#oqKy5Hb?rn=9<x967D`8vNaog$_-kv&OD;i`;(pB}kq=04rK)%WF
zA`h%)y4r`WcQzU^S*VTH#Y@_I1va;m&3`YzuYYMkVb%IFrHUyCYlyn^rscPKy`WAZ
zA_|6S_gJb`Qjh$}f1fP)&Yu?y<Tk?yVagH2N!ISe(&4Buh1EJ^rirOi(~u+t-sY(j
z#<f+6Li%gU9092g#nGTThMM&^BEw|__X-R|ZRRB%tATmh1mY02a0EW&PT+%<hfE)*
zPUTM}K0Qb1peOkU(=-IW#V_WdaPEa3H`OEe8gHQ$><tI+i$0N7`(35MHZp(k0A{zv
zo1yEQXE|;W9<RWD^kpE9q(Dl-cKnw^^iOl{^$!GUJ>+=Iwed#}yez$`?QgJuGf-Uu
zHnKif#&-7zT4wK}_%(|XPXLqqr%}$<W-dHqH_j|BsJdmhYXwJKA%nY-t{f8oxPs_W
zWT}mp<{Oc>4j0F=jlH`H{H^Bn_%2=@Z@OZ_-dma~JdW6JIAw@<nC^t(w(eKRZqK}A
zwSI70422|{O}xsmyunuJw=l~rI05S}4X-GivP#MDAahCW^BPwaCI?&9oPTJ)$!wj{
zV9&8rYNs=e0!lXRFwG~}7tX|}nA$7}JDXL_XC0KqAC>lHY#aWf>i7lyy}!X2A>h)<
ziv2_~xw!;*;k{&JlfN_qCEiy2Se{#QVn<^5GZLgQwT;;=@tuy)2=){$^B_24E4g;)
zEW8G!jzj33nW=igR?`Fe?-d@^()hmgs3tk|lhh??Top}l9V3j(D&|zXRfV&tW$4Gw
z_G@V~Ug=@i2J9VP=G07_7EMWtiEjwENiTSzw%H(okH(uFr|MGzUiePOI&++XG_QP#
z3>4^hjNk7${pG}eL2vrouvRBp5#8M<<$M(+=<$3=O1y^SRgm6~km~T}JLxhgvcu*2
z{3Y2SqxtR1Q0W-K`$dW7fT^x?T{vgV+vu55*8`5O#0tG_erN7>xfH&q@h|B-RGwK;
zyWKjoYwQI2_wdy0R^UH?z*N~Iew;DY$T9&FJ0TJN5@`S7jgDZ##C{>iOJVTZWBeRt
zbqMJCxLv)!k+?cp$>CzO7;i;8m`z0r&T{uN!%6DB{ShqTbo?r+qFe(1k~OWlM<D(T
zux)<wk9yj@`X$N6YO^fD6QSG5sN6vn6;7U&HMOAO*zSYe%&%?3d~q-N0^%2Ekn0iF
zC;iNTQ#orL8=8-YG-4CBLYhTxb~LejIT1#e!xuX=xigzLTg^Cj%ICsRAZvn%B;fh(
zi4eMW*g|u+m{tFZj`ZhD@J?vWj~BcK%M5)h{8p)gg?P1vEB#j+Na1VIY1?LJ>>D$!
z-?QXDj!Jem3ay6@c2x(|D;1;5NGab?$_@J$U42dEaZhjL-@Qq`FmF38iz#?|`j~A#
z?3J~@`ciDXf54M(iV{~9l{`2pGiEK-dJWxX9GM!zMTP(k&y%th4|AG<l7KT-98&wo
zvs{0xoMWT?`6m&^vHY*YE3rS(cWcL_Xw8XvH))Gz!bfKs7MTEZKrqI_ANgS^R<361
zpXNiG5y%7=#9-Z`C4k~;|8R#*R(zX_vnN1Z)xO=tNlT5mIN^6Q*pol7I&bj$I667t
zBiR{uzNY7>%yiY|M>R%#sQU{+^VlHe(zUM?8-+7`!A(trDl!UG%Uc(p@h^dL8oZn@
z+zU&c`Di%dy@!jyk0`;wcI5aV&_KQzDqiqhtuZM;K=#f0?C=N?>2hv|rU)2DprNZ*
zCMmwe>e&FP;$rX^%5I0ynn&zz$2gJJ!$p)MaSGfxr@JjH0EKQ>N~wuQcO8*&w#~eo
z1f1Q%2^bd_{k97*QBPCGHk|P0g+90nz?P=YDNbVm<iHs5MEY>#apiBUuvQW7jgN&H
z)LP#fXaco<%{k&)!R!>h<BVp7i3^@21xQze6b_t{&&|!Di5SYX$<e}*_W7B@*TOX3
z^0+7QS(J@mt~3&gmOw(u8sWksUw)dmxR9)_v-y)zH6wuW_Jk~)C8S3Au{LK+8~I7>
zP9N!moajmLmmxpWs~0(k8f=*Omp?79h)LWifAnUer^9`Ba@ckAwM5XTnXGI98lXv0
zq70p9x~e6Pg5z+}>O`oav~{Tq=&yy%yl?qL*$vh4G2q=W`MGOM$B|-HP_W%mvKDvy
za>5?NiHHR>vF*TIj2WP2Jm9#N@LF`D)0yKeN@Jt-JwKAVaq>_lcWG~P)HM|yS>C`z
z1J;2jz=K)g;`{`be5gaI&J29O96ELq9m*_T);T$ooGnaKpRwbQrm(D;YAa1eA=-~t
zzBW#^wdCLvA`o60djx-LVQpIe@SYU%koE@y@5jE_LJyU9=vNA5Jf2T2w}BTrm^QlS
zix|(Qk+&o=kdLmjs<vmYp$iPo^R~7dTdDu7@r+E(zM<$gM~z<{Mr^8-)+*1IKl*-q
z!?4IYYchcS3*5F9yznww2UBrl1BmnB7rS{fd%1bb)F$J8uxI*iit87)i{KX<7)tEC
z;wu1zylX;EydmA8(qH>gr?ju&gw`zGyz7KE42coqsvR#Gs_%bMriprWDwp7{H7MYl
zO*Ku7QP&-fpN6gSQinO&CH{~OWA8{p3eYCK5yMy@dx@pPl~Qe1#oHD3TB#TQRsksT
zE~+0*c=!^#M{Wj_({37MCsD8IdHyJZ!Vsf8JM23DAS0RW_M#~iX9@^T-r++VZlb}+
zGj_lEj||aW$~8ir4!oE2Z6HI#dro6kw2fq8i2!l=m+;K!$|f{{$h!G+yBcgo{HV8W
z-hU?}7X#DNO^aC-!Lj{oD26YT11;Oqq}ZVL0%f+&VJyn)%>&sDOinjW`EW{yil^p9
zi9cG$+Bcjg-p{+PGKVE@b~ObLA+sfJtFxu@`S6%+wk|zUw9nz6fbrrJNn0p^R<Fw!
zheij78fky`Z4mo+M)kh5lsPnM1oPQs+eNo9Ch@ZH!R#ug@~vWpG=gHldQ^)0W-Amr
zrV89*2s7sJaJ#W#+q}b1{o{eyMj?H$XY4$p5{9`P%+ah1fVE3J1Zg7+omHR%!7$U1
zG{UvCKwYXP=vNG7n8zuZU9`dWXhD`cKT5A5+{8%?B|{e#aQ<n8syi@lYV${nTo_|P
zvweodeUSF81L@|+TG!_ICOSJ(QAeCFp(T0Ek?$<;D%Hn@6P|-Z6}++}QUT-}qX?Wk
z(ME9Hy<btH2D|3wkWPyKY~p3MIYSBAk5L`{L<GsLYl}`Wn9GuK@%KM1U@(mDthI{g
zm>%sHwXi5bQE(cRPj439`jBoba=z+1#M{%RuLesu@LD4BG1rmR$e~_Zs)!lyC|5l%
z{fJU~6y0Nna%rodLATK5(vMrH>OdCI&}s=WkTz9I;ZCFi^4(jAd>V9h+(00>7QR_K
z>Uy@=5{tJH63JIOwCO!GU^Go+SnGH@iU_5U{;A74jBvAv@~P8JH`pd7WKWJRR=kd(
zxuQJM{NQi?R!%mLcs%XBfK|LJ54M_|cRiVF<O69F(;zVx@wX4+65OaqZU@1CcMr(r
zrd_ZpBMguQ`J#%o)c^=&*&fH&SRM1Dl@R!7^-I?Pmfws+qL`k*LVC+DB$z>QKzsRp
zTAwEaTcXxU>>bawNRH~Y1Rn8nQ{3b!46`oigN*>uB%>q4n3~MoPcU-N+86E!+6>pr
z>a2v~xfOEoVW4~uOA&Rz+5>m5grm_>M3ihel11E3jWg!i!j<0=pZG|gYHnp#kM-?5
z4L`!$B8w1kw#8$1ltnOantYnfUVOhkDZsYL?6tGt@R55vC>_9Lf!t&g9e+?{{Si9W
zeE=JC4aCifsr!;r;ZBrt&YwP(S{z4t8#?3Xr?lqCRN1Mv?~g~aChNQg6Q*kb!Kog|
z{J&09dl^z_+EV&w!<uqlBFtMnB4arGcFV^>8`^Y%u$-N^esU#aMm5gu;t-TpY`~;I
ziWGRkr(wI6aosxaJ(H}odP|0(e4M)$aAF5Lk8lYseiV*GxnnL%VVF1{E!uQL<x!&b
zzh)|Ft=oGhT{HEz4!gGJon(*X*b$Q(EC-B8*0FD~&cIkb1}!JfEJ#tlx#uA%4a;j*
zqct|{7;k<^vH*W8c3-iEUoB>>0jzgb`vMylf10<uyJrFQ$#O3@;K94V;La*#_P;rf
zJ%@+Z#;E~qqdm7XPSm&OTJUb}jw$BQ=H~A~7t)Tw+Cz^d7Tu1VBgP-mRcjB5nzp<x
zUhFEBx=5ZNS>A3_gFEf%v{esoxw8K~KeJTpaMAgI$(PhN<%HC@TcI^x6?9Y20B0Z^
zz58q&SG_>;hl+<E?@_+PhV%~B!|=x2>fffF(hc_Vww5&=D*+?dkoN6%YmtR(g0i`_
zLzi*^x@l}Z*m<OG`AacfIp=Z!oIy=KJY(h@vM$6W4brAxeQy2(EMEWcms<652W~9}
z**SwuMl(4DTqKltvZG@v-IFqb5=ndv&j+EjU?pPHQkBCg%Pywj5lZAcDHoBsI;G&`
zsG-Y9$!MI?1pG?Q<)N1e<V3-h2Z>w^QSrTwoK&D;q@G13-{+em>dr%Zb3E|Xb7cRZ
zS_vSRHD6>2{N}4s^GTf%s(?|zT^@@MUvb~FEdfAo?>ggf8Yk_u%S{@zV3(TNP_w`C
zQ|=S*d%{&+_RL7~^0CJ}S-^z(12$Zzei-s(A=Fevo$ab%h4M`FiGPxykct^<<66cv
zQWKt>+LugRX3<U4aumjG>-*h%hYK|pQGXV@{qsrYUlnf6!g+YrqWY6kBh)lEm+QA^
zc(A(ro_YzOivC*TQnuqCucnh%q<inv83>>ERtqw$Y15g31QVXkRxX`qU7{fEsa1A&
z$#26e?6nhgAnm?-gK#sHi1Uz}JM#Kw&%}$GcYj9@B+@%=9KZZ}V}x=-mAP93&angk
zc4B!OI|V+!3#{=X!M@!zF8-I6I8GXM5j^;-+z9oZ+1mO#NSkN>4laN^!X4X1s*<jy
z{j5PBTgrm86CD#8m%0!cKS_*lB)*t`@)6(mZoy5AglRz5Y1LH$9*NUPHmEH3Y^!*_
zt1?1uP$hq{+b}CG1;Bm6`UBi3>JZhP*&4LzN{hV#uTlv2?B9`!vl~pbUjy0E3`9;6
zE6)Q#T#;fyV5$n1gbS@18-cLurs?fd;Zit@yk4kOYS4a>>GAw$T~=X2L6+coL|T4B
zH@^xYd54@s@5GQom^UvjKk@W3pU6$B^j@3ux32@hwUj5CL&>{w9>{7Vl#I%Z{C9cM
zTz3w5aLvKo-5-BLO8{_=#SZ~a*M@F242hD~V+<XR0im!<6<R}@&^IV^CyP1kPlC!{
zpk<9UK9D5-5D#m%l@99~i>Ne0MPQUwA)j7upK6j2v?N;%S?tCxO#H1o57=gU_At(O
zvtGfw(P*l#WYb4w2#UhZMKFmK|64)&|EpI2PmTINL;TDa-DDJGqQK24MS{{R(%%g-
N9W4XRIt_c&{{vcPAzT0e

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index a34a8a1c..7efe6cbe 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -1,21 +1,38 @@
 <script setup lang="ts">
+import { UserFilled, ArrowDown } from '@element-plus/icons-vue'
 import useAuthStore from '@/store/auth'
-import { useRouter } from 'vue-router'
+import Logo from '@/assets/logo.png'
 const authStore = useAuthStore()
 const router = useRouter()
+
 const logout = async () => {
   await authStore.logout()
   router.push({ name: 'Login' }).finally()
 }
+
+const goPersonal = () => {
+  router.push({ name: 'Personal' }).finally()
+}
 </script>
 
 <template>
-  <div style="display: flex; justify-content: space-between">
-    <span>.</span>
-    <h2>
-      <el-button @click="logout">退出登录</el-button>
-      {{ authStore.realname }}
-    </h2>
+  <div style="height: 100%; display: flex; align-items: center">
+    <img :src="Logo" alt="Logo" style="height: 39px" />
+    <div style="position: absolute; right: 1.5rem">
+      <el-dropdown @command="command">
+        <span style="display: flex; align-items: center">
+          <el-avatar :size="33" :icon="UserFilled" :src="authStore.avatar" />
+          <span style="margin: 0 8px">{{ authStore.realname }}</span>
+          <el-icon><arrow-down /></el-icon>
+        </span>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item @click="goPersonal">个人中心</el-dropdown-item>
+            <el-dropdown-item divided @click="logout()">退出登录</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+    </div>
   </div>
 </template>
 
diff --git a/diboot-admin-ui/src/store/auth.ts b/diboot-admin-ui/src/store/auth.ts
index 887818cf..a10f8e92 100644
--- a/diboot-admin-ui/src/store/auth.ts
+++ b/diboot-admin-ui/src/store/auth.ts
@@ -35,8 +35,9 @@ export default defineStore('auth', {
     },
     getInfo: async function () {
       try {
-        const res = await api.get<{ realname: string }>('/auth/userInfo')
+        const res = await api.get<{ realname: string; avatar: string }>('/auth/userInfo')
         this.info = res.data
+        this.avatar = `${res.data?.avatar}`
         this.realname = `${res.data?.realname}`
       } catch (e) {
         throw new Error('获取登录者信息异常')
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 8611f9cc..16fa86d3 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -6,12 +6,17 @@ import '@vue/runtime-core'
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     ElAside: typeof import('element-plus/es')['ElAside']
+    ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDropdown: typeof import('element-plus/es')['ElDropdown']
+    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
+    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElHeader: typeof import('element-plus/es')['ElHeader']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
-- 
Gitee


From 40472b677ef9c8426f6582de6db4a9a6ee402ce5 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 26 Apr 2022 01:05:23 +0800
Subject: [PATCH 051/195] + add view-tabs

---
 diboot-admin-ui/mock/auth/index.ts          |  15 +-
 diboot-admin-ui/src/layout/index.vue        |  24 ++--
 diboot-admin-ui/src/layout/main/index.vue   |   7 +-
 diboot-admin-ui/src/layout/tabs/index.vue   | 150 ++++++++++++++++++++
 diboot-admin-ui/src/router/index.ts         |   3 +-
 diboot-admin-ui/src/router/router-guards.ts |   2 -
 diboot-admin-ui/src/router/typings.d.ts     |   1 +
 diboot-admin-ui/src/store/tabsView.ts       |  27 ----
 diboot-admin-ui/src/store/viewTabs.ts       |  96 +++++++++++++
 diboot-admin-ui/types/components.d.ts       |   1 +
 10 files changed, 279 insertions(+), 47 deletions(-)
 create mode 100644 diboot-admin-ui/src/layout/tabs/index.vue
 delete mode 100644 diboot-admin-ui/src/store/tabsView.ts
 create mode 100644 diboot-admin-ui/src/store/viewTabs.ts

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index 1e3a3080..824e245a 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -79,11 +79,18 @@ const authMenu = [
     path: '/demo',
     name: 'Demo',
     meta: { title: 'Demo', componentName: 'Layout' },
-    children: [
+    'children|20': [
       {
-        path: 'hello',
-        name: 'Hello',
-        meta: { title: 'Hello', componentName: 'Dashboard' }
+        path: `hello@string('number', 5)`,
+        name: 'Hello-@increment',
+        meta: {
+          title: 'Hello-@increment',
+          componentName: 'Dashboard',
+          sort: '@natural',
+          keepAlive: false,
+          hollow: '@boolean',
+          hideFooter: '@boolean'
+        }
       }
     ]
   }
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 5402c541..ee7997c4 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -1,26 +1,32 @@
 <script setup lang="ts">
 import AppHeader from './header/index.vue'
-import AppMenu from '@/layout/memu/index.vue'
+import AppMenu from './memu/index.vue'
 import AppMain from './main/index.vue'
 import AppFooter from './footer/index.vue'
+import AppTabs from './tabs/index.vue'
 </script>
 
 <template>
   <el-container>
-    <el-header>
+    <el-header height="50px" style="border-bottom: 1px solid #eee">
       <app-header />
     </el-header>
     <el-container>
       <el-aside width="200px">
-        <app-menu />
+        <el-scrollbar height="calc(100vh - 50px)">
+          <app-menu />
+        </el-scrollbar>
       </el-aside>
       <el-container>
-        <el-main>
-          <app-main>
-            <template #footer>
-              <app-footer />
-            </template>
-          </app-main>
+        <el-main style="padding: 0">
+          <app-tabs />
+          <el-scrollbar style="height: calc(100vh - 86px)">
+            <app-main>
+              <template #footer>
+                <app-footer />
+              </template>
+            </app-main>
+          </el-scrollbar>
         </el-main>
       </el-container>
     </el-container>
diff --git a/diboot-admin-ui/src/layout/main/index.vue b/diboot-admin-ui/src/layout/main/index.vue
index 6aa0898d..bc446c75 100644
--- a/diboot-admin-ui/src/layout/main/index.vue
+++ b/diboot-admin-ui/src/layout/main/index.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
-import useRouteStore from '@/store/tabsView'
-const routeStore = useRouteStore()
+import useViewTabsStore from '@/store/viewTabs'
+
+const viewTabsStore = useViewTabsStore()
 </script>
 
 <template>
   <router-view v-slot="{ Component, route }">
     <transition :name="route.meta.transition" mode="out-in">
-      <keep-alive :include="routeStore.cachedViews">
+      <keep-alive :include="viewTabsStore.cachedViews">
         <div :key="route.fullPath" class="content">
           <div :class="route.meta.hollow ? '' : 'bounded'">
             <component :is="Component" />
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
new file mode 100644
index 00000000..98d51cf6
--- /dev/null
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -0,0 +1,150 @@
+<script setup lang="ts">
+import { onBeforeRouteUpdate, RouteLocationNormalized } from 'vue-router'
+import { Close, Menu, ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
+import { ElScrollbar } from 'element-plus'
+import useViewTabsStore from '@/store/viewTabs'
+
+const viewTabsStore = useViewTabsStore()
+
+const allowClose = (item: RouteLocationNormalized) => !item.meta.affixTab && viewTabsStore.tabList.length > 1
+const findTabIndex = (item: RouteLocationNormalized) => viewTabsStore.tabList.findIndex(e => e.name === item?.name)
+
+const route = useRoute()
+viewTabsStore.addTab(_.cloneDeep(route))
+watch(route, value => {
+  viewTabsStore.addTab(_.cloneDeep(value))
+})
+
+// 首次加载与第一次跳转路由不进入！！！
+onBeforeRouteUpdate(to => {
+  console.log('to', to.name)
+})
+
+// onBeforeRouteUpdate((to, from, next) => {
+//   console.log('to', to.name)
+//   next()
+// })
+
+// 右键菜单
+const menu = reactive<{ route?: RouteLocationNormalized; locator?: any }>({})
+const contentMenuTarget = ref()
+const contentMenu = ref()
+
+const rightClick = (event: MouseEvent, route: RouteLocationNormalized) => {
+  contentMenu.value?.handleClose()
+  menu.route = route
+  menu.locator = {
+    position: 'fixed',
+    left: `${event.clientX + 1}px`, // X 轴坐标
+    top: `${event.clientY - 10}px` // Y 轴坐标
+  }
+  setTimeout(() => {
+    contentMenuTarget.value?.click()
+  }, 0)
+}
+
+const showButtons = ref(false)
+</script>
+
+<template>
+  <div ref="tabsShellRef" style="display: flex; align-items: center">
+    <el-icon v-show="showButtons" :size="22" class="icon-button" style="border-right: 1px solid #eee" color="#AAA">
+      <arrow-left />
+    </el-icon>
+    <el-scrollbar ref="tabsScrollRef" style="height: 36px; width: calc(100% - 36px)" @scroll="scroll">
+      <div ref="tabsRef" class="tabs">
+        <el-button
+          v-for="item in viewTabsStore.tabList"
+          :key="item.fullPath"
+          :type="$route.name === item.name ? 'primary' : ''"
+          @contextmenu.prevent="event => rightClick(event, item)"
+          @click="$router.push(item.fullPath)"
+        >
+          {{ item.meta.title }}
+          <el-icon v-show="allowClose(item)" :size="18" @click="viewTabsStore.closeTab(item, $router)">
+            <Close />
+          </el-icon>
+        </el-button>
+      </div>
+    </el-scrollbar>
+    <el-icon v-show="showButtons" :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
+      <arrow-right />
+    </el-icon>
+    <el-dropdown size="small" style="border-left: 1px solid #eeeeee">
+      <el-icon :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
+        <Menu />
+      </el-icon>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item @click="viewTabsStore.closeAllTabs($router)">关闭所有页签</el-dropdown-item>
+          <el-dropdown-item command="FullScreen" divided>全屏</el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+  </div>
+  <!-- tab 菜单 -->
+  <el-dropdown ref="contentMenu" trigger="click" size="small" :style="menu.locator" style="position: fixed">
+    <div ref="contentMenuTarget" />
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item :disabled="findTabIndex(menu.route) === 0" @click="viewTabsStore.closeLeftTabs(menu.route)">
+          关闭左侧页签
+        </el-dropdown-item>
+        <el-dropdown-item
+          :disabled="findTabIndex(menu.route) === viewTabsStore.tabList.length - 1"
+          @click="viewTabsStore.closeRightTabs(menu.route)"
+        >
+          关闭右侧页签
+        </el-dropdown-item>
+        <el-dropdown-item
+          :disabled="viewTabsStore.tabList.length === 1"
+          @click="viewTabsStore.closeOtherTabs(menu.route)"
+        >
+          关闭其他页签
+        </el-dropdown-item>
+        <el-dropdown-item command="FullScreen" divided>全屏</el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+</template>
+
+<style scoped lang="scss">
+.tabs {
+  display: flex;
+  margin: 3px;
+
+  .el-button {
+    height: 30px;
+
+    .el-icon {
+      border-radius: 100%;
+      position: relative;
+      right: -6px;
+
+      &:hover {
+        color: var(--el-color-white);
+        background-color: var(--el-color-primary-light-5);
+      }
+    }
+  }
+
+  .el-button + .el-button {
+    margin-left: 5px;
+  }
+}
+
+.add-fun {
+  width: 33px;
+  border-left: 2px solid #eeeeee;
+}
+
+.icon-button {
+  width: 33px;
+  height: 36px;
+  cursor: pointer;
+}
+
+.icon-button:hover {
+  color: var(--el-color-primary);
+}
+</style>
diff --git a/diboot-admin-ui/src/router/index.ts b/diboot-admin-ui/src/router/index.ts
index 000b529c..bf213812 100644
--- a/diboot-admin-ui/src/router/index.ts
+++ b/diboot-admin-ui/src/router/index.ts
@@ -56,13 +56,12 @@ export const constantRoutes: RouteRecordRaw[] = [
     name: 'Home',
     redirect: '/dashboard',
     component: () => import('@/layout/index.vue'),
-    meta: { title: '首页', sort: -1 },
     children: [
       {
         path: 'dashboard',
         name: 'Dashboard',
         component: () => import('@/views/dashboard/index.vue'),
-        meta: { title: '仪表盘' }
+        meta: { title: '仪表盘', affixTab: true, sort: -1 }
       }
     ]
   }
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
index 264e0956..d0e32e5b 100644
--- a/diboot-admin-ui/src/router/router-guards.ts
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -1,7 +1,6 @@
 import { isNavigationFailure, Router } from 'vue-router'
 import nProgress from 'nprogress'
 import useAuthStore from '@/store/auth'
-import useTabsViewStore from '@/store/tabsView'
 import { buildAsyncRoutes } from '@/utils/route'
 import auth from '@/utils/auth'
 
@@ -63,7 +62,6 @@ export function createRouterGuard(router: Router) {
       return
     }
     nProgress.done()
-    useTabsViewStore().addView(to)
   })
 
   router.onError(error => {
diff --git a/diboot-admin-ui/src/router/typings.d.ts b/diboot-admin-ui/src/router/typings.d.ts
index 2d6266f1..c93428dc 100644
--- a/diboot-admin-ui/src/router/typings.d.ts
+++ b/diboot-admin-ui/src/router/typings.d.ts
@@ -7,6 +7,7 @@ declare module 'vue-router' {
     module?: string
     componentName?: string
     sort?: number
+    affixTab?: boolean
     ignoreAuth?: boolean
     keepAlive?: boolean
     hidden?: boolean
diff --git a/diboot-admin-ui/src/store/tabsView.ts b/diboot-admin-ui/src/store/tabsView.ts
deleted file mode 100644
index cd94c38f..00000000
--- a/diboot-admin-ui/src/store/tabsView.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { RouteLocationNormalizedLoaded } from 'vue-router'
-
-interface ITagsViewStore {
-  visitedViews: RouteLocationNormalizedLoaded[]
-  cachedViews: string[]
-}
-
-export default defineStore('tags-view', {
-  state() {
-    return <ITagsViewStore>{
-      visitedViews: [],
-      cachedViews: []
-    }
-  },
-  actions: {
-    addView(view: RouteLocationNormalizedLoaded) {
-      if (!this.visitedViews.includes(view)) {
-        return
-      }
-      this.visitedViews.push(view)
-      if (view.meta.keepAlive !== false) this.cachedViews.push(view.name as string)
-    },
-    delView(view: RouteLocationNormalizedLoaded) {
-      console.log(view)
-    }
-  }
-})
diff --git a/diboot-admin-ui/src/store/viewTabs.ts b/diboot-admin-ui/src/store/viewTabs.ts
new file mode 100644
index 00000000..4b727a5b
--- /dev/null
+++ b/diboot-admin-ui/src/store/viewTabs.ts
@@ -0,0 +1,96 @@
+import { LocationQuery, RouteLocationNormalized, RouteParams, Router, RouteRecordName } from 'vue-router'
+
+export type IViewTabsStore = {
+  tabList: RouteLocationNormalized[] // 页签
+}
+
+interface IViewTab {
+  fullPath: string
+
+  path: string
+
+  title: string
+
+  name?: RouteRecordName
+
+  query?: LocationQuery
+
+  params?: RouteParams
+
+  keepAlive?: boolean
+
+  componentName?: string
+}
+
+// 查找 Tab 函数
+const findTabFu = (route: RouteLocationNormalized) => (item: RouteLocationNormalized) => item.name == route.name
+
+export default defineStore({
+  id: 'view-tabs',
+  state: (): IViewTabsStore => ({
+    tabList: []
+  }),
+  getters: {
+    // 缓存的视图组件名称列表
+    cachedViews(): string[] {
+      return this.tabList
+        .filter(e => e.meta.keepAlive != false && e.meta.componentName)
+        .map(e => e.meta.componentName) as string[]
+    }
+  },
+  actions: {
+    // 初始化标签页
+    initTabs(routes: RouteLocationNormalized[]) {
+      this.tabList = routes
+    },
+    // 添加(存在则替换)
+    addTab(route: RouteLocationNormalized) {
+      const index = this.tabList.findIndex(findTabFu(route))
+      if (index === -1) this.tabList.push(route)
+      else this.tabList.splice(index, 1, route)
+      if (!route.meta.title) route.meta.title = 'no-title'
+    },
+    // 更新
+    updateTabTitle(route: RouteLocationNormalized, title: string) {
+      const find = this.tabList.find(findTabFu(route))
+      if (find) find.meta.title = title
+      else return false
+    },
+    // 关闭指定前页
+    closeTab(route: RouteLocationNormalized, router: Router) {
+      const findIndex = this.tabList.findIndex(findTabFu(route))
+      const find = this.tabList.splice(findIndex, 1)[0]
+      if (router.currentRoute.value.name === find.name) {
+        const length = this.tabList.length
+        router.push(this.tabList[length > findIndex ? findIndex : length - 1].fullPath).finally()
+      }
+    },
+    // 关闭左侧
+    closeLeftTabs(route: RouteLocationNormalized) {
+      this.tabList.splice(0, this.tabList.findIndex(findTabFu(route)))
+    },
+    // 关闭右侧
+    closeRightTabs(route: RouteLocationNormalized) {
+      this.tabList.splice(this.tabList.findIndex(findTabFu(route)) + 1)
+    },
+    // 关闭其他
+    closeOtherTabs(route: RouteLocationNormalized) {
+      this.tabList = this.tabList.filter(findTabFu(route))
+    },
+    // 关闭全部
+    closeAllTabs(router: Router) {
+      let presenceActivation = false
+      const currentRouteName = router.currentRoute.value.name
+      //保留固定路由
+      this.tabList = this.tabList.filter(item => {
+        if (!presenceActivation) presenceActivation = item.name === currentRouteName
+        return item.meta.affixTab ?? false
+      })
+      // 跳转至最后一个 tab 或 Home
+      const length = this.tabList.length
+      if (presenceActivation)
+        if (length >= 0) router.push(this.tabList[length - 1].fullPath).finally()
+        else router.push({ name: 'Home' }).finally()
+    }
+  }
+})
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 16fa86d3..a14fce90 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -21,6 +21,7 @@ declare module '@vue/runtime-core' {
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     HelloWorld: typeof import('@/components/HelloWorld.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
-- 
Gitee


From 873285e2789e7c40cd8a3e7b49a35d03dccc157c Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 26 Apr 2022 01:09:46 +0800
Subject: [PATCH 052/195] * opt main

---
 diboot-admin-ui/src/layout/footer/index.vue   |  6 +-
 diboot-admin-ui/src/layout/main/index.vue     | 60 ++++++++++++++++---
 diboot-admin-ui/src/views/dashboard/index.vue |  7 ++-
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/diboot-admin-ui/src/layout/footer/index.vue b/diboot-admin-ui/src/layout/footer/index.vue
index 62c7946d..6211ef9c 100644
--- a/diboot-admin-ui/src/layout/footer/index.vue
+++ b/diboot-admin-ui/src/layout/footer/index.vue
@@ -2,8 +2,4 @@
 console.log('footer')
 </script>
 
-<template>
-  <h5 style="text-align: center">footer</h5>
-</template>
-
-<style scoped></style>
+<template>Diboot © 2015-2022</template>
diff --git a/diboot-admin-ui/src/layout/main/index.vue b/diboot-admin-ui/src/layout/main/index.vue
index bc446c75..d3449f7b 100644
--- a/diboot-admin-ui/src/layout/main/index.vue
+++ b/diboot-admin-ui/src/layout/main/index.vue
@@ -1,7 +1,21 @@
 <script setup lang="ts">
 import useViewTabsStore from '@/store/viewTabs'
+import { RouteLocationNormalized } from 'vue-router'
 
 const viewTabsStore = useViewTabsStore()
+
+const slotFooter = !!useSlots().footer
+
+// 计算已占用高度
+const alreadyOccupyHeight = (route: RouteLocationNormalized) =>
+  // header + tabs + padding + bounded-padding + footer
+  50 + 36 + 20 + (route.meta.hollow ? 0 : 20) + (slotFooter && !route.meta.hideFooter ? 50 + 2 : 0)
+
+// 获取自定义内容的 class
+const customContentClass = (route: RouteLocationNormalized) => {
+  if (route.meta.hollow) return slotFooter && !route.meta.hideFooter ? 'hollow' : ''
+  return slotFooter && !route.meta.hideFooter ? 'bounded-footer' : 'bounded'
+}
 </script>
 
 <template>
@@ -9,25 +23,53 @@ const viewTabsStore = useViewTabsStore()
     <transition :name="route.meta.transition" mode="out-in">
       <keep-alive :include="viewTabsStore.cachedViews">
         <div :key="route.fullPath" class="content">
-          <div :class="route.meta.hollow ? '' : 'bounded'">
-            <component :is="Component" />
+          <div :class="customContentClass(route)">
+            <component :is="Component" :already-occupy-height="alreadyOccupyHeight(route)" />
+          </div>
+          <div v-if="slotFooter && !route.meta.hideFooter" class="footer">
+            <slot name="footer" />
           </div>
-          <slot v-if="!route.meta.hideFooter" name="footer" />
         </div>
       </keep-alive>
     </transition>
   </router-view>
 </template>
 
-<style scoped>
+<style scoped lang="scss">
 .content {
   padding: 10px;
   background-color: rgba(125, 125, 125, 0.1);
-}
+  min-height: calc(100vh - 106px);
+
+  .hollow {
+    min-height: calc(100vh - 158px);
+  }
+
+  .bounded,
+  .bounded-footer {
+    padding: 10px 15px;
+    background-color: #fff;
+  }
+
+  .bounded {
+    border-radius: 5px;
+    min-height: calc(100vh - 126px);
+  }
+
+  .bounded-footer {
+    min-height: calc(100vh - 178px);
+    border-radius: 5px 5px 0 0;
+  }
 
-.content > .bounded {
-  padding: 10px 15px;
-  border-radius: 5px 5px 0 0;
-  background-color: #fff;
+  .footer {
+    height: 50px;
+    color: darkgray;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    border-top: 2px dashed #eeeeee;
+    border-radius: 0 0 5px 5px;
+    background-color: #fff;
+  }
 }
 </style>
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
index a105f34b..74189cd3 100644
--- a/diboot-admin-ui/src/views/dashboard/index.vue
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts" name="Dashboard">
 console.log('Dashboard')
+// 可接收已占用的高度，方便主区域计算使用
+defineProps<{ alreadyOccupyHeight?: number }>()
 </script>
 
-<template>Dashboard</template>
+<template>
+  Dashboard<br /><br />
+  已占有的高度：{{ alreadyOccupyHeight }}px
+</template>
 
 <style scoped></style>
-- 
Gitee


From 9e689f5c9a6c11a3b8978a3bdf0af50c69ba9b76 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Tue, 26 Apr 2022 16:34:09 +0800
Subject: [PATCH 053/195] =?UTF-8?q?*=20=E7=BC=93=E5=AD=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/diboot/core/test/util/CacheTest.java |  6 ++++--
 .../diboot/core/cache/BaseCacheManager.java   | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/CacheTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/CacheTest.java
index 785b2b57..5cd58962 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/CacheTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/CacheTest.java
@@ -42,14 +42,16 @@ public class CacheTest {
         Assert.assertTrue(dictionaryMapCache.get("G").getType().equals("GENDER"));
         boolean isExpired = cacheManager.isExpired(CACHE_TMPL, "version");
         Assert.assertFalse(isExpired);
-        /*try{
+        try{
             Thread.sleep(60*1000);
         }
         catch (Exception e){
             e.printStackTrace();
         }
+        dictionaryMapCache = cacheManager.getCacheObj(CACHE_TMPL, "version", Map.class);
+        Assert.assertTrue(dictionaryMapCache == null);
         isExpired = cacheManager.isExpired(CACHE_TMPL, "version");
-        Assert.assertTrue(isExpired);*/
+        Assert.assertTrue(isExpired);
     }
 
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
index 3fd9ad18..2febeabb 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
@@ -24,6 +24,15 @@ public abstract class BaseCacheManager extends SimpleCacheManager {
         return cache != null? cache.get(objKey, tClass) : null;
     }
 
+    /**
+     * 获取缓存对象
+     * @param objKey
+     * @return
+     */
+    public String getCacheString(String cacheName, Object objKey){
+        return getCacheObj(cacheName, objKey, String.class);
+    }
+
     /**
      * 缓存对象
      * @param cacheName
@@ -35,6 +44,16 @@ public abstract class BaseCacheManager extends SimpleCacheManager {
         cache.put(objKey, obj);
     }
 
+    /**
+     * 删除缓存对象
+     * @param cacheName
+     * @param objKey
+     */
+    public void removeCacheObj(String cacheName, Object objKey){
+        Cache cache = getCache(cacheName);
+        cache.evict(objKey);
+    }
+
     /**
      * 尚未初始化的
      * @param cacheName
-- 
Gitee


From 78169d78b34538cf663e5fe1838a31c641a29b21 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Tue, 26 Apr 2022 16:35:38 +0800
Subject: [PATCH 054/195] =?UTF-8?q?*=20shiro=E6=97=A0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/iam/jwt/DefaultJwtAuthFilter.java  |   1 +
 .../iam/jwt/StatelessJwtAuthFilter.java       |   1 +
 .../shiro/StatelessAccessControlFilter.java   | 141 ++++++++++++++++++
 .../iam/shiro/StatelessSubjectFactory.java    |  38 +++++
 .../com/diboot/iam/starter/IamAutoConfig.java |  82 +++++-----
 .../com/diboot/iam/starter/IamProperties.java |   4 -
 6 files changed, 225 insertions(+), 42 deletions(-)
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java
index 005b3735..1f5b3ad7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java
@@ -42,6 +42,7 @@ import java.io.PrintWriter;
  * @version v2.0
  * @date 2019/6/6
  */
+@Deprecated
 @Slf4j
 public class DefaultJwtAuthFilter extends BasicHttpAuthenticationFilter {
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java
index a9130b11..1c767d4a 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java
@@ -46,6 +46,7 @@ import java.io.PrintWriter;
  * @version : v1.0
  * @Date 2020/11/19  10:46
  */
+@Deprecated
 @Slf4j
 @Getter @Setter
 public class StatelessJwtAuthFilter extends BasicHttpAuthenticationFilter {
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
new file mode 100644
index 00000000..67ecff8e
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.shiro;
+
+import com.diboot.core.util.JSON;
+import com.diboot.core.util.V;
+import com.diboot.core.vo.JsonResult;
+import com.diboot.core.vo.Status;
+import com.diboot.iam.config.Cons;
+import com.diboot.iam.entity.IamUser;
+import com.diboot.iam.jwt.BaseJwtAuthToken;
+import com.diboot.iam.util.IamSecurityUtils;
+import com.diboot.iam.util.JwtUtils;
+import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.web.filter.AccessControlFilter;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * 无状态的访问控制过滤器
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/26
+ * Copyright © diboot.com
+ */
+@Slf4j
+public class StatelessAccessControlFilter extends AccessControlFilter {
+
+    /**
+     * 判断是否登录
+     *
+     * 返回true则直接进入控制器
+     * @param request
+     * @param response
+     * @param mappedValue
+     * @return
+     */
+    @Override
+    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+        // 从header获取Token
+        Claims claims = JwtUtils.getClaimsFromRequest(httpRequest);
+        if (V.isEmpty(claims)) {
+            return false;
+        }
+        String currentToken = JwtUtils.getRequestToken(httpRequest);
+        //解密是否成功
+        if(V.notEmpty(claims.getSubject())){
+            String subject = claims.getSubject();
+            log.debug("Token验证成功！subject={}", subject);
+            // 如果临近过期，则生成新的token返回
+            String refreshToken = JwtUtils.generateNewTokenIfRequired(claims);
+            if(refreshToken != null){
+                currentToken = refreshToken;
+                // 写入response header中
+                JwtUtils.addTokenToResponseHeader((HttpServletResponse) response, refreshToken);
+                log.debug("写回刷新token :{}", refreshToken);
+            }
+            // 构建登陆的token
+            if(IamSecurityUtils.getSubject().isAuthenticated() == false || refreshToken != null){
+                // tenantId,account,userTypeClass,authType,60
+                String[] subjectDetail = subject.split(Cons.SEPARATOR_COMMA);
+                BaseJwtAuthToken baseJwtAuthToken = new BaseJwtAuthToken();
+                baseJwtAuthToken.setTenantId(Long.valueOf(subjectDetail[0]));
+                baseJwtAuthToken.setAuthAccount(subjectDetail[1]);
+                if(!IamUser.class.getName().equals(subjectDetail[2])){
+                    try {
+                        baseJwtAuthToken.setUserTypeClass(Class.forName(subjectDetail[2]));
+                    } catch (ClassNotFoundException e) {
+                        log.debug("Token验证失败！用户类型{}不存在，url={}", subjectDetail[2], httpRequest.getRequestURL());
+                        return false;
+                    }
+                }
+                baseJwtAuthToken.setAuthType(subjectDetail[3]);
+                baseJwtAuthToken.setAuthtoken(currentToken);
+                baseJwtAuthToken.setValidPassword(false);
+                IamSecurityUtils.getSubject().login(baseJwtAuthToken);
+                log.debug("无状态token自动登录完成");
+            }
+            return true;
+        }
+        log.debug("Token验证失败！url=" + httpRequest.getRequestURL());
+        return false;
+    }
+
+    /**
+     * 没有登录的情况下会走此方法
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @Override
+    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+        log.debug("Token认证失败： onAccessDenied");
+        JsonResult jsonResult = new JsonResult(Status.FAIL_INVALID_TOKEN);
+        this.responseJson((HttpServletResponse)response, jsonResult);
+        return false;
+    }
+
+    /***
+     * 返回json格式错误信息
+     * @param response
+     * @param jsonResult
+     */
+    protected void responseJson(HttpServletResponse response, JsonResult jsonResult){
+        // 处理异步请求
+        response.setStatus(HttpStatus.OK.value());
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+        response.setCharacterEncoding(Cons.CHARSET_UTF8);
+        try (PrintWriter pw = response.getWriter()){
+            pw.write(JSON.stringify(jsonResult));
+            pw.flush();
+        }
+        catch (IOException e) {
+            log.error("处理异步请求异常", e);
+        }
+    }
+
+}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java
new file mode 100644
index 00000000..b6db2cad
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.shiro;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.SubjectContext;
+import org.apache.shiro.web.mgt.DefaultWebSubjectFactory;
+
+/**
+ * 无状态的SubjectFactory
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/26
+ * Copyright © diboot.com
+ */
+@Slf4j
+public class StatelessSubjectFactory extends DefaultWebSubjectFactory {
+    public Subject createSubject(SubjectContext context) {
+        //不创建session
+        context.setSessionCreationEnabled(false);
+        log.debug("SubjectContext禁用session.");
+        return super.createSubject(context);
+    }
+}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
index c5420763..bc004461 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
@@ -15,24 +15,27 @@
  */
 package com.diboot.iam.starter;
 
+import com.diboot.core.cache.BaseCacheManager;
+import com.diboot.core.cache.DynamicMemoryCacheManager;
 import com.diboot.core.util.V;
+import com.diboot.iam.config.Cons;
 import com.diboot.iam.jwt.BaseJwtRealm;
-import com.diboot.iam.jwt.DefaultJwtAuthFilter;
-import com.diboot.iam.jwt.StatelessJwtAuthFilter;
+import com.diboot.iam.shiro.StatelessAccessControlFilter;
+import com.diboot.iam.shiro.StatelessSubjectFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.MemoryConstrainedCacheManager;
-import org.apache.shiro.mgt.DefaultSubjectDAO;
+import org.apache.shiro.mgt.*;
 import org.apache.shiro.mgt.SecurityManager;
-import org.apache.shiro.mgt.SessionsSecurityManager;
 import org.apache.shiro.realm.Realm;
+import org.apache.shiro.session.mgt.DefaultSessionManager;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
 import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.SubjectContext;
-import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
+import org.apache.shiro.web.filter.AccessControlFilter;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.mgt.DefaultWebSessionStorageEvaluator;
 import org.apache.shiro.web.mgt.DefaultWebSubjectFactory;
@@ -99,13 +102,40 @@ public class IamAutoConfig {
      */
     @Bean(name = "shiroSecurityManager")
     @ConditionalOnMissingBean
-    public SessionsSecurityManager shiroSecurityManager() {
+    public DefaultWebSecurityManager shiroSecurityManager() {
         DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
+        securityManager.setSubjectFactory(subjectFactory());
+        securityManager.setSessionManager(sessionManager());
         securityManager.setRealm(realm());
         securityManager.setCacheManager(shiroCacheManager());
+        // subject禁止存储到session
+        ((DefaultSubjectDAO) securityManager.getSubjectDAO()).setSessionStorageEvaluator(sessionStorageEvaluator());
         return securityManager;
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    protected SessionStorageEvaluator sessionStorageEvaluator() {
+        DefaultSessionStorageEvaluator sessionStorageEvaluator = new DefaultSessionStorageEvaluator();
+        sessionStorageEvaluator.setSessionStorageEnabled(false);
+        return sessionStorageEvaluator;
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public DefaultWebSubjectFactory subjectFactory(){
+        StatelessSubjectFactory subjectFactory = new StatelessSubjectFactory();
+        return subjectFactory;
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public DefaultSessionManager sessionManager(){
+        DefaultSessionManager sessionManager = new DefaultSessionManager();
+        sessionManager.setSessionValidationSchedulerEnabled(false);
+        return sessionManager;
+    }
+
     /**
      * 配置ShiroFilter
      *
@@ -113,11 +143,8 @@ public class IamAutoConfig {
      */
     @Bean
     @ConditionalOnMissingBean
-    public BasicHttpAuthenticationFilter shiroFilter() {
-        if (iamProperties.isEnableStatelessSession()) {
-            return new StatelessJwtAuthFilter();
-        }
-        return new DefaultJwtAuthFilter();
+    public AccessControlFilter shiroFilter() {
+        return new StatelessAccessControlFilter();
     }
 
     @Bean
@@ -135,20 +162,6 @@ public class IamAutoConfig {
         // 设置过滤器
         Map<String, Filter> filters = new LinkedHashMap<>();
         filters.put("jwt", shiroFilter());
-
-        // 设置无状态session
-        if (securityManager instanceof DefaultWebSecurityManager &&
-                V.equals(shiroFilter().getClass().getTypeName(), StatelessJwtAuthFilter.class.getTypeName())) {
-            DefaultWebSecurityManager defaultWebSecurityManager = ((DefaultWebSecurityManager) securityManager);
-            // 设置不创建session
-            defaultWebSecurityManager.setSubjectFactory(new StatelessDefaultSubjectFactory());
-            // subject禁止存储到session
-            //详情见org.apache.shiro.mgt.DefaultSubjectDAO#save
-            DefaultWebSessionStorageEvaluator webEvalutator = new DefaultWebSessionStorageEvaluator();
-            webEvalutator.setSessionStorageEnabled(false);
-            ((DefaultSubjectDAO) defaultWebSecurityManager.getSubjectDAO())
-                    .setSessionStorageEvaluator(webEvalutator);
-        }
         shiroFilterFactoryBean.setFilters(filters);
         //Shiro securityManager
         shiroFilterFactoryBean.setSecurityManager(securityManager);
@@ -190,20 +203,13 @@ public class IamAutoConfig {
     }
 
     /**
-     * 禁用session
-     *
-     * @author : uu
-     * @version : v1.0
-     * @date 2020/11/19  11:06
+     * 验证码的缓存管理
+     * @return
      */
-    static class StatelessDefaultSubjectFactory extends DefaultWebSubjectFactory {
-
-        @Override
-        public Subject createSubject(SubjectContext context) {
-            //不创建session
-            context.setSessionCreationEnabled(false);
-            return super.createSubject(context);
-        }
+    @Bean
+    @ConditionalOnMissingBean
+    public BaseCacheManager captchaCacheManager(){
+        return new DynamicMemoryCacheManager(30, Cons.CAPTCHA);
     }
 
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java
index bd522c2d..0cdf153e 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java
@@ -64,10 +64,6 @@ public class IamProperties {
      * 是否开启权限检查（开发环境可关闭方便调试）
      */
     private boolean enablePermissionCheck = true;
-    /**
-     * 是否开启无状态 Jwt 身份验证过滤器
-     */
-    private boolean enableStatelessSession = false;
     /**
      * oauth2 客户端配置
      */
-- 
Gitee


From c201daa73387f32d0cd75d3dd8254f33dbbf4980 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Tue, 26 Apr 2022 16:36:12 +0800
Subject: [PATCH 055/195] =?UTF-8?q?*=20=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8D=E4=BE=9D=E8=B5=96session=E7=9B=B8=E5=85=B3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/iam/config/Cons.java            | 5 +++++
 .../src/main/java/com/diboot/iam/dto/AuthCredential.java     | 5 +++++
 .../java/com/diboot/iam/redis/ShiroRedisCacheManager.java    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
index 52af88a6..37094571 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
@@ -118,4 +118,9 @@ public class Cons extends com.diboot.core.config.Cons {
     public static final String AUTHENTICATION_CAHCE_NAME = "com.diboot.iam.jwt.BaseJwtRealm.authenticationCache";
     public static final String AUTHORIZATION_CAHCE_NAME = "com.diboot.iam.jwt.BaseJwtRealm.authorizationCache";
 
+    /**
+     * 验证码
+     */
+    public static final String CAPTCHA = "captcha";
+
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/AuthCredential.java b/diboot-iam-starter/src/main/java/com/diboot/iam/dto/AuthCredential.java
index 7d374a17..8f2e3914 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/dto/AuthCredential.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/dto/AuthCredential.java
@@ -37,6 +37,11 @@ import java.util.Map;
 public abstract class AuthCredential implements Serializable {
     private static final long serialVersionUID = -4721950772621829194L;
 
+    /**
+     * 唯一标识
+     */
+    private String traceId;
+
     /**
      * 用户类型的Class
      */
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/redis/ShiroRedisCacheManager.java b/diboot-iam-starter/src/main/java/com/diboot/iam/redis/ShiroRedisCacheManager.java
index 46ce2011..ce90b7f5 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/redis/ShiroRedisCacheManager.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/redis/ShiroRedisCacheManager.java
@@ -46,4 +46,4 @@ public class ShiroRedisCacheManager extends AbstractCacheManager {
         return new ShiroRedisCache(cacheName, redisTemplate, tokenExpireMinutes);
     }
 
-}
+}
\ No newline at end of file
-- 
Gitee


From 0bc3a76124f5cf3085408aaa709eefad62144d38 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 26 Apr 2022 22:39:35 +0800
Subject: [PATCH 056/195] * opt view-tabs

---
 diboot-admin-ui/src/layout/memu/index.vue |   2 +-
 diboot-admin-ui/src/layout/tabs/index.vue | 130 ++++++++++++++++------
 diboot-admin-ui/src/store/viewTabs.ts     |  61 +++++-----
 3 files changed, 121 insertions(+), 72 deletions(-)

diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index dec6833b..22e4d5fd 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -4,7 +4,7 @@ import { getMenuTree } from '@/utils/route'
 </script>
 
 <template>
-  <el-menu router>
+  <el-menu router :default-active="$route.path">
     <sub-menu :menu-tree="getMenuTree()" />
   </el-menu>
 </template>
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index 98d51cf6..fee95952 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -1,32 +1,60 @@
 <script setup lang="ts">
-import { onBeforeRouteUpdate, RouteLocationNormalized } from 'vue-router'
+import { RouteLocationNormalized } from 'vue-router'
 import { Close, Menu, ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
 import { ElScrollbar } from 'element-plus'
 import useViewTabsStore from '@/store/viewTabs'
 
+// tabs 滚动控制
+const tabsRef = ref<HTMLDivElement>()
+const tabsScrollRef = ref<InstanceType<typeof ElScrollbar>>()
+
+const showButtons = ref(false) // computed(() => (tabsRef.value?.clientWidth ?? 0) < (tabsRef.value?.scrollWidth ?? 0))
+// 刷新按钮
+const refreshButton = () =>
+  nextTick(() => (showButtons.value = (tabsRef.value?.clientWidth ?? 0) < (tabsRef.value?.scrollWidth ?? 0)))
+
+// tabs 位置
+const tabsPosition = ref(0)
+
+const scroll = ({ scrollLeft }: any) => {
+  tabsPosition.value = scrollLeft
+}
+
+// 手动滚动 Tabs 列表
+const operateScroll = (left = true) => {
+  const step = 50 // 步长，调解速度
+  let deviation = (tabsRef.value?.clientWidth ?? 500) * 0.7
+  let timer = setInterval(() => {
+    tabsScrollRef.value?.setScrollLeft(tabsPosition.value + (left ? step : -step))
+    if ((deviation -= step) <= 0) {
+      clearInterval(timer)
+    }
+  }, 20)
+}
+
+// tabs 收集
 const viewTabsStore = useViewTabsStore()
 
 const allowClose = (item: RouteLocationNormalized) => !item.meta.affixTab && viewTabsStore.tabList.length > 1
-const findTabIndex = (item: RouteLocationNormalized) => viewTabsStore.tabList.findIndex(e => e.name === item?.name)
+const findTabIndex = (item?: RouteLocationNormalized) => viewTabsStore.tabList.findIndex(e => e.name === item?.name)
 
 const route = useRoute()
+const router = useRouter()
+// 收集 Tabs
 viewTabsStore.addTab(_.cloneDeep(route))
-watch(route, value => {
-  viewTabsStore.addTab(_.cloneDeep(value))
-})
-
-// 首次加载与第一次跳转路由不进入！！！
-onBeforeRouteUpdate(to => {
-  console.log('to', to.name)
-})
-
-// onBeforeRouteUpdate((to, from, next) => {
-//   console.log('to', to.name)
-//   next()
-// })
+watch(
+  route,
+  value => {
+    if (viewTabsStore.addTab(_.cloneDeep(value))) {
+      refreshButton()
+      operateScroll()
+    }
+  },
+  { immediate: true }
+)
 
 // 右键菜单
-const menu = reactive<{ route?: RouteLocationNormalized; locator?: any }>({})
+const menu = reactive<{ route?: RouteLocationNormalized; locator?: any }>({ route })
 const contentMenuTarget = ref()
 const contentMenu = ref()
 
@@ -43,15 +71,44 @@ const rightClick = (event: MouseEvent, route: RouteLocationNormalized) => {
   }, 0)
 }
 
-const showButtons = ref(false)
+const closeTab = (tab: RouteLocationNormalized) => {
+  viewTabsStore.closeTab(tab, router)
+  refreshButton()
+}
+const closeLeftTabs = (tab?: RouteLocationNormalized) => {
+  if (tab == null) return
+  viewTabsStore.closeLeftTabs(tab, router)
+  refreshButton()
+}
+const closeRightTabs = (tab?: RouteLocationNormalized) => {
+  if (tab == null) return
+  viewTabsStore.closeRightTabs(tab, router)
+  refreshButton()
+}
+const closeOtherTabs = (tab?: RouteLocationNormalized) => {
+  if (tab == null) return
+  viewTabsStore.closeOtherTabs(tab, router)
+  refreshButton()
+}
+const closeAllTabs = () => {
+  viewTabsStore.closeAllTabs(router)
+  refreshButton()
+}
 </script>
 
 <template>
-  <div ref="tabsShellRef" style="display: flex; align-items: center">
-    <el-icon v-show="showButtons" :size="22" class="icon-button" style="border-right: 1px solid #eee" color="#AAA">
+  <div style="display: flex; align-items: center; border-bottom: 1px solid #eee">
+    <el-icon
+      v-show="showButtons"
+      :size="22"
+      class="icon-button"
+      style="border-right: 1px solid #eee"
+      color="#AAA"
+      @click="operateScroll(false)"
+    >
       <arrow-left />
     </el-icon>
-    <el-scrollbar ref="tabsScrollRef" style="height: 36px; width: calc(100% - 36px)" @scroll="scroll">
+    <el-scrollbar ref="tabsScrollRef" style="width: 100%" @scroll="scroll">
       <div ref="tabsRef" class="tabs">
         <el-button
           v-for="item in viewTabsStore.tabList"
@@ -61,22 +118,29 @@ const showButtons = ref(false)
           @click="$router.push(item.fullPath)"
         >
           {{ item.meta.title }}
-          <el-icon v-show="allowClose(item)" :size="18" @click="viewTabsStore.closeTab(item, $router)">
+          <el-icon v-show="allowClose(item)" :size="18" @click="closeTab(item)">
             <Close />
           </el-icon>
         </el-button>
       </div>
     </el-scrollbar>
-    <el-icon v-show="showButtons" :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
+    <el-icon
+      v-show="showButtons"
+      :size="22"
+      class="icon-button"
+      style="border-left: 1px solid #eee"
+      color="#AAA"
+      @click="operateScroll(true)"
+    >
       <arrow-right />
     </el-icon>
-    <el-dropdown size="small" style="border-left: 1px solid #eeeeee">
+    <el-dropdown size="small">
       <el-icon :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
         <Menu />
       </el-icon>
       <template #dropdown>
         <el-dropdown-menu>
-          <el-dropdown-item @click="viewTabsStore.closeAllTabs($router)">关闭所有页签</el-dropdown-item>
+          <el-dropdown-item @click="closeAllTabs()">关闭所有页签</el-dropdown-item>
           <el-dropdown-item command="FullScreen" divided>全屏</el-dropdown-item>
         </el-dropdown-menu>
       </template>
@@ -87,19 +151,16 @@ const showButtons = ref(false)
     <div ref="contentMenuTarget" />
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item :disabled="findTabIndex(menu.route) === 0" @click="viewTabsStore.closeLeftTabs(menu.route)">
+        <el-dropdown-item :disabled="findTabIndex(menu.route) === 0" @click="closeLeftTabs(menu.route)">
           关闭左侧页签
         </el-dropdown-item>
         <el-dropdown-item
           :disabled="findTabIndex(menu.route) === viewTabsStore.tabList.length - 1"
-          @click="viewTabsStore.closeRightTabs(menu.route)"
+          @click="closeRightTabs(menu.route)"
         >
           关闭右侧页签
         </el-dropdown-item>
-        <el-dropdown-item
-          :disabled="viewTabsStore.tabList.length === 1"
-          @click="viewTabsStore.closeOtherTabs(menu.route)"
-        >
+        <el-dropdown-item :disabled="viewTabsStore.tabList.length === 1" @click="closeOtherTabs(menu.route)">
           关闭其他页签
         </el-dropdown-item>
         <el-dropdown-item command="FullScreen" divided>全屏</el-dropdown-item>
@@ -111,7 +172,7 @@ const showButtons = ref(false)
 <style scoped lang="scss">
 .tabs {
   display: flex;
-  margin: 3px;
+  margin: 0 3px;
 
   .el-button {
     height: 30px;
@@ -133,14 +194,9 @@ const showButtons = ref(false)
   }
 }
 
-.add-fun {
-  width: 33px;
-  border-left: 2px solid #eeeeee;
-}
-
 .icon-button {
   width: 33px;
-  height: 36px;
+  height: 35px;
   cursor: pointer;
 }
 
diff --git a/diboot-admin-ui/src/store/viewTabs.ts b/diboot-admin-ui/src/store/viewTabs.ts
index 4b727a5b..d15e40da 100644
--- a/diboot-admin-ui/src/store/viewTabs.ts
+++ b/diboot-admin-ui/src/store/viewTabs.ts
@@ -1,25 +1,21 @@
-import { LocationQuery, RouteLocationNormalized, RouteParams, Router, RouteRecordName } from 'vue-router'
+import { RouteLocationNormalized, Router } from 'vue-router'
 
 export type IViewTabsStore = {
   tabList: RouteLocationNormalized[] // 页签
 }
 
-interface IViewTab {
-  fullPath: string
-
-  path: string
-
-  title: string
-
-  name?: RouteRecordName
-
-  query?: LocationQuery
-
-  params?: RouteParams
-
-  keepAlive?: boolean
+// 是否存在激活的 tab
+const isPresenceActivation = (list: RouteLocationNormalized[], router: Router) => {
+  const currentRouteName = router.currentRoute.value.name
+  return list.some(item => item.name === currentRouteName)
+}
 
-  componentName?: string
+// 跳转到指定 tab，或最后一个 tab 或 Home
+const goTabOrLastOrHome = (list: RouteLocationNormalized[], router: Router, index = -1) => {
+  const length = list.length
+  if (index > -1 && index < length) router.push(list[index].fullPath).finally()
+  else if (length === 0) router.push({ name: 'Home' }).finally()
+  else router.push(list[length - 1].fullPath).finally()
 }
 
 // 查找 Tab 函数
@@ -49,6 +45,7 @@ export default defineStore({
       if (index === -1) this.tabList.push(route)
       else this.tabList.splice(index, 1, route)
       if (!route.meta.title) route.meta.title = 'no-title'
+      return index === -1
     },
     // 更新
     updateTabTitle(route: RouteLocationNormalized, title: string) {
@@ -59,38 +56,34 @@ export default defineStore({
     // 关闭指定前页
     closeTab(route: RouteLocationNormalized, router: Router) {
       const findIndex = this.tabList.findIndex(findTabFu(route))
-      const find = this.tabList.splice(findIndex, 1)[0]
-      if (router.currentRoute.value.name === find.name) {
-        const length = this.tabList.length
-        router.push(this.tabList[length > findIndex ? findIndex : length - 1].fullPath).finally()
-      }
+      this.tabList.splice(findIndex, 1)
+      if (router.currentRoute.value.name === route.name) goTabOrLastOrHome(this.tabList, router, findIndex)
     },
     // 关闭左侧
-    closeLeftTabs(route: RouteLocationNormalized) {
-      this.tabList.splice(0, this.tabList.findIndex(findTabFu(route)))
+    closeLeftTabs(route: RouteLocationNormalized, router: Router) {
+      const discard = this.tabList.splice(0, this.tabList.findIndex(findTabFu(route)))
+      if (isPresenceActivation(discard, router)) goTabOrLastOrHome(this.tabList, router)
     },
     // 关闭右侧
-    closeRightTabs(route: RouteLocationNormalized) {
-      this.tabList.splice(this.tabList.findIndex(findTabFu(route)) + 1)
+    closeRightTabs(route: RouteLocationNormalized, router: Router) {
+      const discard = this.tabList.splice(this.tabList.findIndex(findTabFu(route)) + 1)
+      if (isPresenceActivation(discard, router)) goTabOrLastOrHome(this.tabList, router)
     },
     // 关闭其他
-    closeOtherTabs(route: RouteLocationNormalized) {
-      this.tabList = this.tabList.filter(findTabFu(route))
+    closeOtherTabs(route: RouteLocationNormalized, router: Router) {
+      if (router.currentRoute.value.name === route.name) router.push(route.fullPath).finally()
+      this.tabList = [route]
     },
     // 关闭全部
     closeAllTabs(router: Router) {
-      let presenceActivation = false
+      let isPresenceActivation = false
       const currentRouteName = router.currentRoute.value.name
       //保留固定路由
       this.tabList = this.tabList.filter(item => {
-        if (!presenceActivation) presenceActivation = item.name === currentRouteName
+        if (!isPresenceActivation) isPresenceActivation = item.name === currentRouteName
         return item.meta.affixTab ?? false
       })
-      // 跳转至最后一个 tab 或 Home
-      const length = this.tabList.length
-      if (presenceActivation)
-        if (length >= 0) router.push(this.tabList[length - 1].fullPath).finally()
-        else router.push({ name: 'Home' }).finally()
+      if (isPresenceActivation) goTabOrLastOrHome(this.tabList, router)
     }
   }
 })
-- 
Gitee


From 08c70aa84d128e6ad8f87d6158789c8ada49f162 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 27 Apr 2022 01:30:39 +0800
Subject: [PATCH 057/195] + add fullScreen

+ add store/app

* opt usedVisibleHeight
---
 diboot-admin-ui/src/layout/main/index.vue     |  82 +++++--
 diboot-admin-ui/src/layout/tabs/index.vue     | 230 ++++++++++++------
 diboot-admin-ui/src/store/app.ts              |  12 +
 diboot-admin-ui/src/views/dashboard/index.vue |   7 +-
 4 files changed, 224 insertions(+), 107 deletions(-)
 create mode 100644 diboot-admin-ui/src/store/app.ts

diff --git a/diboot-admin-ui/src/layout/main/index.vue b/diboot-admin-ui/src/layout/main/index.vue
index d3449f7b..40427364 100644
--- a/diboot-admin-ui/src/layout/main/index.vue
+++ b/diboot-admin-ui/src/layout/main/index.vue
@@ -1,63 +1,91 @@
 <script setup lang="ts">
 import useViewTabsStore from '@/store/viewTabs'
 import { RouteLocationNormalized } from 'vue-router'
+import useAppStore from '@/store/app'
 
-const viewTabsStore = useViewTabsStore()
+const appStore = useAppStore()
+// Tabs 高度
+const tabsHeight = computed(() => (appStore.enableTabs ? 36 : 0))
 
-const slotFooter = !!useSlots().footer
+const props = defineProps<{ fullScreen?: boolean | 'Tabs' }>()
+
+// 滚动区域高度 style
+const scrollHeightStyle = computed(() => {
+  return {
+    height: props.fullScreen
+      ? appStore.enableTabs && props.fullScreen === true
+        ? '100vh'
+        : 'calc(100vh - 36px)'
+      : appStore.enableTabs
+      ? 'calc(100vh - 86px)'
+      : 'calc(100vh - 50px)'
+  }
+})
+
+// 布局已用高度
+const layoutUsedHeight = computed(
+  //             是否全屏                                      (全屏包含 Tabs )  (未开启全屏 header + tabs)  padding
+  () => (props.fullScreen ? (props.fullScreen === true ? 0 : tabsHeight.value) : 50 + tabsHeight.value) + 20
+)
+// 计算已占可视高度
+const usedVisibleHeight = (route: RouteLocationNormalized) =>
+  // 布局已用高度    +  bounded-padding
+  layoutUsedHeight.value + (route.meta.hollow ? 0 : 20)
 
-// 计算已占用高度
-const alreadyOccupyHeight = (route: RouteLocationNormalized) =>
-  // header + tabs + padding + bounded-padding + footer
-  50 + 36 + 20 + (route.meta.hollow ? 0 : 20) + (slotFooter && !route.meta.hideFooter ? 50 + 2 : 0)
+// footer 插槽是否存在内容
+const slotFooter = !!useSlots().footer
 
 // 获取自定义内容的 class
 const customContentClass = (route: RouteLocationNormalized) => {
-  if (route.meta.hollow) return slotFooter && !route.meta.hideFooter ? 'hollow' : ''
+  if (route.meta.hollow) return slotFooter && !route.meta.hideFooter ? 'hollow-footer' : ''
   return slotFooter && !route.meta.hideFooter ? 'bounded-footer' : 'bounded'
 }
+
+const viewTabsStore = useViewTabsStore()
 </script>
 
 <template>
-  <router-view v-slot="{ Component, route }">
-    <transition :name="route.meta.transition" mode="out-in">
-      <keep-alive :include="viewTabsStore.cachedViews">
-        <div :key="route.fullPath" class="content">
-          <div :class="customContentClass(route)">
-            <component :is="Component" :already-occupy-height="alreadyOccupyHeight(route)" />
+  <el-scrollbar :style="scrollHeightStyle">
+    <router-view v-slot="{ Component, route }">
+      <transition :name="route.meta.transition" mode="out-in">
+        <keep-alive :include="viewTabsStore.cachedViews">
+          <div :key="route.fullPath" class="content">
+            <div :class="customContentClass(route)">
+              <component :is="Component" :used-visible-height="usedVisibleHeight(route)" />
+            </div>
+            <div v-if="slotFooter && !route.meta.hideFooter" class="footer">
+              <slot name="footer" />
+            </div>
           </div>
-          <div v-if="slotFooter && !route.meta.hideFooter" class="footer">
-            <slot name="footer" />
-          </div>
-        </div>
-      </keep-alive>
-    </transition>
-  </router-view>
+        </keep-alive>
+      </transition>
+    </router-view>
+  </el-scrollbar>
 </template>
 
 <style scoped lang="scss">
 .content {
   padding: 10px;
-  background-color: rgba(125, 125, 125, 0.1);
-  min-height: calc(100vh - 106px);
+  background-color: var(--el-fill-color-light);
+  min-height: calc(100vh - v-bind('layoutUsedHeight + "px"'));
 
-  .hollow {
-    min-height: calc(100vh - 158px);
+  .hollow-footer {
+    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - 52px);
   }
 
   .bounded,
   .bounded-footer {
     padding: 10px 15px;
-    background-color: #fff;
+    background-color: var(--el-bg-color);
   }
 
   .bounded {
     border-radius: 5px;
-    min-height: calc(100vh - 126px);
+    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - 20px);
   }
 
   .bounded-footer {
-    min-height: calc(100vh - 178px);
+    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - 72px);
     border-radius: 5px 5px 0 0;
   }
 
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index fee95952..2f451610 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -1,11 +1,15 @@
 <script setup lang="ts">
 import { RouteLocationNormalized } from 'vue-router'
-import { Close, Menu, ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
+import { Close, Menu, ArrowLeft, ArrowRight, CloseBold } from '@element-plus/icons-vue'
 import { ElScrollbar } from 'element-plus'
 import useViewTabsStore from '@/store/viewTabs'
+import useAppStore from '@/store/app'
+import { WatchStopHandle } from 'vue'
+
+const appStore = useAppStore()
 
 // tabs 滚动控制
-const tabsRef = ref<HTMLDivElement>()
+const tabsRef = ref<HTMLElement>()
 const tabsScrollRef = ref<InstanceType<typeof ElScrollbar>>()
 
 const showButtons = ref(false) // computed(() => (tabsRef.value?.clientWidth ?? 0) < (tabsRef.value?.scrollWidth ?? 0))
@@ -40,14 +44,25 @@ const findTabIndex = (item?: RouteLocationNormalized) => viewTabsStore.tabList.f
 
 const route = useRoute()
 const router = useRouter()
-// 收集 Tabs
-viewTabsStore.addTab(_.cloneDeep(route))
+let collectTabs: WatchStopHandle
 watch(
-  route,
+  () => appStore.enableTabs,
   value => {
-    if (viewTabsStore.addTab(_.cloneDeep(value))) {
-      refreshButton()
-      operateScroll()
+    if (value) {
+      // 收集 Tabs
+      collectTabs = watch(
+        route,
+        value => {
+          if (viewTabsStore.addTab(_.cloneDeep(value))) {
+            refreshButton()
+            operateScroll()
+          }
+        },
+        { immediate: true }
+      )
+    } else {
+      collectTabs()
+      viewTabsStore.tabList = []
     }
   },
   { immediate: true }
@@ -94,57 +109,83 @@ const closeAllTabs = () => {
   viewTabsStore.closeAllTabs(router)
   refreshButton()
 }
+
+// 全屏
+const fullScreen = ref<boolean | 'Tabs'>()
+// 全屏指定Tab
+const fullScreenTabView = (tab?: RouteLocationNormalized) => {
+  if (tab == null) fullScreen.value = false
+  else {
+    if (tab.name !== route.name) router.push(tab.fullPath).finally()
+    fullScreen.value = true
+  }
+  refreshButton()
+}
+// 全屏Tabs
+const fullScreenTabsView = () => {
+  if (fullScreen.value) fullScreen.value = false
+  else fullScreen.value = 'Tabs'
+  refreshButton()
+}
 </script>
 
 <template>
-  <div style="display: flex; align-items: center; border-bottom: 1px solid #eee">
-    <el-icon
-      v-show="showButtons"
-      :size="22"
-      class="icon-button"
-      style="border-right: 1px solid #eee"
-      color="#AAA"
-      @click="operateScroll(false)"
-    >
-      <arrow-left />
-    </el-icon>
-    <el-scrollbar ref="tabsScrollRef" style="width: 100%" @scroll="scroll">
-      <div ref="tabsRef" class="tabs">
-        <el-button
-          v-for="item in viewTabsStore.tabList"
-          :key="item.fullPath"
-          :type="$route.name === item.name ? 'primary' : ''"
-          @contextmenu.prevent="event => rightClick(event, item)"
-          @click="$router.push(item.fullPath)"
-        >
-          {{ item.meta.title }}
-          <el-icon v-show="allowClose(item)" :size="18" @click="closeTab(item)">
-            <Close />
-          </el-icon>
-        </el-button>
-      </div>
-    </el-scrollbar>
-    <el-icon
-      v-show="showButtons"
-      :size="22"
-      class="icon-button"
-      style="border-left: 1px solid #eee"
-      color="#AAA"
-      @click="operateScroll(true)"
-    >
-      <arrow-right />
-    </el-icon>
-    <el-dropdown size="small">
-      <el-icon :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
-        <Menu />
+  <div :class="fullScreen === 'Tabs' ? 'fullScreen' : ''">
+    <div v-if="appStore.enableTabs" class="tabs-hull">
+      <el-icon
+        v-show="showButtons"
+        :size="22"
+        class="icon-button"
+        style="border-right: 1px solid #eee"
+        color="#AAA"
+        @click="operateScroll(false)"
+      >
+        <arrow-left />
+      </el-icon>
+      <el-scrollbar ref="tabsScrollRef" style="width: 100%" @scroll="scroll">
+        <div ref="tabsRef" class="tabs">
+          <el-button
+            v-for="item in viewTabsStore.tabList"
+            :key="item.fullPath"
+            :type="$route.name === item.name ? 'primary' : ''"
+            @contextmenu.prevent="event => rightClick(event, item)"
+            @click="$router.push(item.fullPath)"
+          >
+            {{ item.meta.title }}
+            <el-icon v-show="allowClose(item)" :size="18" @click="closeTab(item)">
+              <Close />
+            </el-icon>
+          </el-button>
+        </div>
+      </el-scrollbar>
+      <el-icon
+        v-show="showButtons"
+        :size="22"
+        class="icon-button"
+        style="border-left: 1px solid #eee"
+        color="#AAA"
+        @click="operateScroll(true)"
+      >
+        <arrow-right />
       </el-icon>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item @click="closeAllTabs()">关闭所有页签</el-dropdown-item>
-          <el-dropdown-item command="FullScreen" divided>全屏</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
+      <el-dropdown size="small">
+        <el-icon :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
+          <Menu />
+        </el-icon>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item @click="closeAllTabs()">关闭所有页签</el-dropdown-item>
+            <el-dropdown-item @click="fullScreenTabsView()">{{ fullScreen ? '关闭' : '开启' }}全屏</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+    </div>
+    <div :class="fullScreen === true ? 'fullScreen' : ''">
+      <div v-show="fullScreen === true" class="fullScreen-close" title="关闭全屏" @click="fullScreenTabView()">
+        <el-icon :size="20"><close-bold /></el-icon>
+      </div>
+      <slot :full-screen="fullScreen" />
+    </div>
   </div>
   <!-- tab 菜单 -->
   <el-dropdown ref="contentMenu" trigger="click" size="small" :style="menu.locator" style="position: fixed">
@@ -163,44 +204,81 @@ const closeAllTabs = () => {
         <el-dropdown-item :disabled="viewTabsStore.tabList.length === 1" @click="closeOtherTabs(menu.route)">
           关闭其他页签
         </el-dropdown-item>
-        <el-dropdown-item command="FullScreen" divided>全屏</el-dropdown-item>
+        <el-dropdown-item divided @click="fullScreenTabView(menu.route)">当前页全屏</el-dropdown-item>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
 </template>
 
 <style scoped lang="scss">
-.tabs {
+.tabs-hull {
   display: flex;
-  margin: 0 3px;
+  align-items: center;
+  border-bottom: 1px solid #eee;
+  background-color: var(--el-bg-color);
 
-  .el-button {
-    height: 30px;
+  .tabs {
+    display: flex;
+    margin: 0 3px;
 
-    .el-icon {
-      border-radius: 100%;
-      position: relative;
-      right: -6px;
+    .el-button {
+      height: 30px;
 
-      &:hover {
-        color: var(--el-color-white);
-        background-color: var(--el-color-primary-light-5);
+      .el-icon {
+        border-radius: 100%;
+        position: relative;
+        right: -6px;
+
+        &:hover {
+          color: var(--el-color-white);
+          background-color: var(--el-color-primary-light-5);
+        }
       }
     }
+
+    .el-button + .el-button {
+      margin-left: 5px;
+    }
   }
 
-  .el-button + .el-button {
-    margin-left: 5px;
+  .icon-button {
+    width: 33px;
+    height: 35px;
+    cursor: pointer;
   }
-}
 
-.icon-button {
-  width: 33px;
-  height: 35px;
-  cursor: pointer;
+  .icon-button:hover {
+    color: var(--el-color-primary);
+  }
 }
+.fullScreen {
+  position: absolute;
+  width: 100%;
+  left: 0;
+  top: 0;
+
+  .fullScreen-close {
+    width: 39px;
+    height: 39px;
+    border-bottom-left-radius: 100%;
+    position: absolute;
+    z-index: 1;
+    top: 0;
+    right: 0;
+    cursor: pointer;
+    background: rgba(0, 0, 0, 0.1);
+    transition: all 0.3s ease;
 
-.icon-button:hover {
-  color: var(--el-color-primary);
+    &:hover {
+      background: rgba(0, 0, 0, 0.3);
+    }
+
+    .el-icon {
+      top: 6px;
+      left: 12px;
+      position: relative;
+      color: var(--el-fill-color-extra-light);
+    }
+  }
 }
 </style>
diff --git a/diboot-admin-ui/src/store/app.ts b/diboot-admin-ui/src/store/app.ts
new file mode 100644
index 00000000..a7f04497
--- /dev/null
+++ b/diboot-admin-ui/src/store/app.ts
@@ -0,0 +1,12 @@
+export interface IAppStore {
+  enableTabs: boolean
+}
+
+export default defineStore('app', {
+  state: () => {
+    const tabsState = localStorage.getItem('enableTabs')
+    return <IAppStore>{
+      enableTabs: tabsState ? tabsState === 'true' : true
+    }
+  }
+})
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
index 74189cd3..79bb34ef 100644
--- a/diboot-admin-ui/src/views/dashboard/index.vue
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -1,12 +1,11 @@
 <script setup lang="ts" name="Dashboard">
-console.log('Dashboard')
-// 可接收已占用的高度，方便主区域计算使用
-defineProps<{ alreadyOccupyHeight?: number }>()
+// 可接收 已使用的可视高度，方便主区域计算使用
+defineProps<{ usedVisibleHeight?: number }>()
 </script>
 
 <template>
   Dashboard<br /><br />
-  已占有的高度：{{ alreadyOccupyHeight }}px
+  已使用的可视高度：{{ usedVisibleHeight }}px
 </template>
 
 <style scoped></style>
-- 
Gitee


From 9d12bcd815c72e289714949b404ae4d6c58b4b9d Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 27 Apr 2022 10:12:49 +0800
Subject: [PATCH 058/195] * opt fullScreen

---
 diboot-admin-ui/src/layout/index.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index ee7997c4..f28d104d 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -19,14 +19,15 @@ import AppTabs from './tabs/index.vue'
       </el-aside>
       <el-container>
         <el-main style="padding: 0">
-          <app-tabs />
-          <el-scrollbar style="height: calc(100vh - 86px)">
-            <app-main>
-              <template #footer>
-                <app-footer />
-              </template>
-            </app-main>
-          </el-scrollbar>
+          <app-tabs>
+            <template #default="{ fullScreen }">
+              <app-main :full-screen="fullScreen">
+                <template #footer>
+                  <app-footer />
+                </template>
+              </app-main>
+            </template>
+          </app-tabs>
         </el-main>
       </el-container>
     </el-container>
-- 
Gitee


From 33c7e7195e68f6e6400fc2da5db41b22c6760f10 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 27 Apr 2022 11:25:16 +0800
Subject: [PATCH 059/195] * opt hide tabs-scrollbar

---
 diboot-admin-ui/src/layout/tabs/index.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index 2f451610..6406ffe5 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -27,7 +27,7 @@ const scroll = ({ scrollLeft }: any) => {
 // 手动滚动 Tabs 列表
 const operateScroll = (left = true) => {
   const step = 50 // 步长，调解速度
-  let deviation = (tabsRef.value?.clientWidth ?? 500) * 0.7
+  let deviation = (tabsRef.value?.clientWidth ?? 500) * 0.8
   let timer = setInterval(() => {
     tabsScrollRef.value?.setScrollLeft(tabsPosition.value + (left ? step : -step))
     if ((deviation -= step) <= 0) {
@@ -142,7 +142,7 @@ const fullScreenTabsView = () => {
       >
         <arrow-left />
       </el-icon>
-      <el-scrollbar ref="tabsScrollRef" style="width: 100%" @scroll="scroll">
+      <el-scrollbar ref="tabsScrollRef" class="tabs-scrollbar" @scroll="scroll">
         <div ref="tabsRef" class="tabs">
           <el-button
             v-for="item in viewTabsStore.tabList"
@@ -217,6 +217,14 @@ const fullScreenTabsView = () => {
   border-bottom: 1px solid #eee;
   background-color: var(--el-bg-color);
 
+  .tabs-scrollbar {
+    width: 100%;
+
+    &:deep(.el-scrollbar__thumb) {
+      display: none;
+    }
+  }
+
   .tabs {
     display: flex;
     margin: 0 3px;
@@ -251,6 +259,7 @@ const fullScreenTabsView = () => {
     color: var(--el-color-primary);
   }
 }
+
 .fullScreen {
   position: absolute;
   width: 100%;
-- 
Gitee


From 834f07915492d32e62d72a54305ec12ad40c6baa Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 27 Apr 2022 11:30:26 +0800
Subject: [PATCH 060/195] * opt layout/main

---
 diboot-admin-ui/src/layout/header/index.vue |  2 +-
 diboot-admin-ui/src/layout/main/index.vue   | 40 ++++++++-------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 7efe6cbe..27230624 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -19,7 +19,7 @@ const goPersonal = () => {
   <div style="height: 100%; display: flex; align-items: center">
     <img :src="Logo" alt="Logo" style="height: 39px" />
     <div style="position: absolute; right: 1.5rem">
-      <el-dropdown @command="command">
+      <el-dropdown>
         <span style="display: flex; align-items: center">
           <el-avatar :size="33" :icon="UserFilled" :src="authStore.avatar" />
           <span style="margin: 0 8px">{{ authStore.realname }}</span>
diff --git a/diboot-admin-ui/src/layout/main/index.vue b/diboot-admin-ui/src/layout/main/index.vue
index 40427364..18d7b218 100644
--- a/diboot-admin-ui/src/layout/main/index.vue
+++ b/diboot-admin-ui/src/layout/main/index.vue
@@ -35,11 +35,9 @@ const usedVisibleHeight = (route: RouteLocationNormalized) =>
 // footer 插槽是否存在内容
 const slotFooter = !!useSlots().footer
 
-// 获取自定义内容的 class
-const customContentClass = (route: RouteLocationNormalized) => {
-  if (route.meta.hollow) return slotFooter && !route.meta.hideFooter ? 'hollow-footer' : ''
-  return slotFooter && !route.meta.hideFooter ? 'bounded-footer' : 'bounded'
-}
+// footer
+const footerRef = ref<HTMLElement>()
+const footerHeight = computed(() => footerRef.value?.offsetHeight ?? 0)
 
 const viewTabsStore = useViewTabsStore()
 </script>
@@ -50,10 +48,10 @@ const viewTabsStore = useViewTabsStore()
       <transition :name="route.meta.transition" mode="out-in">
         <keep-alive :include="viewTabsStore.cachedViews">
           <div :key="route.fullPath" class="content">
-            <div :class="customContentClass(route)">
+            <div :class="route.meta.hollow ? 'hollow' : 'bounded'">
               <component :is="Component" :used-visible-height="usedVisibleHeight(route)" />
             </div>
-            <div v-if="slotFooter && !route.meta.hideFooter" class="footer">
+            <div v-if="slotFooter && !route.meta.hideFooter" ref="footerRef" class="footer">
               <slot name="footer" />
             </div>
           </div>
@@ -67,37 +65,27 @@ const viewTabsStore = useViewTabsStore()
 .content {
   padding: 10px;
   background-color: var(--el-fill-color-light);
-  min-height: calc(100vh - v-bind('layoutUsedHeight + "px"'));
 
-  .hollow-footer {
-    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - 52px);
+  .hollow {
+    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - v-bind('footerHeight + "px"'));
   }
 
-  .bounded,
-  .bounded-footer {
+  .bounded {
     padding: 10px 15px;
     background-color: var(--el-bg-color);
-  }
-
-  .bounded {
-    border-radius: 5px;
-    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - 20px);
-  }
-
-  .bounded-footer {
-    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - 72px);
-    border-radius: 5px 5px 0 0;
+    border-radius: v-bind('footerHeight ? "5px 5px 0 0" : "5px"');
+    min-height: calc(100vh - v-bind('layoutUsedHeight + "px"') - 20px - v-bind('footerHeight + "px"'));
   }
 
   .footer {
-    height: 50px;
-    color: darkgray;
+    min-height: 50px;
+    color: var(--el-color-info);
     display: flex;
     align-items: center;
     justify-content: space-around;
-    border-top: 2px dashed #eeeeee;
+    border-top: 2px dashed var(--el-border-color-lighter);
     border-radius: 0 0 5px 5px;
-    background-color: #fff;
+    background-color: var(--el-bg-color);
   }
 }
 </style>
-- 
Gitee


From 8c15431728242656b230b2fb24a898681506b7b9 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 27 Apr 2022 15:01:33 +0800
Subject: [PATCH 061/195] * opt: off eslint 'vue/multi-word-component-names'

---
 diboot-admin-ui/.eslintrc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index feed4427..5df3e35f 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -21,6 +21,7 @@ module.exports = {
   rules: {
     '@typescript-eslint/no-explicit-any': 0,
     'comma-dangle': ['warn', 'only-multiline'],
+    'vue/multi-word-component-names': 'off',
     'vue/html-self-closing': ['warn', { html: { void: 'always' } }],
     'no-undef': 'off',
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-- 
Gitee


From de97cdb9bcc70959f744f4827e8fdbb76a185d2a Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 27 Apr 2022 15:51:00 +0800
Subject: [PATCH 062/195] + add view-tabs draggable

---
 diboot-admin-ui/package.json              |  3 ++-
 diboot-admin-ui/pnpm-lock.yaml            | 20 +++++++++++++++
 diboot-admin-ui/src/layout/tabs/index.vue | 30 +++++++++++++----------
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 0632d236..ae387e92 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -18,7 +18,8 @@
     "pinia": "^2.0.13",
     "qs": "^6.10.3",
     "vue": "^3.2.25",
-    "vue-router": "^4.0.14"
+    "vue-router": "^4.0.14",
+    "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.182",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index da717658..57be8638 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -36,6 +36,7 @@ specifiers:
   vue: ^3.2.25
   vue-router: ^4.0.14
   vue-tsc: ^0.29.8
+  vuedraggable: ^4.1.0
 
 dependencies:
   '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
@@ -48,6 +49,7 @@ dependencies:
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
   vue-router: registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33
+  vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.33
 
 devDependencies:
   '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
@@ -4107,6 +4109,12 @@ packages:
       smart-buffer: registry.npmmirror.com/smart-buffer/4.2.0
     dev: true
 
+  registry.npmmirror.com/sortablejs/1.14.0:
+    resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz}
+    name: sortablejs
+    version: 1.14.0
+    dev: false
+
   registry.npmmirror.com/source-map-js/1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz}
     name: source-map-js
@@ -4929,6 +4937,18 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
     dev: false
 
+  registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.33:
+    resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz}
+    id: registry.npmmirror.com/vuedraggable/4.1.0
+    name: vuedraggable
+    version: 4.1.0
+    peerDependencies:
+      vue: ^3.0.1
+    dependencies:
+      sortablejs: registry.npmmirror.com/sortablejs/1.14.0
+      vue: registry.npmmirror.com/vue/3.2.33
+    dev: false
+
   registry.npmmirror.com/webpack-sources/3.2.3:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz}
     name: webpack-sources
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index 6406ffe5..4ef9118c 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -2,6 +2,7 @@
 import { RouteLocationNormalized } from 'vue-router'
 import { Close, Menu, ArrowLeft, ArrowRight, CloseBold } from '@element-plus/icons-vue'
 import { ElScrollbar } from 'element-plus'
+import Draggable from 'vuedraggable'
 import useViewTabsStore from '@/store/viewTabs'
 import useAppStore from '@/store/app'
 import { WatchStopHandle } from 'vue'
@@ -86,6 +87,7 @@ const rightClick = (event: MouseEvent, route: RouteLocationNormalized) => {
   }, 0)
 }
 
+// tab 操作
 const closeTab = (tab: RouteLocationNormalized) => {
   viewTabsStore.closeTab(tab, router)
   refreshButton()
@@ -143,19 +145,21 @@ const fullScreenTabsView = () => {
         <arrow-left />
       </el-icon>
       <el-scrollbar ref="tabsScrollRef" class="tabs-scrollbar" @scroll="scroll">
-        <div ref="tabsRef" class="tabs">
-          <el-button
-            v-for="item in viewTabsStore.tabList"
-            :key="item.fullPath"
-            :type="$route.name === item.name ? 'primary' : ''"
-            @contextmenu.prevent="event => rightClick(event, item)"
-            @click="$router.push(item.fullPath)"
-          >
-            {{ item.meta.title }}
-            <el-icon v-show="allowClose(item)" :size="18" @click="closeTab(item)">
-              <Close />
-            </el-icon>
-          </el-button>
+        <div ref="tabsRef">
+          <draggable :list="viewTabsStore.tabList" animation="300" item-key="fullPath" class="tabs">
+            <template #item="{ element }">
+              <el-button
+                :type="$route.name === element.name ? 'primary' : ''"
+                @contextmenu.prevent="event => rightClick(event, element)"
+                @click="$router.push(element.fullPath)"
+              >
+                {{ element.meta.title }}
+                <el-icon v-show="allowClose(element)" :size="18" @click="closeTab(element)">
+                  <Close />
+                </el-icon>
+              </el-button>
+            </template>
+          </draggable>
         </div>
       </el-scrollbar>
       <el-icon
-- 
Gitee


From 157a3d243d74ca6f6d0e03653593c9997fa50bf5 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 27 Apr 2022 19:00:46 +0800
Subject: [PATCH 063/195] =?UTF-8?q?*=20token=E6=A3=80=E6=9F=A5=E4=B8=8E?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/cache/DynamicRedisCacheManager.java  |  53 ++++++
 .../diboot/core/cache/BaseCacheManager.java   |  35 ++--
 .../core/cache/BaseMemoryCacheManager.java    |  67 +++++++
 .../core/cache/DynamicMemoryCacheManager.java |  32 ++--
 .../core/cache/StaticMemoryCacheManager.java  |   2 +-
 diboot-iam-starter/pom.xml                    |   7 +-
 .../process/ApiPermissionExtractor.java       |   5 +-
 .../process/BindPermissionAspect.java         |   1 +
 .../java/com/diboot/iam/auth/AuthService.java |  10 +-
 .../com/diboot/iam/auth/IamCustomize.java     |   2 -
 .../iam/auth/impl/BaseAuthServiceImpl.java    | 145 ++++++++++++++++
 .../iam/auth/impl/OAuth2SSOServiceImpl.java   |  98 ++---------
 .../iam/auth/impl/PwdAuthServiceImpl.java     | 121 +++----------
 .../com/diboot/iam/cache/IamCacheManager.java |   3 +-
 .../main/java/com/diboot/iam/config/Cons.java |  13 +-
 .../com/diboot/iam/jwt/BaseJwtAuthToken.java  | 117 +------------
 .../diboot/iam/jwt/DefaultJwtAuthFilter.java  | 117 -------------
 .../iam/jwt/StatelessJwtAuthFilter.java       | 143 ---------------
 .../service/IamResourcePermissionService.java |   1 -
 .../IamResourcePermissionServiceImpl.java     |   9 +-
 .../iam/service/impl/IamUserServiceImpl.java  |   1 -
 .../com/diboot/iam/shiro/IamAuthToken.java    | 163 ++++++++++++++++++
 .../IamAuthorizingRealm.java}                 |  42 +++--
 .../shiro/StatelessAccessControlFilter.java   |  85 +++++----
 .../com/diboot/iam/starter/IamAutoConfig.java |  15 +-
 .../com/diboot/iam/starter/IamProperties.java |  11 +-
 .../iam/starter/IamRedisAutoConfig.java       |  35 ++++
 .../com/diboot/iam/util/IamSecurityUtils.java |  44 ++++-
 .../com/diboot/iam/util/TokenCacheHelper.java | 151 ++++++++++++++++
 .../util/{JwtUtils.java => TokenUtils.java}   | 148 ++++------------
 .../mobile/auth/impl/WxAuthServiceImpl.java   |  24 +--
 31 files changed, 877 insertions(+), 823 deletions(-)
 create mode 100644 diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
 delete mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java
 delete mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java
 rename diboot-iam-starter/src/main/java/com/diboot/iam/{jwt/BaseJwtRealm.java => shiro/IamAuthorizingRealm.java} (82%)
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
 rename diboot-iam-starter/src/main/java/com/diboot/iam/util/{JwtUtils.java => TokenUtils.java} (31%)

diff --git a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
new file mode 100644
index 00000000..f5da066b
--- /dev/null
+++ b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
@@ -0,0 +1,53 @@
+package com.diboot.core.cache;
+
+import org.springframework.cache.Cache;
+import org.springframework.data.redis.cache.RedisCacheManager;
+
+/**
+ * 动态数据Redis缓存
+ * @author JerryMa
+ * @version v2.2.1
+ * @date 2021/4/17
+ * Copyright © diboot.com
+ */
+public class DynamicRedisCacheManager implements BaseCacheManager{
+
+    private RedisCacheManager redisCacheManager;
+
+    public DynamicRedisCacheManager(RedisCacheManager redisCacheManager) {
+        this.redisCacheManager = redisCacheManager;
+    }
+
+    @Override
+    public <T> T getCacheObj(String cacheName, Object objKey, Class<T> tClass) {
+        Cache cache = redisCacheManager.getCache(cacheName);
+        return cache != null? cache.get(objKey, tClass) : null;
+    }
+
+    @Override
+    public String getCacheString(String cacheName, Object objKey) {
+        return getCacheObj(cacheName, objKey, String.class);
+    }
+
+    @Override
+    public void putCacheObj(String cacheName, Object objKey, Object obj) {
+        Cache cache = redisCacheManager.getCache(cacheName);
+        cache.put(objKey, obj);
+    }
+
+    public void putCacheObj(String cacheName, Object objKey, Object obj, int expireMinutes) {
+        //TODO 支持按cache的不同过期时间
+        this.putCacheObj(cacheName, objKey, obj);
+    }
+
+    @Override
+    public void removeCacheObj(String cacheName, Object objKey) {
+        Cache cache = redisCacheManager.getCache(cacheName);
+        cache.evict(objKey);
+    }
+
+    @Override
+    public boolean isUninitializedCache(String cacheName) {
+        return false;
+    }
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
index 2febeabb..0edb0da5 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
@@ -1,5 +1,6 @@
 package com.diboot.core.cache;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.support.SimpleCacheManager;
@@ -11,7 +12,7 @@ import org.springframework.cache.support.SimpleCacheManager;
  * @date 2021/4/17
  * Copyright © diboot.com
  */
-public abstract class BaseCacheManager extends SimpleCacheManager {
+public interface BaseCacheManager {
 
     /**
      * 获取缓存对象
@@ -19,19 +20,14 @@ public abstract class BaseCacheManager extends SimpleCacheManager {
      * @param <T>
      * @return
      */
-    public <T> T getCacheObj(String cacheName, Object objKey, Class<T> tClass){
-        Cache cache = getCache(cacheName);
-        return cache != null? cache.get(objKey, tClass) : null;
-    }
+    <T> T getCacheObj(String cacheName, Object objKey, Class<T> tClass);
 
     /**
      * 获取缓存对象
      * @param objKey
      * @return
      */
-    public String getCacheString(String cacheName, Object objKey){
-        return getCacheObj(cacheName, objKey, String.class);
-    }
+    String getCacheString(String cacheName, Object objKey);
 
     /**
      * 缓存对象
@@ -39,9 +35,16 @@ public abstract class BaseCacheManager extends SimpleCacheManager {
      * @param objKey
      * @param obj
      */
-    public void putCacheObj(String cacheName, Object objKey, Object obj){
-        Cache cache = getCache(cacheName);
-        cache.put(objKey, obj);
+    void putCacheObj(String cacheName, Object objKey, Object obj);
+
+    /**
+     * 缓存对象 - 支持过期时间
+     * @param cacheName
+     * @param objKey
+     * @param obj
+     */
+    default void putCacheObj(String cacheName, Object objKey, Object obj, int expiredMinutes){
+        putCacheObj(cacheName, objKey, obj);
     }
 
     /**
@@ -49,19 +52,13 @@ public abstract class BaseCacheManager extends SimpleCacheManager {
      * @param cacheName
      * @param objKey
      */
-    public void removeCacheObj(String cacheName, Object objKey){
-        Cache cache = getCache(cacheName);
-        cache.evict(objKey);
-    }
+    void removeCacheObj(String cacheName, Object objKey);
 
     /**
      * 尚未初始化的
      * @param cacheName
      * @return
      */
-    public boolean isUninitializedCache(String cacheName){
-        ConcurrentMapCache cache = (ConcurrentMapCache)getCache(cacheName);
-        return cache.getNativeCache().isEmpty();
-    }
+    boolean isUninitializedCache(String cacheName);
 
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
new file mode 100644
index 00000000..75236599
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
@@ -0,0 +1,67 @@
+package com.diboot.core.cache;
+
+import org.springframework.cache.Cache;
+import org.springframework.cache.concurrent.ConcurrentMapCache;
+import org.springframework.cache.support.SimpleCacheManager;
+
+/**
+ * 缓存manager父类
+ * @author JerryMa
+ * @version v2.2.1
+ * @date 2021/4/17
+ * Copyright © diboot.com
+ */
+public abstract class BaseMemoryCacheManager extends SimpleCacheManager implements BaseCacheManager{
+
+    /**
+     * 获取缓存对象
+     * @param objKey
+     * @param <T>
+     * @return
+     */
+    public <T> T getCacheObj(String cacheName, Object objKey, Class<T> tClass){
+        Cache cache = getCache(cacheName);
+        return cache != null? cache.get(objKey, tClass) : null;
+    }
+
+    /**
+     * 获取缓存对象
+     * @param objKey
+     * @return
+     */
+    public String getCacheString(String cacheName, Object objKey){
+        return getCacheObj(cacheName, objKey, String.class);
+    }
+
+    /**
+     * 缓存对象
+     * @param cacheName
+     * @param objKey
+     * @param obj
+     */
+    public void putCacheObj(String cacheName, Object objKey, Object obj){
+        Cache cache = getCache(cacheName);
+        cache.put(objKey, obj);
+    }
+
+    /**
+     * 删除缓存对象
+     * @param cacheName
+     * @param objKey
+     */
+    public void removeCacheObj(String cacheName, Object objKey){
+        Cache cache = getCache(cacheName);
+        cache.evict(objKey);
+    }
+
+    /**
+     * 尚未初始化的
+     * @param cacheName
+     * @return
+     */
+    public boolean isUninitializedCache(String cacheName){
+        ConcurrentMapCache cache = (ConcurrentMapCache)getCache(cacheName);
+        return cache.getNativeCache().isEmpty();
+    }
+
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
index df851448..e996589a 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
@@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentMap;
  * @date 2021/4/17
  * Copyright © diboot.com
  */
-public class DynamicMemoryCacheManager extends BaseCacheManager{
+public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements BaseCacheManager{
 
     public DynamicMemoryCacheManager(String... cacheNames){
         List<Cache> caches = new ArrayList<>(cacheNames.length);
@@ -27,9 +27,10 @@ public class DynamicMemoryCacheManager extends BaseCacheManager{
     }
 
     /**
-     * 默认的过期时间（分钟）
+     * cache的时间戳缓存
      */
-    private long expiredMinutes = 60;
+    private ConcurrentHashMap<String, Integer> CACHE_EXPIREDMINUTES_CACHE = null;
+
     /**
      * cache的时间戳缓存
      */
@@ -37,20 +38,17 @@ public class DynamicMemoryCacheManager extends BaseCacheManager{
 
     public DynamicMemoryCacheManager(){
         this.CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
-        super.afterPropertiesSet();
-    }
-    public DynamicMemoryCacheManager(int expiredMinutes){
-        this.expiredMinutes = expiredMinutes;
-        this.CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
+        this.CACHE_EXPIREDMINUTES_CACHE = new ConcurrentHashMap<>();
         super.afterPropertiesSet();
     }
 
     public DynamicMemoryCacheManager(int expiredMinutes, String... cacheNames){
-        this.expiredMinutes = expiredMinutes;
         this.CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
+        this.CACHE_EXPIREDMINUTES_CACHE = new ConcurrentHashMap<>();
         List<Cache> caches = new ArrayList<>(cacheNames.length);
         for(String cacheName : cacheNames){
             caches.add(new ConcurrentMapCache(cacheName));
+            this.CACHE_EXPIREDMINUTES_CACHE.put(cacheName, expiredMinutes);
         }
         setCaches(caches);
         super.afterPropertiesSet();
@@ -69,7 +67,7 @@ public class DynamicMemoryCacheManager extends BaseCacheManager{
         }
         // 已过期，则清空缓存返回null
         if(isExpired(cacheName, objKey)){
-            cache.clear();
+            cache.evict(objKey);
             return null;
         }
         return cache.get(objKey, tClass);
@@ -86,6 +84,19 @@ public class DynamicMemoryCacheManager extends BaseCacheManager{
         refreshCacheTimestamp(cacheName, objKey);
     }
 
+    /**
+     * 缓存对象
+     * @param cacheName
+     * @param objKey
+     * @param obj
+     */
+    public void putCacheObj(String cacheName, Object objKey, Object obj, int expireMinutes) {
+        this.putCacheObj(cacheName, objKey, obj);
+        if(!this.CACHE_EXPIREDMINUTES_CACHE.containsKey(cacheName)){
+            this.CACHE_EXPIREDMINUTES_CACHE.put(cacheName, expireMinutes);
+        }
+    }
+
     /**
      * 数据是否过期
      * @param cacheName 缓存名字
@@ -103,6 +114,7 @@ public class DynamicMemoryCacheManager extends BaseCacheManager{
             return false;
         }
         long currentTimestamp = System.currentTimeMillis();
+        int expiredMinutes = CACHE_EXPIREDMINUTES_CACHE.get(cacheName);
         return (currentTimestamp - cacheTimestamp) > (expiredMinutes*60000);
     }
 
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
index b8259f13..263bd045 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021/4/17
  * Copyright © diboot.com
  */
-public class StaticMemoryCacheManager extends BaseCacheManager{
+public class StaticMemoryCacheManager extends BaseMemoryCacheManager implements BaseCacheManager{
 
     public StaticMemoryCacheManager(String... cacheNames){
         List<Cache> caches = new ArrayList<>();
diff --git a/diboot-iam-starter/pom.xml b/diboot-iam-starter/pom.xml
index 51bf7716..c77ffd83 100644
--- a/diboot-iam-starter/pom.xml
+++ b/diboot-iam-starter/pom.xml
@@ -22,17 +22,12 @@
             <artifactId>diboot-core-spring-boot-starter</artifactId>
             <version>${diboot.version}</version>
         </dependency>
-        <!-- 依赖shiro、JWT -->
+        <!-- 依赖shiro -->
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-web-starter</artifactId>
             <version>1.9.0</version>
         </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>0.9.1</version>
-        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
index 7bdfddb0..82e058c2 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/ApiPermissionExtractor.java
@@ -15,7 +15,10 @@
  */
 package com.diboot.iam.annotation.process;
 
-import com.diboot.core.util.*;
+import com.diboot.core.util.AnnotationUtils;
+import com.diboot.core.util.BeanUtils;
+import com.diboot.core.util.ContextHelper;
+import com.diboot.core.util.V;
 import com.diboot.core.vo.ApiUri;
 import com.diboot.iam.annotation.BindPermission;
 import com.diboot.iam.cache.IamCacheManager;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
index 5dfc7cf8..346381b8 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
@@ -33,6 +33,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.lang.reflect.Method;
 
 /**
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/AuthService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/AuthService.java
index b27892ca..31065437 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/AuthService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/AuthService.java
@@ -17,8 +17,8 @@ package com.diboot.iam.auth;
 
 import com.diboot.iam.dto.AuthCredential;
 import com.diboot.iam.entity.IamAccount;
-import com.diboot.iam.jwt.BaseJwtAuthToken;
-import com.diboot.iam.util.JwtUtils;
+import com.diboot.iam.shiro.IamAuthToken;
+import com.diboot.iam.util.TokenUtils;
 import org.apache.shiro.authc.AuthenticationException;
 
 /**
@@ -40,16 +40,16 @@ public interface AuthService {
      * @return
      */
     default int getExpiresInMinutes(){
-        return JwtUtils.EXPIRES_IN_MINUTES;
+        return TokenUtils.EXPIRES_IN_MINUTES;
     }
 
     /**
      * 获取用户
-     * @param jwtToken
+     * @param iamAuthToken
      * @return
      * @throws AuthenticationException
      */
-    IamAccount getAccount(BaseJwtAuthToken jwtToken) throws AuthenticationException;
+    IamAccount getAccount(IamAuthToken iamAuthToken) throws AuthenticationException;
 
     /**
      * 申请Token
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java
index c8763f78..6d9618c7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamCustomize.java
@@ -19,8 +19,6 @@ import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
 import com.diboot.iam.exception.PermissionException;
 
-import java.lang.reflect.Method;
-
 /**
  * IAM自定义接口
  * @author mazc@dibo.ltd
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
new file mode 100644
index 00000000..522e6f4a
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.auth.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.diboot.core.exception.BusinessException;
+import com.diboot.core.vo.Status;
+import com.diboot.iam.annotation.process.IamAsyncWorker;
+import com.diboot.iam.auth.AuthService;
+import com.diboot.iam.config.Cons;
+import com.diboot.iam.dto.AuthCredential;
+import com.diboot.iam.entity.BaseLoginUser;
+import com.diboot.iam.entity.IamAccount;
+import com.diboot.iam.entity.IamLoginTrace;
+import com.diboot.iam.service.IamAccountService;
+import com.diboot.iam.shiro.IamAuthToken;
+import com.diboot.iam.util.HttpHelper;
+import com.diboot.iam.util.IamSecurityUtils;
+import com.diboot.iam.util.TokenCacheHelper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 用户名密码认证的service实现
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2019/12/25
+ */
+@Slf4j
+public abstract class BaseAuthServiceImpl implements AuthService {
+    @Autowired
+    private IamAccountService accountService;
+    @Autowired
+    private IamAsyncWorker iamAsyncWorker;
+    @Autowired
+    private HttpServletRequest request;
+
+    @Override
+    public String getAuthType() {
+        return Cons.DICTCODE_AUTH_TYPE.PWD.name();
+    }
+
+    /**
+     * 构建查询条件
+     * @return
+     */
+    protected abstract Wrapper buildQueryWrapper(IamAuthToken iamAuthToken);
+
+    @Override
+    public IamAccount getAccount(IamAuthToken iamAuthToken) throws AuthenticationException {
+        IamAccount latestAccount = accountService.getSingleEntity(buildQueryWrapper(iamAuthToken));
+        if(latestAccount == null){
+            return null;
+        }
+        if (Cons.DICTCODE_ACCOUNT_STATUS.I.name().equals(latestAccount.getStatus())) {
+            throw new AuthenticationException("用户账号已禁用! account="+iamAuthToken.getAuthAccount());
+        }
+        if (Cons.DICTCODE_ACCOUNT_STATUS.L.name().equals(latestAccount.getStatus())) {
+            throw new AuthenticationException("用户账号已锁定! account="+iamAuthToken.getAuthAccount());
+        }
+        return latestAccount;
+    }
+
+    @Override
+    public String applyToken(AuthCredential credential) {
+        IamAuthToken authToken = initAuthToken(credential);
+        try {
+            Subject subject = SecurityUtils.getSubject();
+            subject.login(authToken);
+            if (subject.isAuthenticated()) {
+                String accessToken = (String) authToken.getCredentials();
+                // 缓存当前token与用户信息
+                TokenCacheHelper.cacheAccessToken(accessToken, authToken.buildUserInfoStr(), getExpiresInMinutes());
+                log.debug("申请token成功！authtoken={}", authToken.getCredentials());
+                saveLoginTrace(authToken, true);
+                // 返回
+                return accessToken;
+            }
+            else {
+                log.error("认证失败");
+                saveLoginTrace(authToken, false);
+                throw new BusinessException(Status.FAIL_OPERATION, "认证失败");
+            }
+        } catch (Exception e) {
+            log.error("登录异常", e);
+            saveLoginTrace(authToken, false);
+            throw new BusinessException(Status.FAIL_OPERATION, e.getMessage());
+        }
+    }
+
+    /**
+     * 初始化JwtAuthToken实例
+     * @param credential
+     * @return
+     */
+    protected IamAuthToken initAuthToken(AuthCredential credential){
+        IamAuthToken token = new IamAuthToken(getAuthType(), credential.getUserTypeClass());
+        // 设置账号密码
+        token.setAuthAccount(credential.getAuthAccount());
+        token.setAuthSecret(credential.getAuthSecret());
+        token.setRememberMe(credential.isRememberMe());
+        token.setTenantId(credential.getTenantId());
+        token.setExtObj(credential.getExtObj());
+        // 生成token
+        return token.generateAuthtoken();
+    }
+
+    /**
+     * 保存登录日志
+     * @param authToken
+     * @param isSuccess
+     */
+    protected void saveLoginTrace(IamAuthToken authToken, boolean isSuccess){
+        IamLoginTrace loginTrace = new IamLoginTrace();
+        loginTrace.setAuthType(getAuthType()).setAuthAccount(authToken.getAuthAccount()).setUserType(authToken.getUserType()).setSuccess(isSuccess);
+        BaseLoginUser currentUser = IamSecurityUtils.getCurrentUser();
+        if(currentUser != null){
+            loginTrace.setUserId(currentUser.getId());
+        }
+        // 记录客户端信息
+        String userAgent = HttpHelper.getUserAgent(request);
+        String ipAddress = HttpHelper.getRequestIp(request);
+        loginTrace.setUserAgent(userAgent).setIpAddress(ipAddress);
+        iamAsyncWorker.saveLoginTraceLog(loginTrace);
+    }
+
+}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/OAuth2SSOServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/OAuth2SSOServiceImpl.java
index 80ee9c45..34e05512 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/OAuth2SSOServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/OAuth2SSOServiceImpl.java
@@ -15,28 +15,20 @@
  */
 package com.diboot.iam.auth.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.diboot.core.exception.BusinessException;
 import com.diboot.core.exception.InvalidUsageException;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.Status;
-import com.diboot.iam.auth.AuthService;
 import com.diboot.iam.config.Cons;
 import com.diboot.iam.dto.AuthCredential;
 import com.diboot.iam.dto.OAuth2SSOCredential;
-import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
-import com.diboot.iam.entity.IamLoginTrace;
-import com.diboot.iam.jwt.BaseJwtAuthToken;
-import com.diboot.iam.service.IamAccountService;
-import com.diboot.iam.service.IamLoginTraceService;
+import com.diboot.iam.shiro.IamAuthToken;
 import com.diboot.iam.starter.IamProperties;
-import com.diboot.iam.util.IamSecurityUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpEntity;
@@ -48,7 +40,6 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
-import javax.servlet.http.HttpServletRequest;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Map;
@@ -63,13 +54,7 @@ import java.util.Map;
 @Slf4j
 @Service
 @ConditionalOnProperty(prefix = "diboot.iam.oauth2-client", name = {"client-id", "client-secret", "redirect-uri", "access-token-uri"})
-public class OAuth2SSOServiceImpl implements AuthService {
-    @Autowired
-    private HttpServletRequest request;
-    @Autowired
-    private IamAccountService accountService;
-    @Autowired
-    private IamLoginTraceService iamLoginTraceService;
+public class OAuth2SSOServiceImpl extends BaseAuthServiceImpl {
     @Autowired(required = false)
     private RestTemplate restTemplate;
     @Autowired
@@ -80,27 +65,22 @@ public class OAuth2SSOServiceImpl implements AuthService {
         return Cons.DICTCODE_AUTH_TYPE.SSO.name();
     }
 
+    /**
+     * 构建查询条件
+     * @param iamAuthToken
+     * @return
+     */
     @Override
-    public IamAccount getAccount(BaseJwtAuthToken jwtToken) throws AuthenticationException {
+    protected Wrapper buildQueryWrapper(IamAuthToken iamAuthToken) {
         // 查询最新的记录
         LambdaQueryWrapper<IamAccount> queryWrapper = new LambdaQueryWrapper<IamAccount>()
                 .select(IamAccount::getAuthAccount, IamAccount::getUserType, IamAccount::getUserId, IamAccount::getStatus)
-                .eq(IamAccount::getUserType, jwtToken.getUserType())
-                .eq(IamAccount::getTenantId, jwtToken.getTenantId())
+                .eq(IamAccount::getUserType, iamAuthToken.getUserType())
+                .eq(IamAccount::getTenantId, iamAuthToken.getTenantId())
                 //.eq(IamAccount::getAuthType, jwtToken.getAuthType()) SSO只检查用户名，支持任意类型账号
-                .eq(IamAccount::getAuthAccount, jwtToken.getAuthAccount())
+                .eq(IamAccount::getAuthAccount, iamAuthToken.getAuthAccount())
                 .orderByDesc(IamAccount::getId);
-        IamAccount latestAccount = accountService.getSingleEntity(queryWrapper);
-        if (latestAccount == null) {
-            return null;
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.I.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已禁用! account=" + jwtToken.getAuthAccount());
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.L.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已锁定! account=" + jwtToken.getAuthAccount());
-        }
-        return latestAccount;
+        return queryWrapper;
     }
 
     @Override
@@ -111,25 +91,7 @@ public class OAuth2SSOServiceImpl implements AuthService {
         if(V.isEmpty(ssoCredential.getAuthAccount())){
             throw new BusinessException(Status.FAIL_OPERATION, "认证中心验证失败");
         }
-        BaseJwtAuthToken authToken = initBaseJwtAuthToken(credential);
-        try {
-            Subject subject = SecurityUtils.getSubject();
-            subject.login(authToken);
-            if (subject.isAuthenticated()) {
-                log.debug("申请token成功！authtoken={}", authToken.getCredentials());
-                saveLoginTrace(authToken, true);
-                // 跳转到首页
-                return (String) authToken.getCredentials();
-            } else {
-                log.error("认证失败");
-                saveLoginTrace(authToken, false);
-                throw new BusinessException(Status.FAIL_OPERATION, "认证失败");
-            }
-        } catch (Exception e) {
-            log.error("登录异常", e);
-            saveLoginTrace(authToken, false);
-            throw new BusinessException(Status.FAIL_OPERATION, e.getMessage());
-        }
+        return super.applyToken(credential);
     }
 
     /**
@@ -138,14 +100,15 @@ public class OAuth2SSOServiceImpl implements AuthService {
      * @param credential
      * @return
      */
-    private BaseJwtAuthToken initBaseJwtAuthToken(AuthCredential credential) {
-        BaseJwtAuthToken token = new BaseJwtAuthToken(getAuthType(), credential.getUserTypeClass());
+    @Override
+    protected IamAuthToken initAuthToken(AuthCredential credential) {
+        IamAuthToken token = new IamAuthToken(getAuthType(), credential.getUserTypeClass());
         // 设置账号密码
         token.setAuthAccount(credential.getAuthAccount());
         token.setTenantId(credential.getTenantId());
         token.setRememberMe(credential.isRememberMe());
         // 生成token
-        return token.generateAuthtoken(getExpiresInMinutes());
+        return token.generateAuthtoken();
     }
 
     /**
@@ -177,29 +140,4 @@ public class OAuth2SSOServiceImpl implements AuthService {
         }
     }
 
-    /**
-     * 保存登录日志
-     *
-     * @param authToken
-     * @param isSuccess
-     */
-    protected void saveLoginTrace(BaseJwtAuthToken authToken, boolean isSuccess) {
-        IamLoginTrace loginTrace = new IamLoginTrace();
-        loginTrace.setAuthType(getAuthType()).setAuthAccount(authToken.getAuthAccount()).setUserType(authToken.getUserType()).setSuccess(isSuccess);
-        BaseLoginUser currentUser = IamSecurityUtils.getCurrentUser();
-        if (currentUser != null) {
-            Long userId = currentUser.getId();
-            loginTrace.setUserId(userId);
-        }
-        // 记录客户端信息
-        String userAgent = request.getHeader("user-agent");
-        String ipAddress = IamSecurityUtils.getRequestIp(request);
-        loginTrace.setUserAgent(userAgent).setIpAddress(ipAddress);
-        try {
-            iamLoginTraceService.createEntity(loginTrace);
-        } catch (Exception e) {
-            log.warn("保存登录日志异常", e);
-        }
-    }
-
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/PwdAuthServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/PwdAuthServiceImpl.java
index 0d9e55ba..4c7f31b7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/PwdAuthServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/PwdAuthServiceImpl.java
@@ -15,30 +15,17 @@
  */
 package com.diboot.iam.auth.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.diboot.core.exception.BusinessException;
 import com.diboot.core.util.Encryptor;
-import com.diboot.core.vo.Status;
-import com.diboot.iam.annotation.process.IamAsyncWorker;
-import com.diboot.iam.auth.AuthService;
 import com.diboot.iam.config.Cons;
-import com.diboot.iam.dto.AuthCredential;
-import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
-import com.diboot.iam.entity.IamLoginTrace;
-import com.diboot.iam.jwt.BaseJwtAuthToken;
-import com.diboot.iam.service.IamAccountService;
-import com.diboot.iam.util.HttpHelper;
+import com.diboot.iam.shiro.IamAuthToken;
 import com.diboot.iam.util.IamSecurityUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 用户名密码认证的service实现
  * @author mazc@dibo.ltd
@@ -47,68 +34,38 @@ import javax.servlet.http.HttpServletRequest;
  */
 @Service
 @Slf4j
-public class PwdAuthServiceImpl implements AuthService {
-    @Autowired
-    private IamAccountService accountService;
-    @Autowired
-    private IamAsyncWorker iamAsyncWorker;
-    @Autowired
-    private HttpServletRequest request;
-
+public class PwdAuthServiceImpl extends BaseAuthServiceImpl {
     @Override
     public String getAuthType() {
         return Cons.DICTCODE_AUTH_TYPE.PWD.name();
     }
 
+    /**
+     * 构建查询条件
+     * @param iamAuthToken
+     * @return
+     */
     @Override
-    public IamAccount getAccount(BaseJwtAuthToken jwtToken) throws AuthenticationException {
+    protected Wrapper buildQueryWrapper(IamAuthToken iamAuthToken) {
         // 查询最新的记录
         LambdaQueryWrapper<IamAccount> queryWrapper = new LambdaQueryWrapper<IamAccount>()
                 .select(IamAccount::getAuthAccount, IamAccount::getAuthSecret, IamAccount::getSecretSalt, IamAccount::getUserType, IamAccount::getUserId, IamAccount::getStatus)
-                .eq(IamAccount::getUserType, jwtToken.getUserType())
-                .eq(IamAccount::getAuthType, jwtToken.getAuthType())
-                .eq(IamAccount::getAuthAccount, jwtToken.getAuthAccount())
-                .eq(IamAccount::getTenantId, jwtToken.getTenantId())
+                .eq(IamAccount::getUserType, iamAuthToken.getUserType())
+                .eq(IamAccount::getAuthType, iamAuthToken.getAuthType())
+                .eq(IamAccount::getAuthAccount, iamAuthToken.getAuthAccount())
+                .eq(IamAccount::getTenantId, iamAuthToken.getTenantId())
                 .orderByDesc(IamAccount::getId);
-        IamAccount latestAccount = accountService.getSingleEntity(queryWrapper);
-        if(latestAccount == null){
-            return null;
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.I.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已禁用! account="+jwtToken.getAuthAccount());
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.L.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已锁定! account="+jwtToken.getAuthAccount());
-        }
-        // 如果需要密码校验，那么无状态的时候不需要验证
-        if (jwtToken.isValidPassword() && isPasswordMatched(latestAccount, jwtToken) == false){
-            throw new AuthenticationException("用户名或密码错误! account="+jwtToken.getAuthAccount());
-        }
-        return latestAccount;
+        return queryWrapper;
     }
 
     @Override
-    public String applyToken(AuthCredential credential) {
-        BaseJwtAuthToken authToken = initBaseJwtAuthToken(credential);
-        try {
-            Subject subject = SecurityUtils.getSubject();
-            subject.login(authToken);
-            if (subject.isAuthenticated()) {
-                log.debug("申请token成功！authtoken={}", authToken.getCredentials());
-                saveLoginTrace(authToken, true);
-                // 跳转到首页
-                return (String) authToken.getCredentials();
-            }
-            else {
-                log.error("认证失败");
-                saveLoginTrace(authToken, false);
-                throw new BusinessException(Status.FAIL_OPERATION, "认证失败");
-            }
-        } catch (Exception e) {
-            log.error("登录异常", e);
-            saveLoginTrace(authToken, false);
-            throw new BusinessException(Status.FAIL_OPERATION, e.getMessage());
+    public IamAccount getAccount(IamAuthToken iamAuthToken) throws AuthenticationException {
+        IamAccount latestAccount = super.getAccount(iamAuthToken);
+        // 如果需要密码校验，那么无状态的时候不需要验证
+        if (iamAuthToken.isValidPassword() && isPasswordMatched(latestAccount, iamAuthToken) == false){
+            throw new AuthenticationException("用户名或密码错误! account="+iamAuthToken.getAuthAccount());
         }
+        return latestAccount;
     }
 
     /**
@@ -117,7 +74,7 @@ public class PwdAuthServiceImpl implements AuthService {
      * @param jwtToken
      * @return
      */
-    private static boolean isPasswordMatched(IamAccount account, BaseJwtAuthToken jwtToken){
+    private static boolean isPasswordMatched(IamAccount account, IamAuthToken jwtToken){
         //加密后比较
         String encryptedStr = IamSecurityUtils.encryptPwd(jwtToken.getAuthSecret(), account.getSecretSalt());
         // 暂时兼容RC2版本，后期移除
@@ -125,40 +82,4 @@ public class PwdAuthServiceImpl implements AuthService {
         return encryptedStr.equals(account.getAuthSecret()) || oldEncryptedStr.equals(account.getAuthSecret());
     }
 
-    /**
-     * 初始化JwtAuthToken实例
-     * @param credential
-     * @return
-     */
-    private BaseJwtAuthToken initBaseJwtAuthToken(AuthCredential credential){
-        BaseJwtAuthToken token = new BaseJwtAuthToken(getAuthType(), credential.getUserTypeClass());
-        // 设置账号密码
-        token.setAuthAccount(credential.getAuthAccount());
-        token.setAuthSecret(credential.getAuthSecret());
-        token.setRememberMe(credential.isRememberMe());
-        token.setTenantId(credential.getTenantId());
-        token.setExtObj(credential.getExtObj());
-        // 生成token
-        return token.generateAuthtoken(getExpiresInMinutes());
-    }
-
-    /**
-     * 保存登录日志
-     * @param authToken
-     * @param isSuccess
-     */
-    protected void saveLoginTrace(BaseJwtAuthToken authToken, boolean isSuccess){
-        IamLoginTrace loginTrace = new IamLoginTrace();
-        loginTrace.setAuthType(getAuthType()).setAuthAccount(authToken.getAuthAccount()).setUserType(authToken.getUserType()).setSuccess(isSuccess);
-        BaseLoginUser currentUser = IamSecurityUtils.getCurrentUser();
-        if(currentUser != null){
-            loginTrace.setUserId(currentUser.getId());
-        }
-        // 记录客户端信息
-        String userAgent = HttpHelper.getUserAgent(request);
-        String ipAddress = HttpHelper.getRequestIp(request);
-        loginTrace.setUserAgent(userAgent).setIpAddress(ipAddress);
-        iamAsyncWorker.saveLoginTraceLog(loginTrace);
-    }
-
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java b/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
index bf26e71f..d0800b3f 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/cache/IamCacheManager.java
@@ -20,7 +20,8 @@ import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import com.diboot.iam.annotation.BindPermission;
-import com.diboot.iam.annotation.process.*;
+import com.diboot.iam.annotation.process.ApiPermissionExtractor;
+import com.diboot.iam.annotation.process.ApiPermissionWrapper;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
index 37094571..cfadbe79 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
@@ -16,6 +16,7 @@
 package com.diboot.iam.config;
 
 import com.diboot.core.config.BaseConfig;
+import com.diboot.iam.shiro.IamAuthorizingRealm;
 
 /**
  * IAM数据字典等常量定义
@@ -115,12 +116,18 @@ public class Cons extends com.diboot.core.config.Cons {
      */
     public static final String ROLE_SUPER_ADMIN = "SUPER_ADMIN";
 
-    public static final String AUTHENTICATION_CAHCE_NAME = "com.diboot.iam.jwt.BaseJwtRealm.authenticationCache";
-    public static final String AUTHORIZATION_CAHCE_NAME = "com.diboot.iam.jwt.BaseJwtRealm.authorizationCache";
+    public static final String AUTHENTICATION_CAHCE_NAME = IamAuthorizingRealm.class.getName() + ".authenticationCache";
+
+    public static final String AUTHORIZATION_CAHCE_NAME = IamAuthorizingRealm.class.getName() + ".authorizationCache";
+
+    /**
+     * 验证码
+     */
+    public static final String CACHE_CAPTCHA = "CAPTCHA";
 
     /**
      * 验证码
      */
-    public static final String CAPTCHA = "captcha";
+    public static final String CACHE_TOKEN_USERINFO = "TOKEN_USERINFO";
 
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtAuthToken.java b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtAuthToken.java
index 0c71795c..15e72d8f 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtAuthToken.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtAuthToken.java
@@ -15,128 +15,19 @@
  */
 package com.diboot.iam.jwt;
 
-import com.diboot.iam.config.Cons;
-import com.diboot.iam.entity.IamUser;
-import com.diboot.iam.util.JwtUtils;
+import com.diboot.iam.shiro.IamAuthToken;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authc.RememberMeAuthenticationToken;
-
-import java.util.Map;
 
 /**
  * @author Yangzhao
  * @version v2.0
  * @date 2019/6/6
  */
+@Deprecated
 @Getter @Setter
 @Slf4j
-public class BaseJwtAuthToken implements RememberMeAuthenticationToken {
-    private static final long serialVersionUID = -5518501153334708409L;
-
-    /**
-     * 用户类型的Class
-     */
-    private Class userTypeClass = IamUser.class;
-    /**
-     * 认证类型，密码/微信...
-     */
-    private String authType;
-    /**
-     * 认证账号
-     */
-    private String authAccount;
-    /**
-     * 认证凭证
-     */
-    private String authSecret;
-    /**
-     * 记住我
-     */
-    private boolean rememberMe;
-
-    /**
-     * 扩展属性
-     */
-    private Map<String, Object> extObj;
-
-    /**authz token*/
-    private String authtoken;
-
-    /**
-     * 租户id
-     */
-    private Long tenantId = 0L;
-
-    /**
-     * 是否校验密码
-     */
-    private boolean validPassword = true;
-
-    private Object principal;
-
-    private Object credentials;
-
-    public BaseJwtAuthToken(){
-    }
-
-    /***
-     * 初始化认证token
-     * @param authType 认证方式
-     * @param userTypeClass 用户类型Class
-     */
-    public BaseJwtAuthToken(String authType, Class userTypeClass){
-        this.authType = authType;
-        this.userTypeClass = userTypeClass;
-    }
-
-    /***
-     * 验证失败的时候清空token
-     */
-    public void clearAuthtoken(){
-        this.authtoken = null;
-    }
-
-    /**
-     * 设置
-     * @return
-     */
-    @Override
-    public Object getPrincipal() {
-        return this.authtoken;
-    }
-
-    @Override
-    public Object getCredentials() {
-        return this.authtoken;
-    }
-
-    /**
-     * 获取用户类型
-     * @return
-     */
-    public String getUserType(){
-        return userTypeClass.getSimpleName();
-    }
-
-    /**
-     * 生成token  tenantId,account,userTypeClass,authType,60
-     * @param expiresInMinutes
-     * @return
-     */
-    public BaseJwtAuthToken generateAuthtoken(int expiresInMinutes){
-        String tokenInput = this.tenantId + Cons.SEPARATOR_COMMA
-                            + this.authAccount + Cons.SEPARATOR_COMMA
-                            + this.userTypeClass.getTypeName() + Cons.SEPARATOR_COMMA
-                            + this.authType + Cons.SEPARATOR_COMMA
-                            + expiresInMinutes;
-        this.authtoken = JwtUtils.generateToken(tokenInput, expiresInMinutes);
-        return this;
-    }
-
-    @Override
-    public boolean isRememberMe() {
-        return rememberMe;
-    }
+public class BaseJwtAuthToken extends IamAuthToken {
+    private static final long serialVersionUID = -3455501467921544790L;
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java
deleted file mode 100644
index 1f5b3ad7..00000000
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/DefaultJwtAuthFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.iam.jwt;
-
-import com.diboot.core.util.ContextHelper;
-import com.diboot.core.util.JSON;
-import com.diboot.core.util.V;
-import com.diboot.core.vo.JsonResult;
-import com.diboot.core.vo.Status;
-import com.diboot.iam.config.Cons;
-import com.diboot.iam.util.JwtUtils;
-import io.jsonwebtoken.Claims;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.cache.CacheManager;
-import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * JWT 认证过滤器
- * @author Yangzhao
- * @version v2.0
- * @date 2019/6/6
- */
-@Deprecated
-@Slf4j
-public class DefaultJwtAuthFilter extends BasicHttpAuthenticationFilter {
-
-    /**
-     * Shiro权限拦截核心方法 使用JWT进行认证 返回true允许访问
-     */
-    @Override
-    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
-        // 从header获取Token
-        Claims claims = JwtUtils.getClaimsFromRequest(httpRequest);
-        if (V.isEmpty(claims)) {
-            return false;
-        }
-        //解密是否成功
-        if(V.notEmpty(claims.getSubject())){
-            log.debug("Token验证成功！account={}, url={}", claims.getSubject(), httpRequest.getRequestURI());
-            // 如果临近过期，则生成新的token返回
-            String refreshToken = JwtUtils.generateNewTokenIfRequired(claims);
-            if(refreshToken != null){
-                // 写入response header中
-                JwtUtils.addTokenToResponseHeader((HttpServletResponse) response, refreshToken);
-                CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
-                if(cacheManager != null){
-                    // 记录新的token
-                    if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
-                        String currentToken = JwtUtils.getRequestToken(httpRequest);
-                        Object cacheVal = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(currentToken);
-                        cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).put(refreshToken, cacheVal);
-                    }
-                }
-                log.debug("返回新的token: {}", refreshToken);
-            }
-            return true;
-        }
-        log.debug("Token验证失败！url=" + httpRequest.getRequestURI());
-        return false;
-    }
-
-    /**
-     * 当访问拒绝时是否已经处理了；如果返回true表示需要继续处理；如果返回false表示该拦截器实例已经处理
-     * @param
-     */
-    @Override
-    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
-        log.debug("Token认证失败： onAccessDenied。url={}", httpRequest.getRequestURI());
-        JsonResult jsonResult = new JsonResult(Status.FAIL_INVALID_TOKEN);
-        this.responseJson((HttpServletResponse) response, jsonResult);
-        return false;
-    }
-
-    /***
-     * 返回json格式错误信息
-     * @param response
-     * @param jsonResult
-     */
-    protected void responseJson(HttpServletResponse response, JsonResult jsonResult){
-        // 处理异步请求
-        response.setStatus(HttpStatus.OK.value());
-        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-        response.setCharacterEncoding(Cons.CHARSET_UTF8);
-        try (PrintWriter pw = response.getWriter()){
-            pw.write(JSON.stringify(jsonResult));
-            pw.flush();
-        }
-        catch (IOException e) {
-            log.error("处理异步请求异常", e);
-        }
-    }
-
-}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java
deleted file mode 100644
index 1c767d4a..00000000
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/StatelessJwtAuthFilter.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.iam.jwt;
-
-import com.diboot.core.util.JSON;
-import com.diboot.core.util.S;
-import com.diboot.core.util.V;
-import com.diboot.core.vo.JsonResult;
-import com.diboot.core.vo.Status;
-import com.diboot.iam.config.Cons;
-import com.diboot.iam.entity.IamUser;
-import com.diboot.iam.util.IamSecurityUtils;
-import com.diboot.iam.util.JwtUtils;
-import io.jsonwebtoken.Claims;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * 无状态JWT过滤器
- *
- * @author : uu
- * @version : v1.0
- * @Date 2020/11/19  10:46
- */
-@Deprecated
-@Slf4j
-@Getter @Setter
-public class StatelessJwtAuthFilter extends BasicHttpAuthenticationFilter {
-
-    /**
-     * 判断是否登录
-     *
-     * 返回true则直接进入控制器
-     * @param request
-     * @param response
-     * @param mappedValue
-     * @return
-     */
-    @Override
-    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
-        // 从header获取Token
-        Claims claims = JwtUtils.getClaimsFromRequest(httpRequest);
-        if (V.isEmpty(claims)) {
-            return false;
-        }
-        String currentToken = JwtUtils.getRequestToken(httpRequest);
-        //解密是否成功
-        if(V.notEmpty(claims.getSubject())){
-            String subject = S.substringBeforeLast(claims.getSubject(), Cons.SEPARATOR_COMMA);
-            log.debug("Token验证成功！subject={}", subject);
-            // 如果临近过期，则生成新的token返回
-            String refreshToken = JwtUtils.generateNewTokenIfRequired(claims);
-            if(refreshToken != null){
-                currentToken = refreshToken;
-                // 写入response header中
-                JwtUtils.addTokenToResponseHeader((HttpServletResponse) response, refreshToken);
-            }
-            // 构建登陆的token
-            if(IamSecurityUtils.getSubject().isAuthenticated() == false || refreshToken != null){
-                // tenantId,account,userTypeClass,authType,60
-                String[] subjectDetail = subject.split(Cons.SEPARATOR_COMMA);
-                BaseJwtAuthToken baseJwtAuthToken = new BaseJwtAuthToken();
-                baseJwtAuthToken.setTenantId(Long.valueOf(subjectDetail[0]));
-                baseJwtAuthToken.setAuthAccount(subjectDetail[1]);
-                if(!IamUser.class.getName().equals(subjectDetail[2])){
-                    try {
-                        baseJwtAuthToken.setUserTypeClass(Class.forName(subjectDetail[2]));
-                    } catch (ClassNotFoundException e) {
-                        log.debug("Token验证失败！用户类型{}不存在，url={}", subjectDetail[2], httpRequest.getRequestURL());
-                        return false;
-                    }
-                }
-                baseJwtAuthToken.setAuthType(subjectDetail[3]);
-                baseJwtAuthToken.setAuthtoken(currentToken);
-                baseJwtAuthToken.setValidPassword(false);
-                IamSecurityUtils.getSubject().login(baseJwtAuthToken);
-                log.debug("无状态token自动登录完成");
-            }
-            return true;
-        }
-        log.debug("Token验证失败！url=" + httpRequest.getRequestURL());
-        return false;
-    }
-
-    /**
-     * 没有登录的情况下会走此方法
-     * @param request
-     * @param response
-     * @return
-     * @throws Exception
-     */
-    @Override
-    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
-        log.debug("Token认证失败： onAccessDenied");
-        JsonResult jsonResult = new JsonResult(Status.FAIL_INVALID_TOKEN);
-        this.responseJson((HttpServletResponse)response, jsonResult);
-        return false;
-    }
-
-    /***
-     * 返回json格式错误信息
-     * @param response
-     * @param jsonResult
-     */
-    protected void responseJson(HttpServletResponse response, JsonResult jsonResult){
-        // 处理异步请求
-        response.setStatus(HttpStatus.OK.value());
-        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-        response.setCharacterEncoding(Cons.CHARSET_UTF8);
-        try (PrintWriter pw = response.getWriter()){
-            pw.write(JSON.stringify(jsonResult));
-            pw.flush();
-        }
-        catch (IOException e) {
-            log.error("处理异步请求异常", e);
-        }
-    }
-}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java
index ba835826..21f43d44 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamResourcePermissionService.java
@@ -21,7 +21,6 @@ import com.diboot.iam.entity.IamResourcePermission;
 import com.diboot.iam.vo.IamResourcePermissionListVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 前端资源权限相关Service
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
index c61d2503..fde48593 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
@@ -17,25 +17,24 @@ package com.diboot.iam.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.diboot.core.binding.RelationsBinder;
 import com.diboot.core.exception.BusinessException;
 import com.diboot.core.util.BeanUtils;
-import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.Status;
-import com.diboot.iam.cache.IamCacheManager;
 import com.diboot.iam.config.Cons;
 import com.diboot.iam.dto.IamResourcePermissionDTO;
 import com.diboot.iam.entity.IamResourcePermission;
 import com.diboot.iam.mapper.IamResourcePermissionMapper;
 import com.diboot.iam.service.IamResourcePermissionService;
 import com.diboot.iam.vo.IamResourcePermissionListVO;
-import com.diboot.iam.vo.InvalidResourcePermissionVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
index 33befb01..526b1d67 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
@@ -22,7 +22,6 @@ import com.diboot.core.exception.BusinessException;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.Status;
 import com.diboot.iam.auth.IamCustomize;
-import com.diboot.iam.config.Cons;
 import com.diboot.iam.dto.IamUserAccountDTO;
 import com.diboot.iam.entity.IamAccount;
 import com.diboot.iam.entity.IamUser;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java
new file mode 100644
index 00000000..fbe78b35
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.shiro;
+
+import com.diboot.core.util.S;
+import com.diboot.iam.config.Cons;
+import com.diboot.iam.entity.IamUser;
+import com.diboot.iam.util.TokenUtils;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authc.RememberMeAuthenticationToken;
+
+import java.util.Map;
+
+/**
+ * IAM 认证token定义
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/26
+ * Copyright © diboot.com
+ */
+@Getter @Setter
+@Slf4j
+public class IamAuthToken implements RememberMeAuthenticationToken {
+    private static final long serialVersionUID = -5518501153334708409L;
+
+    /**
+     * 用户类型的Class
+     */
+    private Class userTypeClass = IamUser.class;
+    /**
+     * 认证类型，密码/微信...
+     */
+    private String authType;
+    /**
+     * 认证账号
+     */
+    private String authAccount;
+    /**
+     * 认证凭证
+     */
+    private String authSecret;
+    /**
+     * 记住我
+     */
+    private boolean rememberMe;
+
+    /**
+     * 扩展属性
+     */
+    private Map<String, Object> extObj;
+
+    /**authz token*/
+    private String authtoken;
+
+    /**
+     * 租户id
+     */
+    private Long tenantId = 0L;
+
+    /**
+     * 是否校验密码
+     */
+    private boolean validPassword = true;
+
+    private Object principal;
+
+    private Object credentials;
+
+    public IamAuthToken(){
+    }
+
+    /***
+     * 初始化认证token
+     * @param authType 认证方式
+     * @param userTypeClass 用户类型Class
+     */
+    public IamAuthToken(String authType, Class userTypeClass){
+        this.authType = authType;
+        this.userTypeClass = userTypeClass;
+    }
+
+    public IamAuthToken(String userInfoStr){
+        String[] fields = S.split(userInfoStr, Cons.SEPARATOR_COMMA);
+        this.tenantId = Long.parseLong(fields[0]);
+        this.authAccount = fields[1];
+        if(IamUser.class.getSimpleName().equals(fields[2]) != true){
+            try {
+                this.userTypeClass = Class.forName(fields[2]);
+            }
+            catch (ClassNotFoundException e) {
+                log.debug("Token验证失败！用户类型{}不存在", fields[2]);
+            }
+        }
+        this.authType = fields[3];
+    }
+
+    /***
+     * 验证失败的时候清空token
+     */
+    public void clearAuthtoken(){
+        this.authtoken = null;
+    }
+
+    /**
+     * 设置
+     * @return
+     */
+    @Override
+    public Object getPrincipal() {
+        return this.authtoken;
+    }
+
+    @Override
+    public Object getCredentials() {
+        return this.authtoken;
+    }
+
+    /**
+     * 获取用户类型
+     * @return
+     */
+    public String getUserType(){
+        return userTypeClass.getSimpleName();
+    }
+
+    /**
+     * 生成token UUID
+     * @return
+     */
+    public IamAuthToken generateAuthtoken(){
+        this.authtoken = TokenUtils.generateToken();
+        return this;
+    }
+
+    @Override
+    public boolean isRememberMe() {
+        return rememberMe;
+    }
+
+    /**
+     * 构建唯一串用于缓存
+     * @return
+     */
+    public String buildUserInfoStr(){
+        return S.joinWith(Cons.SEPARATOR_COMMA,
+                this.getTenantId(), this.getAuthAccount(), this.getUserTypeClass().getName(), this.getAuthType(), System.currentTimeMillis());
+    }
+}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtRealm.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
similarity index 82%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtRealm.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
index 6248106a..df100f7c 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/jwt/BaseJwtRealm.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.diboot.iam.jwt;
+package com.diboot.iam.shiro;
 
 import com.diboot.core.service.BaseService;
 import com.diboot.core.util.ContextHelper;
@@ -46,24 +46,26 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * @author Yangzhao
- * @version v2.0
- * @date 2019/6/6
+ * IAM realm定义
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/26
+ * Copyright © diboot.com
  */
 @Slf4j
-public class BaseJwtRealm extends AuthorizingRealm {
+public class IamAuthorizingRealm extends AuthorizingRealm {
 
     private IamUserRoleService iamUserRoleService;
     private IamRoleResourceService iamRoleResourceService;
 
     @Override
     public boolean supports(AuthenticationToken token) {
-        return token != null && token instanceof BaseJwtAuthToken;
+        return token != null && token instanceof IamAuthToken;
     }
 
     @Override
     public Class<?> getAuthenticationTokenClass() {
-        return BaseJwtRealm.class;
+        return IamAuthorizingRealm.class;
     }
 
     /***
@@ -74,47 +76,48 @@ public class BaseJwtRealm extends AuthorizingRealm {
      */
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
-        BaseJwtAuthToken jwtToken = (BaseJwtAuthToken) token;
-        String authAccount = (String) jwtToken.getPrincipal();
+        IamAuthToken iamAuthToken = (IamAuthToken) token;
+        String authAccount = (String) iamAuthToken.getPrincipal();
         if (V.isEmpty(authAccount)){
             throw new AuthenticationException("无效的用户标识");
         }
         else {
             // 获取认证方式
-            AuthService authService = AuthServiceFactory.getAuthService(jwtToken.getAuthType());
+            AuthService authService = AuthServiceFactory.getAuthService(iamAuthToken.getAuthType());
             if(authService == null){
-                jwtToken.clearAuthtoken();
-                throw new AuthenticationException("认证类型: "+jwtToken.getAuthType()+" 的AccountAuthService未实现！");
+                iamAuthToken.clearAuthtoken();
+                throw new AuthenticationException("认证类型: "+iamAuthToken.getAuthType()+" 的AccountAuthService未实现！");
             }
-            IamAccount account = authService.getAccount(jwtToken);
+            IamAccount account = authService.getAccount(iamAuthToken);
             // 登录失败则抛出相关异常
             if (account == null){
-                jwtToken.clearAuthtoken();
+                iamAuthToken.clearAuthtoken();
                 throw new AuthenticationException("用户账号或密码错误！");
             }
             // 获取当前user对象并缓存
             BaseLoginUser loginUser = null;
-            BaseService userService = ContextHelper.getBaseServiceByEntity(jwtToken.getUserTypeClass());
+            BaseService userService = ContextHelper.getBaseServiceByEntity(iamAuthToken.getUserTypeClass());
             if(userService != null){
                 loginUser = (BaseLoginUser)userService.getEntity(account.getUserId());
             }
             else{
-                throw new AuthenticationException("用户 "+jwtToken.getUserTypeClass().getName()+" 相关的Service未定义！");
+                throw new AuthenticationException("用户 "+iamAuthToken.getUserTypeClass().getName()+" 相关的Service未定义！");
             }
             if(loginUser == null){
                 throw new AuthenticationException("用户不存在");
             }
-            loginUser.setAuthToken(jwtToken.getAuthtoken());
+            loginUser.setAuthToken(iamAuthToken.getAuthtoken());
             IamExtensible iamExtensible = getIamUserRoleService().getIamExtensible();
             if(iamExtensible != null){
-                LabelValue extentionObj = iamExtensible.getUserExtentionObj(jwtToken.getUserTypeClass().getSimpleName(), account.getUserId(), jwtToken.getExtObj());
+                LabelValue extentionObj = iamExtensible.getUserExtentionObj(iamAuthToken.getUserTypeClass().getSimpleName(), account.getUserId(), iamAuthToken.getExtObj());
                 if(extentionObj != null){
                     loginUser.setExtentionObj(extentionObj);
                 }
             }
             // 清空当前用户缓存
             this.clearCachedAuthorizationInfo(IamSecurityUtils.getSubject().getPrincipals());
-            return new SimpleAuthenticationInfo(loginUser, jwtToken.getCredentials(), this.getName());
+            log.debug("获取用户认证信息完成 : {}", iamAuthToken.getCredentials());
+            return new SimpleAuthenticationInfo(loginUser, iamAuthToken.getCredentials(), this.getName());
         }
     }
 
@@ -165,6 +168,7 @@ public class BaseJwtRealm extends AuthorizingRealm {
         }
         // 将所有角色和权限许可授权给用户
         authorizationInfo.setStringPermissions(permissionCodesSet);
+        log.debug("获取用户授权信息完成 : {}", currentUser.getDisplayName());
         return authorizationInfo;
     }
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
index 67ecff8e..994644cc 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -15,18 +15,22 @@
  */
 package com.diboot.iam.shiro;
 
+import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.JSON;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.JsonResult;
 import com.diboot.core.vo.Status;
+import com.diboot.iam.auth.AuthService;
+import com.diboot.iam.auth.AuthServiceFactory;
 import com.diboot.iam.config.Cons;
+import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamUser;
-import com.diboot.iam.jwt.BaseJwtAuthToken;
 import com.diboot.iam.util.IamSecurityUtils;
-import com.diboot.iam.util.JwtUtils;
-import io.jsonwebtoken.Claims;
+import com.diboot.iam.util.TokenCacheHelper;
+import com.diboot.iam.util.TokenUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.web.filter.AccessControlFilter;
+import org.apache.shiro.cache.CacheManager;
+import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
@@ -45,7 +49,7 @@ import java.io.PrintWriter;
  * Copyright © diboot.com
  */
 @Slf4j
-public class StatelessAccessControlFilter extends AccessControlFilter {
+public class StatelessAccessControlFilter extends BasicHttpAuthenticationFilter {
 
     /**
      * 判断是否登录
@@ -60,48 +64,30 @@ public class StatelessAccessControlFilter extends AccessControlFilter {
     protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
         HttpServletRequest httpRequest = (HttpServletRequest) request;
         // 从header获取Token
-        Claims claims = JwtUtils.getClaimsFromRequest(httpRequest);
-        if (V.isEmpty(claims)) {
+        String currentToken = TokenUtils.getRequestToken(httpRequest);
+        if (V.isEmpty(currentToken)) {
+            log.debug("Token验证失败！url=" + httpRequest.getRequestURL());
             return false;
         }
-        String currentToken = JwtUtils.getRequestToken(httpRequest);
-        //解密是否成功
-        if(V.notEmpty(claims.getSubject())){
-            String subject = claims.getSubject();
-            log.debug("Token验证成功！subject={}", subject);
-            // 如果临近过期，则生成新的token返回
-            String refreshToken = JwtUtils.generateNewTokenIfRequired(claims);
-            if(refreshToken != null){
-                currentToken = refreshToken;
-                // 写入response header中
-                JwtUtils.addTokenToResponseHeader((HttpServletResponse) response, refreshToken);
-                log.debug("写回刷新token :{}", refreshToken);
-            }
-            // 构建登陆的token
-            if(IamSecurityUtils.getSubject().isAuthenticated() == false || refreshToken != null){
-                // tenantId,account,userTypeClass,authType,60
-                String[] subjectDetail = subject.split(Cons.SEPARATOR_COMMA);
-                BaseJwtAuthToken baseJwtAuthToken = new BaseJwtAuthToken();
-                baseJwtAuthToken.setTenantId(Long.valueOf(subjectDetail[0]));
-                baseJwtAuthToken.setAuthAccount(subjectDetail[1]);
-                if(!IamUser.class.getName().equals(subjectDetail[2])){
-                    try {
-                        baseJwtAuthToken.setUserTypeClass(Class.forName(subjectDetail[2]));
-                    } catch (ClassNotFoundException e) {
-                        log.debug("Token验证失败！用户类型{}不存在，url={}", subjectDetail[2], httpRequest.getRequestURL());
-                        return false;
-                    }
-                }
-                baseJwtAuthToken.setAuthType(subjectDetail[3]);
-                baseJwtAuthToken.setAuthtoken(currentToken);
-                baseJwtAuthToken.setValidPassword(false);
-                IamSecurityUtils.getSubject().login(baseJwtAuthToken);
-                log.debug("无状态token自动登录完成");
-            }
-            return true;
+        log.debug("Token验证成功！currentToken={}", currentToken);
+        // 构建登陆的token
+        log.debug("当前用户1: {}", (IamUser)IamSecurityUtils.getCurrentUser());
+        log.debug("当前用户1 getSubject: {}", IamSecurityUtils.getSubject());
+        String cachedUserInfo = TokenCacheHelper.getCachedUserInfoStr(currentToken);
+        if(IamSecurityUtils.getSubject().isAuthenticated() == false){
+            log.debug("当前用户2: {}", (IamUser)IamSecurityUtils.getCurrentUser());
+            IamAuthToken authToken = new IamAuthToken(cachedUserInfo);
+            authToken.setAuthtoken(currentToken);
+            authToken.setValidPassword(false);
+            IamSecurityUtils.getSubject().login(authToken);
+            log.debug("无状态token自动登录完成");
+            log.debug("当前用户3: {}", (IamUser)IamSecurityUtils.getCurrentUser());
+            log.debug("当前用户isAuthenticated: {}", IamSecurityUtils.getSubject().isAuthenticated());
         }
-        log.debug("Token验证失败！url=" + httpRequest.getRequestURL());
-        return false;
+        // 如果临近过期，则生成新的token返回
+        TokenUtils.responseNewTokenIfRequired(response, currentToken, cachedUserInfo);
+        return true;
+
     }
 
     /**
@@ -138,4 +124,15 @@ public class StatelessAccessControlFilter extends AccessControlFilter {
         }
     }
 
+    private Object getUserInfoFromCache(String currentToken){
+        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
+        if(cacheManager != null){
+            if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
+                Object cacheVal = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(currentToken);
+                return cacheVal;
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
index bc004461..da965476 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
@@ -19,25 +19,22 @@ import com.diboot.core.cache.BaseCacheManager;
 import com.diboot.core.cache.DynamicMemoryCacheManager;
 import com.diboot.core.util.V;
 import com.diboot.iam.config.Cons;
-import com.diboot.iam.jwt.BaseJwtRealm;
+import com.diboot.iam.shiro.IamAuthorizingRealm;
 import com.diboot.iam.shiro.StatelessAccessControlFilter;
 import com.diboot.iam.shiro.StatelessSubjectFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.MemoryConstrainedCacheManager;
-import org.apache.shiro.mgt.*;
 import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.mgt.*;
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.session.mgt.DefaultSessionManager;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
 import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.SubjectContext;
 import org.apache.shiro.web.filter.AccessControlFilter;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.apache.shiro.web.mgt.DefaultWebSessionStorageEvaluator;
 import org.apache.shiro.web.mgt.DefaultWebSubjectFactory;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,7 +82,7 @@ public class IamAutoConfig {
     @ConditionalOnMissingBean
     @DependsOn({"shiroCacheManager"})
     public Realm realm() {
-        BaseJwtRealm realm = new BaseJwtRealm();
+        IamAuthorizingRealm realm = new IamAuthorizingRealm();
         CacheManager cacheManager = shiroCacheManager();
         if (cacheManager != null) {
             realm.setCachingEnabled(true);
@@ -203,13 +200,13 @@ public class IamAutoConfig {
     }
 
     /**
-     * 验证码的缓存管理
+     * 用户token缓存管理器
      * @return
      */
     @Bean
     @ConditionalOnMissingBean
-    public BaseCacheManager captchaCacheManager(){
-        return new DynamicMemoryCacheManager(30, Cons.CAPTCHA);
+    public BaseCacheManager baseCacheManager(){
+        return new DynamicMemoryCacheManager(iamProperties.getTokenExpiresMinutes(), Cons.CACHE_TOKEN_USERINFO, Cons.CACHE_CAPTCHA);
     }
 
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java
index 0cdf153e..d24dc50b 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamProperties.java
@@ -40,17 +40,18 @@ public class IamProperties {
     /**
      * jwt header key
      */
-    private String jwtHeaderKey = "authtoken";
+    private String tokenHeaderKey = "authtoken";
 
     /**
-     * jwt 签名key
+     * jwt token过期分钟数
      */
-    private String jwtSignkey = "Diboot";
+    @Deprecated
+    private int jwtTokenExpiresMinutes = 60;
 
     /**
-     * jwt token过期分钟数
+     * token过期分钟数
      */
-    private int jwtTokenExpiresMinutes = 60;
+    private int tokenExpiresMinutes = 60;
 
     /**
      * 匿名的url，以,逗号分隔
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
index 24b65fee..877520b2 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
@@ -15,6 +15,8 @@
  */
 package com.diboot.iam.starter;
 
+import com.diboot.core.cache.BaseCacheManager;
+import com.diboot.core.cache.DynamicRedisCacheManager;
 import com.diboot.iam.redis.ShiroRedisCacheManager;
 import org.apache.shiro.cache.CacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +28,13 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+
+import java.time.Duration;
 
 /**
  * Shiro の Redis 缓存自动配置
@@ -47,6 +54,10 @@ public class IamRedisAutoConfig {
     @Autowired
     private IamProperties iamProperties;
 
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+
     /**
      * 启用RedisCacheManager定义
      * @return
@@ -57,4 +68,28 @@ public class IamRedisAutoConfig {
         return new ShiroRedisCacheManager(redisTemplate, iamProperties.getJwtTokenExpiresMinutes());
      }
 
+    /**
+     * 验证码的缓存管理
+     * @return
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public BaseCacheManager baseCacheManager(){
+        // redis配置参数
+        RedisCacheConfiguration defaultCacheConfiguration = RedisCacheConfiguration
+                        .defaultCacheConfig()
+                            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getStringSerializer()))
+                            .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer()))
+                            .disableCachingNullValues()
+                            .entryTtl(Duration.ofMinutes(iamProperties.getTokenExpiresMinutes()));
+        // 初始化redisCacheManager
+        RedisCacheManager redisCacheManager =
+                RedisCacheManager.RedisCacheManagerBuilder
+                        .fromConnectionFactory(redisTemplate.getConnectionFactory())
+                        .cacheDefaults(defaultCacheConfiguration)
+                        .transactionAware()
+                        .build();
+        return new DynamicRedisCacheManager(redisCacheManager);
+    }
+
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
index e09abce0..71382380 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
@@ -20,7 +20,7 @@ import com.diboot.core.util.S;
 import com.diboot.iam.config.Cons;
 import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
-import com.diboot.iam.jwt.BaseJwtRealm;
+import com.diboot.iam.shiro.IamAuthorizingRealm;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.SimpleAuthenticationInfo;
@@ -69,6 +69,8 @@ public class IamSecurityUtils extends SecurityUtils {
     public static void logout(){
         Subject subject = getSubject();
         if(subject.isAuthenticated() || subject.getPrincipals() != null){
+            // 缓存当前token与用户信息
+            //TokenCacheHelper.removeAccessToken(accessToken);
             subject.logout();
         }
     }
@@ -94,6 +96,34 @@ public class IamSecurityUtils extends SecurityUtils {
         }
     }
 
+    /**
+     * 基于 accessToken 退出 注销指定用户
+     */
+    public static void logoutByToken(String accessToken){
+        IamSecurityUtils.logout();
+        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
+        if(cacheManager != null && cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
+            cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).remove(accessToken);
+        }
+        TokenCacheHelper.removeAccessToken(accessToken);
+    }
+
+    /**
+     * 从缓存中获取用户
+     * @param authtoken
+     * @return
+     */
+    public static BaseLoginUser getUserFromCache(String authtoken){
+        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
+        if(cacheManager == null || cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) == null){
+            log.warn("cacheManager 实例异常");
+            return null;
+        }
+        SimpleAuthenticationInfo authInfo = (SimpleAuthenticationInfo)cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(authtoken);
+        SimplePrincipalCollection principalCollection = (SimplePrincipalCollection) authInfo.getPrincipals();
+        return (BaseLoginUser) principalCollection.getPrimaryPrincipal();
+    }
+
     /**
      * 获取用户 "ID" 的值
      * @return
@@ -120,9 +150,9 @@ public class IamSecurityUtils extends SecurityUtils {
      */
     public static void clearAuthorizationCache(String username){
         RealmSecurityManager rsm = (RealmSecurityManager) IamSecurityUtils.getSecurityManager();
-        BaseJwtRealm baseJwtRealm = (BaseJwtRealm)rsm.getRealms().iterator().next();
-        if(baseJwtRealm != null){
-            Cache<Object, AuthorizationInfo> cache = baseJwtRealm.getAuthorizationCache();
+        IamAuthorizingRealm authorizingRealm = (IamAuthorizingRealm)rsm.getRealms().iterator().next();
+        if(authorizingRealm != null){
+            Cache<Object, AuthorizationInfo> cache = authorizingRealm.getAuthorizationCache();
             if(cache != null) {
                 cache.remove(username);
                 log.debug("已清空账号 {} 的权限缓存，以便新权限生效.", username);
@@ -135,9 +165,9 @@ public class IamSecurityUtils extends SecurityUtils {
      */
     public static void clearAllAuthorizationCache(){
         RealmSecurityManager rsm = (RealmSecurityManager) IamSecurityUtils.getSecurityManager();
-        BaseJwtRealm baseJwtRealm = (BaseJwtRealm)rsm.getRealms().iterator().next();
-        if(baseJwtRealm != null){
-            Cache<Object, AuthorizationInfo> cache = baseJwtRealm.getAuthorizationCache();
+        IamAuthorizingRealm authorizingRealm = (IamAuthorizingRealm)rsm.getRealms().iterator().next();
+        if(authorizingRealm != null){
+            Cache<Object, AuthorizationInfo> cache = authorizingRealm.getAuthorizationCache();
             if(cache != null) {
                 cache.clear();
                 log.debug("已清空全部登录用户的权限缓存，以便新权限生效.");
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
new file mode 100644
index 00000000..b53aaf96
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.util;
+
+import com.diboot.core.cache.BaseCacheManager;
+import com.diboot.core.util.ContextHelper;
+import com.diboot.core.util.S;
+import com.diboot.core.util.V;
+import com.diboot.iam.auth.AuthService;
+import com.diboot.iam.auth.AuthServiceFactory;
+import com.diboot.iam.config.Cons;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.cache.CacheManager;
+import org.springframework.util.Assert;
+
+/**
+ * token缓存相关辅助类
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/4/27
+ * Copyright © diboot.com
+ */
+@Slf4j
+public class TokenCacheHelper {
+
+    /**
+     * 缓存新的token
+     * @param accessToken
+     * @param userInfoStr
+     * @param expiresInMinutes
+     */
+    public static void cacheAccessToken(String accessToken, String userInfoStr, int expiresInMinutes) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken, userInfoStr, expiresInMinutes);
+    }
+
+    /**
+     * 移除失效的token
+     * @param accessToken
+     */
+    public static void removeAccessToken(String accessToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken);
+    }
+
+    /**
+     * 获取缓存的token信息
+     * @param accessToken
+     * @return
+     */
+    public static String getCachedUserInfoStr(String accessToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        return baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, accessToken);
+    }
+
+    /**
+     * token是否有效: 未过期/刷新token 均有效
+     * @param accessToken
+     * @return
+     */
+    public static boolean isActiveAccessToken(String accessToken) {
+        String userInfoStr = getCachedUserInfoStr(accessToken);
+        if(V.isEmpty(userInfoStr)){
+            //TODO 判断是否为刷新token
+        }
+        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
+        if(isExpired(userInfoStr)){
+            log.warn("token 已过期: {}", accessToken);
+            if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
+                Object obj = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(accessToken);
+                log.debug("过期未退出前，AUTHENTICATION object={}", obj);
+            }
+            if(cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME) != null){
+                Object obj = cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME).get(accessToken);
+                log.debug("过期未退出前，AUTHORIZATION object={}", obj);
+            }
+            IamSecurityUtils.logoutByToken(accessToken);
+            if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
+                Object obj = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(accessToken);
+                log.debug("过期退出后，AUTHENTICATION object={}", obj);
+            }
+            if(cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME) != null){
+                Object obj = cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME).get(accessToken);
+                log.debug("过期退出后，AUTHORIZATION object={}", obj);
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 是否已过期
+     * @param userInfoStr
+     * @return
+     */
+    public static boolean isExpired(String userInfoStr){
+        if(V.isEmpty(userInfoStr)){
+            return false;
+        }
+        String[] userFields = S.split(userInfoStr);
+        AuthService authService = AuthServiceFactory.getAuthService(userFields[3]);
+        int expiresInMinutes = authService.getExpiresInMinutes();
+        // 获取当前token的过期时间
+        long issuedAt = Long.parseLong(userFields[4]);
+        // 获取当前token的过期时间
+        long expiredBefore = issuedAt + expiresInMinutes * 60000;
+        return System.currentTimeMillis() > expiredBefore;
+    }
+
+    /**
+     * 是否临近过期
+     * @param userInfoStr
+     * @return
+     */
+    public static boolean isCloseToExpired(String userInfoStr){
+        if(V.isEmpty(userInfoStr)){
+            return false;
+        }
+        String[] userFields = S.split(userInfoStr);
+        AuthService authService = AuthServiceFactory.getAuthService(userFields[3]);
+        int expiresInMinutes = authService.getExpiresInMinutes();
+        // 获取当前token的过期时间
+        long issuedAt = Long.parseLong(userFields[4]);
+        // 获取当前token的过期时间
+        long expiredBefore = issuedAt + expiresInMinutes * 60000;
+        // 当前token是否临近过期
+        long current = System.currentTimeMillis();
+        long takes = (current - issuedAt)/60000;
+        if(takes < expiresInMinutes){
+            if((takes / expiresInMinutes) > 3/4){
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/JwtUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
similarity index 31%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/util/JwtUtils.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
index 734821ec..bab6fbee 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/JwtUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
@@ -16,22 +16,14 @@
 package com.diboot.iam.util;
 
 import com.diboot.core.config.BaseConfig;
-import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
-import com.diboot.iam.config.Cons;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.shiro.cache.CacheManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 
 /**
  * Token相关操作类
@@ -39,61 +31,12 @@ import java.util.Date;
  * @version v2.0
  * @date 2019/6/6
  */
-public class JwtUtils {
-    private static final Logger log = LoggerFactory.getLogger(JwtUtils.class);
+public class TokenUtils {
+    private static final Logger log = LoggerFactory.getLogger(TokenUtils.class);
 
     private static final String TOKEN_PREFIX = "Bearer ";
-    private static final String AUTH_HEADER = getConfigValue("diboot.iam.jwt-header-key", "authtoken");
-    public static final String SIGN_KEY = getConfigValue("diboot.iam.jwt-signkey", "Diboot");
-    // 默认过期时间 2小时
-    public static final int EXPIRES_IN_MINUTES = getConfigIntValue("diboot.iam.jwt-token-expires-minutes", 1*60);
-
-    // 默认加密算法
-    private static final SignatureAlgorithm SIGNATURE_ALGORITHM = SignatureAlgorithm.HS256;
-
-    /***
-     * 从token中获取用户名 + 用户类型
-     * <br>
-     * 返回格式：
-     * <code>authAccount,expiresInMinutes</code>
-     * @param request
-     * @return
-     */
-    public static Claims getClaimsFromRequest(HttpServletRequest request){
-        String authtoken = getRequestToken(request);
-        if (V.isEmpty(authtoken)) {
-            log.debug("Token为空！url={}", request.getRequestURL());
-            return null;
-        }
-        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
-        if(cacheManager != null){
-            if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
-                Object cacheVal = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(authtoken);
-                if(cacheVal == null){
-                    log.warn("非系统颁发的token: {}", authtoken);
-                    return null;
-                }
-            }
-        }
-        try {
-            return Jwts.parser().setSigningKey(SIGN_KEY).parseClaimsJws(authtoken).getBody();
-        }
-        catch (ExpiredJwtException e) {
-            log.warn("token已过期:{}", authtoken);
-            if(cacheManager != null){
-                if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
-                    cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).remove(authtoken);
-                }
-                if(cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME) != null){
-                    cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME).remove(authtoken);
-                }
-            }
-        }
-        catch (Exception e){
-            log.warn("token解析异常\n{}", ExceptionUtils.getRootCauseMessage(e));
-        }
-        return null;
-    }
+    private static final String AUTH_HEADER = getConfigValue("diboot.iam.token-header-key", "authtoken");
+    public static final int EXPIRES_IN_MINUTES = getConfigIntValue("diboot.iam.token-expires-minutes", 60);
 
     /***
      * 从请求头中获取客户端发来的token
@@ -101,77 +44,44 @@ public class JwtUtils {
      * @return
      */
     public static String getRequestToken(HttpServletRequest request) {
-        String authHeader = request.getHeader(AUTH_HEADER);
-        if(authHeader != null){
-            if(authHeader.startsWith(TOKEN_PREFIX)){
-                return authHeader.substring(TOKEN_PREFIX.length());
+        String authtoken = request.getHeader(AUTH_HEADER);
+        if(authtoken != null){
+            authtoken = authtoken.trim();
+            if(authtoken.startsWith(TOKEN_PREFIX)){
+                authtoken = authtoken.substring(TOKEN_PREFIX.length());
             }
-            return authHeader.trim();
         }
-        return null;
-    }
-
-    /***
-     * 将刷新的token放入response header
-     * @param response
-     * @return
-     */
-    public static void addTokenToResponseHeader(HttpServletResponse response, String newToken) {
-        response.setHeader(AUTH_HEADER, newToken);
+        if(V.isEmpty(authtoken)){
+            log.warn("请求未指定token: {}", authtoken);
+            return null;
+        }
+        if(TokenCacheHelper.isActiveAccessToken(authtoken) == false){
+            log.warn("已过期或非系统颁发的token: {}", authtoken);
+            return null;
+        }
+        return authtoken;
     }
 
     /***
      * 生成Token
-     * @param accountInfo
-     * @param expiresInMinutes
      * @return
      */
-    public static String generateToken(String accountInfo, long expiresInMinutes){
-        Date expiration = expirationDate(expiresInMinutes);
-        String jwsToken = Jwts.builder()
-                .setSubject(accountInfo)
-                .setIssuedAt(now())
-                .setExpiration(expiration)
-                .signWith(SIGNATURE_ALGORITHM, SIGN_KEY)
-                .compact();
-        return jwsToken;
+    public static String generateToken(){
+        return S.newUuid();
     }
 
     /**
      * 临近过期时生成新的token
-     * @param claims
+     * @param currentToken
      * @return
      */
-    public static String generateNewTokenIfRequired(Claims claims){
-        // 当前token是否临近过期
-        long current = System.currentTimeMillis();
-        long remaining = claims.getExpiration().getTime() - current;
-        if(remaining > 0){
-            long elapsed = current - claims.getIssuedAt().getTime();
-            // 小于1/4 则更新
-            if((elapsed / remaining) >= 3){
-                // 更新token
-                int expiresInMinutes = Integer.parseInt(S.substringAfterLast(claims.getSubject(), Cons.SEPARATOR_COMMA));
-                return JwtUtils.generateToken(claims.getSubject(), expiresInMinutes);
-            }
+    public static void responseNewTokenIfRequired(ServletResponse response, String currentToken, String cachedUserInfo) {
+        if(TokenCacheHelper.isCloseToExpired(cachedUserInfo)){
+            //将刷新的token放入response header
+            String refreshToken = generateToken();
+            ((HttpServletResponse)response).setHeader(AUTH_HEADER, refreshToken);
+            log.debug("写回刷新token :{}", refreshToken);
         }
-        return null;
-    }
-
-    /**
-     * 当前时间
-     * @return
-     */
-    private static Date now(){
-        return new Date(System.currentTimeMillis());
-    }
-
-    /***
-     * 生成过期时间戳
-     * @return
-     */
-    private static Date expirationDate(long expiresInMinutes) {
-        return new Date(System.currentTimeMillis() + (expiresInMinutes*60000));
     }
 
     /**
@@ -183,7 +93,6 @@ public class JwtUtils {
         return value != null? value : defaultValue;
     }
 
-
     /**
      * 获取配置参数值
      * @return
@@ -193,4 +102,5 @@ public class JwtUtils {
         return value != null? Integer.parseInt(value) : defaultValue;
     }
 
+
 }
diff --git a/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java b/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java
index 64a0b3b8..6f1d6a9b 100644
--- a/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java
+++ b/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java
@@ -24,9 +24,9 @@ import com.diboot.iam.dto.AuthCredential;
 import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
 import com.diboot.iam.entity.IamLoginTrace;
-import com.diboot.iam.jwt.BaseJwtAuthToken;
 import com.diboot.iam.service.IamAccountService;
 import com.diboot.iam.service.IamLoginTraceService;
+import com.diboot.iam.shiro.IamAuthToken;
 import com.diboot.iam.util.HttpHelper;
 import com.diboot.iam.util.IamSecurityUtils;
 import com.diboot.mobile.dto.MobileCredential;
@@ -66,30 +66,30 @@ public class WxAuthServiceImpl implements AuthService {
     }
 
     @Override
-    public IamAccount getAccount(BaseJwtAuthToken jwtToken) throws AuthenticationException {
+    public IamAccount getAccount(IamAuthToken iamAuthToken) throws AuthenticationException {
         // 查询最新的记录
         LambdaQueryWrapper<IamAccount> queryWrapper = new LambdaQueryWrapper<IamAccount>()
                 .select(IamAccount::getAuthAccount, IamAccount::getUserType, IamAccount::getUserId, IamAccount::getStatus)
-                .eq(IamAccount::getUserType, jwtToken.getUserType())
-                .eq(IamAccount::getAuthType, jwtToken.getAuthType())
-                .eq(IamAccount::getAuthAccount, jwtToken.getAuthAccount())
+                .eq(IamAccount::getUserType, iamAuthToken.getUserType())
+                .eq(IamAccount::getAuthType, iamAuthToken.getAuthType())
+                .eq(IamAccount::getAuthAccount, iamAuthToken.getAuthAccount())
                 .orderByDesc(IamAccount::getId);
         IamAccount latestAccount = accountService.getSingleEntity(queryWrapper);
         if(latestAccount == null){
             return null;
         }
         if (Cons.DICTCODE_ACCOUNT_STATUS.I.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已禁用! account="+jwtToken.getAuthAccount());
+            throw new AuthenticationException("用户账号已禁用! account="+iamAuthToken.getAuthAccount());
         }
         if (Cons.DICTCODE_ACCOUNT_STATUS.L.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已锁定! account="+jwtToken.getAuthAccount());
+            throw new AuthenticationException("用户账号已锁定! account="+iamAuthToken.getAuthAccount());
         }
         return latestAccount;
     }
 
     @Override
     public String applyToken(AuthCredential credential) {
-        BaseJwtAuthToken authToken = initBaseJwtAuthToken(credential);
+        IamAuthToken authToken = initAuthToken(credential);
         try {
             Subject subject = SecurityUtils.getSubject();
             subject.login(authToken);
@@ -116,14 +116,14 @@ public class WxAuthServiceImpl implements AuthService {
      * @param credential
      * @return
      */
-    private BaseJwtAuthToken initBaseJwtAuthToken(AuthCredential credential){
+    private IamAuthToken initAuthToken(AuthCredential credential){
         MobileCredential wxMpCredential = (MobileCredential)credential;
-        BaseJwtAuthToken token = new BaseJwtAuthToken(getAuthType(), wxMpCredential.getUserTypeClass());
+        IamAuthToken token = new IamAuthToken(getAuthType(), wxMpCredential.getUserTypeClass());
         // 设置登陆的
         token.setAuthAccount(wxMpCredential.getAuthAccount());
         token.setRememberMe(wxMpCredential.isRememberMe());
         // 生成token
-        return token.generateAuthtoken(getExpiresInMinutes());
+        return token.generateAuthtoken();
     }
 
 
@@ -132,7 +132,7 @@ public class WxAuthServiceImpl implements AuthService {
      * @param authToken
      * @param isSuccess
      */
-    protected void saveLoginTrace(BaseJwtAuthToken authToken, boolean isSuccess){
+    protected void saveLoginTrace(IamAuthToken authToken, boolean isSuccess){
         IamLoginTrace loginTrace = new IamLoginTrace();
         loginTrace.setAuthType(getAuthType()).setAuthAccount(authToken.getAuthAccount()).setUserType(authToken.getUserType()).setSuccess(isSuccess);
         BaseLoginUser currentUser = IamSecurityUtils.getCurrentUser();
-- 
Gitee


From 3a771a47c8f17700f98638c9324ec897a7ce2f94 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 27 Apr 2022 22:10:18 +0800
Subject: [PATCH 064/195] =?UTF-8?q?*=20token=E5=88=B7=E6=96=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/cache/DynamicRedisCacheManager.java  |  4 +-
 .../main/java/com/diboot/iam/config/Cons.java |  7 ++-
 .../shiro/StatelessAccessControlFilter.java   |  6 +-
 .../iam/shiro/StatelessSubjectFactory.java    |  1 -
 .../com/diboot/iam/starter/IamAutoConfig.java |  4 +-
 .../com/diboot/iam/util/IamSecurityUtils.java | 16 -----
 .../com/diboot/iam/util/TokenCacheHelper.java | 60 +++++++++++++++----
 .../java/com/diboot/iam/util/TokenUtils.java  |  6 +-
 8 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
index f5da066b..6907a7bc 100644
--- a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
+++ b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
@@ -1,6 +1,7 @@
 package com.diboot.core.cache;
 
 import org.springframework.cache.Cache;
+import org.springframework.data.redis.cache.RedisCache;
 import org.springframework.data.redis.cache.RedisCacheManager;
 
 /**
@@ -50,4 +51,5 @@ public class DynamicRedisCacheManager implements BaseCacheManager{
     public boolean isUninitializedCache(String cacheName) {
         return false;
     }
-}
+
+}
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
index cfadbe79..cc3eafad 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
@@ -126,8 +126,13 @@ public class Cons extends com.diboot.core.config.Cons {
     public static final String CACHE_CAPTCHA = "CAPTCHA";
 
     /**
-     * 验证码
+     * token-用户信息 缓存
      */
     public static final String CACHE_TOKEN_USERINFO = "TOKEN_USERINFO";
 
+    /**
+     * token-刷新token 缓存
+     */
+    public static final String CACHE_TOKEN_REFRESHTOKEN = "TOKEN_REFRESHTOKEN";
+
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
index 994644cc..7847f485 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -73,16 +73,18 @@ public class StatelessAccessControlFilter extends BasicHttpAuthenticationFilter
         // 构建登陆的token
         log.debug("当前用户1: {}", (IamUser)IamSecurityUtils.getCurrentUser());
         log.debug("当前用户1 getSubject: {}", IamSecurityUtils.getSubject());
+        log.debug("判断hasRole1: {}", IamSecurityUtils.getSubject().hasRole(Cons.ROLE_SUPER_ADMIN));
         String cachedUserInfo = TokenCacheHelper.getCachedUserInfoStr(currentToken);
         if(IamSecurityUtils.getSubject().isAuthenticated() == false){
-            log.debug("当前用户2: {}", (IamUser)IamSecurityUtils.getCurrentUser());
+            log.debug("当前用户2-1: {}", (IamUser)IamSecurityUtils.getCurrentUser());
             IamAuthToken authToken = new IamAuthToken(cachedUserInfo);
             authToken.setAuthtoken(currentToken);
             authToken.setValidPassword(false);
             IamSecurityUtils.getSubject().login(authToken);
             log.debug("无状态token自动登录完成");
-            log.debug("当前用户3: {}", (IamUser)IamSecurityUtils.getCurrentUser());
+            log.debug("当前用户2-2: {}", (IamUser)IamSecurityUtils.getCurrentUser());
             log.debug("当前用户isAuthenticated: {}", IamSecurityUtils.getSubject().isAuthenticated());
+            log.debug("判断hasRole2: {}", IamSecurityUtils.getSubject().hasRole(Cons.ROLE_SUPER_ADMIN));
         }
         // 如果临近过期，则生成新的token返回
         TokenUtils.responseNewTokenIfRequired(response, currentToken, cachedUserInfo);
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java
index b6db2cad..3aa2a13d 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessSubjectFactory.java
@@ -32,7 +32,6 @@ public class StatelessSubjectFactory extends DefaultWebSubjectFactory {
     public Subject createSubject(SubjectContext context) {
         //不创建session
         context.setSessionCreationEnabled(false);
-        log.debug("SubjectContext禁用session.");
         return super.createSubject(context);
     }
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
index da965476..a2e490aa 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
@@ -206,7 +206,9 @@ public class IamAutoConfig {
     @Bean
     @ConditionalOnMissingBean
     public BaseCacheManager baseCacheManager(){
-        return new DynamicMemoryCacheManager(iamProperties.getTokenExpiresMinutes(), Cons.CACHE_TOKEN_USERINFO, Cons.CACHE_CAPTCHA);
+        return new DynamicMemoryCacheManager(iamProperties.getTokenExpiresMinutes(),
+                Cons.CACHE_TOKEN_USERINFO, Cons.CACHE_TOKEN_REFRESHTOKEN,
+                Cons.CACHE_CAPTCHA);
     }
 
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
index 71382380..641beb02 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
@@ -108,22 +108,6 @@ public class IamSecurityUtils extends SecurityUtils {
         TokenCacheHelper.removeAccessToken(accessToken);
     }
 
-    /**
-     * 从缓存中获取用户
-     * @param authtoken
-     * @return
-     */
-    public static BaseLoginUser getUserFromCache(String authtoken){
-        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
-        if(cacheManager == null || cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) == null){
-            log.warn("cacheManager 实例异常");
-            return null;
-        }
-        SimpleAuthenticationInfo authInfo = (SimpleAuthenticationInfo)cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(authtoken);
-        SimplePrincipalCollection principalCollection = (SimplePrincipalCollection) authInfo.getPrincipals();
-        return (BaseLoginUser) principalCollection.getPrimaryPrincipal();
-    }
-
     /**
      * 获取用户 "ID" 的值
      * @return
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
index b53aaf96..83101a4a 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
@@ -55,6 +55,11 @@ public class TokenCacheHelper {
     public static void removeAccessToken(String accessToken) {
         BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
         baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken);
+        String refreshToken = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
+        if(refreshToken != null){
+            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, refreshToken);
+        }
+        baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
     }
 
     /**
@@ -75,7 +80,12 @@ public class TokenCacheHelper {
     public static boolean isActiveAccessToken(String accessToken) {
         String userInfoStr = getCachedUserInfoStr(accessToken);
         if(V.isEmpty(userInfoStr)){
-            //TODO 判断是否为刷新token
+            // 判断是否为刷新token
+            if(TokenCacheHelper.isRefreshToken(accessToken)){
+                log.debug("刷新token已切换 : {}", accessToken);
+                return true;
+            }
+            return false;
         }
         CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
         if(isExpired(userInfoStr)){
@@ -102,6 +112,37 @@ public class TokenCacheHelper {
         return true;
     }
 
+    /**
+     * 获取刷新token
+     * @param currentToken
+     * @return
+     */
+    public static String getCachedRefreshToken(String currentToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        return baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, currentToken);
+    }
+
+    /**
+     * 缓存刷新token
+     * @param currentToken
+     * @param refreshToken
+     */
+    public static void cacheRefreshToken(String currentToken, String refreshToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, currentToken, refreshToken);
+        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, refreshToken, currentToken);
+    }
+
+    /**
+     * 判断是否为刷新token
+     * @param accessToken
+     * @return
+     */
+    private static boolean isRefreshToken(String accessToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        return baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken) != null;
+    }
+
     /**
      * 是否已过期
      * @param userInfoStr
@@ -133,17 +174,16 @@ public class TokenCacheHelper {
         String[] userFields = S.split(userInfoStr);
         AuthService authService = AuthServiceFactory.getAuthService(userFields[3]);
         int expiresInMinutes = authService.getExpiresInMinutes();
-        // 获取当前token的过期时间
-        long issuedAt = Long.parseLong(userFields[4]);
-        // 获取当前token的过期时间
-        long expiredBefore = issuedAt + expiresInMinutes * 60000;
         // 当前token是否临近过期
         long current = System.currentTimeMillis();
-        long takes = (current - issuedAt)/60000;
-        if(takes < expiresInMinutes){
-            if((takes / expiresInMinutes) > 3/4){
-                return true;
-            }
+        long expiration = System.currentTimeMillis() + expiresInMinutes*60000;
+        long remaining = expiration - current;
+        if(remaining > 0){
+            long issuedAt = Long.parseLong(userFields[4]);
+            long elapsed = current - issuedAt;
+            // 小于1/4 则更新
+            double past = (elapsed / remaining);
+            return past > 3.0;
         }
         return false;
     }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
index bab6fbee..782dd5ec 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
@@ -78,7 +78,11 @@ public class TokenUtils {
     public static void responseNewTokenIfRequired(ServletResponse response, String currentToken, String cachedUserInfo) {
         if(TokenCacheHelper.isCloseToExpired(cachedUserInfo)){
             //将刷新的token放入response header
-            String refreshToken = generateToken();
+            String refreshToken = TokenCacheHelper.getCachedRefreshToken(currentToken);
+            if(refreshToken == null){
+                refreshToken = generateToken();
+                TokenCacheHelper.cacheRefreshToken(currentToken, refreshToken);
+            }
             ((HttpServletResponse)response).setHeader(AUTH_HEADER, refreshToken);
             log.debug("写回刷新token :{}", refreshToken);
         }
-- 
Gitee


From b053c59fb671dd7a5aa4bc70137ddbebfa1ce7b4 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 28 Apr 2022 10:01:25 +0800
Subject: [PATCH 065/195] + add pinia-plugin-persist

---
 diboot-admin-ui/package.json       |  1 +
 diboot-admin-ui/pnpm-lock.yaml     | 20 ++++++++++++++++++++
 diboot-admin-ui/src/main.ts        |  3 ++-
 diboot-admin-ui/src/store/index.ts |  8 ++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 diboot-admin-ui/src/store/index.ts

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index ae387e92..3154f22a 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -16,6 +16,7 @@
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "pinia": "^2.0.13",
+    "pinia-plugin-persist": "^1.0.0",
     "qs": "^6.10.3",
     "vue": "^3.2.25",
     "vue-router": "^4.0.14",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 57be8638..673d0e02 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -21,6 +21,7 @@ specifiers:
   node-sass: ^7.0.1
   nprogress: ^0.2.0
   pinia: ^2.0.13
+  pinia-plugin-persist: ^1.0.0
   prettier: 2.6.2
   qs: ^6.10.3
   sass: ^1.50.1
@@ -46,6 +47,7 @@ dependencies:
   mockjs: registry.npmmirror.com/mockjs/1.1.0
   nprogress: registry.npmmirror.com/nprogress/0.2.0
   pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
+  pinia-plugin-persist: registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.13+vue@3.2.33
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
   vue-router: registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33
@@ -3520,6 +3522,24 @@ packages:
     engines: {node: '>=8.6'}
     dev: true
 
+  registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.13+vue@3.2.33:
+    resolution: {integrity: sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia-plugin-persist/-/pinia-plugin-persist-1.0.0.tgz}
+    id: registry.npmmirror.com/pinia-plugin-persist/1.0.0
+    name: pinia-plugin-persist
+    version: 1.0.0
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0
+      pinia: ^2.0.0
+      vue: ^2.0.0 || >=3.0.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+    dependencies:
+      pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
+      vue: registry.npmmirror.com/vue/3.2.33
+      vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
+    dev: false
+
   registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33:
     resolution: {integrity: sha512-B7rSqm1xNpwcPMnqns8/gVBfbbi7lWTByzS6aPZ4JOXSJD4Y531rZHDCoYWBwLyHY/8hWnXljgiXp6rRyrofcw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia/-/pinia-2.0.13.tgz}
     id: registry.npmmirror.com/pinia/2.0.13
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index 246ac44f..2982f515 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -1,9 +1,10 @@
 import App from './App.vue'
 import router from './router'
+import pinia from './store'
 
 const app = createApp(App)
 app.use(router)
-app.use(createPinia())
+app.use(pinia)
 app.mount('#app')
 
 import 'nprogress/nprogress.css'
diff --git a/diboot-admin-ui/src/store/index.ts b/diboot-admin-ui/src/store/index.ts
new file mode 100644
index 00000000..c1fd816d
--- /dev/null
+++ b/diboot-admin-ui/src/store/index.ts
@@ -0,0 +1,8 @@
+import piniaPersist from 'pinia-plugin-persist'
+
+const pinia = createPinia()
+
+// 持久化插件
+pinia.use(piniaPersist)
+
+export default pinia
-- 
Gitee


From 6f37ef2d3c584827d202a60c86c1e4b83542f22d Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 28 Apr 2022 14:37:27 +0800
Subject: [PATCH 066/195] =?UTF-8?q?*=20token=E6=9C=AC=E5=9C=B0=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E4=B8=8E=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/cache/BindingCacheManager.java    |  3 +-
 .../core/cache/BaseMemoryCacheManager.java    | 16 +++-
 .../core/cache/DynamicMemoryCacheManager.java | 24 ++++--
 .../iam/auth/impl/BaseAuthServiceImpl.java    |  3 +-
 .../main/java/com/diboot/iam/config/Cons.java |  4 +
 .../com/diboot/iam/shiro/IamAuthToken.java    |  5 +-
 .../shiro/StatelessAccessControlFilter.java   |  2 +-
 .../com/diboot/iam/starter/IamAutoConfig.java |  4 +-
 .../iam/starter/IamRedisAutoConfig.java       | 11 +++
 .../com/diboot/iam/util/IamSecurityUtils.java |  2 +-
 .../com/diboot/iam/util/TokenCacheHelper.java | 78 ++++++++++++++-----
 .../java/com/diboot/iam/util/TokenUtils.java  | 11 ++-
 12 files changed, 122 insertions(+), 41 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index 80663e4e..ac3553eb 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.diboot.core.binding.parser.EntityInfoCache;
 import com.diboot.core.binding.parser.PropInfo;
 import com.diboot.core.cache.StaticMemoryCacheManager;
+import com.diboot.core.config.Cons;
 import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.S;
@@ -263,7 +264,7 @@ public class BindingCacheManager {
      * @return
      */
     public static List<Field> getFields(Class<?> beanClazz, Class<? extends Annotation> annotation){
-        String key = S.join(beanClazz.getName(), annotation.getName());
+        String key = S.joinWith(Cons.SEPARATOR_COMMA, beanClazz.getName(), annotation.getName());
         List<Field> fields = getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, key, List.class);
         if(fields == null){
             fields = initClassFields(beanClazz, annotation);
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
index 75236599..2f9744de 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
@@ -1,5 +1,6 @@
 package com.diboot.core.cache;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.support.SimpleCacheManager;
@@ -11,6 +12,7 @@ import org.springframework.cache.support.SimpleCacheManager;
  * @date 2021/4/17
  * Copyright © diboot.com
  */
+@Slf4j
 public abstract class BaseMemoryCacheManager extends SimpleCacheManager implements BaseCacheManager{
 
     /**
@@ -21,7 +23,11 @@ public abstract class BaseMemoryCacheManager extends SimpleCacheManager implemen
      */
     public <T> T getCacheObj(String cacheName, Object objKey, Class<T> tClass){
         Cache cache = getCache(cacheName);
-        return cache != null? cache.get(objKey, tClass) : null;
+        T value = cache != null? cache.get(objKey, tClass) : null;
+        if(log.isTraceEnabled()){
+            log.trace("从缓存读取: {}.{} = {}", cacheName, objKey, value);
+        }
+        return value;
     }
 
     /**
@@ -42,6 +48,10 @@ public abstract class BaseMemoryCacheManager extends SimpleCacheManager implemen
     public void putCacheObj(String cacheName, Object objKey, Object obj){
         Cache cache = getCache(cacheName);
         cache.put(objKey, obj);
+        if(log.isDebugEnabled()){
+            ConcurrentMapCache mapCache = (ConcurrentMapCache)cache;
+            log.debug("缓存: {} 新增-> {} , 当前size={}", cacheName, objKey, mapCache.getNativeCache().size());
+        }
     }
 
     /**
@@ -52,6 +62,10 @@ public abstract class BaseMemoryCacheManager extends SimpleCacheManager implemen
     public void removeCacheObj(String cacheName, Object objKey){
         Cache cache = getCache(cacheName);
         cache.evict(objKey);
+        if(log.isDebugEnabled()){
+            ConcurrentMapCache mapCache = (ConcurrentMapCache)cache;
+            log.debug("缓存删除: {}.{} , 当前size={}", cacheName, objKey, mapCache.getNativeCache().size());
+        }
     }
 
     /**
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
index e996589a..3186b1e0 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
@@ -1,5 +1,7 @@
 package com.diboot.core.cache;
 
+import com.diboot.core.util.V;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 
@@ -15,6 +17,7 @@ import java.util.concurrent.ConcurrentMap;
  * @date 2021/4/17
  * Copyright © diboot.com
  */
+@Slf4j
 public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements BaseCacheManager{
 
     public DynamicMemoryCacheManager(String... cacheNames){
@@ -29,22 +32,23 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
     /**
      * cache的时间戳缓存
      */
-    private ConcurrentHashMap<String, Integer> CACHE_EXPIREDMINUTES_CACHE = null;
+    private ConcurrentHashMap<String, Integer> CACHE_EXPIREDMINUTES_CACHE = new ConcurrentHashMap<>();
 
     /**
      * cache的时间戳缓存
      */
-    private ConcurrentHashMap<String, ConcurrentHashMap<Object, Long>> CACHE_TIMESTAMP_CACHE = null;
+    private ConcurrentHashMap<String, ConcurrentHashMap<Object, Long>> CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
 
     public DynamicMemoryCacheManager(){
-        this.CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
-        this.CACHE_EXPIREDMINUTES_CACHE = new ConcurrentHashMap<>();
         super.afterPropertiesSet();
     }
 
+    /**
+     * 统一过期时间
+     * @param expiredMinutes
+     * @param cacheNames
+     */
     public DynamicMemoryCacheManager(int expiredMinutes, String... cacheNames){
-        this.CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
-        this.CACHE_EXPIREDMINUTES_CACHE = new ConcurrentHashMap<>();
         List<Cache> caches = new ArrayList<>(cacheNames.length);
         for(String cacheName : cacheNames){
             caches.add(new ConcurrentMapCache(cacheName));
@@ -68,6 +72,9 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
         // 已过期，则清空缓存返回null
         if(isExpired(cacheName, objKey)){
             cache.evict(objKey);
+            if(log.isDebugEnabled()){
+                log.debug("缓存已过期被清理: {}.{}", cacheName, objKey);
+            }
             return null;
         }
         return cache.get(objKey, tClass);
@@ -94,6 +101,9 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
         this.putCacheObj(cacheName, objKey, obj);
         if(!this.CACHE_EXPIREDMINUTES_CACHE.containsKey(cacheName)){
             this.CACHE_EXPIREDMINUTES_CACHE.put(cacheName, expireMinutes);
+            if(log.isDebugEnabled()){
+                log.debug("设置缓存过期时间: {}={}", cacheName, expireMinutes);
+            }
         }
     }
 
@@ -106,7 +116,7 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
      */
     public boolean isExpired(String cacheName, Object objKey) {
         ConcurrentMap<Object, Long> timestampCache = CACHE_TIMESTAMP_CACHE.get(cacheName);
-        if(timestampCache == null){
+        if(V.isEmpty(timestampCache)){
             return false;
         }
         Long cacheTimestamp = timestampCache.get(objKey);
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
index 522e6f4a..eb5a23d7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
@@ -88,7 +88,7 @@ public abstract class BaseAuthServiceImpl implements AuthService {
             if (subject.isAuthenticated()) {
                 String accessToken = (String) authToken.getCredentials();
                 // 缓存当前token与用户信息
-                TokenCacheHelper.cacheAccessToken(accessToken, authToken.buildUserInfoStr(), getExpiresInMinutes());
+                TokenCacheHelper.cacheAccessToken(accessToken, authToken.buildUserInfoStr(), authToken.getExpiresInMinutes());
                 log.debug("申请token成功！authtoken={}", authToken.getCredentials());
                 saveLoginTrace(authToken, true);
                 // 返回
@@ -119,6 +119,7 @@ public abstract class BaseAuthServiceImpl implements AuthService {
         token.setRememberMe(credential.isRememberMe());
         token.setTenantId(credential.getTenantId());
         token.setExtObj(credential.getExtObj());
+        token.setExpiresInMinutes(getExpiresInMinutes());
         // 生成token
         return token.generateAuthtoken();
     }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
index cc3eafad..b4cf8f7b 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
@@ -134,5 +134,9 @@ public class Cons extends com.diboot.core.config.Cons {
      * token-刷新token 缓存
      */
     public static final String CACHE_TOKEN_REFRESHTOKEN = "TOKEN_REFRESHTOKEN";
+    /**
+     * 刷新token-前token 缓存
+     */
+    public static final String CACHE_REFRESHTOKEN_TOKEN = "REFRESHTOKEN_TOKEN";
 
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java
index fbe78b35..50e46cb8 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthToken.java
@@ -81,6 +81,8 @@ public class IamAuthToken implements RememberMeAuthenticationToken {
 
     private Object credentials;
 
+    private int expiresInMinutes;
+
     public IamAuthToken(){
     }
 
@@ -107,6 +109,7 @@ public class IamAuthToken implements RememberMeAuthenticationToken {
             }
         }
         this.authType = fields[3];
+        this.expiresInMinutes = Integer.parseInt(fields[4]);
     }
 
     /***
@@ -158,6 +161,6 @@ public class IamAuthToken implements RememberMeAuthenticationToken {
      */
     public String buildUserInfoStr(){
         return S.joinWith(Cons.SEPARATOR_COMMA,
-                this.getTenantId(), this.getAuthAccount(), this.getUserTypeClass().getName(), this.getAuthType(), System.currentTimeMillis());
+                this.getTenantId(), this.getAuthAccount(), this.getUserTypeClass().getName(), this.getAuthType(), this.expiresInMinutes, System.currentTimeMillis());
     }
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
index 7847f485..f1e82a58 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -75,7 +75,7 @@ public class StatelessAccessControlFilter extends BasicHttpAuthenticationFilter
         log.debug("当前用户1 getSubject: {}", IamSecurityUtils.getSubject());
         log.debug("判断hasRole1: {}", IamSecurityUtils.getSubject().hasRole(Cons.ROLE_SUPER_ADMIN));
         String cachedUserInfo = TokenCacheHelper.getCachedUserInfoStr(currentToken);
-        if(IamSecurityUtils.getSubject().isAuthenticated() == false){
+        if(IamSecurityUtils.getSubject().isAuthenticated() == false && cachedUserInfo != null){
             log.debug("当前用户2-1: {}", (IamUser)IamSecurityUtils.getCurrentUser());
             IamAuthToken authToken = new IamAuthToken(cachedUserInfo);
             authToken.setAuthtoken(currentToken);
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
index a2e490aa..a21e96d0 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
@@ -207,7 +207,9 @@ public class IamAutoConfig {
     @ConditionalOnMissingBean
     public BaseCacheManager baseCacheManager(){
         return new DynamicMemoryCacheManager(iamProperties.getTokenExpiresMinutes(),
-                Cons.CACHE_TOKEN_USERINFO, Cons.CACHE_TOKEN_REFRESHTOKEN,
+                Cons.CACHE_TOKEN_USERINFO,
+                Cons.CACHE_TOKEN_REFRESHTOKEN,
+                Cons.CACHE_REFRESHTOKEN_TOKEN,
                 Cons.CACHE_CAPTCHA);
     }
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
index 877520b2..31fc9179 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
@@ -17,6 +17,7 @@ package com.diboot.iam.starter;
 
 import com.diboot.core.cache.BaseCacheManager;
 import com.diboot.core.cache.DynamicRedisCacheManager;
+import com.diboot.iam.config.Cons;
 import com.diboot.iam.redis.ShiroRedisCacheManager;
 import org.apache.shiro.cache.CacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 
 import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Shiro の Redis 缓存自动配置
@@ -82,11 +85,19 @@ public class IamRedisAutoConfig {
                             .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer()))
                             .disableCachingNullValues()
                             .entryTtl(Duration.ofMinutes(iamProperties.getTokenExpiresMinutes()));
+        Set<String> cacheNames = new HashSet<String>(){{
+                add(Cons.CACHE_TOKEN_USERINFO);
+                add(Cons.CACHE_TOKEN_REFRESHTOKEN);
+                add(Cons.CACHE_REFRESHTOKEN_TOKEN);
+                add(Cons.CACHE_CAPTCHA);
+        }};
+
         // 初始化redisCacheManager
         RedisCacheManager redisCacheManager =
                 RedisCacheManager.RedisCacheManagerBuilder
                         .fromConnectionFactory(redisTemplate.getConnectionFactory())
                         .cacheDefaults(defaultCacheConfiguration)
+                        .initialCacheNames(cacheNames)
                         .transactionAware()
                         .build();
         return new DynamicRedisCacheManager(redisCacheManager);
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
index 641beb02..ebd799d7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
@@ -105,7 +105,7 @@ public class IamSecurityUtils extends SecurityUtils {
         if(cacheManager != null && cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
             cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).remove(accessToken);
         }
-        TokenCacheHelper.removeAccessToken(accessToken);
+        TokenCacheHelper.removeAccessTokens(accessToken);
     }
 
     /**
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
index 83101a4a..4c80089c 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
@@ -19,13 +19,9 @@ import com.diboot.core.cache.BaseCacheManager;
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
-import com.diboot.iam.auth.AuthService;
-import com.diboot.iam.auth.AuthServiceFactory;
 import com.diboot.iam.config.Cons;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.cache.CacheManager;
-import org.springframework.util.Assert;
 
 /**
  * token缓存相关辅助类
@@ -37,11 +33,15 @@ import org.springframework.util.Assert;
 @Slf4j
 public class TokenCacheHelper {
 
+    /**
+     * 刷新token存储的过期时间
+     */
+    public static int REFRESH_TOKEN_EXPIRES_MINUTES = (TokenUtils.EXPIRES_IN_MINUTES / 4);
+
     /**
      * 缓存新的token
      * @param accessToken
      * @param userInfoStr
-     * @param expiresInMinutes
      */
     public static void cacheAccessToken(String accessToken, String userInfoStr, int expiresInMinutes) {
         BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
@@ -49,15 +49,37 @@ public class TokenCacheHelper {
     }
 
     /**
-     * 移除失效的token
+     * 移除失效的旧token
+     * @param newToken
+     */
+    public static void updateUserInfoCacheAndRemovePreviousToken(String newToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        String previousToken = baseCacheManager.getCacheString(Cons.CACHE_REFRESHTOKEN_TOKEN, newToken);
+        if(previousToken != null){
+            String cachedUserInfoStr = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, previousToken);
+            if(cachedUserInfoStr != null){
+                String prefixTemp = S.substringBeforeLast(cachedUserInfoStr, Cons.SEPARATOR_COMMA);
+                int expiresMinutes = Integer.parseInt(S.substringAfterLast(prefixTemp, Cons.SEPARATOR_COMMA));
+                //如果是刷新token则更新颁发时间
+                cachedUserInfoStr = prefixTemp + Cons.SEPARATOR_COMMA + System.currentTimeMillis();
+                cacheAccessToken(newToken, cachedUserInfoStr, expiresMinutes);
+            }
+            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, previousToken);
+            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, previousToken);
+        }
+    }
+
+    /**
+     * 退出时移除失效的全部token
      * @param accessToken
      */
-    public static void removeAccessToken(String accessToken) {
+    public static void removeAccessTokens(String accessToken) {
         BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
         baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken);
         String refreshToken = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
         if(refreshToken != null){
-            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, refreshToken);
+            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, refreshToken);
+            baseCacheManager.removeCacheObj(Cons.CACHE_REFRESHTOKEN_TOKEN, refreshToken);
         }
         baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
     }
@@ -69,7 +91,18 @@ public class TokenCacheHelper {
      */
     public static String getCachedUserInfoStr(String accessToken) {
         BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        return baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, accessToken);
+        String cachedUserInfoStr = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, accessToken);
+        if(cachedUserInfoStr == null && isRefreshToken(accessToken)){
+            String previousToken = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
+            if(previousToken != null){
+                cachedUserInfoStr = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, previousToken);
+                //如果是刷新token则更新颁发时间
+                if(cachedUserInfoStr != null){
+                    cachedUserInfoStr = S.substringBeforeLast(cachedUserInfoStr, Cons.SEPARATOR_COMMA) + System.currentTimeMillis();
+                }
+            }
+        }
+        return cachedUserInfoStr;
     }
 
     /**
@@ -82,9 +115,13 @@ public class TokenCacheHelper {
         if(V.isEmpty(userInfoStr)){
             // 判断是否为刷新token
             if(TokenCacheHelper.isRefreshToken(accessToken)){
-                log.debug("刷新token已切换 : {}", accessToken);
+                TokenCacheHelper.updateUserInfoCacheAndRemovePreviousToken(accessToken);
+                log.debug("请求已切换为刷新token : {}", accessToken);
                 return true;
             }
+            else{
+                log.debug("非刷新token: {}", accessToken);
+            }
             return false;
         }
         CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
@@ -127,10 +164,11 @@ public class TokenCacheHelper {
      * @param currentToken
      * @param refreshToken
      */
-    public static void cacheRefreshToken(String currentToken, String refreshToken) {
+    public synchronized static void cacheRefreshToken(String currentToken, String refreshToken) {
         BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, currentToken, refreshToken);
-        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, refreshToken, currentToken);
+        // 缓存双向的token，便于后面的请求中识别refreshToken
+        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, currentToken, refreshToken, REFRESH_TOKEN_EXPIRES_MINUTES);
+        baseCacheManager.putCacheObj(Cons.CACHE_REFRESHTOKEN_TOKEN, refreshToken, currentToken, REFRESH_TOKEN_EXPIRES_MINUTES);
     }
 
     /**
@@ -140,7 +178,7 @@ public class TokenCacheHelper {
      */
     private static boolean isRefreshToken(String accessToken) {
         BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        return baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken) != null;
+        return baseCacheManager.getCacheString(Cons.CACHE_REFRESHTOKEN_TOKEN, accessToken) != null;
     }
 
     /**
@@ -153,10 +191,9 @@ public class TokenCacheHelper {
             return false;
         }
         String[] userFields = S.split(userInfoStr);
-        AuthService authService = AuthServiceFactory.getAuthService(userFields[3]);
-        int expiresInMinutes = authService.getExpiresInMinutes();
+        int expiresInMinutes = Integer.parseInt(userFields[4]);
         // 获取当前token的过期时间
-        long issuedAt = Long.parseLong(userFields[4]);
+        long issuedAt = Long.parseLong(userFields[5]);
         // 获取当前token的过期时间
         long expiredBefore = issuedAt + expiresInMinutes * 60000;
         return System.currentTimeMillis() > expiredBefore;
@@ -172,14 +209,13 @@ public class TokenCacheHelper {
             return false;
         }
         String[] userFields = S.split(userInfoStr);
-        AuthService authService = AuthServiceFactory.getAuthService(userFields[3]);
-        int expiresInMinutes = authService.getExpiresInMinutes();
+        int expiresInMinutes = Integer.parseInt(userFields[4]);
         // 当前token是否临近过期
         long current = System.currentTimeMillis();
-        long expiration = System.currentTimeMillis() + expiresInMinutes*60000;
+        long issuedAt = Long.parseLong(userFields[5]);
+        long expiration = issuedAt + expiresInMinutes*60000;
         long remaining = expiration - current;
         if(remaining > 0){
-            long issuedAt = Long.parseLong(userFields[4]);
             long elapsed = current - issuedAt;
             // 小于1/4 则更新
             double past = (elapsed / remaining);
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
index 782dd5ec..3be69d34 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
@@ -18,6 +18,7 @@ package com.diboot.iam.util;
 import com.diboot.core.config.BaseConfig;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
+import com.diboot.iam.config.Cons;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,7 +35,6 @@ import javax.servlet.http.HttpServletResponse;
 public class TokenUtils {
     private static final Logger log = LoggerFactory.getLogger(TokenUtils.class);
 
-    private static final String TOKEN_PREFIX = "Bearer ";
     private static final String AUTH_HEADER = getConfigValue("diboot.iam.token-header-key", "authtoken");
     public static final int EXPIRES_IN_MINUTES = getConfigIntValue("diboot.iam.token-expires-minutes", 60);
 
@@ -46,10 +46,10 @@ public class TokenUtils {
     public static String getRequestToken(HttpServletRequest request) {
         String authtoken = request.getHeader(AUTH_HEADER);
         if(authtoken != null){
-            authtoken = authtoken.trim();
-            if(authtoken.startsWith(TOKEN_PREFIX)){
-                authtoken = authtoken.substring(TOKEN_PREFIX.length());
+            if(authtoken.startsWith(Cons.TOKEN_PREFIX_BEARER)){
+                authtoken = authtoken.substring(Cons.TOKEN_PREFIX_BEARER.length());
             }
+            authtoken = authtoken.trim();
         }
         if(V.isEmpty(authtoken)){
             log.warn("请求未指定token: {}", authtoken);
@@ -75,7 +75,7 @@ public class TokenUtils {
      * @param currentToken
      * @return
      */
-    public static void responseNewTokenIfRequired(ServletResponse response, String currentToken, String cachedUserInfo) {
+    public static synchronized void responseNewTokenIfRequired(ServletResponse response, String currentToken, String cachedUserInfo) {
         if(TokenCacheHelper.isCloseToExpired(cachedUserInfo)){
             //将刷新的token放入response header
             String refreshToken = TokenCacheHelper.getCachedRefreshToken(currentToken);
@@ -106,5 +106,4 @@ public class TokenUtils {
         return value != null? Integer.parseInt(value) : defaultValue;
     }
 
-
 }
-- 
Gitee


From dac674dd8a09295b6e9ecbf52e35204892eeb1c5 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 28 Apr 2022 16:21:04 +0800
Subject: [PATCH 067/195] =?UTF-8?q?*=20token=20redis=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E4=B8=8E=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/cache/DynamicRedisCacheManager.java  | 29 ++++++++++++---
 .../diboot/core/cache/BaseCacheManager.java   | 20 +++++++++++
 .../core/cache/BaseMemoryCacheManager.java    | 15 ++++++++
 .../core/cache/DynamicMemoryCacheManager.java | 36 +++++++++++++++++++
 .../core/cache/StaticMemoryCacheManager.java  | 20 +++++++++++
 .../shiro/StatelessAccessControlFilter.java   | 15 ++------
 .../com/diboot/iam/starter/IamAutoConfig.java |  1 +
 .../iam/starter/IamRedisAutoConfig.java       |  5 ++-
 8 files changed, 124 insertions(+), 17 deletions(-)

diff --git a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
index 6907a7bc..2c39e300 100644
--- a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
+++ b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
@@ -1,16 +1,33 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.diboot.core.cache;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.Cache;
-import org.springframework.data.redis.cache.RedisCache;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 
 /**
  * 动态数据Redis缓存
  * @author JerryMa
- * @version v2.2.1
- * @date 2021/4/17
+ * @version v2.6.0
+ * @date 2022/4/17
  * Copyright © diboot.com
  */
+@Slf4j
 public class DynamicRedisCacheManager implements BaseCacheManager{
 
     private RedisCacheManager redisCacheManager;
@@ -37,7 +54,7 @@ public class DynamicRedisCacheManager implements BaseCacheManager{
     }
 
     public void putCacheObj(String cacheName, Object objKey, Object obj, int expireMinutes) {
-        //TODO 支持按cache的不同过期时间
+        // 暂不支持redis按cache设置不同过期时间
         this.putCacheObj(cacheName, objKey, obj);
     }
 
@@ -52,4 +69,8 @@ public class DynamicRedisCacheManager implements BaseCacheManager{
         return false;
     }
 
+    @Override
+    public void clearAllOutOfDateData() {
+    }
+
 }
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
index 0edb0da5..083d2e0e 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.diboot.core.cache;
 
 import lombok.extern.slf4j.Slf4j;
@@ -61,4 +76,9 @@ public interface BaseCacheManager {
      */
     boolean isUninitializedCache(String cacheName);
 
+    /**
+     * 清理所有过期的数据：系统空闲时调用
+     */
+    void clearAllOutOfDateData();
+
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
index 2f9744de..e0a544f0 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseMemoryCacheManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.diboot.core.cache;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
index 3186b1e0..b2cdd114 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.diboot.core.cache;
 
 import com.diboot.core.util.V;
@@ -7,6 +22,7 @@ import org.springframework.cache.concurrent.ConcurrentMapCache;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -107,6 +123,26 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
         }
     }
 
+    @Override
+    public synchronized void clearAllOutOfDateData() {
+        for(String cacheName : this.getCacheNames()){
+            Cache cache = getCache(cacheName);
+            ConcurrentMap<Object, Object> cacheMap = (ConcurrentMap<Object, Object>)cache.getNativeCache();
+            if(V.isEmpty(cacheMap)){
+                continue;
+            }
+            for(Map.Entry<Object, Object> entry : cacheMap.entrySet()){
+                // 已过期，则清空缓存返回null
+                if(isExpired(cacheName, entry.getKey())){
+                    cache.evict(entry.getKey());
+                    if(log.isDebugEnabled()){
+                        log.debug("统一清理已过期的缓存: {}.{}", cacheName, entry.getKey());
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * 数据是否过期
      * @param cacheName 缓存名字
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
index 263bd045..6861fa9d 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
@@ -1,5 +1,21 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.diboot.core.cache;
 
+import com.diboot.core.exception.InvalidUsageException;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 
@@ -24,4 +40,8 @@ public class StaticMemoryCacheManager extends BaseMemoryCacheManager implements
         super.afterPropertiesSet();
     }
 
+    @Override
+    public void clearAllOutOfDateData() {
+        throw new InvalidUsageException("StaticMemoryCacheManager 缓存不存在过期，不支持清理！");
+    }
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
index f1e82a58..34416659 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -66,30 +66,21 @@ public class StatelessAccessControlFilter extends BasicHttpAuthenticationFilter
         // 从header获取Token
         String currentToken = TokenUtils.getRequestToken(httpRequest);
         if (V.isEmpty(currentToken)) {
-            log.debug("Token验证失败！url=" + httpRequest.getRequestURL());
+            log.debug("Token验证失败！uri={}", httpRequest.getRequestURI());
             return false;
         }
-        log.debug("Token验证成功！currentToken={}", currentToken);
-        // 构建登陆的token
-        log.debug("当前用户1: {}", (IamUser)IamSecurityUtils.getCurrentUser());
-        log.debug("当前用户1 getSubject: {}", IamSecurityUtils.getSubject());
-        log.debug("判断hasRole1: {}", IamSecurityUtils.getSubject().hasRole(Cons.ROLE_SUPER_ADMIN));
+        log.debug("Token验证成功！token={}, uri={}", currentToken, httpRequest.getRequestURI());
         String cachedUserInfo = TokenCacheHelper.getCachedUserInfoStr(currentToken);
         if(IamSecurityUtils.getSubject().isAuthenticated() == false && cachedUserInfo != null){
-            log.debug("当前用户2-1: {}", (IamUser)IamSecurityUtils.getCurrentUser());
             IamAuthToken authToken = new IamAuthToken(cachedUserInfo);
             authToken.setAuthtoken(currentToken);
             authToken.setValidPassword(false);
             IamSecurityUtils.getSubject().login(authToken);
-            log.debug("无状态token自动登录完成");
-            log.debug("当前用户2-2: {}", (IamUser)IamSecurityUtils.getCurrentUser());
-            log.debug("当前用户isAuthenticated: {}", IamSecurityUtils.getSubject().isAuthenticated());
-            log.debug("判断hasRole2: {}", IamSecurityUtils.getSubject().hasRole(Cons.ROLE_SUPER_ADMIN));
+            log.debug("Token验证成功！token={}", currentToken);
         }
         // 如果临近过期，则生成新的token返回
         TokenUtils.responseNewTokenIfRequired(response, currentToken, cachedUserInfo);
         return true;
-
     }
 
     /**
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
index a21e96d0..f166aa4e 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
@@ -206,6 +206,7 @@ public class IamAutoConfig {
     @Bean
     @ConditionalOnMissingBean
     public BaseCacheManager baseCacheManager(){
+        log.info("初始化IAM本地缓存: DynamicMemoryCacheManager");
         return new DynamicMemoryCacheManager(iamProperties.getTokenExpiresMinutes(),
                 Cons.CACHE_TOKEN_USERINFO,
                 Cons.CACHE_TOKEN_REFRESHTOKEN,
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
index 31fc9179..e74aa972 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
@@ -19,6 +19,7 @@ import com.diboot.core.cache.BaseCacheManager;
 import com.diboot.core.cache.DynamicRedisCacheManager;
 import com.diboot.iam.config.Cons;
 import com.diboot.iam.redis.ShiroRedisCacheManager;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.cache.CacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -47,6 +48,7 @@ import java.util.Set;
  * @date 2021/7/20
  * Copyright © diboot.com
  */
+@Slf4j
 @Order(921)
 @Configuration
 @ConditionalOnBean(RedisTemplate.class)
@@ -68,6 +70,7 @@ public class IamRedisAutoConfig {
      @Bean(name = "shiroCacheManager")
      @ConditionalOnMissingBean(CacheManager.class)
      public CacheManager shiroCacheManager(RedisTemplate<String, Object> redisTemplate) {
+         log.info("初始化shiro缓存: ShiroRedisCacheManager");
         return new ShiroRedisCacheManager(redisTemplate, iamProperties.getJwtTokenExpiresMinutes());
      }
 
@@ -83,7 +86,6 @@ public class IamRedisAutoConfig {
                         .defaultCacheConfig()
                             .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getStringSerializer()))
                             .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer()))
-                            .disableCachingNullValues()
                             .entryTtl(Duration.ofMinutes(iamProperties.getTokenExpiresMinutes()));
         Set<String> cacheNames = new HashSet<String>(){{
                 add(Cons.CACHE_TOKEN_USERINFO);
@@ -100,6 +102,7 @@ public class IamRedisAutoConfig {
                         .initialCacheNames(cacheNames)
                         .transactionAware()
                         .build();
+        log.info("初始化IAM缓存: DynamicRedisCacheManager");
         return new DynamicRedisCacheManager(redisCacheManager);
     }
 
-- 
Gitee


From 6da41a1ad647e9be940730eb459c5f45298abfa0 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 28 Apr 2022 16:30:31 +0800
Subject: [PATCH 068/195] * opt Dynamic bind usedVisibleHeight

---
 diboot-admin-ui/src/layout/main/index.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/diboot-admin-ui/src/layout/main/index.vue b/diboot-admin-ui/src/layout/main/index.vue
index 18d7b218..a0e71992 100644
--- a/diboot-admin-ui/src/layout/main/index.vue
+++ b/diboot-admin-ui/src/layout/main/index.vue
@@ -27,13 +27,13 @@ const layoutUsedHeight = computed(
   //             是否全屏                                      (全屏包含 Tabs )  (未开启全屏 header + tabs)  padding
   () => (props.fullScreen ? (props.fullScreen === true ? 0 : tabsHeight.value) : 50 + tabsHeight.value) + 20
 )
-// 计算已占可视高度
-const usedVisibleHeight = (route: RouteLocationNormalized) =>
-  // 布局已用高度    +  bounded-padding
-  layoutUsedHeight.value + (route.meta.hollow ? 0 : 20)
-
-// footer 插槽是否存在内容
-const slotFooter = !!useSlots().footer
+// 为需要已占可视高度的组件bind usedVisibleHeight
+const bindUsedVisibleHeight = (component: any, route: RouteLocationNormalized) => {
+  if (component.type?.props?.usedVisibleHeight)
+    //                                 布局已用高度    +  bounded-padding
+    return { usedVisibleHeight: layoutUsedHeight.value + (route.meta.hollow ? 0 : 20) }
+  else return {}
+}
 
 // footer
 const footerRef = ref<HTMLElement>()
@@ -49,9 +49,9 @@ const viewTabsStore = useViewTabsStore()
         <keep-alive :include="viewTabsStore.cachedViews">
           <div :key="route.fullPath" class="content">
             <div :class="route.meta.hollow ? 'hollow' : 'bounded'">
-              <component :is="Component" :used-visible-height="usedVisibleHeight(route)" />
+              <component :is="Component" v-bind="bindUsedVisibleHeight(Component, route)" />
             </div>
-            <div v-if="slotFooter && !route.meta.hideFooter" ref="footerRef" class="footer">
+            <div v-if="appStore.enableFooter && $slots.footer && !route.meta.hideFooter" ref="footerRef" class="footer">
               <slot name="footer" />
             </div>
           </div>
-- 
Gitee


From 3ef583457d0db09b854013c67f1ae4b955ac007d Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 28 Apr 2022 16:33:24 +0800
Subject: [PATCH 069/195] * opt viewTabs collect

---
 diboot-admin-ui/src/layout/tabs/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index 4ef9118c..245e96f7 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -17,6 +17,7 @@ const showButtons = ref(false) // computed(() => (tabsRef.value?.clientWidth ??
 // 刷新按钮
 const refreshButton = () =>
   nextTick(() => (showButtons.value = (tabsRef.value?.clientWidth ?? 0) < (tabsRef.value?.scrollWidth ?? 0)))
+onMounted(() => refreshButton())
 
 // tabs 位置
 const tabsPosition = ref(0)
@@ -61,13 +62,16 @@ watch(
         },
         { immediate: true }
       )
-    } else {
-      collectTabs()
+    } else if (collectTabs) {
+      collectTabs() // 关闭监听
       viewTabsStore.tabList = []
     }
   },
   { immediate: true }
 )
+onUnmounted(() => {
+  appStore.enableTabs && viewTabsStore.tabList.splice(viewTabsStore.tabList.length - 1)
+})
 
 // 右键菜单
 const menu = reactive<{ route?: RouteLocationNormalized; locator?: any }>({ route })
-- 
Gitee


From 7abd55943c5d5d46e085e80bff027ae5d844cda5 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 28 Apr 2022 18:21:33 +0800
Subject: [PATCH 070/195] * remove unused imports

---
 .../java/com/diboot/core/cache/DynamicRedisCacheManager.java | 1 -
 .../main/java/com/diboot/core/cache/BaseCacheManager.java    | 5 -----
 .../com/diboot/iam/shiro/StatelessAccessControlFilter.java   | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
index 2c39e300..c050f9e7 100644
--- a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
+++ b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
@@ -17,7 +17,6 @@ package com.diboot.core.cache;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.Cache;
-import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 
 /**
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
index 083d2e0e..c0d04c0e 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
@@ -15,11 +15,6 @@
  */
 package com.diboot.core.cache;
 
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.Cache;
-import org.springframework.cache.concurrent.ConcurrentMapCache;
-import org.springframework.cache.support.SimpleCacheManager;
-
 /**
  * 缓存manager父类
  * @author JerryMa
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
index 34416659..241070f0 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -20,11 +20,7 @@ import com.diboot.core.util.JSON;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.JsonResult;
 import com.diboot.core.vo.Status;
-import com.diboot.iam.auth.AuthService;
-import com.diboot.iam.auth.AuthServiceFactory;
 import com.diboot.iam.config.Cons;
-import com.diboot.iam.entity.BaseLoginUser;
-import com.diboot.iam.entity.IamUser;
 import com.diboot.iam.util.IamSecurityUtils;
 import com.diboot.iam.util.TokenCacheHelper;
 import com.diboot.iam.util.TokenUtils;
-- 
Gitee


From 318951dcfd32488215591b102ecfc95ba6dc4afc Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 28 Apr 2022 18:52:49 +0800
Subject: [PATCH 071/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96WxAuthServiceImpl?=
 =?UTF-8?q?=E7=BB=A7=E6=89=BF=E4=BB=A5=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shiro/StatelessAccessControlFilter.java   | 13 ---
 .../mobile/auth/impl/WxAuthServiceImpl.java   | 93 ++-----------------
 2 files changed, 6 insertions(+), 100 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
index 241070f0..18283aee 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -15,7 +15,6 @@
  */
 package com.diboot.iam.shiro;
 
-import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.JSON;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.JsonResult;
@@ -25,7 +24,6 @@ import com.diboot.iam.util.IamSecurityUtils;
 import com.diboot.iam.util.TokenCacheHelper;
 import com.diboot.iam.util.TokenUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -113,15 +111,4 @@ public class StatelessAccessControlFilter extends BasicHttpAuthenticationFilter
         }
     }
 
-    private Object getUserInfoFromCache(String currentToken){
-        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
-        if(cacheManager != null){
-            if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
-                Object cacheVal = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(currentToken);
-                return cacheVal;
-            }
-        }
-        return null;
-    }
-
 }
diff --git a/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java b/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java
index 6f1d6a9b..11ddd32e 100644
--- a/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java
+++ b/diboot-mobile-starter/src/main/java/com/diboot/mobile/auth/impl/WxAuthServiceImpl.java
@@ -15,30 +15,17 @@
  */
 package com.diboot.mobile.auth.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.diboot.core.exception.BusinessException;
-import com.diboot.core.vo.Status;
-import com.diboot.iam.auth.AuthService;
+import com.diboot.iam.auth.impl.BaseAuthServiceImpl;
 import com.diboot.iam.config.Cons;
 import com.diboot.iam.dto.AuthCredential;
-import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.entity.IamAccount;
-import com.diboot.iam.entity.IamLoginTrace;
-import com.diboot.iam.service.IamAccountService;
-import com.diboot.iam.service.IamLoginTraceService;
 import com.diboot.iam.shiro.IamAuthToken;
-import com.diboot.iam.util.HttpHelper;
-import com.diboot.iam.util.IamSecurityUtils;
 import com.diboot.mobile.dto.MobileCredential;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 微信认证实现
  *
@@ -49,16 +36,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @Slf4j
 @Service
-public class WxAuthServiceImpl implements AuthService {
-
-    @Autowired
-    private HttpServletRequest request;
-
-    @Autowired
-    private IamAccountService accountService;
-
-    @Autowired
-    private IamLoginTraceService iamLoginTraceService;
+public class WxAuthServiceImpl extends BaseAuthServiceImpl {
 
     @Override
     public String getAuthType() {
@@ -66,7 +44,7 @@ public class WxAuthServiceImpl implements AuthService {
     }
 
     @Override
-    public IamAccount getAccount(IamAuthToken iamAuthToken) throws AuthenticationException {
+    protected Wrapper buildQueryWrapper(IamAuthToken iamAuthToken) {
         // 查询最新的记录
         LambdaQueryWrapper<IamAccount> queryWrapper = new LambdaQueryWrapper<IamAccount>()
                 .select(IamAccount::getAuthAccount, IamAccount::getUserType, IamAccount::getUserId, IamAccount::getStatus)
@@ -74,41 +52,7 @@ public class WxAuthServiceImpl implements AuthService {
                 .eq(IamAccount::getAuthType, iamAuthToken.getAuthType())
                 .eq(IamAccount::getAuthAccount, iamAuthToken.getAuthAccount())
                 .orderByDesc(IamAccount::getId);
-        IamAccount latestAccount = accountService.getSingleEntity(queryWrapper);
-        if(latestAccount == null){
-            return null;
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.I.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已禁用! account="+iamAuthToken.getAuthAccount());
-        }
-        if (Cons.DICTCODE_ACCOUNT_STATUS.L.name().equals(latestAccount.getStatus())) {
-            throw new AuthenticationException("用户账号已锁定! account="+iamAuthToken.getAuthAccount());
-        }
-        return latestAccount;
-    }
-
-    @Override
-    public String applyToken(AuthCredential credential) {
-        IamAuthToken authToken = initAuthToken(credential);
-        try {
-            Subject subject = SecurityUtils.getSubject();
-            subject.login(authToken);
-            if (subject.isAuthenticated()) {
-                log.debug("申请token成功！authtoken={}", authToken.getCredentials());
-                saveLoginTrace(authToken, true);
-                // 跳转到首页
-                return (String) authToken.getCredentials();
-            }
-            else {
-                log.error("认证失败");
-                saveLoginTrace(authToken, false);
-                throw new BusinessException(Status.FAIL_OPERATION, "认证失败");
-            }
-        } catch (Exception e) {
-            log.error("登录异常", e);
-            saveLoginTrace(authToken, false);
-            throw new BusinessException(Status.FAIL_OPERATION, e.getMessage());
-        }
+        return queryWrapper;
     }
 
     /**
@@ -116,7 +60,7 @@ public class WxAuthServiceImpl implements AuthService {
      * @param credential
      * @return
      */
-    private IamAuthToken initAuthToken(AuthCredential credential){
+    protected IamAuthToken initAuthToken(AuthCredential credential){
         MobileCredential wxMpCredential = (MobileCredential)credential;
         IamAuthToken token = new IamAuthToken(getAuthType(), wxMpCredential.getUserTypeClass());
         // 设置登陆的
@@ -126,29 +70,4 @@ public class WxAuthServiceImpl implements AuthService {
         return token.generateAuthtoken();
     }
 
-
-    /**
-     * 保存登录日志
-     * @param authToken
-     * @param isSuccess
-     */
-    protected void saveLoginTrace(IamAuthToken authToken, boolean isSuccess){
-        IamLoginTrace loginTrace = new IamLoginTrace();
-        loginTrace.setAuthType(getAuthType()).setAuthAccount(authToken.getAuthAccount()).setUserType(authToken.getUserType()).setSuccess(isSuccess);
-        BaseLoginUser currentUser = IamSecurityUtils.getCurrentUser();
-        if(currentUser != null){
-            Long userId = currentUser.getId();
-            loginTrace.setUserId(userId);
-        }
-        // 记录客户端信息
-        String userAgent = HttpHelper.getUserAgent(request);
-        String ipAddress = HttpHelper.getRequestIp(request);
-        loginTrace.setUserAgent(userAgent).setIpAddress(ipAddress);
-        try{
-            iamLoginTraceService.createEntity(loginTrace);
-        }
-        catch (Exception e){
-            log.warn("保存登录日志异常", e);
-        }
-    }
 }
-- 
Gitee


From 7282f693d59405bfd0b7f2eeed66725538da3ac8 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 28 Apr 2022 22:50:17 +0800
Subject: [PATCH 072/195] + add global-size switchable

---
 diboot-admin-ui/src/App.vue                 |  6 ++--
 diboot-admin-ui/src/layout/header/index.vue | 35 ++++++++++++++++++---
 diboot-admin-ui/src/store/app.ts            | 19 ++++++++---
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/diboot-admin-ui/src/App.vue b/diboot-admin-ui/src/App.vue
index 0e90e619..675e434d 100644
--- a/diboot-admin-ui/src/App.vue
+++ b/diboot-admin-ui/src/App.vue
@@ -1,12 +1,14 @@
 <script setup lang="ts">
 import zhCn from 'element-plus/lib/locale/lang/zh-cn'
+import useAppStore from './store/app'
+
+const appStore = useAppStore()
 
-const size = ref<'default' | 'small' | 'large'>('default')
 const locale = reactive(zhCn)
 </script>
 
 <template>
-  <el-config-provider :locale="locale" :size="size">
+  <el-config-provider :locale="locale" :size="appStore.globalSize">
     <router-view />
   </el-config-provider>
 </template>
diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 27230624..b9adf4d1 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import { UserFilled, ArrowDown } from '@element-plus/icons-vue'
+import { UserFilled, ArrowDown, ZoomIn } from '@element-plus/icons-vue'
 import useAuthStore from '@/store/auth'
 import Logo from '@/assets/logo.png'
+import useAppStore from '@/store/app'
+
 const authStore = useAuthStore()
 const router = useRouter()
 
@@ -13,15 +15,31 @@ const logout = async () => {
 const goPersonal = () => {
   router.push({ name: 'Personal' }).finally()
 }
+
+const appStore = useAppStore()
 </script>
 
 <template>
   <div style="height: 100%; display: flex; align-items: center">
     <img :src="Logo" alt="Logo" style="height: 39px" />
-    <div style="position: absolute; right: 1.5rem">
+    <div style="position: absolute; right: 1.5rem; display: flex; align-items: center">
+      <el-dropdown @command="command => (appStore.globalSize = command)">
+        <div class="item">
+          <el-icon :size="22">
+            <zoom-in />
+          </el-icon>
+        </div>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item command="large" :disabled="appStore.globalSize === 'large'">large</el-dropdown-item>
+            <el-dropdown-item command="default" :disabled="appStore.globalSize === 'default'">default</el-dropdown-item>
+            <el-dropdown-item command="small" :disabled="appStore.globalSize === 'small'">small</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
       <el-dropdown>
-        <span style="display: flex; align-items: center">
-          <el-avatar :size="33" :icon="UserFilled" :src="authStore.avatar" />
+        <span class="item">
+          <el-avatar :size="36" :icon="UserFilled" :src="authStore.avatar" />
           <span style="margin: 0 8px">{{ authStore.realname }}</span>
           <el-icon><arrow-down /></el-icon>
         </span>
@@ -36,4 +54,11 @@ const goPersonal = () => {
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+.item {
+  height: 36px;
+  display: flex;
+  align-items: center;
+  padding: 0 10px;
+}
+</style>
diff --git a/diboot-admin-ui/src/store/app.ts b/diboot-admin-ui/src/store/app.ts
index a7f04497..ca5fdf0d 100644
--- a/diboot-admin-ui/src/store/app.ts
+++ b/diboot-admin-ui/src/store/app.ts
@@ -1,12 +1,23 @@
 export interface IAppStore {
   enableTabs: boolean
+  enableFooter: boolean
+  globalSize: 'large' | 'default' | 'small'
 }
 
 export default defineStore('app', {
-  state: () => {
-    const tabsState = localStorage.getItem('enableTabs')
-    return <IAppStore>{
-      enableTabs: tabsState ? tabsState === 'true' : true
+  state: (): IAppStore => {
+    return {
+      enableTabs: true,
+      enableFooter: true,
+      globalSize: 'default'
     }
+  },
+  persist: {
+    enabled: true,
+    strategies: [
+      {
+        storage: localStorage
+      }
+    ]
   }
 })
-- 
Gitee


From 0a2e4d547991b410e2784145e9f45c08ccc6f50f Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Fri, 29 Apr 2022 01:50:09 +0800
Subject: [PATCH 073/195] + add layout switchable

---
 diboot-admin-ui/src/layout/footer/index.vue  |   6 +-
 diboot-admin-ui/src/layout/header/index.vue  |  19 +-
 diboot-admin-ui/src/layout/index.vue         | 183 ++++++++++++++++++-
 diboot-admin-ui/src/layout/memu/index.vue    |   8 +-
 diboot-admin-ui/src/layout/memu/subMenu.vue  |  13 +-
 diboot-admin-ui/src/layout/setting/index.vue |  77 ++++++++
 diboot-admin-ui/src/store/app.ts             |   4 +-
 diboot-admin-ui/types/components.d.ts        |   7 +
 8 files changed, 300 insertions(+), 17 deletions(-)
 create mode 100644 diboot-admin-ui/src/layout/setting/index.vue

diff --git a/diboot-admin-ui/src/layout/footer/index.vue b/diboot-admin-ui/src/layout/footer/index.vue
index 6211ef9c..e28280d5 100644
--- a/diboot-admin-ui/src/layout/footer/index.vue
+++ b/diboot-admin-ui/src/layout/footer/index.vue
@@ -1,5 +1,5 @@
-<script setup lang="ts">
-console.log('footer')
-</script>
+<script setup lang="ts"></script>
 
 <template>Diboot © 2015-2022</template>
+
+<style scoped></style>
diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index b9adf4d1..ed9a62a5 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -21,8 +21,14 @@ const appStore = useAppStore()
 
 <template>
   <div style="height: 100%; display: flex; align-items: center">
-    <img :src="Logo" alt="Logo" style="height: 39px" />
+    <img v-if="appStore.layout !== 'default'" :src="Logo" alt="Logo" style="height: 39px" />
+    <div :style="$slots.dock ? { width: '50vw' } : {}" style="margin-left: 20px">
+      <slot name="dock" />
+    </div>
     <div style="position: absolute; right: 1.5rem; display: flex; align-items: center">
+      <div :class="$slots.topNav ? 'top-nav' : ''">
+        <slot name="topNav" />
+      </div>
       <el-dropdown @command="command => (appStore.globalSize = command)">
         <div class="item">
           <el-icon :size="22">
@@ -54,7 +60,16 @@ const appStore = useAppStore()
   </div>
 </template>
 
-<style scoped>
+<style scoped lang="scss">
+.top-nav {
+  max-width: 50vw;
+  margin-right: 25px;
+
+  :deep(.el-menu) {
+    height: 50px;
+  }
+}
+
 .item {
   height: 36px;
   display: flex;
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index f28d104d..2ef9bfb7 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -4,17 +4,143 @@ import AppMenu from './memu/index.vue'
 import AppMain from './main/index.vue'
 import AppFooter from './footer/index.vue'
 import AppTabs from './tabs/index.vue'
+import AppSetting from './setting/index.vue'
+
+import { Eleme } from '@element-plus/icons-vue'
+
+import Logo from '@/assets/logo.png'
+
+import useAppStore from '@/store/app'
+import { getMenuTree } from '@/utils/route'
+import { RouteRecordRaw } from 'vue-router'
+
+const appStore = useAppStore()
+
+const menuTree = computed(() => getMenuTree())
+
+const router = useRouter()
+
+const submenu = ref<Array<RouteRecordRaw>>([])
+const openOneLevel = (menu: RouteRecordRaw) => {
+  submenu.value = menu.children?.length ? menu.children : []
+  if (router.currentRoute.value.name !== menu.name) router.push({ name: menu.name })
+}
+onMounted(() => {
+  openOneLevel(menuTree.value[0])
+})
 </script>
 
 <template>
-  <el-container>
+  <el-container v-if="appStore.layout === 'default'">
+    <el-container>
+      <el-aside :width="submenu.length ? '260px' : '71px'">
+        <div class="subfield">
+          <div class="one-level">
+            <div class="one-level-logo">
+              <img :src="Logo" alt="Logo" style="height: 39px" />
+            </div>
+            <div v-for="item in menuTree" :key="item.name" class="one-level-item" @click="openOneLevel(item)">
+              <el-icon :size="30">
+                <eleme />
+              </el-icon>
+              {{ item.meta?.title }}
+            </div>
+          </div>
+          <div class="submenu">
+            <div class="title">asd</div>
+            <el-scrollbar v-show="submenu.length" height="calc(100vh - 50px)">
+              <app-menu :menu-tree="submenu" />
+            </el-scrollbar>
+          </div>
+        </div>
+      </el-aside>
+      <el-container>
+        <el-main style="padding: 0">
+          <el-header height="50px" style="border-bottom: 1px solid #eee">
+            <app-header />
+          </el-header>
+          <app-tabs>
+            <template #default="{ fullScreen }">
+              <app-main :full-screen="fullScreen">
+                <template #footer>
+                  <app-footer />
+                </template>
+              </app-main>
+            </template>
+          </app-tabs>
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+
+  <el-container v-if="appStore.layout === 'dock'">
+    <el-header height="50px" style="border-bottom: 1px solid #eee">
+      <app-header>
+        <template #dock>
+          <el-menu style="height: 50px" mode="horizontal">
+            <el-menu-item v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
+              <el-icon :size="22">
+                <eleme />
+              </el-icon>
+              <span>{{ item.meta?.title }}</span>
+            </el-menu-item>
+          </el-menu>
+        </template>
+      </app-header>
+    </el-header>
+    <el-container>
+      <el-aside v-show="submenu.length" width="220px">
+        <el-scrollbar height="calc(100vh - 50px)">
+          <app-menu :menu-tree="submenu" />
+        </el-scrollbar>
+      </el-aside>
+      <el-container>
+        <el-main style="padding: 0">
+          <app-tabs>
+            <template #default="{ fullScreen }">
+              <app-main :full-screen="fullScreen">
+                <template #footer>
+                  <app-footer />
+                </template>
+              </app-main>
+            </template>
+          </app-tabs>
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+
+  <el-container v-if="appStore.layout === 'topNav'">
+    <el-header height="50px" style="border-bottom: 1px solid #eee">
+      <app-header>
+        <template #topNav>
+          <app-menu :menu-tree="menuTree" mode="horizontal" />
+        </template>
+      </app-header>
+    </el-header>
+    <el-container>
+      <el-main style="padding: 0">
+        <app-tabs>
+          <template #default="{ fullScreen }">
+            <app-main :full-screen="fullScreen">
+              <template #footer>
+                <app-footer />
+              </template>
+            </app-main>
+          </template>
+        </app-tabs>
+      </el-main>
+    </el-container>
+  </el-container>
+
+  <el-container v-if="appStore.layout === 'menu'">
     <el-header height="50px" style="border-bottom: 1px solid #eee">
       <app-header />
     </el-header>
     <el-container>
-      <el-aside width="200px">
+      <el-aside width="220px">
         <el-scrollbar height="calc(100vh - 50px)">
-          <app-menu />
+          <app-menu :menu-tree="menuTree" />
         </el-scrollbar>
       </el-aside>
       <el-container>
@@ -32,6 +158,55 @@ import AppTabs from './tabs/index.vue'
       </el-container>
     </el-container>
   </el-container>
+
+  <app-setting />
 </template>
 
-<style scoped></style>
+<style scoped lang="scss">
+.subfield {
+  display: flex;
+
+  .one-level {
+    min-height: 100vh;
+    border-right: 1px solid var(--el-border-color-lighter);
+
+    .one-level-logo,
+    .one-level-item {
+      width: 60px;
+      height: 60px;
+      margin: 5px;
+      cursor: pointer;
+      border-radius: 6px;
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+    }
+
+    .one-level-item {
+      color: var(--el-color-white);
+      font-size: 13px;
+
+      background-color: var(--el-color-primary);
+
+      &:hover {
+        background-color: var(--el-color-primary-light-3);
+      }
+    }
+  }
+
+  .submenu {
+    width: 100%;
+    height: 100%;
+
+    .title {
+      height: 49px;
+      padding: 0 20px;
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid var(--el-border-color-lighter);
+      border-right: 1px solid var(--el-border-color-lighter);
+    }
+  }
+}
+</style>
diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index 22e4d5fd..06c4fdb8 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import SubMenu from './subMenu.vue'
-import { getMenuTree } from '@/utils/route'
+import { RouteRecordRaw } from 'vue-router'
+
+defineProps<{ menuTree: RouteRecordRaw[]; mode?: 'horizontal' }>()
 </script>
 
 <template>
-  <el-menu router :default-active="$route.path">
-    <sub-menu :menu-tree="getMenuTree()" />
+  <el-menu router :default-active="$route.path" :mode="mode">
+    <sub-menu :menu-tree="menuTree" />
   </el-menu>
 </template>
diff --git a/diboot-admin-ui/src/layout/memu/subMenu.vue b/diboot-admin-ui/src/layout/memu/subMenu.vue
index bfcea011..363c499d 100644
--- a/diboot-admin-ui/src/layout/memu/subMenu.vue
+++ b/diboot-admin-ui/src/layout/memu/subMenu.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { RouteRecordRaw } from 'vue-router'
+import { Eleme } from '@element-plus/icons-vue'
 
 defineProps<{ menuTree: RouteRecordRaw[] }>()
 </script>
@@ -8,14 +9,18 @@ defineProps<{ menuTree: RouteRecordRaw[] }>()
   <template v-for="(item, index) in menuTree" :key="index">
     <el-sub-menu v-if="item.children?.length" :index="item.path">
       <template #title>
-        图标：
-        <span>{{ item.meta.title }}</span>
+        <el-icon :size="22">
+          <eleme />
+        </el-icon>
+        <span>{{ item.meta?.title }}</span>
       </template>
       <sub-menu :menu-tree="item.children" />
     </el-sub-menu>
     <el-menu-item v-else :index="item.path">
-      图标：
-      <span>{{ item.meta.title }}</span>
+      <el-icon :size="22">
+        <eleme />
+      </el-icon>
+      <span>{{ item.meta?.title }}</span>
     </el-menu-item>
   </template>
 </template>
diff --git a/diboot-admin-ui/src/layout/setting/index.vue b/diboot-admin-ui/src/layout/setting/index.vue
new file mode 100644
index 00000000..d1964942
--- /dev/null
+++ b/diboot-admin-ui/src/layout/setting/index.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Opportunity } from '@element-plus/icons-vue'
+import useAppStore from '@/store/app'
+
+const openSetting = ref(false)
+
+const appStore = useAppStore()
+</script>
+
+<template>
+  <div class="open-button" @click="openSetting = true">
+    <el-icon :size="22">
+      <opportunity />
+    </el-icon>
+  </div>
+  <div class="setting">
+    <el-drawer v-model="openSetting" title="布局实时演示" :size="360">
+      <el-alert
+        title="以下配置可实时预览"
+        description="开发者可在 `src/store/app.ts` 中修改默认值。"
+        type="warning"
+        :closable="false"
+      />
+      <el-divider />
+      <el-form :model="appStore">
+        <el-form-item label="开启 Tabs">
+          <el-select v-model="appStore.layout">
+            <el-option label="分栏" value="default" />
+            <el-option label="通栏" value="dock" />
+            <el-option label="经典" value="menu" />
+            <el-option label="顶导航" value="topNav" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开启 Tabs">
+          <el-switch v-model="appStore.enableTabs" />
+        </el-form-item>
+        <el-form-item label="开启 Footer">
+          <el-switch v-model="appStore.enableFooter" />
+        </el-form-item>
+      </el-form>
+      <el-button style="width: 100%" @click="appStore.$reset()">重置</el-button>
+    </el-drawer>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.open-button {
+  width: 39px;
+  height: 39px;
+  z-index: 5;
+  position: fixed;
+  bottom: 200px;
+  right: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border-radius: 5px 0 0 5px;
+  background: var(--el-color-primary);
+  cursor: pointer;
+
+  .el-icon {
+    color: var(--el-color-white);
+  }
+}
+.setting {
+  :deep(.el-drawer__header) {
+    margin-bottom: 0;
+  }
+
+  .el-form {
+    :deep(.el-form-item__content) {
+      justify-content: flex-end;
+    }
+  }
+}
+</style>
diff --git a/diboot-admin-ui/src/store/app.ts b/diboot-admin-ui/src/store/app.ts
index ca5fdf0d..0c62472f 100644
--- a/diboot-admin-ui/src/store/app.ts
+++ b/diboot-admin-ui/src/store/app.ts
@@ -2,6 +2,7 @@ export interface IAppStore {
   enableTabs: boolean
   enableFooter: boolean
   globalSize: 'large' | 'default' | 'small'
+  layout: 'default' | 'dock' | 'menu' | 'topNav'
 }
 
 export default defineStore('app', {
@@ -9,7 +10,8 @@ export default defineStore('app', {
     return {
       enableTabs: true,
       enableFooter: true,
-      globalSize: 'default'
+      globalSize: 'default',
+      layout: 'dock'
     }
   },
   persist: {
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index a14fce90..8607ee61 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -5,11 +5,14 @@ import '@vue/runtime-core'
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -21,8 +24,12 @@ declare module '@vue/runtime-core' {
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElResult: typeof import('element-plus/es')['ElResult']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     HelloWorld: typeof import('@/components/HelloWorld.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-- 
Gitee


From 83d051e903b55a80dc17e52b8f565e36ea567077 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Fri, 29 Apr 2022 01:50:56 +0800
Subject: [PATCH 074/195] + add build config skipLibCheck

---
 diboot-admin-ui/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/diboot-admin-ui/tsconfig.json b/diboot-admin-ui/tsconfig.json
index daf82714..6bd0cab5 100644
--- a/diboot-admin-ui/tsconfig.json
+++ b/diboot-admin-ui/tsconfig.json
@@ -7,6 +7,7 @@
     "strict": true,
     "jsx": "preserve",
     "sourceMap": true,
+    "skipLibCheck": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
     "esModuleInterop": true,
-- 
Gitee


From 7c2456becb67f274eb25d514783f2cac7055d7f6 Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Fri, 29 Apr 2022 11:59:40 +0800
Subject: [PATCH 075/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96apiUri=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java b/diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java
index 54e935b1..3f271593 100644
--- a/diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java
+++ b/diboot-core/src/main/java/com/diboot/core/vo/ApiUri.java
@@ -18,6 +18,9 @@ import java.io.Serializable;
 public class ApiUri implements Serializable {
     private static final long serialVersionUID = 662520281067250572L;
 
+    public ApiUri() {
+    }
+
     public ApiUri(String method, String uri){
         this.method = method;
         this.uri = uri;
-- 
Gitee


From 9d9da9b38c30b5f5695fd5d7280b6a0de866178d Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 29 Apr 2022 15:15:12 +0800
Subject: [PATCH 076/195] =?UTF-8?q?*=20=E5=88=B7=E6=96=B0token=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/cache/DynamicRedisCacheManager.java  |   2 +-
 .../diboot/core/cache/BaseCacheManager.java   |   2 +-
 .../core/cache/DynamicMemoryCacheManager.java |  73 +++---
 .../core/cache/StaticMemoryCacheManager.java  |   2 +-
 .../iam/auth/impl/BaseAuthServiceImpl.java    |   4 +-
 .../main/java/com/diboot/iam/config/Cons.java |   9 -
 .../shiro/StatelessAccessControlFilter.java   |  11 +-
 .../com/diboot/iam/starter/IamAutoConfig.java |   2 -
 .../iam/starter/IamRedisAutoConfig.java       |   2 -
 .../com/diboot/iam/util/IamSecurityUtils.java |   3 +-
 .../com/diboot/iam/util/TokenCacheHelper.java | 227 ------------------
 .../java/com/diboot/iam/util/TokenUtils.java  | 125 +++++++++-
 12 files changed, 166 insertions(+), 296 deletions(-)
 delete mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java

diff --git a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
index c050f9e7..40d52de8 100644
--- a/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
+++ b/diboot-core-starter/src/main/java/com/diboot/core/cache/DynamicRedisCacheManager.java
@@ -69,7 +69,7 @@ public class DynamicRedisCacheManager implements BaseCacheManager{
     }
 
     @Override
-    public void clearAllOutOfDateData() {
+    public void clearOutOfDateData(String cacheName) {
     }
 
 }
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
index c0d04c0e..d2aeecf4 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/BaseCacheManager.java
@@ -74,6 +74,6 @@ public interface BaseCacheManager {
     /**
      * 清理所有过期的数据：系统空闲时调用
      */
-    void clearAllOutOfDateData();
+    void clearOutOfDateData(String cacheName);
 
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
index b2cdd114..3bd69feb 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/DynamicMemoryCacheManager.java
@@ -20,7 +20,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -46,14 +48,19 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
     }
 
     /**
-     * cache的时间戳缓存
+     * cache的清理时间缓存
+     */
+    private final ConcurrentHashMap<String, String> CACHE_CLEANDATE_CACHE = new ConcurrentHashMap<>();
+
+    /**
+     * cache的过期时间缓存
      */
-    private ConcurrentHashMap<String, Integer> CACHE_EXPIREDMINUTES_CACHE = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, Integer> CACHE_EXPIREDMINUTES_CACHE = new ConcurrentHashMap<>();
 
     /**
      * cache的时间戳缓存
      */
-    private ConcurrentHashMap<String, ConcurrentHashMap<Object, Long>> CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, ConcurrentHashMap<Object, Long>> CACHE_TIMESTAMP_CACHE = new ConcurrentHashMap<>();
 
     public DynamicMemoryCacheManager(){
         super.afterPropertiesSet();
@@ -69,6 +76,7 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
         for(String cacheName : cacheNames){
             caches.add(new ConcurrentMapCache(cacheName));
             this.CACHE_EXPIREDMINUTES_CACHE.put(cacheName, expiredMinutes);
+            this.CACHE_CLEANDATE_CACHE.put(cacheName, "");
         }
         setCaches(caches);
         super.afterPropertiesSet();
@@ -105,6 +113,7 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
     public void putCacheObj(String cacheName, Object objKey, Object obj) {
         super.putCacheObj(cacheName, objKey, obj);
         refreshCacheTimestamp(cacheName, objKey);
+        clearOutOfDateDataIfNeeded(cacheName);
     }
 
     /**
@@ -114,33 +123,33 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
      * @param obj
      */
     public void putCacheObj(String cacheName, Object objKey, Object obj, int expireMinutes) {
-        this.putCacheObj(cacheName, objKey, obj);
-        if(!this.CACHE_EXPIREDMINUTES_CACHE.containsKey(cacheName)){
+        if(!this.CACHE_EXPIREDMINUTES_CACHE.containsKey(cacheName) || (this.CACHE_EXPIREDMINUTES_CACHE.get(cacheName) != expireMinutes)){
             this.CACHE_EXPIREDMINUTES_CACHE.put(cacheName, expireMinutes);
             if(log.isDebugEnabled()){
                 log.debug("设置缓存过期时间: {}={}", cacheName, expireMinutes);
             }
         }
+        this.putCacheObj(cacheName, objKey, obj);
     }
 
     @Override
-    public synchronized void clearAllOutOfDateData() {
-        for(String cacheName : this.getCacheNames()){
-            Cache cache = getCache(cacheName);
-            ConcurrentMap<Object, Object> cacheMap = (ConcurrentMap<Object, Object>)cache.getNativeCache();
-            if(V.isEmpty(cacheMap)){
-                continue;
-            }
-            for(Map.Entry<Object, Object> entry : cacheMap.entrySet()){
-                // 已过期，则清空缓存返回null
-                if(isExpired(cacheName, entry.getKey())){
-                    cache.evict(entry.getKey());
-                    if(log.isDebugEnabled()){
-                        log.debug("统一清理已过期的缓存: {}.{}", cacheName, entry.getKey());
-                    }
-                }
+    public synchronized void clearOutOfDateData(String cacheName) {
+        Cache cache = getCache(cacheName);
+        ConcurrentMap<Object, Object> cacheMap = (ConcurrentMap<Object, Object>)cache.getNativeCache();
+        if(V.isEmpty(cacheMap)){
+            log.debug("暂无缓存数据: {}", cacheName);
+            return;
+        }
+        int count = 0;
+        for(Map.Entry<Object, Object> entry : cacheMap.entrySet()){
+            // 已过期，则清空缓存返回null
+            if(isExpired(cacheName, entry.getKey())){
+                cache.evict(entry.getKey());
+                count++;
+                log.debug("清理已过期的缓存: {}.{}", cacheName, entry.getKey());
             }
         }
+        log.debug("清理完成已过期缓存数据: {} 共 {} 条", cacheName, count);
     }
 
     /**
@@ -164,19 +173,16 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
         return (currentTimestamp - cacheTimestamp) > (expiredMinutes*60000);
     }
 
-    /**
-     * 清空缓存
-     * @param cacheName
-     */
-    public void clearCache(String cacheName) {
-        Cache cache = getCache(cacheName);
-        if(cache != null){
-            cache.clear();
-            // 清空时间戳
-            ConcurrentMap<Object, Long> timestampCache = CACHE_TIMESTAMP_CACHE.get(cacheName);
-            if(timestampCache != null){
-                timestampCache.clear();
-            }
+    private void clearOutOfDateDataIfNeeded(String cacheName){
+        boolean needed = true;
+        String today = LocalDate.now().toString();
+        if(CACHE_CLEANDATE_CACHE.containsKey(cacheName)){
+            needed = V.notEquals(today, CACHE_CLEANDATE_CACHE.get(cacheName));
+        }
+        if(needed){
+            log.debug("新的执行周期清理过期的本地缓存: {}", cacheName);
+            clearOutOfDateData(cacheName);
+            CACHE_CLEANDATE_CACHE.put(cacheName, today);
         }
     }
 
@@ -191,5 +197,4 @@ public class DynamicMemoryCacheManager extends BaseMemoryCacheManager implements
         }
         timestampCache.put(objKey, System.currentTimeMillis());
     }
-
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java b/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
index 6861fa9d..ce2fb611 100644
--- a/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/cache/StaticMemoryCacheManager.java
@@ -41,7 +41,7 @@ public class StaticMemoryCacheManager extends BaseMemoryCacheManager implements
     }
 
     @Override
-    public void clearAllOutOfDateData() {
+    public void clearOutOfDateData(String cacheName) {
         throw new InvalidUsageException("StaticMemoryCacheManager 缓存不存在过期，不支持清理！");
     }
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
index eb5a23d7..d531aad1 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/BaseAuthServiceImpl.java
@@ -29,7 +29,7 @@ import com.diboot.iam.service.IamAccountService;
 import com.diboot.iam.shiro.IamAuthToken;
 import com.diboot.iam.util.HttpHelper;
 import com.diboot.iam.util.IamSecurityUtils;
-import com.diboot.iam.util.TokenCacheHelper;
+import com.diboot.iam.util.TokenUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
@@ -88,7 +88,7 @@ public abstract class BaseAuthServiceImpl implements AuthService {
             if (subject.isAuthenticated()) {
                 String accessToken = (String) authToken.getCredentials();
                 // 缓存当前token与用户信息
-                TokenCacheHelper.cacheAccessToken(accessToken, authToken.buildUserInfoStr(), authToken.getExpiresInMinutes());
+                TokenUtils.cacheAccessToken(accessToken, authToken.buildUserInfoStr(), authToken.getExpiresInMinutes());
                 log.debug("申请token成功！authtoken={}", authToken.getCredentials());
                 saveLoginTrace(authToken, true);
                 // 返回
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
index b4cf8f7b..9bcc6b08 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
@@ -130,13 +130,4 @@ public class Cons extends com.diboot.core.config.Cons {
      */
     public static final String CACHE_TOKEN_USERINFO = "TOKEN_USERINFO";
 
-    /**
-     * token-刷新token 缓存
-     */
-    public static final String CACHE_TOKEN_REFRESHTOKEN = "TOKEN_REFRESHTOKEN";
-    /**
-     * 刷新token-前token 缓存
-     */
-    public static final String CACHE_REFRESHTOKEN_TOKEN = "REFRESHTOKEN_TOKEN";
-
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
index 18283aee..19040279 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/StatelessAccessControlFilter.java
@@ -21,7 +21,6 @@ import com.diboot.core.vo.JsonResult;
 import com.diboot.core.vo.Status;
 import com.diboot.iam.config.Cons;
 import com.diboot.iam.util.IamSecurityUtils;
-import com.diboot.iam.util.TokenCacheHelper;
 import com.diboot.iam.util.TokenUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
@@ -60,20 +59,20 @@ public class StatelessAccessControlFilter extends BasicHttpAuthenticationFilter
         // 从header获取Token
         String currentToken = TokenUtils.getRequestToken(httpRequest);
         if (V.isEmpty(currentToken)) {
-            log.debug("Token验证失败！uri={}", httpRequest.getRequestURI());
+            log.debug("token: {} 验证失败, uri={}", currentToken, httpRequest.getRequestURI());
             return false;
         }
-        log.debug("Token验证成功！token={}, uri={}", currentToken, httpRequest.getRequestURI());
-        String cachedUserInfo = TokenCacheHelper.getCachedUserInfoStr(currentToken);
+        log.debug("token: {} 验证通过", currentToken);
+        String cachedUserInfo = TokenUtils.getCachedUserInfoStr(currentToken);
         if(IamSecurityUtils.getSubject().isAuthenticated() == false && cachedUserInfo != null){
             IamAuthToken authToken = new IamAuthToken(cachedUserInfo);
             authToken.setAuthtoken(currentToken);
             authToken.setValidPassword(false);
             IamSecurityUtils.getSubject().login(authToken);
-            log.debug("Token验证成功！token={}", currentToken);
+            log.debug("token: {} 保活完成, uri={}", currentToken, httpRequest.getRequestURI());
         }
         // 如果临近过期，则生成新的token返回
-        TokenUtils.responseNewTokenIfRequired(response, currentToken, cachedUserInfo);
+        TokenUtils.responseNewTokenIfRequired(response, cachedUserInfo);
         return true;
     }
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
index f166aa4e..41a71af7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
@@ -209,8 +209,6 @@ public class IamAutoConfig {
         log.info("初始化IAM本地缓存: DynamicMemoryCacheManager");
         return new DynamicMemoryCacheManager(iamProperties.getTokenExpiresMinutes(),
                 Cons.CACHE_TOKEN_USERINFO,
-                Cons.CACHE_TOKEN_REFRESHTOKEN,
-                Cons.CACHE_REFRESHTOKEN_TOKEN,
                 Cons.CACHE_CAPTCHA);
     }
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
index e74aa972..2351fb0b 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamRedisAutoConfig.java
@@ -89,8 +89,6 @@ public class IamRedisAutoConfig {
                             .entryTtl(Duration.ofMinutes(iamProperties.getTokenExpiresMinutes()));
         Set<String> cacheNames = new HashSet<String>(){{
                 add(Cons.CACHE_TOKEN_USERINFO);
-                add(Cons.CACHE_TOKEN_REFRESHTOKEN);
-                add(Cons.CACHE_REFRESHTOKEN_TOKEN);
                 add(Cons.CACHE_CAPTCHA);
         }};
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
index ebd799d7..19b369ca 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
@@ -105,7 +105,8 @@ public class IamSecurityUtils extends SecurityUtils {
         if(cacheManager != null && cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
             cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).remove(accessToken);
         }
-        TokenCacheHelper.removeAccessTokens(accessToken);
+        TokenUtils.removeAccessTokens(accessToken);
+        log.warn("token 已过期注销: {}", accessToken);
     }
 
     /**
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
deleted file mode 100644
index 4c80089c..00000000
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenCacheHelper.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.iam.util;
-
-import com.diboot.core.cache.BaseCacheManager;
-import com.diboot.core.util.ContextHelper;
-import com.diboot.core.util.S;
-import com.diboot.core.util.V;
-import com.diboot.iam.config.Cons;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.cache.CacheManager;
-
-/**
- * token缓存相关辅助类
- * @author JerryMa
- * @version v2.6.0
- * @date 2022/4/27
- * Copyright © diboot.com
- */
-@Slf4j
-public class TokenCacheHelper {
-
-    /**
-     * 刷新token存储的过期时间
-     */
-    public static int REFRESH_TOKEN_EXPIRES_MINUTES = (TokenUtils.EXPIRES_IN_MINUTES / 4);
-
-    /**
-     * 缓存新的token
-     * @param accessToken
-     * @param userInfoStr
-     */
-    public static void cacheAccessToken(String accessToken, String userInfoStr, int expiresInMinutes) {
-        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken, userInfoStr, expiresInMinutes);
-    }
-
-    /**
-     * 移除失效的旧token
-     * @param newToken
-     */
-    public static void updateUserInfoCacheAndRemovePreviousToken(String newToken) {
-        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        String previousToken = baseCacheManager.getCacheString(Cons.CACHE_REFRESHTOKEN_TOKEN, newToken);
-        if(previousToken != null){
-            String cachedUserInfoStr = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, previousToken);
-            if(cachedUserInfoStr != null){
-                String prefixTemp = S.substringBeforeLast(cachedUserInfoStr, Cons.SEPARATOR_COMMA);
-                int expiresMinutes = Integer.parseInt(S.substringAfterLast(prefixTemp, Cons.SEPARATOR_COMMA));
-                //如果是刷新token则更新颁发时间
-                cachedUserInfoStr = prefixTemp + Cons.SEPARATOR_COMMA + System.currentTimeMillis();
-                cacheAccessToken(newToken, cachedUserInfoStr, expiresMinutes);
-            }
-            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, previousToken);
-            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, previousToken);
-        }
-    }
-
-    /**
-     * 退出时移除失效的全部token
-     * @param accessToken
-     */
-    public static void removeAccessTokens(String accessToken) {
-        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken);
-        String refreshToken = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
-        if(refreshToken != null){
-            baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, refreshToken);
-            baseCacheManager.removeCacheObj(Cons.CACHE_REFRESHTOKEN_TOKEN, refreshToken);
-        }
-        baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
-    }
-
-    /**
-     * 获取缓存的token信息
-     * @param accessToken
-     * @return
-     */
-    public static String getCachedUserInfoStr(String accessToken) {
-        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        String cachedUserInfoStr = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, accessToken);
-        if(cachedUserInfoStr == null && isRefreshToken(accessToken)){
-            String previousToken = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, accessToken);
-            if(previousToken != null){
-                cachedUserInfoStr = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, previousToken);
-                //如果是刷新token则更新颁发时间
-                if(cachedUserInfoStr != null){
-                    cachedUserInfoStr = S.substringBeforeLast(cachedUserInfoStr, Cons.SEPARATOR_COMMA) + System.currentTimeMillis();
-                }
-            }
-        }
-        return cachedUserInfoStr;
-    }
-
-    /**
-     * token是否有效: 未过期/刷新token 均有效
-     * @param accessToken
-     * @return
-     */
-    public static boolean isActiveAccessToken(String accessToken) {
-        String userInfoStr = getCachedUserInfoStr(accessToken);
-        if(V.isEmpty(userInfoStr)){
-            // 判断是否为刷新token
-            if(TokenCacheHelper.isRefreshToken(accessToken)){
-                TokenCacheHelper.updateUserInfoCacheAndRemovePreviousToken(accessToken);
-                log.debug("请求已切换为刷新token : {}", accessToken);
-                return true;
-            }
-            else{
-                log.debug("非刷新token: {}", accessToken);
-            }
-            return false;
-        }
-        CacheManager cacheManager = ContextHelper.getBean(CacheManager.class);
-        if(isExpired(userInfoStr)){
-            log.warn("token 已过期: {}", accessToken);
-            if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
-                Object obj = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(accessToken);
-                log.debug("过期未退出前，AUTHENTICATION object={}", obj);
-            }
-            if(cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME) != null){
-                Object obj = cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME).get(accessToken);
-                log.debug("过期未退出前，AUTHORIZATION object={}", obj);
-            }
-            IamSecurityUtils.logoutByToken(accessToken);
-            if(cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME) != null){
-                Object obj = cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).get(accessToken);
-                log.debug("过期退出后，AUTHENTICATION object={}", obj);
-            }
-            if(cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME) != null){
-                Object obj = cacheManager.getCache(Cons.AUTHORIZATION_CAHCE_NAME).get(accessToken);
-                log.debug("过期退出后，AUTHORIZATION object={}", obj);
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 获取刷新token
-     * @param currentToken
-     * @return
-     */
-    public static String getCachedRefreshToken(String currentToken) {
-        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        return baseCacheManager.getCacheString(Cons.CACHE_TOKEN_REFRESHTOKEN, currentToken);
-    }
-
-    /**
-     * 缓存刷新token
-     * @param currentToken
-     * @param refreshToken
-     */
-    public synchronized static void cacheRefreshToken(String currentToken, String refreshToken) {
-        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        // 缓存双向的token，便于后面的请求中识别refreshToken
-        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_REFRESHTOKEN, currentToken, refreshToken, REFRESH_TOKEN_EXPIRES_MINUTES);
-        baseCacheManager.putCacheObj(Cons.CACHE_REFRESHTOKEN_TOKEN, refreshToken, currentToken, REFRESH_TOKEN_EXPIRES_MINUTES);
-    }
-
-    /**
-     * 判断是否为刷新token
-     * @param accessToken
-     * @return
-     */
-    private static boolean isRefreshToken(String accessToken) {
-        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
-        return baseCacheManager.getCacheString(Cons.CACHE_REFRESHTOKEN_TOKEN, accessToken) != null;
-    }
-
-    /**
-     * 是否已过期
-     * @param userInfoStr
-     * @return
-     */
-    public static boolean isExpired(String userInfoStr){
-        if(V.isEmpty(userInfoStr)){
-            return false;
-        }
-        String[] userFields = S.split(userInfoStr);
-        int expiresInMinutes = Integer.parseInt(userFields[4]);
-        // 获取当前token的过期时间
-        long issuedAt = Long.parseLong(userFields[5]);
-        // 获取当前token的过期时间
-        long expiredBefore = issuedAt + expiresInMinutes * 60000;
-        return System.currentTimeMillis() > expiredBefore;
-    }
-
-    /**
-     * 是否临近过期
-     * @param userInfoStr
-     * @return
-     */
-    public static boolean isCloseToExpired(String userInfoStr){
-        if(V.isEmpty(userInfoStr)){
-            return false;
-        }
-        String[] userFields = S.split(userInfoStr);
-        int expiresInMinutes = Integer.parseInt(userFields[4]);
-        // 当前token是否临近过期
-        long current = System.currentTimeMillis();
-        long issuedAt = Long.parseLong(userFields[5]);
-        long expiration = issuedAt + expiresInMinutes*60000;
-        long remaining = expiration - current;
-        if(remaining > 0){
-            long elapsed = current - issuedAt;
-            // 小于1/4 则更新
-            double past = (elapsed / remaining);
-            return past > 3.0;
-        }
-        return false;
-    }
-
-}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
index 3be69d34..c9b684bd 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/TokenUtils.java
@@ -15,7 +15,9 @@
  */
 package com.diboot.iam.util;
 
+import com.diboot.core.cache.BaseCacheManager;
 import com.diboot.core.config.BaseConfig;
+import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import com.diboot.iam.config.Cons;
@@ -55,7 +57,7 @@ public class TokenUtils {
             log.warn("请求未指定token: {}", authtoken);
             return null;
         }
-        if(TokenCacheHelper.isActiveAccessToken(authtoken) == false){
+        if(isActiveAccessToken(authtoken) == false){
             log.warn("已过期或非系统颁发的token: {}", authtoken);
             return null;
         }
@@ -72,22 +74,125 @@ public class TokenUtils {
 
     /**
      * 临近过期时生成新的token
-     * @param currentToken
+     * @param cachedUserInfo
      * @return
      */
-    public static synchronized void responseNewTokenIfRequired(ServletResponse response, String currentToken, String cachedUserInfo) {
-        if(TokenCacheHelper.isCloseToExpired(cachedUserInfo)){
+    public static synchronized void responseNewTokenIfRequired(ServletResponse response, String cachedUserInfo) {
+        if(isCloseToExpired(cachedUserInfo)){
             //将刷新的token放入response header
-            String refreshToken = TokenCacheHelper.getCachedRefreshToken(currentToken);
-            if(refreshToken == null){
-                refreshToken = generateToken();
-                TokenCacheHelper.cacheRefreshToken(currentToken, refreshToken);
-            }
+            String refreshToken = generateToken();
+            cacheRefreshToken(refreshToken, cachedUserInfo);
             ((HttpServletResponse)response).setHeader(AUTH_HEADER, refreshToken);
             log.debug("写回刷新token :{}", refreshToken);
         }
     }
 
+    /**
+     * 缓存新的token
+     * @param accessToken
+     * @param userInfoStr
+     */
+    public static void cacheAccessToken(String accessToken, String userInfoStr, int expiresInMinutes) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        baseCacheManager.putCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken, userInfoStr, expiresInMinutes);
+    }
+
+    /**
+     * 退出时移除失效的全部token
+     * @param accessToken
+     */
+    public static void removeAccessTokens(String accessToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        baseCacheManager.removeCacheObj(Cons.CACHE_TOKEN_USERINFO, accessToken);
+    }
+
+    /**
+     * 获取缓存的token信息
+     * @param accessToken
+     * @return
+     */
+    public static String getCachedUserInfoStr(String accessToken) {
+        BaseCacheManager baseCacheManager = ContextHelper.getBean(BaseCacheManager.class);
+        String userInfoStr = baseCacheManager.getCacheString(Cons.CACHE_TOKEN_USERINFO, accessToken);
+        if(userInfoStr == null){
+            log.info("token {} 缓存信息不存在", accessToken);
+        }
+        return userInfoStr;
+    }
+
+    /**
+     * token是否有效: 未过期/刷新token 均有效
+     * @param accessToken
+     * @return
+     */
+    public static boolean isActiveAccessToken(String accessToken) {
+        String userInfoStr = getCachedUserInfoStr(accessToken);
+        if(V.isEmpty(userInfoStr)){
+            return false;
+        }
+        if(isExpired(userInfoStr)){
+            IamSecurityUtils.logoutByToken(accessToken);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 缓存刷新token
+     * @param refreshToken
+     */
+    public synchronized static void cacheRefreshToken(String refreshToken, String userInfoStr) {
+        String prefixTemp = S.substringBeforeLast(userInfoStr, Cons.SEPARATOR_COMMA);
+        int expiresMinutes = Integer.parseInt(S.substringAfterLast(prefixTemp, Cons.SEPARATOR_COMMA));
+        //如果是刷新token则更新颁发时间
+        userInfoStr = prefixTemp + Cons.SEPARATOR_COMMA + System.currentTimeMillis();
+        cacheAccessToken(refreshToken, userInfoStr, expiresMinutes + 1); //适当延长1m避免临界点问题
+    }
+
+    /**
+     * 是否已过期
+     * @param userInfoStr
+     * @return
+     */
+    private static final int EXPIRES_MINUTES_INDEX = 4, ISSUED_AT_INDEX = 5;
+    public static boolean isExpired(String userInfoStr){
+        if(V.isEmpty(userInfoStr)){
+            return false;
+        }
+        String[] userFields = S.split(userInfoStr);
+        int expiresInMinutes = Integer.parseInt(userFields[EXPIRES_MINUTES_INDEX]);
+        // 获取当前token的过期时间
+        long issuedAt = Long.parseLong(userFields[ISSUED_AT_INDEX]);
+        // 获取当前token的过期时间
+        long expiredBefore = issuedAt + expiresInMinutes * 60000;
+        return System.currentTimeMillis() > expiredBefore;
+    }
+
+    /**
+     * 是否临近过期
+     * @param userInfoStr
+     * @return
+     */
+    public static boolean isCloseToExpired(String userInfoStr){
+        if(V.isEmpty(userInfoStr)){
+            return false;
+        }
+        String[] userFields = S.split(userInfoStr);
+        int expiresInMinutes = Integer.parseInt(userFields[EXPIRES_MINUTES_INDEX]);
+        // 当前token是否临近过期
+        long current = System.currentTimeMillis();
+        long issuedAt = Long.parseLong(userFields[ISSUED_AT_INDEX]);
+        long expiration = issuedAt + expiresInMinutes*60000;
+        long remaining = expiration - current;
+        if(remaining > 0){
+            long elapsed = current - issuedAt;
+            // 小于1/4 则更新
+            double past = (elapsed / remaining);
+            return past > 3.0;
+        }
+        return false;
+    }
+
     /**
      * 获取配置参数值
      * @return
@@ -106,4 +211,4 @@ public class TokenUtils {
         return value != null? Integer.parseInt(value) : defaultValue;
     }
 
-}
+}
\ No newline at end of file
-- 
Gitee


From 145fa802f73d47795ee93e3b919dca0a4b143e63 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Fri, 29 Apr 2022 17:20:09 +0800
Subject: [PATCH 077/195] * opt layout

---
 diboot-admin-ui/src/App.vue               |  1 +
 diboot-admin-ui/src/layout/index.vue      | 83 ++++++++++++-----------
 diboot-admin-ui/src/layout/memu/index.vue | 44 +++++++++++-
 diboot-admin-ui/src/store/app.ts          |  2 +-
 4 files changed, 86 insertions(+), 44 deletions(-)

diff --git a/diboot-admin-ui/src/App.vue b/diboot-admin-ui/src/App.vue
index 675e434d..cf543967 100644
--- a/diboot-admin-ui/src/App.vue
+++ b/diboot-admin-ui/src/App.vue
@@ -17,5 +17,6 @@ const locale = reactive(zhCn)
 body {
   margin: 0;
   padding: 0;
+  overflow: hidden;
 }
 </style>
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 2ef9bfb7..fcd88c7f 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -16,41 +16,44 @@ import { RouteRecordRaw } from 'vue-router'
 
 const appStore = useAppStore()
 
-const menuTree = computed(() => getMenuTree())
+const menuTree = getMenuTree()
 
 const router = useRouter()
 
-const submenu = ref<Array<RouteRecordRaw>>([])
+const oneLevel = ref<RouteRecordRaw>()
 const openOneLevel = (menu: RouteRecordRaw) => {
-  submenu.value = menu.children?.length ? menu.children : []
+  oneLevel.value = menu
   if (router.currentRoute.value.name !== menu.name) router.push({ name: menu.name })
 }
-onMounted(() => {
-  openOneLevel(menuTree.value[0])
-})
+openOneLevel(menuTree[0])
+
+const isMenuCollapse = ref(false)
 </script>
 
 <template>
   <el-container v-if="appStore.layout === 'default'">
     <el-container>
-      <el-aside :width="submenu.length ? '260px' : '71px'">
+      <el-aside :width="oneLevel.children?.length ? (isMenuCollapse ? '135px' : '260px') : '71px'">
         <div class="subfield">
           <div class="one-level">
             <div class="one-level-logo">
               <img :src="Logo" alt="Logo" style="height: 39px" />
             </div>
-            <div v-for="item in menuTree" :key="item.name" class="one-level-item" @click="openOneLevel(item)">
-              <el-icon :size="30">
-                <eleme />
-              </el-icon>
-              {{ item.meta?.title }}
-            </div>
+            <el-menu :default-active="oneLevel.path">
+              <el-menu-item v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
+                <el-icon :size="30">
+                  <eleme />
+                </el-icon>
+                <span>{{ item.meta?.title }}</span>
+              </el-menu-item>
+            </el-menu>
           </div>
-          <div class="submenu">
-            <div class="title">asd</div>
-            <el-scrollbar v-show="submenu.length" height="calc(100vh - 50px)">
-              <app-menu :menu-tree="submenu" />
-            </el-scrollbar>
+          <div v-show="oneLevel.children?.length" class="submenu">
+            <app-menu v-model:collapse="isMenuCollapse" :menu-tree="oneLevel.children">
+              <template #title>
+                <div class="title">{{ oneLevel.meta?.title }}</div>
+              </template>
+            </app-menu>
           </div>
         </div>
       </el-aside>
@@ -77,7 +80,7 @@ onMounted(() => {
     <el-header height="50px" style="border-bottom: 1px solid #eee">
       <app-header>
         <template #dock>
-          <el-menu style="height: 50px" mode="horizontal">
+          <el-menu style="height: 50px" mode="horizontal" :default-active="oneLevel.path">
             <el-menu-item v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
               <el-icon :size="22">
                 <eleme />
@@ -89,10 +92,8 @@ onMounted(() => {
       </app-header>
     </el-header>
     <el-container>
-      <el-aside v-show="submenu.length" width="220px">
-        <el-scrollbar height="calc(100vh - 50px)">
-          <app-menu :menu-tree="submenu" />
-        </el-scrollbar>
+      <el-aside v-show="oneLevel.children?.length" :width="isMenuCollapse ? '64px' : '220px'">
+        <app-menu v-model:collapse="isMenuCollapse" :menu-tree="oneLevel.children" />
       </el-aside>
       <el-container>
         <el-main style="padding: 0">
@@ -138,10 +139,8 @@ onMounted(() => {
       <app-header />
     </el-header>
     <el-container>
-      <el-aside width="220px">
-        <el-scrollbar height="calc(100vh - 50px)">
-          <app-menu :menu-tree="menuTree" />
-        </el-scrollbar>
+      <el-aside :width="isMenuCollapse ? '64px' : '220px'" class="aside-width">
+        <app-menu v-model:collapse="isMenuCollapse" :menu-tree="menuTree" />
       </el-aside>
       <el-container>
         <el-main style="padding: 0">
@@ -163,6 +162,11 @@ onMounted(() => {
 </template>
 
 <style scoped lang="scss">
+.el-aside {
+  transition: width 0.3s;
+  -webkit-transition: width 0.3s;
+}
+
 .subfield {
   display: flex;
 
@@ -170,27 +174,24 @@ onMounted(() => {
     min-height: 100vh;
     border-right: 1px solid var(--el-border-color-lighter);
 
-    .one-level-logo,
-    .one-level-item {
-      width: 60px;
-      height: 60px;
-      margin: 5px;
-      cursor: pointer;
-      border-radius: 6px;
+    .one-level-logo {
+      width: 70px;
+      height: 50px;
       display: flex;
       align-items: center;
       flex-direction: column;
       justify-content: center;
     }
 
-    .one-level-item {
-      color: var(--el-color-white);
-      font-size: 13px;
-
-      background-color: var(--el-color-primary);
+    .el-menu {
+      width: 70px;
+      margin-top: 10px;
 
-      &:hover {
-        background-color: var(--el-color-primary-light-3);
+      .el-menu-item {
+        height: 60px;
+        padding-top: 5px;
+        line-height: 15px;
+        flex-direction: column;
       }
     }
   }
diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index 06c4fdb8..09a43917 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -2,11 +2,51 @@
 import SubMenu from './subMenu.vue'
 import { RouteRecordRaw } from 'vue-router'
 
-defineProps<{ menuTree: RouteRecordRaw[]; mode?: 'horizontal' }>()
+import { Fold, Expand } from '@element-plus/icons-vue'
+
+const props = withDefaults(
+  defineProps<{ menuTree: RouteRecordRaw[]; collapse?: boolean; mode?: 'horizontal' | 'vertical' }>(),
+  { menuTree: () => [], mode: 'vertical' }
+)
+
+const emits = defineEmits<{ (e: 'update:collapse', collapse: boolean): void }>()
+
+const toggleState = () => emits('update:collapse', !props.collapse)
 </script>
 
 <template>
-  <el-menu router :default-active="$route.path" :mode="mode">
+  <el-menu v-if="mode === 'horizontal'" router :default-active="$route.path" mode="horizontal">
     <sub-menu :menu-tree="menuTree" />
   </el-menu>
+  <div v-else>
+    <span v-show="!collapse">
+      <slot name="title" />
+    </span>
+    <el-scrollbar :height="collapse && $slots.title ? 'calc(100vh - 36px)' : 'calc(100vh - 86px)'">
+      <el-menu router :default-active="$route.path" :collapse="collapse">
+        <sub-menu :menu-tree="menuTree" />
+      </el-menu>
+    </el-scrollbar>
+    <div class="collapse" @click="toggleState()">
+      <el-icon :size="20">
+        <expand v-if="collapse" />
+        <fold v-else />
+      </el-icon>
+    </div>
+  </div>
 </template>
+
+<style scoped lang="scss">
+.collapse {
+  height: 35px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  border-top: 1px solid var(--el-border-color-lighter);
+
+  &:hover {
+    color: var(--el-color-primary);
+  }
+}
+</style>
diff --git a/diboot-admin-ui/src/store/app.ts b/diboot-admin-ui/src/store/app.ts
index 0c62472f..e948dda0 100644
--- a/diboot-admin-ui/src/store/app.ts
+++ b/diboot-admin-ui/src/store/app.ts
@@ -11,7 +11,7 @@ export default defineStore('app', {
       enableTabs: true,
       enableFooter: true,
       globalSize: 'default',
-      layout: 'dock'
+      layout: 'default'
     }
   },
   persist: {
-- 
Gitee


From 542e2cf34fed0a7dce803be31b162fc84d5e53a8 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 30 Apr 2022 19:30:26 +0800
Subject: [PATCH 078/195] * opt auto-import enabled eslintrc

---
 diboot-admin-ui/.eslintrc-auto-import.json | 68 ++++++++++++++++++++++
 diboot-admin-ui/.eslintrc.js               | 10 +++-
 diboot-admin-ui/vite.config.ts             |  4 +-
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 diboot-admin-ui/.eslintrc-auto-import.json

diff --git a/diboot-admin-ui/.eslintrc-auto-import.json b/diboot-admin-ui/.eslintrc-auto-import.json
new file mode 100644
index 00000000..aea76831
--- /dev/null
+++ b/diboot-admin-ui/.eslintrc-auto-import.json
@@ -0,0 +1,68 @@
+{
+  "globals": {
+    "_": "readonly",
+    "acceptHMRUpdate": "readonly",
+    "api": "readonly",
+    "baseURL": "readonly",
+    "computed": "readonly",
+    "createApp": "readonly",
+    "createPinia": "readonly",
+    "customRef": "readonly",
+    "defineAsyncComponent": "readonly",
+    "defineComponent": "readonly",
+    "defineStore": "readonly",
+    "effectScope": "readonly",
+    "EffectScope": "readonly",
+    "getActivePinia": "readonly",
+    "getCurrentInstance": "readonly",
+    "getCurrentScope": "readonly",
+    "h": "readonly",
+    "inject": "readonly",
+    "isReadonly": "readonly",
+    "isRef": "readonly",
+    "mapActions": "readonly",
+    "mapGetters": "readonly",
+    "mapState": "readonly",
+    "mapStores": "readonly",
+    "mapWritableState": "readonly",
+    "markRaw": "readonly",
+    "nextTick": "readonly",
+    "onActivated": "readonly",
+    "onBeforeMount": "readonly",
+    "onBeforeUnmount": "readonly",
+    "onBeforeUpdate": "readonly",
+    "onDeactivated": "readonly",
+    "onErrorCaptured": "readonly",
+    "onMounted": "readonly",
+    "onRenderTracked": "readonly",
+    "onRenderTriggered": "readonly",
+    "onScopeDispose": "readonly",
+    "onServerPrefetch": "readonly",
+    "onUnmounted": "readonly",
+    "onUpdated": "readonly",
+    "provide": "readonly",
+    "reactive": "readonly",
+    "readonly": "readonly",
+    "ref": "readonly",
+    "resolveComponent": "readonly",
+    "setActivePinia": "readonly",
+    "setMapStoreSuffix": "readonly",
+    "shallowReactive": "readonly",
+    "shallowReadonly": "readonly",
+    "shallowRef": "readonly",
+    "storeToRefs": "readonly",
+    "toRaw": "readonly",
+    "toRef": "readonly",
+    "toRefs": "readonly",
+    "triggerRef": "readonly",
+    "unref": "readonly",
+    "useAttrs": "readonly",
+    "useCssModule": "readonly",
+    "useCssVars": "readonly",
+    "useRoute": "readonly",
+    "useRouter": "readonly",
+    "useSlots": "readonly",
+    "watch": "readonly",
+    "watchEffect": "readonly"
+  }
+}
\ No newline at end of file
diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index 5df3e35f..86a823a1 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -10,7 +10,8 @@ module.exports = {
     'plugin:vue/vue3-recommended',
     'plugin:@typescript-eslint/recommended',
     'prettier',
-    'plugin:prettier/recommended'
+    'plugin:prettier/recommended',
+    './.eslintrc-auto-import.json'
   ],
   parserOptions: {
     ecmaVersion: 'latest',
@@ -18,12 +19,17 @@ module.exports = {
     sourceType: 'module'
   },
   plugins: ['vue', '@typescript-eslint', 'prettier'],
+  globals: {
+    defineProps: 'readonly',
+    defineEmits: 'readonly',
+    defineExpose: 'readonly',
+    withDefaults: 'readonly'
+  },
   rules: {
     '@typescript-eslint/no-explicit-any': 0,
     'comma-dangle': ['warn', 'only-multiline'],
     'vue/multi-word-component-names': 'off',
     'vue/html-self-closing': ['warn', { html: { void: 'always' } }],
-    'no-undef': 'off',
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'prettier/prettier': 'warn',
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index c2225ac4..4a5de8c0 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -23,7 +23,9 @@ export default defineConfig(({ command }) => {
         // 自动导入Api
         imports: ['vue', 'vue-router', 'pinia', { lodash: [['*', '_']] }, { '@/utils/request': ['api', 'baseURL'] }],
         // 为true时在项目根目录自动创建
-        dts: 'types/auto-imports.d.ts'
+        dts: 'types/auto-imports.d.ts',
+        // 启用 eslint
+        eslintrc: { enabled: true, globalsPropValue: 'readonly' }
       }),
       Components({
         // 解析器
-- 
Gitee


From 89e465df3580421a607da04274fdfb9dc80e2489 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 30 Apr 2022 22:36:35 +0800
Subject: [PATCH 079/195] * opt eslint config

---
 diboot-admin-ui/.eslintrc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index 86a823a1..5c452b53 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -23,7 +23,8 @@ module.exports = {
     defineProps: 'readonly',
     defineEmits: 'readonly',
     defineExpose: 'readonly',
-    withDefaults: 'readonly'
+    withDefaults: 'readonly',
+    NodeJS: 'readonly'
   },
   rules: {
     '@typescript-eslint/no-explicit-any': 0,
-- 
Gitee


From ce873ebedba17d2210de1690dccad9775b0646a9 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 5 May 2022 09:35:22 +0800
Subject: [PATCH 080/195] * opt tabs scroll

---
 diboot-admin-ui/src/layout/index.vue      | 16 ++++++++--------
 diboot-admin-ui/src/layout/tabs/index.vue | 20 +++++++-------------
 diboot-admin-ui/src/store/viewTabs.ts     |  2 +-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index fcd88c7f..d946a828 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -33,13 +33,13 @@ const isMenuCollapse = ref(false)
 <template>
   <el-container v-if="appStore.layout === 'default'">
     <el-container>
-      <el-aside :width="oneLevel.children?.length ? (isMenuCollapse ? '135px' : '260px') : '71px'">
+      <el-aside :width="oneLevel?.children?.length ? (isMenuCollapse ? '135px' : '260px') : '71px'">
         <div class="subfield">
           <div class="one-level">
             <div class="one-level-logo">
               <img :src="Logo" alt="Logo" style="height: 39px" />
             </div>
-            <el-menu :default-active="oneLevel.path">
+            <el-menu :default-active="oneLevel?.path">
               <el-menu-item v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
                 <el-icon :size="30">
                   <eleme />
@@ -48,10 +48,10 @@ const isMenuCollapse = ref(false)
               </el-menu-item>
             </el-menu>
           </div>
-          <div v-show="oneLevel.children?.length" class="submenu">
-            <app-menu v-model:collapse="isMenuCollapse" :menu-tree="oneLevel.children">
+          <div v-show="oneLevel?.children?.length" class="submenu">
+            <app-menu v-model:collapse="isMenuCollapse" :menu-tree="oneLevel?.children">
               <template #title>
-                <div class="title">{{ oneLevel.meta?.title }}</div>
+                <div class="title">{{ oneLevel?.meta?.title }}</div>
               </template>
             </app-menu>
           </div>
@@ -80,7 +80,7 @@ const isMenuCollapse = ref(false)
     <el-header height="50px" style="border-bottom: 1px solid #eee">
       <app-header>
         <template #dock>
-          <el-menu style="height: 50px" mode="horizontal" :default-active="oneLevel.path">
+          <el-menu style="height: 50px" mode="horizontal" :default-active="oneLevel?.path">
             <el-menu-item v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
               <el-icon :size="22">
                 <eleme />
@@ -92,8 +92,8 @@ const isMenuCollapse = ref(false)
       </app-header>
     </el-header>
     <el-container>
-      <el-aside v-show="oneLevel.children?.length" :width="isMenuCollapse ? '64px' : '220px'">
-        <app-menu v-model:collapse="isMenuCollapse" :menu-tree="oneLevel.children" />
+      <el-aside v-show="oneLevel?.children?.length" :width="isMenuCollapse ? '64px' : '220px'">
+        <app-menu v-model:collapse="isMenuCollapse" :menu-tree="oneLevel?.children" />
       </el-aside>
       <el-container>
         <el-main style="padding: 0">
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index 245e96f7..bac7109a 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -10,7 +10,7 @@ import { WatchStopHandle } from 'vue'
 const appStore = useAppStore()
 
 // tabs 滚动控制
-const tabsRef = ref<HTMLElement>()
+const tabsRef = ref()
 const tabsScrollRef = ref<InstanceType<typeof ElScrollbar>>()
 
 const showButtons = ref(false) // computed(() => (tabsRef.value?.clientWidth ?? 0) < (tabsRef.value?.scrollWidth ?? 0))
@@ -27,15 +27,9 @@ const scroll = ({ scrollLeft }: any) => {
 }
 
 // 手动滚动 Tabs 列表
-const operateScroll = (left = true) => {
-  const step = 50 // 步长，调解速度
+const operateScroll = (right = true) => {
   let deviation = (tabsRef.value?.clientWidth ?? 500) * 0.8
-  let timer = setInterval(() => {
-    tabsScrollRef.value?.setScrollLeft(tabsPosition.value + (left ? step : -step))
-    if ((deviation -= step) <= 0) {
-      clearInterval(timer)
-    }
-  }, 20)
+  tabsScrollRef.value?.scrollTo({ left: tabsPosition.value + (right ? deviation : -deviation), behavior: 'smooth' })
 }
 
 // tabs 收集
@@ -55,10 +49,10 @@ watch(
       collectTabs = watch(
         route,
         value => {
-          if (viewTabsStore.addTab(_.cloneDeep(value))) {
-            refreshButton()
-            operateScroll()
-          }
+          const index = viewTabsStore.addTab(_.cloneDeep(value))
+          refreshButton().then(() =>
+            tabsRef.value?.childNodes[0].childNodes[index]?.scrollIntoView({ behavior: 'smooth' })
+          )
         },
         { immediate: true }
       )
diff --git a/diboot-admin-ui/src/store/viewTabs.ts b/diboot-admin-ui/src/store/viewTabs.ts
index d15e40da..9064cd4e 100644
--- a/diboot-admin-ui/src/store/viewTabs.ts
+++ b/diboot-admin-ui/src/store/viewTabs.ts
@@ -45,7 +45,7 @@ export default defineStore({
       if (index === -1) this.tabList.push(route)
       else this.tabList.splice(index, 1, route)
       if (!route.meta.title) route.meta.title = 'no-title'
-      return index === -1
+      return index === -1 ? this.tabList.length - 1 : index
     },
     // 更新
     updateTabTitle(route: RouteLocationNormalized, title: string) {
-- 
Gitee


From 3314c50e42ef1aa93694d7038a1e4f48957005e4 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 5 May 2022 09:55:14 +0800
Subject: [PATCH 081/195] * opt logout

---
 diboot-admin-ui/src/layout/header/index.vue |  1 -
 diboot-admin-ui/src/router/index.ts         | 20 +++++++++++++++-----
 diboot-admin-ui/src/store/auth.ts           | 18 ++++++++++++------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index ed9a62a5..d84b8b2f 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -9,7 +9,6 @@ const router = useRouter()
 
 const logout = async () => {
   await authStore.logout()
-  router.push({ name: 'Login' }).finally()
 }
 
 const goPersonal = () => {
diff --git a/diboot-admin-ui/src/router/index.ts b/diboot-admin-ui/src/router/index.ts
index bf213812..23bacbbf 100644
--- a/diboot-admin-ui/src/router/index.ts
+++ b/diboot-admin-ui/src/router/index.ts
@@ -70,12 +70,22 @@ export const constantRoutes: RouteRecordRaw[] = [
 /**
  * 创建路由
  */
-const router = createRouter({
-  history: createWebHashHistory(import.meta.env.BASE_URL), // hash 模式
-  // history: createWebHistory(import.meta.env.BASE_URL), // HTML5 模式
-  routes: constantRoutes
-})
+const createAppRouter = () =>
+  createRouter({
+    history: createWebHashHistory(import.meta.env.BASE_URL), // hash 模式
+    // history: createWebHistory(import.meta.env.BASE_URL), // HTML5 模式
+    routes: constantRoutes
+  })
 
+const router = createAppRouter()
+
+// 添加路由守卫等
 createRouterGuard(router)
 
 export default router
+
+// 重置路由
+export const resetRouter = () => {
+  router.currentRoute.value.matched = createAppRouter().currentRoute.value.matched
+  router.go(0)
+}
diff --git a/diboot-admin-ui/src/store/auth.ts b/diboot-admin-ui/src/store/auth.ts
index a10f8e92..af0d7442 100644
--- a/diboot-admin-ui/src/store/auth.ts
+++ b/diboot-admin-ui/src/store/auth.ts
@@ -1,19 +1,24 @@
 import auth from '@/utils/auth'
+import { resetRouter } from '@/router'
 import { ElMessage } from 'element-plus'
 
-interface IAuthStore {
+export interface IAuthStore {
   realname: string
-  email: string
-  avatar: string
-  info: any
+  avatar?: string
+  info?: IUserInfo
+}
+
+export interface IUserInfo extends Record<string, unknown> {
+  realname?: string
+  avatar?: string
 }
 
 export default defineStore('auth', {
   state: () => {
     return <IAuthStore>{
       realname: '',
-      avatar: '',
-      info: null
+      avatar: undefined,
+      info: undefined
     }
   },
   actions: {
@@ -49,6 +54,7 @@ export default defineStore('auth', {
       } finally {
         auth.clearToken()
         this.$reset()
+        resetRouter()
       }
     }
   }
-- 
Gitee


From 84a1a83c3eec4fc4939d8c13cc43eeba07dc1d91 Mon Sep 17 00:00:00 2001
From: fullstackyang <8mQwYMHd3M94my7>
Date: Thu, 5 May 2022 10:09:40 +0800
Subject: [PATCH 082/195] =?UTF-8?q?+=20=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/src/layout/index.vue  | 31 +++++++++++++++++++++++----
 diboot-admin-ui/types/components.d.ts |  1 -
 diboot-core/pom.xml                   |  2 +-
 diboot-iam-starter/pom.xml            |  2 +-
 diboot-mobile-starter/pom.xml         |  2 +-
 pom.xml                               |  3 +--
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index fcd88c7f..56cbbb38 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -39,12 +39,18 @@ const isMenuCollapse = ref(false)
             <div class="one-level-logo">
               <img :src="Logo" alt="Logo" style="height: 39px" />
             </div>
-            <el-menu :default-active="oneLevel.path">
-              <el-menu-item v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
-                <el-icon :size="30">
+            <el-menu class="default-menu" :default-active="oneLevel.path">
+              <el-menu-item
+                v-for="item in menuTree"
+                :key="item.name"
+                class="default-menu-item"
+                :index="item.path"
+                @click="openOneLevel(item)"
+              >
+                <el-icon :size="24">
                   <eleme />
                 </el-icon>
-                <span>{{ item.meta?.title }}</span>
+                <span class="title">{{ item.meta?.title }}</span>
               </el-menu-item>
             </el-menu>
           </div>
@@ -210,4 +216,21 @@ const isMenuCollapse = ref(false)
     }
   }
 }
+.default-menu {
+  border: none;
+  .default-menu-item {
+    height: 70px !important;
+    width: 70px;
+    padding: 0 !important;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    text-align: center;
+    justify-content: center;
+    .title {
+      line-height: 24px;
+      font-size: 14px;
+    }
+  }
+}
 </style>
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 8607ee61..fffa6e95 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -25,7 +25,6 @@ declare module '@vue/runtime-core' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
-    ElResult: typeof import('element-plus/es')['ElResult']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
diff --git a/diboot-core/pom.xml b/diboot-core/pom.xml
index 3b3f4fbc..38a3f025 100644
--- a/diboot-core/pom.xml
+++ b/diboot-core/pom.xml
@@ -114,4 +114,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/diboot-iam-starter/pom.xml b/diboot-iam-starter/pom.xml
index c77ffd83..73b94a5d 100644
--- a/diboot-iam-starter/pom.xml
+++ b/diboot-iam-starter/pom.xml
@@ -82,4 +82,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/diboot-mobile-starter/pom.xml b/diboot-mobile-starter/pom.xml
index 189fdf04..d5c2d355 100644
--- a/diboot-mobile-starter/pom.xml
+++ b/diboot-mobile-starter/pom.xml
@@ -59,4 +59,4 @@
         </dependency>
 
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 24cbffb1..c1a8b4d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,5 +56,4 @@
         </dependency>
 
     </dependencies>
-
-</project>
\ No newline at end of file
+</project>
-- 
Gitee


From 9313211ffe8686877711ad2aec3fbcfb47db6b25 Mon Sep 17 00:00:00 2001
From: fullstackyang <8mQwYMHd3M94my7>
Date: Thu, 5 May 2022 10:25:18 +0800
Subject: [PATCH 083/195] =?UTF-8?q?+=20=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/src/layout/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 7d9734f8..56f4b5d2 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -40,7 +40,13 @@ const isMenuCollapse = ref(false)
               <img :src="Logo" alt="Logo" style="height: 39px" />
             </div>
             <el-menu class="default-menu" :default-active="oneLevel?.path">
-              <el-menu-item class="default-menu-item" v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
+              <el-menu-item
+                v-for="item in menuTree"
+                :key="item.name"
+                class="default-menu-item"
+                :index="item.path"
+                @click="openOneLevel(item)"
+              >
                 <el-icon :size="30">
                   <eleme />
                 </el-icon>
-- 
Gitee


From c46702654cae10e11f39ab77c50deb688be42185 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 5 May 2022 10:31:10 +0800
Subject: [PATCH 084/195] * style tabs

---
 diboot-admin-ui/src/layout/header/index.vue | 1 +
 diboot-admin-ui/src/layout/tabs/index.vue   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index d84b8b2f..55cf68f1 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -74,5 +74,6 @@ const appStore = useAppStore()
   display: flex;
   align-items: center;
   padding: 0 10px;
+  cursor: pointer;
 }
 </style>
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index bac7109a..2a1494c6 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -170,7 +170,7 @@ const fullScreenTabsView = () => {
       >
         <arrow-right />
       </el-icon>
-      <el-dropdown size="small">
+      <el-dropdown>
         <el-icon :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
           <Menu />
         </el-icon>
@@ -190,7 +190,7 @@ const fullScreenTabsView = () => {
     </div>
   </div>
   <!-- tab 菜单 -->
-  <el-dropdown ref="contentMenu" trigger="click" size="small" :style="menu.locator" style="position: fixed">
+  <el-dropdown ref="contentMenu" trigger="click" :style="menu.locator" style="position: fixed">
     <div ref="contentMenuTarget" />
     <template #dropdown>
       <el-dropdown-menu>
@@ -229,7 +229,7 @@ const fullScreenTabsView = () => {
 
   .tabs {
     display: flex;
-    margin: 0 3px;
+    margin: 0 10px;
 
     .el-button {
       height: 30px;
-- 
Gitee


From 633ce84c1d93969742ff34b14a4e5e3973dc8324 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 5 May 2022 11:12:59 +0800
Subject: [PATCH 085/195] =?UTF-8?q?*=20context=E7=9B=91=E5=90=AC=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BAApplicationReadyEvent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/core/util/ContextHelper.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
index e88ece4a..d0eb5581 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
@@ -28,11 +28,11 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.ContextLoader;
@@ -50,7 +50,7 @@ import java.util.Map;
  */
 @Component
 @Lazy(false)
-public class ContextHelper implements ApplicationContextAware, ApplicationListener<ContextRefreshedEvent> {
+public class ContextHelper implements ApplicationContextAware, ApplicationListener<ApplicationReadyEvent> {
     private static final Logger log = LoggerFactory.getLogger(ContextHelper.class);
 
     /***
@@ -66,11 +66,13 @@ public class ContextHelper implements ApplicationContextAware, ApplicationListen
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         APPLICATION_CONTEXT = applicationContext;
+        log.debug("ApplicationContext已赋值: {}", APPLICATION_CONTEXT.toString());
     }
 
     @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
+    public void onApplicationEvent(ApplicationReadyEvent event) {
         APPLICATION_CONTEXT = event.getApplicationContext();
+        log.debug("ApplicationContext已注入: {}", APPLICATION_CONTEXT.toString());
     }
 
     /***
@@ -78,6 +80,7 @@ public class ContextHelper implements ApplicationContextAware, ApplicationListen
      */
     public static ApplicationContext getApplicationContext() {
         if (APPLICATION_CONTEXT == null){
+            log.debug("ApplicationContext未初始化，通过ContextLoader获取!");
             APPLICATION_CONTEXT = ContextLoader.getCurrentWebApplicationContext();
         }
         if(APPLICATION_CONTEXT == null){
-- 
Gitee


From d5e0960a4e2848fa86605a52ce5e17ce673d4f7b Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 5 May 2022 11:23:09 +0800
Subject: [PATCH 086/195] * style menu background-color

---
 diboot-admin-ui/src/layout/index.vue        | 8 ++++++++
 diboot-admin-ui/src/layout/memu/subMenu.vue | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 56f4b5d2..a66a508b 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -173,6 +173,11 @@ const isMenuCollapse = ref(false)
   -webkit-transition: width 0.3s;
 }
 
+.el-sub-menu.is-active,
+.el-menu-item.is-active {
+  background-color: var(--el-color-primary-light-9) !important;
+}
+
 .subfield {
   display: flex;
 
@@ -216,8 +221,10 @@ const isMenuCollapse = ref(false)
     }
   }
 }
+
 .default-menu {
   border: none;
+
   .default-menu-item {
     height: 70px !important;
     width: 70px;
@@ -227,6 +234,7 @@ const isMenuCollapse = ref(false)
     align-items: center;
     text-align: center;
     justify-content: center;
+
     .title {
       line-height: 24px;
       font-size: 14px;
diff --git a/diboot-admin-ui/src/layout/memu/subMenu.vue b/diboot-admin-ui/src/layout/memu/subMenu.vue
index 363c499d..acb6aa91 100644
--- a/diboot-admin-ui/src/layout/memu/subMenu.vue
+++ b/diboot-admin-ui/src/layout/memu/subMenu.vue
@@ -24,3 +24,9 @@ defineProps<{ menuTree: RouteRecordRaw[] }>()
     </el-menu-item>
   </template>
 </template>
+
+<style scoped lang="scss">
+.el-menu-item.is-active {
+  background-color: var(--el-color-primary-light-9);
+}
+</style>
-- 
Gitee


From 9b596daa8a0e592633fb4ae7bfe8e11aa1bff780 Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Thu, 5 May 2022 12:06:10 +0800
Subject: [PATCH 087/195] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=89=80=E6=9C=89tab=E8=B7=AF=E7=94=B1=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E8=B7=AF=E7=94=B1=E6=97=A0=E6=B3=95=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=9B=9E=E5=88=B0dashboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/src/layout/index.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 56f4b5d2..fa54f90d 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -19,7 +19,6 @@ const appStore = useAppStore()
 const menuTree = getMenuTree()
 
 const router = useRouter()
-
 const oneLevel = ref<RouteRecordRaw>()
 const openOneLevel = (menu: RouteRecordRaw) => {
   oneLevel.value = menu
@@ -28,6 +27,16 @@ const openOneLevel = (menu: RouteRecordRaw) => {
 openOneLevel(menuTree[0])
 
 const isMenuCollapse = ref(false)
+
+watch(
+  () => router.currentRoute.value,
+  value => {
+    // 存在redirect，且存在title（（上级菜单menu中显示的情况））
+    // 或
+    // 路径匹配（上级菜单menu中不显示的情况）
+    oneLevel.value = value.matched.find(item => (item.redirect && item.meta.title) || item.path === value.path)
+  }
+)
 </script>
 
 <template>
-- 
Gitee


From ceb0e81965d65a66e9ae174c0a11fc85ec1f5ce7 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 5 May 2022 16:09:17 +0800
Subject: [PATCH 088/195] =?UTF-8?q?*=20=E7=AE=80=E5=8C=96=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/diboot/iam/starter/IamPluginInitializer.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
index 94ab4b9a..58848fc8 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
@@ -99,8 +99,8 @@ public class IamPluginInitializer implements ApplicationRunner {
         IamResourcePermissionService resourcePermissionService = ContextHelper.getBean(IamResourcePermissionService.class);
         if(resourcePermissionService != null && !resourcePermissionService.exists(IamResourcePermission::getResourceCode, "system")){
             String[] RESOURCE_PERMISSION_DATA = {
-                    "{\"displayType\":\"MENU\",\"displayName\":\"系统管理\",\"resourceCode\":\"system\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"数据字典管理\",\"resourceCode\":\"Dictionary\",\"permissionCode\":\"Dictionary:list\",\"sortId\":\"10030\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Dictionary:detail\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"Dictionary:create\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"Dictionary:update,Dictionary:detail\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"Dictionary:delete\",\"sortId\":\"3\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统用户管理\",\"resourceCode\":\"IamUser\",\"permissionCode\":\"IamUser:list\",\"sortId\":\"10029\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"部门查看\",\"resourceCode\":\"orgTree\",\"permissionCode\":\"IamUser:tree\",\"sortId\":\"12\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:detail\",\"sortId\":\"11\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:create\",\"sortId\":\"10\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:update,IamUser:detail\",\"sortId\":\"9\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:delete\",\"sortId\":\"8\"}]},{\"displayType\":\"MENU\",\"displayName\":\"角色资源管理\",\"resourceCode\":\"IamRole\",\"permissionCode\":\"IamRole:list\",\"sortId\":\"10023\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamRole:detail\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamRole:create\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamRole:update,IamRole:detail,IamResourcePermission:list\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamRole:delete\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"资源权限管理\",\"resourceCode\":\"IamResourcePermission\",\"permissionCode\":\"IamResourcePermission:list\",\"sortId\":\"10017\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamResourcePermission:detail\",\"sortId\":\"23\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamResourcePermission:create\",\"sortId\":\"21\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamResourcePermission:update,IamResourcePermission:detail\",\"sortId\":\"20\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamResourcePermission:delete\",\"sortId\":\"19\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamResourcePermission:update\",\"sortId\":\"18\"}]},{\"displayType\":\"MENU\",\"displayName\":\"定时任务管理\",\"resourceCode\":\"ScheduleJob\",\"permissionCode\":\"ScheduleJob:list\",\"sortId\":\"10012\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"ScheduleJob:delete\",\"sortId\":\"7\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"ScheduleJob:update,ScheduleJob:detail\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"ScheduleJob:create\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"ScheduleJob:detail,ScheduleJob:JOB_LOG_LIST,ScheduleJob:JOB_LOG_DETAIL\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"运行一次\",\"resourceCode\":\"executeOnce\",\"permissionCode\":\"ScheduleJob:EXECUTE_ONCE_JOB\",\"sortId\":\"3\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志记录\",\"resourceCode\":\"logList\",\"permissionCode\":\"ScheduleJob:JOB_LOG_LIST,ScheduleJob:JOB_LOG_DETAIL\",\"sortId\":\"2\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志删除\",\"resourceCode\":\"logDelete\",\"permissionCode\":\"ScheduleJob:JOB_LOG_DELETE\",\"sortId\":\"1\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息模板管理\",\"resourceCode\":\"MessageTemplate\",\"permissionCode\":\"MessageTemplate:list\",\"sortId\":\"10010\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"MessageTemplate:detail\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"MessageTemplate:create\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"MessageTemplate:update,MessageTemplate:detail\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"MessageTemplate:delete\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息记录管理\",\"resourceCode\":\"Message\",\"permissionCode\":\"Message:list\",\"sortId\":\"10009\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Message:detail\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"上传文件管理\",\"resourceCode\":\"UploadFile\",\"permissionCode\":\"UploadFile:list\",\"sortId\":\"10008\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"UploadFile:detail\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"UploadFile:update,UploadFile:detail\",\"sortId\":\"14\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统配置管理\",\"resourceCode\":\"SystemConfig\",\"permissionCode\":\"SystemConfig:list,SystemConfig:detail\",\"sortId\":\"10007\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"SystemConfig:update\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"操作日志查看\",\"resourceCode\":\"IamOperationLog\",\"permissionCode\":\"IamOperationLog:list\",\"sortId\":\"10006\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOperationLog:detail\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"登录日志查看\",\"resourceCode\":\"IamLoginTrace\",\"permissionCode\":\"IamLoginTrace:list\",\"sortId\":\"10001\",\"children\":[]}]}",
-                    "{\"displayType\":\"MENU\",\"displayName\":\"组织机构\",\"resourceCode\":\"orgStructure\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"组织机构管理\",\"resourceCode\":\"IamOrg\",\"permissionCode\":\"IamOrg:sort,IamOrg:tree,IamOrg:subTree,IamOrg:list\",\"sortId\":\"10044\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamOrg:sort\",\"sortId\":\"106\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamOrg:delete\",\"sortId\":\"105\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamOrg:update,IamOrg:detail\",\"sortId\":\"104\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamOrg:create\",\"sortId\":\"103\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOrg:detail\",\"sortId\":\"102\"}]},{\"displayType\":\"MENU\",\"displayName\":\"岗位管理\",\"resourceCode\":\"IamPosition\",\"permissionCode\":\"IamPosition:list\",\"sortId\":\"10038\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamPosition:delete\",\"sortId\":\"112\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamPosition:detail\",\"sortId\":\"111\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamPosition:update,IamPosition:detail\",\"sortId\":\"110\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamPosition:create\",\"sortId\":\"108\"}]},{\"displayType\":\"MENU\",\"displayName\":\"组织人员管理\",\"resourceCode\":\"IamOrgUser\",\"permissionCode\":\"IamOrg:tree,IamUser:list\",\"sortId\":\"10032\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:create\",\"sortId\":\"40\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:update,IamUser:detail\",\"sortId\":\"39\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:delete\",\"sortId\":\"38\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:detail\",\"sortId\":\"37\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导入\",\"resourceCode\":\"import\",\"permissionCode\":\"IamUserExcel:import\",\"sortId\":\"36\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导出\",\"resourceCode\":\"export\",\"permissionCode\":\"IamUserExcel:export\",\"sortId\":\"35\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"人员岗位设置\",\"resourceCode\":\"position\",\"permissionCode\":\"IamPosition:update,IamPosition:listByUserInfo\",\"sortId\":\"34\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"添加岗位\",\"resourceCode\":\"addPosition\",\"permissionCode\":\"IamPosition:create\",\"sortId\":\"33\"}]}]}"
+                    "{\"displayType\":\"MENU\",\"displayName\":\"系统管理\",\"resourceCode\":\"system\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"数据字典管理\",\"resourceCode\":\"Dictionary\",\"permissionCode\":\"Dictionary:read\",\"sortId\":\"10030\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Dictionary:read\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"Dictionary:write\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"Dictionary:write,Dictionary:read\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"Dictionary:write\",\"sortId\":\"3\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统用户管理\",\"resourceCode\":\"IamUser\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"10029\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"部门查看\",\"resourceCode\":\"orgTree\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"12\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"11\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"10\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:write,IamUser:read\",\"sortId\":\"9\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"8\"}]},{\"displayType\":\"MENU\",\"displayName\":\"角色资源管理\",\"resourceCode\":\"IamRole\",\"permissionCode\":\"IamRole:read\",\"sortId\":\"10023\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamRole:read\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamRole:write\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamRole:write,IamRole:read,IamResourcePermission:read\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamRole:write\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"资源权限管理\",\"resourceCode\":\"IamResourcePermission\",\"permissionCode\":\"IamResourcePermission:read\",\"sortId\":\"10017\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamResourcePermission:read\",\"sortId\":\"23\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamResourcePermission:write\",\"sortId\":\"21\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamResourcePermission:write,IamResourcePermission:read\",\"sortId\":\"20\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamResourcePermission:write\",\"sortId\":\"19\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamResourcePermission:write\",\"sortId\":\"18\"}]},{\"displayType\":\"MENU\",\"displayName\":\"定时任务管理\",\"resourceCode\":\"ScheduleJob\",\"permissionCode\":\"ScheduleJob:read\",\"sortId\":\"10012\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"7\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"ScheduleJob:write,ScheduleJob:read\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"ScheduleJob:read\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"运行一次\",\"resourceCode\":\"executeOnce\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"3\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志记录\",\"resourceCode\":\"logList\",\"permissionCode\":\"ScheduleJob:read\",\"sortId\":\"2\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志删除\",\"resourceCode\":\"logDelete\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"1\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息模板管理\",\"resourceCode\":\"MessageTemplate\",\"permissionCode\":\"MessageTemplate:read\",\"sortId\":\"10010\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"MessageTemplate:read\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"MessageTemplate:write\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"MessageTemplate:write,MessageTemplate:read\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"MessageTemplate:write\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息记录管理\",\"resourceCode\":\"Message\",\"permissionCode\":\"Message:read\",\"sortId\":\"10009\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Message:read\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"上传文件管理\",\"resourceCode\":\"UploadFile\",\"permissionCode\":\"UploadFile:read\",\"sortId\":\"10008\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"UploadFile:read\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"UploadFile:write,UploadFile:read\",\"sortId\":\"14\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统配置管理\",\"resourceCode\":\"SystemConfig\",\"permissionCode\":\"SystemConfig:read\",\"sortId\":\"10007\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"SystemConfig:write\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"操作日志查看\",\"resourceCode\":\"IamOperationLog\",\"permissionCode\":\"IamOperationLog:read\",\"sortId\":\"10006\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOperationLog:read\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"登录日志查看\",\"resourceCode\":\"IamLoginTrace\",\"permissionCode\":\"IamLoginTrace:read\",\"sortId\":\"10001\",\"children\":[]}]}",
+                    "{\"displayType\":\"MENU\",\"displayName\":\"组织机构\",\"resourceCode\":\"orgStructure\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"组织机构管理\",\"resourceCode\":\"IamOrg\",\"permissionCode\":\"IamOrg:read\",\"sortId\":\"10044\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"106\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"105\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamOrg:write,IamOrg:read\",\"sortId\":\"104\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"103\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOrg:read\",\"sortId\":\"102\"}]},{\"displayType\":\"MENU\",\"displayName\":\"岗位管理\",\"resourceCode\":\"IamPosition\",\"permissionCode\":\"IamPosition:read\",\"sortId\":\"10038\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"112\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamPosition:read\",\"sortId\":\"111\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamPosition:write,IamPosition:read\",\"sortId\":\"110\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"108\"}]},{\"displayType\":\"MENU\",\"displayName\":\"组织人员管理\",\"resourceCode\":\"IamOrgUser\",\"permissionCode\":\"IamOrg:read,IamUser:read\",\"sortId\":\"10032\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"40\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:write,IamUser:read\",\"sortId\":\"39\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"38\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"37\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导入\",\"resourceCode\":\"import\",\"permissionCode\":\"IamUserExcel:import\",\"sortId\":\"36\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导出\",\"resourceCode\":\"export\",\"permissionCode\":\"IamUserExcel:export\",\"sortId\":\"35\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"人员岗位设置\",\"resourceCode\":\"position\",\"permissionCode\":\"IamPosition:write,IamPosition:read\",\"sortId\":\"34\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"添加岗位\",\"resourceCode\":\"addPosition\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"33\"}]}]}"
             };
             // 插入多层级资源权限初始数据
             try {
-- 
Gitee


From 2e2c0386328084de6d04078b9ad2ad85b4fc3cf6 Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Fri, 6 May 2022 13:57:30 +0800
Subject: [PATCH 089/195] + add attachMore and system menu

---
 diboot-admin-ui/mock/auth/index.ts            | 20 +++++
 diboot-admin-ui/mock/utils/attachMore.ts      | 49 +++++++++++
 diboot-admin-ui/src/utils/attachMore.ts       | 34 ++++++++
 .../system/iamResourcePermission/list.vue     | 86 +++++++++++++++++++
 diboot-admin-ui/types/components.d.ts         |  2 +
 5 files changed, 191 insertions(+)
 create mode 100644 diboot-admin-ui/mock/utils/attachMore.ts
 create mode 100644 diboot-admin-ui/src/utils/attachMore.ts
 create mode 100644 diboot-admin-ui/src/views/system/iamResourcePermission/list.vue

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index 824e245a..e2ed304e 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -93,5 +93,25 @@ const authMenu = [
         }
       }
     ]
+  },
+  {
+    path: '/system',
+    name: 'System',
+    redirect: '/system/iamResourcePermission',
+    meta: { title: '系统管理', componentName: 'Layout' },
+    children: [
+      {
+        path: 'iamResourcePermission',
+        name: 'iamResourcePermission-@increment',
+        meta: {
+          title: '资源权限管理',
+          componentName: 'IamResourcePermissionList',
+          sort: '@natural',
+          keepAlive: false,
+          hollow: '@boolean',
+          hideFooter: '@boolean'
+        }
+      }
+    ]
   }
 ]
diff --git a/diboot-admin-ui/mock/utils/attachMore.ts b/diboot-admin-ui/mock/utils/attachMore.ts
new file mode 100644
index 00000000..f317c798
--- /dev/null
+++ b/diboot-admin-ui/mock/utils/attachMore.ts
@@ -0,0 +1,49 @@
+import { MockMethod } from 'vite-plugin-mock'
+import JsonResult from '../_util'
+import { Random } from 'mockjs'
+
+const baseUrl = '/api'
+
+export default [
+  {
+    url: `${baseUrl}/common/attachMore`,
+    timeout: Random.natural(50, 100),
+    method: 'post',
+    response: () => {
+      return JsonResult.OK({
+        genderOptions: [
+          {
+            label: '女',
+            value: 'F'
+          },
+          {
+            label: '男',
+            value: 'M'
+          }
+        ],
+        iamUserOptions: [
+          {
+            label: '超级管理员',
+            value: 10000,
+            ext: '000'
+          }
+        ]
+      })
+    }
+  },
+  {
+    url: `${baseUrl}/iamResource/attachMore`,
+    timeout: Random.natural(50, 100),
+    method: 'get',
+    response: () => {
+      return JsonResult.OK({
+        iamResourceOptions: [
+          {
+            label: '测试权限',
+            value: 10000
+          }
+        ]
+      })
+    }
+  }
+]
diff --git a/diboot-admin-ui/src/utils/attachMore.ts b/diboot-admin-ui/src/utils/attachMore.ts
new file mode 100644
index 00000000..a0c99bc2
--- /dev/null
+++ b/diboot-admin-ui/src/utils/attachMore.ts
@@ -0,0 +1,34 @@
+import { api } from '@/utils/request'
+export interface IAttachMore {
+  target: string // 对象名 / 字典名
+  module?: string // 模块名（用于cloud指定module，默认当前module）
+  alias?: string // 指定别名（默认为：target的小驼峰+Options）since v2.5.0
+  label?: string // 对象的属性名，查询作为label的属性名称
+  value?: string // 对象的属性名，，需要查询作为value的属性名称
+  ext?: string // 对象的属性名，需要查询作为ext的属性名称 (扩展值，一般用于特殊情景)
+  condition?: { [label: string]: string | Array<any> | null } // 查询条件
+}
+//
+export interface ILabelValue {
+  label: string
+  value: any
+  ext?: any
+}
+
+export type LabelValue = { [label: string]: ILabelValue[] }
+/**
+ * attachMore请求
+ * @param attachMoreList
+ * @param baseApi 设置api，表示发起个性化请求
+ */
+export const useAttachMore = (attachMoreList?: IAttachMore[], baseApi?: string): LabelValue => {
+  const more = reactive<LabelValue>({})
+  api.post<LabelValue>('/common/attachMore', attachMoreList).then(res => {
+    Object.assign(more, res.code === 0 ? res.data : {})
+  })
+  baseApi &&
+    api.get<LabelValue>(`${baseApi}/attachMore`).then(res => {
+      Object.assign(more, res.code === 0 ? res.data : {})
+    })
+  return more
+}
diff --git a/diboot-admin-ui/src/views/system/iamResourcePermission/list.vue b/diboot-admin-ui/src/views/system/iamResourcePermission/list.vue
new file mode 100644
index 00000000..f9c81d0b
--- /dev/null
+++ b/diboot-admin-ui/src/views/system/iamResourcePermission/list.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts" name="IamResourcePermissionList">
+import { useAttachMore, LabelValue } from '@/utils/attachMore'
+// script
+const queryParams = reactive({})
+const onSubmit = () => {
+  console.log(queryParams)
+}
+const more: LabelValue = useAttachMore([{}], '/iamResource')
+
+type User = {
+  id: number
+  date: string
+  name: string
+  hasChildren?: boolean
+  children?: User[]
+}
+const tableData: User[] = [
+  {
+    id: 1,
+    date: '2016-05-02',
+    name: 'wangxiaohu'
+  },
+  {
+    id: 2,
+    date: '2016-05-04',
+    name: 'wangxiaohu'
+  },
+  {
+    id: 3,
+    date: '2016-05-01',
+    name: 'wangxiaohu',
+    children: [
+      {
+        id: 31,
+        date: '2016-05-01',
+        name: 'wangxiaohu'
+      },
+      {
+        id: 32,
+        date: '2016-05-01',
+        name: 'wangxiaohu'
+      }
+    ]
+  },
+  {
+    id: 4,
+    date: '2016-05-03',
+    name: 'wangxiaohu'
+  }
+]
+</script>
+<template>
+  <div class="list-container">
+    <div class="search-container">
+      <el-form :inline="true" :model="queryParams" class="demo-form-inline">
+        <el-form-item label="菜单名称">
+          <el-input v-model="queryParams.displayName" placeholder="菜单名称" />
+        </el-form-item>
+        <el-form-item label="菜单编码">
+          <el-input v-model="queryParams.resourceCode" placeholder="菜单编码" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">查询</el-button>
+          <el-button @click="onSubmit">重置</el-button>
+          <el-button @click="onSubmit">{{ more.genderOptions && more.genderOptions[0].label }}</el-button>
+          <el-button @click="onSubmit">{{ more.iamResourceOptions && more.iamResourceOptions[0].label }}</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table-container">
+      <el-table :data="tableData" row-key="id" default-expand-all>
+        <el-table-column prop="date" label="菜单名称" />
+        <el-table-column prop="name" label="菜单编码" />
+        <el-table-column prop="name" label="页面按钮权限" />
+        <el-table-column prop="name" label="创建时间" />
+        <el-table-column prop="date" label="操作" />
+      </el-table>
+    </div>
+  </div>
+</template>
+<style scoped lang="scss">
+.list-container {
+  background-color: #fff;
+  padding: 12px;
+}
+</style>
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index fffa6e95..980c5e0a 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -29,6 +29,8 @@ declare module '@vue/runtime-core' {
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     HelloWorld: typeof import('@/components/HelloWorld.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-- 
Gitee


From 714e24d8ac9967e1f9617f94912698ae45006662 Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Fri, 6 May 2022 14:59:02 +0800
Subject: [PATCH 090/195] * attachMore rename with relatedData

---
 .../utils/{attachMore.ts => relatedData.ts}   |  0
 .../utils/{attachMore.ts => relatedData.ts}   | 32 +++++++++++--------
 .../system/iamResourcePermission/list.vue     | 10 +++---
 .../pages/component-page/crud/list.vue        |  7 ++--
 4 files changed, 27 insertions(+), 22 deletions(-)
 rename diboot-admin-ui/mock/utils/{attachMore.ts => relatedData.ts} (100%)
 rename diboot-admin-ui/src/utils/{attachMore.ts => relatedData.ts} (51%)

diff --git a/diboot-admin-ui/mock/utils/attachMore.ts b/diboot-admin-ui/mock/utils/relatedData.ts
similarity index 100%
rename from diboot-admin-ui/mock/utils/attachMore.ts
rename to diboot-admin-ui/mock/utils/relatedData.ts
diff --git a/diboot-admin-ui/src/utils/attachMore.ts b/diboot-admin-ui/src/utils/relatedData.ts
similarity index 51%
rename from diboot-admin-ui/src/utils/attachMore.ts
rename to diboot-admin-ui/src/utils/relatedData.ts
index a0c99bc2..88b07aaa 100644
--- a/diboot-admin-ui/src/utils/attachMore.ts
+++ b/diboot-admin-ui/src/utils/relatedData.ts
@@ -1,34 +1,40 @@
 import { api } from '@/utils/request'
-export interface IAttachMore {
+export interface RelatedDataConfig {
   target: string // 对象名 / 字典名
+  cache?: boolean // 数据是否缓存 TODO
   module?: string // 模块名（用于cloud指定module，默认当前module）
-  alias?: string // 指定别名（默认为：target的小驼峰+Options）since v2.5.0
+  alias?: string // 指定别名（默认为：target的小驼峰+Options）
   label?: string // 对象的属性名，查询作为label的属性名称
   value?: string // 对象的属性名，，需要查询作为value的属性名称
   ext?: string // 对象的属性名，需要查询作为ext的属性名称 (扩展值，一般用于特殊情景)
   condition?: { [label: string]: string | Array<any> | null } // 查询条件
 }
-//
 export interface ILabelValue {
   label: string
   value: any
   ext?: any
 }
-
 export type LabelValue = { [label: string]: ILabelValue[] }
 /**
- * attachMore请求
- * @param attachMoreList
+ * useLoadRelatedData 请求
+ * @param relatedDataConfigList
  * @param baseApi 设置api，表示发起个性化请求
  */
-export const useAttachMore = (attachMoreList?: IAttachMore[], baseApi?: string): LabelValue => {
+export const useLoadRelatedData = (relatedDataConfigList: RelatedDataConfig[], baseApi?: string): LabelValue => {
   const more = reactive<LabelValue>({})
-  api.post<LabelValue>('/common/attachMore', attachMoreList).then(res => {
-    Object.assign(more, res.code === 0 ? res.data : {})
-  })
-  baseApi &&
-    api.get<LabelValue>(`${baseApi}/attachMore`).then(res => {
-      Object.assign(more, res.code === 0 ? res.data : {})
+  const requestList = []
+  // add 通用接口
+  relatedDataConfigList &&
+    relatedDataConfigList.length > 0 &&
+    requestList.push(api.post<LabelValue>('/common/attachMore', relatedDataConfigList))
+  // add 个性化接口
+  baseApi && requestList.push(api.get<LabelValue>(`${baseApi}/attachMore`))
+  // send api and set more
+  requestList.length > 0 &&
+    Promise.all(requestList).then(results => {
+      results.forEach(result => {
+        Object.assign(more, result.code === 0 ? result.data : {})
+      })
     })
   return more
 }
diff --git a/diboot-admin-ui/src/views/system/iamResourcePermission/list.vue b/diboot-admin-ui/src/views/system/iamResourcePermission/list.vue
index f9c81d0b..d807013a 100644
--- a/diboot-admin-ui/src/views/system/iamResourcePermission/list.vue
+++ b/diboot-admin-ui/src/views/system/iamResourcePermission/list.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts" name="IamResourcePermissionList">
-import { useAttachMore, LabelValue } from '@/utils/attachMore'
+import { useLoadRelatedData } from '@/utils/relatedData'
 // script
 const queryParams = reactive({})
 const onSubmit = () => {
   console.log(queryParams)
 }
-const more: LabelValue = useAttachMore([{}], '/iamResource')
+const relatedData = useLoadRelatedData([{}], '/iamResource')
 
 type User = {
   id: number
@@ -53,17 +53,15 @@ const tableData: User[] = [
   <div class="list-container">
     <div class="search-container">
       <el-form :inline="true" :model="queryParams" class="demo-form-inline">
-        <el-form-item label="菜单名称">
+        <el-form-item>
           <el-input v-model="queryParams.displayName" placeholder="菜单名称" />
         </el-form-item>
-        <el-form-item label="菜单编码">
+        <el-form-item>
           <el-input v-model="queryParams.resourceCode" placeholder="菜单编码" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="onSubmit">查询</el-button>
           <el-button @click="onSubmit">重置</el-button>
-          <el-button @click="onSubmit">{{ more.genderOptions && more.genderOptions[0].label }}</el-button>
-          <el-button @click="onSubmit">{{ more.iamResourceOptions && more.iamResourceOptions[0].label }}</el-button>
         </el-form-item>
       </el-form>
     </div>
diff --git a/diboot-mobile-ui/pages/component-page/crud/list.vue b/diboot-mobile-ui/pages/component-page/crud/list.vue
index cd1ad27a..29db3847 100644
--- a/diboot-mobile-ui/pages/component-page/crud/list.vue
+++ b/diboot-mobile-ui/pages/component-page/crud/list.vue
@@ -17,8 +17,8 @@
 					@click="handleActionClick"
 					@open="handleActiveSwipeAction">
 					<di-descriptions :title="item.title" label-col="4" value-col="8" :border-bottom="true" >
-						<di-descriptions-item label="文字省略" value="你好你好你好你好你好你好你好你好你好你好你好你好你好你好" :ellipsis="true"/>
-						<di-descriptions-item label="createTime" :value="item.createTime"/>
+						<di-descriptions-item label="姓名" :value="item.value" :ellipsis="true"/>
+						<di-descriptions-item label="创建时间" :value="item.createTime"/>
 					</di-descriptions>
 				</u-swipe-action>
 			</view>
@@ -51,7 +51,8 @@
 					for (let i = 1; i <= this.page.pageSize; i++) {
 						list.push({
 							id: ++count,
-							title: '列表展示 ' + count,
+							title: '标题' + count,
+							value: 'Didoot',
 							createTime: '2021-11-22 10:27'
 						})
 					}
-- 
Gitee


From ec5bd3b29d57f2a6c0f3125f1a080bfb5b646b36 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 7 May 2022 00:09:24 +0800
Subject: [PATCH 091/195] + add icon-select

---
 .../src/assets/svg/TextFontSize.svg           |  1 +
 diboot-admin-ui/src/assets/svg/index.ts       |  8 +++
 diboot-admin-ui/src/components/HelloWorld.vue | 48 --------------
 .../src/components/icon/library.ts            | 15 +++++
 .../src/components/icon/select.vue            | 64 +++++++++++++++++++
 diboot-admin-ui/src/components/icon/show.vue  | 13 ++++
 diboot-admin-ui/src/layout/header/index.vue   |  4 +-
 diboot-admin-ui/src/views/dashboard/index.vue | 15 ++++-
 diboot-admin-ui/types/components.d.ts         | 10 ++-
 9 files changed, 125 insertions(+), 53 deletions(-)
 create mode 100644 diboot-admin-ui/src/assets/svg/TextFontSize.svg
 create mode 100644 diboot-admin-ui/src/assets/svg/index.ts
 delete mode 100644 diboot-admin-ui/src/components/HelloWorld.vue
 create mode 100644 diboot-admin-ui/src/components/icon/library.ts
 create mode 100644 diboot-admin-ui/src/components/icon/select.vue
 create mode 100644 diboot-admin-ui/src/components/icon/show.vue

diff --git a/diboot-admin-ui/src/assets/svg/TextFontSize.svg b/diboot-admin-ui/src/assets/svg/TextFontSize.svg
new file mode 100644
index 00000000..e09eb4a0
--- /dev/null
+++ b/diboot-admin-ui/src/assets/svg/TextFontSize.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 20 20"><g fill="none"><path d="M13 3.5a.5.5 0 0 1 .468.324l2.996 7.99a.515.515 0 0 1 .008.021l1.496 3.99a.5.5 0 1 1-.936.35L15.654 12.5h-5.307l-1.379 3.676a.5.5 0 0 1-.932.01L6.962 13.5H4.039l-1.075 2.686a.5.5 0 1 1-.928-.372l1.196-2.989a.485.485 0 0 1 .008-.021l1.796-4.49a.5.5 0 0 1 .928 0l1.796 4.49a.485.485 0 0 1 .009.021l.716 1.791l1.043-2.78a.525.525 0 0 1 .008-.022l2.996-7.99A.5.5 0 0 1 13 3.5zm-2.278 8h4.557L13 5.424L10.722 11.5zm-4.16 1L5.5 9.846L4.44 12.5h2.123z" fill="currentColor"></path></g></svg>
diff --git a/diboot-admin-ui/src/assets/svg/index.ts b/diboot-admin-ui/src/assets/svg/index.ts
new file mode 100644
index 00000000..2e85131e
--- /dev/null
+++ b/diboot-admin-ui/src/assets/svg/index.ts
@@ -0,0 +1,8 @@
+// 加载当前目录下所有 svg
+const svgFiles = import.meta.globEager('./**/*.svg', { as: 'raw' })
+
+export default Object.keys(svgFiles).reduce((all: any, svgPath: string) => {
+  const svgName = svgPath.replace(/\.\/(.*)\.svg/, '$1')
+  all[svgName] = defineComponent({ name: svgName, template: svgFiles[svgPath] })
+  return all
+}, {})
diff --git a/diboot-admin-ui/src/components/HelloWorld.vue b/diboot-admin-ui/src/components/HelloWorld.vue
deleted file mode 100644
index be419899..00000000
--- a/diboot-admin-ui/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<script setup lang="ts">
-withDefaults(defineProps<{ msg: string }>(), { msg: 'Hello Vue 3 + TypeScript + Vite' })
-
-const count = ref(0)
-</script>
-
-<template>
-  <h1>{{ msg }}</h1>
-
-  <p>
-    Recommended IDE setup:
-    <a href="https://code.visualstudio.com/" target="_blank">VS Code</a>
-    +
-    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
-  </p>
-
-  <p>See <code>README.md</code> for more information.</p>
-
-  <p>
-    <a href="https://vitejs.dev/guide/features.html" target="_blank"> Vite Docs </a>
-    |
-    <a href="https://v3.vuejs.org/" target="_blank">Vue 3 Docs</a>
-  </p>
-
-  <button type="button" @click="count++">count is: {{ count }}</button>
-  <p>
-    Edit
-    <code>components/HelloWorld.vue</code> to test hot module replacement.
-  </p>
-</template>
-
-<style scoped>
-a {
-  color: #42b983;
-}
-
-label {
-  margin: 0 0.5em;
-  font-weight: bold;
-}
-
-code {
-  background-color: #eee;
-  padding: 2px 4px;
-  border-radius: 4px;
-  color: #304455;
-}
-</style>
diff --git a/diboot-admin-ui/src/components/icon/library.ts b/diboot-admin-ui/src/components/icon/library.ts
new file mode 100644
index 00000000..6ba73550
--- /dev/null
+++ b/diboot-admin-ui/src/components/icon/library.ts
@@ -0,0 +1,15 @@
+import * as Element from '@element-plus/icons-vue'
+import LocalSvg from '@/assets/svg'
+
+export const library: any = { Element, LocalSvg }
+
+/**
+ * 查找图标
+ * @param name 图标名称 [库别名]:[(路径)图标名]
+ */
+export const findIcon = (name?: string) => {
+  if (!name) return
+  const split = name.split(/:/)
+  const lib = library[split[0]]
+  return lib && lib[split[1]]
+}
diff --git a/diboot-admin-ui/src/components/icon/select.vue b/diboot-admin-ui/src/components/icon/select.vue
new file mode 100644
index 00000000..476937fc
--- /dev/null
+++ b/diboot-admin-ui/src/components/icon/select.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { library } from './library'
+
+const getIconMap = (key: string): any => Object.values(library[key])
+
+defineProps<{ modelValue?: string }>()
+
+const emits = defineEmits<{
+  (e: 'update:modelValue', value?: string): void
+}>()
+
+const visible = ref(false)
+
+const selectIcon = (name?: string) => {
+  emits('update:modelValue', name)
+  visible.value = false
+}
+</script>
+
+<template>
+  <el-icon :size="25" style="vertical-align: middle; margin-right: 10px">
+    <icon-show :name="modelValue" />
+  </el-icon>
+  <el-button type="text" @click="visible = true">{{ modelValue ? '重选' : '选择' }}</el-button>
+  <el-button v-show="modelValue" type="text" style="color: var(--el-color-danger)" @click="selectIcon()">
+    清除
+  </el-button>
+  <el-dialog v-model="visible" title="图标选择器">
+    <el-tabs style="margin-top: -30px">
+      <el-tab-pane v-for="key in Object.keys(library)" :key="key" lazy>
+        <template #label>
+          {{ key }}
+          <el-tag size="small" type="info">{{ Object.keys(library[key]).length }}</el-tag>
+        </template>
+        <el-scrollbar style="height: 60vh">
+          <el-space wrap>
+            <el-card
+              v-for="item in getIconMap(key)"
+              :key="item.name"
+              shadow="hover"
+              @click="selectIcon(`${key}:${item.name}`)"
+            >
+              <el-tooltip :content="item.name" :show-after="200">
+                <el-icon :size="28">
+                  <component :is="item" />
+                </el-icon>
+              </el-tooltip>
+            </el-card>
+          </el-space>
+        </el-scrollbar>
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+
+<style scoped lang="scss">
+.el-card {
+  &:hover {
+    .el-icon {
+      color: var(--el-color-primary);
+    }
+  }
+}
+</style>
diff --git a/diboot-admin-ui/src/components/icon/show.vue b/diboot-admin-ui/src/components/icon/show.vue
new file mode 100644
index 00000000..129f9972
--- /dev/null
+++ b/diboot-admin-ui/src/components/icon/show.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+import { findIcon } from './library'
+
+const props = defineProps<{ name?: string }>()
+
+const Icon = computed(() => findIcon(props.name))
+</script>
+
+<template>
+  <template v-if="Icon">
+    <icon />
+  </template>
+</template>
diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 55cf68f1..1df5572f 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { UserFilled, ArrowDown, ZoomIn } from '@element-plus/icons-vue'
+import { UserFilled, ArrowDown } from '@element-plus/icons-vue'
 import useAuthStore from '@/store/auth'
 import Logo from '@/assets/logo.png'
 import useAppStore from '@/store/app'
@@ -31,7 +31,7 @@ const appStore = useAppStore()
       <el-dropdown @command="command => (appStore.globalSize = command)">
         <div class="item">
           <el-icon :size="22">
-            <zoom-in />
+            <icon-show name="LocalSvg:TextFontSize" />
           </el-icon>
         </div>
         <template #dropdown>
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
index 79bb34ef..8fd14e57 100644
--- a/diboot-admin-ui/src/views/dashboard/index.vue
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -1,11 +1,22 @@
 <script setup lang="ts" name="Dashboard">
 // 可接收 已使用的可视高度，方便主区域计算使用
 defineProps<{ usedVisibleHeight?: number }>()
+
+const value = ref<string>('Element:HotWater')
 </script>
 
 <template>
-  Dashboard<br /><br />
-  已使用的可视高度：{{ usedVisibleHeight }}px
+  Dashboard
+  <p>已使用的可视高度：{{ usedVisibleHeight }}px</p>
+
+  回显图标：
+  <el-icon :size="25" style="vertical-align: middle">
+    <icon-show :name="value" />
+  </el-icon>
+
+  <br />
+
+  图标选择：<icon-select v-model="value" />
 </template>
 
 <style scoped></style>
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 980c5e0a..4d177621 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -9,8 +9,10 @@ declare module '@vue/runtime-core' {
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
@@ -27,11 +29,17 @@ declare module '@vue/runtime-core' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    HelloWorld: typeof import('@/components/HelloWorld.vue')['default']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    IconSelect: typeof import('@/components/icon/select.vue')['default']
+    IconShow: typeof import('@/components/icon/show.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
-- 
Gitee


From 35e9c73a00bb72ba603421fab0272cc885c534ac Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sat, 7 May 2022 15:20:08 +0800
Subject: [PATCH 092/195] * opt icon-select

---
 diboot-admin-ui/src/assets/svg/index.ts       |  8 -------
 diboot-admin-ui/src/components/icon/index.vue | 23 +++++++++++++++++++
 .../src/components/icon/library.ts            | 15 ------------
 .../src/components/icon/select.vue            | 20 ++++++++--------
 diboot-admin-ui/src/components/icon/show.vue  | 13 -----------
 diboot-admin-ui/src/config/iconLibrary.ts     | 20 ++++++++++++++++
 diboot-admin-ui/src/layout/header/index.vue   |  2 +-
 diboot-admin-ui/src/views/dashboard/index.vue |  5 ++--
 diboot-admin-ui/types/components.d.ts         |  2 +-
 9 files changed, 58 insertions(+), 50 deletions(-)
 delete mode 100644 diboot-admin-ui/src/assets/svg/index.ts
 create mode 100644 diboot-admin-ui/src/components/icon/index.vue
 delete mode 100644 diboot-admin-ui/src/components/icon/library.ts
 delete mode 100644 diboot-admin-ui/src/components/icon/show.vue
 create mode 100644 diboot-admin-ui/src/config/iconLibrary.ts

diff --git a/diboot-admin-ui/src/assets/svg/index.ts b/diboot-admin-ui/src/assets/svg/index.ts
deleted file mode 100644
index 2e85131e..00000000
--- a/diboot-admin-ui/src/assets/svg/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// 加载当前目录下所有 svg
-const svgFiles = import.meta.globEager('./**/*.svg', { as: 'raw' })
-
-export default Object.keys(svgFiles).reduce((all: any, svgPath: string) => {
-  const svgName = svgPath.replace(/\.\/(.*)\.svg/, '$1')
-  all[svgName] = defineComponent({ name: svgName, template: svgFiles[svgPath] })
-  return all
-}, {})
diff --git a/diboot-admin-ui/src/components/icon/index.vue b/diboot-admin-ui/src/components/icon/index.vue
new file mode 100644
index 00000000..aae5fd89
--- /dev/null
+++ b/diboot-admin-ui/src/components/icon/index.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import IconLibrary from '@/config/iconLibrary'
+
+const props = defineProps<{
+  /**
+   * 图标名称 [库别名]:[(路径)图标名]
+   */
+  name?: string
+}>()
+
+const Icon = computed(() => {
+  if (!props.name) return
+  const split = props.name.split(/:/)
+  const lib = IconLibrary[split[0]]
+  return lib && lib[split[1]]
+})
+</script>
+
+<template>
+  <template v-if="Icon">
+    <icon />
+  </template>
+</template>
diff --git a/diboot-admin-ui/src/components/icon/library.ts b/diboot-admin-ui/src/components/icon/library.ts
deleted file mode 100644
index 6ba73550..00000000
--- a/diboot-admin-ui/src/components/icon/library.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as Element from '@element-plus/icons-vue'
-import LocalSvg from '@/assets/svg'
-
-export const library: any = { Element, LocalSvg }
-
-/**
- * 查找图标
- * @param name 图标名称 [库别名]:[(路径)图标名]
- */
-export const findIcon = (name?: string) => {
-  if (!name) return
-  const split = name.split(/:/)
-  const lib = library[split[0]]
-  return lib && lib[split[1]]
-}
diff --git a/diboot-admin-ui/src/components/icon/select.vue b/diboot-admin-ui/src/components/icon/select.vue
index 476937fc..bba9c65e 100644
--- a/diboot-admin-ui/src/components/icon/select.vue
+++ b/diboot-admin-ui/src/components/icon/select.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { library } from './library'
+import IconLibrary from '@/config/iconLibrary'
 
-const getIconMap = (key: string): any => Object.values(library[key])
+const getIconList = (key: string): any => Object.values(IconLibrary[key])
 
 defineProps<{ modelValue?: string }>()
 
@@ -19,7 +19,7 @@ const selectIcon = (name?: string) => {
 
 <template>
   <el-icon :size="25" style="vertical-align: middle; margin-right: 10px">
-    <icon-show :name="modelValue" />
+    <icon :name="modelValue" />
   </el-icon>
   <el-button type="text" @click="visible = true">{{ modelValue ? '重选' : '选择' }}</el-button>
   <el-button v-show="modelValue" type="text" style="color: var(--el-color-danger)" @click="selectIcon()">
@@ -27,15 +27,15 @@ const selectIcon = (name?: string) => {
   </el-button>
   <el-dialog v-model="visible" title="图标选择器">
     <el-tabs style="margin-top: -30px">
-      <el-tab-pane v-for="key in Object.keys(library)" :key="key" lazy>
+      <el-tab-pane v-for="key in Object.keys(IconLibrary)" :key="key" lazy>
         <template #label>
           {{ key }}
-          <el-tag size="small" type="info">{{ Object.keys(library[key]).length }}</el-tag>
+          <el-tag size="small" type="info">{{ Object.keys(IconLibrary[key]).length }}</el-tag>
         </template>
         <el-scrollbar style="height: 60vh">
           <el-space wrap>
             <el-card
-              v-for="item in getIconMap(key)"
+              v-for="item in getIconList(key)"
               :key="item.name"
               shadow="hover"
               @click="selectIcon(`${key}:${item.name}`)"
@@ -55,10 +55,10 @@ const selectIcon = (name?: string) => {
 
 <style scoped lang="scss">
 .el-card {
-  &:hover {
-    .el-icon {
-      color: var(--el-color-primary);
-    }
+  cursor: pointer;
+
+  &:hover .el-icon {
+    color: var(--el-color-primary);
   }
 }
 </style>
diff --git a/diboot-admin-ui/src/components/icon/show.vue b/diboot-admin-ui/src/components/icon/show.vue
deleted file mode 100644
index 129f9972..00000000
--- a/diboot-admin-ui/src/components/icon/show.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<script setup lang="ts">
-import { findIcon } from './library'
-
-const props = defineProps<{ name?: string }>()
-
-const Icon = computed(() => findIcon(props.name))
-</script>
-
-<template>
-  <template v-if="Icon">
-    <icon />
-  </template>
-</template>
diff --git a/diboot-admin-ui/src/config/iconLibrary.ts b/diboot-admin-ui/src/config/iconLibrary.ts
new file mode 100644
index 00000000..5d12f488
--- /dev/null
+++ b/diboot-admin-ui/src/config/iconLibrary.ts
@@ -0,0 +1,20 @@
+import * as Element from '@element-plus/icons-vue'
+
+/**
+ * 加载 @/assets/svg 目录下所有 svg
+ */
+const svgFiles = import.meta.glob('@/assets/svg/**/*.svg', { as: 'raw' })
+
+/**
+ * 构建本地 svg 图标库
+ */
+const LocalSvg = Object.keys(svgFiles).reduce((all: any, svgPath: string) => {
+  const svgName = svgPath.replace(/.*svg\/(.*)\.svg/, '$1')
+  all[svgName] = defineComponent({ name: svgName, render: () => h('i', { innerHTML: svgFiles[svgPath] }) })
+  return all
+}, {})
+
+/**
+ * 导出所有图标资源
+ */
+export default { Element, LocalSvg } as any
diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 1df5572f..0097b62a 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -31,7 +31,7 @@ const appStore = useAppStore()
       <el-dropdown @command="command => (appStore.globalSize = command)">
         <div class="item">
           <el-icon :size="22">
-            <icon-show name="LocalSvg:TextFontSize" />
+            <icon name="LocalSvg:TextFontSize" />
           </el-icon>
         </div>
         <template #dropdown>
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
index 8fd14e57..b5cdaf91 100644
--- a/diboot-admin-ui/src/views/dashboard/index.vue
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -11,12 +11,13 @@ const value = ref<string>('Element:HotWater')
 
   回显图标：
   <el-icon :size="25" style="vertical-align: middle">
-    <icon-show :name="value" />
+    <icon :name="value" />
   </el-icon>
 
   <br />
 
-  图标选择：<icon-select v-model="value" />
+  图标选择：
+  <icon-select v-model="value" />
 </template>
 
 <style scoped></style>
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 4d177621..30c8dbf8 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -38,8 +38,8 @@ declare module '@vue/runtime-core' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    Icon: typeof import('@/components/icon/index.vue')['default']
     IconSelect: typeof import('@/components/icon/select.vue')['default']
-    IconShow: typeof import('@/components/icon/show.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
-- 
Gitee


From 8188ff50a1eba875eed3c6dcf059363b20477386 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 7 May 2022 18:31:22 +0800
Subject: [PATCH 093/195] =?UTF-8?q?*=20permissionCode=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/iam/entity/IamResourcePermission.java  | 1 -
 .../src/main/java/com/diboot/iam/util/IamSecurityUtils.java     | 2 +-
 .../src/main/resources/META-INF/sql/init-iam-mysql.sql          | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
index f4864323..3bf9839e 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamResourcePermission.java
@@ -81,7 +81,6 @@ public class IamResourcePermission extends BaseEntity {
     private String resourceCode;
 
     // 权限编码
-    @NotNull(message = "权限编码不能为空")
     @Length(max=200, message="权限编码长度应小于200")
     @TableField()
     private String permissionCode;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
index 19b369ca..2a8d0aef 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/util/IamSecurityUtils.java
@@ -106,7 +106,7 @@ public class IamSecurityUtils extends SecurityUtils {
             cacheManager.getCache(Cons.AUTHENTICATION_CAHCE_NAME).remove(accessToken);
         }
         TokenUtils.removeAccessTokens(accessToken);
-        log.warn("token 已过期注销: {}", accessToken);
+        log.debug("token 已过期注销: {}", accessToken);
     }
 
     /**
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
index ea4bd04f..c720caa1 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-mysql.sql
@@ -83,7 +83,7 @@ create table iam_resource_permission
   display_type  varchar(20)                          not null comment '展现类型',
   display_name  varchar(100)                         not null comment '显示名称',
   resource_code varchar(100)                        null comment '权限编码',
-  permission_code varchar(200)                         not null comment '权限编码',
+  permission_code varchar(200)                      null comment '权限编码',
   sort_id       bigint                               null comment '排序号',
   is_deleted     tinyint(1)  default 0                 not null comment '是否删除',
   create_time    datetime   default CURRENT_TIMESTAMP not null comment '创建时间',
-- 
Gitee


From 534ff80b95fec1637565fd8efb62e6e27e01467e Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 7 May 2022 18:31:49 +0800
Subject: [PATCH 094/195] =?UTF-8?q?*=20sqlSessionFactory=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E9=81=BF=E5=85=8DNPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/cache/BindingCacheManager.java    | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index ac3553eb..076cf1fe 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -119,30 +119,31 @@ public class BindingCacheManager {
             }
             // 初始化没有service的table-mapper缓存
             SqlSessionFactory sqlSessionFactory = ContextHelper.getBean(SqlSessionFactory.class);
-            Objects.requireNonNull(sqlSessionFactory, "sqlSessionFactory");
-            Collection<Class<?>> mappers = sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers();
-            if (V.notEmpty(mappers)) {
-                for (Class<?> mapperClass : mappers) {
-                    Type[] types = mapperClass.getGenericInterfaces();
-                    try {
-                        if (types.length > 0 && types[0] != null) {
-                            ParameterizedType genericType = (ParameterizedType) types[0];
-                            Type[] superTypes = genericType.getActualTypeArguments();
-                            if (superTypes != null && superTypes.length > 0 && superTypes[0] != null) {
-                                String entityClassName = superTypes[0].getTypeName();
-                                if (!uniqueEntitySet.contains(entityClassName) && entityClassName.length() > 1) {
-                                    Class<?> entityClass = Class.forName(entityClassName);
-                                    EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, null);
-                                    entityInfoCache.setBaseMapper((Class<? extends BaseMapper>) mapperClass);
-                                    cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
-                                    cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
-                                    cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
-                                    uniqueEntitySet.add(entityClass.getName());
+            if(sqlSessionFactory != null){
+                Collection<Class<?>> mappers = sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers();
+                if (V.notEmpty(mappers)) {
+                    for (Class<?> mapperClass : mappers) {
+                        Type[] types = mapperClass.getGenericInterfaces();
+                        try {
+                            if (types.length > 0 && types[0] != null) {
+                                ParameterizedType genericType = (ParameterizedType) types[0];
+                                Type[] superTypes = genericType.getActualTypeArguments();
+                                if (superTypes != null && superTypes.length > 0 && superTypes[0] != null) {
+                                    String entityClassName = superTypes[0].getTypeName();
+                                    if (!uniqueEntitySet.contains(entityClassName) && entityClassName.length() > 1) {
+                                        Class<?> entityClass = Class.forName(entityClassName);
+                                        EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, null);
+                                        entityInfoCache.setBaseMapper((Class<? extends BaseMapper>) mapperClass);
+                                        cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
+                                        cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
+                                        cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
+                                        uniqueEntitySet.add(entityClass.getName());
+                                    }
                                 }
                             }
+                        } catch (Exception e) {
+                            log.warn("解析mapper异常", e);
                         }
-                    } catch (Exception e) {
-                        log.warn("解析mapper异常", e);
                     }
                 }
             }
-- 
Gitee


From 501ac0d28e96ed7ed1c98fc3148237afa3e4a93f Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 9 May 2022 17:52:01 +0800
Subject: [PATCH 095/195] + add dark

---
 diboot-admin-ui/package.json                  |   2 +-
 diboot-admin-ui/pnpm-lock.yaml                | 137 ++++++++----------
 diboot-admin-ui/src/layout/header/index.vue   |   9 +-
 diboot-admin-ui/src/layout/index.vue          |   8 +-
 diboot-admin-ui/src/layout/tabs/index.vue     |  13 +-
 diboot-admin-ui/src/main.ts                   |   1 +
 diboot-admin-ui/src/styles/element/index.scss |  29 ++++
 diboot-admin-ui/src/styles/index.scss         |   5 +
 diboot-admin-ui/vite.config.ts                |  14 +-
 9 files changed, 124 insertions(+), 94 deletions(-)
 create mode 100644 diboot-admin-ui/src/styles/element/index.scss
 create mode 100644 diboot-admin-ui/src/styles/index.scss

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 3154f22a..ecf0ab2b 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^1.1.4",
+    "@vueuse/core": "^8.4.2",
     "axios": "^0.26.1",
     "element-plus": "^2.1.10",
     "lodash": "^4.17.21",
@@ -41,7 +42,6 @@
     "sass-loader": "^12.6.0",
     "typescript": "^4.5.4",
     "unplugin-auto-import": "^0.7.1",
-    "unplugin-element-plus": "^0.4.0",
     "unplugin-vue-components": "^0.19.3",
     "vite": "^2.9.2",
     "vite-plugin-eslint": "^1.4.0",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 673d0e02..f7d3e00a 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -10,6 +10,7 @@ specifiers:
   '@typescript-eslint/parser': ^5.20.0
   '@vitejs/plugin-vue': ^2.3.1
   '@vue/eslint-config-prettier': ^7.0.0
+  '@vueuse/core': ^8.4.2
   axios: ^0.26.1
   element-plus: ^2.1.10
   eslint: ^8.12.0
@@ -28,7 +29,6 @@ specifiers:
   sass-loader: ^12.6.0
   typescript: ^4.5.4
   unplugin-auto-import: ^0.7.1
-  unplugin-element-plus: ^0.4.0
   unplugin-vue-components: ^0.19.3
   vite: ^2.9.2
   vite-plugin-eslint: ^1.4.0
@@ -41,6 +41,7 @@ specifiers:
 
 dependencies:
   '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
+  '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
   axios: registry.npmmirror.com/axios/0.26.1
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
   lodash: registry.npmmirror.com/lodash/4.17.21
@@ -71,8 +72,7 @@ devDependencies:
   sass: registry.npmmirror.com/sass/1.50.1
   sass-loader: registry.npmmirror.com/sass-loader/12.6.0_node-sass@7.0.1+sass@1.50.1
   typescript: registry.npmmirror.com/typescript/4.6.3
-  unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_vite@2.9.5
-  unplugin-element-plus: registry.npmmirror.com/unplugin-element-plus/0.4.0_vite@2.9.5
+  unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_@vueuse+core@8.4.2+vite@2.9.5
   unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33
   vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
@@ -133,7 +133,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/@ctrl/tinycolor/3.4.1:
-    resolution: {integrity: sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz}
+    resolution: {integrity: sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz}
     name: '@ctrl/tinycolor'
     version: 3.4.1
     engines: {node: '>=10'}
@@ -192,13 +192,13 @@ packages:
     dev: true
 
   registry.npmmirror.com/@floating-ui/core/0.6.2:
-    resolution: {integrity: sha512-jktYRmZwmau63adUG3GKOAVCofBXkk55S/zQ94XOorAHhwqFIOFAy1rSp2N0Wp6/tGbe9V3u/ExlGZypyY17rg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@floating-ui/core/-/core-0.6.2.tgz}
+    resolution: {integrity: sha512-jktYRmZwmau63adUG3GKOAVCofBXkk55S/zQ94XOorAHhwqFIOFAy1rSp2N0Wp6/tGbe9V3u/ExlGZypyY17rg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@floating-ui/core/-/core-0.6.2.tgz}
     name: '@floating-ui/core'
     version: 0.6.2
     dev: false
 
   registry.npmmirror.com/@floating-ui/dom/0.4.5:
-    resolution: {integrity: sha512-b+prvQgJt8pieaKYMSJBXHxX/DYwdLsAWxKYqnO5dO2V4oo/TYBZJAUQCVNjTWWsrs6o4VDrNcP9+E70HAhJdw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@floating-ui/dom/-/dom-0.4.5.tgz}
+    resolution: {integrity: sha512-b+prvQgJt8pieaKYMSJBXHxX/DYwdLsAWxKYqnO5dO2V4oo/TYBZJAUQCVNjTWWsrs6o4VDrNcP9+E70HAhJdw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@floating-ui/dom/-/dom-0.4.5.tgz}
     name: '@floating-ui/dom'
     version: 0.4.5
     dependencies:
@@ -277,7 +277,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/@popperjs/core/2.11.5:
-    resolution: {integrity: sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@popperjs/core/-/core-2.11.5.tgz}
+    resolution: {integrity: sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@popperjs/core/-/core-2.11.5.tgz}
     name: '@popperjs/core'
     version: 2.11.5
     dev: false
@@ -341,7 +341,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/@types/lodash-es/4.17.6:
-    resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.6.tgz}
+    resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.6.tgz}
     name: '@types/lodash-es'
     version: 4.17.6
     dependencies:
@@ -750,11 +750,11 @@ packages:
     name: '@vue/shared'
     version: 3.2.33
 
-  registry.npmmirror.com/@vueuse/core/8.2.6_vue@3.2.33:
-    resolution: {integrity: sha512-fzlpM3B5oVe+UhCT1mXlhG1Zxdq2lq1Z2AvddSB8+RxrsSFzII7DKfsQEz8Vop7Lzc++4m8drTNbhPovYoFqHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/core/-/core-8.2.6.tgz}
-    id: registry.npmmirror.com/@vueuse/core/8.2.6
+  registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33:
+    resolution: {integrity: sha512-dUVU96lii1ZdWoNJXauQNt+4QrHz1DKbuW+y6pDR2N10q7rGZJMDU7pQeMcC2XeosX7kMODfaBuqsF03NozzLg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/core/-/core-8.4.2.tgz}
+    id: registry.npmmirror.com/@vueuse/core/8.4.2
     name: '@vueuse/core'
-    version: 8.2.6
+    version: 8.4.2
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -764,23 +764,23 @@ packages:
       vue:
         optional: true
     dependencies:
-      '@vueuse/metadata': registry.npmmirror.com/@vueuse/metadata/8.2.6
-      '@vueuse/shared': registry.npmmirror.com/@vueuse/shared/8.2.6_vue@3.2.33
+      '@vueuse/metadata': registry.npmmirror.com/@vueuse/metadata/8.4.2
+      '@vueuse/shared': registry.npmmirror.com/@vueuse/shared/8.4.2_vue@3.2.33
       vue: registry.npmmirror.com/vue/3.2.33
       vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
     dev: false
 
-  registry.npmmirror.com/@vueuse/metadata/8.2.6:
-    resolution: {integrity: sha512-OBKtafCt+4RcEJlYDCjp1vl65pBCL2g4TmipEtdZ8/qphKlW6nakJbkY7XRN5grPmjqU99/ahJGtyGk5NHS2hw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.2.6.tgz}
+  registry.npmmirror.com/@vueuse/metadata/8.4.2:
+    resolution: {integrity: sha512-2BIj++7P0/I5dfMsEe8q7Kw0HqVAjVcyNOd9+G22/ILUC9TVLTeYOuJ1kwa1Gpr+0LWKHc6GqHiLWNL33+exoQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.4.2.tgz}
     name: '@vueuse/metadata'
-    version: 8.2.6
+    version: 8.4.2
     dev: false
 
-  registry.npmmirror.com/@vueuse/shared/8.2.6_vue@3.2.33:
-    resolution: {integrity: sha512-J/W4CMfdL8TahELuSOgtfVO4eQXTjhigp7dVWIBsLUVFCeY9d49gvHUcQN3y5xYLZ6iNP57TjTQjMMT/zhklkw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/shared/-/shared-8.2.6.tgz}
-    id: registry.npmmirror.com/@vueuse/shared/8.2.6
+  registry.npmmirror.com/@vueuse/shared/8.4.2_vue@3.2.33:
+    resolution: {integrity: sha512-hILXMEjL8YQhj1LHN/HZ49UThyfk8irTjhele2nW+L3N55ElFUBGB/f4w0rg8EW+/suhqv7kJJPTZzvHCqxlIw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/shared/-/shared-8.4.2.tgz}
+    id: registry.npmmirror.com/@vueuse/shared/8.4.2
     name: '@vueuse/shared'
-    version: 8.2.6
+    version: 8.4.2
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -987,7 +987,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/async-validator/4.0.7:
-    resolution: {integrity: sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-validator/-/async-validator-4.0.7.tgz}
+    resolution: {integrity: sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-validator/-/async-validator-4.0.7.tgz}
     name: async-validator
     version: 4.0.7
     dev: false
@@ -1342,7 +1342,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/dayjs/1.11.1:
-    resolution: {integrity: sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.1.tgz}
+    resolution: {integrity: sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.1.tgz}
     name: dayjs
     version: 1.11.1
     dev: false
@@ -1494,7 +1494,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33:
-    resolution: {integrity: sha512-sS9OMgP20dlYipmzHlEEgCJU+ID7+03YpRpoJWNQEH736C6ArmDMLnGFe8DUjPvwbUEXRA2d0Eo5d0apFgkSqg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.1.10.tgz}
+    resolution: {integrity: sha512-sS9OMgP20dlYipmzHlEEgCJU+ID7+03YpRpoJWNQEH736C6ArmDMLnGFe8DUjPvwbUEXRA2d0Eo5d0apFgkSqg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.1.10.tgz}
     id: registry.npmmirror.com/element-plus/2.1.10
     name: element-plus
     version: 2.1.10
@@ -1507,7 +1507,7 @@ packages:
       '@popperjs/core': registry.npmmirror.com/@popperjs/core/2.11.5
       '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
       '@types/lodash-es': registry.npmmirror.com/@types/lodash-es/4.17.6
-      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.2.6_vue@3.2.33
+      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
       async-validator: registry.npmmirror.com/async-validator/4.0.7
       dayjs: registry.npmmirror.com/dayjs/1.11.1
       escape-html: registry.npmmirror.com/escape-html/1.0.3
@@ -1544,7 +1544,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/encoding/0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
     name: encoding
     version: 0.1.13
     requiresBuild: true
@@ -1587,14 +1587,8 @@ packages:
       is-arrayish: registry.npmmirror.com/is-arrayish/0.2.1
     dev: true
 
-  registry.npmmirror.com/es-module-lexer/0.10.5:
-    resolution: {integrity: sha512-+7IwY/kiGAacQfY+YBhKMvEmyAJnw5grTUgjG85Pe7vcUI/6b7pZjZG8nQ7+48YhzEAEqrEgD2dCz/JIK+AYvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.10.5.tgz}
-    name: es-module-lexer
-    version: 0.10.5
-    dev: true
-
   registry.npmmirror.com/esbuild-android-64/0.14.36:
-    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
+    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
     name: esbuild-android-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1605,7 +1599,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-android-arm64/0.14.36:
-    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
     name: esbuild-android-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1616,7 +1610,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-64/0.14.36:
-    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
+    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
     name: esbuild-darwin-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1627,7 +1621,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-arm64/0.14.36:
-    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
     name: esbuild-darwin-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1638,7 +1632,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-64/0.14.36:
-    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
     name: esbuild-freebsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1649,7 +1643,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-arm64/0.14.36:
-    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
     name: esbuild-freebsd-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1660,7 +1654,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-32/0.14.36:
-    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
+    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
     name: esbuild-linux-32
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1671,7 +1665,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-64/0.14.36:
-    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
+    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
     name: esbuild-linux-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1682,7 +1676,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm/0.14.36:
-    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
+    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
     name: esbuild-linux-arm
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1693,7 +1687,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm64/0.14.36:
-    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
     name: esbuild-linux-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1704,7 +1698,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-mips64le/0.14.36:
-    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
+    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
     name: esbuild-linux-mips64le
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1715,7 +1709,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-ppc64le/0.14.36:
-    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
+    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
     name: esbuild-linux-ppc64le
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1726,7 +1720,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-riscv64/0.14.36:
-    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
+    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
     name: esbuild-linux-riscv64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1737,7 +1731,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-s390x/0.14.36:
-    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
+    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
     name: esbuild-linux-s390x
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1748,7 +1742,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-netbsd-64/0.14.36:
-    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
     name: esbuild-netbsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1759,7 +1753,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-openbsd-64/0.14.36:
-    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
     name: esbuild-openbsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1770,7 +1764,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-sunos-64/0.14.36:
-    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
+    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
     name: esbuild-sunos-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1781,7 +1775,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-32/0.14.36:
-    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
+    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
     name: esbuild-windows-32
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1792,7 +1786,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-64/0.14.36:
-    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
+    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
     name: esbuild-windows-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1803,7 +1797,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-arm64/0.14.36:
-    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
     name: esbuild-windows-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1859,7 +1853,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/escape-html/1.0.3:
-    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz}
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz}
     name: escape-html
     version: 1.0.3
 
@@ -2243,7 +2237,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/fsevents/2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
     name: fsevents
     version: 2.3.2
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -2863,7 +2857,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/klona/2.0.5:
-    resolution: {integrity: sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz}
+    resolution: {integrity: sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz}
     name: klona
     version: 2.0.5
     engines: {node: '>= 8'}
@@ -2902,13 +2896,13 @@ packages:
     dev: true
 
   registry.npmmirror.com/lodash-es/4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz}
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz}
     name: lodash-es
     version: 4.17.21
     dev: false
 
   registry.npmmirror.com/lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd:
-    resolution: {integrity: sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.2.tgz}
+    resolution: {integrity: sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.2.tgz}
     id: registry.npmmirror.com/lodash-unified/1.0.2
     name: lodash-unified
     version: 1.0.2
@@ -2999,7 +2993,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/memoize-one/6.0.0:
-    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz}
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz}
     name: memoize-one
     version: 6.0.0
     dev: false
@@ -3224,7 +3218,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/neo-async/2.6.2:
-    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz}
+    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz}
     name: neo-async
     version: 2.6.2
     dev: true
@@ -3318,7 +3312,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/normalize-wheel-es/1.1.2:
-    resolution: {integrity: sha512-scX83plWJXYH1J4+BhAuIHadROzxX0UBF3+HuZNY2Ks8BciE7tSTQ+5JhTsvzjaO0/EJdm4JBGrfObKxFf3Png==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.1.2.tgz}
+    resolution: {integrity: sha512-scX83plWJXYH1J4+BhAuIHadROzxX0UBF3+HuZNY2Ks8BciE7tSTQ+5JhTsvzjaO0/EJdm4JBGrfObKxFf3Png==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.1.2.tgz}
     name: normalize-wheel-es
     version: 1.1.2
     dev: false
@@ -3989,7 +3983,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/sass-loader/12.6.0_node-sass@7.0.1+sass@1.50.1:
-    resolution: {integrity: sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass-loader/-/sass-loader-12.6.0.tgz}
+    resolution: {integrity: sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass-loader/-/sass-loader-12.6.0.tgz}
     id: registry.npmmirror.com/sass-loader/12.6.0
     name: sass-loader
     version: 12.6.0
@@ -4476,7 +4470,7 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
-  registry.npmmirror.com/unplugin-auto-import/0.7.1_vite@2.9.5:
+  registry.npmmirror.com/unplugin-auto-import/0.7.1_@vueuse+core@8.4.2+vite@2.9.5:
     resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.7.1.tgz}
     id: registry.npmmirror.com/unplugin-auto-import/0.7.1
     name: unplugin-auto-import
@@ -4490,6 +4484,7 @@ packages:
     dependencies:
       '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.5.1
       '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
+      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
       local-pkg: registry.npmmirror.com/local-pkg/0.4.1
       magic-string: registry.npmmirror.com/magic-string/0.26.1
       resolve: registry.npmmirror.com/resolve/1.22.0
@@ -4501,24 +4496,6 @@ packages:
       - webpack
     dev: true
 
-  registry.npmmirror.com/unplugin-element-plus/0.4.0_vite@2.9.5:
-    resolution: {integrity: sha512-iE4EZu8pp5Vz/qb9r45sCNSz9Px6KOthBpe6gFBV1E60g9A45HS+JhwAaj4Zki8HZ0YGW3LyrsBCrd+XhOypnQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-element-plus/-/unplugin-element-plus-0.4.0.tgz}
-    id: registry.npmmirror.com/unplugin-element-plus/0.4.0
-    name: unplugin-element-plus
-    version: 0.4.0
-    engines: {node: '>=14.17.0'}
-    dependencies:
-      '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
-      es-module-lexer: registry.npmmirror.com/es-module-lexer/0.10.5
-      magic-string: registry.npmmirror.com/magic-string/0.26.1
-      unplugin: registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5
-    transitivePeerDependencies:
-      - esbuild
-      - rollup
-      - vite
-      - webpack
-    dev: true
-
   registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33:
     resolution: {integrity: sha512-z/kpYJnqrJuWglDNs7fy0YRHr41oLc07y2TkP3by6DqPb1GG9xGC9SFigeFwd4J7GVTqyFVsnjoeup7uK7I2dA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.19.3.tgz}
     id: registry.npmmirror.com/unplugin-vue-components/0.19.3
diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 0097b62a..0da9a54d 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -1,9 +1,13 @@
 <script setup lang="ts">
-import { UserFilled, ArrowDown } from '@element-plus/icons-vue'
+import { UserFilled, ArrowDown, Moon, Sunny } from '@element-plus/icons-vue'
+import { useDark, useToggle } from '@vueuse/core'
 import useAuthStore from '@/store/auth'
 import Logo from '@/assets/logo.png'
 import useAppStore from '@/store/app'
 
+const isDark = useDark()
+const toggleDark = useToggle(isDark)
+
 const authStore = useAuthStore()
 const router = useRouter()
 
@@ -28,6 +32,9 @@ const appStore = useAppStore()
       <div :class="$slots.topNav ? 'top-nav' : ''">
         <slot name="topNav" />
       </div>
+      <el-icon class="item" :size="22" @click="toggleDark()">
+        <component :is="isDark ? Sunny : Moon" />
+      </el-icon>
       <el-dropdown @command="command => (appStore.globalSize = command)">
         <div class="item">
           <el-icon :size="22">
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 2afeb3af..0e8d19a9 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -74,7 +74,7 @@ watch(
       </el-aside>
       <el-container>
         <el-main style="padding: 0">
-          <el-header height="50px" style="border-bottom: 1px solid #eee">
+          <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
             <app-header />
           </el-header>
           <app-tabs>
@@ -92,7 +92,7 @@ watch(
   </el-container>
 
   <el-container v-if="appStore.layout === 'dock'">
-    <el-header height="50px" style="border-bottom: 1px solid #eee">
+    <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
       <app-header>
         <template #dock>
           <el-menu style="height: 50px" mode="horizontal" :default-active="oneLevel?.path">
@@ -127,7 +127,7 @@ watch(
   </el-container>
 
   <el-container v-if="appStore.layout === 'topNav'">
-    <el-header height="50px" style="border-bottom: 1px solid #eee">
+    <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
       <app-header>
         <template #topNav>
           <app-menu :menu-tree="menuTree" mode="horizontal" />
@@ -150,7 +150,7 @@ watch(
   </el-container>
 
   <el-container v-if="appStore.layout === 'menu'">
-    <el-header height="50px" style="border-bottom: 1px solid #eee">
+    <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
       <app-header />
     </el-header>
     <el-container>
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index 2a1494c6..302d1e9c 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -136,7 +136,7 @@ const fullScreenTabsView = () => {
         v-show="showButtons"
         :size="22"
         class="icon-button"
-        style="border-right: 1px solid #eee"
+        style="border-right: 1px solid var(--el-border-color-lighter)"
         color="#AAA"
         @click="operateScroll(false)"
       >
@@ -164,14 +164,19 @@ const fullScreenTabsView = () => {
         v-show="showButtons"
         :size="22"
         class="icon-button"
-        style="border-left: 1px solid #eee"
+        style="border-left: 1px solid var(--el-border-color-lighter)"
         color="#AAA"
         @click="operateScroll(true)"
       >
         <arrow-right />
       </el-icon>
       <el-dropdown>
-        <el-icon :size="22" class="icon-button" style="border-left: 1px solid #eee" color="#AAA">
+        <el-icon
+          :size="22"
+          class="icon-button"
+          style="border-left: 1px solid var(--el-border-color-lighter)"
+          color="#AAA"
+        >
           <Menu />
         </el-icon>
         <template #dropdown>
@@ -216,7 +221,7 @@ const fullScreenTabsView = () => {
 .tabs-hull {
   display: flex;
   align-items: center;
-  border-bottom: 1px solid #eee;
+  border-bottom: 1px solid var(--el-border-color-lighter);
   background-color: var(--el-bg-color);
 
   .tabs-scrollbar {
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index 2982f515..d43a2167 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -7,4 +7,5 @@ app.use(router)
 app.use(pinia)
 app.mount('#app')
 
+import '@/styles/index.scss'
 import 'nprogress/nprogress.css'
diff --git a/diboot-admin-ui/src/styles/element/index.scss b/diboot-admin-ui/src/styles/element/index.scss
new file mode 100644
index 00000000..d7cf7ea0
--- /dev/null
+++ b/diboot-admin-ui/src/styles/element/index.scss
@@ -0,0 +1,29 @@
+$--colors: (
+        "primary": (
+                "base": #58a9fd,
+        ),
+        "success": (
+                "base": #21ba45,
+        ),
+        "warning": (
+                "base": #f2711c,
+        ),
+        "danger": (
+                "base": #db2828,
+        ),
+        "error": (
+                "base": #db2828,
+        ),
+        "info": (
+                "base": #bababa,
+        ),
+);
+
+// You should use them in scss, because we calculate it by sass.
+//@forward "element-plus/theme-chalk/src/common/var.scss"  with (
+//  // do not use same name, it will override.
+//  $colors: $--colors
+//);
+
+// import dark theme
+@use "element-plus/theme-chalk/src/dark/css-vars.scss" as *;
diff --git a/diboot-admin-ui/src/styles/index.scss b/diboot-admin-ui/src/styles/index.scss
new file mode 100644
index 00000000..1ca3a3bc
--- /dev/null
+++ b/diboot-admin-ui/src/styles/index.scss
@@ -0,0 +1,5 @@
+:root {
+  .el-dialog {
+    --el-dialog-margin-top: 10vh;
+  }
+}
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 4a5de8c0..cbc81ae1 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -5,7 +5,6 @@ import eslintPlugin from 'vite-plugin-eslint/dist'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
-import ElementPlus from 'unplugin-element-plus/vite'
 import { viteMockServe } from 'vite-plugin-mock'
 import { resolve } from 'path'
 
@@ -19,7 +18,7 @@ export default defineConfig(({ command }) => {
       eslintPlugin({ fix: true }),
       AutoImport({
         // 解析器
-        resolvers: [ElementPlusResolver()],
+        resolvers: [ElementPlusResolver({ importStyle: 'sass' })],
         // 自动导入Api
         imports: ['vue', 'vue-router', 'pinia', { lodash: [['*', '_']] }, { '@/utils/request': ['api', 'baseURL'] }],
         // 为true时在项目根目录自动创建
@@ -29,7 +28,7 @@ export default defineConfig(({ command }) => {
       }),
       Components({
         // 解析器
-        resolvers: [ElementPlusResolver()],
+        resolvers: [ElementPlusResolver({ importStyle: 'sass' })],
         // 自动加载的组件目录，默认值为 ['src/components']
         dirs: ['src/components'],
         // 组件名称包含目录，防止同名组件冲突
@@ -39,7 +38,6 @@ export default defineConfig(({ command }) => {
         // 导入路径变换
         importPathTransform: path => path.replace(/^.+\/src/g, '@')
       }),
-      ElementPlus({ useSource: false }),
       viteMockServe({
         // 忽略以_开头的文件及目录
         ignore: /^_|\/_/,
@@ -55,6 +53,14 @@ export default defineConfig(({ command }) => {
         `
       })
     ],
+    css: {
+      preprocessorOptions: {
+        scss: {
+          // javascriptEnabled: true,
+          additionalData: `@use "@/styles/element/index.scss" as *;`
+        }
+      }
+    },
     resolve: {
       alias: [
         { find: '@', replacement: resolve(__dirname, 'src') },
-- 
Gitee


From 3de7e06b54712541f4664d5dd787321c4466d0e8 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 9 May 2022 18:25:54 +0800
Subject: [PATCH 096/195] =?UTF-8?q?*=20=E5=AE=9E=E7=8E=B0=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D=E8=AE=BE=E7=BD=AE=E4=B8=8B=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/test/service/BaseServiceTest.java    |   7 +
 .../core/data/access/DataAccessInterface.java |   2 +-
 .../handler/DataAccessControlInterceptor.java |  20 ++-
 .../com/diboot/iam/auth/IamExtensible.java    |   6 +-
 .../iam/auth/impl/IamExtensibleImpl.java      |  92 +++++++++++++
 .../main/java/com/diboot/iam/config/Cons.java |   5 +-
 .../data/DataAccessPermissionUserOrgImpl.java | 126 +++++++++++++++---
 .../com/diboot/iam/entity/BaseLoginUser.java  |  10 +-
 .../com/diboot/iam/service/IamOrgService.java |   7 +
 .../iam/service/IamPositionService.java       |   8 ++
 .../iam/service/IamUserRoleService.java       |   4 +-
 .../diboot/iam/service/IamUserService.java    |   7 +
 .../iam/service/impl/IamOrgServiceImpl.java   |  11 ++
 .../service/impl/IamPositionServiceImpl.java  |  16 +++
 .../service/impl/IamUserRoleServiceImpl.java  |   4 +-
 .../iam/service/impl/IamUserServiceImpl.java  |  20 +++
 .../diboot/iam/shiro/IamAuthorizingRealm.java |  17 +--
 ...rmissionVO.java => PositionDataScope.java} |  75 ++++++-----
 18 files changed, 358 insertions(+), 79 deletions(-)
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java
 rename diboot-iam-starter/src/main/java/com/diboot/iam/vo/{InvalidResourcePermissionVO.java => PositionDataScope.java} (32%)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
index b2ac5946..6f77c7eb 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
@@ -36,6 +36,7 @@ import diboot.core.test.binder.entity.CcCityInfo;
 import diboot.core.test.binder.entity.Department;
 import diboot.core.test.binder.entity.User;
 import diboot.core.test.binder.entity.UserRole;
+import diboot.core.test.binder.service.CcCityInfoService;
 import diboot.core.test.binder.service.DepartmentService;
 import diboot.core.test.binder.service.UserService;
 import diboot.core.test.binder.vo.SimpleDictionaryVO;
@@ -504,4 +505,10 @@ public class BaseServiceTest {
         Assert.assertTrue(dictionaries.size() == 0);
     }
 
+    @Test
+    public void testDelete(){
+        CcCityInfo cityInfo = ContextHelper.getBean(CcCityInfoService.class).list().get(0);
+        //ContextHelper.getBean(CcCityInfoService.class).removeById(cityInfo.getId());
+    }
+
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/data/access/DataAccessInterface.java b/diboot-core/src/main/java/com/diboot/core/data/access/DataAccessInterface.java
index 3e2c7ab5..da0d7833 100644
--- a/diboot-core/src/main/java/com/diboot/core/data/access/DataAccessInterface.java
+++ b/diboot-core/src/main/java/com/diboot/core/data/access/DataAccessInterface.java
@@ -57,6 +57,6 @@ public interface DataAccessInterface {
      * </tr>
      * </table>
      */
-    List<Serializable> getAccessibleIds(Class<?> entityClass, String fieldName);
+    List<? extends Serializable> getAccessibleIds(Class<?> entityClass, String fieldName);
 
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java b/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java
index 9a3c29ef..1228b846 100644
--- a/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java
+++ b/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java
@@ -26,6 +26,7 @@ import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
@@ -87,7 +88,7 @@ public class DataAccessControlInterceptor implements InnerInterceptor {
             mpBoundSql.sql(newSql);
             // 打印修改后的SQL
             if (log.isTraceEnabled() && V.notEquals(originSql, newSql)) {
-                log.trace("DataAccess Inteceptor SQL : {}", newSql);
+                log.trace("DataAccess Interceptor SQL : {}", newSql);
             }
         } else {
             noCheckpointCache.add(ms.getId());
@@ -127,7 +128,7 @@ public class DataAccessControlInterceptor implements InnerInterceptor {
             if (checkImpl == null) {
                 throw new InvalidUsageException("无法从上下文中获取数据权限的接口实现：DataAccessInterface");
             }
-            List<Serializable> idValues = checkImpl.getAccessibleIds(entityClass, entry.getKey());
+            List<? extends Serializable> idValues = checkImpl.getAccessibleIds(entityClass, entry.getKey());
             if (idValues == null) {
                 return null;
             }
@@ -140,10 +141,21 @@ public class DataAccessControlInterceptor implements InnerInterceptor {
             } else if (idValues.size() == 1) {
                 EqualsTo equalsTo = new EqualsTo();
                 equalsTo.setLeftExpression(new Column(idCol));
-                equalsTo.setRightExpression(new StringValue(S.defaultValueOf(idValues.get(0))));
+                if(idValues.get(0) instanceof Long){
+                    equalsTo.setRightExpression(new LongValue((long)idValues.get(0)));
+                }
+                else{
+                    equalsTo.setRightExpression(new StringValue(S.defaultValueOf(idValues.get(0))));
+                }
                 return equalsTo;
             } else {
-                String conditionExpr = idCol + " IN ('" + S.join(idValues, "', '") + "')";
+                String conditionExpr = idCol + " IN ";
+                if(idValues.get(0) instanceof Long){
+                    conditionExpr += "(" + S.join(idValues, ", ") + ")";
+                }
+                else{
+                    conditionExpr += "('" + S.join(idValues, "', '") + "')";
+                }
                 try {
                     return CCJSqlParserUtil.parseCondExpression(conditionExpr);
                 } catch (JSQLParserException e) {
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamExtensible.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamExtensible.java
index 061b5269..e14dc6a4 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamExtensible.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/IamExtensible.java
@@ -36,15 +36,15 @@ public interface IamExtensible {
      * @param extObj 登录扩展信息
      * @return
      */
-    LabelValue getUserExtentionObj(String userType, Long userId, Map<String, Object> extObj);
+    LabelValue getUserExtensionObj(String userType, Long userId, Map<String, Object> extObj);
 
     /**
      * 获取可扩展的角色
      * @param userType
      * @param userId
-     * @param extentionObjId 岗位等当前扩展对象id
+     * @param extensionObjId 岗位等当前扩展对象id
      * @return
      */
-    List<IamRole> getExtentionRoles(String userType, Long userId, Long extentionObjId);
+    List<IamRole> getExtensionRoles(String userType, Long userId, Long extensionObjId);
 
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java
new file mode 100644
index 00000000..8d409738
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.auth.impl;
+
+import com.diboot.core.util.ContextHelper;
+import com.diboot.core.util.V;
+import com.diboot.core.vo.LabelValue;
+import com.diboot.iam.auth.IamExtensible;
+import com.diboot.iam.entity.IamPosition;
+import com.diboot.iam.entity.IamRole;
+import com.diboot.iam.entity.IamUser;
+import com.diboot.iam.entity.IamUserPosition;
+import com.diboot.iam.service.IamOrgService;
+import com.diboot.iam.service.IamPositionService;
+import com.diboot.iam.service.IamUserService;
+import com.diboot.iam.vo.PositionDataScope;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * IAM扩展配置
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/9
+ * Copyright © diboot.com
+ */
+@Slf4j
+@Service
+public class IamExtensibleImpl implements IamExtensible {
+
+    @Override
+    public LabelValue getUserExtensionObj(String userType, Long userId, Map<String, Object> extObj) {
+        if(!IamUser.class.getSimpleName().equals(userType)){
+            log.warn("扩展的用户类型: {} 需自行实现附加扩展对象逻辑", userType);
+            return null;
+        }
+        IamPositionService iamPositionService = ContextHelper.getBean(IamPositionService.class);
+        IamUserPosition userPosition = iamPositionService.getUserPrimaryPosition(userType, userId);
+        if(userPosition != null){
+            Long orgId = userPosition.getOrgId();
+            IamPosition position = iamPositionService.getEntity(userPosition.getPositionId());
+            PositionDataScope positionDataScope = new PositionDataScope(userId, position.getDataPermissionType(), userId, orgId);
+            List<Long> accessibleUserIds = new ArrayList<>(), accessibleOrgIds = new ArrayList<>();
+            // 本人及下属的用户ids
+            accessibleUserIds.add(userId);
+            List<Long> userIds = ContextHelper.getBean(IamUserService.class).getUserIdsByManagerId(userId);
+            if(V.notEmpty(userIds)){
+                userIds.forEach(uid -> {
+                    if(!accessibleUserIds.contains(uid)){
+                        accessibleUserIds.add(uid);
+                    }
+                });
+            }
+            positionDataScope.setAccessibleUserIds(accessibleUserIds);
+            // 本部门及下属部门的ids
+            accessibleOrgIds.add(orgId);
+            List<Long> childOrgIds = ContextHelper.getBean(IamOrgService.class).getChildOrgIds(orgId);
+            if(V.notEmpty(childOrgIds)){
+                childOrgIds.forEach(oid -> {
+                    if(!accessibleOrgIds.contains(oid)){
+                        accessibleOrgIds.add(oid);
+                    }
+                });
+            }
+            positionDataScope.setAccessibleOrgIds(accessibleOrgIds);
+            return new LabelValue(position.getName(), positionDataScope);
+        }
+        return null;
+    }
+
+    @Override
+    public List<IamRole> getExtensionRoles(String userType, Long userId, Long extensionObjId) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
index 9bcc6b08..de504aa6 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/config/Cons.java
@@ -45,9 +45,10 @@ public class Cons extends com.diboot.core.config.Cons {
      * 字典编码 - 数据权限类型
      */
     public enum DICTCODE_DATA_PERMISSION_TYPE{
-        INDIVIDUAL,
+        SELF,
+        SELF_AND_SUB,
         DEPT,
-        DEPT_MEMS,
+        DEPT_AND_SUB,
         ALL
     }
 
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
index 178348c7..750c88e7 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
@@ -15,13 +15,12 @@
  */
 package com.diboot.iam.data;
 
-import com.diboot.core.config.Cons;
 import com.diboot.core.data.access.DataAccessInterface;
-import com.diboot.core.util.ContextHelper;
-import com.diboot.core.util.V;
+import com.diboot.core.vo.LabelValue;
+import com.diboot.iam.config.Cons;
 import com.diboot.iam.entity.IamUser;
-import com.diboot.iam.service.IamOrgService;
 import com.diboot.iam.util.IamSecurityUtils;
+import com.diboot.iam.vo.PositionDataScope;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
@@ -40,7 +39,7 @@ import java.util.List;
 public class DataAccessPermissionUserOrgImpl implements DataAccessInterface {
 
     @Override
-    public List<Serializable> getAccessibleIds(Class<?> entityClass, String fieldName) {
+    public List<? extends Serializable> getAccessibleIds(Class<?> entityClass, String fieldName) {
         // 获取当前登录用户
         IamUser currentUser = null;
         try {
@@ -51,23 +50,116 @@ public class DataAccessPermissionUserOrgImpl implements DataAccessInterface {
             return Collections.emptyList();
         }
         if (currentUser == null) {
+            log.warn("无法获取当前用户");
             return Collections.emptyList();
         }
-        // 提取其可访问ids
-        List<Serializable> accessibleIds = new ArrayList<>();
-        if(Cons.FieldName.orgId.name().equals(fieldName)){
-            //添加当前部门ID
-            Long currentOrgId = currentUser.getOrgId();
-            accessibleIds.add(currentOrgId);
-            List<Long> childOrgIds = ContextHelper.getBean(IamOrgService.class).getChildOrgIds(currentOrgId);
-            if(V.notEmpty(childOrgIds)){
-                accessibleIds.addAll(childOrgIds);
+        // 获取用户岗位对应的数据权限
+        LabelValue extensionObj = currentUser.getExtensionObj();
+        if(extensionObj == null){
+            // 提取其可访问ids
+            if(isOrgFieldName(fieldName)){
+                return buildOrgIdsScope(currentUser);
+            }
+            else if(isUserFieldName(fieldName)){
+                return buildUserIdsScope(currentUser);
+            }
+            else{
+                log.warn("数据权限未能识别该字段类型: {}", fieldName);
+                return Collections.emptyList();
+            }
+        }
+        // 处理岗位对应的数据范围权限
+        PositionDataScope positionDataScope = (PositionDataScope)extensionObj.getValue();
+        // 可看全部数据，不拦截
+        if(Cons.DICTCODE_DATA_PERMISSION_TYPE.ALL.name().equalsIgnoreCase(positionDataScope.getDataPermissionType())){
+            return null;
+        }
+        // 本人数据
+        else if(Cons.DICTCODE_DATA_PERMISSION_TYPE.SELF.name().equalsIgnoreCase(positionDataScope.getDataPermissionType())){
+            if(isUserFieldName(fieldName)){
+                return buildUserIdsScope(currentUser);
+            }
+            else{// 忽略无关字段
+                return null;
+            }
+        }
+        // 按user过滤，本人及下属
+        else if(Cons.DICTCODE_DATA_PERMISSION_TYPE.SELF_AND_SUB.name().equalsIgnoreCase(positionDataScope.getDataPermissionType())){
+            if(isUserFieldName(fieldName)){
+                return positionDataScope.getAccessibleUserIds();
+            }
+            else{// 忽略无关字段
+                return null;
+            }
+        }
+        // 按部门过滤，本部门
+        else if(Cons.DICTCODE_DATA_PERMISSION_TYPE.DEPT.name().equalsIgnoreCase(positionDataScope.getDataPermissionType())){
+            if(isOrgFieldName(fieldName)){
+                List<Long> accessibleIds = new ArrayList<>(1);
+                accessibleIds.add(positionDataScope.getOrgId());
+                return accessibleIds;
+            }
+            else{// 忽略无关字段
+                return null;
+            }
+        }
+        // 按部门过滤，本部门及下属部门
+        else if(Cons.DICTCODE_DATA_PERMISSION_TYPE.DEPT_AND_SUB.name().equalsIgnoreCase(positionDataScope.getDataPermissionType())){
+            if(isOrgFieldName(fieldName)){
+                return positionDataScope.getAccessibleOrgIds();
+            }
+            else{// 忽略无关字段
+                return null;
             }
         }
-        else if(Cons.FieldName.userId.name().equals(fieldName) || Cons.FieldName.createBy.name().equals(fieldName)){
-            accessibleIds.add(currentUser.getId());
+        else{
+            log.warn("未知的数据权限类型: {}", positionDataScope.getDataPermissionType());
+            return Collections.emptyList();
         }
-        // ... 其他类型字段
+    }
+
+    /**
+     * 未配置数据权限时的默认可见自己的
+     * @param currentUser
+     * @return
+     */
+    protected List<? extends Serializable> buildUserIdsScope(IamUser currentUser){
+        List<Serializable> accessibleIds = new ArrayList<>(1);
+        accessibleIds.add(currentUser.getId());
+        return accessibleIds;
+    }
+
+    /**
+     * 未配置数据权限时的默认本部门
+     * @param currentUser
+     * @return
+     */
+    protected List<? extends Serializable> buildOrgIdsScope(IamUser currentUser){
+        List<Serializable> accessibleIds = new ArrayList<>();
+        accessibleIds.add(currentUser.getOrgId());
+        /*List<Long> childOrgIds = ContextHelper.getBean(IamOrgService.class).getChildOrgIds(currentUser.getOrgId());
+        if(V.notEmpty(childOrgIds)){
+            accessibleIds.addAll(childOrgIds);
+        }*/
         return accessibleIds;
     }
+
+    /**
+     * 是否为可支持的用户字段
+     * @param fieldName
+     * @return
+     */
+    protected boolean isUserFieldName(String fieldName){
+        return (Cons.FieldName.userId.name().equals(fieldName) || Cons.FieldName.createBy.name().equals(fieldName));
+    }
+
+    /**
+     * 是否为可支持的部门字段
+     * @param fieldName
+     * @return
+     */
+    protected boolean isOrgFieldName(String fieldName){
+        return Cons.FieldName.orgId.name().equals(fieldName);
+    }
+
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/BaseLoginUser.java b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/BaseLoginUser.java
index 398c491f..2c45e2c9 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/BaseLoginUser.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/BaseLoginUser.java
@@ -52,13 +52,13 @@ public abstract class BaseLoginUser extends BaseEntity {
      * 附加对象，用于岗位等扩展
       */
     @TableField(exist = false)
-    private LabelValue extentionObj;
+    private LabelValue extensionObj;
 
-    public LabelValue getExtentionObj(){
-        return this.extentionObj;
+    public LabelValue getExtensionObj(){
+        return this.extensionObj;
     }
-    public void setExtentionObj(LabelValue extentionObj){
-        this.extentionObj = extentionObj;
+    public void setExtensionObj(LabelValue extensionObj){
+        this.extensionObj = extensionObj;
     }
 
     public String getAuthToken(){
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamOrgService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamOrgService.java
index d15b857e..4ab48e83 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamOrgService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamOrgService.java
@@ -63,4 +63,11 @@ public interface IamOrgService extends BaseIamService<IamOrg> {
      */
     List<Long> getParentOrgIds(Long orgId, boolean includeThis);
 
+    /**
+     * 获取某负责人负责的相关部门ids
+     * @param managerId 负责人id
+     * @return
+     */
+    List<Long> getOrgIdsByManagerId(Long managerId);
+
 }
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamPositionService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamPositionService.java
index b52bf685..b84ca69b 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamPositionService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamPositionService.java
@@ -36,6 +36,14 @@ public interface IamPositionService extends BaseIamService<IamPosition> {
      */
     List<IamUserPosition> getUserPositionListByUser(String userType, Long userId);
 
+    /**
+     * 获取用户的第一主岗
+     * @param userType
+     * @param userId
+     * @return
+     */
+    IamUserPosition getUserPrimaryPosition(String userType, Long userId);
+
     /***
      * 通过用户ID获取用户的所有任职岗位集合
      * @param userType
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserRoleService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserRoleService.java
index db2244a3..2fc225ee 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserRoleService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserRoleService.java
@@ -44,10 +44,10 @@ public interface IamUserRoleService extends BaseIamService<IamUserRole> {
      * 获取用户所有的全部角色
      * @param userType
      * @param userId
-     * @param extentionObjId 岗位等扩展对象id
+     * @param extensionObjId 岗位等扩展对象id
      * @return
      */
-    List<IamRole> getUserRoleList(String userType, Long userId, Long extentionObjId);
+    List<IamRole> getUserRoleList(String userType, Long userId, Long extensionObjId);
 
     /**
      * 批量创建用户-角色的关系
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java
index 9605ccb9..9385e131 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java
@@ -65,4 +65,11 @@ public interface IamUserService extends BaseIamService<IamUser> {
      */
     boolean isUserNumExists(Long id, String userNum);
 
+    /**
+     * 获取指定管理者的下属人员
+     * @param managerId
+     * @return
+     */
+    List<Long> getUserIdsByManagerId(Long managerId);
+
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamOrgServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamOrgServiceImpl.java
index 6fb27b97..96eca7a9 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamOrgServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamOrgServiceImpl.java
@@ -82,6 +82,9 @@ public class IamOrgServiceImpl extends BaseIamServiceImpl<IamOrgMapper, IamOrg>
 
     @Override
     public List<Long> getChildOrgIds(Long rootOrgId) {
+        if(rootOrgId == null){
+            return Collections.emptyList();
+        }
         List<IamOrgVO> childOrgs = getOrgTree(rootOrgId);
         if(V.notEmpty(childOrgs)){
             List<Long> childOrgIds = new ArrayList<>();
@@ -172,6 +175,14 @@ public class IamOrgServiceImpl extends BaseIamServiceImpl<IamOrgMapper, IamOrg>
         return scopeIds;
     }
 
+    @Override
+    public List<Long> getOrgIdsByManagerId(Long managerId) {
+        LambdaQueryWrapper<IamOrg> queryWrapper = new LambdaQueryWrapper<IamOrg>()
+                .eq(IamOrg::getManagerId, managerId);
+        List<Long> orgIdList = getValuesOfField(queryWrapper, IamOrg::getId);
+        return orgIdList;
+    }
+
     /**
      * 提取id
      * @param orgs
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamPositionServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamPositionServiceImpl.java
index 4148a839..57f1cb8b 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamPositionServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamPositionServiceImpl.java
@@ -57,6 +57,22 @@ public class IamPositionServiceImpl extends BaseIamServiceImpl<IamPositionMapper
         return userPositionList;
     }
 
+    @Override
+    public IamUserPosition getUserPrimaryPosition(String userType, Long userId) {
+        LambdaQueryWrapper<IamUserPosition> queryWrapper = Wrappers.<IamUserPosition>lambdaQuery()
+                .eq(IamUserPosition::getUserType, userType)
+                .eq(IamUserPosition::getUserId, userId)
+                .eq(IamUserPosition::getIsPrimaryPosition, true);
+        List<IamUserPosition> userPositionList = iamUserPositionMapper.selectList(queryWrapper);
+        if(V.isEmpty(userPositionList)){
+            return null;
+        }
+        if(userPositionList.size() > 1){
+            log.warn("用户 {}:{} 主岗多于1个，当前以第一个为准", userType, userId);
+        }
+        return userPositionList.get(0);
+    }
+
     @Override
     public List<IamPosition> getPositionListByUser(String userType, Long userId) {
         // 根据user与position的关联获取positionId列表
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserRoleServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserRoleServiceImpl.java
index 8a3c28fd..4561d99d 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserRoleServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserRoleServiceImpl.java
@@ -80,7 +80,7 @@ public class IamUserRoleServiceImpl extends BaseIamServiceImpl<IamUserRoleMapper
     }
 
     @Override
-    public List<IamRole> getUserRoleList(String userType, Long userId, Long extentionObjId) {
+    public List<IamRole> getUserRoleList(String userType, Long userId, Long extensionObjId) {
         List<IamUserRole> userRoleList = getEntityList(Wrappers.<IamUserRole>lambdaQuery()
                 .select(IamUserRole::getRoleId)
                 .eq(IamUserRole::getUserType, userType)
@@ -96,7 +96,7 @@ public class IamUserRoleServiceImpl extends BaseIamServiceImpl<IamUserRoleMapper
                 .in(IamRole::getId, roleIds));
         // 加载扩展角色
         if(getIamExtensible() != null){
-            List<IamRole> extRoles = getIamExtensible().getExtentionRoles(userType, userId, extentionObjId);
+            List<IamRole> extRoles = getIamExtensible().getExtensionRoles(userType, userId, extensionObjId);
             if(V.notEmpty(extRoles)){
                 roles.addAll(extRoles);
                 roles = BeanUtils.distinctByKey(roles, IamRole::getId);
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
index 526b1d67..b13a9135 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
@@ -27,6 +27,7 @@ import com.diboot.iam.entity.IamAccount;
 import com.diboot.iam.entity.IamUser;
 import com.diboot.iam.mapper.IamUserMapper;
 import com.diboot.iam.service.IamAccountService;
+import com.diboot.iam.service.IamOrgService;
 import com.diboot.iam.service.IamUserRoleService;
 import com.diboot.iam.service.IamUserService;
 import com.diboot.iam.util.IamSecurityUtils;
@@ -54,6 +55,9 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
     @Autowired
     private IamAccountService iamAccountService;
 
+    @Autowired
+    private IamOrgService iamOrgService;
+
     @Autowired(required = false)
     private IamCustomize iamCustomize;
 
@@ -161,6 +165,22 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
         return exists(wrapper);
     }
 
+    @Override
+    public List<Long> getUserIdsByManagerId(Long managerId) {
+        if(managerId == null){
+            return null;
+        }
+        List<Long> orgIds = iamOrgService.getOrgIdsByManagerId(managerId);
+        if(V.isEmpty(orgIds)){
+            return Collections.emptyList();
+        }
+        List<Long> iamUserIds = getValuesOfField(
+                Wrappers.<IamUser>lambdaQuery().in(IamUser::getOrgId, orgIds),
+                IamUser::getId
+        );
+        return iamUserIds;
+    }
+
     /***
      * 检查重复用户编号
      * @param userNumList
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
index df100f7c..3288878a 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
@@ -30,6 +30,7 @@ import com.diboot.iam.entity.IamRole;
 import com.diboot.iam.service.IamRoleResourceService;
 import com.diboot.iam.service.IamUserRoleService;
 import com.diboot.iam.util.IamSecurityUtils;
+import com.diboot.iam.vo.PositionDataScope;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
@@ -109,9 +110,9 @@ public class IamAuthorizingRealm extends AuthorizingRealm {
             loginUser.setAuthToken(iamAuthToken.getAuthtoken());
             IamExtensible iamExtensible = getIamUserRoleService().getIamExtensible();
             if(iamExtensible != null){
-                LabelValue extentionObj = iamExtensible.getUserExtentionObj(iamAuthToken.getUserTypeClass().getSimpleName(), account.getUserId(), iamAuthToken.getExtObj());
-                if(extentionObj != null){
-                    loginUser.setExtentionObj(extentionObj);
+                LabelValue extensionObj = iamExtensible.getUserExtensionObj(iamAuthToken.getUserTypeClass().getSimpleName(), account.getUserId(), iamAuthToken.getExtObj());
+                if(extensionObj != null){
+                    loginUser.setExtensionObj(extensionObj);
                 }
             }
             // 清空当前用户缓存
@@ -131,13 +132,13 @@ public class IamAuthorizingRealm extends AuthorizingRealm {
         SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo();
         BaseLoginUser currentUser = (BaseLoginUser) principals.getPrimaryPrincipal();
         // 根据用户类型与用户id获取roleList
-        Long extentionObjId = null;
-        LabelValue extentionObj = currentUser.getExtentionObj();
-        if(extentionObj != null){
-            extentionObjId = (Long)extentionObj.getValue();
+        Long extensionObjId = null;
+        LabelValue extensionObj = currentUser.getExtensionObj();
+        if(extensionObj != null){
+            extensionObjId = ((PositionDataScope)extensionObj.getValue()).getPositionId();
         }
         // 获取角色列表
-        List<IamRole> roleList = getIamUserRoleService().getUserRoleList(currentUser.getClass().getSimpleName(), currentUser.getId(), extentionObjId);
+        List<IamRole> roleList = getIamUserRoleService().getUserRoleList(currentUser.getClass().getSimpleName(), currentUser.getId(), extensionObjId);
         // 如果没有任何角色，返回
         if (V.isEmpty(roleList)){
             return authorizationInfo;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/vo/InvalidResourcePermissionVO.java b/diboot-iam-starter/src/main/java/com/diboot/iam/vo/PositionDataScope.java
similarity index 32%
rename from diboot-iam-starter/src/main/java/com/diboot/iam/vo/InvalidResourcePermissionVO.java
rename to diboot-iam-starter/src/main/java/com/diboot/iam/vo/PositionDataScope.java
index 4cadf72c..83ccfcc3 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/vo/InvalidResourcePermissionVO.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/vo/PositionDataScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -15,54 +15,59 @@
  */
 package com.diboot.iam.vo;
 
-import com.diboot.core.binding.annotation.BindDict;
-import com.diboot.core.binding.annotation.BindField;
-import com.diboot.core.util.V;
-import com.diboot.iam.entity.IamResourcePermission;
 import lombok.Getter;
 import lombok.Setter;
-import lombok.experimental.Accessors;
 
-import java.util.HashSet;
+import java.io.Serializable;
 import java.util.List;
-import java.util.Set;
 
 /**
- * 无效的资源权限VO
- * @author : uu
- * @version : v1.0
- * @Date 2021/5/7  13:18
- * @copyright www.diboot.com
+ * 岗位相关的数据范围
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/9
+ * Copyright © diboot.com
  */
-@Getter
-@Setter
-@Accessors(chain = true)
-public class InvalidResourcePermissionVO  extends IamResourcePermission {
+@Getter @Setter
+public class PositionDataScope implements Serializable {
+    private static final long serialVersionUID = 3374139242516436636L;
 
-    private static final long serialVersionUID = 6643651522844488124L;
+    public PositionDataScope(){}
 
-    // display_type字段的关联数据字典
-    public static final String DICT_RESOURCE_PERMISSION_TYPE = "RESOURCE_PERMISSION_TYPE";
+    public PositionDataScope(Long positionId, String dataPermissionType, Long userId, Long orgId){
+        this.positionId = positionId;
+        this.dataPermissionType = dataPermissionType;
+        this.userId = userId;
+        this.orgId = orgId;
+    }
 
-    // 字段关联：this.parent_id=id
-    @BindField(entity = IamResourcePermission.class, field = "displayName", condition = "this.parent_id=id")
-    private String parentDisplayName;
+    /**
+     * 岗位id
+     */
+    private Long positionId;
 
-    // 关联数据字典：RESOURCE_PERMISSION_TYPE
-    @BindDict(type = DICT_RESOURCE_PERMISSION_TYPE, field = "displayType")
-    private String displayTypeLabel;
+    /**
+     * 数据权限范围
+     */
+    private String dataPermissionType;
 
-    private List<InvalidResourcePermissionVO> children;
+    /**
+     * 当前部门id
+     */
+    private Long orgId;
 
     /**
-     * 当前权限无效的的uri集合
+     * 当前及子级别部门ids
      */
-    private Set<String> invalidApiSetList;
+    private List<? extends Serializable> accessibleOrgIds;
 
-    public void addInvalidApiSet(String invalidApiSet) {
-        if (V.isEmpty(invalidApiSetList)) {
-            invalidApiSetList = new HashSet<>();
-        }
-        invalidApiSetList.add(invalidApiSet);
-    }
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    /**
+     * 当前及子级用户ids
+     */
+    private List<? extends Serializable> accessibleUserIds;
 }
-- 
Gitee


From 69f3e3248d20735f76e2585ff8c1ad2ad3c34d4f Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 9 May 2022 18:30:09 +0800
Subject: [PATCH 097/195] =?UTF-8?q?*=20=E9=BB=98=E8=AE=A4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/diboot/iam/starter/IamAutoConfig.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
index 41a71af7..28e48f13 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamAutoConfig.java
@@ -17,8 +17,10 @@ package com.diboot.iam.starter;
 
 import com.diboot.core.cache.BaseCacheManager;
 import com.diboot.core.cache.DynamicMemoryCacheManager;
+import com.diboot.core.data.access.DataAccessInterface;
 import com.diboot.core.util.V;
 import com.diboot.iam.config.Cons;
+import com.diboot.iam.data.DataAccessPermissionUserOrgImpl;
 import com.diboot.iam.shiro.IamAuthorizingRealm;
 import com.diboot.iam.shiro.StatelessAccessControlFilter;
 import com.diboot.iam.shiro.StatelessSubjectFactory;
@@ -212,4 +214,14 @@ public class IamAutoConfig {
                 Cons.CACHE_CAPTCHA);
     }
 
+    /**
+     * 数据访问控制实现，默认基于用户和部门过滤
+     * @return
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public DataAccessInterface dataAccessInterface(){
+        return new DataAccessPermissionUserOrgImpl();
+    }
+
 }
-- 
Gitee


From 272405b9be79197333be8f1d19b9c8c8223c0732 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 9 May 2022 19:03:59 +0800
Subject: [PATCH 098/195] + add config colorPrimary

---
 diboot-admin-ui/src/layout/setting/index.vue | 44 ++++++++++++++++++++
 diboot-admin-ui/src/store/app.ts             |  4 +-
 diboot-admin-ui/types/components.d.ts        |  1 +
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/src/layout/setting/index.vue b/diboot-admin-ui/src/layout/setting/index.vue
index d1964942..58b2a7d8 100644
--- a/diboot-admin-ui/src/layout/setting/index.vue
+++ b/diboot-admin-ui/src/layout/setting/index.vue
@@ -1,10 +1,50 @@
 <script setup lang="ts">
 import { Opportunity } from '@element-plus/icons-vue'
 import useAppStore from '@/store/app'
+import { useCssVar } from '@vueuse/core'
 
 const openSetting = ref(false)
 
 const appStore = useAppStore()
+
+// 动态主题色
+// 变量前缀
+const pre = '--el-color-primary'
+// 白色混合色
+const mixWhite = '#ffffff'
+// 黑色混合色
+const mixBlack = '#000000'
+
+const colorPrimary = useCssVar(pre)
+
+watch(
+  () => appStore.colorPrimary,
+  value => (colorPrimary.value = value ? value : '#409eff'),
+  { immediate: true }
+)
+
+const mix = (color1: string, color2: string, weight: number) => {
+  weight = Math.max(Math.min(Number(weight), 1), 0)
+  const unit = (color: string, position: number) => parseInt(color.substring(position, position + 2), 16)
+  const unitColor = (position: number) => {
+    const num = Math.round(unit(color1, position) * (1 - weight) + unit(color2, position) * weight)
+    return ('0' + (num || 0).toString(16)).slice(-2)
+  }
+  return '#' + unitColor(1) + unitColor(3) + unitColor(5)
+}
+
+watch(
+  colorPrimary,
+  value => {
+    console.log(123)
+    appStore.colorPrimary = value
+    for (let i = 1; i < 10; i += 1) {
+      useCssVar(`${pre}-light-${i}`).value = mix(value, mixWhite, i * 0.1)
+    }
+    useCssVar(`${pre}-dark`).value = mix(value, mixBlack, 0.1)
+  },
+  { immediate: true }
+)
 </script>
 
 <template>
@@ -37,6 +77,9 @@ const appStore = useAppStore()
         <el-form-item label="开启 Footer">
           <el-switch v-model="appStore.enableFooter" />
         </el-form-item>
+        <el-form-item label="主题色">
+          <el-color-picker v-model="colorPrimary" />
+        </el-form-item>
       </el-form>
       <el-button style="width: 100%" @click="appStore.$reset()">重置</el-button>
     </el-drawer>
@@ -63,6 +106,7 @@ const appStore = useAppStore()
     color: var(--el-color-white);
   }
 }
+
 .setting {
   :deep(.el-drawer__header) {
     margin-bottom: 0;
diff --git a/diboot-admin-ui/src/store/app.ts b/diboot-admin-ui/src/store/app.ts
index e948dda0..b5e31385 100644
--- a/diboot-admin-ui/src/store/app.ts
+++ b/diboot-admin-ui/src/store/app.ts
@@ -3,6 +3,7 @@ export interface IAppStore {
   enableFooter: boolean
   globalSize: 'large' | 'default' | 'small'
   layout: 'default' | 'dock' | 'menu' | 'topNav'
+  colorPrimary?: string
 }
 
 export default defineStore('app', {
@@ -11,7 +12,8 @@ export default defineStore('app', {
       enableTabs: true,
       enableFooter: true,
       globalSize: 'default',
-      layout: 'default'
+      layout: 'default',
+      colorPrimary: undefined
     }
   },
   persist: {
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 30c8dbf8..96b3bdca 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -10,6 +10,7 @@ declare module '@vue/runtime-core' {
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDialog: typeof import('element-plus/es')['ElDialog']
-- 
Gitee


From 4127c6d250a947834732033d96910c2d666b076f Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 9 May 2022 19:05:14 +0800
Subject: [PATCH 099/195] * opt route-sort

---
 diboot-admin-ui/src/utils/route.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/src/utils/route.ts b/diboot-admin-ui/src/utils/route.ts
index 0b720576..340db186 100644
--- a/diboot-admin-ui/src/utils/route.ts
+++ b/diboot-admin-ui/src/utils/route.ts
@@ -33,6 +33,9 @@ export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
   const buildFullPath = (path: string, parentPath = '/') =>
     /^\//.exec(path) ? path : `${parentPath === '/' ? '' : parentPath}/${path}`
 
+  // 路由排序
+  const routeSort = (e1: RouteRecordRaw, e2: RouteRecordRaw) => (e1.meta?.sort ?? 0) - (e2.meta?.sort ?? 0)
+
   /**
    * 构建路由
    *
@@ -42,7 +45,7 @@ export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
   function buildRouter(routes: RouteRecordRaw[], parentPath?: string) {
     return routes.filter(route => {
       const fullPath = buildFullPath(route.path, parentPath)
-      if (route.children?.length && (route.children = buildRouter(route.children, fullPath)).length) {
+      if (route.children?.length && (route.children = buildRouter(route.children.sort(routeSort), fullPath)).length) {
         const componentName = route.meta?.componentName
         if (componentName) {
           route.component = resolveComponent(componentName)
-- 
Gitee


From 78fcfb8a6cda31f00007cad6cd7e51d8b864c233 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 10 May 2022 18:55:27 +0800
Subject: [PATCH 100/195] + add menu-search

---
 diboot-admin-ui/src/layout/header/index.vue   |   6 +
 .../src/layout/header/menuSearch.vue          | 103 ++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 diboot-admin-ui/src/layout/header/menuSearch.vue

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 0da9a54d..401fa9d9 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { UserFilled, ArrowDown, Moon, Sunny } from '@element-plus/icons-vue'
 import { useDark, useToggle } from '@vueuse/core'
+import MenuSearch from './menuSearch.vue'
 import useAuthStore from '@/store/auth'
 import Logo from '@/assets/logo.png'
 import useAppStore from '@/store/app'
@@ -32,6 +33,7 @@ const appStore = useAppStore()
       <div :class="$slots.topNav ? 'top-nav' : ''">
         <slot name="topNav" />
       </div>
+      <menu-search class="item" />
       <el-icon class="item" :size="22" @click="toggleDark()">
         <component :is="isDark ? Sunny : Moon" />
       </el-icon>
@@ -82,5 +84,9 @@ const appStore = useAppStore()
   align-items: center;
   padding: 0 10px;
   cursor: pointer;
+
+  &:hover {
+    color: var(--el-color-primary);
+  }
 }
 </style>
diff --git a/diboot-admin-ui/src/layout/header/menuSearch.vue b/diboot-admin-ui/src/layout/header/menuSearch.vue
new file mode 100644
index 00000000..874214c3
--- /dev/null
+++ b/diboot-admin-ui/src/layout/header/menuSearch.vue
@@ -0,0 +1,103 @@
+<script setup lang="ts">
+import { Search } from '@element-plus/icons-vue'
+import { useVueFuse } from 'vue-fuse'
+import { getMenuTree } from '@/utils/route'
+import { RouteRecordRaw } from 'vue-router'
+
+interface MenuNode {
+  routeName: string
+  title: string
+}
+
+function tree2List(tree: RouteRecordRaw[]): MenuNode[] {
+  const list: MenuNode[] = []
+  for (const node of tree) {
+    const children = node.children
+    if (!children || !children.length) {
+      list.push({ routeName: String(node.name), title: node.meta?.title ?? '' })
+    } else {
+      for (const child of tree2List(children)) {
+        child.title = node.meta?.title + ' - ' + child.title
+        list.push(child)
+      }
+    }
+  }
+  return list
+}
+
+const { search, results } = useVueFuse(tree2List(getMenuTree()), {
+  // 是否按优先级进行排序
+  shouldSort: true,
+  // 匹配度阈值	0.0表示完全匹配(字符和位置)；1.0将会匹配所有值
+  threshold: 0.3,
+  // 将被搜索的键列表。 这支持嵌套路径、加权搜索、在字符串和对象数组中搜索。
+  // name：搜索的键
+  // weight：对应的权重
+  keys: [
+    {
+      name: 'title',
+      weight: 0.9
+    },
+    {
+      name: 'routeName',
+      weight: 0.1
+    }
+  ]
+})
+const value = ref('')
+const visible = ref(false)
+watch(value, v => (search.value = v))
+
+const router = useRouter()
+const open = (name: string) => {
+  router.push({ name })
+  visible.value = false
+  value.value = ''
+}
+</script>
+
+<template>
+  <span class="router-search">
+    <el-icon :size="22" @click="visible = true">
+      <Search />
+    </el-icon>
+    <el-dialog v-model="visible" :show-close="false" top="10vh">
+      <template #title>
+        <el-input v-model="value" placeholder="搜索菜单">
+          <template #prefix>
+            <el-icon :size="20">
+              <Search />
+            </el-icon>
+          </template>
+        </el-input>
+      </template>
+      <el-scrollbar max-height="60vh">
+        <el-card v-for="item in results" :key="item.routeName" shadow="hover" @click="open(item.routeName)">
+          {{ item.title }}
+        </el-card>
+      </el-scrollbar>
+    </el-dialog>
+  </span>
+</template>
+
+<style scoped lang="scss">
+.router-search {
+  :deep(.el-dialog) {
+    .el-dialog__header {
+      margin-right: 0;
+    }
+
+    .el-dialog__body {
+      padding: var(--el-dialog-padding-primary) var(--el-dialog-padding-primary);
+
+      .el-card:hover {
+        color: var(--el-color-primary);
+      }
+
+      .el-card + .el-card {
+        margin-top: 10px;
+      }
+    }
+  }
+}
+</style>
-- 
Gitee


From 1bd78692b38bae93b50eaafafd54ec407af55324 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 11 May 2022 00:19:08 +0800
Subject: [PATCH 101/195] + add fuse.js and vue-fuse

---
 diboot-admin-ui/package.json   |  2 ++
 diboot-admin-ui/pnpm-lock.yaml | 47 ++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index ecf0ab2b..17d109f7 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -13,6 +13,7 @@
     "@vueuse/core": "^8.4.2",
     "axios": "^0.26.1",
     "element-plus": "^2.1.10",
+    "fuse.js": "^6.6.1",
     "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
@@ -20,6 +21,7 @@
     "pinia-plugin-persist": "^1.0.0",
     "qs": "^6.10.3",
     "vue": "^3.2.25",
+    "vue-fuse": "^4.1.1",
     "vue-router": "^4.0.14",
     "vuedraggable": "^4.1.0"
   },
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index f7d3e00a..126ef895 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -17,6 +17,7 @@ specifiers:
   eslint-config-prettier: ^8.5.0
   eslint-plugin-prettier: ^4.0.0
   eslint-plugin-vue: ^8.6.0
+  fuse.js: ^6.6.1
   lodash: ^4.17.21
   mockjs: ^1.1.0
   node-sass: ^7.0.1
@@ -35,6 +36,7 @@ specifiers:
   vite-plugin-mock: ^2.9.6
   vite-plugin-vue-setup-extend: ^0.4.0
   vue: ^3.2.25
+  vue-fuse: ^4.1.1
   vue-router: ^4.0.14
   vue-tsc: ^0.29.8
   vuedraggable: ^4.1.0
@@ -44,6 +46,7 @@ dependencies:
   '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
   axios: registry.npmmirror.com/axios/0.26.1
   element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
+  fuse.js: registry.npmmirror.com/fuse.js/6.6.1
   lodash: registry.npmmirror.com/lodash/4.17.21
   mockjs: registry.npmmirror.com/mockjs/1.1.0
   nprogress: registry.npmmirror.com/nprogress/0.2.0
@@ -51,6 +54,7 @@ dependencies:
   pinia-plugin-persist: registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.13+vue@3.2.33
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
+  vue-fuse: registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.1+vue@3.2.33
   vue-router: registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33
   vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.33
 
@@ -2257,6 +2261,13 @@ packages:
     version: 1.0.1
     dev: true
 
+  registry.npmmirror.com/fuse.js/6.6.1:
+    resolution: {integrity: sha512-3PXxXYsdKm68JHY6o2I9gIY+z9LcPs/ROITSzwFZyo0McjShwPFJU2i81Iu4h4si5X7JrrgXtOLDkeiTjdnWFQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.1.tgz}
+    name: fuse.js
+    version: 6.6.1
+    engines: {node: '>=10'}
+    dev: false
+
   registry.npmmirror.com/gauge/3.0.2:
     resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/gauge/-/gauge-3.0.2.tgz}
     name: gauge
@@ -4857,6 +4868,24 @@ packages:
       vscode-typescript-languageservice: registry.npmmirror.com/vscode-typescript-languageservice/0.29.8
     dev: true
 
+  registry.npmmirror.com/vue-demi/0.11.4_vue@3.2.33:
+    resolution: {integrity: sha512-/3xFwzSykLW2HiiLie43a+FFgNOcokbBJ+fzvFXd0r2T8MYohqvphUyDQ8lbAwzQ3Dlcrb1c9ykifGkhSIAk6A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-demi/-/vue-demi-0.11.4.tgz}
+    id: registry.npmmirror.com/vue-demi/0.11.4
+    name: vue-demi
+    version: 0.11.4
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+    dependencies:
+      vue: registry.npmmirror.com/vue/3.2.33
+    dev: false
+
   registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33:
     resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz}
     id: registry.npmmirror.com/vue-demi/0.12.5
@@ -4896,6 +4925,24 @@ packages:
       - supports-color
     dev: true
 
+  registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.1+vue@3.2.33:
+    resolution: {integrity: sha512-bhuTiniVK3HmTcxvksrzPgDWPFTEDYiWbJa01E7yT2lRPtE4BVb5cXUBUmqtb5rCkDOsLgMh1n9mRlHQImYNkA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-fuse/-/vue-fuse-4.1.1.tgz}
+    id: registry.npmmirror.com/vue-fuse/4.1.1
+    name: vue-fuse
+    version: 4.1.1
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      fuse.js: ^6.4.6
+      vue: ^3.2.20
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+    dependencies:
+      fuse.js: registry.npmmirror.com/fuse.js/6.6.1
+      vue: registry.npmmirror.com/vue/3.2.33
+      vue-demi: registry.npmmirror.com/vue-demi/0.11.4_vue@3.2.33
+    dev: false
+
   registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33:
     resolution: {integrity: sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-router/-/vue-router-4.0.14.tgz}
     id: registry.npmmirror.com/vue-router/4.0.14
-- 
Gitee


From 31086d4fda83dd8b0417b0c708b491a61c881bf0 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 11 May 2022 00:20:49 +0800
Subject: [PATCH 102/195] * opt theme config

---
 diboot-admin-ui/src/layout/header/index.vue  |  7 ++--
 diboot-admin-ui/src/layout/setting/index.vue | 38 ++------------------
 diboot-admin-ui/src/utils/theme.ts           | 38 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 diboot-admin-ui/src/utils/theme.ts

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index 401fa9d9..ae9748ae 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -1,14 +1,11 @@
 <script setup lang="ts">
 import { UserFilled, ArrowDown, Moon, Sunny } from '@element-plus/icons-vue'
-import { useDark, useToggle } from '@vueuse/core'
+import { isDark, toggleTheme } from '@/utils/theme'
 import MenuSearch from './menuSearch.vue'
 import useAuthStore from '@/store/auth'
 import Logo from '@/assets/logo.png'
 import useAppStore from '@/store/app'
 
-const isDark = useDark()
-const toggleDark = useToggle(isDark)
-
 const authStore = useAuthStore()
 const router = useRouter()
 
@@ -34,7 +31,7 @@ const appStore = useAppStore()
         <slot name="topNav" />
       </div>
       <menu-search class="item" />
-      <el-icon class="item" :size="22" @click="toggleDark()">
+      <el-icon class="item" :size="22" @click="toggleTheme()">
         <component :is="isDark ? Sunny : Moon" />
       </el-icon>
       <el-dropdown @command="command => (appStore.globalSize = command)">
diff --git a/diboot-admin-ui/src/layout/setting/index.vue b/diboot-admin-ui/src/layout/setting/index.vue
index 58b2a7d8..8a4b4b5c 100644
--- a/diboot-admin-ui/src/layout/setting/index.vue
+++ b/diboot-admin-ui/src/layout/setting/index.vue
@@ -1,50 +1,18 @@
 <script setup lang="ts">
 import { Opportunity } from '@element-plus/icons-vue'
 import useAppStore from '@/store/app'
-import { useCssVar } from '@vueuse/core'
+import { colorPrimary } from '@/utils/theme'
 
 const openSetting = ref(false)
 
 const appStore = useAppStore()
 
-// 动态主题色
-// 变量前缀
-const pre = '--el-color-primary'
-// 白色混合色
-const mixWhite = '#ffffff'
-// 黑色混合色
-const mixBlack = '#000000'
-
-const colorPrimary = useCssVar(pre)
-
+// 监听主题色
 watch(
   () => appStore.colorPrimary,
   value => (colorPrimary.value = value ? value : '#409eff'),
   { immediate: true }
 )
-
-const mix = (color1: string, color2: string, weight: number) => {
-  weight = Math.max(Math.min(Number(weight), 1), 0)
-  const unit = (color: string, position: number) => parseInt(color.substring(position, position + 2), 16)
-  const unitColor = (position: number) => {
-    const num = Math.round(unit(color1, position) * (1 - weight) + unit(color2, position) * weight)
-    return ('0' + (num || 0).toString(16)).slice(-2)
-  }
-  return '#' + unitColor(1) + unitColor(3) + unitColor(5)
-}
-
-watch(
-  colorPrimary,
-  value => {
-    console.log(123)
-    appStore.colorPrimary = value
-    for (let i = 1; i < 10; i += 1) {
-      useCssVar(`${pre}-light-${i}`).value = mix(value, mixWhite, i * 0.1)
-    }
-    useCssVar(`${pre}-dark`).value = mix(value, mixBlack, 0.1)
-  },
-  { immediate: true }
-)
 </script>
 
 <template>
@@ -78,7 +46,7 @@ watch(
           <el-switch v-model="appStore.enableFooter" />
         </el-form-item>
         <el-form-item label="主题色">
-          <el-color-picker v-model="colorPrimary" />
+          <el-color-picker v-model="colorPrimary" @update:modelValue="value => (appStore.colorPrimary = value)" />
         </el-form-item>
       </el-form>
       <el-button style="width: 100%" @click="appStore.$reset()">重置</el-button>
diff --git a/diboot-admin-ui/src/utils/theme.ts b/diboot-admin-ui/src/utils/theme.ts
new file mode 100644
index 00000000..6451fe48
--- /dev/null
+++ b/diboot-admin-ui/src/utils/theme.ts
@@ -0,0 +1,38 @@
+import { useCssVar, useDark, useToggle } from '@vueuse/core'
+
+// 主题 (是否是黑暗的)
+export const isDark = useDark()
+// 切换主题
+export const toggleTheme = useToggle(isDark)
+
+// 主题色配置
+const pre = '--el-color-primary'
+// 主题色
+export const colorPrimary = useCssVar(pre)
+// 颜色混合(参考 sass @function mix)
+const mix = (color1: string, color2: string, weight: number) => {
+  weight = Math.max(Math.min(Number(weight), 1), 0)
+  const unit = (color: string, index: number) => parseInt(color.substring(index, index + 2), 16)
+  const unitColor = (index: number) =>
+    `0${Math.round(unit(color1, index) * weight + unit(color2, index) * (1 - weight)).toString(16)}`.slice(-2)
+  return `#${unitColor(1)}${unitColor(3)}${unitColor(5)}`
+}
+// 混入从主题色
+const mixColorPrimary = (color: string, light: string, dark: string) => {
+  for (let i = 1; i < 10; i += 1) {
+    useCssVar(`${pre}-light-${i}`).value = mix(light, color, i * 0.1)
+  }
+  useCssVar(`${pre}-dark-2`).value = mix(dark, color, 0.2)
+}
+// 设置从主题色
+const subColorPrimary = (color: string, isDark: boolean) => {
+  if (isDark) {
+    mixColorPrimary(color, '#141414', '#ffffff')
+  } else {
+    mixColorPrimary(color, '#ffffff', '#000000')
+  }
+}
+// 监听主题色变化
+watch(colorPrimary, value => subColorPrimary(value, isDark.value))
+// 监听主题变化，随着改变主题色
+watch(isDark, value => subColorPrimary(colorPrimary.value, value))
-- 
Gitee


From 3494460abd8dc0187501b551a4af44cf2865cb67 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 11 May 2022 09:09:09 +0800
Subject: [PATCH 103/195] * opt local icons support Vue and SVG

---
 .../src/assets/{svg => icon}/TextFontSize.svg |  0
 .../src/components/icon/select.vue            |  4 ++--
 diboot-admin-ui/src/config/iconLibrary.ts     | 23 +++++++++++++------
 diboot-admin-ui/src/layout/header/index.vue   |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)
 rename diboot-admin-ui/src/assets/{svg => icon}/TextFontSize.svg (100%)

diff --git a/diboot-admin-ui/src/assets/svg/TextFontSize.svg b/diboot-admin-ui/src/assets/icon/TextFontSize.svg
similarity index 100%
rename from diboot-admin-ui/src/assets/svg/TextFontSize.svg
rename to diboot-admin-ui/src/assets/icon/TextFontSize.svg
diff --git a/diboot-admin-ui/src/components/icon/select.vue b/diboot-admin-ui/src/components/icon/select.vue
index bba9c65e..20804951 100644
--- a/diboot-admin-ui/src/components/icon/select.vue
+++ b/diboot-admin-ui/src/components/icon/select.vue
@@ -25,14 +25,14 @@ const selectIcon = (name?: string) => {
   <el-button v-show="modelValue" type="text" style="color: var(--el-color-danger)" @click="selectIcon()">
     清除
   </el-button>
-  <el-dialog v-model="visible" title="图标选择器">
+  <el-dialog v-model="visible" title="图标选择器" top="10vh">
     <el-tabs style="margin-top: -30px">
       <el-tab-pane v-for="key in Object.keys(IconLibrary)" :key="key" lazy>
         <template #label>
           {{ key }}
           <el-tag size="small" type="info">{{ Object.keys(IconLibrary[key]).length }}</el-tag>
         </template>
-        <el-scrollbar style="height: 60vh">
+        <el-scrollbar height="60vh">
           <el-space wrap>
             <el-card
               v-for="item in getIconList(key)"
diff --git a/diboot-admin-ui/src/config/iconLibrary.ts b/diboot-admin-ui/src/config/iconLibrary.ts
index 5d12f488..d0b4fcf6 100644
--- a/diboot-admin-ui/src/config/iconLibrary.ts
+++ b/diboot-admin-ui/src/config/iconLibrary.ts
@@ -1,20 +1,29 @@
 import * as Element from '@element-plus/icons-vue'
 
 /**
- * 加载 @/assets/svg 目录下所有 svg
+ * 加载 @/assets/icon 目录下所有图标（svg|vue）
  */
-const svgFiles = import.meta.glob('@/assets/svg/**/*.svg', { as: 'raw' })
+const iconSvgFiles = import.meta.glob('@/assets/icon/**/*.svg', { as: 'raw' })
+const iconVueFiles = import.meta.globEager('@/assets/icon/**/*.vue')
 
 /**
- * 构建本地 svg 图标库
+ * 构建本地图标
  */
-const LocalSvg = Object.keys(svgFiles).reduce((all: any, svgPath: string) => {
-  const svgName = svgPath.replace(/.*svg\/(.*)\.svg/, '$1')
-  all[svgName] = defineComponent({ name: svgName, render: () => h('i', { innerHTML: svgFiles[svgPath] }) })
+const Local = Object.keys(iconSvgFiles).reduce((all: any, path: string) => {
+  const name = path.replace(/.*icon\/(.*)\.svg/, '$1')
+  all[name] = defineComponent({
+    name,
+    render: () => h('i', { innerHTML: iconSvgFiles[path], style: { display: 'inline-flex' } })
+  })
   return all
 }, {})
+Object.keys(iconVueFiles).reduce((all: any, path: string) => {
+  const name = path.replace(/.*icon\/(.*)\.vue/, '$1')
+  all[name] = { name, ...iconVueFiles[path].default }
+  return all
+}, Local)
 
 /**
  * 导出所有图标资源
  */
-export default { Element, LocalSvg } as any
+export default { Element, Local } as any
diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index ae9748ae..c4ddb9d0 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -37,7 +37,7 @@ const appStore = useAppStore()
       <el-dropdown @command="command => (appStore.globalSize = command)">
         <div class="item">
           <el-icon :size="22">
-            <icon name="LocalSvg:TextFontSize" />
+            <icon name="Local:TextFontSize" />
           </el-icon>
         </div>
         <template #dropdown>
-- 
Gitee


From 71d7c50a9d79740e463f3bfa3664105c1eefa3d6 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 11 May 2022 10:50:45 +0800
Subject: [PATCH 104/195] + add menu-search shortcut `ctrl + k`

---
 .../src/layout/header/menuSearch.vue          | 45 +++++++++++++++----
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/diboot-admin-ui/src/layout/header/menuSearch.vue b/diboot-admin-ui/src/layout/header/menuSearch.vue
index 874214c3..1fb00a8c 100644
--- a/diboot-admin-ui/src/layout/header/menuSearch.vue
+++ b/diboot-admin-ui/src/layout/header/menuSearch.vue
@@ -46,10 +46,29 @@ const { search, results } = useVueFuse(tree2List(getMenuTree()), {
 })
 const value = ref('')
 const visible = ref(false)
-watch(value, v => (search.value = v))
+const inputRef = ref()
+
+const open = () => {
+  visible.value = true
+  inputRef.value?.focus()
+}
+// 监听全局快捷键 （ctrl + k）
+onMounted(() => {
+  let keyList: string[] = []
+  document.addEventListener('keyup', e => {
+    keyList = keyList.filter(key => key !== e.key)
+  })
+  document.addEventListener('keydown', e => {
+    keyList.push(e.key)
+    if (keyList[0] === 'Control' && keyList[1] === 'k') {
+      e.preventDefault()
+      open()
+    }
+  })
+})
 
 const router = useRouter()
-const open = (name: string) => {
+const go = (name: string) => {
   router.push({ name })
   visible.value = false
   value.value = ''
@@ -57,13 +76,21 @@ const open = (name: string) => {
 </script>
 
 <template>
-  <span class="router-search">
-    <el-icon :size="22" @click="visible = true">
-      <Search />
-    </el-icon>
+  <span class="menu-search">
+    <el-tooltip effect="light" content="ctrl + k" placement="bottom" :show-after="300">
+      <el-icon :size="22" @click="open">
+        <Search />
+      </el-icon>
+    </el-tooltip>
     <el-dialog v-model="visible" :show-close="false" top="10vh">
       <template #title>
-        <el-input v-model="value" placeholder="搜索菜单">
+        <el-input
+          ref="inputRef"
+          v-model="value"
+          autofocus
+          placeholder="搜索菜单"
+          @update:modelValue="v => (search = v)"
+        >
           <template #prefix>
             <el-icon :size="20">
               <Search />
@@ -72,7 +99,7 @@ const open = (name: string) => {
         </el-input>
       </template>
       <el-scrollbar max-height="60vh">
-        <el-card v-for="item in results" :key="item.routeName" shadow="hover" @click="open(item.routeName)">
+        <el-card v-for="item in results" :key="item.routeName" shadow="hover" @click="go(item.routeName)">
           {{ item.title }}
         </el-card>
       </el-scrollbar>
@@ -81,7 +108,7 @@ const open = (name: string) => {
 </template>
 
 <style scoped lang="scss">
-.router-search {
+.menu-search {
   :deep(.el-dialog) {
     .el-dialog__header {
       margin-right: 0;
-- 
Gitee


From 32b7877ee22d545df194f1cb8355539561ca0378 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 11 May 2022 15:23:20 +0800
Subject: [PATCH 105/195] * fix typo

---
 diboot-admin-ui/src/layout/header/menuSearch.vue | 2 +-
 diboot-admin-ui/src/layout/setting/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-admin-ui/src/layout/header/menuSearch.vue b/diboot-admin-ui/src/layout/header/menuSearch.vue
index 1fb00a8c..754b41b4 100644
--- a/diboot-admin-ui/src/layout/header/menuSearch.vue
+++ b/diboot-admin-ui/src/layout/header/menuSearch.vue
@@ -89,7 +89,7 @@ const go = (name: string) => {
           v-model="value"
           autofocus
           placeholder="搜索菜单"
-          @update:modelValue="v => (search = v)"
+          @update:model-value="v => (search = v)"
         >
           <template #prefix>
             <el-icon :size="20">
diff --git a/diboot-admin-ui/src/layout/setting/index.vue b/diboot-admin-ui/src/layout/setting/index.vue
index 8a4b4b5c..10f0b489 100644
--- a/diboot-admin-ui/src/layout/setting/index.vue
+++ b/diboot-admin-ui/src/layout/setting/index.vue
@@ -46,7 +46,7 @@ watch(
           <el-switch v-model="appStore.enableFooter" />
         </el-form-item>
         <el-form-item label="主题色">
-          <el-color-picker v-model="colorPrimary" @update:modelValue="value => (appStore.colorPrimary = value)" />
+          <el-color-picker v-model="colorPrimary" @update:model-value="value => (appStore.colorPrimary = value)" />
         </el-form-item>
       </el-form>
       <el-button style="width: 100%" @click="appStore.$reset()">重置</el-button>
-- 
Gitee


From 99b370f178f3b314b2e8653f3d07f191ae22ef74 Mon Sep 17 00:00:00 2001
From: fullstackyang <8mQwYMHd3M94my7>
Date: Wed, 11 May 2022 16:00:56 +0800
Subject: [PATCH 106/195] =?UTF-8?q?+=20=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=88=97=E8=A1=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/mock/auth/index.ts            |  19 ++-
 diboot-admin-ui/mock/system/dictionary.ts     | 124 ++++++++++++++++++
 diboot-admin-ui/pnpm-lock.yaml                |  44 +++----
 .../src/views/system/dictionary/list.vue      |  71 ++++++++++
 4 files changed, 235 insertions(+), 23 deletions(-)
 create mode 100644 diboot-admin-ui/mock/system/dictionary.ts
 create mode 100644 diboot-admin-ui/src/views/system/dictionary/list.vue

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index e2ed304e..e63a58af 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -70,7 +70,8 @@ export default [
     response: () => {
       return JsonResult.OK(authMenu)
     }
-  }
+  },
+
 ] as MockMethod[]
 
 // 授权菜单
@@ -113,5 +114,21 @@ const authMenu = [
         }
       }
     ]
+  },
+  {
+    path: '/system',
+    name: 'System',
+    meta: {title: 'System', componentName: 'Layout'},
+    'children': [
+      {
+        path: 'dictionary',
+        name: 'Dictionary',
+        meta: {
+          title: 'Dictionary',
+          componentName: 'DictionaryList',
+          keepAlive: false,
+        }
+      }
+    ]
   }
 ]
diff --git a/diboot-admin-ui/mock/system/dictionary.ts b/diboot-admin-ui/mock/system/dictionary.ts
new file mode 100644
index 00000000..c52388bf
--- /dev/null
+++ b/diboot-admin-ui/mock/system/dictionary.ts
@@ -0,0 +1,124 @@
+import { MockMethod } from 'vite-plugin-mock'
+import JsonResult from '../_util'
+import { Random } from 'mockjs'
+
+const baseUrl = '/api/dictionary'
+
+export default [
+    {
+        url: `${baseUrl}/list`,
+        timeout: Random.natural(50, 300),
+        method: 'get',
+        response: () => {
+            return JsonResult.OK(dictionaryDataMap.list)
+        }
+    },
+    {
+        url: `${baseUrl}/detail`,
+        timeout: Random.natural(50, 300),
+        method: 'get',
+        response: () => {
+            return JsonResult.OK(dictionaryDataMap.detail)
+        }
+    }
+]as MockMethod[]
+
+
+const dictionaryDataMap = {
+    list: [{
+        id: '1',
+        type: 'GENDER',
+        itemName: '用户性别',
+        itemValue: '',
+        description: '用户性别数据字典',
+        createTime: '2022-05-11',
+        children: [{
+            id: '2',
+            type: 'GENDER',
+            itemName: '男',
+            itemValue: 'M',
+            description: '男性',
+            createTime: '2022-05-11',
+        },{
+            id: '3',
+            type: 'GENDER',
+            itemName: '女',
+            itemValue: 'F',
+            description: '女性',
+            createTime: '2022-05-11',
+        }]
+    },{
+        id: '4',
+        type: 'ACCOUNT_STATUS',
+        itemName: '账号状态',
+        itemValue: '',
+        description: '用户账号状态信息',
+        createTime: '2022-05-11',
+        children: [{
+            id: '5',
+            type: 'ACCOUNT_STATUS',
+            itemName: '有效',
+            itemValue: 'A',
+            description: '有效',
+            createTime: '2022-05-11',
+        },{
+            id: '6',
+            type: 'ACCOUNT_STATUS',
+            itemName: '无效',
+            itemValue: 'I',
+            description: '无效',
+            createTime: '2022-05-11',
+        },{
+            id: '7',
+            type: 'ACCOUNT_STATUS',
+            itemName: '锁定',
+            itemValue: 'L',
+            description: '锁定',
+            createTime: '2022-05-11',
+        },{
+            id: '8',
+            type: 'ACCOUNT_STATUS',
+            itemName: '停用',
+            itemValue: 'S',
+            description: '停用',
+            createTime: '2022-05-11',
+        }]
+    }],
+    detail: {
+        id: '4',
+        type: 'ACCOUNT_STATUS',
+        itemName: '账号状态',
+        itemValue: '',
+        description: '用户账号状态信息',
+        createTime: '2022-05-11',
+        children: [{
+            id: '5',
+            type: 'ACCOUNT_STATUS',
+            itemName: '有效',
+            itemValue: 'A',
+            description: '有效',
+            createTime: '2022-05-11',
+        },{
+            id: '6',
+            type: 'ACCOUNT_STATUS',
+            itemName: '无效',
+            itemValue: 'I',
+            description: '无效',
+            createTime: '2022-05-11',
+        },{
+            id: '7',
+            type: 'ACCOUNT_STATUS',
+            itemName: '锁定',
+            itemValue: 'L',
+            description: '锁定',
+            createTime: '2022-05-11',
+        },{
+            id: '8',
+            type: 'ACCOUNT_STATUS',
+            itemName: '停用',
+            itemValue: 'S',
+            description: '停用',
+            createTime: '2022-05-11',
+        }]
+    }
+}
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 126ef895..d9cbf9df 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -1548,7 +1548,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/encoding/0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
     name: encoding
     version: 0.1.13
     requiresBuild: true
@@ -1592,7 +1592,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/esbuild-android-64/0.14.36:
-    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
+    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
     name: esbuild-android-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1603,7 +1603,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-android-arm64/0.14.36:
-    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
     name: esbuild-android-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1614,7 +1614,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-64/0.14.36:
-    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
+    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
     name: esbuild-darwin-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1625,7 +1625,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-arm64/0.14.36:
-    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
     name: esbuild-darwin-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1636,7 +1636,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-64/0.14.36:
-    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
     name: esbuild-freebsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1647,7 +1647,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-arm64/0.14.36:
-    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
     name: esbuild-freebsd-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1658,7 +1658,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-32/0.14.36:
-    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
+    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
     name: esbuild-linux-32
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1669,7 +1669,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-64/0.14.36:
-    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
+    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
     name: esbuild-linux-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1680,7 +1680,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm/0.14.36:
-    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
+    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
     name: esbuild-linux-arm
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1691,7 +1691,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm64/0.14.36:
-    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
     name: esbuild-linux-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1702,7 +1702,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-mips64le/0.14.36:
-    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
+    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
     name: esbuild-linux-mips64le
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1713,7 +1713,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-ppc64le/0.14.36:
-    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
+    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
     name: esbuild-linux-ppc64le
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1724,7 +1724,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-riscv64/0.14.36:
-    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
+    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
     name: esbuild-linux-riscv64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1735,7 +1735,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-s390x/0.14.36:
-    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
+    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
     name: esbuild-linux-s390x
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1746,7 +1746,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-netbsd-64/0.14.36:
-    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
     name: esbuild-netbsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1757,7 +1757,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-openbsd-64/0.14.36:
-    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
     name: esbuild-openbsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1768,7 +1768,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-sunos-64/0.14.36:
-    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
+    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
     name: esbuild-sunos-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1779,7 +1779,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-32/0.14.36:
-    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
+    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
     name: esbuild-windows-32
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1790,7 +1790,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-64/0.14.36:
-    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
+    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
     name: esbuild-windows-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1801,7 +1801,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-arm64/0.14.36:
-    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
     name: esbuild-windows-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -2241,7 +2241,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/fsevents/2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
     name: fsevents
     version: 2.3.2
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
diff --git a/diboot-admin-ui/src/views/system/dictionary/list.vue b/diboot-admin-ui/src/views/system/dictionary/list.vue
new file mode 100644
index 00000000..ed1f210c
--- /dev/null
+++ b/diboot-admin-ui/src/views/system/dictionary/list.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts" name="DictionaryList">
+interface Dictionary {
+  type: string
+  itemName: string
+  itemValue: string
+  description: string
+  children: Dictionary[]
+  createTime: string
+}
+const customParam = ref({})
+let searchParam = ref({})
+let dataList = ref<Dictionary[]>([])
+
+const buildQueryParam = async () => {
+  const queryParam = {}
+  _.merge(queryParam, customParam)
+  _.merge(queryParam, searchParam)
+  return queryParam
+}
+const clearSearchParam = () => {
+  searchParam.value = {}
+}
+const queryDataList = async () => {
+  const queryParam = await buildQueryParam()
+  try {
+    const res = await api.get<Dictionary[]>('/dictionary/list', queryParam)
+    if (res.code === 0) {
+      dataList.value = res.data || []
+    }
+  } catch (e) {
+    console.error(e)
+  }
+}
+const onSearch = async () => {
+  await buildQueryParam()
+  await queryDataList()
+}
+const onReset = async () => {
+  clearSearchParam()
+  await queryDataList()
+}
+onMounted(() => {
+  onSearch()
+})
+</script>
+<template>
+  <div class="list-container">
+    <div class="search-container">
+      <el-form :inline="true" :model="searchParam" class="demo-form-inline">
+        <el-form-item label="菜单名称">
+          <el-input v-model="searchParam.itemName" placeholder="类型名称" />
+        </el-form-item>
+        <el-form-item label="菜单编码">
+          <el-input v-model="searchParam.itemValue" placeholder="类型编码" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSearch">查询</el-button>
+          <el-button @click="onReset">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table-container">
+      <el-table :data="dataList" row-key="id" default-expand-all>
+        <el-table-column prop="itemName" label="类型名称" />
+        <el-table-column prop="itemValue" label="类型编码" />
+        <el-table-column prop="description" label="备注" />
+        <el-table-column prop="createTime" label="创建时间" />
+      </el-table>
+    </div>
+  </div>
+</template>
-- 
Gitee


From 987a34d2654a0b25798a50c793d2c368ed83d700 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 11 May 2022 16:02:59 +0800
Subject: [PATCH 107/195] =?UTF-8?q?*=20Converter=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/core/starter/CoreAutoConfig.java   |  10 +-
 .../test/binder/entity/TestUploadFile.java    |   4 +
 .../diboot/core/test/binder/entity/User.java  |   2 +-
 .../core/test/config/SpringMvcConfig.java     | 106 +++++++++++++-----
 .../service/EnhancedConversionService2.java   |  25 +++++
 .../diboot/core/test/util/BeanUtilsTest.java  |  20 +++-
 .../java/diboot/core/test/util/JsonTest.java  |  10 +-
 .../converter/Date2LocalDateConverter.java    |  43 +++++++
 .../Date2LocalDateTimeConverter.java          |  43 +++++++
 .../converter/EnhancedConversionService.java  |  25 +++++
 .../converter/String2BooleanConverter.java    |  35 ++++++
 .../core/converter/String2DateConverter.java  |  37 ++++++
 .../Timestamp2LocalDateTimeConverter.java     |  40 +++++++
 .../java/com/diboot/core/util/BeanUtils.java  |  24 ++--
 .../com/diboot/core/util/DateConverter.java   |   4 +-
 15 files changed, 383 insertions(+), 45 deletions(-)
 create mode 100644 diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateConverter.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/converter/String2DateConverter.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/converter/Timestamp2LocalDateTimeConverter.java

diff --git a/diboot-core-starter/src/main/java/com/diboot/core/starter/CoreAutoConfig.java b/diboot-core-starter/src/main/java/com/diboot/core/starter/CoreAutoConfig.java
index 28ad1186..ca79e4a6 100644
--- a/diboot-core-starter/src/main/java/com/diboot/core/starter/CoreAutoConfig.java
+++ b/diboot-core-starter/src/main/java/com/diboot/core/starter/CoreAutoConfig.java
@@ -17,11 +17,11 @@ package com.diboot.core.starter;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.diboot.core.converter.*;
 import com.diboot.core.data.ProtectFieldHandler;
 import com.diboot.core.data.encrypt.ProtectInterceptor;
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.D;
-import com.diboot.core.util.DateConverter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -43,6 +43,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -172,7 +174,11 @@ public class CoreAutoConfig implements WebMvcConfigurer {
      */
     @Override
     public void addFormatters(FormatterRegistry registry) {
-        registry.addConverter(new DateConverter());
+        registry.addConverter(new Date2LocalDateConverter());
+        registry.addConverter(new Date2LocalDateTimeConverter());
+        registry.addConverter(new String2DateConverter());
+        registry.addConverter(new String2BooleanConverter());
+        registry.addConverter(new Timestamp2LocalDateTimeConverter());
     }
 
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestUploadFile.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestUploadFile.java
index 28fe1267..3dc59678 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestUploadFile.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestUploadFile.java
@@ -26,6 +26,7 @@ import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 
 /**
  * file基础父类
@@ -70,4 +71,7 @@ public class TestUploadFile extends BaseEntity {
     @TableField
     private String accessUrl;
 
+
+    @TableField(exist = false)
+    private LocalDateTime localDateTime;
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
index ff0dd3a6..c3750c3c 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
@@ -48,7 +48,7 @@ public class User extends BaseEntity {
     @TableField
     private String gender;
 
-    @JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
+    //@JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
     private Date birthdate;
 
     @JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java b/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java
index 49040920..a6f5fc89 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/config/SpringMvcConfig.java
@@ -17,18 +17,28 @@ package diboot.core.test.config;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.diboot.core.converter.*;
 import com.diboot.core.handler.DataAccessControlInterceptor;
+import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.D;
-import com.diboot.core.util.DateConverter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -39,6 +49,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
@@ -61,42 +75,78 @@ public class SpringMvcConfig implements WebMvcConfigurer {
     @Value("${spring.jackson.time-zone:GMT+8}")
     private String defaultTimeZone;
 
+    @Value("${spring.jackson.default-property-inclusion:NON_NULL}")
+    private JsonInclude.Include defaultPropertyInclusion;
+
     /**
-     * 覆盖Jackson转换
-     **/
-    @Override
-    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        ObjectMapper objectMapper = converter.getObjectMapper();
-        // Long转换成String避免JS超长问题
-        SimpleModule simpleModule = new SimpleModule();
+     * 默认配置 ObjectMapper, 并允许用户覆盖
+     *
+     * @return Jackson2ObjectMapperBuilderCustomizer
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
+        return builder -> {
+            // Long转换成String避免JS超长问题
+            builder.serializerByType(Long.class, ToStringSerializer.instance);
+            builder.serializerByType(Long.TYPE, ToStringSerializer.instance);
+            builder.serializerByType(BigInteger.class, ToStringSerializer.instance);
 
-        // 不显示为null的字段
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
-        simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
+            // 支持java8时间类型
+            // LocalDateTime
+            DateTimeFormatter localDateTimeFormatter = DateTimeFormatter.ofPattern(D.FORMAT_DATETIME_Y4MDHMS);
+            builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(localDateTimeFormatter));
+            builder.deserializerByType(LocalDateTime.class, new LocalDateTimeDeserializer(localDateTimeFormatter));
+            // LocalDate
+            DateTimeFormatter localDateFormatter = DateTimeFormatter.ofPattern(D.FORMAT_DATE_Y4MD);
+            builder.serializerByType(LocalDate.class, new LocalDateSerializer(localDateFormatter));
+            builder.deserializerByType(LocalDate.class, new LocalDateDeserializer(localDateFormatter));
+            // LocalTime
+            DateTimeFormatter localTimeFormatter = DateTimeFormatter.ofPattern(D.FORMAT_TIME_HHmmss);
+            builder.serializerByType(LocalTime.class, new LocalTimeSerializer(localTimeFormatter));
+            builder.deserializerByType(LocalTime.class, new LocalTimeDeserializer(localTimeFormatter));
 
-        objectMapper.registerModule(simpleModule);
-        // 时间格式化
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        objectMapper.setTimeZone(TimeZone.getTimeZone(defaultTimeZone));
-        SimpleDateFormat dateFormat = new SimpleDateFormat(defaultDatePattern) {
-            @Override
-            public Date parse(String dateStr) {
-                return D.fuzzyConvert(dateStr);
-            }
+            // 设置序列化包含策略
+            builder.serializationInclusion(defaultPropertyInclusion);
+            // 时间格式化
+            builder.failOnUnknownProperties(false);
+            builder.timeZone(TimeZone.getTimeZone(defaultTimeZone));
+            SimpleDateFormat dateFormat = new SimpleDateFormat(defaultDatePattern) {
+                @Override
+                public Date parse(String dateStr) {
+                    return D.fuzzyConvert(dateStr);
+                }
+            };
+            builder.dateFormat(dateFormat);
         };
-        objectMapper.setDateFormat(dateFormat);
-        // 设置格式化内容
-        converter.setObjectMapper(objectMapper);
+    }
 
-        converters.add(0, converter);
+    @Bean
+    @ConditionalOnMissingBean
+    public HttpMessageConverters jacksonHttpMessageConverters() {
+        return new HttpMessageConverters(jacksonMessageConverter());
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public MappingJackson2HttpMessageConverter jacksonMessageConverter(){
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        // 优先使用全局默认ObjectMapper, 保证ObjectMapper全局配置相同
+        ObjectMapper objectMapper = ContextHelper.getBean(ObjectMapper.class);
+        if (objectMapper == null) {
+            objectMapper = converter.getObjectMapper();
+        }
+        converter.setObjectMapper(objectMapper);
+        return converter;
     }
 
     @Override
     public void addFormatters(FormatterRegistry registry) {
-       registry.addConverter(new DateConverter());
+        registry.addConverter(new Date2LocalDateConverter());
+        registry.addConverter(new Date2LocalDateTimeConverter());
+        registry.addConverter(new String2DateConverter());
+        registry.addConverter(new String2BooleanConverter());
+        registry.addConverter(new Timestamp2LocalDateTimeConverter());
     }
 
     /**
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java b/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
new file mode 100644
index 00000000..d1480fa7
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
@@ -0,0 +1,25 @@
+package diboot.core.test.service;
+
+import com.diboot.core.converter.*;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.stereotype.Component;
+
+/**
+ * 扩展的转换service
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/11
+ * Copyright © diboot.com
+ */
+@Primary
+@Component
+public class EnhancedConversionService2 extends EnhancedConversionService {
+
+    public EnhancedConversionService2(){
+        super();
+        //添加扩展
+        //addConverter(new String2DateConverter());
+    }
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
index aa0b856d..da66df9d 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
@@ -25,6 +25,7 @@ import com.diboot.core.util.JSON;
 import com.diboot.core.vo.DictionaryVO;
 import com.sun.management.OperatingSystemMXBean;
 import diboot.core.test.StartupApplication;
+import diboot.core.test.binder.entity.TestUploadFile;
 import diboot.core.test.binder.entity.User;
 import diboot.core.test.config.SpringMvcConfig;
 import org.junit.Assert;
@@ -37,6 +38,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Field;
+import java.sql.Timestamp;
 import java.util.*;
 
 /**
@@ -105,13 +107,13 @@ public class BeanUtilsTest {
 
     @Test
     public void testDateCopy(){
-        //User user1 = new User().setUsername("test").setGender("").setBirthdate(new Date()).setLocalDatetime(LocalDate.now());
         User user2 = new User();
         Map<String, Object> map = new HashMap<>();
         map.put("username", "test");
         map.put("birthdate", "1980-10-12");
         map.put("localDatetime", new Date());
-
+        BeanUtils.setProperty(user2, "birthdate", "1980-10-12");
+        Assert.assertTrue(user2.getBirthdate() != null);
         BeanUtils.bindProperties(user2, map);
         Assert.assertTrue(user2.getLocalDatetime() != null);
         System.out.println(JSON.stringify(user2));
@@ -243,4 +245,18 @@ public class BeanUtilsTest {
         }
     }
 
+    @Test
+    public void testSetProperty(){
+        TestUploadFile object = new TestUploadFile();
+        BeanUtils.setProperty(object, "id", 123l);
+        BeanUtils.setProperty(object, "storagePath", "/test/xxx");
+        Assert.assertTrue(object.getStoragePath() != null);
+        BeanUtils.setProperty(object, "createTime", new Timestamp(System.currentTimeMillis()));
+        Assert.assertTrue(object.getCreateTime() != null);
+        BeanUtils.setProperty(object, "createTime", new Date());
+        Assert.assertTrue(object.getCreateTime() != null);
+        BeanUtils.setProperty(object, "localDateTime", new Timestamp(System.currentTimeMillis()));
+        Assert.assertTrue(object.getLocalDateTime() != null);
+    }
+
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java
index 5b33ce5d..50cea70c 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/JsonTest.java
@@ -20,10 +20,16 @@ import com.diboot.core.util.JSON;
 import com.diboot.core.vo.JsonResult;
 import com.diboot.core.vo.Pagination;
 import com.diboot.core.vo.PagingJsonResult;
+import diboot.core.test.StartupApplication;
 import diboot.core.test.binder.entity.Role;
 import diboot.core.test.binder.entity.User;
+import diboot.core.test.config.SpringMvcConfig;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -35,6 +41,9 @@ import java.util.List;
  * @version 1.0
  * @date 2021/01/22
  */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SpringMvcConfig.class})
+@SpringBootTest(classes = {StartupApplication.class})
 public class JsonTest {
 
     @Test
@@ -51,7 +60,6 @@ public class JsonTest {
         Assert.assertTrue("1988-09-12".equals(D.convert2DateString(user2.getBirthdate())));
     }
 
-
     @Test
     public void testJsonConvert(){
         Role role = new Role();
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateConverter.java b/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateConverter.java
new file mode 100644
index 00000000..44f42d0e
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateConverter.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.converter;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+/**
+ * Date - LocalDate 转换器
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/11
+ * Copyright © diboot.com
+ */
+public class Date2LocalDateConverter implements Converter<Date, LocalDate> {
+
+    @Override
+    public LocalDate convert(Date source) {
+        if (source == null) {
+            return null;
+        }
+        ZonedDateTime zonedDateTime = source.toInstant().atZone(ZoneId.systemDefault());
+        return zonedDateTime.toLocalDate();
+    }
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java b/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java
new file mode 100644
index 00000000..be6ea734
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.converter;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+/**
+ * Date - LocalDateTime 转换器
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/11
+ * Copyright © diboot.com
+ */
+public class Date2LocalDateTimeConverter implements Converter<Date, LocalDateTime> {
+
+    @Override
+    public LocalDateTime convert(Date source) {
+        if (source == null) {
+            return null;
+        }
+        ZonedDateTime zonedDateTime = source.toInstant().atZone(ZoneId.systemDefault());
+        return zonedDateTime.toLocalDateTime();
+    }
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java b/diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java
new file mode 100644
index 00000000..f0dbb5f7
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java
@@ -0,0 +1,25 @@
+package com.diboot.core.converter;
+
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.stereotype.Component;
+
+/**
+ * 扩展的转换service
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/11
+ * Copyright © diboot.com
+ */
+@Component
+public class EnhancedConversionService extends DefaultConversionService {
+
+    public EnhancedConversionService(){
+        super();
+        addConverter(new Date2LocalDateConverter());
+        addConverter(new Date2LocalDateTimeConverter());
+        addConverter(new String2DateConverter());
+        addConverter(new String2BooleanConverter());
+        addConverter(new Timestamp2LocalDateTimeConverter());
+    }
+
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java b/diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java
new file mode 100644
index 00000000..887e845a
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.converter;
+
+import com.diboot.core.util.V;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+/**
+ * String - boolean 转换器
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/11
+ * Copyright © diboot.com
+ */
+public class String2BooleanConverter implements Converter<String, Boolean> {
+
+    @Override
+    public Boolean convert(String source) {
+        return V.isTrue(source);
+    }
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/String2DateConverter.java b/diboot-core/src/main/java/com/diboot/core/converter/String2DateConverter.java
new file mode 100644
index 00000000..8400f037
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/converter/String2DateConverter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.converter;
+
+import com.diboot.core.util.D;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * String - date 转换器
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/11
+ * Copyright © diboot.com
+ */
+public class String2DateConverter implements Converter<String, Date> {
+
+    @Override
+    public Date convert(String dateString) {
+        return D.fuzzyConvert(dateString);
+    }
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/Timestamp2LocalDateTimeConverter.java b/diboot-core/src/main/java/com/diboot/core/converter/Timestamp2LocalDateTimeConverter.java
new file mode 100644
index 00000000..f9d01adf
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/converter/Timestamp2LocalDateTimeConverter.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.converter;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+/**
+ * Timestamp - LocalDateTime 转换器
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/11
+ * Copyright © diboot.com
+ */
+public class Timestamp2LocalDateTimeConverter implements Converter<Timestamp, LocalDateTime> {
+
+    @Override
+    public LocalDateTime convert(Timestamp source) {
+        if (source == null) {
+            return null;
+        }
+        return source.toLocalDateTime();
+    }
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index b5a3066b..ea31090c 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -18,6 +18,7 @@ package com.diboot.core.util;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.diboot.core.binding.cache.BindingCacheManager;
 import com.diboot.core.config.Cons;
+import com.diboot.core.converter.*;
 import com.diboot.core.data.copy.AcceptAnnoCopier;
 import com.diboot.core.entity.BaseEntity;
 import com.diboot.core.exception.BusinessException;
@@ -30,7 +31,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.PropertyAccessorFactory;
+import org.springframework.boot.convert.ApplicationConversionService;
+import org.springframework.context.support.ConversionServiceFactoryBean;
 import org.springframework.core.ResolvableType;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.util.ReflectionUtils;
 
 import java.io.Serializable;
@@ -148,17 +153,12 @@ public class BeanUtils {
         if (V.isAnyEmpty(model, propMap)) {
             return;
         }
-        Map<String, Field> fieldNameMaps = BindingCacheManager.getFieldsMap(model.getClass());
         for(Map.Entry<String, Object> entry : propMap.entrySet()){
-            Field field = fieldNameMaps.get(entry.getKey());
-            if(field != null){
-                try{
-                    Object value = convertValueToFieldType(entry.getValue(), field);
-                    setProperty(model, entry.getKey(), value);
-                }
-                catch (Exception e){
-                    log.warn("复制属性{}.{}异常: {}", model.getClass().getSimpleName(), entry.getKey(), e.getMessage());
-                }
+            try{
+                setProperty(model, entry.getKey(), entry.getValue());
+            }
+            catch (Exception e){
+                log.warn("复制属性{}.{}异常: {}", model.getClass().getSimpleName(), entry.getKey(), e.getMessage());
             }
         }
     }
@@ -202,6 +202,10 @@ public class BeanUtils {
      */
     public static void setProperty(Object obj, String field, Object value) {
         BeanWrapper wrapper = PropertyAccessorFactory.forBeanPropertyAccess(obj);
+        if(wrapper.getConversionService() == null){
+            ConversionService conversionService = ContextHelper.getBean(EnhancedConversionService.class);
+            wrapper.setConversionService(conversionService);
+        }
         wrapper.setPropertyValue(field, value);
     }
 
diff --git a/diboot-core/src/main/java/com/diboot/core/util/DateConverter.java b/diboot-core/src/main/java/com/diboot/core/util/DateConverter.java
index 6225eb45..97274668 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/DateConverter.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/DateConverter.java
@@ -22,11 +22,13 @@ import org.springframework.core.convert.converter.Converter;
 import java.util.Date;
 
 /**
- * Spring表单自动绑定到Java属性时的日期格式转换
+ * Spring表单自动绑定到Java属性时的日期格式转换<br>
+ * @see com.diboot.core.converter.String2DateConverter
  * @author mazc@dibo.ltd
  * @version v2.0
  * @date 2019/01/01
  */
+@Deprecated
 public class DateConverter implements Converter<String, Date> {
     private static final Logger log = LoggerFactory.getLogger(DateConverter.class);
 
-- 
Gitee


From 61dcc2205562cc9cdb40c2e777285360be88ce65 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 11 May 2022 16:04:18 +0800
Subject: [PATCH 108/195] =?UTF-8?q?*=20Converter=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/EnhancedConversionService2.java     | 17 ++++++++++++++++-
 .../converter/Date2LocalDateTimeConverter.java  |  1 -
 .../converter/EnhancedConversionService.java    | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java b/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
index d1480fa7..d07f718d 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/EnhancedConversionService2.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package diboot.core.test.service;
 
 import com.diboot.core.converter.*;
@@ -6,7 +21,7 @@ import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.stereotype.Component;
 
 /**
- * 扩展的转换service
+ * 扩展的转换service 测试覆盖
  * @author JerryMa
  * @version v2.6.0
  * @date 2022/5/11
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java b/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java
index be6ea734..717b9cdd 100644
--- a/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java
+++ b/diboot-core/src/main/java/com/diboot/core/converter/Date2LocalDateTimeConverter.java
@@ -16,7 +16,6 @@
 package com.diboot.core.converter;
 
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.time.LocalDateTime;
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java b/diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java
index f0dbb5f7..611197af 100644
--- a/diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java
+++ b/diboot-core/src/main/java/com/diboot/core/converter/EnhancedConversionService.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.diboot.core.converter;
 
 import org.springframework.core.convert.support.DefaultConversionService;
-- 
Gitee


From 7828ad3201b6d756cd7541985ecdda0eb921e6f1 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 11 May 2022 16:36:21 +0800
Subject: [PATCH 109/195] =?UTF-8?q?*=20BeanUtils=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E7=9B=B8=E5=85=B3=E6=80=A7=E8=83=BD=E4=B8=8E?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8D=A0=E7=94=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/core/test/util/BeanUtilsTest.java  | 29 +++++++++++++++++++
 .../com/diboot/core/binding/JoinsBinder.java  |  4 ++-
 .../core/binding/binder/FieldBinder.java      |  4 ++-
 .../core/binding/binder/FieldListBinder.java  |  4 ++-
 .../core/binding/helper/ResultAssembler.java  |  9 ++++--
 .../core/data/copy/AcceptAnnoCopier.java      |  4 ++-
 .../core/service/impl/BaseServiceImpl.java    |  6 ++--
 .../java/com/diboot/core/util/BeanUtils.java  | 18 +++++++++---
 8 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
index da66df9d..07ffc4f3 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
@@ -31,6 +31,7 @@ import diboot.core.test.config.SpringMvcConfig;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
@@ -259,4 +260,32 @@ public class BeanUtilsTest {
         Assert.assertTrue(object.getLocalDateTime() != null);
     }
 
+    /**
+     * 测试属性赋值的性能优化
+     */
+    @Test
+    public void testSetPropertyOptimize(){
+        User user2 = new User();
+        long begin = System.currentTimeMillis();
+        for(int i=0; i< 10000; i++){
+            BeanUtils.setProperty(user2, "username", "test");
+            BeanUtils.setProperty(user2, "birthdate", "1980-10-12");
+            BeanUtils.setProperty(user2, "localDatetime", new Date());
+        }
+        long end = System.currentTimeMillis();
+        long takes1 = (end - begin);
+        begin = System.currentTimeMillis();
+
+        BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(user2);
+        for(int i=0; i< 10000; i++){
+            beanWrapper.setPropertyValue("username", "test");
+            beanWrapper.setPropertyValue("birthdate", "1980-10-12");
+            beanWrapper.setPropertyValue("localDatetime", new Date());
+        }
+        end = System.currentTimeMillis();
+        long takes2 = (end - begin);
+        System.out.println(takes1 + " ms , after: " + takes2 + " ms") ;
+        Assert.assertTrue(takes2 < takes1);
+    }
+
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
index 5a54ce75..43c00eaf 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
@@ -34,6 +34,7 @@ import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.Pagination;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanWrapper;
 
 import java.lang.reflect.Field;
 import java.util.*;
@@ -165,10 +166,11 @@ public class JoinsBinder {
                 E entityInst = entityClazz.newInstance();
                 BeanUtils.bindProperties(entityInst, fieldValueMap);
                 if (protectFieldHandler != null) {
+                    BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(entityInst);
                     ParserCache.getProtectFieldList(entityClazz).forEach(fieldName -> {
                         String value = BeanUtils.getStringProperty(entityInst, fieldName);
                         if (value != null) {
-                            BeanUtils.setProperty(entityInst, fieldName, protectFieldHandler.decrypt(entityClazz,fieldName,value));
+                            beanWrapper.setPropertyValue(fieldName, protectFieldHandler.decrypt(entityClazz,fieldName,value));
                         }
                     });
                 }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
index f09bcf71..43410f11 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
@@ -22,6 +22,7 @@ import com.diboot.core.exception.InvalidUsageException;
 import com.diboot.core.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanWrapper;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -181,9 +182,10 @@ public class FieldBinder<T> extends BaseBinder<T> {
     private void setFieldValueToTrunkObj(Map<String, Map<String, Object>> key2DataMap, Object annoObject, String matchKey) {
         Map<String, Object> relationMap = key2DataMap.get(matchKey);
         if (relationMap != null) {
+            BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(annoObject);
             for (int i = 0; i < annoObjectSetterPropNameList.size(); i++) {
                 Object valObj = getValueIgnoreKeyCase(relationMap, toRefObjColumn(referencedGetterFieldNameList.get(i)));
-                BeanUtils.setProperty(annoObject, annoObjectSetterPropNameList.get(i), valObj);
+                beanWrapper.setPropertyValue(annoObjectSetterPropNameList.get(i), valObj);
             }
         }
     }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
index 86f8ee30..86bd5ca2 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
@@ -24,6 +24,7 @@ import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.V;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanWrapper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -193,9 +194,10 @@ public class FieldListBinder<T> extends FieldBinder<T> {
                 List entityList = valueMatchMap.get(sb.toString());
                 if(entityList != null){
                     // 赋值
+                    BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(object);
                     for(int i = 0; i< annoObjectSetterPropNameList.size(); i++){
                         List valObjList = BeanUtils.collectToList(entityList, referencedGetterFieldNameList.get(i));
-                        BeanUtils.setProperty(object, annoObjectSetterPropNameList.get(i), valObjList);
+                        beanWrapper.setPropertyValue(annoObjectSetterPropNameList.get(i), valObjList);
                     }
                 }
             }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java b/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
index 855dda70..2ad7a3da 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
@@ -20,6 +20,7 @@ import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanWrapper;
 
 import java.util.*;
 
@@ -47,6 +48,7 @@ public class ResultAssembler {
         StringBuilder sb = new StringBuilder();
         try{
             for(E object : fromList){
+                BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(object);
                 sb.setLength(0);
                 for(int i=0; i<getterFields.length; i++){
                     String fieldValue = BeanUtils.getStringProperty(object, getterFields[i]);
@@ -59,7 +61,7 @@ public class ResultAssembler {
                 String matchKey = sb.toString();
                 if(valueMatchMap.containsKey(matchKey)){
                     // 赋值
-                    BeanUtils.setProperty(object, setterFieldName, valueMatchMap.get(matchKey));
+                    beanWrapper.setPropertyValue(setterFieldName, valueMatchMap.get(matchKey));
                 }
                 else if(V.notEmpty(splitBy) && getterFields.length == 1 && matchKey.contains(splitBy)){
                     String[] keys = matchKey.split(splitBy);
@@ -83,7 +85,7 @@ public class ResultAssembler {
                         }
                     }
                     // 赋值
-                    BeanUtils.setProperty(object, setterFieldName, matchedValues);
+                    beanWrapper.setPropertyValue(setterFieldName, matchedValues);
                 }
             }
             sb.setLength(0);
@@ -193,9 +195,10 @@ public class ResultAssembler {
                 }
                 if(entityList != null){
                     // 赋值
+                    BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(object);
                     for(int i = 0; i< annoObjSetterPropNameList.size(); i++){
                         List valObjList = BeanUtils.collectToList(entityList, refGetterFieldNameList.get(i));
-                        BeanUtils.setProperty(object, annoObjSetterPropNameList.get(i), valObjList);
+                        beanWrapper.setPropertyValue(annoObjSetterPropNameList.get(i), valObjList);
                     }
                 }
             }
diff --git a/diboot-core/src/main/java/com/diboot/core/data/copy/AcceptAnnoCopier.java b/diboot-core/src/main/java/com/diboot/core/data/copy/AcceptAnnoCopier.java
index f7d50883..f8677dc1 100644
--- a/diboot-core/src/main/java/com/diboot/core/data/copy/AcceptAnnoCopier.java
+++ b/diboot-core/src/main/java/com/diboot/core/data/copy/AcceptAnnoCopier.java
@@ -18,6 +18,7 @@ package com.diboot.core.data.copy;
 import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.V;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanWrapper;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -69,6 +70,7 @@ public class AcceptAnnoCopier {
         if(V.isEmpty(acceptAnnos)){
             return;
         }
+        BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(target);
         for(String[] annoDef : acceptAnnos){
             boolean override = !"0".equals(annoDef[IDX_OVERRIDE]);
             if(!override){
@@ -82,7 +84,7 @@ public class AcceptAnnoCopier {
             if(sourceField != null){
                 Object sourceValue = BeanUtils.getProperty(source, annoDef[IDX_SOURCE_FIELD]);
                 if(sourceValue != null){
-                    BeanUtils.setProperty(target, annoDef[IDX_TARGET_FIELD], sourceValue);
+                    beanWrapper.setPropertyValue(annoDef[IDX_TARGET_FIELD], sourceValue);
                 }
             }
         }
diff --git a/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java b/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
index 11ae845b..e100b6ce 100644
--- a/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
+++ b/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
@@ -51,6 +51,7 @@ import com.diboot.core.vo.Status;
 import org.apache.ibatis.reflection.property.PropertyNamer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanWrapper;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
@@ -356,8 +357,9 @@ public class BaseServiceImpl<M extends BaseCrudMapper<T>, T> extends ServiceImpl
             try {
                 for (Serializable followerId : followerIdList) {
                     R relation = middleTableClass.newInstance();
-                    BeanUtils.setProperty(relation, driverFieldName, driverId);
-                    BeanUtils.setProperty(relation, followerFieldName, followerId);
+					BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(relation);
+					beanWrapper.setPropertyValue(driverFieldName, driverId);
+					beanWrapper.setPropertyValue(followerFieldName, followerId);
                     if (setConsumer != null) {
                         setConsumer.accept(relation);
                     }
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index ea31090c..b34775f9 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -153,9 +153,10 @@ public class BeanUtils {
         if (V.isAnyEmpty(model, propMap)) {
             return;
         }
+        BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(model);
         for(Map.Entry<String, Object> entry : propMap.entrySet()){
             try{
-                setProperty(model, entry.getKey(), entry.getValue());
+                beanWrapper.setPropertyValue(entry.getKey(), entry.getValue());
             }
             catch (Exception e){
                 log.warn("复制属性{}.{}异常: {}", model.getClass().getSimpleName(), entry.getKey(), e.getMessage());
@@ -197,15 +198,24 @@ public class BeanUtils {
     /***
      * 设置属性值
      * @param obj
-     * @param field
-     * @param value
      */
-    public static void setProperty(Object obj, String field, Object value) {
+    public static BeanWrapper getBeanWrapper(Object obj) {
         BeanWrapper wrapper = PropertyAccessorFactory.forBeanPropertyAccess(obj);
         if(wrapper.getConversionService() == null){
             ConversionService conversionService = ContextHelper.getBean(EnhancedConversionService.class);
             wrapper.setConversionService(conversionService);
         }
+        return wrapper;
+    }
+
+    /***
+     * 设置属性值
+     * @param obj
+     * @param field
+     * @param value
+     */
+    public static void setProperty(Object obj, String field, Object value) {
+        BeanWrapper wrapper = getBeanWrapper(obj);
         wrapper.setPropertyValue(field, value);
     }
 
-- 
Gitee


From 7b12aee695f46004cfed5e27400cb10a7b672083 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 11 May 2022 17:55:12 +0800
Subject: [PATCH 110/195] + add(directive) permission

---
 diboot-admin-ui/mock/auth/index.ts            | 18 +++++---
 diboot-admin-ui/src/directives/index.ts       |  7 +++
 .../src/directives/permission/index.ts        | 24 ++++++++++
 diboot-admin-ui/src/main.ts                   |  3 ++
 diboot-admin-ui/src/router/typings.d.ts       |  1 +
 diboot-admin-ui/src/store/auth.ts             |  6 ++-
 diboot-admin-ui/src/utils/permission.ts       | 44 +++++++++++++++++++
 diboot-admin-ui/src/views/dashboard/index.vue | 10 +++++
 8 files changed, 105 insertions(+), 8 deletions(-)
 create mode 100644 diboot-admin-ui/src/directives/index.ts
 create mode 100644 diboot-admin-ui/src/directives/permission/index.ts
 create mode 100644 diboot-admin-ui/src/utils/permission.ts

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index e63a58af..e8d41116 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -39,7 +39,8 @@ export default [
         return JsonResult.OK({
           realname: name,
           email: Random.email(),
-          avatar: Random.image('50x50', Random.color(), Random.color(), name[0])
+          avatar: Random.image('50x50', Random.color(), Random.color(), name[0]),
+          roles: [Random.pick(['admin', 'develop', 'test'])]
         })
       }
       return JsonResult.FAIL_INVALID_TOKEN()
@@ -70,10 +71,12 @@ export default [
     response: () => {
       return JsonResult.OK(authMenu)
     }
-  },
-
+  }
 ] as MockMethod[]
 
+// 随机按钮权限
+const permission = '@pick(["detail", "create", "update", "delete", "import", "export"])'
+
 // 授权菜单
 const authMenu = [
   {
@@ -90,7 +93,8 @@ const authMenu = [
           sort: '@natural',
           keepAlive: false,
           hollow: '@boolean',
-          hideFooter: '@boolean'
+          hideFooter: '@boolean',
+          permissions: [permission, permission, permission]
         }
       }
     ]
@@ -118,15 +122,15 @@ const authMenu = [
   {
     path: '/system',
     name: 'System',
-    meta: {title: 'System', componentName: 'Layout'},
-    'children': [
+    meta: { title: 'System', componentName: 'Layout' },
+    children: [
       {
         path: 'dictionary',
         name: 'Dictionary',
         meta: {
           title: 'Dictionary',
           componentName: 'DictionaryList',
-          keepAlive: false,
+          keepAlive: false
         }
       }
     ]
diff --git a/diboot-admin-ui/src/directives/index.ts b/diboot-admin-ui/src/directives/index.ts
new file mode 100644
index 00000000..2b0ae82f
--- /dev/null
+++ b/diboot-admin-ui/src/directives/index.ts
@@ -0,0 +1,7 @@
+import { App } from 'vue'
+import { hasRole, hasPermission } from './permission'
+
+export default (app: App) => {
+  app.directive('hasRole', hasRole)
+  app.directive('hasPermission', hasPermission)
+}
diff --git a/diboot-admin-ui/src/directives/permission/index.ts b/diboot-admin-ui/src/directives/permission/index.ts
new file mode 100644
index 00000000..40a839ec
--- /dev/null
+++ b/diboot-admin-ui/src/directives/permission/index.ts
@@ -0,0 +1,24 @@
+import type { Directive } from 'vue'
+import { checkPermission, checkRole } from '@/utils/permission'
+
+/**
+ * 检查权限
+ *
+ * @modifiers not 取反
+ * @modifiers all 全部
+ */
+export const hasPermission: Directive<HTMLElement, string | Array<string>> = (el, binding) => {
+  const { not, all } = binding.modifiers
+  if (!checkPermission(binding.value, not, all)) el.remove()
+}
+
+/**
+ * 检查角色
+ *
+ * @modifiers not 取反
+ * @modifiers all 全部
+ */
+export const hasRole: Directive<HTMLElement, string | Array<string>> = (el, binding) => {
+  const { not, all } = binding.modifiers
+  if (!checkRole(binding.value, not, all)) el.remove()
+}
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index d43a2167..c6bd5c49 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -1,11 +1,14 @@
 import App from './App.vue'
 import router from './router'
 import pinia from './store'
+import directives from './directives'
 
 const app = createApp(App)
 app.use(router)
 app.use(pinia)
 app.mount('#app')
 
+app.use(directives)
+
 import '@/styles/index.scss'
 import 'nprogress/nprogress.css'
diff --git a/diboot-admin-ui/src/router/typings.d.ts b/diboot-admin-ui/src/router/typings.d.ts
index c93428dc..00e3347a 100644
--- a/diboot-admin-ui/src/router/typings.d.ts
+++ b/diboot-admin-ui/src/router/typings.d.ts
@@ -6,6 +6,7 @@ declare module 'vue-router' {
     icon?: string
     module?: string
     componentName?: string
+    permissions?: Array<string>
     sort?: number
     affixTab?: boolean
     ignoreAuth?: boolean
diff --git a/diboot-admin-ui/src/store/auth.ts b/diboot-admin-ui/src/store/auth.ts
index af0d7442..3c1f2037 100644
--- a/diboot-admin-ui/src/store/auth.ts
+++ b/diboot-admin-ui/src/store/auth.ts
@@ -5,12 +5,14 @@ import { ElMessage } from 'element-plus'
 export interface IAuthStore {
   realname: string
   avatar?: string
+  roles: Array<string>
   info?: IUserInfo
 }
 
 export interface IUserInfo extends Record<string, unknown> {
   realname?: string
   avatar?: string
+  roles: Array<string>
 }
 
 export default defineStore('auth', {
@@ -18,6 +20,7 @@ export default defineStore('auth', {
     return <IAuthStore>{
       realname: '',
       avatar: undefined,
+      roles: [],
       info: undefined
     }
   },
@@ -40,10 +43,11 @@ export default defineStore('auth', {
     },
     getInfo: async function () {
       try {
-        const res = await api.get<{ realname: string; avatar: string }>('/auth/userInfo')
+        const res = await api.get<{ realname: string; avatar: string; roles: Array<string> }>('/auth/userInfo')
         this.info = res.data
         this.avatar = `${res.data?.avatar}`
         this.realname = `${res.data?.realname}`
+        this.roles = res.data?.roles ?? []
       } catch (e) {
         throw new Error('获取登录者信息异常')
       }
diff --git a/diboot-admin-ui/src/utils/permission.ts b/diboot-admin-ui/src/utils/permission.ts
new file mode 100644
index 00000000..8dd27186
--- /dev/null
+++ b/diboot-admin-ui/src/utils/permission.ts
@@ -0,0 +1,44 @@
+import useAuthStore from '@/store/auth'
+import router from '@/router'
+
+/**
+ * 角色权限校验
+ *
+ * @param {string | Array} value 校验值
+ * @param {boolean} not 取反
+ * @param {boolean} all 全部
+ * @returns {Boolean}
+ */
+export function checkRole(value: string | Array<string>, not = false, all = false) {
+  if (value && value.length) {
+    const roles = useAuthStore().roles
+    const permissionRoles = value instanceof Array ? value : [value]
+    const findFn = (role: string) => permissionRoles.includes(role)
+    const exist = all ? roles.every(findFn) : roles.some(findFn)
+    return not ? !exist : exist
+  } else {
+    console.error(`need roles!`)
+    return false
+  }
+}
+
+/**
+ * 字符权限校验
+ *
+ * @param {string | Array} value 校验值
+ * @param {boolean} not 取反
+ * @param {boolean} all 全部
+ * @returns {Boolean}
+ */
+export function checkPermission(value: string | Array<string>, not = false, all = false) {
+  if (value && value.length) {
+    const permissions = router.currentRoute.value.meta?.permissions ?? []
+    const permissionList = value instanceof Array ? value : [value]
+    const findFn = (permission: string) => permissionList.includes(permission)
+    const exist = all ? permissions.every(findFn) : permissions.some(findFn)
+    return not ? !exist : exist
+  } else {
+    console.error(`need permissions!`)
+    return false
+  }
+}
diff --git a/diboot-admin-ui/src/views/dashboard/index.vue b/diboot-admin-ui/src/views/dashboard/index.vue
index b5cdaf91..e4a71b06 100644
--- a/diboot-admin-ui/src/views/dashboard/index.vue
+++ b/diboot-admin-ui/src/views/dashboard/index.vue
@@ -3,6 +3,9 @@
 defineProps<{ usedVisibleHeight?: number }>()
 
 const value = ref<string>('Element:HotWater')
+
+const roles = ['admin', 'develop', 'test']
+const permissions = ['detail', 'create', 'update', 'delete', 'import', 'export']
 </script>
 
 <template>
@@ -18,6 +21,13 @@ const value = ref<string>('Element:HotWater')
 
   图标选择：
   <icon-select v-model="value" />
+
+  <br />
+  角色：
+  <el-tag v-for="item in roles" :key="item" v-has-role="[item]">{{ item }}</el-tag>
+  <br />
+  权限：
+  <el-tag v-for="item in permissions" :key="item" v-has-permission="item">{{ item }}</el-tag>
 </template>
 
 <style scoped></style>
-- 
Gitee


From ae7407b36d3a6ba7d4fd5908bd664525f3cd769a Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 12 May 2022 17:25:22 +0800
Subject: [PATCH 111/195] * opt(element-plus) from 2.1.10 to 2.2.0

---
 diboot-admin-ui/package.json                  |  2 +-
 diboot-admin-ui/pnpm-lock.yaml                | 82 +++++++++----------
 .../src/components/icon/select.vue            |  6 +-
 3 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index 17d109f7..accf0e71 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -12,7 +12,7 @@
     "@element-plus/icons-vue": "^1.1.4",
     "@vueuse/core": "^8.4.2",
     "axios": "^0.26.1",
-    "element-plus": "^2.1.10",
+    "element-plus": "^2.2.0",
     "fuse.js": "^6.6.1",
     "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index d9cbf9df..80a1cd49 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -12,7 +12,7 @@ specifiers:
   '@vue/eslint-config-prettier': ^7.0.0
   '@vueuse/core': ^8.4.2
   axios: ^0.26.1
-  element-plus: ^2.1.10
+  element-plus: ^2.2.0
   eslint: ^8.12.0
   eslint-config-prettier: ^8.5.0
   eslint-plugin-prettier: ^4.0.0
@@ -45,7 +45,7 @@ dependencies:
   '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
   '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
   axios: registry.npmmirror.com/axios/0.26.1
-  element-plus: registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33
+  element-plus: registry.npmmirror.com/element-plus/2.2.0_vue@3.2.33
   fuse.js: registry.npmmirror.com/fuse.js/6.6.1
   lodash: registry.npmmirror.com/lodash/4.17.21
   mockjs: registry.npmmirror.com/mockjs/1.1.0
@@ -55,7 +55,7 @@ dependencies:
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
   vue-fuse: registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.1+vue@3.2.33
-  vue-router: registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33
+  vue-router: registry.npmmirror.com/vue-router/4.0.15_vue@3.2.33
   vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.33
 
 devDependencies:
@@ -280,12 +280,6 @@ packages:
       rimraf: registry.npmmirror.com/rimraf/3.0.2
     dev: true
 
-  registry.npmmirror.com/@popperjs/core/2.11.5:
-    resolution: {integrity: sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@popperjs/core/-/core-2.11.5.tgz}
-    name: '@popperjs/core'
-    version: 2.11.5
-    dev: false
-
   registry.npmmirror.com/@rollup/plugin-node-resolve/13.2.1:
     resolution: {integrity: sha512-btX7kzGvp1JwShQI9V6IM841YKNPYjKCvUbNrQ2EcVYbULtUd/GH6wZ/qdqH13j9pOHBER+EZXNN2L8RSJhVRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.2.1.tgz}
     name: '@rollup/plugin-node-resolve'
@@ -325,6 +319,12 @@ packages:
       picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
+  registry.npmmirror.com/@sxzz/popperjs-es/2.11.7:
+    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz}
+    name: '@sxzz/popperjs-es'
+    version: 2.11.7
+    dev: false
+
   registry.npmmirror.com/@tootallnate/once/1.1.2:
     resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@tootallnate/once/-/once-1.1.2.tgz}
     name: '@tootallnate/once'
@@ -679,7 +679,7 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
 
   registry.npmmirror.com/@vue/devtools-api/6.1.4:
-    resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz}
+    resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz}
     name: '@vue/devtools-api'
     version: 6.1.4
     dev: false
@@ -1497,18 +1497,18 @@ packages:
     version: 1.1.1
     dev: true
 
-  registry.npmmirror.com/element-plus/2.1.10_vue@3.2.33:
-    resolution: {integrity: sha512-sS9OMgP20dlYipmzHlEEgCJU+ID7+03YpRpoJWNQEH736C6ArmDMLnGFe8DUjPvwbUEXRA2d0Eo5d0apFgkSqg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.1.10.tgz}
-    id: registry.npmmirror.com/element-plus/2.1.10
+  registry.npmmirror.com/element-plus/2.2.0_vue@3.2.33:
+    resolution: {integrity: sha512-zxmAFEAa1T/n09rR+NozXcWl5CjaFtqoaxhFSafag0dgc90tgEHitDXfegdFAl4ahugdNTqu9aLzngx3VhDAtA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.0.tgz}
+    id: registry.npmmirror.com/element-plus/2.2.0
     name: element-plus
-    version: 2.1.10
+    version: 2.2.0
     peerDependencies:
       vue: ^3.2.0
     dependencies:
       '@ctrl/tinycolor': registry.npmmirror.com/@ctrl/tinycolor/3.4.1
       '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
       '@floating-ui/dom': registry.npmmirror.com/@floating-ui/dom/0.4.5
-      '@popperjs/core': registry.npmmirror.com/@popperjs/core/2.11.5
+      '@popperjs/core': registry.npmmirror.com/@sxzz/popperjs-es/2.11.7
       '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
       '@types/lodash-es': registry.npmmirror.com/@types/lodash-es/4.17.6
       '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
@@ -1548,7 +1548,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/encoding/0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
     name: encoding
     version: 0.1.13
     requiresBuild: true
@@ -1592,7 +1592,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/esbuild-android-64/0.14.36:
-    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
+    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
     name: esbuild-android-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1603,7 +1603,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-android-arm64/0.14.36:
-    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
     name: esbuild-android-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1614,7 +1614,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-64/0.14.36:
-    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
+    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
     name: esbuild-darwin-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1625,7 +1625,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-arm64/0.14.36:
-    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
     name: esbuild-darwin-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1636,7 +1636,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-64/0.14.36:
-    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
     name: esbuild-freebsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1647,7 +1647,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-arm64/0.14.36:
-    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
     name: esbuild-freebsd-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1658,7 +1658,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-32/0.14.36:
-    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
+    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
     name: esbuild-linux-32
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1669,7 +1669,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-64/0.14.36:
-    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
+    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
     name: esbuild-linux-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1680,7 +1680,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm/0.14.36:
-    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
+    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
     name: esbuild-linux-arm
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1691,7 +1691,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm64/0.14.36:
-    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
     name: esbuild-linux-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1702,7 +1702,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-mips64le/0.14.36:
-    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
+    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
     name: esbuild-linux-mips64le
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1713,7 +1713,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-ppc64le/0.14.36:
-    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
+    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
     name: esbuild-linux-ppc64le
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1724,7 +1724,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-riscv64/0.14.36:
-    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
+    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
     name: esbuild-linux-riscv64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1735,7 +1735,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-s390x/0.14.36:
-    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
+    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
     name: esbuild-linux-s390x
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1746,7 +1746,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-netbsd-64/0.14.36:
-    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
     name: esbuild-netbsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1757,7 +1757,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-openbsd-64/0.14.36:
-    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
+    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
     name: esbuild-openbsd-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1768,7 +1768,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-sunos-64/0.14.36:
-    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
+    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
     name: esbuild-sunos-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1779,7 +1779,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-32/0.14.36:
-    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
+    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
     name: esbuild-windows-32
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1790,7 +1790,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-64/0.14.36:
-    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
+    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
     name: esbuild-windows-64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -1801,7 +1801,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-arm64/0.14.36:
-    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
+    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
     name: esbuild-windows-arm64
     version: 0.14.36
     engines: {node: '>=12'}
@@ -2241,7 +2241,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/fsevents/2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
     name: fsevents
     version: 2.3.2
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -4943,11 +4943,11 @@ packages:
       vue-demi: registry.npmmirror.com/vue-demi/0.11.4_vue@3.2.33
     dev: false
 
-  registry.npmmirror.com/vue-router/4.0.14_vue@3.2.33:
-    resolution: {integrity: sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-router/-/vue-router-4.0.14.tgz}
-    id: registry.npmmirror.com/vue-router/4.0.14
+  registry.npmmirror.com/vue-router/4.0.15_vue@3.2.33:
+    resolution: {integrity: sha512-xa+pIN9ZqORdIW1MkN2+d9Ui2pCM1b/UMgwYUCZOiFYHAvz/slKKBDha8DLrh5aCG/RibtrpyhKjKOZ85tYyWg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-router/-/vue-router-4.0.15.tgz}
+    id: registry.npmmirror.com/vue-router/4.0.15
     name: vue-router
-    version: 4.0.14
+    version: 4.0.15
     peerDependencies:
       vue: ^3.2.0
     dependencies:
diff --git a/diboot-admin-ui/src/components/icon/select.vue b/diboot-admin-ui/src/components/icon/select.vue
index 20804951..7bccc92a 100644
--- a/diboot-admin-ui/src/components/icon/select.vue
+++ b/diboot-admin-ui/src/components/icon/select.vue
@@ -21,10 +21,8 @@ const selectIcon = (name?: string) => {
   <el-icon :size="25" style="vertical-align: middle; margin-right: 10px">
     <icon :name="modelValue" />
   </el-icon>
-  <el-button type="text" @click="visible = true">{{ modelValue ? '重选' : '选择' }}</el-button>
-  <el-button v-show="modelValue" type="text" style="color: var(--el-color-danger)" @click="selectIcon()">
-    清除
-  </el-button>
+  <el-button text bg type="primary" @click="visible = true">{{ modelValue ? '重选' : '选择' }}</el-button>
+  <el-button v-show="modelValue" text bg type="danger" @click="selectIcon()"> 清除 </el-button>
   <el-dialog v-model="visible" title="图标选择器" top="10vh">
     <el-tabs style="margin-top: -30px">
       <el-tab-pane v-for="key in Object.keys(IconLibrary)" :key="key" lazy>
-- 
Gitee


From 565db75bae320e7fddc8b78e656590be6a10e99b Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 12 May 2022 17:31:14 +0800
Subject: [PATCH 112/195] * opt(theme) color scheme

---
 diboot-admin-ui/src/App.vue                   |  4 +++
 diboot-admin-ui/src/styles/element/index.scss | 29 -------------------
 diboot-admin-ui/src/styles/index.scss         | 10 +++----
 diboot-admin-ui/src/styles/theme/dark.scss    | 12 ++++++++
 diboot-admin-ui/src/styles/theme/index.scss   |  2 ++
 diboot-admin-ui/src/styles/theme/light.scss   | 12 ++++++++
 diboot-admin-ui/src/utils/theme.ts            |  9 ++----
 diboot-admin-ui/vite.config.ts                |  2 +-
 8 files changed, 39 insertions(+), 41 deletions(-)
 delete mode 100644 diboot-admin-ui/src/styles/element/index.scss
 create mode 100644 diboot-admin-ui/src/styles/theme/dark.scss
 create mode 100644 diboot-admin-ui/src/styles/theme/index.scss
 create mode 100644 diboot-admin-ui/src/styles/theme/light.scss

diff --git a/diboot-admin-ui/src/App.vue b/diboot-admin-ui/src/App.vue
index cf543967..a92e5364 100644
--- a/diboot-admin-ui/src/App.vue
+++ b/diboot-admin-ui/src/App.vue
@@ -1,9 +1,13 @@
 <script setup lang="ts">
 import zhCn from 'element-plus/lib/locale/lang/zh-cn'
+import { colorPrimary } from '@/utils/theme'
 import useAppStore from './store/app'
 
 const appStore = useAppStore()
 
+// 初始化自定义主题色
+onMounted(() => appStore.colorPrimary && (colorPrimary.value = appStore.colorPrimary))
+
 const locale = reactive(zhCn)
 </script>
 
diff --git a/diboot-admin-ui/src/styles/element/index.scss b/diboot-admin-ui/src/styles/element/index.scss
deleted file mode 100644
index d7cf7ea0..00000000
--- a/diboot-admin-ui/src/styles/element/index.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-$--colors: (
-        "primary": (
-                "base": #58a9fd,
-        ),
-        "success": (
-                "base": #21ba45,
-        ),
-        "warning": (
-                "base": #f2711c,
-        ),
-        "danger": (
-                "base": #db2828,
-        ),
-        "error": (
-                "base": #db2828,
-        ),
-        "info": (
-                "base": #bababa,
-        ),
-);
-
-// You should use them in scss, because we calculate it by sass.
-//@forward "element-plus/theme-chalk/src/common/var.scss"  with (
-//  // do not use same name, it will override.
-//  $colors: $--colors
-//);
-
-// import dark theme
-@use "element-plus/theme-chalk/src/dark/css-vars.scss" as *;
diff --git a/diboot-admin-ui/src/styles/index.scss b/diboot-admin-ui/src/styles/index.scss
index 1ca3a3bc..081c50cd 100644
--- a/diboot-admin-ui/src/styles/index.scss
+++ b/diboot-admin-ui/src/styles/index.scss
@@ -1,5 +1,5 @@
-:root {
-  .el-dialog {
-    --el-dialog-margin-top: 10vh;
-  }
-}
+//:root {
+//  .el-dialog {
+//    --el-dialog-margin-top: 10vh;
+//  }
+//}
diff --git a/diboot-admin-ui/src/styles/theme/dark.scss b/diboot-admin-ui/src/styles/theme/dark.scss
new file mode 100644
index 00000000..86795052
--- /dev/null
+++ b/diboot-admin-ui/src/styles/theme/dark.scss
@@ -0,0 +1,12 @@
+// Custom dark color scheme
+@forward 'element-plus/theme-chalk/src/dark/var.scss'  with (
+  $colors: (
+        'success': ( 'base': #21ba45 ),
+        'warning': ( 'base': #f2711c ),
+        'danger': ( 'base': #db2828 ),
+        'error': ( 'base': #db2828 ),
+  ),
+);
+
+// import dark theme
+@use 'element-plus/theme-chalk/src/dark/css-vars.scss' as *;
diff --git a/diboot-admin-ui/src/styles/theme/index.scss b/diboot-admin-ui/src/styles/theme/index.scss
new file mode 100644
index 00000000..caa04de6
--- /dev/null
+++ b/diboot-admin-ui/src/styles/theme/index.scss
@@ -0,0 +1,2 @@
+@use 'light';
+@use 'dark';
diff --git a/diboot-admin-ui/src/styles/theme/light.scss b/diboot-admin-ui/src/styles/theme/light.scss
new file mode 100644
index 00000000..0e4c8bf7
--- /dev/null
+++ b/diboot-admin-ui/src/styles/theme/light.scss
@@ -0,0 +1,12 @@
+// Custom light color scheme（Share light color schemes when dark color schemes are not overridden）
+@forward 'element-plus/theme-chalk/src/common/var.scss' with (
+  // default color scheme
+  $colors: (
+        'primary': ( 'base': #409eff ),
+        'success': ( 'base': #67c23a ),
+        'warning': ( 'base': #e6a23c ),
+        'danger': ( 'base': #f56c6c ),
+        'error': ( 'base': #f56c6c ),
+        'info': ( 'base': #909399 ),
+  ),
+);
diff --git a/diboot-admin-ui/src/utils/theme.ts b/diboot-admin-ui/src/utils/theme.ts
index 6451fe48..441347c9 100644
--- a/diboot-admin-ui/src/utils/theme.ts
+++ b/diboot-admin-ui/src/utils/theme.ts
@@ -26,13 +26,10 @@ const mixColorPrimary = (color: string, light: string, dark: string) => {
 }
 // 设置从主题色
 const subColorPrimary = (color: string, isDark: boolean) => {
-  if (isDark) {
-    mixColorPrimary(color, '#141414', '#ffffff')
-  } else {
-    mixColorPrimary(color, '#ffffff', '#000000')
-  }
+  const bgColor = useCssVar('--el-bg-color').value.trim()
+  mixColorPrimary(color, bgColor, isDark ? '#ffffff' : '#000000')
 }
 // 监听主题色变化
 watch(colorPrimary, value => subColorPrimary(value, isDark.value))
 // 监听主题变化，随着改变主题色
-watch(isDark, value => subColorPrimary(colorPrimary.value, value))
+watch(isDark, value => nextTick(() => subColorPrimary(colorPrimary.value.trim(), value)))
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index cbc81ae1..b6b9557a 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -57,7 +57,7 @@ export default defineConfig(({ command }) => {
       preprocessorOptions: {
         scss: {
           // javascriptEnabled: true,
-          additionalData: `@use "@/styles/element/index.scss" as *;`
+          additionalData: `@use "@/styles/theme/index.scss" as *;`
         }
       }
     },
-- 
Gitee


From f6f961e5995bbd4a75aa766c9d5eae0b25296649 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 12 May 2022 18:30:43 +0800
Subject: [PATCH 113/195] * opt(setting) dev environment only

---
 diboot-admin-ui/src/layout/index.vue         | 7 ++++++-
 diboot-admin-ui/src/layout/setting/index.vue | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 0e8d19a9..d5c84591 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -4,7 +4,6 @@ import AppMenu from './memu/index.vue'
 import AppMain from './main/index.vue'
 import AppFooter from './footer/index.vue'
 import AppTabs from './tabs/index.vue'
-import AppSetting from './setting/index.vue'
 
 import { Eleme } from '@element-plus/icons-vue'
 
@@ -37,6 +36,12 @@ watch(
     oneLevel.value = value.matched.find(item => (item.redirect && item.meta.title) || item.path === value.path)
   }
 )
+
+// 动态引入配置组件（生产环境舍弃）
+const AppSetting = defineAsyncComponent({
+  loader: () => (import.meta.env.DEV ? import('./setting/index.vue') : Promise.reject()),
+  onError: () => null
+})
 </script>
 
 <template>
diff --git a/diboot-admin-ui/src/layout/setting/index.vue b/diboot-admin-ui/src/layout/setting/index.vue
index 10f0b489..17ba3027 100644
--- a/diboot-admin-ui/src/layout/setting/index.vue
+++ b/diboot-admin-ui/src/layout/setting/index.vue
@@ -10,8 +10,7 @@ const appStore = useAppStore()
 // 监听主题色
 watch(
   () => appStore.colorPrimary,
-  value => (colorPrimary.value = value ? value : '#409eff'),
-  { immediate: true }
+  value => (colorPrimary.value = value ? value : '#409eff')
 )
 </script>
 
-- 
Gitee


From f3b1662b6ea8c220a187ce3ea1f2a30c9e9de145 Mon Sep 17 00:00:00 2001
From: fullstackyang <8mQwYMHd3M94my7>
Date: Thu, 12 May 2022 18:54:50 +0800
Subject: [PATCH 114/195] =?UTF-8?q?+=20hooks=20&=20PageLoader=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/src/components/hooks/list.ts  | 242 ++++++++++++++++++
 diboot-admin-ui/src/utils/permission.ts       |   2 +-
 diboot-admin-ui/src/views/login/index.vue     |   4 +-
 .../src/views/system/dictionary/list.vue      |  51 +---
 4 files changed, 258 insertions(+), 41 deletions(-)
 create mode 100644 diboot-admin-ui/src/components/hooks/list.ts

diff --git a/diboot-admin-ui/src/components/hooks/list.ts b/diboot-admin-ui/src/components/hooks/list.ts
new file mode 100644
index 00000000..770b5f29
--- /dev/null
+++ b/diboot-admin-ui/src/components/hooks/list.ts
@@ -0,0 +1,242 @@
+import { ElNotification } from 'element-plus'
+
+export interface BaseModel {
+  id: string
+}
+
+import { reactive } from 'vue'
+
+type HookOptions<T> = {
+  pageLoader?: BaseListPageLoader<T>
+  baseApi: string
+  autoLoad?: boolean
+}
+
+export interface Pagination {
+  pageSize: number
+  current: number
+  total: number
+  showSizeChanger: boolean
+  pageSizeOptions: string[]
+}
+
+export interface ListOptions<T> {
+  baseUrl?: string
+  // 主键字段名
+  primaryKey?: string
+  // 请求接口基础路径
+  baseApi?: string
+  // 列表数据接口
+  listApi?: string
+  // 删除接口
+  deleteApiPrefix?: string
+  // 导出接口
+  exportApi?: string
+  // 自定义参数（不被查询表单重置和改变的参数）
+  customQueryParam?: { [key: string]: any }
+  // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
+  queryParam?: { [key: string]: any }
+  // 日期区间选择配置
+  dateRangeQuery?: any[]
+  // 高级搜索 展开/关闭
+  advanced?: boolean
+  // 列表数据
+  list?: T[]
+  // 是否将children转化为_children
+  childrenConvert: boolean
+  // 是否从mixin中自动获取初始的列表数据
+  getListFromMixin?: boolean
+  // 标记加载状态
+  loading?: boolean
+  // 标记导出
+  exportLoadingData?: boolean
+  // 是否允许撤回删除
+  allowCanceledDelete?: boolean
+  // 是否重新加载
+  reload?: boolean
+  // 当前激活value
+  currentPrimaryValue?: string | number
+  // 分页数据
+  pagination?: Pagination
+}
+
+export class BaseListPageLoader<T> {
+  public options: ListOptions<T> = reactive({
+    // 主键字段名
+    primaryKey: 'id',
+    // 请求接口基础路径
+    baseApi: '/',
+    // 列表数据接口
+    listApi: '',
+    // 删除接口
+    deleteApiPrefix: '',
+    // 导出接口
+    exportApi: '',
+    // 自定义参数（不被查询表单重置和改变的参数）
+    customQueryParam: {},
+    // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
+    queryParam: {},
+    // 日期区间选择配置
+    dateRangeQuery: [],
+    // 高级搜索 展开/关闭
+    advanced: false,
+    // 列表数据
+    list: [],
+    // 是否将children转化为_children
+    childrenConvert: true,
+    // 是否从mixin中自动获取初始的列表数据
+    getListFromMixin: true,
+    // 标记加载状态
+    loading: false,
+    // 标记导出
+    exportLoadingData: false,
+    // 是否允许撤回删除
+    allowCanceledDelete: false,
+    // 是否重新加载
+    reload: false,
+    // 当前激活value
+    currentPrimaryValue: '',
+    // 分页数据
+    pagination: {
+      pageSize: 10,
+      current: 1,
+      total: 0,
+      showSizeChanger: true,
+      pageSizeOptions: ['10', '20', '30', '50', '100']
+    }
+  })
+  /**
+   * 搜索，查询第一页
+   */
+  public onSearch() {
+    if (this.options?.pagination) this.options.pagination.current = 1
+    this.getList()
+  }
+  public toggleLoading() {
+    if (this.options) this.options.loading = true
+  }
+  /**
+   * get请求获取列表
+   * @returns {Promise<any>}
+   */
+  public async getList() {
+    try {
+      this.toggleLoading()
+      const res = await api.get<T[]>(
+        this.options?.listApi ? this.options?.listApi : `${this.options?.baseApi}/list`,
+        this.buildQueryParam()
+      )
+      if (res.code === 0) {
+        if (this.options) this.options.list = this.listFilter(res.data)
+        console.log('this.options.list', this.options.list)
+        if (res.page) {
+          if (this.options?.pagination) {
+            this.options.pagination.pageSize = res.page.pageSize
+            this.options.pagination.current = res.page.pageIndex
+            this.options.pagination.total = res.page.totalCount ? Number(res.page.totalCount) : 0
+          }
+        }
+      } else {
+        ElNotification.error({
+          title: '获取列表数据失败',
+          message: res.msg
+        })
+      }
+    } catch (e) {
+      ElNotification.error({
+        title: '获取列表数据失败',
+        message: e as string
+      })
+    } finally {
+      // this.toggleLoadingData()
+      console.log(this.options?.loading)
+    }
+  }
+  /**
+   * 列表过滤器
+   * @param list
+   * @returns {*}
+   */
+  public listFilter(list: T[] | undefined) {
+    if (!list || list.length === 0) {
+      return []
+    }
+    return list
+  }
+  /**
+   * 构建查询参数
+   */
+  public buildQueryParam() {
+    this.dateRange2queryParam()
+    // 进行前置处理，获取查询条件初始值
+    let tempQueryParam = this.beforeBuildQueryParam()
+    // 合并自定义查询参数
+    _.merge(tempQueryParam, this.options?.customQueryParam)
+    // 合并搜索参数
+    _.merge(tempQueryParam, this.options?.queryParam)
+    // 进行后置处理，可用于改造查询条件（用于列表页扩展等场景）
+    tempQueryParam = this.afterBuildQueryParam(tempQueryParam)
+    return tempQueryParam
+  }
+  /**
+   * 查询条件前置处理
+   */
+  beforeBuildQueryParam(): object {
+    return {}
+  }
+  /**
+   * 查询条件后置处理
+   */
+  afterBuildQueryParam(queryParam: object): object {
+    return {}
+  }
+  clearQueryParam(): void {
+    this.options.queryParam = {}
+  }
+  public onReset(): void {
+    this.clearQueryParam()
+    this.getList()
+  }
+  /**
+   * 构建区间查询参数
+   */
+  dateRange2queryParam() {
+    _.forEach(this.options?.dateRangeQuery || [], (v, k) => {
+      if (k && v && v.length === 2) {
+        if (this.options?.queryParam) {
+          this.options.queryParam[`${k}Begin`] = v[0]
+          this.options.queryParam[`${k}End`] = v[1]
+        }
+      }
+    })
+  }
+}
+
+type Results<T> = {
+  pageLoader: BaseListPageLoader<T>
+  queryParam: object
+  dataList: T[]
+  loading: boolean
+  pagination: Pagination
+}
+
+export default function <T>(options: HookOptions<T>) {
+  let { pageLoader, autoLoad } = options
+  const { baseApi } = options
+  pageLoader = pageLoader || new BaseListPageLoader<T>()
+  pageLoader.options.baseApi = baseApi
+  autoLoad = autoLoad == null ? true : autoLoad
+  onMounted(() => {
+    if (autoLoad) {
+      pageLoader?.onSearch()
+    }
+  })
+  const { list: dataList, queryParam, loading, pagination } = toRefs(pageLoader.options)
+  return {
+    pageLoader,
+    queryParam,
+    dataList,
+    loading,
+    pagination
+  }
+}
diff --git a/diboot-admin-ui/src/utils/permission.ts b/diboot-admin-ui/src/utils/permission.ts
index 8dd27186..aa232c39 100644
--- a/diboot-admin-ui/src/utils/permission.ts
+++ b/diboot-admin-ui/src/utils/permission.ts
@@ -14,7 +14,7 @@ export function checkRole(value: string | Array<string>, not = false, all = fals
     const roles = useAuthStore().roles
     const permissionRoles = value instanceof Array ? value : [value]
     const findFn = (role: string) => permissionRoles.includes(role)
-    const exist = all ? roles.every(findFn) : roles.some(findFn)
+    const exist = all ? roles.every(findFn) : roles?.some(findFn)
     return not ? !exist : exist
   } else {
     console.error(`need roles!`)
diff --git a/diboot-admin-ui/src/views/login/index.vue b/diboot-admin-ui/src/views/login/index.vue
index a54f2cc1..34263276 100644
--- a/diboot-admin-ui/src/views/login/index.vue
+++ b/diboot-admin-ui/src/views/login/index.vue
@@ -53,8 +53,8 @@ const submitForm = async () => {
         </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button style="width: 100%" type="primary" plain @click="submitForm">登 陆</el-button>
-      </el-form-item>
+        <el-button style="width: 100%" type="primary" plain @click="submitForm">登 陆</el-button> </el-form-item
+      >、
     </el-form>
   </div>
 </template>
diff --git a/diboot-admin-ui/src/views/system/dictionary/list.vue b/diboot-admin-ui/src/views/system/dictionary/list.vue
index ed1f210c..99b97d3a 100644
--- a/diboot-admin-ui/src/views/system/dictionary/list.vue
+++ b/diboot-admin-ui/src/views/system/dictionary/list.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts" name="DictionaryList">
-interface Dictionary {
+import { BaseModel } from '@/components/hooks/list'
+import useList from '@/components/hooks/list'
+
+interface Dictionary extends BaseModel {
   type: string
   itemName: string
   itemValue: string
@@ -7,54 +10,26 @@ interface Dictionary {
   children: Dictionary[]
   createTime: string
 }
-const customParam = ref({})
-let searchParam = ref({})
-let dataList = ref<Dictionary[]>([])
 
-const buildQueryParam = async () => {
-  const queryParam = {}
-  _.merge(queryParam, customParam)
-  _.merge(queryParam, searchParam)
-  return queryParam
-}
-const clearSearchParam = () => {
-  searchParam.value = {}
-}
-const queryDataList = async () => {
-  const queryParam = await buildQueryParam()
-  try {
-    const res = await api.get<Dictionary[]>('/dictionary/list', queryParam)
-    if (res.code === 0) {
-      dataList.value = res.data || []
-    }
-  } catch (e) {
-    console.error(e)
-  }
-}
-const onSearch = async () => {
-  await buildQueryParam()
-  await queryDataList()
-}
-const onReset = async () => {
-  clearSearchParam()
-  await queryDataList()
-}
-onMounted(() => {
-  onSearch()
+const { pageLoader, queryParam, dataList } = useList<Dictionary>({
+  baseApi: '/dictionary'
 })
+const onReset = () => {
+  pageLoader.onReset()
+}
 </script>
 <template>
   <div class="list-container">
     <div class="search-container">
-      <el-form :inline="true" :model="searchParam" class="demo-form-inline">
+      <el-form :inline="true" :model="queryParam" class="demo-form-inline">
         <el-form-item label="菜单名称">
-          <el-input v-model="searchParam.itemName" placeholder="类型名称" />
+          <el-input v-model="queryParam.itemName" placeholder="类型名称" />
         </el-form-item>
         <el-form-item label="菜单编码">
-          <el-input v-model="searchParam.itemValue" placeholder="类型编码" />
+          <el-input v-model="queryParam.itemValue" placeholder="类型编码" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSearch">查询</el-button>
+          <el-button type="primary" @click="pageLoader.onSearch()">查询</el-button>
           <el-button @click="onReset">重置</el-button>
         </el-form-item>
       </el-form>
-- 
Gitee


From 310d950a80e3ac3f3b2174aca84f53c8d308ab71 Mon Sep 17 00:00:00 2001
From: fullstackyang <8mQwYMHd3M94my7>
Date: Thu, 12 May 2022 19:01:21 +0800
Subject: [PATCH 115/195] + Result types for list hooks

---
 diboot-admin-ui/src/components/hooks/list.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/diboot-admin-ui/src/components/hooks/list.ts b/diboot-admin-ui/src/components/hooks/list.ts
index 770b5f29..4d6e8fa9 100644
--- a/diboot-admin-ui/src/components/hooks/list.ts
+++ b/diboot-admin-ui/src/components/hooks/list.ts
@@ -1,4 +1,5 @@
 import { ElNotification } from 'element-plus'
+import { Ref } from 'vue'
 
 export interface BaseModel {
   id: string
@@ -214,13 +215,13 @@ export class BaseListPageLoader<T> {
 
 type Results<T> = {
   pageLoader: BaseListPageLoader<T>
-  queryParam: object
-  dataList: T[]
-  loading: boolean
-  pagination: Pagination
+  queryParam: Ref<{ [p: string]: any } | undefined> | undefined
+  dataList: Ref<T[] | undefined> | undefined
+  loading: Ref<boolean | undefined> | undefined
+  pagination: Ref<Pagination | undefined> | undefined
 }
 
-export default function <T>(options: HookOptions<T>) {
+export default function <T>(options: HookOptions<T>): Results<T> {
   let { pageLoader, autoLoad } = options
   const { baseApi } = options
   pageLoader = pageLoader || new BaseListPageLoader<T>()
-- 
Gitee


From 69f4228bb34c784bea2dd910cc41ff627f358518 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 14 May 2022 11:15:28 +0800
Subject: [PATCH 116/195] =?UTF-8?q?+=20isPaginationParam=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/core/vo/Pagination.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java b/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java
index 20c84621..165a0895 100644
--- a/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java
+++ b/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java
@@ -186,6 +186,18 @@ public class Pagination implements Serializable {
         return this.orderBy = Cons.FieldName.createTime.name() + ":" + Cons.ORDER_DESC;
     }
 
+    /**
+     * 是否为分页参数
+     * @param paramName
+     * @return
+     */
+    public static boolean isFParam(String paramName){
+        return "pageIndex".equals(paramName)
+                || "pageSize".equals(paramName)
+                || "orderBy".equals(paramName)
+                || "totalCount".equals(paramName);
+    }
+
     private PropInfo getEntityPropInfo(){
         if (this.entityClass != null) {
             return BindingCacheManager.getPropInfoByClass(this.entityClass);
-- 
Gitee


From 00ddd68b00cdc5987431859160627179cabd88cd Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 14 May 2022 11:17:44 +0800
Subject: [PATCH 117/195] =?UTF-8?q?+=20isPaginationParam=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-core/src/main/java/com/diboot/core/vo/Pagination.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java b/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java
index 165a0895..604df469 100644
--- a/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java
+++ b/diboot-core/src/main/java/com/diboot/core/vo/Pagination.java
@@ -191,7 +191,7 @@ public class Pagination implements Serializable {
      * @param paramName
      * @return
      */
-    public static boolean isFParam(String paramName){
+    public static boolean isPaginationParam(String paramName){
         return "pageIndex".equals(paramName)
                 || "pageSize".equals(paramName)
                 || "orderBy".equals(paramName)
-- 
Gitee


From fcac2b2d8c23953868cdf9339c607e467d140315 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 15 May 2022 18:16:15 +0800
Subject: [PATCH 118/195] + add(hooks) list

---
 diboot-admin-ui/.eslintrc-auto-import.json |   3 +
 diboot-admin-ui/mock/_util.ts              |   9 +-
 diboot-admin-ui/src/hooks/list.ts          | 182 +++++++++++++++++++++
 diboot-admin-ui/src/main.ts                |   4 +
 diboot-admin-ui/src/store/auth.ts          |   1 -
 diboot-admin-ui/types/auto-imports.d.ts    |   3 +
 diboot-admin-ui/vite.config.ts             |   9 +-
 7 files changed, 208 insertions(+), 3 deletions(-)
 create mode 100644 diboot-admin-ui/src/hooks/list.ts

diff --git a/diboot-admin-ui/.eslintrc-auto-import.json b/diboot-admin-ui/.eslintrc-auto-import.json
index aea76831..818e664b 100644
--- a/diboot-admin-ui/.eslintrc-auto-import.json
+++ b/diboot-admin-ui/.eslintrc-auto-import.json
@@ -13,6 +13,9 @@
     "defineStore": "readonly",
     "effectScope": "readonly",
     "EffectScope": "readonly",
+    "ElMessage": "readonly",
+    "ElMessageBox": "readonly",
+    "ElNotification": "readonly",
     "getActivePinia": "readonly",
     "getCurrentInstance": "readonly",
     "getCurrentScope": "readonly",
diff --git a/diboot-admin-ui/mock/_util.ts b/diboot-admin-ui/mock/_util.ts
index 736ab40b..efce360b 100644
--- a/diboot-admin-ui/mock/_util.ts
+++ b/diboot-admin-ui/mock/_util.ts
@@ -28,7 +28,14 @@ class JsonResult {
    * 数据分页
    */
   PAGINATION<T = any>(page: number, pageSize: number, list: T[] = []) {
-    return resultJson(0, '操作成功', pagination(page, pageSize, list), { page, pageSize, total: list.length })
+    pageSize = pageSize ? pageSize : 20
+    return resultJson(0, '操作成功', pagination(page, pageSize, list), {
+      page: {
+        pageIndex: Number(page),
+        pageSize: Number(pageSize),
+        totalCount: list.length
+      }
+    })
   }
 
   /**
diff --git a/diboot-admin-ui/src/hooks/list.ts b/diboot-admin-ui/src/hooks/list.ts
new file mode 100644
index 00000000..bcb214b6
--- /dev/null
+++ b/diboot-admin-ui/src/hooks/list.ts
@@ -0,0 +1,182 @@
+import { ElButton } from 'element-plus'
+
+export interface ListOption<T> {
+  // 请求接口基础路径
+  baseApi: string
+  // 列表数据接口
+  listApi?: string
+  // 自定义参数（不被查询表单重置和改变的参数）
+  initQueryParam?: QueryParam<T>
+  // 重建查询条件
+  rebuildQuery?: (query: QueryParam<T>) => QueryParam<T>
+}
+
+export type QueryParam<T> = Partial<T> & Record<string, unknown>
+
+export interface Pagination {
+  pageSize: number
+  current: number
+  total: number
+}
+
+export default <T>(option: ListOption<T> & DeleteOption) => {
+  // 标记加载状态
+  const loading = ref(false)
+
+  const dataList = reactive<Array<T>>([])
+
+  const pagination = reactive<Pagination>({ pageSize: 20, current: 1, total: 0 })
+
+  const queryParam = reactive<QueryParam<T>>(_.cloneDeep(option.initQueryParam ?? {}))
+
+  const dateRangeQuery = reactive<Record<string, [string | number | Date, string | number | Date]>>({})
+
+  const buildQueryParam = () => {
+    // 合并自定义查询
+    const tempQueryParam: QueryParam<unknown> = _.cloneDeep(queryParam)
+    // 合并分页参数
+    tempQueryParam.pageIndex = pagination.current
+    tempQueryParam.pageSize = pagination.pageSize
+    // 合并日期范围查询参数
+    for (const [key, value] of Object.entries(dateRangeQuery)) {
+      tempQueryParam[`${key}Begin`] = value[0]
+      tempQueryParam[`${key}End`] = value[1]
+    }
+    // TODO 日期格式化
+
+    // 改造查询条件（用于列表页扩展）
+    return option.rebuildQuery ? option.rebuildQuery(tempQueryParam) : tempQueryParam
+  }
+
+  // 获取数据列表
+  const getList = _.debounce(() => {
+    loading.value = true
+    api
+      .get<Array<T>>(option.listApi ? option.listApi : `${option.baseApi}/list`, buildQueryParam())
+      .then(res => {
+        dataList.splice(0, dataList.length)
+        if (res.data) dataList.push(...reactive(res.data ?? []))
+        pagination.pageSize = res.page?.pageSize ?? 20
+        pagination.current = res.page?.pageIndex ?? 1
+        pagination.total = res.page?.totalCount ? Number(res.page.totalCount) : 0
+      })
+      .catch(err => {
+        ElNotification.error({
+          title: '获取列表数据失败',
+          message: err.msg || err.message
+        })
+      })
+      .finally(() => (loading.value = false))
+  }, 300)
+
+  /**
+   * 搜索，查询第一页
+   */
+  const onSearch = () => {
+    pagination.current = 1
+    getList()
+  }
+
+  /**
+   * 重置筛选条件
+   */
+  const resetFilter = () => {
+    Object.keys(dateRangeQuery).forEach(key => delete dateRangeQuery[key])
+    Object.keys(queryParam).forEach(key => delete queryParam[key])
+    Object.assign(queryParam, _.cloneDeep(option.initQueryParam ?? {}))
+    onSearch()
+  }
+
+  // 删除
+  const del = useDelete({ ...option, deleteCallback: getList })
+
+  return {
+    queryParam,
+    dateRangeQuery,
+    onSearch,
+    resetFilter,
+    getList,
+    loading,
+    dataList,
+    pagination,
+    ...del
+  }
+}
+
+// 删除数据
+export interface DeleteOption {
+  // 请求接口基础路径
+  baseApi: string
+  // 删除数据接口前缀
+  deleteApiPrefix?: string
+  // 是否允许撤回删除 (默认允许)
+  allowCanceledDelete?: boolean
+  // 删除回调
+  deleteCallback?: () => void
+}
+
+export const useDelete = (option: DeleteOption) => {
+  const removeSuccess = (ids: Array<string>) => {
+    if (option.deleteCallback) option.deleteCallback()
+
+    if (option.allowCanceledDelete === false) return ElMessage.success('数据删除成功')
+
+    // 支持撤回的删除成功提示
+    const message = ElMessage.success({
+      type: 'success',
+      message: h('span', null, [
+        h('span', { style: { color: 'var(--el-color-success)' } }, '数据删除成功'),
+        h(
+          ElButton,
+          {
+            bg: true,
+            text: true,
+            type: 'primary',
+            style: { height: '25px', position: 'absolute', right: '13px' },
+            onClick: () => {
+              message.close()
+              api
+                .patch(`${option.baseApi}/cancelDeleted`, ids)
+                .then(() => {
+                  ElMessage.success('撤回成功')
+                  if (option.deleteCallback) option.deleteCallback()
+                })
+                .catch(() => ElMessage.error('撤回失败'))
+            }
+          },
+          { default: () => '撤回' }
+        )
+      ])
+    })
+  }
+
+  const remove = (id: string) => {
+    ElMessageBox.confirm('确认删除该数据吗？', '删除', { type: 'warning' })
+      .then(() => {
+        api
+          .delete(`${option.baseApi}${option.deleteApiPrefix ?? ''}/${id}`)
+          .then(() => removeSuccess([id]))
+          .catch(err => {
+            ElMessage.error(err.msg || err.message || '删除失败')
+          })
+      })
+      .catch(() => null)
+  }
+
+  const batchRemove = (ids: Array<string>) => {
+    if (!(ids && ids.length)) return ElMessage.warning('未选择数据')
+
+    ElMessageBox.confirm('确认删除已选数据吗？', '批量删除', { type: 'warning' })
+      .then(() => {
+        api
+          .post(`${option.baseApi}/batchDelete`, ids)
+          .then(() => removeSuccess(ids))
+          .catch(err => {
+            ElMessage.error(err.msg || err.message || '删除失败')
+          })
+      })
+      .catch(() => null)
+  }
+
+  return { remove, batchRemove }
+}
diff --git a/diboot-admin-ui/src/main.ts b/diboot-admin-ui/src/main.ts
index c6bd5c49..e328b38a 100644
--- a/diboot-admin-ui/src/main.ts
+++ b/diboot-admin-ui/src/main.ts
@@ -12,3 +12,7 @@ app.use(directives)
 
 import '@/styles/index.scss'
 import 'nprogress/nprogress.css'
+
+import 'element-plus/es/components/message/style/css'
+import 'element-plus/es/components/message-box/style/css'
+import 'element-plus/es/components/notification/style/css'
diff --git a/diboot-admin-ui/src/store/auth.ts b/diboot-admin-ui/src/store/auth.ts
index 3c1f2037..67d24a71 100644
--- a/diboot-admin-ui/src/store/auth.ts
+++ b/diboot-admin-ui/src/store/auth.ts
@@ -1,6 +1,5 @@
 import auth from '@/utils/auth'
 import { resetRouter } from '@/router'
-import { ElMessage } from 'element-plus'
 
 export interface IAuthStore {
   realname: string
diff --git a/diboot-admin-ui/types/auto-imports.d.ts b/diboot-admin-ui/types/auto-imports.d.ts
index 12dc046e..109f3cc9 100644
--- a/diboot-admin-ui/types/auto-imports.d.ts
+++ b/diboot-admin-ui/types/auto-imports.d.ts
@@ -14,6 +14,9 @@ declare global {
   const defineStore: typeof import('pinia')['defineStore']
   const effectScope: typeof import('vue')['effectScope']
   const EffectScope: typeof import('vue')['EffectScope']
+  const ElMessage: typeof import('element-plus')['ElMessage']
+  const ElMessageBox: typeof import('element-plus')['ElMessageBox']
+  const ElNotification: typeof import('element-plus')['ElNotification']
   const getActivePinia: typeof import('pinia')['getActivePinia']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index b6b9557a..02dac167 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -20,7 +20,14 @@ export default defineConfig(({ command }) => {
         // 解析器
         resolvers: [ElementPlusResolver({ importStyle: 'sass' })],
         // 自动导入Api
-        imports: ['vue', 'vue-router', 'pinia', { lodash: [['*', '_']] }, { '@/utils/request': ['api', 'baseURL'] }],
+        imports: [
+          'vue',
+          'vue-router',
+          'pinia',
+          { lodash: [['*', '_']] },
+          { 'element-plus': ['ElMessage', 'ElMessageBox', 'ElNotification'] },
+          { '@/utils/request': ['api', 'baseURL'] }
+        ],
         // 为true时在项目根目录自动创建
         dts: 'types/auto-imports.d.ts',
         // 启用 eslint
-- 
Gitee


From e10266ab1ab698bfd4a1a7804fc0a2f75fdd7e59 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 15 May 2022 18:33:24 +0800
Subject: [PATCH 119/195] + add(role) list

---
 diboot-admin-ui/mock/auth/index.ts            |  18 +-
 diboot-admin-ui/mock/system/role.ts           |  60 +++++++
 .../src/views/system/role/list.vue            | 155 ++++++++++++++++++
 diboot-admin-ui/types/components.d.ts         |   5 +
 4 files changed, 230 insertions(+), 8 deletions(-)
 create mode 100644 diboot-admin-ui/mock/system/role.ts
 create mode 100644 diboot-admin-ui/src/views/system/role/list.vue

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index e8d41116..0bfbed8e 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -116,14 +116,16 @@ const authMenu = [
           hollow: '@boolean',
           hideFooter: '@boolean'
         }
-      }
-    ]
-  },
-  {
-    path: '/system',
-    name: 'System',
-    meta: { title: 'System', componentName: 'Layout' },
-    children: [
+      },
+      {
+        path: 'role',
+        name: 'Role',
+        meta: {
+          title: '角色管理',
+          componentName: 'RoleList',
+          sort: 3
+        }
+      },
       {
         path: 'dictionary',
         name: 'Dictionary',
diff --git a/diboot-admin-ui/mock/system/role.ts b/diboot-admin-ui/mock/system/role.ts
new file mode 100644
index 00000000..7309f73b
--- /dev/null
+++ b/diboot-admin-ui/mock/system/role.ts
@@ -0,0 +1,60 @@
+import { MockMethod } from 'vite-plugin-mock'
+import JsonResult from '../_util'
+import { Random } from 'mockjs'
+
+const baseUrl = '/api/role'
+
+const deleteDataIds: string[] = []
+
+export default [
+  {
+    url: `${baseUrl}/list`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    response: ({ query }: any) => {
+      return JsonResult.PAGINATION(
+        query.pageIndex,
+        query.pageSize,
+        Array.from({ length: 50 })
+          .map((_, index) => ({
+            id: String(index + 1),
+            name: '角色' + (index + 1),
+            code: 'role' + (index + 1),
+            description: '@csentence',
+            createTime: '@datetime',
+            updateTime: '@datetime'
+          }))
+          .filter(e => !deleteDataIds.includes(e.id))
+          .filter(e => e.name.match(query.name) && e.code.match(query.code))
+      )
+    }
+  },
+  {
+    url: `${baseUrl}/:id`,
+    timeout: Random.natural(50, 300),
+    method: 'delete',
+    response: ({ query }: any) => {
+      deleteDataIds.push(query.id)
+      return JsonResult.OK()
+    }
+  },
+  {
+    url: `${baseUrl}/cancelDeleted`,
+    timeout: Random.natural(50, 300),
+    method: 'patch',
+    response: ({ body }: any) => {
+      deleteDataIds.splice(0, deleteDataIds.length, ...deleteDataIds.filter(e => !body.includes(e)))
+      return JsonResult.OK()
+    }
+  },
+  {
+    url: `${baseUrl}/batchDelete`,
+    timeout: Random.natural(50, 300),
+    method: 'post',
+    response: ({ body }: any) => {
+      deleteDataIds.push(...body)
+      console.log(deleteDataIds)
+      return JsonResult.OK()
+    }
+  }
+] as MockMethod[]
diff --git a/diboot-admin-ui/src/views/system/role/list.vue b/diboot-admin-ui/src/views/system/role/list.vue
new file mode 100644
index 00000000..fb94bf32
--- /dev/null
+++ b/diboot-admin-ui/src/views/system/role/list.vue
@@ -0,0 +1,155 @@
+<script setup lang="ts" name="RoleList">
+import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'
+import useList from '@/hooks/list'
+
+defineProps<{ usedVisibleHeight?: number }>()
+
+interface Role {
+  id: string
+  name: string
+  code: string
+  description: string
+  createTime: string
+  updateTime: string
+}
+
+const {
+  queryParam,
+  dateRangeQuery,
+  onSearch,
+  resetFilter,
+  getList,
+  loading,
+  dataList,
+  pagination,
+  remove,
+  batchRemove
+} = useList<Role>({ baseApi: '/role' })
+
+getList()
+
+// 搜索区折叠
+const advanced = ref(false)
+
+// 选中的数据 Id 集合
+const multipleSelectionIds = ref<string[]>([])
+
+const openDetail = (id: string) => {
+  ElMessage({
+    message: 'open:Detail ' + id,
+    grouping: true,
+    type: 'success'
+  })
+}
+const openEdit = (id: any) => {
+  ElMessage({
+    message: 'open:Edit ' + id,
+    grouping: true,
+    type: 'warning'
+  })
+}
+</script>
+
+<template>
+  <el-form label-width="80px" @submit.prevent>
+    <el-row :gutter="18">
+      <el-col :md="8" :sm="24">
+        <el-form-item label="名称">
+          <el-input v-model="queryParam.name" @keyup.enter="onSearch" />
+        </el-form-item>
+      </el-col>
+      <el-col :md="8" :sm="24">
+        <el-form-item label="编码">
+          <el-input v-model="queryParam.code" @keyup.enter="onSearch" />
+        </el-form-item>
+      </el-col>
+      <template v-if="advanced">
+        <el-col :md="8" :sm="24">
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRangeQuery.createTime"
+              type="daterange"
+              value-format="YYYY-MM-DD"
+              @change="onSearch"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :sm="24">
+          <el-form-item label="更新时间">
+            <el-date-picker
+              v-model="queryParam.updateTime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              style="width: 100%"
+              @change="onSearch"
+            />
+          </el-form-item>
+        </el-col>
+      </template>
+      <el-col :md="8" :sm="24" style="margin-left: auto">
+        <el-form-item>
+          <el-button type="primary" @click="onSearch">搜索</el-button>
+          <el-button @click="resetFilter">重置</el-button>
+          <el-button type="primary" text @click="advanced = !advanced">
+            {{ advanced ? '收起' : '展开' }}
+            <el-icon :size="18" style="margin-left: 5px">
+              <component :is="advanced ? ArrowUp : ArrowDown" />
+            </el-icon>
+          </el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+  <el-space>
+    <el-button type="primary">新建</el-button>
+    <el-button @click="batchRemove(multipleSelectionIds)">批量删除</el-button>
+    <el-button>导入</el-button>
+    <el-button>导出</el-button>
+  </el-space>
+  <el-table
+    ref="tableRef"
+    v-loading="loading"
+    :data="dataList"
+    :max-height="`calc(100vh - 120px - ${usedVisibleHeight}px)`"
+    @selection-change="arr => (multipleSelectionIds = arr.map((e: Role) => e.id))"
+  >
+    <el-table-column type="selection" width="55" />
+    <el-table-column prop="name" label="名称" />
+    <el-table-column prop="code" label="编码" />
+    <el-table-column prop="createTime" label="创建时间" />
+    <el-table-column prop="updateTime" label="更新时间" />
+    <el-table-column label="操作" width="160">
+      <template #default="{ row }">
+        <el-space>
+          <el-button text bg type="primary" size="small" @click="openDetail(row.id)">详情</el-button>
+          <el-dropdown>
+            <el-button text bg type="primary" size="small">
+              更多
+              <el-icon :size="16" style="margin-left: 5px">
+                <arrow-down />
+              </el-icon>
+            </el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item @click="openEdit(row.id)">编辑</el-dropdown-item>
+                <el-dropdown-item @click="remove(row.id)">删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </el-space>
+      </template>
+    </el-table-column>
+  </el-table>
+  <el-pagination
+    v-show="pagination.total > 0"
+    v-model:currentPage="pagination.current"
+    v-model:page-size="pagination.pageSize"
+    style="position: relative; top: 10px; margin-bottom: 10px; justify-content: flex-end"
+    :page-sizes="[10, 20, 30, 50, 100]"
+    background
+    layout="total, sizes, prev, pager, next, jumper"
+    :total="pagination.total"
+  />
+</template>
+
+<style scoped></style>
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 96b3bdca..74a7a1ae 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -10,9 +10,11 @@ declare module '@vue/runtime-core' {
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -28,6 +30,8 @@ declare module '@vue/runtime-core' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSpace: typeof import('element-plus/es')['ElSpace']
@@ -41,6 +45,7 @@ declare module '@vue/runtime-core' {
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     Icon: typeof import('@/components/icon/index.vue')['default']
     IconSelect: typeof import('@/components/icon/select.vue')['default']
+    Loading: typeof import('element-plus/es')['ElLoadingDirective']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
-- 
Gitee


From 22089c5db90f8771dab6946114a79ae74291a032 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 15 May 2022 18:35:19 +0800
Subject: [PATCH 120/195] + add(AutoImport) useList

---
 diboot-admin-ui/.eslintrc-auto-import.json     | 1 +
 diboot-admin-ui/src/views/system/role/list.vue | 1 -
 diboot-admin-ui/types/auto-imports.d.ts        | 1 +
 diboot-admin-ui/vite.config.ts                 | 3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/diboot-admin-ui/.eslintrc-auto-import.json b/diboot-admin-ui/.eslintrc-auto-import.json
index 818e664b..d2f5b7f0 100644
--- a/diboot-admin-ui/.eslintrc-auto-import.json
+++ b/diboot-admin-ui/.eslintrc-auto-import.json
@@ -62,6 +62,7 @@
     "useAttrs": "readonly",
     "useCssModule": "readonly",
     "useCssVars": "readonly",
+    "useList": "readonly",
     "useRoute": "readonly",
     "useRouter": "readonly",
     "useSlots": "readonly",
diff --git a/diboot-admin-ui/src/views/system/role/list.vue b/diboot-admin-ui/src/views/system/role/list.vue
index fb94bf32..e21e300f 100644
--- a/diboot-admin-ui/src/views/system/role/list.vue
+++ b/diboot-admin-ui/src/views/system/role/list.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="RoleList">
 import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'
-import useList from '@/hooks/list'
 
 defineProps<{ usedVisibleHeight?: number }>()
 
diff --git a/diboot-admin-ui/types/auto-imports.d.ts b/diboot-admin-ui/types/auto-imports.d.ts
index 109f3cc9..a69dfe1e 100644
--- a/diboot-admin-ui/types/auto-imports.d.ts
+++ b/diboot-admin-ui/types/auto-imports.d.ts
@@ -63,6 +63,7 @@ declare global {
   const useAttrs: typeof import('vue')['useAttrs']
   const useCssModule: typeof import('vue')['useCssModule']
   const useCssVars: typeof import('vue')['useCssVars']
+  const useList: typeof import('@/hooks/list')['default']
   const useRoute: typeof import('vue-router')['useRoute']
   const useRouter: typeof import('vue-router')['useRouter']
   const useSlots: typeof import('vue')['useSlots']
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 02dac167..b500360e 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -26,7 +26,8 @@ export default defineConfig(({ command }) => {
           'pinia',
           { lodash: [['*', '_']] },
           { 'element-plus': ['ElMessage', 'ElMessageBox', 'ElNotification'] },
-          { '@/utils/request': ['api', 'baseURL'] }
+          { '@/utils/request': ['api', 'baseURL'] },
+          { '@/hooks/list': [['default', 'useList']] }
         ],
         // 为true时在项目根目录自动创建
         dts: 'types/auto-imports.d.ts',
-- 
Gitee


From 47b4bc73d1508cdcff2896fcdca64c1282c8955b Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Sun, 15 May 2022 22:56:09 +0800
Subject: [PATCH 121/195] * opt(role) list pagination change

---
 diboot-admin-ui/src/views/system/role/list.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/diboot-admin-ui/src/views/system/role/list.vue b/diboot-admin-ui/src/views/system/role/list.vue
index e21e300f..971a735e 100644
--- a/diboot-admin-ui/src/views/system/role/list.vue
+++ b/diboot-admin-ui/src/views/system/role/list.vue
@@ -148,6 +148,8 @@ const openEdit = (id: any) => {
     background
     layout="total, sizes, prev, pager, next, jumper"
     :total="pagination.total"
+    @size-change="getList()"
+    @current-change="getList()"
   />
 </template>
 
-- 
Gitee


From c0b116498be2baa25d7e68b71e1c9a9565065dc7 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 00:15:57 +0800
Subject: [PATCH 122/195] * opt(hooks) list

---
 diboot-admin-ui/src/hooks/list.ts | 104 +++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 39 deletions(-)

diff --git a/diboot-admin-ui/src/hooks/list.ts b/diboot-admin-ui/src/hooks/list.ts
index bcb214b6..6b19acd7 100644
--- a/diboot-admin-ui/src/hooks/list.ts
+++ b/diboot-admin-ui/src/hooks/list.ts
@@ -23,14 +23,17 @@ export default <T>(option: ListOption<T> & DeleteOption) => {
   // 标记加载状态
   const loading = ref(false)
 
-  const dataList = reactive<Array<T>>([])
+  const dataList: Array<T> = reactive([])
 
-  const pagination = reactive<Pagination>({ pageSize: 20, current: 1, total: 0 })
+  const pagination: Partial<Pagination> = reactive({})
 
-  const queryParam = reactive<QueryParam<T>>(_.cloneDeep(option.initQueryParam ?? {}))
+  const queryParam: QueryParam<T> = reactive(_.cloneDeep(option.initQueryParam ?? {}))
 
-  const dateRangeQuery = reactive<Record<string, [string | number | Date, string | number | Date]>>({})
+  const dateRangeQuery: Record<string, [string | number | Date, string | number | Date]> = reactive({})
 
+  /**
+   * 构建查询参数
+   */
   const buildQueryParam = () => {
     // 合并自定义查询
     const tempQueryParam: QueryParam<unknown> = _.cloneDeep(queryParam)
@@ -48,16 +51,18 @@ export default <T>(option: ListOption<T> & DeleteOption) => {
     return option.rebuildQuery ? option.rebuildQuery(tempQueryParam) : tempQueryParam
   }
 
-  // 获取数据列表
+  /**
+   * 获取数据列表
+   */
   const getList = _.debounce(() => {
     loading.value = true
     api
       .get<Array<T>>(option.listApi ? option.listApi : `${option.baseApi}/list`, buildQueryParam())
       .then(res => {
         dataList.splice(0, dataList.length)
-        if (res.data) dataList.push(...reactive(res.data ?? []))
-        pagination.pageSize = res.page?.pageSize ?? 20
-        pagination.current = res.page?.pageIndex ?? 1
+        if (res.data) dataList.push(...(res.data ?? []))
+        pagination.pageSize = res.page?.pageSize
+        pagination.current = res.page?.pageIndex
         pagination.total = res.page?.totalCount ? Number(res.page.totalCount) : 0
       })
       .catch(err => {
@@ -88,7 +93,7 @@ export default <T>(option: ListOption<T> & DeleteOption) => {
   }
 
   // 删除
-  const del = useDelete({ ...option, deleteCallback: getList })
+  const del = useDelete({ deleteCallback: getList, ...option })
 
   return {
     queryParam,
@@ -116,10 +121,59 @@ export interface DeleteOption {
 }
 
 export const useDelete = (option: DeleteOption) => {
-  const removeSuccess = (ids: Array<string>) => {
+  /**
+   * 删除数据
+   *
+   * @param id
+   */
+  const remove = (id: string) => {
+    ElMessageBox.confirm('确认删除该数据吗？', '删除', { type: 'warning' })
+      .then(() => {
+        api
+          .delete(`${option.baseApi}${option.deleteApiPrefix ?? ''}/${id}`)
+          .then(() => removeSuccessHandler([id]))
+          .catch(err => {
+            ElMessage.error(err.msg || err.message || '删除失败')
+          })
+      })
+      .catch(() => null)
+  }
+
+  /**
+   * 批量删除数据
+   *
+   * @param ids
+   */
+  const batchRemove = (ids: Array<string>) => {
+    if (!(ids && ids.length)) {
+      ElMessage.warning('未选择数据')
+      return
+    }
+
+    ElMessageBox.confirm('确认删除已选数据吗？', '批量删除', { type: 'warning' })
+      .then(() => {
+        api
+          .post(`${option.baseApi}/batchDelete`, ids)
+          .then(() => removeSuccessHandler(ids))
+          .catch(err => {
+            ElMessage.error(err.msg || err.message || '删除失败')
+          })
+      })
+      .catch(() => null)
+  }
+
+  /**
+   * 删除成功处理
+   *
+   * @param ids
+   */
+  const removeSuccessHandler = (ids: Array<string>) => {
     if (option.deleteCallback) option.deleteCallback()
 
-    if (option.allowCanceledDelete === false) return ElMessage.success('数据删除成功')
+    if (option.allowCanceledDelete === false) {
+      ElMessage.success('数据删除成功')
+      return
+    }
 
     // 支持撤回的删除成功提示
     const message = ElMessage.success({
@@ -150,33 +204,5 @@ export const useDelete = (option: DeleteOption) => {
     })
   }
 
-  const remove = (id: string) => {
-    ElMessageBox.confirm('确认删除该数据吗？', '删除', { type: 'warning' })
-      .then(() => {
-        api
-          .delete(`${option.baseApi}${option.deleteApiPrefix ?? ''}/${id}`)
-          .then(() => removeSuccess([id]))
-          .catch(err => {
-            ElMessage.error(err.msg || err.message || '删除失败')
-          })
-      })
-      .catch(() => null)
-  }
-
-  const batchRemove = (ids: Array<string>) => {
-    if (!(ids && ids.length)) return ElMessage.warning('未选择数据')
-
-    ElMessageBox.confirm('确认删除已选数据吗？', '批量删除', { type: 'warning' })
-      .then(() => {
-        api
-          .post(`${option.baseApi}/batchDelete`, ids)
-          .then(() => removeSuccess(ids))
-          .catch(err => {
-            ElMessage.error(err.msg || err.message || '删除失败')
-          })
-      })
-      .catch(() => null)
-  }
-
   return { remove, batchRemove }
 }
-- 
Gitee


From e359413c7488c880bcfbd58477452696ee0bcfad Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 00:19:42 +0800
Subject: [PATCH 123/195] * opt(mock) util

---
 diboot-admin-ui/mock/_util.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/diboot-admin-ui/mock/_util.ts b/diboot-admin-ui/mock/_util.ts
index efce360b..b338c17c 100644
--- a/diboot-admin-ui/mock/_util.ts
+++ b/diboot-admin-ui/mock/_util.ts
@@ -28,6 +28,7 @@ class JsonResult {
    * 数据分页
    */
   PAGINATION<T = any>(page: number, pageSize: number, list: T[] = []) {
+    page = page ? page : 1
     pageSize = pageSize ? pageSize : 20
     return resultJson(0, '操作成功', pagination(page, pageSize, list), {
       page: {
-- 
Gitee


From 6f808b6abf0d912dc85787e061524deaf6139be8 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 11:06:16 +0800
Subject: [PATCH 124/195] * style(layout) menu

---
 diboot-admin-ui/src/layout/memu/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index 09a43917..e2ea655b 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -23,7 +23,12 @@ const toggleState = () => emits('update:collapse', !props.collapse)
       <slot name="title" />
     </span>
     <el-scrollbar :height="collapse && $slots.title ? 'calc(100vh - 36px)' : 'calc(100vh - 86px)'">
-      <el-menu router :default-active="$route.path" :collapse="collapse">
+      <el-menu
+        router
+        :default-active="$route.path"
+        :collapse="collapse"
+        :style="{ minHeight: collapse && $slots.title ? 'calc(100vh - 36px)' : 'calc(100vh - 86px)' }"
+      >
         <sub-menu :menu-tree="menuTree" />
       </el-menu>
     </el-scrollbar>
-- 
Gitee


From 54c177b961a8a31d468c90e9763a6898ce939acd Mon Sep 17 00:00:00 2001
From: fullstackyang <8mQwYMHd3M94my7>
Date: Mon, 16 May 2022 11:44:30 +0800
Subject: [PATCH 125/195] + list hooks refactor

---
 diboot-admin-ui/.eslintrc-auto-import.json    |   3 +-
 diboot-admin-ui/src/components/hooks/list.ts  | 243 ------------
 diboot-admin-ui/src/hooks/list.ts             | 370 ++++++++++--------
 diboot-admin-ui/src/hooks/list_default.ts     | 208 ++++++++++
 .../src/views/system/dictionary/list.vue      |   6 +-
 .../src/views/system/role/list.vue            |   2 +-
 diboot-admin-ui/types/auto-imports.d.ts       |   1 +
 diboot-admin-ui/types/components.d.ts         |  12 -
 diboot-admin-ui/vite.config.ts                |   3 +-
 9 files changed, 418 insertions(+), 430 deletions(-)
 delete mode 100644 diboot-admin-ui/src/components/hooks/list.ts
 create mode 100644 diboot-admin-ui/src/hooks/list_default.ts

diff --git a/diboot-admin-ui/.eslintrc-auto-import.json b/diboot-admin-ui/.eslintrc-auto-import.json
index d2f5b7f0..94f5b231 100644
--- a/diboot-admin-ui/.eslintrc-auto-import.json
+++ b/diboot-admin-ui/.eslintrc-auto-import.json
@@ -63,10 +63,11 @@
     "useCssModule": "readonly",
     "useCssVars": "readonly",
     "useList": "readonly",
+    "useListDefault": "readonly",
     "useRoute": "readonly",
     "useRouter": "readonly",
     "useSlots": "readonly",
     "watch": "readonly",
     "watchEffect": "readonly"
   }
-}
\ No newline at end of file
+}
diff --git a/diboot-admin-ui/src/components/hooks/list.ts b/diboot-admin-ui/src/components/hooks/list.ts
deleted file mode 100644
index 4d6e8fa9..00000000
--- a/diboot-admin-ui/src/components/hooks/list.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-import { ElNotification } from 'element-plus'
-import { Ref } from 'vue'
-
-export interface BaseModel {
-  id: string
-}
-
-import { reactive } from 'vue'
-
-type HookOptions<T> = {
-  pageLoader?: BaseListPageLoader<T>
-  baseApi: string
-  autoLoad?: boolean
-}
-
-export interface Pagination {
-  pageSize: number
-  current: number
-  total: number
-  showSizeChanger: boolean
-  pageSizeOptions: string[]
-}
-
-export interface ListOptions<T> {
-  baseUrl?: string
-  // 主键字段名
-  primaryKey?: string
-  // 请求接口基础路径
-  baseApi?: string
-  // 列表数据接口
-  listApi?: string
-  // 删除接口
-  deleteApiPrefix?: string
-  // 导出接口
-  exportApi?: string
-  // 自定义参数（不被查询表单重置和改变的参数）
-  customQueryParam?: { [key: string]: any }
-  // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
-  queryParam?: { [key: string]: any }
-  // 日期区间选择配置
-  dateRangeQuery?: any[]
-  // 高级搜索 展开/关闭
-  advanced?: boolean
-  // 列表数据
-  list?: T[]
-  // 是否将children转化为_children
-  childrenConvert: boolean
-  // 是否从mixin中自动获取初始的列表数据
-  getListFromMixin?: boolean
-  // 标记加载状态
-  loading?: boolean
-  // 标记导出
-  exportLoadingData?: boolean
-  // 是否允许撤回删除
-  allowCanceledDelete?: boolean
-  // 是否重新加载
-  reload?: boolean
-  // 当前激活value
-  currentPrimaryValue?: string | number
-  // 分页数据
-  pagination?: Pagination
-}
-
-export class BaseListPageLoader<T> {
-  public options: ListOptions<T> = reactive({
-    // 主键字段名
-    primaryKey: 'id',
-    // 请求接口基础路径
-    baseApi: '/',
-    // 列表数据接口
-    listApi: '',
-    // 删除接口
-    deleteApiPrefix: '',
-    // 导出接口
-    exportApi: '',
-    // 自定义参数（不被查询表单重置和改变的参数）
-    customQueryParam: {},
-    // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
-    queryParam: {},
-    // 日期区间选择配置
-    dateRangeQuery: [],
-    // 高级搜索 展开/关闭
-    advanced: false,
-    // 列表数据
-    list: [],
-    // 是否将children转化为_children
-    childrenConvert: true,
-    // 是否从mixin中自动获取初始的列表数据
-    getListFromMixin: true,
-    // 标记加载状态
-    loading: false,
-    // 标记导出
-    exportLoadingData: false,
-    // 是否允许撤回删除
-    allowCanceledDelete: false,
-    // 是否重新加载
-    reload: false,
-    // 当前激活value
-    currentPrimaryValue: '',
-    // 分页数据
-    pagination: {
-      pageSize: 10,
-      current: 1,
-      total: 0,
-      showSizeChanger: true,
-      pageSizeOptions: ['10', '20', '30', '50', '100']
-    }
-  })
-  /**
-   * 搜索，查询第一页
-   */
-  public onSearch() {
-    if (this.options?.pagination) this.options.pagination.current = 1
-    this.getList()
-  }
-  public toggleLoading() {
-    if (this.options) this.options.loading = true
-  }
-  /**
-   * get请求获取列表
-   * @returns {Promise<any>}
-   */
-  public async getList() {
-    try {
-      this.toggleLoading()
-      const res = await api.get<T[]>(
-        this.options?.listApi ? this.options?.listApi : `${this.options?.baseApi}/list`,
-        this.buildQueryParam()
-      )
-      if (res.code === 0) {
-        if (this.options) this.options.list = this.listFilter(res.data)
-        console.log('this.options.list', this.options.list)
-        if (res.page) {
-          if (this.options?.pagination) {
-            this.options.pagination.pageSize = res.page.pageSize
-            this.options.pagination.current = res.page.pageIndex
-            this.options.pagination.total = res.page.totalCount ? Number(res.page.totalCount) : 0
-          }
-        }
-      } else {
-        ElNotification.error({
-          title: '获取列表数据失败',
-          message: res.msg
-        })
-      }
-    } catch (e) {
-      ElNotification.error({
-        title: '获取列表数据失败',
-        message: e as string
-      })
-    } finally {
-      // this.toggleLoadingData()
-      console.log(this.options?.loading)
-    }
-  }
-  /**
-   * 列表过滤器
-   * @param list
-   * @returns {*}
-   */
-  public listFilter(list: T[] | undefined) {
-    if (!list || list.length === 0) {
-      return []
-    }
-    return list
-  }
-  /**
-   * 构建查询参数
-   */
-  public buildQueryParam() {
-    this.dateRange2queryParam()
-    // 进行前置处理，获取查询条件初始值
-    let tempQueryParam = this.beforeBuildQueryParam()
-    // 合并自定义查询参数
-    _.merge(tempQueryParam, this.options?.customQueryParam)
-    // 合并搜索参数
-    _.merge(tempQueryParam, this.options?.queryParam)
-    // 进行后置处理，可用于改造查询条件（用于列表页扩展等场景）
-    tempQueryParam = this.afterBuildQueryParam(tempQueryParam)
-    return tempQueryParam
-  }
-  /**
-   * 查询条件前置处理
-   */
-  beforeBuildQueryParam(): object {
-    return {}
-  }
-  /**
-   * 查询条件后置处理
-   */
-  afterBuildQueryParam(queryParam: object): object {
-    return {}
-  }
-  clearQueryParam(): void {
-    this.options.queryParam = {}
-  }
-  public onReset(): void {
-    this.clearQueryParam()
-    this.getList()
-  }
-  /**
-   * 构建区间查询参数
-   */
-  dateRange2queryParam() {
-    _.forEach(this.options?.dateRangeQuery || [], (v, k) => {
-      if (k && v && v.length === 2) {
-        if (this.options?.queryParam) {
-          this.options.queryParam[`${k}Begin`] = v[0]
-          this.options.queryParam[`${k}End`] = v[1]
-        }
-      }
-    })
-  }
-}
-
-type Results<T> = {
-  pageLoader: BaseListPageLoader<T>
-  queryParam: Ref<{ [p: string]: any } | undefined> | undefined
-  dataList: Ref<T[] | undefined> | undefined
-  loading: Ref<boolean | undefined> | undefined
-  pagination: Ref<Pagination | undefined> | undefined
-}
-
-export default function <T>(options: HookOptions<T>): Results<T> {
-  let { pageLoader, autoLoad } = options
-  const { baseApi } = options
-  pageLoader = pageLoader || new BaseListPageLoader<T>()
-  pageLoader.options.baseApi = baseApi
-  autoLoad = autoLoad == null ? true : autoLoad
-  onMounted(() => {
-    if (autoLoad) {
-      pageLoader?.onSearch()
-    }
-  })
-  const { list: dataList, queryParam, loading, pagination } = toRefs(pageLoader.options)
-  return {
-    pageLoader,
-    queryParam,
-    dataList,
-    loading,
-    pagination
-  }
-}
diff --git a/diboot-admin-ui/src/hooks/list.ts b/diboot-admin-ui/src/hooks/list.ts
index 6b19acd7..37c17670 100644
--- a/diboot-admin-ui/src/hooks/list.ts
+++ b/diboot-admin-ui/src/hooks/list.ts
@@ -1,208 +1,242 @@
-import { ElButton } from 'element-plus'
+import { ElNotification } from 'element-plus'
+import { Ref } from 'vue'
 
-export interface ListOption<T> {
-  // 请求接口基础路径
+import { reactive } from 'vue'
+
+type HookOptions<T> = {
+  pageLoader?: BaseListPageLoader<T>
   baseApi: string
-  // 列表数据接口
   listApi?: string
-  // 自定义参数（不被查询表单重置和改变的参数）
-  initQueryParam?: QueryParam<T>
-  // 重建查询条件
-  rebuildQuery?: (query: QueryParam<T>) => QueryParam<T>
+  deleteApi?: string
+  exportApi?: string
+  autoLoad?: boolean
 }
 
-export type QueryParam<T> = Partial<T> & Record<string, unknown>
-
 export interface Pagination {
   pageSize: number
   current: number
   total: number
+  showSizeChanger: boolean
+  pageSizeOptions: string[]
 }
 
-export default <T>(option: ListOption<T> & DeleteOption) => {
+export interface ListOptions<T> {
+  baseUrl?: string
+  // 主键字段名
+  primaryKey?: string
+  // 请求接口基础路径
+  baseApi?: string
+  // 列表数据接口
+  listApi?: string
+  // 删除接口
+  deleteApiPrefix?: string
+  // 导出接口
+  exportApi?: string
+  // 自定义参数（不被查询表单重置和改变的参数）
+  customQueryParam?: { [key: string]: any }
+  // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
+  queryParam?: { [key: string]: any }
+  // 日期区间选择配置
+  dateRangeQuery?: any[]
+  // 高级搜索 展开/关闭
+  advanced?: boolean
+  // 列表数据
+  list?: T[]
+  // 是否将children转化为_children
+  childrenConvert: boolean
+  // 是否从mixin中自动获取初始的列表数据
+  getListFromMixin?: boolean
   // 标记加载状态
-  const loading = ref(false)
-
-  const dataList: Array<T> = reactive([])
-
-  const pagination: Partial<Pagination> = reactive({})
-
-  const queryParam: QueryParam<T> = reactive(_.cloneDeep(option.initQueryParam ?? {}))
-
-  const dateRangeQuery: Record<string, [string | number | Date, string | number | Date]> = reactive({})
+  loading?: boolean
+  // 标记导出
+  exportLoadingData?: boolean
+  // 是否允许撤回删除
+  allowCanceledDelete?: boolean
+  // 是否重新加载
+  reload?: boolean
+  // 当前激活value
+  currentPrimaryValue?: string | number
+  // 分页数据
+  pagination?: Pagination
+}
 
+export class BaseListPageLoader<T> {
+  public options: ListOptions<T> = reactive({
+    // 主键字段名
+    primaryKey: 'id',
+    // 请求接口基础路径
+    baseApi: '/',
+    // 列表数据接口
+    listApi: '',
+    // 删除接口
+    deleteApiPrefix: '',
+    // 导出接口
+    exportApi: '',
+    // 自定义参数（不被查询表单重置和改变的参数）
+    customQueryParam: {},
+    // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
+    queryParam: {},
+    // 日期区间选择配置
+    dateRangeQuery: [],
+    // 高级搜索 展开/关闭
+    advanced: false,
+    // 列表数据
+    list: [],
+    // 是否将children转化为_children
+    childrenConvert: true,
+    // 是否从mixin中自动获取初始的列表数据
+    getListFromMixin: true,
+    // 标记加载状态
+    loading: false,
+    // 标记导出
+    exportLoadingData: false,
+    // 是否允许撤回删除
+    allowCanceledDelete: false,
+    // 是否重新加载
+    reload: false,
+    // 当前激活value
+    currentPrimaryValue: '',
+    // 分页数据
+    pagination: {
+      pageSize: 10,
+      current: 1,
+      total: 0,
+      showSizeChanger: true,
+      pageSizeOptions: ['10', '20', '30', '50', '100']
+    }
+  })
   /**
-   * 构建查询参数
+   * 搜索，查询第一页
    */
-  const buildQueryParam = () => {
-    // 合并自定义查询
-    const tempQueryParam: QueryParam<unknown> = _.cloneDeep(queryParam)
-    // 合并分页参数
-    tempQueryParam.pageIndex = pagination.current
-    tempQueryParam.pageSize = pagination.pageSize
-    // 合并日期范围查询参数
-    for (const [key, value] of Object.entries(dateRangeQuery)) {
-      tempQueryParam[`${key}Begin`] = value[0]
-      tempQueryParam[`${key}End`] = value[1]
-    }
-    // TODO 日期格式化
-
-    // 改造查询条件（用于列表页扩展）
-    return option.rebuildQuery ? option.rebuildQuery(tempQueryParam) : tempQueryParam
+  public onSearch() {
+    if (this.options?.pagination) this.options.pagination.current = 1
+    this.getList()
+  }
+  public toggleLoading() {
+    if (this.options) this.options.loading = true
   }
-
   /**
-   * 获取数据列表
+   * get请求获取列表
+   * @returns {Promise<any>}
    */
-  const getList = _.debounce(() => {
-    loading.value = true
-    api
-      .get<Array<T>>(option.listApi ? option.listApi : `${option.baseApi}/list`, buildQueryParam())
-      .then(res => {
-        dataList.splice(0, dataList.length)
-        if (res.data) dataList.push(...(res.data ?? []))
-        pagination.pageSize = res.page?.pageSize
-        pagination.current = res.page?.pageIndex
-        pagination.total = res.page?.totalCount ? Number(res.page.totalCount) : 0
-      })
-      .catch(err => {
+  public async getList() {
+    try {
+      this.toggleLoading()
+      const res = await api.get<T[]>(
+        this.options?.listApi ? this.options?.listApi : `${this.options?.baseApi}/list`,
+        this.buildQueryParam()
+      )
+      if (res.code === 0) {
+        if (this.options) this.options.list = this.listFilter(res.data)
+        console.log('this.options.list', this.options.list)
+        if (res.page) {
+          if (this.options?.pagination) {
+            this.options.pagination.pageSize = res.page.pageSize
+            this.options.pagination.current = res.page.pageIndex
+            this.options.pagination.total = res.page.totalCount ? Number(res.page.totalCount) : 0
+          }
+        }
+      } else {
         ElNotification.error({
           title: '获取列表数据失败',
-          message: err.msg || err.message
+          message: res.msg
         })
+      }
+    } catch (e) {
+      ElNotification.error({
+        title: '获取列表数据失败',
+        message: e as string
       })
-      .finally(() => (loading.value = false))
-  }, 300)
-
+    } finally {
+      // this.toggleLoadingData()
+      console.log(this.options?.loading)
+    }
+  }
   /**
-   * 搜索，查询第一页
+   * 列表过滤器
+   * @param list
+   * @returns {*}
    */
-  const onSearch = () => {
-    pagination.current = 1
-    getList()
+  public listFilter(list: T[] | undefined) {
+    if (!list || list.length === 0) {
+      return []
+    }
+    return list
   }
-
   /**
-   * 重置筛选条件
+   * 构建查询参数
    */
-  const resetFilter = () => {
-    Object.keys(dateRangeQuery).forEach(key => delete dateRangeQuery[key])
-    Object.keys(queryParam).forEach(key => delete queryParam[key])
-    Object.assign(queryParam, _.cloneDeep(option.initQueryParam ?? {}))
-    onSearch()
-  }
-
-  // 删除
-  const del = useDelete({ deleteCallback: getList, ...option })
-
-  return {
-    queryParam,
-    dateRangeQuery,
-    onSearch,
-    resetFilter,
-    getList,
-    loading,
-    dataList,
-    pagination,
-    ...del
+  public buildQueryParam() {
+    this.dateRange2queryParam()
+    // 进行前置处理，获取查询条件初始值
+    let tempQueryParam = this.beforeBuildQueryParam()
+    // 合并自定义查询参数
+    _.merge(tempQueryParam, this.options?.customQueryParam)
+    // 合并搜索参数
+    _.merge(tempQueryParam, this.options?.queryParam)
+    // 进行后置处理，可用于改造查询条件（用于列表页扩展等场景）
+    tempQueryParam = this.afterBuildQueryParam(tempQueryParam)
+    return tempQueryParam
   }
-}
-
-// 删除数据
-export interface DeleteOption {
-  // 请求接口基础路径
-  baseApi: string
-  // 删除数据接口前缀
-  deleteApiPrefix?: string
-  // 是否允许撤回删除 (默认允许)
-  allowCanceledDelete?: boolean
-  // 删除回调
-  deleteCallback?: () => void
-}
-
-export const useDelete = (option: DeleteOption) => {
   /**
-   * 删除数据
-   *
-   * @param id
+   * 查询条件前置处理
    */
-  const remove = (id: string) => {
-    ElMessageBox.confirm('确认删除该数据吗？', '删除', { type: 'warning' })
-      .then(() => {
-        api
-          .delete(`${option.baseApi}${option.deleteApiPrefix ?? ''}/${id}`)
-          .then(() => removeSuccessHandler([id]))
-          .catch(err => {
-            ElMessage.error(err.msg || err.message || '删除失败')
-          })
-      })
-      .catch(() => null)
+  beforeBuildQueryParam(): object {
+    return {}
   }
-
   /**
-   * 批量删除数据
-   *
-   * @param ids
+   * 查询条件后置处理
    */
-  const batchRemove = (ids: Array<string>) => {
-    if (!(ids && ids.length)) {
-      ElMessage.warning('未选择数据')
-      return
-    }
-
-    ElMessageBox.confirm('确认删除已选数据吗？', '批量删除', { type: 'warning' })
-      .then(() => {
-        api
-          .post(`${option.baseApi}/batchDelete`, ids)
-          .then(() => removeSuccessHandler(ids))
-          .catch(err => {
-            ElMessage.error(err.msg || err.message || '删除失败')
-          })
-      })
-      .catch(() => null)
+  afterBuildQueryParam(queryParam: object): object {
+    return {}
+  }
+  clearQueryParam(): void {
+    this.options.queryParam = {}
+  }
+  public onReset(): void {
+    this.clearQueryParam()
+    this.getList()
   }
-
   /**
-   * 删除成功处理
-   *
-   * @param ids
+   * 构建区间查询参数
    */
-  const removeSuccessHandler = (ids: Array<string>) => {
-    if (option.deleteCallback) option.deleteCallback()
-
-    if (option.allowCanceledDelete === false) {
-      ElMessage.success('数据删除成功')
-      return
-    }
-
-    // 支持撤回的删除成功提示
-    const message = ElMessage.success({
-      type: 'success',
-      message: h('span', null, [
-        h('span', { style: { color: 'var(--el-color-success)' } }, '数据删除成功'),
-        h(
-          ElButton,
-          {
-            bg: true,
-            text: true,
-            type: 'primary',
-            style: { height: '25px', position: 'absolute', right: '13px' },
-            onClick: () => {
-              message.close()
-              api
-                .patch(`${option.baseApi}/cancelDeleted`, ids)
-                .then(() => {
-                  ElMessage.success('撤回成功')
-                  if (option.deleteCallback) option.deleteCallback()
-                })
-                .catch(() => ElMessage.error('撤回失败'))
-            }
-          },
-          { default: () => '撤回' }
-        )
-      ])
+  dateRange2queryParam() {
+    _.forEach(this.options?.dateRangeQuery || [], (v, k) => {
+      if (k && v && v.length === 2) {
+        if (this.options?.queryParam) {
+          this.options.queryParam[`${k}Begin`] = v[0]
+          this.options.queryParam[`${k}End`] = v[1]
+        }
+      }
     })
   }
+}
 
-  return { remove, batchRemove }
+type Results<T> = {
+  pageLoader: BaseListPageLoader<T>
+  queryParam: Ref<{ [p: string]: any } | undefined> | undefined
+  dataList: Ref<T[] | undefined> | undefined
+  loading: Ref<boolean | undefined> | undefined
+  pagination: Ref<Pagination | undefined> | undefined
+}
+
+export default function <T>(options: HookOptions<T>) {
+  let { pageLoader, autoLoad } = options
+  const { baseApi } = options
+  pageLoader = pageLoader || new BaseListPageLoader<T>()
+  pageLoader.options.baseApi = baseApi
+  autoLoad = autoLoad == null ? true : autoLoad
+  onMounted(() => {
+    if (autoLoad) {
+      pageLoader?.onSearch()
+    }
+  })
+  const { list: dataList, queryParam, loading, pagination } = toRefs(pageLoader.options)
+  return {
+    pageLoader,
+    queryParam,
+    dataList,
+    loading,
+    pagination
+  }
 }
diff --git a/diboot-admin-ui/src/hooks/list_default.ts b/diboot-admin-ui/src/hooks/list_default.ts
new file mode 100644
index 00000000..6b19acd7
--- /dev/null
+++ b/diboot-admin-ui/src/hooks/list_default.ts
@@ -0,0 +1,208 @@
+import { ElButton } from 'element-plus'
+
+export interface ListOption<T> {
+  // 请求接口基础路径
+  baseApi: string
+  // 列表数据接口
+  listApi?: string
+  // 自定义参数（不被查询表单重置和改变的参数）
+  initQueryParam?: QueryParam<T>
+  // 重建查询条件
+  rebuildQuery?: (query: QueryParam<T>) => QueryParam<T>
+}
+
+export type QueryParam<T> = Partial<T> & Record<string, unknown>
+
+export interface Pagination {
+  pageSize: number
+  current: number
+  total: number
+}
+
+export default <T>(option: ListOption<T> & DeleteOption) => {
+  // 标记加载状态
+  const loading = ref(false)
+
+  const dataList: Array<T> = reactive([])
+
+  const pagination: Partial<Pagination> = reactive({})
+
+  const queryParam: QueryParam<T> = reactive(_.cloneDeep(option.initQueryParam ?? {}))
+
+  const dateRangeQuery: Record<string, [string | number | Date, string | number | Date]> = reactive({})
+
+  /**
+   * 构建查询参数
+   */
+  const buildQueryParam = () => {
+    // 合并自定义查询
+    const tempQueryParam: QueryParam<unknown> = _.cloneDeep(queryParam)
+    // 合并分页参数
+    tempQueryParam.pageIndex = pagination.current
+    tempQueryParam.pageSize = pagination.pageSize
+    // 合并日期范围查询参数
+    for (const [key, value] of Object.entries(dateRangeQuery)) {
+      tempQueryParam[`${key}Begin`] = value[0]
+      tempQueryParam[`${key}End`] = value[1]
+    }
+    // TODO 日期格式化
+
+    // 改造查询条件（用于列表页扩展）
+    return option.rebuildQuery ? option.rebuildQuery(tempQueryParam) : tempQueryParam
+  }
+
+  /**
+   * 获取数据列表
+   */
+  const getList = _.debounce(() => {
+    loading.value = true
+    api
+      .get<Array<T>>(option.listApi ? option.listApi : `${option.baseApi}/list`, buildQueryParam())
+      .then(res => {
+        dataList.splice(0, dataList.length)
+        if (res.data) dataList.push(...(res.data ?? []))
+        pagination.pageSize = res.page?.pageSize
+        pagination.current = res.page?.pageIndex
+        pagination.total = res.page?.totalCount ? Number(res.page.totalCount) : 0
+      })
+      .catch(err => {
+        ElNotification.error({
+          title: '获取列表数据失败',
+          message: err.msg || err.message
+        })
+      })
+      .finally(() => (loading.value = false))
+  }, 300)
+
+  /**
+   * 搜索，查询第一页
+   */
+  const onSearch = () => {
+    pagination.current = 1
+    getList()
+  }
+
+  /**
+   * 重置筛选条件
+   */
+  const resetFilter = () => {
+    Object.keys(dateRangeQuery).forEach(key => delete dateRangeQuery[key])
+    Object.keys(queryParam).forEach(key => delete queryParam[key])
+    Object.assign(queryParam, _.cloneDeep(option.initQueryParam ?? {}))
+    onSearch()
+  }
+
+  // 删除
+  const del = useDelete({ deleteCallback: getList, ...option })
+
+  return {
+    queryParam,
+    dateRangeQuery,
+    onSearch,
+    resetFilter,
+    getList,
+    loading,
+    dataList,
+    pagination,
+    ...del
+  }
+}
+
+// 删除数据
+export interface DeleteOption {
+  // 请求接口基础路径
+  baseApi: string
+  // 删除数据接口前缀
+  deleteApiPrefix?: string
+  // 是否允许撤回删除 (默认允许)
+  allowCanceledDelete?: boolean
+  // 删除回调
+  deleteCallback?: () => void
+}
+
+export const useDelete = (option: DeleteOption) => {
+  /**
+   * 删除数据
+   *
+   * @param id
+   */
+  const remove = (id: string) => {
+    ElMessageBox.confirm('确认删除该数据吗？', '删除', { type: 'warning' })
+      .then(() => {
+        api
+          .delete(`${option.baseApi}${option.deleteApiPrefix ?? ''}/${id}`)
+          .then(() => removeSuccessHandler([id]))
+          .catch(err => {
+            ElMessage.error(err.msg || err.message || '删除失败')
+          })
+      })
+      .catch(() => null)
+  }
+
+  /**
+   * 批量删除数据
+   *
+   * @param ids
+   */
+  const batchRemove = (ids: Array<string>) => {
+    if (!(ids && ids.length)) {
+      ElMessage.warning('未选择数据')
+      return
+    }
+
+    ElMessageBox.confirm('确认删除已选数据吗？', '批量删除', { type: 'warning' })
+      .then(() => {
+        api
+          .post(`${option.baseApi}/batchDelete`, ids)
+          .then(() => removeSuccessHandler(ids))
+          .catch(err => {
+            ElMessage.error(err.msg || err.message || '删除失败')
+          })
+      })
+      .catch(() => null)
+  }
+
+  /**
+   * 删除成功处理
+   *
+   * @param ids
+   */
+  const removeSuccessHandler = (ids: Array<string>) => {
+    if (option.deleteCallback) option.deleteCallback()
+
+    if (option.allowCanceledDelete === false) {
+      ElMessage.success('数据删除成功')
+      return
+    }
+
+    // 支持撤回的删除成功提示
+    const message = ElMessage.success({
+      type: 'success',
+      message: h('span', null, [
+        h('span', { style: { color: 'var(--el-color-success)' } }, '数据删除成功'),
+        h(
+          ElButton,
+          {
+            bg: true,
+            text: true,
+            type: 'primary',
+            style: { height: '25px', position: 'absolute', right: '13px' },
+            onClick: () => {
+              message.close()
+              api
+                .patch(`${option.baseApi}/cancelDeleted`, ids)
+                .then(() => {
+                  ElMessage.success('撤回成功')
+                  if (option.deleteCallback) option.deleteCallback()
+                })
+                .catch(() => ElMessage.error('撤回失败'))
+            }
+          },
+          { default: () => '撤回' }
+        )
+      ])
+    })
+  }
+
+  return { remove, batchRemove }
+}
diff --git a/diboot-admin-ui/src/views/system/dictionary/list.vue b/diboot-admin-ui/src/views/system/dictionary/list.vue
index 99b97d3a..8519bcf0 100644
--- a/diboot-admin-ui/src/views/system/dictionary/list.vue
+++ b/diboot-admin-ui/src/views/system/dictionary/list.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts" name="DictionaryList">
-import { BaseModel } from '@/components/hooks/list'
-import useList from '@/components/hooks/list'
-
-interface Dictionary extends BaseModel {
+interface Dictionary {
+  id: string
   type: string
   itemName: string
   itemValue: string
diff --git a/diboot-admin-ui/src/views/system/role/list.vue b/diboot-admin-ui/src/views/system/role/list.vue
index 971a735e..68c776a7 100644
--- a/diboot-admin-ui/src/views/system/role/list.vue
+++ b/diboot-admin-ui/src/views/system/role/list.vue
@@ -23,7 +23,7 @@ const {
   pagination,
   remove,
   batchRemove
-} = useList<Role>({ baseApi: '/role' })
+} = useListDefault<Role>({ baseApi: '/role' })
 
 getList()
 
diff --git a/diboot-admin-ui/types/auto-imports.d.ts b/diboot-admin-ui/types/auto-imports.d.ts
index a69dfe1e..bfa66764 100644
--- a/diboot-admin-ui/types/auto-imports.d.ts
+++ b/diboot-admin-ui/types/auto-imports.d.ts
@@ -64,6 +64,7 @@ declare global {
   const useCssModule: typeof import('vue')['useCssModule']
   const useCssVars: typeof import('vue')['useCssVars']
   const useList: typeof import('@/hooks/list')['default']
+  const useListDefault: typeof import('@/hooks/list_default')['default']
   const useRoute: typeof import('vue-router')['useRoute']
   const useRouter: typeof import('vue-router')['useRouter']
   const useSlots: typeof import('vue')['useSlots']
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 74a7a1ae..7b09f592 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -5,19 +5,13 @@ import '@vue/runtime-core'
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCol: typeof import('element-plus/es')['ElCol']
-    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -29,14 +23,9 @@ declare module '@vue/runtime-core' {
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-    ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
@@ -45,7 +34,6 @@ declare module '@vue/runtime-core' {
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     Icon: typeof import('@/components/icon/index.vue')['default']
     IconSelect: typeof import('@/components/icon/select.vue')['default']
-    Loading: typeof import('element-plus/es')['ElLoadingDirective']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index b500360e..1777f837 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -27,7 +27,8 @@ export default defineConfig(({ command }) => {
           { lodash: [['*', '_']] },
           { 'element-plus': ['ElMessage', 'ElMessageBox', 'ElNotification'] },
           { '@/utils/request': ['api', 'baseURL'] },
-          { '@/hooks/list': [['default', 'useList']] }
+          { '@/hooks/list': [['default', 'useList']] },
+          { '@/hooks/list_default': [['default', 'useListDefault']] }
         ],
         // 为true时在项目根目录自动创建
         dts: 'types/auto-imports.d.ts',
-- 
Gitee


From 14352120de0f0d5a5a9642724e42bfb48886bfed Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 13:50:08 +0800
Subject: [PATCH 126/195] * fix(permission) `all` misjudgment

---
 diboot-admin-ui/src/utils/permission.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/diboot-admin-ui/src/utils/permission.ts b/diboot-admin-ui/src/utils/permission.ts
index aa232c39..25835706 100644
--- a/diboot-admin-ui/src/utils/permission.ts
+++ b/diboot-admin-ui/src/utils/permission.ts
@@ -11,10 +11,10 @@ import router from '@/router'
  */
 export function checkRole(value: string | Array<string>, not = false, all = false) {
   if (value && value.length) {
-    const roles = useAuthStore().roles
+    const roles = useAuthStore().roles ?? []
     const permissionRoles = value instanceof Array ? value : [value]
-    const findFn = (role: string) => permissionRoles.includes(role)
-    const exist = all ? roles.every(findFn) : roles?.some(findFn)
+    const findFn = (role: string) => roles.includes(role)
+    const exist = all ? permissionRoles.every(findFn) : permissionRoles.some(findFn)
     return not ? !exist : exist
   } else {
     console.error(`need roles!`)
@@ -34,8 +34,8 @@ export function checkPermission(value: string | Array<string>, not = false, all
   if (value && value.length) {
     const permissions = router.currentRoute.value.meta?.permissions ?? []
     const permissionList = value instanceof Array ? value : [value]
-    const findFn = (permission: string) => permissionList.includes(permission)
-    const exist = all ? permissions.every(findFn) : permissions.some(findFn)
+    const findFn = (permission: string) => permissions.includes(permission)
+    const exist = all ? permissionList.every(findFn) : permissionList.some(findFn)
     return not ? !exist : exist
   } else {
     console.error(`need permissions!`)
-- 
Gitee


From e5a9780b9c72e7af71b3743c983a902943ec636d Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 14:50:29 +0800
Subject: [PATCH 127/195] + add(setting) one click copy

---
 diboot-admin-ui/package.json                 |  1 +
 diboot-admin-ui/pnpm-lock.yaml               | 46 +++++++++++
 diboot-admin-ui/src/layout/setting/index.vue | 83 +++++++++++++-------
 3 files changed, 102 insertions(+), 28 deletions(-)

diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index accf0e71..d2f3f02d 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -21,6 +21,7 @@
     "pinia-plugin-persist": "^1.0.0",
     "qs": "^6.10.3",
     "vue": "^3.2.25",
+    "vue-clipboard3": "^2.0.0",
     "vue-fuse": "^4.1.1",
     "vue-router": "^4.0.14",
     "vuedraggable": "^4.1.0"
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 80a1cd49..b1e8bd66 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -36,6 +36,7 @@ specifiers:
   vite-plugin-mock: ^2.9.6
   vite-plugin-vue-setup-extend: ^0.4.0
   vue: ^3.2.25
+  vue-clipboard3: ^2.0.0
   vue-fuse: ^4.1.1
   vue-router: ^4.0.14
   vue-tsc: ^0.29.8
@@ -54,6 +55,7 @@ dependencies:
   pinia-plugin-persist: registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.13+vue@3.2.33
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
+  vue-clipboard3: registry.npmmirror.com/vue-clipboard3/2.0.0
   vue-fuse: registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.1+vue@3.2.33
   vue-router: registry.npmmirror.com/vue-router/4.0.15_vue@3.2.33
   vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.33
@@ -1212,6 +1214,16 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  registry.npmmirror.com/clipboard/2.0.11:
+    resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz}
+    name: clipboard
+    version: 2.0.11
+    dependencies:
+      good-listener: registry.npmmirror.com/good-listener/1.2.2
+      select: registry.npmmirror.com/select/1.1.2
+      tiny-emitter: registry.npmmirror.com/tiny-emitter/2.1.0
+    dev: false
+
   registry.npmmirror.com/cliui/7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz}
     name: cliui
@@ -1410,6 +1422,12 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
+  registry.npmmirror.com/delegate/3.2.0:
+    resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz}
+    name: delegate
+    version: 3.2.0
+    dev: false
+
   registry.npmmirror.com/delegates/1.0.0:
     resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz}
     name: delegates
@@ -2419,6 +2437,14 @@ packages:
       minimatch: registry.npmmirror.com/minimatch/3.0.8
     dev: true
 
+  registry.npmmirror.com/good-listener/1.2.2:
+    resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz}
+    name: good-listener
+    version: 1.2.2
+    dependencies:
+      delegate: registry.npmmirror.com/delegate/3.2.0
+    dev: false
+
   registry.npmmirror.com/graceful-fs/4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
@@ -4042,6 +4068,12 @@ packages:
       source-map: registry.npmmirror.com/source-map/0.7.3
     dev: true
 
+  registry.npmmirror.com/select/1.1.2:
+    resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/select/-/select-1.1.2.tgz}
+    name: select
+    version: 1.1.2
+    dev: false
+
   registry.npmmirror.com/semver/5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz}
     name: semver
@@ -4333,6 +4365,12 @@ packages:
     version: 0.2.0
     dev: true
 
+  registry.npmmirror.com/tiny-emitter/2.1.0:
+    resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz}
+    name: tiny-emitter
+    version: 2.1.0
+    dev: false
+
   registry.npmmirror.com/to-fast-properties/2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz}
     name: to-fast-properties
@@ -4868,6 +4906,14 @@ packages:
       vscode-typescript-languageservice: registry.npmmirror.com/vscode-typescript-languageservice/0.29.8
     dev: true
 
+  registry.npmmirror.com/vue-clipboard3/2.0.0:
+    resolution: {integrity: sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz}
+    name: vue-clipboard3
+    version: 2.0.0
+    dependencies:
+      clipboard: registry.npmmirror.com/clipboard/2.0.11
+    dev: false
+
   registry.npmmirror.com/vue-demi/0.11.4_vue@3.2.33:
     resolution: {integrity: sha512-/3xFwzSykLW2HiiLie43a+FFgNOcokbBJ+fzvFXd0r2T8MYohqvphUyDQ8lbAwzQ3Dlcrb1c9ykifGkhSIAk6A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-demi/-/vue-demi-0.11.4.tgz}
     id: registry.npmmirror.com/vue-demi/0.11.4
diff --git a/diboot-admin-ui/src/layout/setting/index.vue b/diboot-admin-ui/src/layout/setting/index.vue
index 17ba3027..9e0b6793 100644
--- a/diboot-admin-ui/src/layout/setting/index.vue
+++ b/diboot-admin-ui/src/layout/setting/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { Opportunity } from '@element-plus/icons-vue'
+import { Opportunity, RefreshLeft, CopyDocument } from '@element-plus/icons-vue'
+import useClipboard from 'vue-clipboard3'
 import useAppStore from '@/store/app'
 import { colorPrimary } from '@/utils/theme'
 
@@ -12,6 +13,25 @@ watch(
   () => appStore.colorPrimary,
   value => (colorPrimary.value = value ? value : '#409eff')
 )
+
+const clipboard = useClipboard()
+
+const copyConfig = () => {
+  let configJsonStr = JSON.stringify(
+    appStore,
+    ['layout', 'globalSize', 'enableTabs', 'enableFooter', 'colorPrimary'],
+    2
+  )
+    .replace(/"/g, "'")
+    .replace(/'(.+)': /g, '$1: ')
+  if (appStore.colorPrimary === undefined) {
+    configJsonStr = configJsonStr.replace(/\n}/m, ',\n  colorPrimary: undefined\n}')
+  }
+  clipboard
+    .toClipboard(configJsonStr)
+    .then(() => ElMessage.success('复制成功'))
+    .catch(() => ElMessage.error('写入剪切板失败，请手动配置'))
+}
 </script>
 
 <template>
@@ -22,33 +42,40 @@ watch(
   </div>
   <div class="setting">
     <el-drawer v-model="openSetting" title="布局实时演示" :size="360">
-      <el-alert
-        title="以下配置可实时预览"
-        description="开发者可在 `src/store/app.ts` 中修改默认值。"
-        type="warning"
-        :closable="false"
-      />
-      <el-divider />
-      <el-form :model="appStore">
-        <el-form-item label="开启 Tabs">
-          <el-select v-model="appStore.layout">
-            <el-option label="分栏" value="default" />
-            <el-option label="通栏" value="dock" />
-            <el-option label="经典" value="menu" />
-            <el-option label="顶导航" value="topNav" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开启 Tabs">
-          <el-switch v-model="appStore.enableTabs" />
-        </el-form-item>
-        <el-form-item label="开启 Footer">
-          <el-switch v-model="appStore.enableFooter" />
-        </el-form-item>
-        <el-form-item label="主题色">
-          <el-color-picker v-model="colorPrimary" @update:model-value="value => (appStore.colorPrimary = value)" />
-        </el-form-item>
-      </el-form>
-      <el-button style="width: 100%" @click="appStore.$reset()">重置</el-button>
+      <el-scrollbar max-height="100%">
+        <el-alert
+          title="以下配置可实时预览"
+          description="开发者可在 `src/store/app.ts` 中修改默认值。"
+          type="warning"
+          :closable="false"
+        />
+        <el-divider />
+        <el-form :model="appStore">
+          <el-form-item label="开启 Tabs">
+            <el-select v-model="appStore.layout">
+              <el-option label="分栏" value="default" />
+              <el-option label="通栏" value="dock" />
+              <el-option label="经典" value="menu" />
+              <el-option label="顶导航" value="topNav" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="开启 Tabs">
+            <el-switch v-model="appStore.enableTabs" />
+          </el-form-item>
+          <el-form-item label="开启 Footer">
+            <el-switch v-model="appStore.enableFooter" />
+          </el-form-item>
+          <el-form-item label="主题色">
+            <el-color-picker v-model="colorPrimary" @update:model-value="value => (appStore.colorPrimary = value)" />
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+      <template #footer>
+        <el-space direction="vertical" style="align-items: stretch; width: 100%; margin-bottom: -10px">
+          <el-button type="primary" :icon="CopyDocument" @click="copyConfig"> 一键复制配置 </el-button>
+          <el-button text bg :icon="RefreshLeft" @click="appStore.$reset()"> 一键恢复默认 </el-button>
+        </el-space>
+      </template>
     </el-drawer>
   </div>
 </template>
-- 
Gitee


From ccb338771f38bd9db6e4ca3d90d8dd4fe6651ea1 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 16:29:17 +0800
Subject: [PATCH 128/195] * fix refresh route auto jump

---
 diboot-admin-ui/src/layout/index.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index d5c84591..dbfa5f6a 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -23,20 +23,10 @@ const openOneLevel = (menu: RouteRecordRaw) => {
   oneLevel.value = menu
   if (router.currentRoute.value.name !== menu.name) router.push({ name: menu.name })
 }
-openOneLevel(menuTree[0])
+oneLevel.value = router.currentRoute.value.matched.find(item => menuTree.find(e => e === item))
 
 const isMenuCollapse = ref(false)
 
-watch(
-  () => router.currentRoute.value,
-  value => {
-    // 存在redirect，且存在title（（上级菜单menu中显示的情况））
-    // 或
-    // 路径匹配（上级菜单menu中不显示的情况）
-    oneLevel.value = value.matched.find(item => (item.redirect && item.meta.title) || item.path === value.path)
-  }
-)
-
 // 动态引入配置组件（生产环境舍弃）
 const AppSetting = defineAsyncComponent({
   loader: () => (import.meta.env.DEV ? import('./setting/index.vue') : Promise.reject()),
-- 
Gitee


From 5b7c6af72ab99b57930450556f3ee2e97cd2866f Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 16:35:20 +0800
Subject: [PATCH 129/195] * fix(404) repeat jump

---
 diboot-admin-ui/src/views/exception/404.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/diboot-admin-ui/src/views/exception/404.vue b/diboot-admin-ui/src/views/exception/404.vue
index 5d0fd8f6..33990bf2 100644
--- a/diboot-admin-ui/src/views/exception/404.vue
+++ b/diboot-admin-ui/src/views/exception/404.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts" name="404">
+import { onBeforeRouteLeave } from 'vue-router'
+
 const router = useRouter()
 // 返回首页
 const goHome = () => {
@@ -20,6 +22,9 @@ function resetTimer() {
 }
 
 resetTimer()
+
+// 离开时销毁计时器
+onBeforeRouteLeave(() => clearTimeout(timer))
 </script>
 
 <template>
-- 
Gitee


From cb37078c1e288d8b0130b249fbf08b18e6ff3b59 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 18:39:31 +0800
Subject: [PATCH 130/195] =?UTF-8?q?+=20(admin-ui)=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/src/layout/header/index.vue |  9 +--
 diboot-admin-ui/src/layout/index.vue        | 67 +++++++++++++++++++--
 diboot-admin-ui/src/layout/memu/index.vue   |  7 ++-
 3 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/diboot-admin-ui/src/layout/header/index.vue b/diboot-admin-ui/src/layout/header/index.vue
index c4ddb9d0..385a46bc 100644
--- a/diboot-admin-ui/src/layout/header/index.vue
+++ b/diboot-admin-ui/src/layout/header/index.vue
@@ -6,8 +6,11 @@ import useAuthStore from '@/store/auth'
 import Logo from '@/assets/logo.png'
 import useAppStore from '@/store/app'
 
-const authStore = useAuthStore()
+withDefaults(defineProps<{ showLogo?: boolean }>(), { showLogo: true })
+
 const router = useRouter()
+const appStore = useAppStore()
+const authStore = useAuthStore()
 
 const logout = async () => {
   await authStore.logout()
@@ -16,13 +19,11 @@ const logout = async () => {
 const goPersonal = () => {
   router.push({ name: 'Personal' }).finally()
 }
-
-const appStore = useAppStore()
 </script>
 
 <template>
   <div style="height: 100%; display: flex; align-items: center">
-    <img v-if="appStore.layout !== 'default'" :src="Logo" alt="Logo" style="height: 39px" />
+    <img v-if="showLogo" :src="Logo" alt="Logo" style="height: 39px" />
     <div :style="$slots.dock ? { width: '50vw' } : {}" style="margin-left: 20px">
       <slot name="dock" />
     </div>
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index dbfa5f6a..2aaf36b2 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -5,7 +5,7 @@ import AppMain from './main/index.vue'
 import AppFooter from './footer/index.vue'
 import AppTabs from './tabs/index.vue'
 
-import { Eleme } from '@element-plus/icons-vue'
+import { Eleme, Menu } from '@element-plus/icons-vue'
 
 import Logo from '@/assets/logo.png'
 
@@ -32,10 +32,45 @@ const AppSetting = defineAsyncComponent({
   loader: () => (import.meta.env.DEV ? import('./setting/index.vue') : Promise.reject()),
   onError: () => null
 })
+
+const isMobile = ref(document.body.clientWidth < 992)
+window.addEventListener('resize', () => (isMobile.value = document.body.clientWidth < 992))
+
+const showMenu = ref(false)
+watch(router.currentRoute, () => (showMenu.value = false))
 </script>
 
 <template>
-  <el-container v-if="appStore.layout === 'default'">
+  <el-container v-if="isMobile">
+    <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
+      <app-header />
+    </el-header>
+    <app-tabs>
+      <template #default="{ fullScreen }">
+        <app-main :full-screen="fullScreen">
+          <template #footer>
+            <app-footer />
+          </template>
+        </app-main>
+      </template>
+    </app-tabs>
+
+    <div class="mobile-menu-button" @click="showMenu = true">
+      <el-icon :size="30" color="var(--el-color-white)">
+        <Menu />
+      </el-icon>
+      <el-drawer v-model="showMenu" direction="ltr" :with-header="false">
+        <template #title>
+          <div />
+        </template>
+        <el-scrollbar>
+          <app-menu :menu-tree="menuTree" height="100vh" />
+        </el-scrollbar>
+      </el-drawer>
+    </div>
+  </el-container>
+
+  <el-container v-else-if="appStore.layout === 'default'">
     <el-container>
       <el-aside :width="oneLevel?.children?.length ? (isMenuCollapse ? '135px' : '260px') : '71px'">
         <div class="subfield">
@@ -70,7 +105,7 @@ const AppSetting = defineAsyncComponent({
       <el-container>
         <el-main style="padding: 0">
           <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
-            <app-header />
+            <app-header :show-logo="false" />
           </el-header>
           <app-tabs>
             <template #default="{ fullScreen }">
@@ -86,7 +121,7 @@ const AppSetting = defineAsyncComponent({
     </el-container>
   </el-container>
 
-  <el-container v-if="appStore.layout === 'dock'">
+  <el-container v-else-if="appStore.layout === 'dock'">
     <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
       <app-header>
         <template #dock>
@@ -121,7 +156,7 @@ const AppSetting = defineAsyncComponent({
     </el-container>
   </el-container>
 
-  <el-container v-if="appStore.layout === 'topNav'">
+  <el-container v-else-if="appStore.layout === 'topNav'">
     <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
       <app-header>
         <template #topNav>
@@ -144,7 +179,7 @@ const AppSetting = defineAsyncComponent({
     </el-container>
   </el-container>
 
-  <el-container v-if="appStore.layout === 'menu'">
+  <el-container v-else-if="appStore.layout === 'menu'">
     <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
       <app-header />
     </el-header>
@@ -226,6 +261,26 @@ const AppSetting = defineAsyncComponent({
   }
 }
 
+.mobile-menu-button {
+  position: fixed;
+  bottom: 20px;
+  left: 20px;
+  z-index: 10;
+  width: 50px;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: var(--el-color-primary);
+  box-shadow: 0 2px 12px 0 var(--el-color-primary);
+  border-radius: 50%;
+  cursor: pointer;
+
+  :deep(.el-drawer__body) {
+    padding: 0;
+  }
+}
+
 .default-menu {
   border: none;
 
diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index e2ea655b..7278a06a 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -5,7 +5,7 @@ import { RouteRecordRaw } from 'vue-router'
 import { Fold, Expand } from '@element-plus/icons-vue'
 
 const props = withDefaults(
-  defineProps<{ menuTree: RouteRecordRaw[]; collapse?: boolean; mode?: 'horizontal' | 'vertical' }>(),
+  defineProps<{ menuTree: RouteRecordRaw[]; collapse?: boolean; mode?: 'horizontal' | 'vertical'; height?: string }>(),
   { menuTree: () => [], mode: 'vertical' }
 )
 
@@ -18,6 +18,11 @@ const toggleState = () => emits('update:collapse', !props.collapse)
   <el-menu v-if="mode === 'horizontal'" router :default-active="$route.path" mode="horizontal">
     <sub-menu :menu-tree="menuTree" />
   </el-menu>
+  <el-scrollbar v-else-if="height" :height="height">
+    <el-menu router :default-active="$route.path" :style="{ minHeight: height }">
+      <sub-menu :menu-tree="menuTree" />
+    </el-menu>
+  </el-scrollbar>
   <div v-else>
     <span v-show="!collapse">
       <slot name="title" />
-- 
Gitee


From 271a45570fad83857bff112f4c80024f661370f7 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Mon, 16 May 2022 18:59:22 +0800
Subject: [PATCH 131/195] =?UTF-8?q?+=20(admin-ui)=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/mock/auth/index.ts          |  8 ++++++--
 diboot-admin-ui/src/layout/index.vue        | 10 +++++-----
 diboot-admin-ui/src/layout/memu/subMenu.vue |  9 ++++-----
 diboot-admin-ui/src/router/index.ts         |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index 0bfbed8e..d9fe29fc 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -1,6 +1,7 @@
 import { MockMethod } from 'vite-plugin-mock'
 import JsonResult from '../_util'
 import { Random } from 'mockjs'
+import * as Element from '@element-plus/icons-vue'
 
 const baseUrl = '/api/auth'
 
@@ -76,13 +77,15 @@ export default [
 
 // 随机按钮权限
 const permission = '@pick(["detail", "create", "update", "delete", "import", "export"])'
+// 随机图标
+const icon = `Element:@pick(${Object.keys(Element)})`
 
 // 授权菜单
 const authMenu = [
   {
     path: '/demo',
     name: 'Demo',
-    meta: { title: 'Demo', componentName: 'Layout' },
+    meta: { title: 'Demo', icon, componentName: 'Layout' },
     'children|20': [
       {
         path: `hello@string('number', 5)`,
@@ -90,6 +93,7 @@ const authMenu = [
         meta: {
           title: 'Hello-@increment',
           componentName: 'Dashboard',
+          icon,
           sort: '@natural',
           keepAlive: false,
           hollow: '@boolean',
@@ -103,7 +107,7 @@ const authMenu = [
     path: '/system',
     name: 'System',
     redirect: '/system/iamResourcePermission',
-    meta: { title: '系统管理', componentName: 'Layout' },
+    meta: { title: '系统管理', icon: 'Element:SetUp', componentName: 'Layout' },
     children: [
       {
         path: 'iamResourcePermission',
diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index 2aaf36b2..f2ba4685 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -5,7 +5,7 @@ import AppMain from './main/index.vue'
 import AppFooter from './footer/index.vue'
 import AppTabs from './tabs/index.vue'
 
-import { Eleme, Menu } from '@element-plus/icons-vue'
+import { Menu } from '@element-plus/icons-vue'
 
 import Logo from '@/assets/logo.png'
 
@@ -86,8 +86,8 @@ watch(router.currentRoute, () => (showMenu.value = false))
                 :index="item.path"
                 @click="openOneLevel(item)"
               >
-                <el-icon :size="30">
-                  <eleme />
+                <el-icon v-if="item.meta?.icon" :size="30">
+                  <icon :name="item.meta?.icon" />
                 </el-icon>
                 <span class="title">{{ item.meta?.title }}</span>
               </el-menu-item>
@@ -127,8 +127,8 @@ watch(router.currentRoute, () => (showMenu.value = false))
         <template #dock>
           <el-menu style="height: 50px" mode="horizontal" :default-active="oneLevel?.path">
             <el-menu-item v-for="item in menuTree" :key="item.name" :index="item.path" @click="openOneLevel(item)">
-              <el-icon :size="22">
-                <eleme />
+              <el-icon v-if="item.meta?.icon" :size="22">
+                <icon :name="item.meta?.icon" />
               </el-icon>
               <span>{{ item.meta?.title }}</span>
             </el-menu-item>
diff --git a/diboot-admin-ui/src/layout/memu/subMenu.vue b/diboot-admin-ui/src/layout/memu/subMenu.vue
index acb6aa91..c5071873 100644
--- a/diboot-admin-ui/src/layout/memu/subMenu.vue
+++ b/diboot-admin-ui/src/layout/memu/subMenu.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { RouteRecordRaw } from 'vue-router'
-import { Eleme } from '@element-plus/icons-vue'
 
 defineProps<{ menuTree: RouteRecordRaw[] }>()
 </script>
@@ -9,16 +8,16 @@ defineProps<{ menuTree: RouteRecordRaw[] }>()
   <template v-for="(item, index) in menuTree" :key="index">
     <el-sub-menu v-if="item.children?.length" :index="item.path">
       <template #title>
-        <el-icon :size="22">
-          <eleme />
+        <el-icon v-if="item.meta?.icon" :size="22">
+          <icon :name="item.meta?.icon" />
         </el-icon>
         <span>{{ item.meta?.title }}</span>
       </template>
       <sub-menu :menu-tree="item.children" />
     </el-sub-menu>
     <el-menu-item v-else :index="item.path">
-      <el-icon :size="22">
-        <eleme />
+      <el-icon v-if="item.meta?.icon" :size="22">
+        <icon :name="item.meta?.icon" />
       </el-icon>
       <span>{{ item.meta?.title }}</span>
     </el-menu-item>
diff --git a/diboot-admin-ui/src/router/index.ts b/diboot-admin-ui/src/router/index.ts
index 23bacbbf..05e32400 100644
--- a/diboot-admin-ui/src/router/index.ts
+++ b/diboot-admin-ui/src/router/index.ts
@@ -61,7 +61,7 @@ export const constantRoutes: RouteRecordRaw[] = [
         path: 'dashboard',
         name: 'Dashboard',
         component: () => import('@/views/dashboard/index.vue'),
-        meta: { title: '仪表盘', affixTab: true, sort: -1 }
+        meta: { title: '仪表盘', icon: 'Element:Odometer', affixTab: true, sort: -1 }
       }
     ]
   }
-- 
Gitee


From b95d2d7405dd85e37c2b0209e4dc7e6ebd227562 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 17 May 2022 15:50:54 +0800
Subject: [PATCH 132/195] =?UTF-8?q?*=20(admin-ui)=20=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/src/layout/index.vue      | 48 ++++++++++++++++++-----
 diboot-admin-ui/src/layout/memu/index.vue |  2 +-
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/diboot-admin-ui/src/layout/index.vue b/diboot-admin-ui/src/layout/index.vue
index f2ba4685..95b96acf 100644
--- a/diboot-admin-ui/src/layout/index.vue
+++ b/diboot-admin-ui/src/layout/index.vue
@@ -5,13 +5,14 @@ import AppMain from './main/index.vue'
 import AppFooter from './footer/index.vue'
 import AppTabs from './tabs/index.vue'
 
+import { Directive } from 'vue'
+import { RouteRecordRaw } from 'vue-router'
 import { Menu } from '@element-plus/icons-vue'
 
 import Logo from '@/assets/logo.png'
 
 import useAppStore from '@/store/app'
 import { getMenuTree } from '@/utils/route'
-import { RouteRecordRaw } from 'vue-router'
 
 const appStore = useAppStore()
 
@@ -33,15 +34,49 @@ const AppSetting = defineAsyncComponent({
   onError: () => null
 })
 
+// 移动端布局
 const isMobile = ref(document.body.clientWidth < 992)
 window.addEventListener('resize', () => (isMobile.value = document.body.clientWidth < 992))
 
 const showMenu = ref(false)
 watch(router.currentRoute, () => (showMenu.value = false))
+
+// 拖拽指令
+const vDrag: Directive<HTMLElement> = {
+  created(el) {
+    el.onmousedown = event => {
+      document.onselectstart = () => false
+      let isClick = true
+      //鼠标按下，计算当前元素距离可视区的距离
+      const elX = event.clientX - el.offsetLeft
+      const elY = event.clientY - el.offsetTop
+      document.onmousemove = e => {
+        //通过事件委托，计算移动的距离
+        const x = e.clientX - elX
+        const y = e.clientY - elY
+        //移动当前元素
+        if (x > 0 && x < document.body.clientWidth - 50) {
+          isClick = false
+          el.style.left = x + 'px'
+        }
+        if (y > 0 && y < document.body.clientHeight - 50) {
+          isClick = false
+          el.style.top = y + 'px'
+        }
+      }
+      document.onmouseup = () => {
+        if (isClick) showMenu.value = true
+        document.onselectstart = null
+        document.onmousemove = null
+        document.onmouseup = null
+      }
+    }
+  }
+}
 </script>
 
 <template>
-  <el-container v-if="isMobile">
+  <el-container v-if="isMobile" style="height: 100vh">
     <el-header height="50px" style="border-bottom: 1px solid var(--el-border-color-lighter)">
       <app-header />
     </el-header>
@@ -55,17 +90,12 @@ watch(router.currentRoute, () => (showMenu.value = false))
       </template>
     </app-tabs>
 
-    <div class="mobile-menu-button" @click="showMenu = true">
+    <div v-drag class="mobile-menu-button">
       <el-icon :size="30" color="var(--el-color-white)">
         <Menu />
       </el-icon>
       <el-drawer v-model="showMenu" direction="ltr" :with-header="false">
-        <template #title>
-          <div />
-        </template>
-        <el-scrollbar>
-          <app-menu :menu-tree="menuTree" height="100vh" />
-        </el-scrollbar>
+        <app-menu :menu-tree="menuTree" height="100vh" />
       </el-drawer>
     </div>
   </el-container>
diff --git a/diboot-admin-ui/src/layout/memu/index.vue b/diboot-admin-ui/src/layout/memu/index.vue
index 7278a06a..3fa33e40 100644
--- a/diboot-admin-ui/src/layout/memu/index.vue
+++ b/diboot-admin-ui/src/layout/memu/index.vue
@@ -6,7 +6,7 @@ import { Fold, Expand } from '@element-plus/icons-vue'
 
 const props = withDefaults(
   defineProps<{ menuTree: RouteRecordRaw[]; collapse?: boolean; mode?: 'horizontal' | 'vertical'; height?: string }>(),
-  { menuTree: () => [], mode: 'vertical' }
+  { menuTree: () => [], mode: 'vertical', height: undefined }
 )
 
 const emits = defineEmits<{ (e: 'update:collapse', collapse: boolean): void }>()
-- 
Gitee


From 6a1d03451e1063bc5c3e6078bd949f2da8cf4806 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 17 May 2022 16:05:10 +0800
Subject: [PATCH 133/195] =?UTF-8?q?*=20(admin-ui)=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=8F=98=E5=8C=96tab=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/src/layout/tabs/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index 302d1e9c..f619b010 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { RouteLocationNormalized } from 'vue-router'
+import { onBeforeRouteLeave, RouteLocationNormalized } from 'vue-router'
 import { Close, Menu, ArrowLeft, ArrowRight, CloseBold } from '@element-plus/icons-vue'
 import { ElScrollbar } from 'element-plus'
 import Draggable from 'vuedraggable'
@@ -63,9 +63,11 @@ watch(
   },
   { immediate: true }
 )
-onUnmounted(() => {
-  appStore.enableTabs && viewTabsStore.tabList.splice(viewTabsStore.tabList.length - 1)
-})
+onUnmounted(() =>
+  onBeforeRouteLeave(() => {
+    appStore.enableTabs && viewTabsStore.tabList.splice(viewTabsStore.tabList.length - 1)
+  })
+)
 
 // 右键菜单
 const menu = reactive<{ route?: RouteLocationNormalized; locator?: any }>({ route })
-- 
Gitee


From 5520a669e2f8affdad5ad02da8ad58bf7914e832 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 18 May 2022 00:19:13 +0800
Subject: [PATCH 134/195] =?UTF-8?q?*=20(admin-ui)=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/.eslintrc.js   |   12 +-
 diboot-admin-ui/package.json   |   42 +-
 diboot-admin-ui/pnpm-lock.yaml | 3571 ++++++--------------------------
 diboot-admin-ui/vite.config.ts |   15 +-
 4 files changed, 707 insertions(+), 2933 deletions(-)

diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index 5c452b53..b832b5a1 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -2,15 +2,15 @@ module.exports = {
   env: {
     browser: true,
     es2021: true,
-    node: true
+    node: true,
+    'vue/setup-compiler-macros': true
   },
   parser: 'vue-eslint-parser',
   extends: [
     'eslint:recommended',
     'plugin:vue/vue3-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'plugin:prettier/recommended',
+    '@vue/eslint-config-typescript/recommended',
+    '@vue/eslint-config-prettier',
     './.eslintrc-auto-import.json'
   ],
   parserOptions: {
@@ -20,10 +20,6 @@ module.exports = {
   },
   plugins: ['vue', '@typescript-eslint', 'prettier'],
   globals: {
-    defineProps: 'readonly',
-    defineEmits: 'readonly',
-    defineExpose: 'readonly',
-    withDefaults: 'readonly',
     NodeJS: 'readonly'
   },
   rules: {
diff --git a/diboot-admin-ui/package.json b/diboot-admin-ui/package.json
index d2f3f02d..2bdeac6d 100644
--- a/diboot-admin-ui/package.json
+++ b/diboot-admin-ui/package.json
@@ -6,50 +6,46 @@
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
-    "lint": "eslint --ext .{js,jsx,ts,tsx,vue} ./src"
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^1.1.4",
-    "@vueuse/core": "^8.4.2",
-    "axios": "^0.26.1",
+    "@vueuse/core": "^8.5.0",
+    "axios": "^0.27.2",
     "element-plus": "^2.2.0",
-    "fuse.js": "^6.6.1",
+    "fuse.js": "^6.6.2",
     "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.13",
+    "pinia": "^2.0.14",
     "pinia-plugin-persist": "^1.0.0",
     "qs": "^6.10.3",
-    "vue": "^3.2.25",
+    "vue": "^3.2.33",
     "vue-clipboard3": "^2.0.0",
     "vue-fuse": "^4.1.1",
-    "vue-router": "^4.0.14",
+    "vue-router": "^4.0.15",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.182",
-    "@types/node": "^17.0.25",
+    "@types/mockjs": "^1.0.6",
+    "@types/node": "^17.0.34",
     "@types/nprogress": "^0.2.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
-    "@vitejs/plugin-vue": "^2.3.1",
+    "@vitejs/plugin-vue": "^2.3.3",
     "@vue/eslint-config-prettier": "^7.0.0",
-    "eslint": "^8.12.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.6.0",
-    "node-sass": "^7.0.1",
+    "@vue/eslint-config-typescript": "^10.0.0",
+    "eslint": "^8.15.0",
+    "eslint-plugin-vue": "^8.7.1",
     "prettier": "2.6.2",
-    "sass": "^1.50.1",
-    "sass-loader": "^12.6.0",
-    "typescript": "^4.5.4",
+    "sass": "^1.51.0",
+    "typescript": "^4.6.4",
     "unplugin-auto-import": "^0.7.1",
-    "unplugin-vue-components": "^0.19.3",
-    "vite": "^2.9.2",
-    "vite-plugin-eslint": "^1.4.0",
+    "unplugin-vue-components": "^0.19.5",
+    "vite": "^2.9.9",
+    "vite-plugin-eslint": "^1.6.0",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-vue-setup-extend": "^0.4.0",
-    "vue-tsc": "^0.29.8"
+    "vue-tsc": "^0.34.15"
   }
 }
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index b1e8bd66..48c49218 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -1,143 +1,98 @@
-lockfileVersion: 5.3
+lockfileVersion: 5.4
 
 specifiers:
   '@element-plus/icons-vue': ^1.1.4
   '@types/lodash': ^4.14.182
-  '@types/node': ^17.0.25
+  '@types/mockjs': ^1.0.6
+  '@types/node': ^17.0.34
   '@types/nprogress': ^0.2.0
   '@types/qs': ^6.9.7
-  '@typescript-eslint/eslint-plugin': ^5.20.0
-  '@typescript-eslint/parser': ^5.20.0
-  '@vitejs/plugin-vue': ^2.3.1
+  '@vitejs/plugin-vue': ^2.3.3
   '@vue/eslint-config-prettier': ^7.0.0
-  '@vueuse/core': ^8.4.2
-  axios: ^0.26.1
+  '@vue/eslint-config-typescript': ^10.0.0
+  '@vueuse/core': ^8.5.0
+  axios: ^0.27.2
   element-plus: ^2.2.0
-  eslint: ^8.12.0
-  eslint-config-prettier: ^8.5.0
-  eslint-plugin-prettier: ^4.0.0
-  eslint-plugin-vue: ^8.6.0
-  fuse.js: ^6.6.1
+  eslint: ^8.15.0
+  eslint-plugin-vue: ^8.7.1
+  fuse.js: ^6.6.2
   lodash: ^4.17.21
   mockjs: ^1.1.0
-  node-sass: ^7.0.1
   nprogress: ^0.2.0
-  pinia: ^2.0.13
+  pinia: ^2.0.14
   pinia-plugin-persist: ^1.0.0
   prettier: 2.6.2
   qs: ^6.10.3
-  sass: ^1.50.1
-  sass-loader: ^12.6.0
-  typescript: ^4.5.4
+  sass: ^1.51.0
+  typescript: ^4.6.4
   unplugin-auto-import: ^0.7.1
-  unplugin-vue-components: ^0.19.3
-  vite: ^2.9.2
-  vite-plugin-eslint: ^1.4.0
+  unplugin-vue-components: ^0.19.5
+  vite: ^2.9.9
+  vite-plugin-eslint: ^1.6.0
   vite-plugin-mock: ^2.9.6
   vite-plugin-vue-setup-extend: ^0.4.0
-  vue: ^3.2.25
+  vue: ^3.2.33
   vue-clipboard3: ^2.0.0
   vue-fuse: ^4.1.1
-  vue-router: ^4.0.14
-  vue-tsc: ^0.29.8
+  vue-router: ^4.0.15
+  vue-tsc: ^0.34.15
   vuedraggable: ^4.1.0
 
 dependencies:
   '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
-  '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
-  axios: registry.npmmirror.com/axios/0.26.1
+  '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.5.0_vue@3.2.33
+  axios: registry.npmmirror.com/axios/0.27.2
   element-plus: registry.npmmirror.com/element-plus/2.2.0_vue@3.2.33
-  fuse.js: registry.npmmirror.com/fuse.js/6.6.1
+  fuse.js: registry.npmmirror.com/fuse.js/6.6.2
   lodash: registry.npmmirror.com/lodash/4.17.21
   mockjs: registry.npmmirror.com/mockjs/1.1.0
   nprogress: registry.npmmirror.com/nprogress/0.2.0
-  pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
-  pinia-plugin-persist: registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.13+vue@3.2.33
+  pinia: registry.npmmirror.com/pinia/2.0.14_ytvqwwdyss532bvoq2clv4ed5m
+  pinia-plugin-persist: registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.14+vue@3.2.33
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
   vue-clipboard3: registry.npmmirror.com/vue-clipboard3/2.0.0
-  vue-fuse: registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.1+vue@3.2.33
+  vue-fuse: registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.2+vue@3.2.33
   vue-router: registry.npmmirror.com/vue-router/4.0.15_vue@3.2.33
   vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.33
 
 devDependencies:
   '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
-  '@types/node': registry.npmmirror.com/@types/node/17.0.25
+  '@types/mockjs': registry.npmmirror.com/@types/mockjs/1.0.6
+  '@types/node': registry.npmmirror.com/@types/node/17.0.34
   '@types/nprogress': registry.npmmirror.com/@types/nprogress/0.2.0
   '@types/qs': registry.npmmirror.com/@types/qs/6.9.7
-  '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf
-  '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
-  '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33
-  '@vue/eslint-config-prettier': registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.13.0+prettier@2.6.2
-  eslint: registry.npmmirror.com/eslint/8.13.0
-  eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0
-  eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_1815ac95b7fb26c13c7d48a8eef62d0f
-  eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0
-  node-sass: registry.npmmirror.com/node-sass/7.0.1
+  '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.3_vite@2.9.9+vue@3.2.33
+  '@vue/eslint-config-prettier': registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_bppm6sp3oxoychvfagx6tcd7pe
+  '@vue/eslint-config-typescript': registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0_p4if3q7l2moozcc73o6tbvomjq
+  eslint: registry.npmmirror.com/eslint/8.15.0
+  eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.7.1_eslint@8.15.0
   prettier: registry.npmmirror.com/prettier/2.6.2
-  sass: registry.npmmirror.com/sass/1.50.1
-  sass-loader: registry.npmmirror.com/sass-loader/12.6.0_node-sass@7.0.1+sass@1.50.1
-  typescript: registry.npmmirror.com/typescript/4.6.3
-  unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_@vueuse+core@8.4.2+vite@2.9.5
-  unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33
-  vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
-  vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5
-  vite-plugin-mock: registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.5
-  vite-plugin-vue-setup-extend: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.9.5
-  vue-tsc: registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3
+  sass: registry.npmmirror.com/sass/1.51.0
+  typescript: registry.npmmirror.com/typescript/4.6.4
+  unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_4xyn6ao5ngwbgzbefoyccvabvi
+  unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.5_vite@2.9.9+vue@3.2.33
+  vite: registry.npmmirror.com/vite/2.9.9_sass@1.51.0
+  vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.6.0_eslint@8.15.0+vite@2.9.9
+  vite-plugin-mock: registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.9
+  vite-plugin-vue-setup-extend: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.9.9
+  vue-tsc: registry.npmmirror.com/vue-tsc/0.34.15_typescript@4.6.4
 
 packages:
 
-  registry.npmmirror.com/@antfu/utils/0.5.1:
-    resolution: {integrity: sha512-8Afo0+xvYe1K8Wm4xHTymfTkpzy36aaqDvhXIayUwl+mecMG9Xzl3XjXa6swG6Bk8FBeQ646RyvmsYt6+2Be9g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@antfu/utils/-/utils-0.5.1.tgz}
+  registry.npmmirror.com/@antfu/utils/0.5.2:
+    resolution: {integrity: sha512-CQkeV+oJxUazwjlHD0/3ZD08QWKuGQkhnrKo3e6ly5pd48VUpXbb77q0xMU4+vc2CkJnDS02Eq/M9ugyX20XZA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@antfu/utils/-/utils-0.5.2.tgz}
     name: '@antfu/utils'
-    version: 0.5.1
+    version: 0.5.2
     dev: true
 
-  registry.npmmirror.com/@babel/code-frame/7.16.7:
-    resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.16.7.tgz}
-    name: '@babel/code-frame'
-    version: 7.16.7
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': registry.npmmirror.com/@babel/highlight/7.17.9
-    dev: true
-
-  registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7:
-    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz}
-    name: '@babel/helper-validator-identifier'
-    version: 7.16.7
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  registry.npmmirror.com/@babel/highlight/7.17.9:
-    resolution: {integrity: sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/highlight/-/highlight-7.17.9.tgz}
-    name: '@babel/highlight'
-    version: 7.17.9
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7
-      chalk: registry.npmmirror.com/chalk/2.4.2
-      js-tokens: registry.npmmirror.com/js-tokens/4.0.0
-    dev: true
-
-  registry.npmmirror.com/@babel/parser/7.17.9:
-    resolution: {integrity: sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/parser/-/parser-7.17.9.tgz}
+  registry.npmmirror.com/@babel/parser/7.17.12:
+    resolution: {integrity: sha512-FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/parser/-/parser-7.17.12.tgz}
     name: '@babel/parser'
-    version: 7.17.9
+    version: 7.17.12
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  registry.npmmirror.com/@babel/types/7.17.0:
-    resolution: {integrity: sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/types/-/types-7.17.0.tgz}
-    name: '@babel/types'
-    version: 7.17.0
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': registry.npmmirror.com/@babel/helper-validator-identifier/7.16.7
-      to-fast-properties: registry.npmmirror.com/to-fast-properties/2.0.0
-    dev: true
-
   registry.npmmirror.com/@ctrl/tinycolor/3.4.1:
     resolution: {integrity: sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz}
     name: '@ctrl/tinycolor'
@@ -146,7 +101,7 @@ packages:
     dev: false
 
   registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33:
-    resolution: {integrity: sha512-Iz/nHqdp1sFPmdzRwHkEQQA3lKvoObk8azgABZ81QUOpW9s/lUyQVUSh0tNtEPZXQlKwlSh7SPgoVxzrE0uuVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-1.1.4.tgz}
+    resolution: {integrity: sha512-Iz/nHqdp1sFPmdzRwHkEQQA3lKvoObk8azgABZ81QUOpW9s/lUyQVUSh0tNtEPZXQlKwlSh7SPgoVxzrE0uuVQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-1.1.4.tgz}
     id: registry.npmmirror.com/@element-plus/icons-vue/1.1.4
     name: '@element-plus/icons-vue'
     version: 1.1.4
@@ -156,38 +111,16 @@ packages:
       vue: registry.npmmirror.com/vue/3.2.33
     dev: false
 
-  registry.npmmirror.com/@emmetio/abbreviation/2.2.3:
-    resolution: {integrity: sha512-87pltuCPt99aL+y9xS6GPZ+Wmmyhll2WXH73gG/xpGcQ84DRnptBsI2r0BeIQ0EB/SQTOe2ANPqFqj3Rj5FOGA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@emmetio/abbreviation/-/abbreviation-2.2.3.tgz}
-    name: '@emmetio/abbreviation'
-    version: 2.2.3
-    dependencies:
-      '@emmetio/scanner': registry.npmmirror.com/@emmetio/scanner/1.0.0
-    dev: true
-
-  registry.npmmirror.com/@emmetio/css-abbreviation/2.1.4:
-    resolution: {integrity: sha512-qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz}
-    name: '@emmetio/css-abbreviation'
-    version: 2.1.4
-    dependencies:
-      '@emmetio/scanner': registry.npmmirror.com/@emmetio/scanner/1.0.0
-    dev: true
-
-  registry.npmmirror.com/@emmetio/scanner/1.0.0:
-    resolution: {integrity: sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@emmetio/scanner/-/scanner-1.0.0.tgz}
-    name: '@emmetio/scanner'
-    version: 1.0.0
-    dev: true
-
-  registry.npmmirror.com/@eslint/eslintrc/1.2.1:
-    resolution: {integrity: sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz}
+  registry.npmmirror.com/@eslint/eslintrc/1.2.3:
+    resolution: {integrity: sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz}
     name: '@eslint/eslintrc'
-    version: 1.2.1
+    version: 1.2.3
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: registry.npmmirror.com/ajv/6.12.6
       debug: registry.npmmirror.com/debug/4.3.4
-      espree: registry.npmmirror.com/espree/9.3.1
-      globals: registry.npmmirror.com/globals/13.13.0
+      espree: registry.npmmirror.com/espree/9.3.2
+      globals: registry.npmmirror.com/globals/13.15.0
       ignore: registry.npmmirror.com/ignore/5.2.0
       import-fresh: registry.npmmirror.com/import-fresh/3.3.0
       js-yaml: registry.npmmirror.com/js-yaml/4.1.0
@@ -211,14 +144,8 @@ packages:
       '@floating-ui/core': registry.npmmirror.com/@floating-ui/core/0.6.2
     dev: false
 
-  registry.npmmirror.com/@gar/promisify/1.1.3:
-    resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz}
-    name: '@gar/promisify'
-    version: 1.1.3
-    dev: true
-
   registry.npmmirror.com/@humanwhocodes/config-array/0.9.5:
-    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz}
+    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz}
     name: '@humanwhocodes/config-array'
     version: 0.9.5
     engines: {node: '>=10.10.0'}
@@ -231,13 +158,13 @@ packages:
     dev: true
 
   registry.npmmirror.com/@humanwhocodes/object-schema/1.2.1:
-    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz}
+    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz}
     name: '@humanwhocodes/object-schema'
     version: 1.2.1
     dev: true
 
   registry.npmmirror.com/@nodelib/fs.scandir/2.1.5:
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz}
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz}
     name: '@nodelib/fs.scandir'
     version: 2.1.5
     engines: {node: '>= 8'}
@@ -247,14 +174,14 @@ packages:
     dev: true
 
   registry.npmmirror.com/@nodelib/fs.stat/2.0.5:
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz}
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz}
     name: '@nodelib/fs.stat'
     version: 2.0.5
     engines: {node: '>= 8'}
     dev: true
 
   registry.npmmirror.com/@nodelib/fs.walk/1.2.8:
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz}
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz}
     name: '@nodelib/fs.walk'
     version: 1.2.8
     engines: {node: '>= 8'}
@@ -263,43 +190,24 @@ packages:
       fastq: registry.npmmirror.com/fastq/1.13.0
     dev: true
 
-  registry.npmmirror.com/@npmcli/fs/1.1.1:
-    resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@npmcli/fs/-/fs-1.1.1.tgz}
-    name: '@npmcli/fs'
-    version: 1.1.1
-    dependencies:
-      '@gar/promisify': registry.npmmirror.com/@gar/promisify/1.1.3
-      semver: registry.npmmirror.com/semver/7.3.7
-    dev: true
-
-  registry.npmmirror.com/@npmcli/move-file/1.1.2:
-    resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz}
-    name: '@npmcli/move-file'
-    version: 1.1.2
-    engines: {node: '>=10'}
-    dependencies:
-      mkdirp: registry.npmmirror.com/mkdirp/1.0.4
-      rimraf: registry.npmmirror.com/rimraf/3.0.2
-    dev: true
-
-  registry.npmmirror.com/@rollup/plugin-node-resolve/13.2.1:
-    resolution: {integrity: sha512-btX7kzGvp1JwShQI9V6IM841YKNPYjKCvUbNrQ2EcVYbULtUd/GH6wZ/qdqH13j9pOHBER+EZXNN2L8RSJhVRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.2.1.tgz}
+  registry.npmmirror.com/@rollup/plugin-node-resolve/13.3.0:
+    resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz}
     name: '@rollup/plugin-node-resolve'
-    version: 13.2.1
+    version: 13.3.0
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       rollup: ^2.42.0
     dependencies:
       '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/3.1.0
       '@types/resolve': registry.npmmirror.com/@types/resolve/1.17.1
-      builtin-modules: registry.npmmirror.com/builtin-modules/3.2.0
       deepmerge: registry.npmmirror.com/deepmerge/4.2.2
+      is-builtin-module: registry.npmmirror.com/is-builtin-module/3.1.0
       is-module: registry.npmmirror.com/is-module/1.0.0
       resolve: registry.npmmirror.com/resolve/1.22.0
     dev: true
 
   registry.npmmirror.com/@rollup/pluginutils/3.1.0:
-    resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz}
+    resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz}
     name: '@rollup/pluginutils'
     version: 3.1.0
     engines: {node: '>= 8.0.0'}
@@ -312,7 +220,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/@rollup/pluginutils/4.2.1:
-    resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz}
+    resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz}
     name: '@rollup/pluginutils'
     version: 4.2.1
     engines: {node: '>= 8.0.0'}
@@ -327,21 +235,14 @@ packages:
     version: 2.11.7
     dev: false
 
-  registry.npmmirror.com/@tootallnate/once/1.1.2:
-    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@tootallnate/once/-/once-1.1.2.tgz}
-    name: '@tootallnate/once'
-    version: 1.1.2
-    engines: {node: '>= 6'}
-    dev: true
-
   registry.npmmirror.com/@types/estree/0.0.39:
-    resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/estree/-/estree-0.0.39.tgz}
+    resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/estree/-/estree-0.0.39.tgz}
     name: '@types/estree'
     version: 0.0.39
     dev: true
 
   registry.npmmirror.com/@types/json-schema/7.0.11:
-    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz}
+    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz}
     name: '@types/json-schema'
     version: 7.0.11
     dev: true
@@ -355,59 +256,47 @@ packages:
     dev: false
 
   registry.npmmirror.com/@types/lodash/4.14.182:
-    resolution: {integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.182.tgz}
+    resolution: {integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.182.tgz}
     name: '@types/lodash'
     version: 4.14.182
 
-  registry.npmmirror.com/@types/minimist/1.2.2:
-    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz}
-    name: '@types/minimist'
-    version: 1.2.2
-    dev: true
-
   registry.npmmirror.com/@types/mockjs/1.0.6:
-    resolution: {integrity: sha512-Yu5YlqbYZyqsd6LjO4e8ONJDN9pTSnciHDcRP4teNOh/au2b8helFhgRx+3w8xsTFEnwr9jtfTVJbAx+eYmlHA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/mockjs/-/mockjs-1.0.6.tgz}
+    resolution: {integrity: sha512-Yu5YlqbYZyqsd6LjO4e8ONJDN9pTSnciHDcRP4teNOh/au2b8helFhgRx+3w8xsTFEnwr9jtfTVJbAx+eYmlHA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/mockjs/-/mockjs-1.0.6.tgz}
     name: '@types/mockjs'
     version: 1.0.6
     dev: true
 
-  registry.npmmirror.com/@types/node/17.0.25:
-    resolution: {integrity: sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.25.tgz}
+  registry.npmmirror.com/@types/node/17.0.34:
+    resolution: {integrity: sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.34.tgz}
     name: '@types/node'
-    version: 17.0.25
-    dev: true
-
-  registry.npmmirror.com/@types/normalize-package-data/2.4.1:
-    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz}
-    name: '@types/normalize-package-data'
-    version: 2.4.1
+    version: 17.0.34
     dev: true
 
   registry.npmmirror.com/@types/nprogress/0.2.0:
-    resolution: {integrity: sha512-1cYJrqq9GezNFPsWTZpFut/d4CjpZqA0vhqDUPFWYKF1oIyBz5qnoYMzR+0C/T96t3ebLAC1SSnwrVOm5/j74A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.0.tgz}
+    resolution: {integrity: sha512-1cYJrqq9GezNFPsWTZpFut/d4CjpZqA0vhqDUPFWYKF1oIyBz5qnoYMzR+0C/T96t3ebLAC1SSnwrVOm5/j74A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.0.tgz}
     name: '@types/nprogress'
     version: 0.2.0
     dev: true
 
   registry.npmmirror.com/@types/qs/6.9.7:
-    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz}
+    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz}
     name: '@types/qs'
     version: 6.9.7
     dev: true
 
   registry.npmmirror.com/@types/resolve/1.17.1:
-    resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/resolve/-/resolve-1.17.1.tgz}
+    resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/resolve/-/resolve-1.17.1.tgz}
     name: '@types/resolve'
     version: 1.17.1
     dependencies:
-      '@types/node': registry.npmmirror.com/@types/node/17.0.25
+      '@types/node': registry.npmmirror.com/@types/node/17.0.34
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0_b9ac9b5656ce5dffade639fcf5e491bf:
-    resolution: {integrity: sha512-fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz}
-    id: registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.20.0
+  registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0_w4ec7awddsetq6k5phhi6huiuu:
+    resolution: {integrity: sha512-6bqFGk6wa9+6RrU++eLknKyDqXU1Oc8nyoLu5a1fU17PNRJd9UBr56rMF7c4DRaRtnarlkQ4jwxUbvBo8cNlpw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.24.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0
     name: '@typescript-eslint/eslint-plugin'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -417,27 +306,27 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3
-      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0
-      '@typescript-eslint/type-utils': registry.npmmirror.com/@typescript-eslint/type-utils/5.20.0_eslint@8.13.0+typescript@4.6.3
-      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.20.0_eslint@8.13.0+typescript@4.6.3
+      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.24.0_hcfsmds2fshutdssjqluwm76uu
+      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.24.0
+      '@typescript-eslint/type-utils': registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0_hcfsmds2fshutdssjqluwm76uu
+      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.24.0_hcfsmds2fshutdssjqluwm76uu
       debug: registry.npmmirror.com/debug/4.3.4
-      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint: registry.npmmirror.com/eslint/8.15.0
       functional-red-black-tree: registry.npmmirror.com/functional-red-black-tree/1.0.1
       ignore: registry.npmmirror.com/ignore/5.2.0
       regexpp: registry.npmmirror.com/regexpp/3.2.0
       semver: registry.npmmirror.com/semver/7.3.7
-      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3
-      typescript: registry.npmmirror.com/typescript/4.6.3
+      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.4
+      typescript: registry.npmmirror.com/typescript/4.6.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/parser/5.20.0_eslint@8.13.0+typescript@4.6.3:
-    resolution: {integrity: sha512-UWKibrCZQCYvobmu3/N8TWbEeo/EPQbS41Ux1F9XqPzGuV7pfg6n50ZrFo6hryynD8qOTTfLHtHjjdQtxJ0h/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.20.0.tgz}
-    id: registry.npmmirror.com/@typescript-eslint/parser/5.20.0
+  registry.npmmirror.com/@typescript-eslint/parser/5.24.0_hcfsmds2fshutdssjqluwm76uu:
+    resolution: {integrity: sha512-4q29C6xFYZ5B2CXqSBBdcS0lPyfM9M09DoQLtHS5kf+WbpV8pBBhHDLNhXfgyVwFnhrhYzOu7xmg02DzxeF2Uw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.24.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/parser/5.24.0
     name: '@typescript-eslint/parser'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -446,31 +335,31 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0
-      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
-      '@typescript-eslint/typescript-estree': registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0_typescript@4.6.3
+      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.24.0
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.24.0
+      '@typescript-eslint/typescript-estree': registry.npmmirror.com/@typescript-eslint/typescript-estree/5.24.0_typescript@4.6.4
       debug: registry.npmmirror.com/debug/4.3.4
-      eslint: registry.npmmirror.com/eslint/8.13.0
-      typescript: registry.npmmirror.com/typescript/4.6.3
+      eslint: registry.npmmirror.com/eslint/8.15.0
+      typescript: registry.npmmirror.com/typescript/4.6.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0:
-    resolution: {integrity: sha512-h9KtuPZ4D/JuX7rpp1iKg3zOH0WNEa+ZIXwpW/KWmEFDxlA/HSfCMhiyF1HS/drTICjIbpA6OqkAhrP/zkCStg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.20.0.tgz}
+  registry.npmmirror.com/@typescript-eslint/scope-manager/5.24.0:
+    resolution: {integrity: sha512-WpMWipcDzGmMzdT7NtTjRXFabx10WleLUGrJpuJLGaxSqpcyq5ACpKSD5VE40h2nz3melQ91aP4Du7lh9FliCA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.24.0.tgz}
     name: '@typescript-eslint/scope-manager'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
-      '@typescript-eslint/visitor-keys': registry.npmmirror.com/@typescript-eslint/visitor-keys/5.20.0
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.24.0
+      '@typescript-eslint/visitor-keys': registry.npmmirror.com/@typescript-eslint/visitor-keys/5.24.0
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/type-utils/5.20.0_eslint@8.13.0+typescript@4.6.3:
-    resolution: {integrity: sha512-WxNrCwYB3N/m8ceyoGCgbLmuZwupvzN0rE8NBuwnl7APgjv24ZJIjkNzoFBXPRCGzLNkoU/WfanW0exvp/+3Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.20.0.tgz}
-    id: registry.npmmirror.com/@typescript-eslint/type-utils/5.20.0
+  registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0_hcfsmds2fshutdssjqluwm76uu:
+    resolution: {integrity: sha512-uGi+sQiM6E5CeCZYBXiaIvIChBXru4LZ1tMoeKbh1Lze+8BO9syUG07594C4lvN2YPT4KVeIupOJkVI+9/DAmQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.24.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0
     name: '@typescript-eslint/type-utils'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -479,27 +368,27 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.20.0_eslint@8.13.0+typescript@4.6.3
+      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.24.0_hcfsmds2fshutdssjqluwm76uu
       debug: registry.npmmirror.com/debug/4.3.4
-      eslint: registry.npmmirror.com/eslint/8.13.0
-      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3
-      typescript: registry.npmmirror.com/typescript/4.6.3
+      eslint: registry.npmmirror.com/eslint/8.15.0
+      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.4
+      typescript: registry.npmmirror.com/typescript/4.6.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/types/5.20.0:
-    resolution: {integrity: sha512-+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.20.0.tgz}
+  registry.npmmirror.com/@typescript-eslint/types/5.24.0:
+    resolution: {integrity: sha512-Tpg1c3shTDgTmZd3qdUyd+16r/pGmVaVEbLs+ufuWP0EruVbUiEOmpBBQxBb9a8iPRxi8Rb2oiwOxuZJzSq11A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.24.0.tgz}
     name: '@typescript-eslint/types'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0_typescript@4.6.3:
-    resolution: {integrity: sha512-36xLjP/+bXusLMrT9fMMYy1KJAGgHhlER2TqpUVDYUQg4w0q/NW/sg4UGAgVwAqb8V4zYg43KMUpM8vV2lve6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.20.0.tgz}
-    id: registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0
+  registry.npmmirror.com/@typescript-eslint/typescript-estree/5.24.0_typescript@4.6.4:
+    resolution: {integrity: sha512-zcor6vQkQmZAQfebSPVwUk/FD+CvnsnlfKXYeQDsWXRF+t7SBPmIfNia/wQxCSeu1h1JIjwV2i9f5/DdSp/uDw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.24.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/typescript-estree/5.24.0
     name: '@typescript-eslint/typescript-estree'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -507,149 +396,113 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
-      '@typescript-eslint/visitor-keys': registry.npmmirror.com/@typescript-eslint/visitor-keys/5.20.0
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.24.0
+      '@typescript-eslint/visitor-keys': registry.npmmirror.com/@typescript-eslint/visitor-keys/5.24.0
       debug: registry.npmmirror.com/debug/4.3.4
       globby: registry.npmmirror.com/globby/11.1.0
       is-glob: registry.npmmirror.com/is-glob/4.0.3
       semver: registry.npmmirror.com/semver/7.3.7
-      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3
-      typescript: registry.npmmirror.com/typescript/4.6.3
+      tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.4
+      typescript: registry.npmmirror.com/typescript/4.6.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/utils/5.20.0_eslint@8.13.0+typescript@4.6.3:
-    resolution: {integrity: sha512-lHONGJL1LIO12Ujyx8L8xKbwWSkoUKFSO+0wDAqGXiudWB2EO7WEUT+YZLtVbmOmSllAjLb9tpoIPwpRe5Tn6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.20.0.tgz}
-    id: registry.npmmirror.com/@typescript-eslint/utils/5.20.0
+  registry.npmmirror.com/@typescript-eslint/utils/5.24.0_hcfsmds2fshutdssjqluwm76uu:
+    resolution: {integrity: sha512-K05sbWoeCBJH8KXu6hetBJ+ukG0k2u2KlgD3bN+v+oBKm8adJqVHpSSLHNzqyuv0Lh4GVSAUgZ5lB4icmPmWLw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.24.0.tgz}
+    id: registry.npmmirror.com/@typescript-eslint/utils/5.24.0
     name: '@typescript-eslint/utils'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': registry.npmmirror.com/@types/json-schema/7.0.11
-      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.20.0
-      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
-      '@typescript-eslint/typescript-estree': registry.npmmirror.com/@typescript-eslint/typescript-estree/5.20.0_typescript@4.6.3
-      eslint: registry.npmmirror.com/eslint/8.13.0
+      '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.24.0
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.24.0
+      '@typescript-eslint/typescript-estree': registry.npmmirror.com/@typescript-eslint/typescript-estree/5.24.0_typescript@4.6.4
+      eslint: registry.npmmirror.com/eslint/8.15.0
       eslint-scope: registry.npmmirror.com/eslint-scope/5.1.1
-      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0
+      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.15.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/visitor-keys/5.20.0:
-    resolution: {integrity: sha512-1flRpNF+0CAQkMNlTJ6L/Z5jiODG/e5+7mk6XwtPOUS3UrTz3UOiAg9jG2VtKsWI6rZQfy4C6a232QNRZTRGlg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.20.0.tgz}
+  registry.npmmirror.com/@typescript-eslint/visitor-keys/5.24.0:
+    resolution: {integrity: sha512-qzGwSXMyMnogcAo+/2fU+jhlPPVMXlIH2PeAonIKjJSoDKl1+lJVvG5Z5Oud36yU0TWK2cs1p/FaSN5J2OUFYA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.24.0.tgz}
     name: '@typescript-eslint/visitor-keys'
-    version: 5.20.0
+    version: 5.24.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.20.0
+      '@typescript-eslint/types': registry.npmmirror.com/@typescript-eslint/types/5.24.0
       eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
     dev: true
 
-  registry.npmmirror.com/@vitejs/plugin-vue/2.3.1_vite@2.9.5+vue@3.2.33:
-    resolution: {integrity: sha512-YNzBt8+jt6bSwpt7LP890U1UcTOIZZxfpE5WOJ638PNxSEKOqAi0+FSKS0nVeukfdZ0Ai/H7AFd6k3hayfGZqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-2.3.1.tgz}
-    id: registry.npmmirror.com/@vitejs/plugin-vue/2.3.1
+  registry.npmmirror.com/@vitejs/plugin-vue/2.3.3_vite@2.9.9+vue@3.2.33:
+    resolution: {integrity: sha512-SmQLDyhz+6lGJhPELsBdzXGc+AcaT8stgkbiTFGpXPe8Tl1tJaBw1A6pxDqDuRsVkD8uscrkx3hA7QDOoKYtyw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-2.3.3.tgz}
+    id: registry.npmmirror.com/@vitejs/plugin-vue/2.3.3
     name: '@vitejs/plugin-vue'
-    version: 2.3.1
+    version: 2.3.3
     engines: {node: '>=12.0.0'}
     peerDependencies:
       vite: ^2.5.10
       vue: ^3.2.25
     dependencies:
-      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
+      vite: registry.npmmirror.com/vite/2.9.9_sass@1.51.0
       vue: registry.npmmirror.com/vue/3.2.33
     dev: true
 
-  registry.npmmirror.com/@volar/code-gen/0.29.8:
-    resolution: {integrity: sha512-eohLLUqPChHRPDFT5gXn4V6pr/CeTri7Ou5GI26lUvBRRAbP8p+oYfQRcbMPGeKmVkYjfVj0chsxQGx6T8PQ4Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/code-gen/-/code-gen-0.29.8.tgz}
+  registry.npmmirror.com/@volar/code-gen/0.34.15:
+    resolution: {integrity: sha512-g30glPo5N9bJocf1NBt802UcmqgZ3UtPst9b/Tangj+zR+K2RV5S2Un/suR6ZRiETXtg3nmrUcCgsTSJ6PC29A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/code-gen/-/code-gen-0.34.15.tgz}
     name: '@volar/code-gen'
-    version: 0.29.8
-    dependencies:
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
-    dev: true
-
-  registry.npmmirror.com/@volar/html2pug/0.29.8:
-    resolution: {integrity: sha512-bhSNXg8A2aD3w0B+CwmHjqCAaKtj5rORbE5C/q/UdGqptJbC6STCmi30KuRTdfPhR++Xb18Hauf3s/WCmtNAPA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/html2pug/-/html2pug-0.29.8.tgz}
-    name: '@volar/html2pug'
-    version: 0.29.8
-    dependencies:
-      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
-      domhandler: registry.npmmirror.com/domhandler/4.3.1
-      htmlparser2: registry.npmmirror.com/htmlparser2/7.2.0
-      pug: registry.npmmirror.com/pug/3.0.2
-    dev: true
-
-  registry.npmmirror.com/@volar/shared/0.29.8:
-    resolution: {integrity: sha512-Y1NN6irkIukD+T0wf4p/dHWYL90sacN2e2lYoDXxRlvoYxwANnHgw0J0Rcp+yw58ElWRScdG7/YntEIuZWeJsw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/shared/-/shared-0.29.8.tgz}
-    name: '@volar/shared'
-    version: 0.29.8
+    version: 0.34.15
     dependencies:
-      upath: registry.npmmirror.com/upath/2.0.1
-      vscode-jsonrpc: registry.npmmirror.com/vscode-jsonrpc/8.0.0-next.7
-      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
+      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.34.15
     dev: true
 
-  registry.npmmirror.com/@volar/source-map/0.29.8:
-    resolution: {integrity: sha512-7w+UoYtnc6UQu30CgMVvx0YN4dzDgP4TIsSmUaW62AGmxU9Lxwp3Kkn/4N8efi91z8ma5Z78v/HddyJPwAC3LA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/source-map/-/source-map-0.29.8.tgz}
+  registry.npmmirror.com/@volar/source-map/0.34.15:
+    resolution: {integrity: sha512-Y3sENK/kqsgD7Vtve6gq6/Dor6JuoJWR+s9iwHcHTcA4VDkJnJRGHcvP8S3SVBsWl7T9qtlnvH3WCbFj7WlXrw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/source-map/-/source-map-0.34.15.tgz}
     name: '@volar/source-map'
-    version: 0.29.8
-    dependencies:
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-    dev: true
-
-  registry.npmmirror.com/@volar/transforms/0.29.8:
-    resolution: {integrity: sha512-o2hRa8CoDwYTO1Mu5KA47+1elUnYUjDaVhCvbyKlRfd8qpHea2llotArq7B6OORSL2M9DVs1IRJ5NGURBFeZ3Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/transforms/-/transforms-0.29.8.tgz}
-    name: '@volar/transforms'
-    version: 0.29.8
-    dependencies:
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
+    version: 0.34.15
     dev: true
 
-  registry.npmmirror.com/@volar/vue-code-gen/0.29.8:
-    resolution: {integrity: sha512-E1e7P2oktNC/DzgDBditfla4s8+HlUlluZ+BtcLvEdbkl3QEjujkB0x1wxguWzXmpWgLIDPtrS3Jzll5cCOkTg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/vue-code-gen/-/vue-code-gen-0.29.8.tgz}
+  registry.npmmirror.com/@volar/vue-code-gen/0.34.15:
+    resolution: {integrity: sha512-GglGsHxPPb7mW2v//5MUrkzxAO68YEIL5bRwpZD0Cp9np34keQdd1SHB5DXdoyU38cnfHJWjBlqCYpTnz2CR/w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/vue-code-gen/-/vue-code-gen-0.34.15.tgz}
     name: '@volar/vue-code-gen'
-    version: 0.29.8
+    version: 0.34.15
     dependencies:
-      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.29.8
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
+      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.34.15
+      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.34.15
       '@vue/compiler-core': registry.npmmirror.com/@vue/compiler-core/3.2.33
       '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.33
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
-      upath: registry.npmmirror.com/upath/2.0.1
     dev: true
 
-  registry.npmmirror.com/@vscode/emmet-helper/2.8.4:
-    resolution: {integrity: sha512-lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz}
-    name: '@vscode/emmet-helper'
-    version: 2.8.4
+  registry.npmmirror.com/@volar/vue-typescript/0.34.15:
+    resolution: {integrity: sha512-7jwhYl1NQB0uYgTO74x+OBSD4SPF7bI3m1KFQ98Wt/NOTXr57YcUyOkDBImcTKRLX3PHG9ex6OfT7u3jiZ2Zzg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@volar/vue-typescript/-/vue-typescript-0.34.15.tgz}
+    name: '@volar/vue-typescript'
+    version: 0.34.15
     dependencies:
-      emmet: registry.npmmirror.com/emmet/2.3.6
-      jsonc-parser: registry.npmmirror.com/jsonc-parser/2.3.1
-      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
-      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
-      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
-      vscode-uri: registry.npmmirror.com/vscode-uri/2.1.2
+      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.34.15
+      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.34.15
+      '@volar/vue-code-gen': registry.npmmirror.com/@volar/vue-code-gen/0.34.15
+      '@vue/compiler-sfc': registry.npmmirror.com/@vue/compiler-sfc/3.2.33
+      '@vue/reactivity': registry.npmmirror.com/@vue/reactivity/3.2.33
     dev: true
 
   registry.npmmirror.com/@vue/compiler-core/3.2.33:
-    resolution: {integrity: sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.33.tgz}
+    resolution: {integrity: sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.33.tgz}
     name: '@vue/compiler-core'
     version: 3.2.33
     dependencies:
-      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.12
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
       estree-walker: registry.npmmirror.com/estree-walker/2.0.2
       source-map: registry.npmmirror.com/source-map/0.6.1
 
   registry.npmmirror.com/@vue/compiler-dom/3.2.33:
-    resolution: {integrity: sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz}
+    resolution: {integrity: sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz}
     name: '@vue/compiler-dom'
     version: 3.2.33
     dependencies:
@@ -657,11 +510,11 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
 
   registry.npmmirror.com/@vue/compiler-sfc/3.2.33:
-    resolution: {integrity: sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.33.tgz}
+    resolution: {integrity: sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.33.tgz}
     name: '@vue/compiler-sfc'
     version: 3.2.33
     dependencies:
-      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.12
       '@vue/compiler-core': registry.npmmirror.com/@vue/compiler-core/3.2.33
       '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.33
       '@vue/compiler-ssr': registry.npmmirror.com/@vue/compiler-ssr/3.2.33
@@ -669,11 +522,11 @@ packages:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
       estree-walker: registry.npmmirror.com/estree-walker/2.0.2
       magic-string: registry.npmmirror.com/magic-string/0.25.9
-      postcss: registry.npmmirror.com/postcss/8.4.12
+      postcss: registry.npmmirror.com/postcss/8.4.13
       source-map: registry.npmmirror.com/source-map/0.6.1
 
   registry.npmmirror.com/@vue/compiler-ssr/3.2.33:
-    resolution: {integrity: sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.33.tgz}
+    resolution: {integrity: sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.33.tgz}
     name: '@vue/compiler-ssr'
     version: 3.2.33
     dependencies:
@@ -686,8 +539,8 @@ packages:
     version: 6.1.4
     dev: false
 
-  registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.13.0+prettier@2.6.2:
-    resolution: {integrity: sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz}
+  registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_bppm6sp3oxoychvfagx6tcd7pe:
+    resolution: {integrity: sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz}
     id: registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0
     name: '@vue/eslint-config-prettier'
     version: 7.0.0
@@ -695,32 +548,52 @@ packages:
       eslint: '>= 7.28.0'
       prettier: '>= 2.0.0'
     dependencies:
-      eslint: registry.npmmirror.com/eslint/8.13.0
-      eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0
-      eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_1815ac95b7fb26c13c7d48a8eef62d0f
+      eslint: registry.npmmirror.com/eslint/8.15.0
+      eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.15.0
+      eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_iqftbjqlxzn3ny5nablrkczhqi
       prettier: registry.npmmirror.com/prettier/2.6.2
     dev: true
 
+  registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0_p4if3q7l2moozcc73o6tbvomjq:
+    resolution: {integrity: sha512-F94cL8ug3FaYXlCfU5/wiGjk1qeadmoBpRGAOBq+qre3Smdupa59dd6ZJrsfRODpsMPyTG7330juMDsUvpZ3Rw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/eslint-config-typescript/-/eslint-config-typescript-10.0.0.tgz}
+    id: registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0
+    name: '@vue/eslint-config-typescript'
+    version: 10.0.0
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
+      eslint-plugin-vue: ^8.0.1
+    dependencies:
+      '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0_w4ec7awddsetq6k5phhi6huiuu
+      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.24.0_hcfsmds2fshutdssjqluwm76uu
+      eslint: registry.npmmirror.com/eslint/8.15.0
+      eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.7.1_eslint@8.15.0
+      vue-eslint-parser: registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.15.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
   registry.npmmirror.com/@vue/reactivity-transform/3.2.33:
-    resolution: {integrity: sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.33.tgz}
+    resolution: {integrity: sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.33.tgz}
     name: '@vue/reactivity-transform'
     version: 3.2.33
     dependencies:
-      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
+      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.12
       '@vue/compiler-core': registry.npmmirror.com/@vue/compiler-core/3.2.33
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
       estree-walker: registry.npmmirror.com/estree-walker/2.0.2
       magic-string: registry.npmmirror.com/magic-string/0.25.9
 
   registry.npmmirror.com/@vue/reactivity/3.2.33:
-    resolution: {integrity: sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.33.tgz}
+    resolution: {integrity: sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.33.tgz}
     name: '@vue/reactivity'
     version: 3.2.33
     dependencies:
       '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
 
   registry.npmmirror.com/@vue/runtime-core/3.2.33:
-    resolution: {integrity: sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.33.tgz}
+    resolution: {integrity: sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.33.tgz}
     name: '@vue/runtime-core'
     version: 3.2.33
     dependencies:
@@ -729,7 +602,7 @@ packages:
     dev: false
 
   registry.npmmirror.com/@vue/runtime-dom/3.2.33:
-    resolution: {integrity: sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.33.tgz}
+    resolution: {integrity: sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.33.tgz}
     name: '@vue/runtime-dom'
     version: 3.2.33
     dependencies:
@@ -739,7 +612,7 @@ packages:
     dev: false
 
   registry.npmmirror.com/@vue/server-renderer/3.2.33_vue@3.2.33:
-    resolution: {integrity: sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.33.tgz}
+    resolution: {integrity: sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.33.tgz}
     id: registry.npmmirror.com/@vue/server-renderer/3.2.33
     name: '@vue/server-renderer'
     version: 3.2.33
@@ -752,15 +625,15 @@ packages:
     dev: false
 
   registry.npmmirror.com/@vue/shared/3.2.33:
-    resolution: {integrity: sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/shared/-/shared-3.2.33.tgz}
+    resolution: {integrity: sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/shared/-/shared-3.2.33.tgz}
     name: '@vue/shared'
     version: 3.2.33
 
-  registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33:
-    resolution: {integrity: sha512-dUVU96lii1ZdWoNJXauQNt+4QrHz1DKbuW+y6pDR2N10q7rGZJMDU7pQeMcC2XeosX7kMODfaBuqsF03NozzLg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/core/-/core-8.4.2.tgz}
-    id: registry.npmmirror.com/@vueuse/core/8.4.2
+  registry.npmmirror.com/@vueuse/core/8.5.0_vue@3.2.33:
+    resolution: {integrity: sha512-VEJ6sGNsPlUp0o9BGda2YISvDZbhWJSOJu5zlp2TufRGVrLcYUKr31jyFEOj6RXzG3k/H4aCYeZyjpItfU8glw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/core/-/core-8.5.0.tgz}
+    id: registry.npmmirror.com/@vueuse/core/8.5.0
     name: '@vueuse/core'
-    version: 8.4.2
+    version: 8.5.0
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -770,23 +643,23 @@ packages:
       vue:
         optional: true
     dependencies:
-      '@vueuse/metadata': registry.npmmirror.com/@vueuse/metadata/8.4.2
-      '@vueuse/shared': registry.npmmirror.com/@vueuse/shared/8.4.2_vue@3.2.33
+      '@vueuse/metadata': registry.npmmirror.com/@vueuse/metadata/8.5.0
+      '@vueuse/shared': registry.npmmirror.com/@vueuse/shared/8.5.0_vue@3.2.33
       vue: registry.npmmirror.com/vue/3.2.33
       vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
     dev: false
 
-  registry.npmmirror.com/@vueuse/metadata/8.4.2:
-    resolution: {integrity: sha512-2BIj++7P0/I5dfMsEe8q7Kw0HqVAjVcyNOd9+G22/ILUC9TVLTeYOuJ1kwa1Gpr+0LWKHc6GqHiLWNL33+exoQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.4.2.tgz}
+  registry.npmmirror.com/@vueuse/metadata/8.5.0:
+    resolution: {integrity: sha512-WxsD+Cd+bn+HcjpY6Dl9FJ8ywTRTT9pTwk3bCQpzEhXVYAyNczKDSahk50fCfIJKeWHhyI4B2+/ZEOxQAkUr0g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.5.0.tgz}
     name: '@vueuse/metadata'
-    version: 8.4.2
+    version: 8.5.0
     dev: false
 
-  registry.npmmirror.com/@vueuse/shared/8.4.2_vue@3.2.33:
-    resolution: {integrity: sha512-hILXMEjL8YQhj1LHN/HZ49UThyfk8irTjhele2nW+L3N55ElFUBGB/f4w0rg8EW+/suhqv7kJJPTZzvHCqxlIw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/shared/-/shared-8.4.2.tgz}
-    id: registry.npmmirror.com/@vueuse/shared/8.4.2
+  registry.npmmirror.com/@vueuse/shared/8.5.0_vue@3.2.33:
+    resolution: {integrity: sha512-qKG+SZb44VvGD4dU5cQ63z4JE2Yk39hQUecR0a9sEdJA01cx+XrxAvFKJfPooxwoiqalAVw/ktWK6xbyc/jS3g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/shared/-/shared-8.5.0.tgz}
+    id: registry.npmmirror.com/@vueuse/shared/8.5.0
     name: '@vueuse/shared'
-    version: 8.4.2
+    version: 8.5.0
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -800,75 +673,27 @@ packages:
       vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
     dev: false
 
-  registry.npmmirror.com/abbrev/1.1.1:
-    resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/abbrev/-/abbrev-1.1.1.tgz}
-    name: abbrev
-    version: 1.1.1
-    dev: true
-
-  registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.0:
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz}
+  registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.1:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz}
     id: registry.npmmirror.com/acorn-jsx/5.3.2
     name: acorn-jsx
     version: 5.3.2
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: registry.npmmirror.com/acorn/8.7.0
-    dev: true
-
-  registry.npmmirror.com/acorn/7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz}
-    name: acorn
-    version: 7.4.1
-    engines: {node: '>=0.4.0'}
-    hasBin: true
+      acorn: registry.npmmirror.com/acorn/8.7.1
     dev: true
 
-  registry.npmmirror.com/acorn/8.7.0:
-    resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn/-/acorn-8.7.0.tgz}
+  registry.npmmirror.com/acorn/8.7.1:
+    resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/acorn/-/acorn-8.7.1.tgz}
     name: acorn
-    version: 8.7.0
+    version: 8.7.1
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
 
-  registry.npmmirror.com/agent-base/6.0.2:
-    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz}
-    name: agent-base
-    version: 6.0.2
-    engines: {node: '>= 6.0.0'}
-    dependencies:
-      debug: registry.npmmirror.com/debug/4.3.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/agentkeepalive/4.2.1:
-    resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz}
-    name: agentkeepalive
-    version: 4.2.1
-    engines: {node: '>= 8.0.0'}
-    dependencies:
-      debug: registry.npmmirror.com/debug/4.3.4
-      depd: registry.npmmirror.com/depd/1.1.2
-      humanize-ms: registry.npmmirror.com/humanize-ms/1.2.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/aggregate-error/3.1.0:
-    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz}
-    name: aggregate-error
-    version: 3.1.0
-    engines: {node: '>=8'}
-    dependencies:
-      clean-stack: registry.npmmirror.com/clean-stack/2.2.0
-      indent-string: registry.npmmirror.com/indent-string/4.0.0
-    dev: true
-
   registry.npmmirror.com/ajv/6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz}
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz}
     name: ajv
     version: 6.12.6
     dependencies:
@@ -879,23 +704,14 @@ packages:
     dev: true
 
   registry.npmmirror.com/ansi-regex/5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz}
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz}
     name: ansi-regex
     version: 5.0.1
     engines: {node: '>=8'}
     dev: true
 
-  registry.npmmirror.com/ansi-styles/3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz}
-    name: ansi-styles
-    version: 3.2.1
-    engines: {node: '>=4'}
-    dependencies:
-      color-convert: registry.npmmirror.com/color-convert/1.9.3
-    dev: true
-
   registry.npmmirror.com/ansi-styles/4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz}
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz}
     name: ansi-styles
     version: 4.3.0
     engines: {node: '>=8'}
@@ -904,7 +720,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/anymatch/3.1.2:
-    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz}
+    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz}
     name: anymatch
     version: 3.1.2
     engines: {node: '>= 8'}
@@ -913,151 +729,63 @@ packages:
       picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
-  registry.npmmirror.com/aproba/2.0.0:
-    resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aproba/-/aproba-2.0.0.tgz}
-    name: aproba
-    version: 2.0.0
-    dev: true
-
-  registry.npmmirror.com/are-we-there-yet/2.0.0:
-    resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz}
-    name: are-we-there-yet
-    version: 2.0.0
-    engines: {node: '>=10'}
-    dependencies:
-      delegates: registry.npmmirror.com/delegates/1.0.0
-      readable-stream: registry.npmmirror.com/readable-stream/3.6.0
-    dev: true
-
-  registry.npmmirror.com/are-we-there-yet/3.0.0:
-    resolution: {integrity: sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz}
-    name: are-we-there-yet
-    version: 3.0.0
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16}
-    dependencies:
-      delegates: registry.npmmirror.com/delegates/1.0.0
-      readable-stream: registry.npmmirror.com/readable-stream/3.6.0
-    dev: true
-
   registry.npmmirror.com/argparse/2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz}
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz}
     name: argparse
     version: 2.0.1
     dev: true
 
   registry.npmmirror.com/array-union/2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz}
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz}
     name: array-union
     version: 2.1.0
     engines: {node: '>=8'}
     dev: true
 
-  registry.npmmirror.com/arrify/1.0.1:
-    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/arrify/-/arrify-1.0.1.tgz}
-    name: arrify
-    version: 1.0.1
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  registry.npmmirror.com/asap/2.0.6:
-    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asap/-/asap-2.0.6.tgz}
-    name: asap
-    version: 2.0.6
-    dev: true
-
-  registry.npmmirror.com/asn1/0.2.6:
-    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asn1/-/asn1-0.2.6.tgz}
-    name: asn1
-    version: 0.2.6
-    dependencies:
-      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
-    dev: true
-
-  registry.npmmirror.com/assert-never/1.2.1:
-    resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/assert-never/-/assert-never-1.2.1.tgz}
-    name: assert-never
-    version: 1.2.1
-    dev: true
-
-  registry.npmmirror.com/assert-plus/1.0.0:
-    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz}
-    name: assert-plus
-    version: 1.0.0
-    engines: {node: '>=0.8'}
-    dev: true
-
-  registry.npmmirror.com/async-foreach/0.1.3:
-    resolution: {integrity: sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz}
-    name: async-foreach
-    version: 0.1.3
-    dev: true
-
-  registry.npmmirror.com/async-validator/4.0.7:
-    resolution: {integrity: sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-validator/-/async-validator-4.0.7.tgz}
+  registry.npmmirror.com/async-validator/4.1.1:
+    resolution: {integrity: sha512-p4DO/JXwjs8klJyJL8Q2oM4ks5fUTze/h5k10oPPKMiLe1fj3G1QMzPHNmN1Py4ycOk7WlO2DcGXv1qiESJCZA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/async-validator/-/async-validator-4.1.1.tgz}
     name: async-validator
-    version: 4.0.7
+    version: 4.1.1
     dev: false
 
   registry.npmmirror.com/asynckit/0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz}
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz}
     name: asynckit
     version: 0.4.0
-    dev: true
-
-  registry.npmmirror.com/aws-sign2/0.7.0:
-    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aws-sign2/-/aws-sign2-0.7.0.tgz}
-    name: aws-sign2
-    version: 0.7.0
-    dev: true
-
-  registry.npmmirror.com/aws4/1.11.0:
-    resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/aws4/-/aws4-1.11.0.tgz}
-    name: aws4
-    version: 1.11.0
-    dev: true
+    dev: false
 
-  registry.npmmirror.com/axios/0.26.1:
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/axios/-/axios-0.26.1.tgz}
+  registry.npmmirror.com/axios/0.27.2:
+    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz}
     name: axios
-    version: 0.26.1
+    version: 0.27.2
     dependencies:
-      follow-redirects: registry.npmmirror.com/follow-redirects/1.14.9
+      follow-redirects: registry.npmmirror.com/follow-redirects/1.15.0
+      form-data: registry.npmmirror.com/form-data/4.0.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  registry.npmmirror.com/babel-walk/3.0.0-canary-5:
-    resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz}
-    name: babel-walk
-    version: 3.0.0-canary-5
-    engines: {node: '>= 10.0.0'}
-    dependencies:
-      '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
-    dev: true
-
   registry.npmmirror.com/balanced-match/1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz}
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz}
     name: balanced-match
     version: 1.0.2
     dev: true
 
-  registry.npmmirror.com/bcrypt-pbkdf/1.0.2:
-    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz}
-    name: bcrypt-pbkdf
-    version: 1.0.2
-    dependencies:
-      tweetnacl: registry.npmmirror.com/tweetnacl/0.14.5
-    dev: true
-
   registry.npmmirror.com/binary-extensions/2.2.0:
-    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz}
+    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz}
     name: binary-extensions
     version: 2.2.0
     engines: {node: '>=8'}
     dev: true
 
+  registry.npmmirror.com/boolbase/1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz}
+    name: boolbase
+    version: 1.0.0
+    dev: true
+
   registry.npmmirror.com/brace-expansion/1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz}
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz}
     name: brace-expansion
     version: 1.1.11
     dependencies:
@@ -1066,7 +794,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/brace-expansion/2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz}
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz}
     name: brace-expansion
     version: 2.0.1
     dependencies:
@@ -1074,7 +802,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/braces/3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz}
+    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz}
     name: braces
     version: 3.0.2
     engines: {node: '>=8'}
@@ -1082,91 +810,31 @@ packages:
       fill-range: registry.npmmirror.com/fill-range/7.0.1
     dev: true
 
-  registry.npmmirror.com/builtin-modules/3.2.0:
-    resolution: {integrity: sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/builtin-modules/-/builtin-modules-3.2.0.tgz}
+  registry.npmmirror.com/builtin-modules/3.3.0:
+    resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/builtin-modules/-/builtin-modules-3.3.0.tgz}
     name: builtin-modules
-    version: 3.2.0
+    version: 3.3.0
     engines: {node: '>=6'}
     dev: true
 
-  registry.npmmirror.com/cacache/15.3.0:
-    resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cacache/-/cacache-15.3.0.tgz}
-    name: cacache
-    version: 15.3.0
-    engines: {node: '>= 10'}
-    dependencies:
-      '@npmcli/fs': registry.npmmirror.com/@npmcli/fs/1.1.1
-      '@npmcli/move-file': registry.npmmirror.com/@npmcli/move-file/1.1.2
-      chownr: registry.npmmirror.com/chownr/2.0.0
-      fs-minipass: registry.npmmirror.com/fs-minipass/2.1.0
-      glob: registry.npmmirror.com/glob/7.2.0
-      infer-owner: registry.npmmirror.com/infer-owner/1.0.4
-      lru-cache: registry.npmmirror.com/lru-cache/6.0.0
-      minipass: registry.npmmirror.com/minipass/3.1.6
-      minipass-collect: registry.npmmirror.com/minipass-collect/1.0.2
-      minipass-flush: registry.npmmirror.com/minipass-flush/1.0.5
-      minipass-pipeline: registry.npmmirror.com/minipass-pipeline/1.2.4
-      mkdirp: registry.npmmirror.com/mkdirp/1.0.4
-      p-map: registry.npmmirror.com/p-map/4.0.0
-      promise-inflight: registry.npmmirror.com/promise-inflight/1.0.1
-      rimraf: registry.npmmirror.com/rimraf/3.0.2
-      ssri: registry.npmmirror.com/ssri/8.0.1
-      tar: registry.npmmirror.com/tar/6.1.11
-      unique-filename: registry.npmmirror.com/unique-filename/1.1.1
-    dev: true
-
   registry.npmmirror.com/call-bind/1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz}
+    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz}
     name: call-bind
     version: 1.0.2
     dependencies:
       function-bind: registry.npmmirror.com/function-bind/1.1.1
       get-intrinsic: registry.npmmirror.com/get-intrinsic/1.1.1
+    dev: false
 
   registry.npmmirror.com/callsites/3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz}
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz}
     name: callsites
     version: 3.1.0
     engines: {node: '>=6'}
     dev: true
 
-  registry.npmmirror.com/camelcase-keys/6.2.2:
-    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz}
-    name: camelcase-keys
-    version: 6.2.2
-    engines: {node: '>=8'}
-    dependencies:
-      camelcase: registry.npmmirror.com/camelcase/5.3.1
-      map-obj: registry.npmmirror.com/map-obj/4.3.0
-      quick-lru: registry.npmmirror.com/quick-lru/4.0.1
-    dev: true
-
-  registry.npmmirror.com/camelcase/5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz}
-    name: camelcase
-    version: 5.3.1
-    engines: {node: '>=6'}
-    dev: true
-
-  registry.npmmirror.com/caseless/0.12.0:
-    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz}
-    name: caseless
-    version: 0.12.0
-    dev: true
-
-  registry.npmmirror.com/chalk/2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz}
-    name: chalk
-    version: 2.4.2
-    engines: {node: '>=4'}
-    dependencies:
-      ansi-styles: registry.npmmirror.com/ansi-styles/3.2.1
-      escape-string-regexp: registry.npmmirror.com/escape-string-regexp/1.0.5
-      supports-color: registry.npmmirror.com/supports-color/5.5.0
-    dev: true
-
   registry.npmmirror.com/chalk/4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz}
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz}
     name: chalk
     version: 4.1.2
     engines: {node: '>=10'}
@@ -1175,16 +843,8 @@ packages:
       supports-color: registry.npmmirror.com/supports-color/7.2.0
     dev: true
 
-  registry.npmmirror.com/character-parser/2.2.0:
-    resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/character-parser/-/character-parser-2.2.0.tgz}
-    name: character-parser
-    version: 2.2.0
-    dependencies:
-      is-regex: registry.npmmirror.com/is-regex/1.1.4
-    dev: true
-
   registry.npmmirror.com/chokidar/3.5.3:
-    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz}
+    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz}
     name: chokidar
     version: 3.5.3
     engines: {node: '>= 8.10.0'}
@@ -1200,20 +860,6 @@ packages:
       fsevents: registry.npmmirror.com/fsevents/2.3.2
     dev: true
 
-  registry.npmmirror.com/chownr/2.0.0:
-    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz}
-    name: chownr
-    version: 2.0.0
-    engines: {node: '>=10'}
-    dev: true
-
-  registry.npmmirror.com/clean-stack/2.2.0:
-    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/clean-stack/-/clean-stack-2.2.0.tgz}
-    name: clean-stack
-    version: 2.2.0
-    engines: {node: '>=6'}
-    dev: true
-
   registry.npmmirror.com/clipboard/2.0.11:
     resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz}
     name: clipboard
@@ -1224,26 +870,8 @@ packages:
       tiny-emitter: registry.npmmirror.com/tiny-emitter/2.1.0
     dev: false
 
-  registry.npmmirror.com/cliui/7.0.4:
-    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz}
-    name: cliui
-    version: 7.0.4
-    dependencies:
-      string-width: registry.npmmirror.com/string-width/4.2.3
-      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
-      wrap-ansi: registry.npmmirror.com/wrap-ansi/7.0.0
-    dev: true
-
-  registry.npmmirror.com/color-convert/1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz}
-    name: color-convert
-    version: 1.9.3
-    dependencies:
-      color-name: registry.npmmirror.com/color-name/1.1.3
-    dev: true
-
   registry.npmmirror.com/color-convert/2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz}
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz}
     name: color-convert
     version: 2.0.1
     engines: {node: '>=7.0.0'}
@@ -1251,49 +879,36 @@ packages:
       color-name: registry.npmmirror.com/color-name/1.1.4
     dev: true
 
-  registry.npmmirror.com/color-name/1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz}
-    name: color-name
-    version: 1.1.3
-    dev: true
-
   registry.npmmirror.com/color-name/1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz}
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz}
     name: color-name
     version: 1.1.4
     dev: true
 
-  registry.npmmirror.com/color-support/1.1.3:
-    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/color-support/-/color-support-1.1.3.tgz}
-    name: color-support
-    version: 1.1.3
-    hasBin: true
-    dev: true
-
   registry.npmmirror.com/combined-stream/1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz}
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz}
     name: combined-stream
     version: 1.0.8
     engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: registry.npmmirror.com/delayed-stream/1.0.0
-    dev: true
+    dev: false
 
   registry.npmmirror.com/commander/9.2.0:
-    resolution: {integrity: sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/commander/-/commander-9.2.0.tgz}
+    resolution: {integrity: sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/commander/-/commander-9.2.0.tgz}
     name: commander
     version: 9.2.0
     engines: {node: ^12.20.0 || >=14}
     dev: false
 
   registry.npmmirror.com/concat-map/0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz}
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz}
     name: concat-map
     version: 0.0.1
     dev: true
 
   registry.npmmirror.com/connect/3.7.0:
-    resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/connect/-/connect-3.7.0.tgz}
+    resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/connect/-/connect-3.7.0.tgz}
     name: connect
     version: 3.7.0
     engines: {node: '>= 0.10.0'}
@@ -1304,35 +919,8 @@ packages:
       utils-merge: registry.npmmirror.com/utils-merge/1.0.1
     dev: true
 
-  registry.npmmirror.com/console-control-strings/1.1.0:
-    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/console-control-strings/-/console-control-strings-1.1.0.tgz}
-    name: console-control-strings
-    version: 1.1.0
-    dev: true
-
-  registry.npmmirror.com/constantinople/4.0.1:
-    resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/constantinople/-/constantinople-4.0.1.tgz}
-    name: constantinople
-    version: 4.0.1
-    dependencies:
-      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
-      '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
-    dev: true
-
-  registry.npmmirror.com/core-util-is/1.0.2:
-    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz}
-    name: core-util-is
-    version: 1.0.2
-    dev: true
-
-  registry.npmmirror.com/core-util-is/1.0.3:
-    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz}
-    name: core-util-is
-    version: 1.0.3
-    dev: true
-
   registry.npmmirror.com/cross-spawn/7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz}
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz}
     name: cross-spawn
     version: 7.0.3
     engines: {node: '>= 8'}
@@ -1342,29 +930,28 @@ packages:
       which: registry.npmmirror.com/which/2.0.2
     dev: true
 
+  registry.npmmirror.com/cssesc/3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz}
+    name: cssesc
+    version: 3.0.0
+    engines: {node: '>=4'}
+    hasBin: true
+    dev: true
+
   registry.npmmirror.com/csstype/2.6.20:
-    resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz}
+    resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz}
     name: csstype
     version: 2.6.20
     dev: false
 
-  registry.npmmirror.com/dashdash/1.14.1:
-    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz}
-    name: dashdash
-    version: 1.14.1
-    engines: {node: '>=0.10'}
-    dependencies:
-      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
-    dev: true
-
-  registry.npmmirror.com/dayjs/1.11.1:
-    resolution: {integrity: sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.1.tgz}
+  registry.npmmirror.com/dayjs/1.11.2:
+    resolution: {integrity: sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.2.tgz}
     name: dayjs
-    version: 1.11.1
+    version: 1.11.2
     dev: false
 
   registry.npmmirror.com/debug/2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz}
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz}
     name: debug
     version: 2.6.9
     dependencies:
@@ -1372,7 +959,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/debug/4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz}
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz}
     name: debug
     version: 4.3.4
     engines: {node: '>=6.0'}
@@ -1385,42 +972,25 @@ packages:
       ms: registry.npmmirror.com/ms/2.1.2
     dev: true
 
-  registry.npmmirror.com/decamelize-keys/1.1.0:
-    resolution: {integrity: sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz}
-    name: decamelize-keys
-    version: 1.1.0
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      decamelize: registry.npmmirror.com/decamelize/1.2.0
-      map-obj: registry.npmmirror.com/map-obj/1.0.1
-    dev: true
-
-  registry.npmmirror.com/decamelize/1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz}
-    name: decamelize
-    version: 1.2.0
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   registry.npmmirror.com/deep-is/0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz}
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz}
     name: deep-is
     version: 0.1.4
     dev: true
 
   registry.npmmirror.com/deepmerge/4.2.2:
-    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz}
+    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz}
     name: deepmerge
     version: 4.2.2
     engines: {node: '>=0.10.0'}
     dev: true
 
   registry.npmmirror.com/delayed-stream/1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz}
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz}
     name: delayed-stream
     version: 1.0.0
     engines: {node: '>=0.4.0'}
-    dev: true
+    dev: false
 
   registry.npmmirror.com/delegate/3.2.0:
     resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz}
@@ -1428,21 +998,8 @@ packages:
     version: 3.2.0
     dev: false
 
-  registry.npmmirror.com/delegates/1.0.0:
-    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz}
-    name: delegates
-    version: 1.0.0
-    dev: true
-
-  registry.npmmirror.com/depd/1.1.2:
-    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz}
-    name: depd
-    version: 1.1.2
-    engines: {node: '>= 0.6'}
-    dev: true
-
   registry.npmmirror.com/dir-glob/3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz}
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz}
     name: dir-glob
     version: 3.0.1
     engines: {node: '>=8'}
@@ -1451,7 +1008,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/doctrine/3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz}
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz}
     name: doctrine
     version: 3.0.0
     engines: {node: '>=6.0.0'}
@@ -1459,69 +1016,19 @@ packages:
       esutils: registry.npmmirror.com/esutils/2.0.3
     dev: true
 
-  registry.npmmirror.com/doctypes/1.1.0:
-    resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/doctypes/-/doctypes-1.1.0.tgz}
-    name: doctypes
-    version: 1.1.0
+  registry.npmmirror.com/ee-first/1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz}
+    name: ee-first
+    version: 1.1.1
     dev: true
 
-  registry.npmmirror.com/dom-serializer/1.4.1:
-    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz}
-    name: dom-serializer
-    version: 1.4.1
-    dependencies:
-      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
-      domhandler: registry.npmmirror.com/domhandler/4.3.1
-      entities: registry.npmmirror.com/entities/2.2.0
-    dev: true
-
-  registry.npmmirror.com/domelementtype/2.3.0:
-    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz}
-    name: domelementtype
-    version: 2.3.0
-    dev: true
-
-  registry.npmmirror.com/domhandler/4.3.1:
-    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz}
-    name: domhandler
-    version: 4.3.1
-    engines: {node: '>= 4'}
-    dependencies:
-      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
-    dev: true
-
-  registry.npmmirror.com/domutils/2.8.0:
-    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz}
-    name: domutils
-    version: 2.8.0
-    dependencies:
-      dom-serializer: registry.npmmirror.com/dom-serializer/1.4.1
-      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
-      domhandler: registry.npmmirror.com/domhandler/4.3.1
-    dev: true
-
-  registry.npmmirror.com/ecc-jsbn/0.1.2:
-    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz}
-    name: ecc-jsbn
-    version: 0.1.2
-    dependencies:
-      jsbn: registry.npmmirror.com/jsbn/0.1.1
-      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
-    dev: true
-
-  registry.npmmirror.com/ee-first/1.1.1:
-    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz}
-    name: ee-first
-    version: 1.1.1
-    dev: true
-
-  registry.npmmirror.com/element-plus/2.2.0_vue@3.2.33:
-    resolution: {integrity: sha512-zxmAFEAa1T/n09rR+NozXcWl5CjaFtqoaxhFSafag0dgc90tgEHitDXfegdFAl4ahugdNTqu9aLzngx3VhDAtA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.0.tgz}
-    id: registry.npmmirror.com/element-plus/2.2.0
-    name: element-plus
-    version: 2.2.0
-    peerDependencies:
-      vue: ^3.2.0
+  registry.npmmirror.com/element-plus/2.2.0_vue@3.2.33:
+    resolution: {integrity: sha512-zxmAFEAa1T/n09rR+NozXcWl5CjaFtqoaxhFSafag0dgc90tgEHitDXfegdFAl4ahugdNTqu9aLzngx3VhDAtA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.0.tgz}
+    id: registry.npmmirror.com/element-plus/2.2.0
+    name: element-plus
+    version: 2.2.0
+    peerDependencies:
+      vue: ^3.2.0
     dependencies:
       '@ctrl/tinycolor': registry.npmmirror.com/@ctrl/tinycolor/3.4.1
       '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/1.1.4_vue@3.2.33
@@ -1529,13 +1036,13 @@ packages:
       '@popperjs/core': registry.npmmirror.com/@sxzz/popperjs-es/2.11.7
       '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
       '@types/lodash-es': registry.npmmirror.com/@types/lodash-es/4.17.6
-      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
-      async-validator: registry.npmmirror.com/async-validator/4.0.7
-      dayjs: registry.npmmirror.com/dayjs/1.11.1
+      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.5.0_vue@3.2.33
+      async-validator: registry.npmmirror.com/async-validator/4.1.1
+      dayjs: registry.npmmirror.com/dayjs/1.11.2
       escape-html: registry.npmmirror.com/escape-html/1.0.3
       lodash: registry.npmmirror.com/lodash/4.17.21
       lodash-es: registry.npmmirror.com/lodash-es/4.17.21
-      lodash-unified: registry.npmmirror.com/lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd
+      lodash-unified: registry.npmmirror.com/lodash-unified/1.0.2_3ib2ivapxullxkx3xftsimdk7u
       memoize-one: registry.npmmirror.com/memoize-one/6.0.0
       normalize-wheel-es: registry.npmmirror.com/normalize-wheel-es/1.1.2
       vue: registry.npmmirror.com/vue/3.2.33
@@ -1543,76 +1050,17 @@ packages:
       - '@vue/composition-api'
     dev: false
 
-  registry.npmmirror.com/emmet/2.3.6:
-    resolution: {integrity: sha512-pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/emmet/-/emmet-2.3.6.tgz}
-    name: emmet
-    version: 2.3.6
-    dependencies:
-      '@emmetio/abbreviation': registry.npmmirror.com/@emmetio/abbreviation/2.2.3
-      '@emmetio/css-abbreviation': registry.npmmirror.com/@emmetio/css-abbreviation/2.1.4
-    dev: true
-
-  registry.npmmirror.com/emoji-regex/8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz}
-    name: emoji-regex
-    version: 8.0.0
-    dev: true
-
   registry.npmmirror.com/encodeurl/1.0.2:
-    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz}
+    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz}
     name: encodeurl
     version: 1.0.2
     engines: {node: '>= 0.8'}
     dev: true
 
-  registry.npmmirror.com/encoding/0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz}
-    name: encoding
-    version: 0.1.13
-    requiresBuild: true
-    dependencies:
-      iconv-lite: registry.npmmirror.com/iconv-lite/0.6.3
-    dev: true
-    optional: true
-
-  registry.npmmirror.com/entities/2.2.0:
-    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz}
-    name: entities
-    version: 2.2.0
-    dev: true
-
-  registry.npmmirror.com/entities/3.0.1:
-    resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz}
-    name: entities
-    version: 3.0.1
-    engines: {node: '>=0.12'}
-    dev: true
-
-  registry.npmmirror.com/env-paths/2.2.1:
-    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/env-paths/-/env-paths-2.2.1.tgz}
-    name: env-paths
-    version: 2.2.1
-    engines: {node: '>=6'}
-    dev: true
-
-  registry.npmmirror.com/err-code/2.0.3:
-    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/err-code/-/err-code-2.0.3.tgz}
-    name: err-code
-    version: 2.0.3
-    dev: true
-
-  registry.npmmirror.com/error-ex/1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz}
-    name: error-ex
-    version: 1.3.2
-    dependencies:
-      is-arrayish: registry.npmmirror.com/is-arrayish/0.2.1
-    dev: true
-
-  registry.npmmirror.com/esbuild-android-64/0.14.36:
-    resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-android-64/0.14.39:
+    resolution: {integrity: sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz}
     name: esbuild-android-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -1620,10 +1068,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-android-arm64/0.14.36:
-    resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-android-arm64/0.14.39:
+    resolution: {integrity: sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz}
     name: esbuild-android-arm64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -1631,10 +1079,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-darwin-64/0.14.36:
-    resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-darwin-64/0.14.39:
+    resolution: {integrity: sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz}
     name: esbuild-darwin-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -1642,10 +1090,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-darwin-arm64/0.14.36:
-    resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-darwin-arm64/0.14.39:
+    resolution: {integrity: sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz}
     name: esbuild-darwin-arm64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -1653,10 +1101,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-freebsd-64/0.14.36:
-    resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-freebsd-64/0.14.39:
+    resolution: {integrity: sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz}
     name: esbuild-freebsd-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -1664,10 +1112,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-freebsd-arm64/0.14.36:
-    resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-freebsd-arm64/0.14.39:
+    resolution: {integrity: sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz}
     name: esbuild-freebsd-arm64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -1675,10 +1123,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-32/0.14.36:
-    resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-32/0.14.39:
+    resolution: {integrity: sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz}
     name: esbuild-linux-32
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -1686,10 +1134,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-64/0.14.36:
-    resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-64/0.14.39:
+    resolution: {integrity: sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz}
     name: esbuild-linux-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -1697,10 +1145,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-arm/0.14.36:
-    resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-arm/0.14.39:
+    resolution: {integrity: sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz}
     name: esbuild-linux-arm
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -1708,10 +1156,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-arm64/0.14.36:
-    resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-arm64/0.14.39:
+    resolution: {integrity: sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz}
     name: esbuild-linux-arm64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -1719,10 +1167,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-mips64le/0.14.36:
-    resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-mips64le/0.14.39:
+    resolution: {integrity: sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz}
     name: esbuild-linux-mips64le
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -1730,10 +1178,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-ppc64le/0.14.36:
-    resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-ppc64le/0.14.39:
+    resolution: {integrity: sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz}
     name: esbuild-linux-ppc64le
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -1741,10 +1189,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-riscv64/0.14.36:
-    resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-riscv64/0.14.39:
+    resolution: {integrity: sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz}
     name: esbuild-linux-riscv64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -1752,10 +1200,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-linux-s390x/0.14.36:
-    resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-linux-s390x/0.14.39:
+    resolution: {integrity: sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz}
     name: esbuild-linux-s390x
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -1763,10 +1211,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-netbsd-64/0.14.36:
-    resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-netbsd-64/0.14.39:
+    resolution: {integrity: sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz}
     name: esbuild-netbsd-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -1774,10 +1222,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-openbsd-64/0.14.36:
-    resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-openbsd-64/0.14.39:
+    resolution: {integrity: sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz}
     name: esbuild-openbsd-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -1785,10 +1233,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-sunos-64/0.14.36:
-    resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-sunos-64/0.14.39:
+    resolution: {integrity: sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz}
     name: esbuild-sunos-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -1796,10 +1244,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-windows-32/0.14.36:
-    resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-windows-32/0.14.39:
+    resolution: {integrity: sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz}
     name: esbuild-windows-32
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -1807,10 +1255,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-windows-64/0.14.36:
-    resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-windows-64/0.14.39:
+    resolution: {integrity: sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz}
     name: esbuild-windows-64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -1818,10 +1266,10 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/esbuild-windows-arm64/0.14.36:
-    resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz}
+  registry.npmmirror.com/esbuild-windows-arm64/0.14.39:
+    resolution: {integrity: sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz}
     name: esbuild-windows-arm64
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -1830,48 +1278,41 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild/0.11.3:
-    resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.11.3.tgz}
+    resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.11.3.tgz}
     name: esbuild
     version: 0.11.3
     hasBin: true
     requiresBuild: true
     dev: true
 
-  registry.npmmirror.com/esbuild/0.14.36:
-    resolution: {integrity: sha512-HhFHPiRXGYOCRlrhpiVDYKcFJRdO0sBElZ668M4lh2ER0YgnkLxECuFe7uWCf23FrcLc59Pqr7dHkTqmRPDHmw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.14.36.tgz}
+  registry.npmmirror.com/esbuild/0.14.39:
+    resolution: {integrity: sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.14.39.tgz}
     name: esbuild
-    version: 0.14.36
+    version: 0.14.39
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      esbuild-android-64: registry.npmmirror.com/esbuild-android-64/0.14.36
-      esbuild-android-arm64: registry.npmmirror.com/esbuild-android-arm64/0.14.36
-      esbuild-darwin-64: registry.npmmirror.com/esbuild-darwin-64/0.14.36
-      esbuild-darwin-arm64: registry.npmmirror.com/esbuild-darwin-arm64/0.14.36
-      esbuild-freebsd-64: registry.npmmirror.com/esbuild-freebsd-64/0.14.36
-      esbuild-freebsd-arm64: registry.npmmirror.com/esbuild-freebsd-arm64/0.14.36
-      esbuild-linux-32: registry.npmmirror.com/esbuild-linux-32/0.14.36
-      esbuild-linux-64: registry.npmmirror.com/esbuild-linux-64/0.14.36
-      esbuild-linux-arm: registry.npmmirror.com/esbuild-linux-arm/0.14.36
-      esbuild-linux-arm64: registry.npmmirror.com/esbuild-linux-arm64/0.14.36
-      esbuild-linux-mips64le: registry.npmmirror.com/esbuild-linux-mips64le/0.14.36
-      esbuild-linux-ppc64le: registry.npmmirror.com/esbuild-linux-ppc64le/0.14.36
-      esbuild-linux-riscv64: registry.npmmirror.com/esbuild-linux-riscv64/0.14.36
-      esbuild-linux-s390x: registry.npmmirror.com/esbuild-linux-s390x/0.14.36
-      esbuild-netbsd-64: registry.npmmirror.com/esbuild-netbsd-64/0.14.36
-      esbuild-openbsd-64: registry.npmmirror.com/esbuild-openbsd-64/0.14.36
-      esbuild-sunos-64: registry.npmmirror.com/esbuild-sunos-64/0.14.36
-      esbuild-windows-32: registry.npmmirror.com/esbuild-windows-32/0.14.36
-      esbuild-windows-64: registry.npmmirror.com/esbuild-windows-64/0.14.36
-      esbuild-windows-arm64: registry.npmmirror.com/esbuild-windows-arm64/0.14.36
-    dev: true
-
-  registry.npmmirror.com/escalade/3.1.1:
-    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz}
-    name: escalade
-    version: 3.1.1
-    engines: {node: '>=6'}
+      esbuild-android-64: registry.npmmirror.com/esbuild-android-64/0.14.39
+      esbuild-android-arm64: registry.npmmirror.com/esbuild-android-arm64/0.14.39
+      esbuild-darwin-64: registry.npmmirror.com/esbuild-darwin-64/0.14.39
+      esbuild-darwin-arm64: registry.npmmirror.com/esbuild-darwin-arm64/0.14.39
+      esbuild-freebsd-64: registry.npmmirror.com/esbuild-freebsd-64/0.14.39
+      esbuild-freebsd-arm64: registry.npmmirror.com/esbuild-freebsd-arm64/0.14.39
+      esbuild-linux-32: registry.npmmirror.com/esbuild-linux-32/0.14.39
+      esbuild-linux-64: registry.npmmirror.com/esbuild-linux-64/0.14.39
+      esbuild-linux-arm: registry.npmmirror.com/esbuild-linux-arm/0.14.39
+      esbuild-linux-arm64: registry.npmmirror.com/esbuild-linux-arm64/0.14.39
+      esbuild-linux-mips64le: registry.npmmirror.com/esbuild-linux-mips64le/0.14.39
+      esbuild-linux-ppc64le: registry.npmmirror.com/esbuild-linux-ppc64le/0.14.39
+      esbuild-linux-riscv64: registry.npmmirror.com/esbuild-linux-riscv64/0.14.39
+      esbuild-linux-s390x: registry.npmmirror.com/esbuild-linux-s390x/0.14.39
+      esbuild-netbsd-64: registry.npmmirror.com/esbuild-netbsd-64/0.14.39
+      esbuild-openbsd-64: registry.npmmirror.com/esbuild-openbsd-64/0.14.39
+      esbuild-sunos-64: registry.npmmirror.com/esbuild-sunos-64/0.14.39
+      esbuild-windows-32: registry.npmmirror.com/esbuild-windows-32/0.14.39
+      esbuild-windows-64: registry.npmmirror.com/esbuild-windows-64/0.14.39
+      esbuild-windows-arm64: registry.npmmirror.com/esbuild-windows-arm64/0.14.39
     dev: true
 
   registry.npmmirror.com/escape-html/1.0.3:
@@ -1879,22 +1320,15 @@ packages:
     name: escape-html
     version: 1.0.3
 
-  registry.npmmirror.com/escape-string-regexp/1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz}
-    name: escape-string-regexp
-    version: 1.0.5
-    engines: {node: '>=0.8.0'}
-    dev: true
-
   registry.npmmirror.com/escape-string-regexp/4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}
     name: escape-string-regexp
     version: 4.0.0
     engines: {node: '>=10'}
     dev: true
 
-  registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0:
-    resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz}
+  registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.15.0:
+    resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz}
     id: registry.npmmirror.com/eslint-config-prettier/8.5.0
     name: eslint-config-prettier
     version: 8.5.0
@@ -1902,11 +1336,11 @@ packages:
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint: registry.npmmirror.com/eslint/8.15.0
     dev: true
 
-  registry.npmmirror.com/eslint-plugin-prettier/4.0.0_1815ac95b7fb26c13c7d48a8eef62d0f:
-    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz}
+  registry.npmmirror.com/eslint-plugin-prettier/4.0.0_iqftbjqlxzn3ny5nablrkczhqi:
+    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz}
     id: registry.npmmirror.com/eslint-plugin-prettier/4.0.0
     name: eslint-plugin-prettier
     version: 4.0.0
@@ -1919,32 +1353,34 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: registry.npmmirror.com/eslint/8.13.0
-      eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.13.0
+      eslint: registry.npmmirror.com/eslint/8.15.0
+      eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.15.0
       prettier: registry.npmmirror.com/prettier/2.6.2
       prettier-linter-helpers: registry.npmmirror.com/prettier-linter-helpers/1.0.0
     dev: true
 
-  registry.npmmirror.com/eslint-plugin-vue/8.6.0_eslint@8.13.0:
-    resolution: {integrity: sha512-abXiF2J18n/7ZPy9foSlJyouKf54IqpKlNvNmzhM93N0zs3QUxZG/oBd3tVPOJTKg7SlhBUtPxugpqzNbgGpQQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.6.0.tgz}
-    id: registry.npmmirror.com/eslint-plugin-vue/8.6.0
+  registry.npmmirror.com/eslint-plugin-vue/8.7.1_eslint@8.15.0:
+    resolution: {integrity: sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz}
+    id: registry.npmmirror.com/eslint-plugin-vue/8.7.1
     name: eslint-plugin-vue
-    version: 8.6.0
+    version: 8.7.1
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      eslint: registry.npmmirror.com/eslint/8.13.0
-      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0
+      eslint: registry.npmmirror.com/eslint/8.15.0
+      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.15.0
       natural-compare: registry.npmmirror.com/natural-compare/1.4.0
+      nth-check: registry.npmmirror.com/nth-check/2.0.1
+      postcss-selector-parser: registry.npmmirror.com/postcss-selector-parser/6.0.10
       semver: registry.npmmirror.com/semver/7.3.7
-      vue-eslint-parser: registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.13.0
+      vue-eslint-parser: registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.15.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
   registry.npmmirror.com/eslint-scope/5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz}
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz}
     name: eslint-scope
     version: 5.1.1
     engines: {node: '>=8.0.0'}
@@ -1954,7 +1390,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/eslint-scope/7.1.1:
-    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.1.1.tgz}
+    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.1.1.tgz}
     name: eslint-scope
     version: 7.1.1
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1963,8 +1399,8 @@ packages:
       estraverse: registry.npmmirror.com/estraverse/5.3.0
     dev: true
 
-  registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0:
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-utils/-/eslint-utils-3.0.0.tgz}
+  registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.15.0:
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-utils/-/eslint-utils-3.0.0.tgz}
     id: registry.npmmirror.com/eslint-utils/3.0.0
     name: eslint-utils
     version: 3.0.0
@@ -1972,32 +1408,32 @@ packages:
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint: registry.npmmirror.com/eslint/8.15.0
       eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/2.1.0
     dev: true
 
   registry.npmmirror.com/eslint-visitor-keys/2.1.0:
-    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz}
+    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz}
     name: eslint-visitor-keys
     version: 2.1.0
     engines: {node: '>=10'}
     dev: true
 
   registry.npmmirror.com/eslint-visitor-keys/3.3.0:
-    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz}
+    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz}
     name: eslint-visitor-keys
     version: 3.3.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  registry.npmmirror.com/eslint/8.13.0:
-    resolution: {integrity: sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint/-/eslint-8.13.0.tgz}
+  registry.npmmirror.com/eslint/8.15.0:
+    resolution: {integrity: sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint/-/eslint-8.15.0.tgz}
     name: eslint
-    version: 8.13.0
+    version: 8.15.0
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': registry.npmmirror.com/@eslint/eslintrc/1.2.1
+      '@eslint/eslintrc': registry.npmmirror.com/@eslint/eslintrc/1.2.3
       '@humanwhocodes/config-array': registry.npmmirror.com/@humanwhocodes/config-array/0.9.5
       ajv: registry.npmmirror.com/ajv/6.12.6
       chalk: registry.npmmirror.com/chalk/4.1.2
@@ -2006,16 +1442,16 @@ packages:
       doctrine: registry.npmmirror.com/doctrine/3.0.0
       escape-string-regexp: registry.npmmirror.com/escape-string-regexp/4.0.0
       eslint-scope: registry.npmmirror.com/eslint-scope/7.1.1
-      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.13.0
+      eslint-utils: registry.npmmirror.com/eslint-utils/3.0.0_eslint@8.15.0
       eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
-      espree: registry.npmmirror.com/espree/9.3.1
+      espree: registry.npmmirror.com/espree/9.3.2
       esquery: registry.npmmirror.com/esquery/1.4.0
       esutils: registry.npmmirror.com/esutils/2.0.3
       fast-deep-equal: registry.npmmirror.com/fast-deep-equal/3.1.3
       file-entry-cache: registry.npmmirror.com/file-entry-cache/6.0.1
       functional-red-black-tree: registry.npmmirror.com/functional-red-black-tree/1.0.1
       glob-parent: registry.npmmirror.com/glob-parent/6.0.2
-      globals: registry.npmmirror.com/globals/13.13.0
+      globals: registry.npmmirror.com/globals/13.15.0
       ignore: registry.npmmirror.com/ignore/5.2.0
       import-fresh: registry.npmmirror.com/import-fresh/3.3.0
       imurmurhash: registry.npmmirror.com/imurmurhash/0.1.4
@@ -2036,19 +1472,19 @@ packages:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/espree/9.3.1:
-    resolution: {integrity: sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/espree/-/espree-9.3.1.tgz}
+  registry.npmmirror.com/espree/9.3.2:
+    resolution: {integrity: sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/espree/-/espree-9.3.2.tgz}
     name: espree
-    version: 9.3.1
+    version: 9.3.2
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: registry.npmmirror.com/acorn/8.7.0
-      acorn-jsx: registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.0
+      acorn: registry.npmmirror.com/acorn/8.7.1
+      acorn-jsx: registry.npmmirror.com/acorn-jsx/5.3.2_acorn@8.7.1
       eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
     dev: true
 
   registry.npmmirror.com/esquery/1.4.0:
-    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esquery/-/esquery-1.4.0.tgz}
+    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esquery/-/esquery-1.4.0.tgz}
     name: esquery
     version: 1.4.0
     engines: {node: '>=0.10'}
@@ -2057,7 +1493,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/esrecurse/4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz}
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz}
     name: esrecurse
     version: 4.3.0
     engines: {node: '>=4.0'}
@@ -2066,64 +1502,51 @@ packages:
     dev: true
 
   registry.npmmirror.com/estraverse/4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz}
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz}
     name: estraverse
     version: 4.3.0
     engines: {node: '>=4.0'}
     dev: true
 
   registry.npmmirror.com/estraverse/5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz}
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz}
     name: estraverse
     version: 5.3.0
     engines: {node: '>=4.0'}
     dev: true
 
   registry.npmmirror.com/estree-walker/1.0.1:
-    resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-1.0.1.tgz}
+    resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-1.0.1.tgz}
     name: estree-walker
     version: 1.0.1
     dev: true
 
   registry.npmmirror.com/estree-walker/2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz}
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz}
     name: estree-walker
     version: 2.0.2
 
   registry.npmmirror.com/esutils/2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz}
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz}
     name: esutils
     version: 2.0.3
     engines: {node: '>=0.10.0'}
     dev: true
 
-  registry.npmmirror.com/extend/3.0.2:
-    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz}
-    name: extend
-    version: 3.0.2
-    dev: true
-
-  registry.npmmirror.com/extsprintf/1.3.0:
-    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/extsprintf/-/extsprintf-1.3.0.tgz}
-    name: extsprintf
-    version: 1.3.0
-    engines: {'0': node >=0.6.0}
-    dev: true
-
   registry.npmmirror.com/fast-deep-equal/3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz}
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz}
     name: fast-deep-equal
     version: 3.1.3
     dev: true
 
   registry.npmmirror.com/fast-diff/1.2.0:
-    resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz}
+    resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz}
     name: fast-diff
     version: 1.2.0
     dev: true
 
   registry.npmmirror.com/fast-glob/3.2.11:
-    resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.11.tgz}
+    resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.11.tgz}
     name: fast-glob
     version: 3.2.11
     engines: {node: '>=8.6.0'}
@@ -2136,19 +1559,19 @@ packages:
     dev: true
 
   registry.npmmirror.com/fast-json-stable-stringify/2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz}
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz}
     name: fast-json-stable-stringify
     version: 2.1.0
     dev: true
 
   registry.npmmirror.com/fast-levenshtein/2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz}
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz}
     name: fast-levenshtein
     version: 2.0.6
     dev: true
 
   registry.npmmirror.com/fastq/1.13.0:
-    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fastq/-/fastq-1.13.0.tgz}
+    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fastq/-/fastq-1.13.0.tgz}
     name: fastq
     version: 1.13.0
     dependencies:
@@ -2156,7 +1579,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/file-entry-cache/6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz}
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz}
     name: file-entry-cache
     version: 6.0.1
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -2165,7 +1588,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/fill-range/7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz}
+    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz}
     name: fill-range
     version: 7.0.1
     engines: {node: '>=8'}
@@ -2174,7 +1597,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/finalhandler/1.1.2:
-    resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/finalhandler/-/finalhandler-1.1.2.tgz}
+    resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/finalhandler/-/finalhandler-1.1.2.tgz}
     name: finalhandler
     version: 1.1.2
     engines: {node: '>= 0.8'}
@@ -2188,18 +1611,8 @@ packages:
       unpipe: registry.npmmirror.com/unpipe/1.0.0
     dev: true
 
-  registry.npmmirror.com/find-up/4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz}
-    name: find-up
-    version: 4.1.0
-    engines: {node: '>=8'}
-    dependencies:
-      locate-path: registry.npmmirror.com/locate-path/5.0.0
-      path-exists: registry.npmmirror.com/path-exists/4.0.0
-    dev: true
-
   registry.npmmirror.com/flat-cache/3.0.4:
-    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flat-cache/-/flat-cache-3.0.4.tgz}
+    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flat-cache/-/flat-cache-3.0.4.tgz}
     name: flat-cache
     version: 3.0.4
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -2209,15 +1622,15 @@ packages:
     dev: true
 
   registry.npmmirror.com/flatted/3.2.5:
-    resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flatted/-/flatted-3.2.5.tgz}
+    resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/flatted/-/flatted-3.2.5.tgz}
     name: flatted
     version: 3.2.5
     dev: true
 
-  registry.npmmirror.com/follow-redirects/1.14.9:
-    resolution: {integrity: sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.14.9.tgz}
+  registry.npmmirror.com/follow-redirects/1.15.0:
+    resolution: {integrity: sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.0.tgz}
     name: follow-redirects
-    version: 1.14.9
+    version: 1.15.0
     engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
@@ -2226,34 +1639,19 @@ packages:
         optional: true
     dev: false
 
-  registry.npmmirror.com/forever-agent/0.6.1:
-    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/forever-agent/-/forever-agent-0.6.1.tgz}
-    name: forever-agent
-    version: 0.6.1
-    dev: true
-
-  registry.npmmirror.com/form-data/2.3.3:
-    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/form-data/-/form-data-2.3.3.tgz}
+  registry.npmmirror.com/form-data/4.0.0:
+    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz}
     name: form-data
-    version: 2.3.3
-    engines: {node: '>= 0.12'}
+    version: 4.0.0
+    engines: {node: '>= 6'}
     dependencies:
       asynckit: registry.npmmirror.com/asynckit/0.4.0
       combined-stream: registry.npmmirror.com/combined-stream/1.0.8
       mime-types: registry.npmmirror.com/mime-types/2.1.35
-    dev: true
-
-  registry.npmmirror.com/fs-minipass/2.1.0:
-    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz}
-    name: fs-minipass
-    version: 2.1.0
-    engines: {node: '>= 8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-    dev: true
+    dev: false
 
   registry.npmmirror.com/fs.realpath/1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz}
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz}
     name: fs.realpath
     version: 1.0.0
     dev: true
@@ -2269,98 +1667,35 @@ packages:
     optional: true
 
   registry.npmmirror.com/function-bind/1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz}
+    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz}
     name: function-bind
     version: 1.1.1
 
   registry.npmmirror.com/functional-red-black-tree/1.0.1:
-    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz}
+    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz}
     name: functional-red-black-tree
     version: 1.0.1
     dev: true
 
-  registry.npmmirror.com/fuse.js/6.6.1:
-    resolution: {integrity: sha512-3PXxXYsdKm68JHY6o2I9gIY+z9LcPs/ROITSzwFZyo0McjShwPFJU2i81Iu4h4si5X7JrrgXtOLDkeiTjdnWFQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.1.tgz}
+  registry.npmmirror.com/fuse.js/6.6.2:
+    resolution: {integrity: sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.2.tgz}
     name: fuse.js
-    version: 6.6.1
+    version: 6.6.2
     engines: {node: '>=10'}
     dev: false
 
-  registry.npmmirror.com/gauge/3.0.2:
-    resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/gauge/-/gauge-3.0.2.tgz}
-    name: gauge
-    version: 3.0.2
-    engines: {node: '>=10'}
-    dependencies:
-      aproba: registry.npmmirror.com/aproba/2.0.0
-      color-support: registry.npmmirror.com/color-support/1.1.3
-      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
-      has-unicode: registry.npmmirror.com/has-unicode/2.0.1
-      object-assign: registry.npmmirror.com/object-assign/4.1.1
-      signal-exit: registry.npmmirror.com/signal-exit/3.0.7
-      string-width: registry.npmmirror.com/string-width/4.2.3
-      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
-      wide-align: registry.npmmirror.com/wide-align/1.1.5
-    dev: true
-
-  registry.npmmirror.com/gauge/4.0.4:
-    resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/gauge/-/gauge-4.0.4.tgz}
-    name: gauge
-    version: 4.0.4
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      aproba: registry.npmmirror.com/aproba/2.0.0
-      color-support: registry.npmmirror.com/color-support/1.1.3
-      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
-      has-unicode: registry.npmmirror.com/has-unicode/2.0.1
-      signal-exit: registry.npmmirror.com/signal-exit/3.0.7
-      string-width: registry.npmmirror.com/string-width/4.2.3
-      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
-      wide-align: registry.npmmirror.com/wide-align/1.1.5
-    dev: true
-
-  registry.npmmirror.com/gaze/1.1.3:
-    resolution: {integrity: sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz}
-    name: gaze
-    version: 1.1.3
-    engines: {node: '>= 4.0.0'}
-    dependencies:
-      globule: registry.npmmirror.com/globule/1.3.3
-    dev: true
-
-  registry.npmmirror.com/get-caller-file/2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz}
-    name: get-caller-file
-    version: 2.0.5
-    engines: {node: 6.* || 8.* || >= 10.*}
-    dev: true
-
   registry.npmmirror.com/get-intrinsic/1.1.1:
-    resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz}
+    resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz}
     name: get-intrinsic
     version: 1.1.1
     dependencies:
       function-bind: registry.npmmirror.com/function-bind/1.1.1
       has: registry.npmmirror.com/has/1.0.3
       has-symbols: registry.npmmirror.com/has-symbols/1.0.3
-
-  registry.npmmirror.com/get-stdin/4.0.1:
-    resolution: {integrity: sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz}
-    name: get-stdin
-    version: 4.0.1
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  registry.npmmirror.com/getpass/0.1.7:
-    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/getpass/-/getpass-0.1.7.tgz}
-    name: getpass
-    version: 0.1.7
-    dependencies:
-      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
-    dev: true
+    dev: false
 
   registry.npmmirror.com/glob-parent/5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz}
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz}
     name: glob-parent
     version: 5.1.2
     engines: {node: '>= 6'}
@@ -2369,7 +1704,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/glob-parent/6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz}
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz}
     name: glob-parent
     version: 6.0.2
     engines: {node: '>=10.13.0'}
@@ -2377,23 +1712,10 @@ packages:
       is-glob: registry.npmmirror.com/is-glob/4.0.3
     dev: true
 
-  registry.npmmirror.com/glob/7.1.7:
-    resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz}
-    name: glob
-    version: 7.1.7
-    dependencies:
-      fs.realpath: registry.npmmirror.com/fs.realpath/1.0.0
-      inflight: registry.npmmirror.com/inflight/1.0.6
-      inherits: registry.npmmirror.com/inherits/2.0.4
-      minimatch: registry.npmmirror.com/minimatch/3.1.2
-      once: registry.npmmirror.com/once/1.4.0
-      path-is-absolute: registry.npmmirror.com/path-is-absolute/1.0.1
-    dev: true
-
-  registry.npmmirror.com/glob/7.2.0:
-    resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob/-/glob-7.2.0.tgz}
+  registry.npmmirror.com/glob/7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz}
     name: glob
-    version: 7.2.0
+    version: 7.2.3
     dependencies:
       fs.realpath: registry.npmmirror.com/fs.realpath/1.0.0
       inflight: registry.npmmirror.com/inflight/1.0.6
@@ -2403,17 +1725,17 @@ packages:
       path-is-absolute: registry.npmmirror.com/path-is-absolute/1.0.1
     dev: true
 
-  registry.npmmirror.com/globals/13.13.0:
-    resolution: {integrity: sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globals/-/globals-13.13.0.tgz}
+  registry.npmmirror.com/globals/13.15.0:
+    resolution: {integrity: sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globals/-/globals-13.15.0.tgz}
     name: globals
-    version: 13.13.0
+    version: 13.15.0
     engines: {node: '>=8'}
     dependencies:
       type-fest: registry.npmmirror.com/type-fest/0.20.2
     dev: true
 
   registry.npmmirror.com/globby/11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globby/-/globby-11.1.0.tgz}
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globby/-/globby-11.1.0.tgz}
     name: globby
     version: 11.1.0
     engines: {node: '>=10'}
@@ -2426,17 +1748,6 @@ packages:
       slash: registry.npmmirror.com/slash/3.0.0
     dev: true
 
-  registry.npmmirror.com/globule/1.3.3:
-    resolution: {integrity: sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/globule/-/globule-1.3.3.tgz}
-    name: globule
-    version: 1.3.3
-    engines: {node: '>= 0.10'}
-    dependencies:
-      glob: registry.npmmirror.com/glob/7.1.7
-      lodash: registry.npmmirror.com/lodash/4.17.21
-      minimatch: registry.npmmirror.com/minimatch/3.0.8
-    dev: true
-
   registry.npmmirror.com/good-listener/1.2.2:
     resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz}
     name: good-listener
@@ -2445,181 +1756,43 @@ packages:
       delegate: registry.npmmirror.com/delegate/3.2.0
     dev: false
 
-  registry.npmmirror.com/graceful-fs/4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
-    name: graceful-fs
-    version: 4.2.10
-    dev: true
-
-  registry.npmmirror.com/har-schema/2.0.0:
-    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz}
-    name: har-schema
-    version: 2.0.0
-    engines: {node: '>=4'}
-    dev: true
-
-  registry.npmmirror.com/har-validator/5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/har-validator/-/har-validator-5.1.5.tgz}
-    name: har-validator
-    version: 5.1.5
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
-    dependencies:
-      ajv: registry.npmmirror.com/ajv/6.12.6
-      har-schema: registry.npmmirror.com/har-schema/2.0.0
-    dev: true
-
-  registry.npmmirror.com/hard-rejection/2.1.0:
-    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/hard-rejection/-/hard-rejection-2.1.0.tgz}
-    name: hard-rejection
-    version: 2.1.0
-    engines: {node: '>=6'}
-    dev: true
-
-  registry.npmmirror.com/has-flag/3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz}
-    name: has-flag
-    version: 3.0.0
-    engines: {node: '>=4'}
-    dev: true
-
   registry.npmmirror.com/has-flag/4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz}
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz}
     name: has-flag
     version: 4.0.0
     engines: {node: '>=8'}
     dev: true
 
   registry.npmmirror.com/has-symbols/1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz}
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz}
     name: has-symbols
     version: 1.0.3
     engines: {node: '>= 0.4'}
-
-  registry.npmmirror.com/has-tostringtag/1.0.0:
-    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz}
-    name: has-tostringtag
-    version: 1.0.0
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: registry.npmmirror.com/has-symbols/1.0.3
-    dev: true
-
-  registry.npmmirror.com/has-unicode/2.0.1:
-    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has-unicode/-/has-unicode-2.0.1.tgz}
-    name: has-unicode
-    version: 2.0.1
-    dev: true
+    dev: false
 
   registry.npmmirror.com/has/1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has/-/has-1.0.3.tgz}
+    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/has/-/has-1.0.3.tgz}
     name: has
     version: 1.0.3
     engines: {node: '>= 0.4.0'}
     dependencies:
       function-bind: registry.npmmirror.com/function-bind/1.1.1
 
-  registry.npmmirror.com/hosted-git-info/2.8.9:
-    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz}
-    name: hosted-git-info
-    version: 2.8.9
-    dev: true
-
-  registry.npmmirror.com/hosted-git-info/4.1.0:
-    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz}
-    name: hosted-git-info
-    version: 4.1.0
-    engines: {node: '>=10'}
-    dependencies:
-      lru-cache: registry.npmmirror.com/lru-cache/6.0.0
-    dev: true
-
-  registry.npmmirror.com/htmlparser2/7.2.0:
-    resolution: {integrity: sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/htmlparser2/-/htmlparser2-7.2.0.tgz}
-    name: htmlparser2
-    version: 7.2.0
-    dependencies:
-      domelementtype: registry.npmmirror.com/domelementtype/2.3.0
-      domhandler: registry.npmmirror.com/domhandler/4.3.1
-      domutils: registry.npmmirror.com/domutils/2.8.0
-      entities: registry.npmmirror.com/entities/3.0.1
-    dev: true
-
-  registry.npmmirror.com/http-cache-semantics/4.1.0:
-    resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz}
-    name: http-cache-semantics
-    version: 4.1.0
-    dev: true
-
-  registry.npmmirror.com/http-proxy-agent/4.0.1:
-    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz}
-    name: http-proxy-agent
-    version: 4.0.1
-    engines: {node: '>= 6'}
-    dependencies:
-      '@tootallnate/once': registry.npmmirror.com/@tootallnate/once/1.1.2
-      agent-base: registry.npmmirror.com/agent-base/6.0.2
-      debug: registry.npmmirror.com/debug/4.3.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/http-signature/1.2.0:
-    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz}
-    name: http-signature
-    version: 1.2.0
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
-    dependencies:
-      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
-      jsprim: registry.npmmirror.com/jsprim/1.4.2
-      sshpk: registry.npmmirror.com/sshpk/1.17.0
-    dev: true
-
-  registry.npmmirror.com/https-proxy-agent/5.0.1:
-    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz}
-    name: https-proxy-agent
-    version: 5.0.1
-    engines: {node: '>= 6'}
-    dependencies:
-      agent-base: registry.npmmirror.com/agent-base/6.0.2
-      debug: registry.npmmirror.com/debug/4.3.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/humanize-ms/1.2.1:
-    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/humanize-ms/-/humanize-ms-1.2.1.tgz}
-    name: humanize-ms
-    version: 1.2.1
-    dependencies:
-      ms: registry.npmmirror.com/ms/2.1.2
-    dev: true
-
-  registry.npmmirror.com/iconv-lite/0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz}
-    name: iconv-lite
-    version: 0.6.3
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
-    dev: true
-    optional: true
-
   registry.npmmirror.com/ignore/5.2.0:
-    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ignore/-/ignore-5.2.0.tgz}
+    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ignore/-/ignore-5.2.0.tgz}
     name: ignore
     version: 5.2.0
     engines: {node: '>= 4'}
     dev: true
 
   registry.npmmirror.com/immutable/4.0.0:
-    resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/immutable/-/immutable-4.0.0.tgz}
+    resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/immutable/-/immutable-4.0.0.tgz}
     name: immutable
     version: 4.0.0
     dev: true
 
   registry.npmmirror.com/import-fresh/3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz}
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz}
     name: import-fresh
     version: 3.3.0
     engines: {node: '>=6'}
@@ -2629,27 +1802,14 @@ packages:
     dev: true
 
   registry.npmmirror.com/imurmurhash/0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz}
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz}
     name: imurmurhash
     version: 0.1.4
     engines: {node: '>=0.8.19'}
     dev: true
 
-  registry.npmmirror.com/indent-string/4.0.0:
-    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/indent-string/-/indent-string-4.0.0.tgz}
-    name: indent-string
-    version: 4.0.0
-    engines: {node: '>=8'}
-    dev: true
-
-  registry.npmmirror.com/infer-owner/1.0.4:
-    resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/infer-owner/-/infer-owner-1.0.4.tgz}
-    name: infer-owner
-    version: 1.0.4
-    dev: true
-
   registry.npmmirror.com/inflight/1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz}
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz}
     name: inflight
     version: 1.0.6
     dependencies:
@@ -2658,25 +1818,13 @@ packages:
     dev: true
 
   registry.npmmirror.com/inherits/2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz}
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz}
     name: inherits
     version: 2.0.4
     dev: true
 
-  registry.npmmirror.com/ip/1.1.5:
-    resolution: {integrity: sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ip/-/ip-1.1.5.tgz}
-    name: ip
-    version: 1.1.5
-    dev: true
-
-  registry.npmmirror.com/is-arrayish/0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz}
-    name: is-arrayish
-    version: 0.2.1
-    dev: true
-
   registry.npmmirror.com/is-binary-path/2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz}
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz}
     name: is-binary-path
     version: 2.1.0
     engines: {node: '>=8'}
@@ -2684,39 +1832,32 @@ packages:
       binary-extensions: registry.npmmirror.com/binary-extensions/2.2.0
     dev: true
 
-  registry.npmmirror.com/is-core-module/2.8.1:
-    resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz}
-    name: is-core-module
-    version: 2.8.1
+  registry.npmmirror.com/is-builtin-module/3.1.0:
+    resolution: {integrity: sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-builtin-module/-/is-builtin-module-3.1.0.tgz}
+    name: is-builtin-module
+    version: 3.1.0
+    engines: {node: '>=6'}
     dependencies:
-      has: registry.npmmirror.com/has/1.0.3
+      builtin-modules: registry.npmmirror.com/builtin-modules/3.3.0
     dev: true
 
-  registry.npmmirror.com/is-expression/4.0.0:
-    resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-expression/-/is-expression-4.0.0.tgz}
-    name: is-expression
-    version: 4.0.0
+  registry.npmmirror.com/is-core-module/2.9.0:
+    resolution: {integrity: sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-core-module/-/is-core-module-2.9.0.tgz}
+    name: is-core-module
+    version: 2.9.0
     dependencies:
-      acorn: registry.npmmirror.com/acorn/7.4.1
-      object-assign: registry.npmmirror.com/object-assign/4.1.1
+      has: registry.npmmirror.com/has/1.0.3
     dev: true
 
   registry.npmmirror.com/is-extglob/2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz}
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz}
     name: is-extglob
     version: 2.1.1
     engines: {node: '>=0.10.0'}
     dev: true
 
-  registry.npmmirror.com/is-fullwidth-code-point/3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz}
-    name: is-fullwidth-code-point
-    version: 3.0.0
-    engines: {node: '>=8'}
-    dev: true
-
   registry.npmmirror.com/is-glob/4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz}
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz}
     name: is-glob
     version: 4.0.3
     engines: {node: '>=0.10.0'}
@@ -2724,92 +1865,27 @@ packages:
       is-extglob: registry.npmmirror.com/is-extglob/2.1.1
     dev: true
 
-  registry.npmmirror.com/is-lambda/1.0.1:
-    resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-lambda/-/is-lambda-1.0.1.tgz}
-    name: is-lambda
-    version: 1.0.1
-    dev: true
-
   registry.npmmirror.com/is-module/1.0.0:
-    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-module/-/is-module-1.0.0.tgz}
+    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-module/-/is-module-1.0.0.tgz}
     name: is-module
     version: 1.0.0
     dev: true
 
   registry.npmmirror.com/is-number/7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz}
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz}
     name: is-number
     version: 7.0.0
     engines: {node: '>=0.12.0'}
     dev: true
 
-  registry.npmmirror.com/is-plain-obj/1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz}
-    name: is-plain-obj
-    version: 1.1.0
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  registry.npmmirror.com/is-promise/2.2.2:
-    resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz}
-    name: is-promise
-    version: 2.2.2
-    dev: true
-
-  registry.npmmirror.com/is-regex/1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-regex/-/is-regex-1.1.4.tgz}
-    name: is-regex
-    version: 1.1.4
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: registry.npmmirror.com/call-bind/1.0.2
-      has-tostringtag: registry.npmmirror.com/has-tostringtag/1.0.0
-    dev: true
-
-  registry.npmmirror.com/is-typedarray/1.0.0:
-    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz}
-    name: is-typedarray
-    version: 1.0.0
-    dev: true
-
-  registry.npmmirror.com/isarray/1.0.0:
-    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz}
-    name: isarray
-    version: 1.0.0
-    dev: true
-
   registry.npmmirror.com/isexe/2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz}
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz}
     name: isexe
     version: 2.0.0
     dev: true
 
-  registry.npmmirror.com/isstream/0.1.2:
-    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz}
-    name: isstream
-    version: 0.1.2
-    dev: true
-
-  registry.npmmirror.com/js-base64/2.6.4:
-    resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz}
-    name: js-base64
-    version: 2.6.4
-    dev: true
-
-  registry.npmmirror.com/js-stringify/1.0.2:
-    resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-stringify/-/js-stringify-1.0.2.tgz}
-    name: js-stringify
-    version: 1.0.2
-    dev: true
-
-  registry.npmmirror.com/js-tokens/4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz}
-    name: js-tokens
-    version: 4.0.0
-    dev: true
-
   registry.npmmirror.com/js-yaml/4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.0.tgz}
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.0.tgz}
     name: js-yaml
     version: 4.1.0
     hasBin: true
@@ -2817,91 +1893,20 @@ packages:
       argparse: registry.npmmirror.com/argparse/2.0.1
     dev: true
 
-  registry.npmmirror.com/jsbn/0.1.1:
-    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsbn/-/jsbn-0.1.1.tgz}
-    name: jsbn
-    version: 0.1.1
-    dev: true
-
-  registry.npmmirror.com/json-parse-even-better-errors/2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz}
-    name: json-parse-even-better-errors
-    version: 2.3.1
-    dev: true
-
   registry.npmmirror.com/json-schema-traverse/0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz}
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz}
     name: json-schema-traverse
     version: 0.4.1
     dev: true
 
-  registry.npmmirror.com/json-schema/0.4.0:
-    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema/-/json-schema-0.4.0.tgz}
-    name: json-schema
-    version: 0.4.0
-    dev: true
-
   registry.npmmirror.com/json-stable-stringify-without-jsonify/1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz}
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz}
     name: json-stable-stringify-without-jsonify
     version: 1.0.1
     dev: true
 
-  registry.npmmirror.com/json-stringify-safe/5.0.1:
-    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz}
-    name: json-stringify-safe
-    version: 5.0.1
-    dev: true
-
-  registry.npmmirror.com/jsonc-parser/2.3.1:
-    resolution: {integrity: sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz}
-    name: jsonc-parser
-    version: 2.3.1
-    dev: true
-
-  registry.npmmirror.com/jsonc-parser/3.0.0:
-    resolution: {integrity: sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz}
-    name: jsonc-parser
-    version: 3.0.0
-    dev: true
-
-  registry.npmmirror.com/jsprim/1.4.2:
-    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz}
-    name: jsprim
-    version: 1.4.2
-    engines: {node: '>=0.6.0'}
-    dependencies:
-      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
-      extsprintf: registry.npmmirror.com/extsprintf/1.3.0
-      json-schema: registry.npmmirror.com/json-schema/0.4.0
-      verror: registry.npmmirror.com/verror/1.10.0
-    dev: true
-
-  registry.npmmirror.com/jstransformer/1.0.0:
-    resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jstransformer/-/jstransformer-1.0.0.tgz}
-    name: jstransformer
-    version: 1.0.0
-    dependencies:
-      is-promise: registry.npmmirror.com/is-promise/2.2.2
-      promise: registry.npmmirror.com/promise/7.3.1
-    dev: true
-
-  registry.npmmirror.com/kind-of/6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz}
-    name: kind-of
-    version: 6.0.3
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  registry.npmmirror.com/klona/2.0.5:
-    resolution: {integrity: sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz}
-    name: klona
-    version: 2.0.5
-    engines: {node: '>= 8'}
-    dev: true
-
   registry.npmmirror.com/levn/0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz}
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz}
     name: levn
     version: 0.4.1
     engines: {node: '>= 0.8.0'}
@@ -2910,35 +1915,20 @@ packages:
       type-check: registry.npmmirror.com/type-check/0.4.0
     dev: true
 
-  registry.npmmirror.com/lines-and-columns/1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz}
-    name: lines-and-columns
-    version: 1.2.4
-    dev: true
-
   registry.npmmirror.com/local-pkg/0.4.1:
-    resolution: {integrity: sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.1.tgz}
+    resolution: {integrity: sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.1.tgz}
     name: local-pkg
     version: 0.4.1
     engines: {node: '>=14'}
     dev: true
 
-  registry.npmmirror.com/locate-path/5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz}
-    name: locate-path
-    version: 5.0.0
-    engines: {node: '>=8'}
-    dependencies:
-      p-locate: registry.npmmirror.com/p-locate/4.1.0
-    dev: true
-
   registry.npmmirror.com/lodash-es/4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz}
     name: lodash-es
     version: 4.17.21
     dev: false
 
-  registry.npmmirror.com/lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd:
+  registry.npmmirror.com/lodash-unified/1.0.2_3ib2ivapxullxkx3xftsimdk7u:
     resolution: {integrity: sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.2.tgz}
     id: registry.npmmirror.com/lodash-unified/1.0.2
     name: lodash-unified
@@ -2954,18 +1944,18 @@ packages:
     dev: false
 
   registry.npmmirror.com/lodash.merge/4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz}
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz}
     name: lodash.merge
     version: 4.6.2
     dev: true
 
   registry.npmmirror.com/lodash/4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz}
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz}
     name: lodash
     version: 4.17.21
 
   registry.npmmirror.com/lru-cache/6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz}
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz}
     name: lru-cache
     version: 6.0.0
     engines: {node: '>=10'}
@@ -2974,96 +1964,36 @@ packages:
     dev: true
 
   registry.npmmirror.com/magic-string/0.25.9:
-    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz}
+    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz}
     name: magic-string
     version: 0.25.9
     dependencies:
       sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
 
-  registry.npmmirror.com/magic-string/0.26.1:
-    resolution: {integrity: sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/magic-string/-/magic-string-0.26.1.tgz}
+  registry.npmmirror.com/magic-string/0.26.2:
+    resolution: {integrity: sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/magic-string/-/magic-string-0.26.2.tgz}
     name: magic-string
-    version: 0.26.1
+    version: 0.26.2
     engines: {node: '>=12'}
     dependencies:
       sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8
     dev: true
 
-  registry.npmmirror.com/make-fetch-happen/9.1.0:
-    resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz}
-    name: make-fetch-happen
-    version: 9.1.0
-    engines: {node: '>= 10'}
-    dependencies:
-      agentkeepalive: registry.npmmirror.com/agentkeepalive/4.2.1
-      cacache: registry.npmmirror.com/cacache/15.3.0
-      http-cache-semantics: registry.npmmirror.com/http-cache-semantics/4.1.0
-      http-proxy-agent: registry.npmmirror.com/http-proxy-agent/4.0.1
-      https-proxy-agent: registry.npmmirror.com/https-proxy-agent/5.0.1
-      is-lambda: registry.npmmirror.com/is-lambda/1.0.1
-      lru-cache: registry.npmmirror.com/lru-cache/6.0.0
-      minipass: registry.npmmirror.com/minipass/3.1.6
-      minipass-collect: registry.npmmirror.com/minipass-collect/1.0.2
-      minipass-fetch: registry.npmmirror.com/minipass-fetch/1.4.1
-      minipass-flush: registry.npmmirror.com/minipass-flush/1.0.5
-      minipass-pipeline: registry.npmmirror.com/minipass-pipeline/1.2.4
-      negotiator: registry.npmmirror.com/negotiator/0.6.3
-      promise-retry: registry.npmmirror.com/promise-retry/2.0.1
-      socks-proxy-agent: registry.npmmirror.com/socks-proxy-agent/6.2.0
-      ssri: registry.npmmirror.com/ssri/8.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/map-obj/1.0.1:
-    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/map-obj/-/map-obj-1.0.1.tgz}
-    name: map-obj
-    version: 1.0.1
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  registry.npmmirror.com/map-obj/4.3.0:
-    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/map-obj/-/map-obj-4.3.0.tgz}
-    name: map-obj
-    version: 4.3.0
-    engines: {node: '>=8'}
-    dev: true
-
   registry.npmmirror.com/memoize-one/6.0.0:
     resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz}
     name: memoize-one
     version: 6.0.0
     dev: false
 
-  registry.npmmirror.com/meow/9.0.0:
-    resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz}
-    name: meow
-    version: 9.0.0
-    engines: {node: '>=10'}
-    dependencies:
-      '@types/minimist': registry.npmmirror.com/@types/minimist/1.2.2
-      camelcase-keys: registry.npmmirror.com/camelcase-keys/6.2.2
-      decamelize: registry.npmmirror.com/decamelize/1.2.0
-      decamelize-keys: registry.npmmirror.com/decamelize-keys/1.1.0
-      hard-rejection: registry.npmmirror.com/hard-rejection/2.1.0
-      minimist-options: registry.npmmirror.com/minimist-options/4.1.0
-      normalize-package-data: registry.npmmirror.com/normalize-package-data/3.0.3
-      read-pkg-up: registry.npmmirror.com/read-pkg-up/7.0.1
-      redent: registry.npmmirror.com/redent/3.0.0
-      trim-newlines: registry.npmmirror.com/trim-newlines/3.0.1
-      type-fest: registry.npmmirror.com/type-fest/0.18.1
-      yargs-parser: registry.npmmirror.com/yargs-parser/20.2.9
-    dev: true
-
   registry.npmmirror.com/merge2/1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz}
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz}
     name: merge2
     version: 1.4.1
     engines: {node: '>= 8'}
     dev: true
 
   registry.npmmirror.com/micromatch/4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz}
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz}
     name: micromatch
     version: 4.0.5
     engines: {node: '>=8.6'}
@@ -3073,142 +2003,40 @@ packages:
     dev: true
 
   registry.npmmirror.com/mime-db/1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz}
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz}
     name: mime-db
     version: 1.52.0
     engines: {node: '>= 0.6'}
-    dev: true
+    dev: false
 
   registry.npmmirror.com/mime-types/2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz}
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz}
     name: mime-types
     version: 2.1.35
     engines: {node: '>= 0.6'}
     dependencies:
       mime-db: registry.npmmirror.com/mime-db/1.52.0
-    dev: true
-
-  registry.npmmirror.com/min-indent/1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/min-indent/-/min-indent-1.0.1.tgz}
-    name: min-indent
-    version: 1.0.1
-    engines: {node: '>=4'}
-    dev: true
-
-  registry.npmmirror.com/minimatch/3.0.8:
-    resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz}
-    name: minimatch
-    version: 3.0.8
-    dependencies:
-      brace-expansion: registry.npmmirror.com/brace-expansion/1.1.11
-    dev: true
+    dev: false
 
   registry.npmmirror.com/minimatch/3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz}
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz}
     name: minimatch
     version: 3.1.2
     dependencies:
       brace-expansion: registry.npmmirror.com/brace-expansion/1.1.11
     dev: true
 
-  registry.npmmirror.com/minimatch/5.0.1:
-    resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-5.0.1.tgz}
+  registry.npmmirror.com/minimatch/5.1.0:
+    resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimatch/-/minimatch-5.1.0.tgz}
     name: minimatch
-    version: 5.0.1
+    version: 5.1.0
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: registry.npmmirror.com/brace-expansion/2.0.1
     dev: true
 
-  registry.npmmirror.com/minimist-options/4.1.0:
-    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minimist-options/-/minimist-options-4.1.0.tgz}
-    name: minimist-options
-    version: 4.1.0
-    engines: {node: '>= 6'}
-    dependencies:
-      arrify: registry.npmmirror.com/arrify/1.0.1
-      is-plain-obj: registry.npmmirror.com/is-plain-obj/1.1.0
-      kind-of: registry.npmmirror.com/kind-of/6.0.3
-    dev: true
-
-  registry.npmmirror.com/minipass-collect/1.0.2:
-    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-collect/-/minipass-collect-1.0.2.tgz}
-    name: minipass-collect
-    version: 1.0.2
-    engines: {node: '>= 8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-    dev: true
-
-  registry.npmmirror.com/minipass-fetch/1.4.1:
-    resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz}
-    name: minipass-fetch
-    version: 1.4.1
-    engines: {node: '>=8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-      minipass-sized: registry.npmmirror.com/minipass-sized/1.0.3
-      minizlib: registry.npmmirror.com/minizlib/2.1.2
-    optionalDependencies:
-      encoding: registry.npmmirror.com/encoding/0.1.13
-    dev: true
-
-  registry.npmmirror.com/minipass-flush/1.0.5:
-    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-flush/-/minipass-flush-1.0.5.tgz}
-    name: minipass-flush
-    version: 1.0.5
-    engines: {node: '>= 8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-    dev: true
-
-  registry.npmmirror.com/minipass-pipeline/1.2.4:
-    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz}
-    name: minipass-pipeline
-    version: 1.2.4
-    engines: {node: '>=8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-    dev: true
-
-  registry.npmmirror.com/minipass-sized/1.0.3:
-    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass-sized/-/minipass-sized-1.0.3.tgz}
-    name: minipass-sized
-    version: 1.0.3
-    engines: {node: '>=8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-    dev: true
-
-  registry.npmmirror.com/minipass/3.1.6:
-    resolution: {integrity: sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minipass/-/minipass-3.1.6.tgz}
-    name: minipass
-    version: 3.1.6
-    engines: {node: '>=8'}
-    dependencies:
-      yallist: registry.npmmirror.com/yallist/4.0.0
-    dev: true
-
-  registry.npmmirror.com/minizlib/2.1.2:
-    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz}
-    name: minizlib
-    version: 2.1.2
-    engines: {node: '>= 8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-      yallist: registry.npmmirror.com/yallist/4.0.0
-    dev: true
-
-  registry.npmmirror.com/mkdirp/1.0.4:
-    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz}
-    name: mkdirp
-    version: 1.0.4
-    engines: {node: '>=10'}
-    hasBin: true
-    dev: true
-
   registry.npmmirror.com/mockjs/1.1.0:
-    resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz}
+    resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz}
     name: mockjs
     version: 1.1.0
     hasBin: true
@@ -3217,132 +2045,32 @@ packages:
     dev: false
 
   registry.npmmirror.com/ms/2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz}
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz}
     name: ms
     version: 2.0.0
     dev: true
 
   registry.npmmirror.com/ms/2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz}
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz}
     name: ms
     version: 2.1.2
     dev: true
 
-  registry.npmmirror.com/nan/2.15.0:
-    resolution: {integrity: sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nan/-/nan-2.15.0.tgz}
-    name: nan
-    version: 2.15.0
-    dev: true
-
-  registry.npmmirror.com/nanoid/3.3.3:
-    resolution: {integrity: sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-3.3.3.tgz}
+  registry.npmmirror.com/nanoid/3.3.4:
+    resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz}
     name: nanoid
-    version: 3.3.3
+    version: 3.3.4
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
   registry.npmmirror.com/natural-compare/1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz}
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz}
     name: natural-compare
     version: 1.4.0
     dev: true
 
-  registry.npmmirror.com/negotiator/0.6.3:
-    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz}
-    name: negotiator
-    version: 0.6.3
-    engines: {node: '>= 0.6'}
-    dev: true
-
-  registry.npmmirror.com/neo-async/2.6.2:
-    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz}
-    name: neo-async
-    version: 2.6.2
-    dev: true
-
-  registry.npmmirror.com/node-gyp/8.4.1:
-    resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/node-gyp/-/node-gyp-8.4.1.tgz}
-    name: node-gyp
-    version: 8.4.1
-    engines: {node: '>= 10.12.0'}
-    hasBin: true
-    dependencies:
-      env-paths: registry.npmmirror.com/env-paths/2.2.1
-      glob: registry.npmmirror.com/glob/7.2.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
-      make-fetch-happen: registry.npmmirror.com/make-fetch-happen/9.1.0
-      nopt: registry.npmmirror.com/nopt/5.0.0
-      npmlog: registry.npmmirror.com/npmlog/6.0.2
-      rimraf: registry.npmmirror.com/rimraf/3.0.2
-      semver: registry.npmmirror.com/semver/7.3.7
-      tar: registry.npmmirror.com/tar/6.1.11
-      which: registry.npmmirror.com/which/2.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/node-sass/7.0.1:
-    resolution: {integrity: sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/node-sass/-/node-sass-7.0.1.tgz}
-    name: node-sass
-    version: 7.0.1
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    dependencies:
-      async-foreach: registry.npmmirror.com/async-foreach/0.1.3
-      chalk: registry.npmmirror.com/chalk/4.1.2
-      cross-spawn: registry.npmmirror.com/cross-spawn/7.0.3
-      gaze: registry.npmmirror.com/gaze/1.1.3
-      get-stdin: registry.npmmirror.com/get-stdin/4.0.1
-      glob: registry.npmmirror.com/glob/7.2.0
-      lodash: registry.npmmirror.com/lodash/4.17.21
-      meow: registry.npmmirror.com/meow/9.0.0
-      nan: registry.npmmirror.com/nan/2.15.0
-      node-gyp: registry.npmmirror.com/node-gyp/8.4.1
-      npmlog: registry.npmmirror.com/npmlog/5.0.1
-      request: registry.npmmirror.com/request/2.88.2
-      sass-graph: registry.npmmirror.com/sass-graph/4.0.0
-      stdout-stream: registry.npmmirror.com/stdout-stream/1.4.1
-      true-case-path: registry.npmmirror.com/true-case-path/1.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/nopt/5.0.0:
-    resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz}
-    name: nopt
-    version: 5.0.0
-    engines: {node: '>=6'}
-    hasBin: true
-    dependencies:
-      abbrev: registry.npmmirror.com/abbrev/1.1.1
-    dev: true
-
-  registry.npmmirror.com/normalize-package-data/2.5.0:
-    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz}
-    name: normalize-package-data
-    version: 2.5.0
-    dependencies:
-      hosted-git-info: registry.npmmirror.com/hosted-git-info/2.8.9
-      resolve: registry.npmmirror.com/resolve/1.22.0
-      semver: registry.npmmirror.com/semver/5.7.1
-      validate-npm-package-license: registry.npmmirror.com/validate-npm-package-license/3.0.4
-    dev: true
-
-  registry.npmmirror.com/normalize-package-data/3.0.3:
-    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz}
-    name: normalize-package-data
-    version: 3.0.3
-    engines: {node: '>=10'}
-    dependencies:
-      hosted-git-info: registry.npmmirror.com/hosted-git-info/4.1.0
-      is-core-module: registry.npmmirror.com/is-core-module/2.8.1
-      semver: registry.npmmirror.com/semver/7.3.7
-      validate-npm-package-license: registry.npmmirror.com/validate-npm-package-license/3.0.4
-    dev: true
-
   registry.npmmirror.com/normalize-path/3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz}
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz}
     name: normalize-path
     version: 3.0.0
     engines: {node: '>=0.10.0'}
@@ -3354,56 +2082,28 @@ packages:
     version: 1.1.2
     dev: false
 
-  registry.npmmirror.com/npmlog/5.0.1:
-    resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/npmlog/-/npmlog-5.0.1.tgz}
-    name: npmlog
-    version: 5.0.1
-    dependencies:
-      are-we-there-yet: registry.npmmirror.com/are-we-there-yet/2.0.0
-      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
-      gauge: registry.npmmirror.com/gauge/3.0.2
-      set-blocking: registry.npmmirror.com/set-blocking/2.0.0
-    dev: true
-
-  registry.npmmirror.com/npmlog/6.0.2:
-    resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/npmlog/-/npmlog-6.0.2.tgz}
-    name: npmlog
-    version: 6.0.2
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      are-we-there-yet: registry.npmmirror.com/are-we-there-yet/3.0.0
-      console-control-strings: registry.npmmirror.com/console-control-strings/1.1.0
-      gauge: registry.npmmirror.com/gauge/4.0.4
-      set-blocking: registry.npmmirror.com/set-blocking/2.0.0
-    dev: true
-
   registry.npmmirror.com/nprogress/0.2.0:
-    resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz}
+    resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz}
     name: nprogress
     version: 0.2.0
     dev: false
 
-  registry.npmmirror.com/oauth-sign/0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/oauth-sign/-/oauth-sign-0.9.0.tgz}
-    name: oauth-sign
-    version: 0.9.0
-    dev: true
-
-  registry.npmmirror.com/object-assign/4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz}
-    name: object-assign
-    version: 4.1.1
-    engines: {node: '>=0.10.0'}
+  registry.npmmirror.com/nth-check/2.0.1:
+    resolution: {integrity: sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nth-check/-/nth-check-2.0.1.tgz}
+    name: nth-check
+    version: 2.0.1
+    dependencies:
+      boolbase: registry.npmmirror.com/boolbase/1.0.0
     dev: true
 
   registry.npmmirror.com/object-inspect/1.12.0:
-    resolution: {integrity: sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.0.tgz}
+    resolution: {integrity: sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.0.tgz}
     name: object-inspect
     version: 1.12.0
     dev: false
 
   registry.npmmirror.com/on-finished/2.3.0:
-    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz}
+    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz}
     name: on-finished
     version: 2.3.0
     engines: {node: '>= 0.8'}
@@ -3412,7 +2112,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/once/1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/once/-/once-1.4.0.tgz}
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/once/-/once-1.4.0.tgz}
     name: once
     version: 1.4.0
     dependencies:
@@ -3420,7 +2120,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/optionator/0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/optionator/-/optionator-0.9.1.tgz}
+    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/optionator/-/optionator-0.9.1.tgz}
     name: optionator
     version: 0.9.1
     engines: {node: '>= 0.8.0'}
@@ -3433,42 +2133,8 @@ packages:
       word-wrap: registry.npmmirror.com/word-wrap/1.2.3
     dev: true
 
-  registry.npmmirror.com/p-limit/2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz}
-    name: p-limit
-    version: 2.3.0
-    engines: {node: '>=6'}
-    dependencies:
-      p-try: registry.npmmirror.com/p-try/2.2.0
-    dev: true
-
-  registry.npmmirror.com/p-locate/4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz}
-    name: p-locate
-    version: 4.1.0
-    engines: {node: '>=8'}
-    dependencies:
-      p-limit: registry.npmmirror.com/p-limit/2.3.0
-    dev: true
-
-  registry.npmmirror.com/p-map/4.0.0:
-    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-map/-/p-map-4.0.0.tgz}
-    name: p-map
-    version: 4.0.0
-    engines: {node: '>=10'}
-    dependencies:
-      aggregate-error: registry.npmmirror.com/aggregate-error/3.1.0
-    dev: true
-
-  registry.npmmirror.com/p-try/2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz}
-    name: p-try
-    version: 2.2.0
-    engines: {node: '>=6'}
-    dev: true
-
   registry.npmmirror.com/parent-module/1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz}
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz}
     name: parent-module
     version: 1.0.1
     engines: {node: '>=6'}
@@ -3476,85 +2142,60 @@ packages:
       callsites: registry.npmmirror.com/callsites/3.1.0
     dev: true
 
-  registry.npmmirror.com/parse-json/5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz}
-    name: parse-json
-    version: 5.2.0
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/code-frame': registry.npmmirror.com/@babel/code-frame/7.16.7
-      error-ex: registry.npmmirror.com/error-ex/1.3.2
-      json-parse-even-better-errors: registry.npmmirror.com/json-parse-even-better-errors/2.3.1
-      lines-and-columns: registry.npmmirror.com/lines-and-columns/1.2.4
-    dev: true
-
   registry.npmmirror.com/parseurl/1.3.3:
-    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz}
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz}
     name: parseurl
     version: 1.3.3
     engines: {node: '>= 0.8'}
     dev: true
 
-  registry.npmmirror.com/path-exists/4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz}
-    name: path-exists
-    version: 4.0.0
-    engines: {node: '>=8'}
-    dev: true
-
   registry.npmmirror.com/path-is-absolute/1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz}
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz}
     name: path-is-absolute
     version: 1.0.1
     engines: {node: '>=0.10.0'}
     dev: true
 
   registry.npmmirror.com/path-key/3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz}
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz}
     name: path-key
     version: 3.1.1
     engines: {node: '>=8'}
     dev: true
 
   registry.npmmirror.com/path-parse/1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz}
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz}
     name: path-parse
     version: 1.0.7
     dev: true
 
-  registry.npmmirror.com/path-to-regexp/6.2.0:
-    resolution: {integrity: sha512-f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-6.2.0.tgz}
+  registry.npmmirror.com/path-to-regexp/6.2.1:
+    resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-6.2.1.tgz}
     name: path-to-regexp
-    version: 6.2.0
+    version: 6.2.1
     dev: true
 
   registry.npmmirror.com/path-type/4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz}
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz}
     name: path-type
     version: 4.0.0
     engines: {node: '>=8'}
     dev: true
 
-  registry.npmmirror.com/performance-now/2.1.0:
-    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz}
-    name: performance-now
-    version: 2.1.0
-    dev: true
-
   registry.npmmirror.com/picocolors/1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz}
+    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz}
     name: picocolors
     version: 1.0.0
 
   registry.npmmirror.com/picomatch/2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz}
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz}
     name: picomatch
     version: 2.3.1
     engines: {node: '>=8.6'}
     dev: true
 
-  registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.13+vue@3.2.33:
-    resolution: {integrity: sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia-plugin-persist/-/pinia-plugin-persist-1.0.0.tgz}
+  registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.14+vue@3.2.33:
+    resolution: {integrity: sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia-plugin-persist/-/pinia-plugin-persist-1.0.0.tgz}
     id: registry.npmmirror.com/pinia-plugin-persist/1.0.0
     name: pinia-plugin-persist
     version: 1.0.0
@@ -3566,16 +2207,16 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      pinia: registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33
+      pinia: registry.npmmirror.com/pinia/2.0.14_ytvqwwdyss532bvoq2clv4ed5m
       vue: registry.npmmirror.com/vue/3.2.33
       vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
     dev: false
 
-  registry.npmmirror.com/pinia/2.0.13_typescript@4.6.3+vue@3.2.33:
-    resolution: {integrity: sha512-B7rSqm1xNpwcPMnqns8/gVBfbbi7lWTByzS6aPZ4JOXSJD4Y531rZHDCoYWBwLyHY/8hWnXljgiXp6rRyrofcw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia/-/pinia-2.0.13.tgz}
-    id: registry.npmmirror.com/pinia/2.0.13
+  registry.npmmirror.com/pinia/2.0.14_ytvqwwdyss532bvoq2clv4ed5m:
+    resolution: {integrity: sha512-0nPuZR4TetT/WcLN+feMSjWJku3SQU7dBbXC6uw+R6FLQJCsg+/0pzXyD82T1FmAYe0lsx+jnEDQ1BLgkRKlxA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia/-/pinia-2.0.14.tgz}
+    id: registry.npmmirror.com/pinia/2.0.14
     name: pinia
-    version: 2.0.13
+    version: 2.0.14
     peerDependencies:
       '@vue/composition-api': ^1.4.0
       typescript: '>=4.4.4'
@@ -3587,30 +2228,40 @@ packages:
         optional: true
     dependencies:
       '@vue/devtools-api': registry.npmmirror.com/@vue/devtools-api/6.1.4
-      typescript: registry.npmmirror.com/typescript/4.6.3
+      typescript: registry.npmmirror.com/typescript/4.6.4
       vue: registry.npmmirror.com/vue/3.2.33
       vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
     dev: false
 
-  registry.npmmirror.com/postcss/8.4.12:
-    resolution: {integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss/-/postcss-8.4.12.tgz}
+  registry.npmmirror.com/postcss-selector-parser/6.0.10:
+    resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz}
+    name: postcss-selector-parser
+    version: 6.0.10
+    engines: {node: '>=4'}
+    dependencies:
+      cssesc: registry.npmmirror.com/cssesc/3.0.0
+      util-deprecate: registry.npmmirror.com/util-deprecate/1.0.2
+    dev: true
+
+  registry.npmmirror.com/postcss/8.4.13:
+    resolution: {integrity: sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss/-/postcss-8.4.13.tgz}
     name: postcss
-    version: 8.4.12
+    version: 8.4.13
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: registry.npmmirror.com/nanoid/3.3.3
+      nanoid: registry.npmmirror.com/nanoid/3.3.4
       picocolors: registry.npmmirror.com/picocolors/1.0.0
       source-map-js: registry.npmmirror.com/source-map-js/1.0.2
 
   registry.npmmirror.com/prelude-ls/1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz}
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz}
     name: prelude-ls
     version: 1.2.1
     engines: {node: '>= 0.8.0'}
     dev: true
 
   registry.npmmirror.com/prettier-linter-helpers/1.0.0:
-    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz}
+    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz}
     name: prettier-linter-helpers
     version: 1.0.0
     engines: {node: '>=6.0.0'}
@@ -3619,173 +2270,22 @@ packages:
     dev: true
 
   registry.npmmirror.com/prettier/2.6.2:
-    resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prettier/-/prettier-2.6.2.tgz}
+    resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prettier/-/prettier-2.6.2.tgz}
     name: prettier
     version: 2.6.2
     engines: {node: '>=10.13.0'}
     hasBin: true
     dev: true
 
-  registry.npmmirror.com/process-nextick-args/2.0.1:
-    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz}
-    name: process-nextick-args
-    version: 2.0.1
-    dev: true
-
-  registry.npmmirror.com/promise-inflight/1.0.1:
-    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz}
-    name: promise-inflight
-    version: 1.0.1
-    dev: true
-
-  registry.npmmirror.com/promise-retry/2.0.1:
-    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise-retry/-/promise-retry-2.0.1.tgz}
-    name: promise-retry
-    version: 2.0.1
-    engines: {node: '>=10'}
-    dependencies:
-      err-code: registry.npmmirror.com/err-code/2.0.3
-      retry: registry.npmmirror.com/retry/0.12.0
-    dev: true
-
-  registry.npmmirror.com/promise/7.3.1:
-    resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/promise/-/promise-7.3.1.tgz}
-    name: promise
-    version: 7.3.1
-    dependencies:
-      asap: registry.npmmirror.com/asap/2.0.6
-    dev: true
-
-  registry.npmmirror.com/psl/1.8.0:
-    resolution: {integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/psl/-/psl-1.8.0.tgz}
-    name: psl
-    version: 1.8.0
-    dev: true
-
-  registry.npmmirror.com/pug-attrs/3.0.0:
-    resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-attrs/-/pug-attrs-3.0.0.tgz}
-    name: pug-attrs
-    version: 3.0.0
-    dependencies:
-      constantinople: registry.npmmirror.com/constantinople/4.0.1
-      js-stringify: registry.npmmirror.com/js-stringify/1.0.2
-      pug-runtime: registry.npmmirror.com/pug-runtime/3.0.1
-    dev: true
-
-  registry.npmmirror.com/pug-code-gen/3.0.2:
-    resolution: {integrity: sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz}
-    name: pug-code-gen
-    version: 3.0.2
-    dependencies:
-      constantinople: registry.npmmirror.com/constantinople/4.0.1
-      doctypes: registry.npmmirror.com/doctypes/1.1.0
-      js-stringify: registry.npmmirror.com/js-stringify/1.0.2
-      pug-attrs: registry.npmmirror.com/pug-attrs/3.0.0
-      pug-error: registry.npmmirror.com/pug-error/2.0.0
-      pug-runtime: registry.npmmirror.com/pug-runtime/3.0.1
-      void-elements: registry.npmmirror.com/void-elements/3.1.0
-      with: registry.npmmirror.com/with/7.0.2
-    dev: true
-
-  registry.npmmirror.com/pug-error/2.0.0:
-    resolution: {integrity: sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-error/-/pug-error-2.0.0.tgz}
-    name: pug-error
-    version: 2.0.0
-    dev: true
-
-  registry.npmmirror.com/pug-filters/4.0.0:
-    resolution: {integrity: sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-filters/-/pug-filters-4.0.0.tgz}
-    name: pug-filters
-    version: 4.0.0
-    dependencies:
-      constantinople: registry.npmmirror.com/constantinople/4.0.1
-      jstransformer: registry.npmmirror.com/jstransformer/1.0.0
-      pug-error: registry.npmmirror.com/pug-error/2.0.0
-      pug-walk: registry.npmmirror.com/pug-walk/2.0.0
-      resolve: registry.npmmirror.com/resolve/1.22.0
-    dev: true
-
-  registry.npmmirror.com/pug-lexer/5.0.1:
-    resolution: {integrity: sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-lexer/-/pug-lexer-5.0.1.tgz}
-    name: pug-lexer
-    version: 5.0.1
-    dependencies:
-      character-parser: registry.npmmirror.com/character-parser/2.2.0
-      is-expression: registry.npmmirror.com/is-expression/4.0.0
-      pug-error: registry.npmmirror.com/pug-error/2.0.0
-    dev: true
-
-  registry.npmmirror.com/pug-linker/4.0.0:
-    resolution: {integrity: sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-linker/-/pug-linker-4.0.0.tgz}
-    name: pug-linker
-    version: 4.0.0
-    dependencies:
-      pug-error: registry.npmmirror.com/pug-error/2.0.0
-      pug-walk: registry.npmmirror.com/pug-walk/2.0.0
-    dev: true
-
-  registry.npmmirror.com/pug-load/3.0.0:
-    resolution: {integrity: sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-load/-/pug-load-3.0.0.tgz}
-    name: pug-load
-    version: 3.0.0
-    dependencies:
-      object-assign: registry.npmmirror.com/object-assign/4.1.1
-      pug-walk: registry.npmmirror.com/pug-walk/2.0.0
-    dev: true
-
-  registry.npmmirror.com/pug-parser/6.0.0:
-    resolution: {integrity: sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-parser/-/pug-parser-6.0.0.tgz}
-    name: pug-parser
-    version: 6.0.0
-    dependencies:
-      pug-error: registry.npmmirror.com/pug-error/2.0.0
-      token-stream: registry.npmmirror.com/token-stream/1.0.0
-    dev: true
-
-  registry.npmmirror.com/pug-runtime/3.0.1:
-    resolution: {integrity: sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-runtime/-/pug-runtime-3.0.1.tgz}
-    name: pug-runtime
-    version: 3.0.1
-    dev: true
-
-  registry.npmmirror.com/pug-strip-comments/2.0.0:
-    resolution: {integrity: sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz}
-    name: pug-strip-comments
-    version: 2.0.0
-    dependencies:
-      pug-error: registry.npmmirror.com/pug-error/2.0.0
-    dev: true
-
-  registry.npmmirror.com/pug-walk/2.0.0:
-    resolution: {integrity: sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug-walk/-/pug-walk-2.0.0.tgz}
-    name: pug-walk
-    version: 2.0.0
-    dev: true
-
-  registry.npmmirror.com/pug/3.0.2:
-    resolution: {integrity: sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pug/-/pug-3.0.2.tgz}
-    name: pug
-    version: 3.0.2
-    dependencies:
-      pug-code-gen: registry.npmmirror.com/pug-code-gen/3.0.2
-      pug-filters: registry.npmmirror.com/pug-filters/4.0.0
-      pug-lexer: registry.npmmirror.com/pug-lexer/5.0.1
-      pug-linker: registry.npmmirror.com/pug-linker/4.0.0
-      pug-load: registry.npmmirror.com/pug-load/3.0.0
-      pug-parser: registry.npmmirror.com/pug-parser/6.0.0
-      pug-runtime: registry.npmmirror.com/pug-runtime/3.0.1
-      pug-strip-comments: registry.npmmirror.com/pug-strip-comments/2.0.0
-    dev: true
-
   registry.npmmirror.com/punycode/2.1.1:
-    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/punycode/-/punycode-2.1.1.tgz}
+    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/punycode/-/punycode-2.1.1.tgz}
     name: punycode
     version: 2.1.1
     engines: {node: '>=6'}
     dev: true
 
   registry.npmmirror.com/qs/6.10.3:
-    resolution: {integrity: sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qs/-/qs-6.10.3.tgz}
+    resolution: {integrity: sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qs/-/qs-6.10.3.tgz}
     name: qs
     version: 6.10.3
     engines: {node: '>=0.6'}
@@ -3793,187 +2293,66 @@ packages:
       side-channel: registry.npmmirror.com/side-channel/1.0.4
     dev: false
 
-  registry.npmmirror.com/qs/6.5.3:
-    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz}
-    name: qs
-    version: 6.5.3
-    engines: {node: '>=0.6'}
-    dev: true
-
   registry.npmmirror.com/queue-microtask/1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz}
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz}
     name: queue-microtask
     version: 1.2.3
     dev: true
 
-  registry.npmmirror.com/quick-lru/4.0.1:
-    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/quick-lru/-/quick-lru-4.0.1.tgz}
-    name: quick-lru
-    version: 4.0.1
-    engines: {node: '>=8'}
-    dev: true
-
-  registry.npmmirror.com/read-pkg-up/7.0.1:
-    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz}
-    name: read-pkg-up
-    version: 7.0.1
-    engines: {node: '>=8'}
-    dependencies:
-      find-up: registry.npmmirror.com/find-up/4.1.0
-      read-pkg: registry.npmmirror.com/read-pkg/5.2.0
-      type-fest: registry.npmmirror.com/type-fest/0.8.1
-    dev: true
-
-  registry.npmmirror.com/read-pkg/5.2.0:
-    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz}
-    name: read-pkg
-    version: 5.2.0
-    engines: {node: '>=8'}
-    dependencies:
-      '@types/normalize-package-data': registry.npmmirror.com/@types/normalize-package-data/2.4.1
-      normalize-package-data: registry.npmmirror.com/normalize-package-data/2.5.0
-      parse-json: registry.npmmirror.com/parse-json/5.2.0
-      type-fest: registry.npmmirror.com/type-fest/0.6.0
-    dev: true
-
-  registry.npmmirror.com/readable-stream/2.3.7:
-    resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz}
-    name: readable-stream
-    version: 2.3.7
-    dependencies:
-      core-util-is: registry.npmmirror.com/core-util-is/1.0.3
-      inherits: registry.npmmirror.com/inherits/2.0.4
-      isarray: registry.npmmirror.com/isarray/1.0.0
-      process-nextick-args: registry.npmmirror.com/process-nextick-args/2.0.1
-      safe-buffer: registry.npmmirror.com/safe-buffer/5.1.2
-      string_decoder: registry.npmmirror.com/string_decoder/1.1.1
-      util-deprecate: registry.npmmirror.com/util-deprecate/1.0.2
-    dev: true
-
-  registry.npmmirror.com/readable-stream/3.6.0:
-    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz}
-    name: readable-stream
-    version: 3.6.0
-    engines: {node: '>= 6'}
-    dependencies:
-      inherits: registry.npmmirror.com/inherits/2.0.4
-      string_decoder: registry.npmmirror.com/string_decoder/1.3.0
-      util-deprecate: registry.npmmirror.com/util-deprecate/1.0.2
-    dev: true
-
   registry.npmmirror.com/readdirp/3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz}
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz}
     name: readdirp
     version: 3.6.0
-    engines: {node: '>=8.10.0'}
-    dependencies:
-      picomatch: registry.npmmirror.com/picomatch/2.3.1
-    dev: true
-
-  registry.npmmirror.com/redent/3.0.0:
-    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz}
-    name: redent
-    version: 3.0.0
-    engines: {node: '>=8'}
+    engines: {node: '>=8.10.0'}
     dependencies:
-      indent-string: registry.npmmirror.com/indent-string/4.0.0
-      strip-indent: registry.npmmirror.com/strip-indent/3.0.0
+      picomatch: registry.npmmirror.com/picomatch/2.3.1
     dev: true
 
   registry.npmmirror.com/regexpp/3.2.0:
-    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz}
+    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz}
     name: regexpp
     version: 3.2.0
     engines: {node: '>=8'}
     dev: true
 
-  registry.npmmirror.com/request-light/0.5.8:
-    resolution: {integrity: sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/request-light/-/request-light-0.5.8.tgz}
-    name: request-light
-    version: 0.5.8
-    dev: true
-
-  registry.npmmirror.com/request/2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/request/-/request-2.88.2.tgz}
-    name: request
-    version: 2.88.2
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
-    dependencies:
-      aws-sign2: registry.npmmirror.com/aws-sign2/0.7.0
-      aws4: registry.npmmirror.com/aws4/1.11.0
-      caseless: registry.npmmirror.com/caseless/0.12.0
-      combined-stream: registry.npmmirror.com/combined-stream/1.0.8
-      extend: registry.npmmirror.com/extend/3.0.2
-      forever-agent: registry.npmmirror.com/forever-agent/0.6.1
-      form-data: registry.npmmirror.com/form-data/2.3.3
-      har-validator: registry.npmmirror.com/har-validator/5.1.5
-      http-signature: registry.npmmirror.com/http-signature/1.2.0
-      is-typedarray: registry.npmmirror.com/is-typedarray/1.0.0
-      isstream: registry.npmmirror.com/isstream/0.1.2
-      json-stringify-safe: registry.npmmirror.com/json-stringify-safe/5.0.1
-      mime-types: registry.npmmirror.com/mime-types/2.1.35
-      oauth-sign: registry.npmmirror.com/oauth-sign/0.9.0
-      performance-now: registry.npmmirror.com/performance-now/2.1.0
-      qs: registry.npmmirror.com/qs/6.5.3
-      safe-buffer: registry.npmmirror.com/safe-buffer/5.2.1
-      tough-cookie: registry.npmmirror.com/tough-cookie/2.5.0
-      tunnel-agent: registry.npmmirror.com/tunnel-agent/0.6.0
-      uuid: registry.npmmirror.com/uuid/3.4.0
-    dev: true
-
-  registry.npmmirror.com/require-directory/2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz}
-    name: require-directory
-    version: 2.1.1
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   registry.npmmirror.com/resolve-from/4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz}
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz}
     name: resolve-from
     version: 4.0.0
     engines: {node: '>=4'}
     dev: true
 
   registry.npmmirror.com/resolve/1.22.0:
-    resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve/-/resolve-1.22.0.tgz}
+    resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/resolve/-/resolve-1.22.0.tgz}
     name: resolve
     version: 1.22.0
     hasBin: true
     dependencies:
-      is-core-module: registry.npmmirror.com/is-core-module/2.8.1
+      is-core-module: registry.npmmirror.com/is-core-module/2.9.0
       path-parse: registry.npmmirror.com/path-parse/1.0.7
       supports-preserve-symlinks-flag: registry.npmmirror.com/supports-preserve-symlinks-flag/1.0.0
     dev: true
 
-  registry.npmmirror.com/retry/0.12.0:
-    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/retry/-/retry-0.12.0.tgz}
-    name: retry
-    version: 0.12.0
-    engines: {node: '>= 4'}
-    dev: true
-
   registry.npmmirror.com/reusify/1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz}
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz}
     name: reusify
     version: 1.0.4
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
     dev: true
 
   registry.npmmirror.com/rimraf/3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz}
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz}
     name: rimraf
     version: 3.0.2
     hasBin: true
     dependencies:
-      glob: registry.npmmirror.com/glob/7.2.0
+      glob: registry.npmmirror.com/glob/7.2.3
     dev: true
 
-  registry.npmmirror.com/rollup/2.70.2:
-    resolution: {integrity: sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rollup/-/rollup-2.70.2.tgz}
+  registry.npmmirror.com/rollup/2.73.0:
+    resolution: {integrity: sha512-h/UngC3S4Zt28mB3g0+2YCMegT5yoftnQplwzPqGZcKvlld5e+kT/QRmJiL+qxGyZKOYpgirWGdLyEO1b0dpLQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rollup/-/rollup-2.73.0.tgz}
     name: rollup
-    version: 2.70.2
+    version: 2.73.0
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
@@ -3981,76 +2360,17 @@ packages:
     dev: true
 
   registry.npmmirror.com/run-parallel/1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz}
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz}
     name: run-parallel
     version: 1.2.0
     dependencies:
       queue-microtask: registry.npmmirror.com/queue-microtask/1.2.3
     dev: true
 
-  registry.npmmirror.com/safe-buffer/5.1.2:
-    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz}
-    name: safe-buffer
-    version: 5.1.2
-    dev: true
-
-  registry.npmmirror.com/safe-buffer/5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz}
-    name: safe-buffer
-    version: 5.2.1
-    dev: true
-
-  registry.npmmirror.com/safer-buffer/2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz}
-    name: safer-buffer
-    version: 2.1.2
-    dev: true
-
-  registry.npmmirror.com/sass-graph/4.0.0:
-    resolution: {integrity: sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass-graph/-/sass-graph-4.0.0.tgz}
-    name: sass-graph
-    version: 4.0.0
-    engines: {node: '>=12'}
-    hasBin: true
-    dependencies:
-      glob: registry.npmmirror.com/glob/7.2.0
-      lodash: registry.npmmirror.com/lodash/4.17.21
-      scss-tokenizer: registry.npmmirror.com/scss-tokenizer/0.3.0
-      yargs: registry.npmmirror.com/yargs/17.4.1
-    dev: true
-
-  registry.npmmirror.com/sass-loader/12.6.0_node-sass@7.0.1+sass@1.50.1:
-    resolution: {integrity: sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass-loader/-/sass-loader-12.6.0.tgz}
-    id: registry.npmmirror.com/sass-loader/12.6.0
-    name: sass-loader
-    version: 12.6.0
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      fibers: '>= 3.1.0'
-      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
-      sass: ^1.3.0
-      sass-embedded: '*'
-      webpack: ^5.0.0
-    peerDependenciesMeta:
-      fibers:
-        optional: true
-      node-sass:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-    dependencies:
-      klona: registry.npmmirror.com/klona/2.0.5
-      neo-async: registry.npmmirror.com/neo-async/2.6.2
-      node-sass: registry.npmmirror.com/node-sass/7.0.1
-      sass: registry.npmmirror.com/sass/1.50.1
-    dev: true
-
-  registry.npmmirror.com/sass/1.50.1:
-    resolution: {integrity: sha512-noTnY41KnlW2A9P8sdwESpDmo+KBNkukI1i8+hOK3footBUcohNHtdOJbckp46XO95nuvcHDDZ+4tmOnpK3hjw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass/-/sass-1.50.1.tgz}
+  registry.npmmirror.com/sass/1.51.0:
+    resolution: {integrity: sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass/-/sass-1.51.0.tgz}
     name: sass
-    version: 1.50.1
+    version: 1.51.0
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
@@ -4059,30 +2379,14 @@ packages:
       source-map-js: registry.npmmirror.com/source-map-js/1.0.2
     dev: true
 
-  registry.npmmirror.com/scss-tokenizer/0.3.0:
-    resolution: {integrity: sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz}
-    name: scss-tokenizer
-    version: 0.3.0
-    dependencies:
-      js-base64: registry.npmmirror.com/js-base64/2.6.4
-      source-map: registry.npmmirror.com/source-map/0.7.3
-    dev: true
-
   registry.npmmirror.com/select/1.1.2:
     resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/select/-/select-1.1.2.tgz}
     name: select
     version: 1.1.2
     dev: false
 
-  registry.npmmirror.com/semver/5.7.1:
-    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz}
-    name: semver
-    version: 5.7.1
-    hasBin: true
-    dev: true
-
   registry.npmmirror.com/semver/7.3.7:
-    resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz}
+    resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz}
     name: semver
     version: 7.3.7
     engines: {node: '>=10'}
@@ -4091,14 +2395,8 @@ packages:
       lru-cache: registry.npmmirror.com/lru-cache/6.0.0
     dev: true
 
-  registry.npmmirror.com/set-blocking/2.0.0:
-    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz}
-    name: set-blocking
-    version: 2.0.0
-    dev: true
-
   registry.npmmirror.com/shebang-command/2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz}
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz}
     name: shebang-command
     version: 2.0.0
     engines: {node: '>=8'}
@@ -4107,14 +2405,14 @@ packages:
     dev: true
 
   registry.npmmirror.com/shebang-regex/3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz}
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz}
     name: shebang-regex
     version: 3.0.0
     engines: {node: '>=8'}
     dev: true
 
   registry.npmmirror.com/side-channel/1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz}
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz}
     name: side-channel
     version: 1.0.4
     dependencies:
@@ -4123,180 +2421,45 @@ packages:
       object-inspect: registry.npmmirror.com/object-inspect/1.12.0
     dev: false
 
-  registry.npmmirror.com/signal-exit/3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz}
-    name: signal-exit
-    version: 3.0.7
-    dev: true
-
   registry.npmmirror.com/slash/3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz}
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz}
     name: slash
     version: 3.0.0
     engines: {node: '>=8'}
     dev: true
 
-  registry.npmmirror.com/smart-buffer/4.2.0:
-    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/smart-buffer/-/smart-buffer-4.2.0.tgz}
-    name: smart-buffer
-    version: 4.2.0
-    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
-    dev: true
-
-  registry.npmmirror.com/socks-proxy-agent/6.2.0:
-    resolution: {integrity: sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz}
-    name: socks-proxy-agent
-    version: 6.2.0
-    engines: {node: '>= 10'}
-    dependencies:
-      agent-base: registry.npmmirror.com/agent-base/6.0.2
-      debug: registry.npmmirror.com/debug/4.3.4
-      socks: registry.npmmirror.com/socks/2.6.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  registry.npmmirror.com/socks/2.6.2:
-    resolution: {integrity: sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/socks/-/socks-2.6.2.tgz}
-    name: socks
-    version: 2.6.2
-    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
-    dependencies:
-      ip: registry.npmmirror.com/ip/1.1.5
-      smart-buffer: registry.npmmirror.com/smart-buffer/4.2.0
-    dev: true
-
   registry.npmmirror.com/sortablejs/1.14.0:
-    resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz}
+    resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz}
     name: sortablejs
     version: 1.14.0
     dev: false
 
   registry.npmmirror.com/source-map-js/1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz}
+    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz}
     name: source-map-js
     version: 1.0.2
     engines: {node: '>=0.10.0'}
 
   registry.npmmirror.com/source-map/0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz}
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz}
     name: source-map
     version: 0.6.1
     engines: {node: '>=0.10.0'}
 
-  registry.npmmirror.com/source-map/0.7.3:
-    resolution: {integrity: sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map/-/source-map-0.7.3.tgz}
-    name: source-map
-    version: 0.7.3
-    engines: {node: '>= 8'}
-    dev: true
-
   registry.npmmirror.com/sourcemap-codec/1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz}
+    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz}
     name: sourcemap-codec
     version: 1.4.8
 
-  registry.npmmirror.com/spdx-correct/3.1.1:
-    resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.1.1.tgz}
-    name: spdx-correct
-    version: 3.1.1
-    dependencies:
-      spdx-expression-parse: registry.npmmirror.com/spdx-expression-parse/3.0.1
-      spdx-license-ids: registry.npmmirror.com/spdx-license-ids/3.0.11
-    dev: true
-
-  registry.npmmirror.com/spdx-exceptions/2.3.0:
-    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz}
-    name: spdx-exceptions
-    version: 2.3.0
-    dev: true
-
-  registry.npmmirror.com/spdx-expression-parse/3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz}
-    name: spdx-expression-parse
-    version: 3.0.1
-    dependencies:
-      spdx-exceptions: registry.npmmirror.com/spdx-exceptions/2.3.0
-      spdx-license-ids: registry.npmmirror.com/spdx-license-ids/3.0.11
-    dev: true
-
-  registry.npmmirror.com/spdx-license-ids/3.0.11:
-    resolution: {integrity: sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz}
-    name: spdx-license-ids
-    version: 3.0.11
-    dev: true
-
-  registry.npmmirror.com/sshpk/1.17.0:
-    resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz}
-    name: sshpk
-    version: 1.17.0
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    dependencies:
-      asn1: registry.npmmirror.com/asn1/0.2.6
-      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
-      bcrypt-pbkdf: registry.npmmirror.com/bcrypt-pbkdf/1.0.2
-      dashdash: registry.npmmirror.com/dashdash/1.14.1
-      ecc-jsbn: registry.npmmirror.com/ecc-jsbn/0.1.2
-      getpass: registry.npmmirror.com/getpass/0.1.7
-      jsbn: registry.npmmirror.com/jsbn/0.1.1
-      safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2
-      tweetnacl: registry.npmmirror.com/tweetnacl/0.14.5
-    dev: true
-
-  registry.npmmirror.com/ssri/8.0.1:
-    resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz}
-    name: ssri
-    version: 8.0.1
-    engines: {node: '>= 8'}
-    dependencies:
-      minipass: registry.npmmirror.com/minipass/3.1.6
-    dev: true
-
   registry.npmmirror.com/statuses/1.5.0:
-    resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz}
+    resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz}
     name: statuses
     version: 1.5.0
     engines: {node: '>= 0.6'}
     dev: true
 
-  registry.npmmirror.com/stdout-stream/1.4.1:
-    resolution: {integrity: sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz}
-    name: stdout-stream
-    version: 1.4.1
-    dependencies:
-      readable-stream: registry.npmmirror.com/readable-stream/2.3.7
-    dev: true
-
-  registry.npmmirror.com/string-width/4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz}
-    name: string-width
-    version: 4.2.3
-    engines: {node: '>=8'}
-    dependencies:
-      emoji-regex: registry.npmmirror.com/emoji-regex/8.0.0
-      is-fullwidth-code-point: registry.npmmirror.com/is-fullwidth-code-point/3.0.0
-      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
-    dev: true
-
-  registry.npmmirror.com/string_decoder/1.1.1:
-    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz}
-    name: string_decoder
-    version: 1.1.1
-    dependencies:
-      safe-buffer: registry.npmmirror.com/safe-buffer/5.1.2
-    dev: true
-
-  registry.npmmirror.com/string_decoder/1.3.0:
-    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz}
-    name: string_decoder
-    version: 1.3.0
-    dependencies:
-      safe-buffer: registry.npmmirror.com/safe-buffer/5.2.1
-    dev: true
-
   registry.npmmirror.com/strip-ansi/6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz}
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz}
     name: strip-ansi
     version: 6.0.1
     engines: {node: '>=8'}
@@ -4304,33 +2467,15 @@ packages:
       ansi-regex: registry.npmmirror.com/ansi-regex/5.0.1
     dev: true
 
-  registry.npmmirror.com/strip-indent/3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-indent/-/strip-indent-3.0.0.tgz}
-    name: strip-indent
-    version: 3.0.0
-    engines: {node: '>=8'}
-    dependencies:
-      min-indent: registry.npmmirror.com/min-indent/1.0.1
-    dev: true
-
   registry.npmmirror.com/strip-json-comments/3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz}
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz}
     name: strip-json-comments
     version: 3.1.1
     engines: {node: '>=8'}
     dev: true
 
-  registry.npmmirror.com/supports-color/5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz}
-    name: supports-color
-    version: 5.5.0
-    engines: {node: '>=4'}
-    dependencies:
-      has-flag: registry.npmmirror.com/has-flag/3.0.0
-    dev: true
-
   registry.npmmirror.com/supports-color/7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz}
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz}
     name: supports-color
     version: 7.2.0
     engines: {node: '>=8'}
@@ -4339,28 +2484,14 @@ packages:
     dev: true
 
   registry.npmmirror.com/supports-preserve-symlinks-flag/1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz}
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz}
     name: supports-preserve-symlinks-flag
     version: 1.0.0
     engines: {node: '>= 0.4'}
     dev: true
 
-  registry.npmmirror.com/tar/6.1.11:
-    resolution: {integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tar/-/tar-6.1.11.tgz}
-    name: tar
-    version: 6.1.11
-    engines: {node: '>= 10'}
-    dependencies:
-      chownr: registry.npmmirror.com/chownr/2.0.0
-      fs-minipass: registry.npmmirror.com/fs-minipass/2.1.0
-      minipass: registry.npmmirror.com/minipass/3.1.6
-      minizlib: registry.npmmirror.com/minizlib/2.1.2
-      mkdirp: registry.npmmirror.com/mkdirp/1.0.4
-      yallist: registry.npmmirror.com/yallist/4.0.0
-    dev: true
-
   registry.npmmirror.com/text-table/0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz}
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz}
     name: text-table
     version: 0.2.0
     dev: true
@@ -4371,15 +2502,8 @@ packages:
     version: 2.1.0
     dev: false
 
-  registry.npmmirror.com/to-fast-properties/2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz}
-    name: to-fast-properties
-    version: 2.0.0
-    engines: {node: '>=4'}
-    dev: true
-
   registry.npmmirror.com/to-regex-range/5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz}
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz}
     name: to-regex-range
     version: 5.0.1
     engines: {node: '>=8.0'}
@@ -4387,45 +2511,14 @@ packages:
       is-number: registry.npmmirror.com/is-number/7.0.0
     dev: true
 
-  registry.npmmirror.com/token-stream/1.0.0:
-    resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/token-stream/-/token-stream-1.0.0.tgz}
-    name: token-stream
-    version: 1.0.0
-    dev: true
-
-  registry.npmmirror.com/tough-cookie/2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz}
-    name: tough-cookie
-    version: 2.5.0
-    engines: {node: '>=0.8'}
-    dependencies:
-      psl: registry.npmmirror.com/psl/1.8.0
-      punycode: registry.npmmirror.com/punycode/2.1.1
-    dev: true
-
-  registry.npmmirror.com/trim-newlines/3.0.1:
-    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/trim-newlines/-/trim-newlines-3.0.1.tgz}
-    name: trim-newlines
-    version: 3.0.1
-    engines: {node: '>=8'}
-    dev: true
-
-  registry.npmmirror.com/true-case-path/1.0.3:
-    resolution: {integrity: sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/true-case-path/-/true-case-path-1.0.3.tgz}
-    name: true-case-path
-    version: 1.0.3
-    dependencies:
-      glob: registry.npmmirror.com/glob/7.2.0
-    dev: true
-
   registry.npmmirror.com/tslib/1.14.1:
-    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz}
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz}
     name: tslib
     version: 1.14.1
     dev: true
 
-  registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.3:
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tsutils/-/tsutils-3.21.0.tgz}
+  registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.4:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tsutils/-/tsutils-3.21.0.tgz}
     id: registry.npmmirror.com/tsutils/3.21.0
     name: tsutils
     version: 3.21.0
@@ -4434,25 +2527,11 @@ packages:
       typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
       tslib: registry.npmmirror.com/tslib/1.14.1
-      typescript: registry.npmmirror.com/typescript/4.6.3
-    dev: true
-
-  registry.npmmirror.com/tunnel-agent/0.6.0:
-    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz}
-    name: tunnel-agent
-    version: 0.6.0
-    dependencies:
-      safe-buffer: registry.npmmirror.com/safe-buffer/5.2.1
-    dev: true
-
-  registry.npmmirror.com/tweetnacl/0.14.5:
-    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz}
-    name: tweetnacl
-    version: 0.14.5
+      typescript: registry.npmmirror.com/typescript/4.6.4
     dev: true
 
   registry.npmmirror.com/type-check/0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz}
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz}
     name: type-check
     version: 0.4.0
     engines: {node: '>= 0.8.0'}
@@ -4460,67 +2539,30 @@ packages:
       prelude-ls: registry.npmmirror.com/prelude-ls/1.2.1
     dev: true
 
-  registry.npmmirror.com/type-fest/0.18.1:
-    resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz}
-    name: type-fest
-    version: 0.18.1
-    engines: {node: '>=10'}
-    dev: true
-
   registry.npmmirror.com/type-fest/0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz}
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz}
     name: type-fest
     version: 0.20.2
     engines: {node: '>=10'}
     dev: true
 
-  registry.npmmirror.com/type-fest/0.6.0:
-    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz}
-    name: type-fest
-    version: 0.6.0
-    engines: {node: '>=8'}
-    dev: true
-
-  registry.npmmirror.com/type-fest/0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz}
-    name: type-fest
-    version: 0.8.1
-    engines: {node: '>=8'}
-    dev: true
-
-  registry.npmmirror.com/typescript/4.6.3:
-    resolution: {integrity: sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/typescript/-/typescript-4.6.3.tgz}
+  registry.npmmirror.com/typescript/4.6.4:
+    resolution: {integrity: sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/typescript/-/typescript-4.6.4.tgz}
     name: typescript
-    version: 4.6.3
+    version: 4.6.4
     engines: {node: '>=4.2.0'}
     hasBin: true
     dev: true
 
-  registry.npmmirror.com/unique-filename/1.1.1:
-    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unique-filename/-/unique-filename-1.1.1.tgz}
-    name: unique-filename
-    version: 1.1.1
-    dependencies:
-      unique-slug: registry.npmmirror.com/unique-slug/2.0.2
-    dev: true
-
-  registry.npmmirror.com/unique-slug/2.0.2:
-    resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unique-slug/-/unique-slug-2.0.2.tgz}
-    name: unique-slug
-    version: 2.0.2
-    dependencies:
-      imurmurhash: registry.npmmirror.com/imurmurhash/0.1.4
-    dev: true
-
   registry.npmmirror.com/unpipe/1.0.0:
-    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz}
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz}
     name: unpipe
     version: 1.0.0
     engines: {node: '>= 0.8'}
     dev: true
 
-  registry.npmmirror.com/unplugin-auto-import/0.7.1_@vueuse+core@8.4.2+vite@2.9.5:
-    resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.7.1.tgz}
+  registry.npmmirror.com/unplugin-auto-import/0.7.1_4xyn6ao5ngwbgzbefoyccvabvi:
+    resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.7.1.tgz}
     id: registry.npmmirror.com/unplugin-auto-import/0.7.1
     name: unplugin-auto-import
     version: 0.7.1
@@ -4531,13 +2573,13 @@ packages:
       '@vueuse/core':
         optional: true
     dependencies:
-      '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.5.1
+      '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.5.2
       '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
-      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.4.2_vue@3.2.33
+      '@vueuse/core': registry.npmmirror.com/@vueuse/core/8.5.0_vue@3.2.33
       local-pkg: registry.npmmirror.com/local-pkg/0.4.1
-      magic-string: registry.npmmirror.com/magic-string/0.26.1
+      magic-string: registry.npmmirror.com/magic-string/0.26.2
       resolve: registry.npmmirror.com/resolve/1.22.0
-      unplugin: registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5
+      unplugin: registry.npmmirror.com/unplugin/0.6.3_vite@2.9.9
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -4545,11 +2587,11 @@ packages:
       - webpack
     dev: true
 
-  registry.npmmirror.com/unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33:
-    resolution: {integrity: sha512-z/kpYJnqrJuWglDNs7fy0YRHr41oLc07y2TkP3by6DqPb1GG9xGC9SFigeFwd4J7GVTqyFVsnjoeup7uK7I2dA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.19.3.tgz}
-    id: registry.npmmirror.com/unplugin-vue-components/0.19.3
+  registry.npmmirror.com/unplugin-vue-components/0.19.5_vite@2.9.9+vue@3.2.33:
+    resolution: {integrity: sha512-cIC+PdQEXmG+B1gmZGk4hws2xP+00C6pg3FD6ixEgRyW+WF+QXQW/60pc+hUhtDYs1PFE+23K3NY7yvYTnDDTA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.19.5.tgz}
+    id: registry.npmmirror.com/unplugin-vue-components/0.19.5
     name: unplugin-vue-components
-    version: 0.19.3
+    version: 0.19.5
     engines: {node: '>=14'}
     peerDependencies:
       '@babel/parser': ^7.15.8
@@ -4561,16 +2603,16 @@ packages:
       '@babel/traverse':
         optional: true
     dependencies:
-      '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.5.1
+      '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.5.2
       '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
       chokidar: registry.npmmirror.com/chokidar/3.5.3
       debug: registry.npmmirror.com/debug/4.3.4
       fast-glob: registry.npmmirror.com/fast-glob/3.2.11
       local-pkg: registry.npmmirror.com/local-pkg/0.4.1
-      magic-string: registry.npmmirror.com/magic-string/0.26.1
-      minimatch: registry.npmmirror.com/minimatch/5.0.1
+      magic-string: registry.npmmirror.com/magic-string/0.26.2
+      minimatch: registry.npmmirror.com/minimatch/5.1.0
       resolve: registry.npmmirror.com/resolve/1.22.0
-      unplugin: registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5
+      unplugin: registry.npmmirror.com/unplugin/0.6.3_vite@2.9.9
       vue: registry.npmmirror.com/vue/3.2.33
     transitivePeerDependencies:
       - esbuild
@@ -4580,11 +2622,11 @@ packages:
       - webpack
     dev: true
 
-  registry.npmmirror.com/unplugin/0.6.2_vite@2.9.5:
-    resolution: {integrity: sha512-+QONc2uBFQbeo4x5mlJHjTKjR6pmuchMpGVrWhwdGFFMb4ttFZ4E9KqhOOrNcm3Q8NNyB1vJ4s5e36IZC7UWYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin/-/unplugin-0.6.2.tgz}
-    id: registry.npmmirror.com/unplugin/0.6.2
+  registry.npmmirror.com/unplugin/0.6.3_vite@2.9.9:
+    resolution: {integrity: sha512-CoW88FQfCW/yabVc4bLrjikN9HC8dEvMU4O7B6K2jsYMPK0l6iAnd9dpJwqGcmXJKRCU9vwSsy653qg+RK0G6A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin/-/unplugin-0.6.3.tgz}
+    id: registry.npmmirror.com/unplugin/0.6.3
     name: unplugin
-    version: 0.6.2
+    version: 0.6.3
     peerDependencies:
       esbuild: '>=0.13'
       rollup: ^2.50.0
@@ -4601,20 +2643,13 @@ packages:
         optional: true
     dependencies:
       chokidar: registry.npmmirror.com/chokidar/3.5.3
-      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
+      vite: registry.npmmirror.com/vite/2.9.9_sass@1.51.0
       webpack-sources: registry.npmmirror.com/webpack-sources/3.2.3
       webpack-virtual-modules: registry.npmmirror.com/webpack-virtual-modules/0.4.3
     dev: true
 
-  registry.npmmirror.com/upath/2.0.1:
-    resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/upath/-/upath-2.0.1.tgz}
-    name: upath
-    version: 2.0.1
-    engines: {node: '>=4'}
-    dev: true
-
   registry.npmmirror.com/uri-js/4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz}
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz}
     name: uri-js
     version: 4.4.1
     dependencies:
@@ -4622,69 +2657,41 @@ packages:
     dev: true
 
   registry.npmmirror.com/util-deprecate/1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz}
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz}
     name: util-deprecate
     version: 1.0.2
     dev: true
 
   registry.npmmirror.com/utils-merge/1.0.1:
-    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz}
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz}
     name: utils-merge
     version: 1.0.1
     engines: {node: '>= 0.4.0'}
     dev: true
 
-  registry.npmmirror.com/uuid/3.4.0:
-    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz}
-    name: uuid
-    version: 3.4.0
-    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
-    hasBin: true
-    dev: true
-
   registry.npmmirror.com/v8-compile-cache/2.3.0:
-    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz}
+    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz}
     name: v8-compile-cache
     version: 2.3.0
     dev: true
 
-  registry.npmmirror.com/validate-npm-package-license/3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz}
-    name: validate-npm-package-license
-    version: 3.0.4
-    dependencies:
-      spdx-correct: registry.npmmirror.com/spdx-correct/3.1.1
-      spdx-expression-parse: registry.npmmirror.com/spdx-expression-parse/3.0.1
-    dev: true
-
-  registry.npmmirror.com/verror/1.10.0:
-    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/verror/-/verror-1.10.0.tgz}
-    name: verror
-    version: 1.10.0
-    engines: {'0': node >=0.6.0}
-    dependencies:
-      assert-plus: registry.npmmirror.com/assert-plus/1.0.0
-      core-util-is: registry.npmmirror.com/core-util-is/1.0.2
-      extsprintf: registry.npmmirror.com/extsprintf/1.3.0
-    dev: true
-
-  registry.npmmirror.com/vite-plugin-eslint/1.4.0_eslint@8.13.0+vite@2.9.5:
-    resolution: {integrity: sha512-EeA09UuA2E66WbbcgOFkfvEZ/SJVrTxP+syRwrX+L+jeMMPpi1W1ZIR5mMtPr4I8evaD4WrszWkPZPOW8amFpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-eslint/-/vite-plugin-eslint-1.4.0.tgz}
-    id: registry.npmmirror.com/vite-plugin-eslint/1.4.0
+  registry.npmmirror.com/vite-plugin-eslint/1.6.0_eslint@8.15.0+vite@2.9.9:
+    resolution: {integrity: sha512-knoNx2jksnqSO645OGgA++xQigTfA+CgvoeJV6554y5DOc+mXbwUm4oR6ijycsD5IrPMDEnwj3NqnFTgjAAJCQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-eslint/-/vite-plugin-eslint-1.6.0.tgz}
+    id: registry.npmmirror.com/vite-plugin-eslint/1.6.0
     name: vite-plugin-eslint
-    version: 1.4.0
+    version: 1.6.0
     peerDependencies:
-      eslint: ^7.0.0
+      eslint: '>=7'
       vite: ^2.0.0
     dependencies:
       '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1
-      eslint: registry.npmmirror.com/eslint/8.13.0
-      rollup: registry.npmmirror.com/rollup/2.70.2
-      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
+      eslint: registry.npmmirror.com/eslint/8.15.0
+      rollup: registry.npmmirror.com/rollup/2.73.0
+      vite: registry.npmmirror.com/vite/2.9.9_sass@1.51.0
     dev: true
 
-  registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.5:
-    resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-mock/-/vite-plugin-mock-2.9.6.tgz}
+  registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.9:
+    resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-mock/-/vite-plugin-mock-2.9.6.tgz}
     id: registry.npmmirror.com/vite-plugin-mock/2.9.6
     name: vite-plugin-mock
     version: 2.9.6
@@ -4693,7 +2700,7 @@ packages:
       mockjs: '>=1.1.0'
       vite: '>=2.0.0'
     dependencies:
-      '@rollup/plugin-node-resolve': registry.npmmirror.com/@rollup/plugin-node-resolve/13.2.1
+      '@rollup/plugin-node-resolve': registry.npmmirror.com/@rollup/plugin-node-resolve/13.3.0
       '@types/mockjs': registry.npmmirror.com/@types/mockjs/1.0.6
       chalk: registry.npmmirror.com/chalk/4.1.2
       chokidar: registry.npmmirror.com/chokidar/3.5.3
@@ -4702,15 +2709,15 @@ packages:
       esbuild: registry.npmmirror.com/esbuild/0.11.3
       fast-glob: registry.npmmirror.com/fast-glob/3.2.11
       mockjs: registry.npmmirror.com/mockjs/1.1.0
-      path-to-regexp: registry.npmmirror.com/path-to-regexp/6.2.0
-      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
+      path-to-regexp: registry.npmmirror.com/path-to-regexp/6.2.1
+      vite: registry.npmmirror.com/vite/2.9.9_sass@1.51.0
     transitivePeerDependencies:
       - rollup
       - supports-color
     dev: true
 
-  registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.9.5:
-    resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-vue-setup-extend/-/vite-plugin-vue-setup-extend-0.4.0.tgz}
+  registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.9.9:
+    resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-vue-setup-extend/-/vite-plugin-vue-setup-extend-0.4.0.tgz}
     id: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0
     name: vite-plugin-vue-setup-extend
     version: 0.4.0
@@ -4719,14 +2726,14 @@ packages:
     dependencies:
       '@vue/compiler-sfc': registry.npmmirror.com/@vue/compiler-sfc/3.2.33
       magic-string: registry.npmmirror.com/magic-string/0.25.9
-      vite: registry.npmmirror.com/vite/2.9.5_sass@1.50.1
+      vite: registry.npmmirror.com/vite/2.9.9_sass@1.51.0
     dev: true
 
-  registry.npmmirror.com/vite/2.9.5_sass@1.50.1:
-    resolution: {integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-2.9.5.tgz}
-    id: registry.npmmirror.com/vite/2.9.5
+  registry.npmmirror.com/vite/2.9.9_sass@1.51.0:
+    resolution: {integrity: sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-2.9.9.tgz}
+    id: registry.npmmirror.com/vite/2.9.9
     name: vite
-    version: 2.9.5
+    version: 2.9.9
     engines: {node: '>=12.2.0'}
     hasBin: true
     peerDependencies:
@@ -4741,171 +2748,15 @@ packages:
       stylus:
         optional: true
     dependencies:
-      esbuild: registry.npmmirror.com/esbuild/0.14.36
-      postcss: registry.npmmirror.com/postcss/8.4.12
+      esbuild: registry.npmmirror.com/esbuild/0.14.39
+      postcss: registry.npmmirror.com/postcss/8.4.13
       resolve: registry.npmmirror.com/resolve/1.22.0
-      rollup: registry.npmmirror.com/rollup/2.70.2
-      sass: registry.npmmirror.com/sass/1.50.1
+      rollup: registry.npmmirror.com/rollup/2.73.0
+      sass: registry.npmmirror.com/sass/1.51.0
     optionalDependencies:
       fsevents: registry.npmmirror.com/fsevents/2.3.2
     dev: true
 
-  registry.npmmirror.com/void-elements/3.1.0:
-    resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/void-elements/-/void-elements-3.1.0.tgz}
-    name: void-elements
-    version: 3.1.0
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  registry.npmmirror.com/vscode-css-languageservice/5.4.1:
-    resolution: {integrity: sha512-W7D3GKFXf97ReAaU4EZ2nxVO1kQhztbycJgc1b/Ipr0h8zYWr88BADmrXu02z+lsCS84D7Sr4hoUzDKeaFn2Kg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-css-languageservice/-/vscode-css-languageservice-5.4.1.tgz}
-    name: vscode-css-languageservice
-    version: 5.4.1
-    dependencies:
-      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
-      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
-      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
-      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
-    dev: true
-
-  registry.npmmirror.com/vscode-html-languageservice/4.2.4:
-    resolution: {integrity: sha512-1HqvXKOq9WlZyW4HTD+0XzrjZoZ/YFrgQY2PZqktbRloHXVAUKm6+cAcvZi4YqKPVn05/CK7do+KBHfuSaEdbg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-html-languageservice/-/vscode-html-languageservice-4.2.4.tgz}
-    name: vscode-html-languageservice
-    version: 4.2.4
-    dependencies:
-      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
-      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
-      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
-      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
-    dev: true
-
-  registry.npmmirror.com/vscode-json-languageservice/4.2.1:
-    resolution: {integrity: sha512-xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-json-languageservice/-/vscode-json-languageservice-4.2.1.tgz}
-    name: vscode-json-languageservice
-    version: 4.2.1
-    dependencies:
-      jsonc-parser: registry.npmmirror.com/jsonc-parser/3.0.0
-      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
-      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.16.0
-      vscode-nls: registry.npmmirror.com/vscode-nls/5.0.0
-      vscode-uri: registry.npmmirror.com/vscode-uri/3.0.3
-    dev: true
-
-  registry.npmmirror.com/vscode-jsonrpc/8.0.0-next.7:
-    resolution: {integrity: sha512-JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.7.tgz}
-    name: vscode-jsonrpc
-    version: 8.0.0-next.7
-    engines: {node: '>=14.0.0'}
-    dev: true
-
-  registry.npmmirror.com/vscode-languageserver-protocol/3.17.0-next.16:
-    resolution: {integrity: sha512-tx4DnXw9u3N7vw+bx6n2NKp6FoxoNwiP/biH83AS30I2AnTGyLd7afSeH6Oewn2E8jvB7K15bs12sMppkKOVeQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.16.tgz}
-    name: vscode-languageserver-protocol
-    version: 3.17.0-next.16
-    dependencies:
-      vscode-jsonrpc: registry.npmmirror.com/vscode-jsonrpc/8.0.0-next.7
-      vscode-languageserver-types: registry.npmmirror.com/vscode-languageserver-types/3.17.0-next.9
-    dev: true
-
-  registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4:
-    resolution: {integrity: sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz}
-    name: vscode-languageserver-textdocument
-    version: 1.0.4
-    dev: true
-
-  registry.npmmirror.com/vscode-languageserver-types/3.16.0:
-    resolution: {integrity: sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz}
-    name: vscode-languageserver-types
-    version: 3.16.0
-    dev: true
-
-  registry.npmmirror.com/vscode-languageserver-types/3.17.0-next.9:
-    resolution: {integrity: sha512-9/PeDNPYduaoXRUzYpqmu4ZV9L01HGo0wH9FUt+sSHR7IXwA7xoXBfNUlv8gB9H0D2WwEmMomSy1NmhjKQyn3A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.9.tgz}
-    name: vscode-languageserver-types
-    version: 3.17.0-next.9
-    dev: true
-
-  registry.npmmirror.com/vscode-languageserver/8.0.0-next.10:
-    resolution: {integrity: sha512-sdjldl9ipuBSWVw5ENVMRcOVQwF0o+J6+lNA7FrB8MiLmzflnfjRoJMqA5tCEY8S/J/+P56ZR/dqiQnRYg5m8w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-languageserver/-/vscode-languageserver-8.0.0-next.10.tgz}
-    name: vscode-languageserver
-    version: 8.0.0-next.10
-    hasBin: true
-    dependencies:
-      vscode-languageserver-protocol: registry.npmmirror.com/vscode-languageserver-protocol/3.17.0-next.16
-    dev: true
-
-  registry.npmmirror.com/vscode-nls/5.0.0:
-    resolution: {integrity: sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-nls/-/vscode-nls-5.0.0.tgz}
-    name: vscode-nls
-    version: 5.0.0
-    dev: true
-
-  registry.npmmirror.com/vscode-pug-languageservice/0.29.8:
-    resolution: {integrity: sha512-QHYAzDSJLg7GOLxCZ12qsM0dAM0dPeMSS1t4kKfzLsfpErmZpFzkAIXbidVrNMdMffGZMtTuIlcpEyWHbx96Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-pug-languageservice/-/vscode-pug-languageservice-0.29.8.tgz}
-    name: vscode-pug-languageservice
-    version: 0.29.8
-    deprecated: 'WARNING: This project has been renamed to @volar/pug-language-service. Install using @volar/pug-language-service instead.'
-    dependencies:
-      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.29.8
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
-      '@volar/transforms': registry.npmmirror.com/@volar/transforms/0.29.8
-      pug-lexer: registry.npmmirror.com/pug-lexer/5.0.1
-      pug-parser: registry.npmmirror.com/pug-parser/6.0.0
-      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
-    dev: true
-
-  registry.npmmirror.com/vscode-typescript-languageservice/0.29.8:
-    resolution: {integrity: sha512-eecDqHk4WjEvy6VHQ6teHczppQ9yJO2wExCy7yu7WiFj35qbw0h4G6Erv46MvP3ClL8FggFzD7s1qM6vdqJUfw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.29.8.tgz}
-    name: vscode-typescript-languageservice
-    version: 0.29.8
-    deprecated: 'WARNING: This project has been renamed to @volar/typescript-language-service. Install using @volar/typescript-language-service instead.'
-    dependencies:
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-      semver: registry.npmmirror.com/semver/7.3.7
-      upath: registry.npmmirror.com/upath/2.0.1
-      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
-      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
-    dev: true
-
-  registry.npmmirror.com/vscode-uri/2.1.2:
-    resolution: {integrity: sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-uri/-/vscode-uri-2.1.2.tgz}
-    name: vscode-uri
-    version: 2.1.2
-    dev: true
-
-  registry.npmmirror.com/vscode-uri/3.0.3:
-    resolution: {integrity: sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.0.3.tgz}
-    name: vscode-uri
-    version: 3.0.3
-    dev: true
-
-  registry.npmmirror.com/vscode-vue-languageservice/0.29.8:
-    resolution: {integrity: sha512-qSJdvW5ttyGUB/8uWDKgo8vnIoFnXYlBP4Z/cn54btsRn6ZMw7IJGJU1381e7p/yGvMTLeGbugD53SghbnSa6g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vscode-vue-languageservice/-/vscode-vue-languageservice-0.29.8.tgz}
-    name: vscode-vue-languageservice
-    version: 0.29.8
-    deprecated: 'WARNING: This project has been renamed to @volar/vue-language-service. Install using @volar/vue-language-service instead.'
-    dependencies:
-      '@volar/code-gen': registry.npmmirror.com/@volar/code-gen/0.29.8
-      '@volar/html2pug': registry.npmmirror.com/@volar/html2pug/0.29.8
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-      '@volar/source-map': registry.npmmirror.com/@volar/source-map/0.29.8
-      '@volar/transforms': registry.npmmirror.com/@volar/transforms/0.29.8
-      '@volar/vue-code-gen': registry.npmmirror.com/@volar/vue-code-gen/0.29.8
-      '@vscode/emmet-helper': registry.npmmirror.com/@vscode/emmet-helper/2.8.4
-      '@vue/reactivity': registry.npmmirror.com/@vue/reactivity/3.2.33
-      '@vue/shared': registry.npmmirror.com/@vue/shared/3.2.33
-      request-light: registry.npmmirror.com/request-light/0.5.8
-      upath: registry.npmmirror.com/upath/2.0.1
-      vscode-css-languageservice: registry.npmmirror.com/vscode-css-languageservice/5.4.1
-      vscode-html-languageservice: registry.npmmirror.com/vscode-html-languageservice/4.2.4
-      vscode-json-languageservice: registry.npmmirror.com/vscode-json-languageservice/4.2.1
-      vscode-languageserver: registry.npmmirror.com/vscode-languageserver/8.0.0-next.10
-      vscode-languageserver-textdocument: registry.npmmirror.com/vscode-languageserver-textdocument/1.0.4
-      vscode-pug-languageservice: registry.npmmirror.com/vscode-pug-languageservice/0.29.8
-      vscode-typescript-languageservice: registry.npmmirror.com/vscode-typescript-languageservice/0.29.8
-    dev: true
-
   registry.npmmirror.com/vue-clipboard3/2.0.0:
     resolution: {integrity: sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz}
     name: vue-clipboard3
@@ -4933,7 +2784,7 @@ packages:
     dev: false
 
   registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33:
-    resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz}
+    resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz}
     id: registry.npmmirror.com/vue-demi/0.12.5
     name: vue-demi
     version: 0.12.5
@@ -4950,8 +2801,8 @@ packages:
       vue: registry.npmmirror.com/vue/3.2.33
     dev: false
 
-  registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.13.0:
-    resolution: {integrity: sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz}
+  registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.15.0:
+    resolution: {integrity: sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz}
     id: registry.npmmirror.com/vue-eslint-parser/8.3.0
     name: vue-eslint-parser
     version: 8.3.0
@@ -4960,10 +2811,10 @@ packages:
       eslint: '>=6.0.0'
     dependencies:
       debug: registry.npmmirror.com/debug/4.3.4
-      eslint: registry.npmmirror.com/eslint/8.13.0
+      eslint: registry.npmmirror.com/eslint/8.15.0
       eslint-scope: registry.npmmirror.com/eslint-scope/7.1.1
       eslint-visitor-keys: registry.npmmirror.com/eslint-visitor-keys/3.3.0
-      espree: registry.npmmirror.com/espree/9.3.1
+      espree: registry.npmmirror.com/espree/9.3.2
       esquery: registry.npmmirror.com/esquery/1.4.0
       lodash: registry.npmmirror.com/lodash/4.17.21
       semver: registry.npmmirror.com/semver/7.3.7
@@ -4971,7 +2822,7 @@ packages:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.1+vue@3.2.33:
+  registry.npmmirror.com/vue-fuse/4.1.1_fuse.js@6.6.2+vue@3.2.33:
     resolution: {integrity: sha512-bhuTiniVK3HmTcxvksrzPgDWPFTEDYiWbJa01E7yT2lRPtE4BVb5cXUBUmqtb5rCkDOsLgMh1n9mRlHQImYNkA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-fuse/-/vue-fuse-4.1.1.tgz}
     id: registry.npmmirror.com/vue-fuse/4.1.1
     name: vue-fuse
@@ -4984,7 +2835,7 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      fuse.js: registry.npmmirror.com/fuse.js/6.6.1
+      fuse.js: registry.npmmirror.com/fuse.js/6.6.2
       vue: registry.npmmirror.com/vue/3.2.33
       vue-demi: registry.npmmirror.com/vue-demi/0.11.4_vue@3.2.33
     dev: false
@@ -5001,22 +2852,21 @@ packages:
       vue: registry.npmmirror.com/vue/3.2.33
     dev: false
 
-  registry.npmmirror.com/vue-tsc/0.29.8_typescript@4.6.3:
-    resolution: {integrity: sha512-pT0wLRjvRuSmB+J4WJT6uuV9mO0KtSSXEAtaVXZQzyk5+DJdbLIQTbRce/TXSkfqt1l1WogO78RjtOJFiMCgfQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.29.8.tgz}
-    id: registry.npmmirror.com/vue-tsc/0.29.8
+  registry.npmmirror.com/vue-tsc/0.34.15_typescript@4.6.4:
+    resolution: {integrity: sha512-xRNaOpg/UCHnRcz9vOdbIjB7uCQ0mifHpqNaejAho7em4WLOzNdJx4R9HMJrqWek44keg7AblIiwM+86QfXx9g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.34.15.tgz}
+    id: registry.npmmirror.com/vue-tsc/0.34.15
     name: vue-tsc
-    version: 0.29.8
+    version: 0.34.15
     hasBin: true
     peerDependencies:
       typescript: '*'
     dependencies:
-      '@volar/shared': registry.npmmirror.com/@volar/shared/0.29.8
-      typescript: registry.npmmirror.com/typescript/4.6.3
-      vscode-vue-languageservice: registry.npmmirror.com/vscode-vue-languageservice/0.29.8
+      '@volar/vue-typescript': registry.npmmirror.com/@volar/vue-typescript/0.34.15
+      typescript: registry.npmmirror.com/typescript/4.6.4
     dev: true
 
   registry.npmmirror.com/vue/3.2.33:
-    resolution: {integrity: sha512-si1ExAlDUrLSIg/V7D/GgA4twJwfsfgG+t9w10z38HhL/HA07132pUQ2KuwAo8qbCyMJ9e6OqrmWrOCr+jW7ZQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue/-/vue-3.2.33.tgz}
+    resolution: {integrity: sha512-si1ExAlDUrLSIg/V7D/GgA4twJwfsfgG+t9w10z38HhL/HA07132pUQ2KuwAo8qbCyMJ9e6OqrmWrOCr+jW7ZQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue/-/vue-3.2.33.tgz}
     name: vue
     version: 3.2.33
     dependencies:
@@ -5028,7 +2878,7 @@ packages:
     dev: false
 
   registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.33:
-    resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz}
+    resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz}
     id: registry.npmmirror.com/vuedraggable/4.1.0
     name: vuedraggable
     version: 4.1.0
@@ -5040,20 +2890,20 @@ packages:
     dev: false
 
   registry.npmmirror.com/webpack-sources/3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz}
+    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz}
     name: webpack-sources
     version: 3.2.3
     engines: {node: '>=10.13.0'}
     dev: true
 
   registry.npmmirror.com/webpack-virtual-modules/0.4.3:
-    resolution: {integrity: sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz}
+    resolution: {integrity: sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz}
     name: webpack-virtual-modules
     version: 0.4.3
     dev: true
 
   registry.npmmirror.com/which/2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/which/-/which-2.0.2.tgz}
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/which/-/which-2.0.2.tgz}
     name: which
     version: 2.0.2
     engines: {node: '>= 8'}
@@ -5062,88 +2912,21 @@ packages:
       isexe: registry.npmmirror.com/isexe/2.0.0
     dev: true
 
-  registry.npmmirror.com/wide-align/1.1.5:
-    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wide-align/-/wide-align-1.1.5.tgz}
-    name: wide-align
-    version: 1.1.5
-    dependencies:
-      string-width: registry.npmmirror.com/string-width/4.2.3
-    dev: true
-
-  registry.npmmirror.com/with/7.0.2:
-    resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/with/-/with-7.0.2.tgz}
-    name: with
-    version: 7.0.2
-    engines: {node: '>= 10.0.0'}
-    dependencies:
-      '@babel/parser': registry.npmmirror.com/@babel/parser/7.17.9
-      '@babel/types': registry.npmmirror.com/@babel/types/7.17.0
-      assert-never: registry.npmmirror.com/assert-never/1.2.1
-      babel-walk: registry.npmmirror.com/babel-walk/3.0.0-canary-5
-    dev: true
-
   registry.npmmirror.com/word-wrap/1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz}
+    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz}
     name: word-wrap
     version: 1.2.3
     engines: {node: '>=0.10.0'}
     dev: true
 
-  registry.npmmirror.com/wrap-ansi/7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz}
-    name: wrap-ansi
-    version: 7.0.0
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: registry.npmmirror.com/ansi-styles/4.3.0
-      string-width: registry.npmmirror.com/string-width/4.2.3
-      strip-ansi: registry.npmmirror.com/strip-ansi/6.0.1
-    dev: true
-
   registry.npmmirror.com/wrappy/1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz}
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz}
     name: wrappy
     version: 1.0.2
     dev: true
 
-  registry.npmmirror.com/y18n/5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz}
-    name: y18n
-    version: 5.0.8
-    engines: {node: '>=10'}
-    dev: true
-
   registry.npmmirror.com/yallist/4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz}
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz}
     name: yallist
     version: 4.0.0
     dev: true
-
-  registry.npmmirror.com/yargs-parser/20.2.9:
-    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz}
-    name: yargs-parser
-    version: 20.2.9
-    engines: {node: '>=10'}
-    dev: true
-
-  registry.npmmirror.com/yargs-parser/21.0.1:
-    resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yargs-parser/-/yargs-parser-21.0.1.tgz}
-    name: yargs-parser
-    version: 21.0.1
-    engines: {node: '>=12'}
-    dev: true
-
-  registry.npmmirror.com/yargs/17.4.1:
-    resolution: {integrity: sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/yargs/-/yargs-17.4.1.tgz}
-    name: yargs
-    version: 17.4.1
-    engines: {node: '>=12'}
-    dependencies:
-      cliui: registry.npmmirror.com/cliui/7.0.4
-      escalade: registry.npmmirror.com/escalade/3.1.1
-      get-caller-file: registry.npmmirror.com/get-caller-file/2.0.5
-      require-directory: registry.npmmirror.com/require-directory/2.1.1
-      string-width: registry.npmmirror.com/string-width/4.2.3
-      y18n: registry.npmmirror.com/y18n/5.0.8
-      yargs-parser: registry.npmmirror.com/yargs-parser/21.0.1
-    dev: true
diff --git a/diboot-admin-ui/vite.config.ts b/diboot-admin-ui/vite.config.ts
index 1777f837..99355015 100644
--- a/diboot-admin-ui/vite.config.ts
+++ b/diboot-admin-ui/vite.config.ts
@@ -1,12 +1,12 @@
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import VueSetupExtend from 'vite-plugin-vue-setup-extend'
-import eslintPlugin from 'vite-plugin-eslint/dist'
+import eslintPlugin from 'vite-plugin-eslint'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 import { viteMockServe } from 'vite-plugin-mock'
-import { resolve } from 'path'
+import { fileURLToPath, URL } from 'url'
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command }) => {
@@ -14,8 +14,7 @@ export default defineConfig(({ command }) => {
     plugins: [
       vue(),
       VueSetupExtend(),
-      // eslint 自动修复
-      eslintPlugin({ fix: true }),
+      eslintPlugin(),
       AutoImport({
         // 解析器
         resolvers: [ElementPlusResolver({ importStyle: 'sass' })],
@@ -71,10 +70,10 @@ export default defineConfig(({ command }) => {
       }
     },
     resolve: {
-      alias: [
-        { find: '@', replacement: resolve(__dirname, 'src') },
-        { find: '#', replacement: resolve(__dirname, 'types') }
-      ]
+      alias: {
+        '@': fileURLToPath(new URL('./src', import.meta.url)),
+        '#': fileURLToPath(new URL('./types', import.meta.url))
+      }
     }
   }
 })
-- 
Gitee


From b876a38107c0aaf71b82fcf08872bcab7a32f3fe Mon Sep 17 00:00:00 2001
From: fullstackyang <8mQwYMHd3M94my7>
Date: Wed, 18 May 2022 09:18:28 +0800
Subject: [PATCH 135/195] + List hooks support options config

---
 diboot-admin-ui/.eslintrc-auto-import.json    |  2 +-
 diboot-admin-ui/pnpm-lock.yaml                | 92 +++++++++----------
 diboot-admin-ui/src/hooks/list.ts             | 53 +++++++----
 .../src/views/system/dictionary/list.vue      |  6 +-
 diboot-admin-ui/types/components.d.ts         | 12 +++
 5 files changed, 96 insertions(+), 69 deletions(-)

diff --git a/diboot-admin-ui/.eslintrc-auto-import.json b/diboot-admin-ui/.eslintrc-auto-import.json
index 94f5b231..82ea7b2f 100644
--- a/diboot-admin-ui/.eslintrc-auto-import.json
+++ b/diboot-admin-ui/.eslintrc-auto-import.json
@@ -70,4 +70,4 @@
     "watch": "readonly",
     "watchEffect": "readonly"
   }
-}
+}
\ No newline at end of file
diff --git a/diboot-admin-ui/pnpm-lock.yaml b/diboot-admin-ui/pnpm-lock.yaml
index 48c49218..a4869689 100644
--- a/diboot-admin-ui/pnpm-lock.yaml
+++ b/diboot-admin-ui/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: 5.4
+lockfileVersion: 5.3
 
 specifiers:
   '@element-plus/icons-vue': ^1.1.4
@@ -47,7 +47,7 @@ dependencies:
   lodash: registry.npmmirror.com/lodash/4.17.21
   mockjs: registry.npmmirror.com/mockjs/1.1.0
   nprogress: registry.npmmirror.com/nprogress/0.2.0
-  pinia: registry.npmmirror.com/pinia/2.0.14_ytvqwwdyss532bvoq2clv4ed5m
+  pinia: registry.npmmirror.com/pinia/2.0.14_typescript@4.6.4+vue@3.2.33
   pinia-plugin-persist: registry.npmmirror.com/pinia-plugin-persist/1.0.0_pinia@2.0.14+vue@3.2.33
   qs: registry.npmmirror.com/qs/6.10.3
   vue: registry.npmmirror.com/vue/3.2.33
@@ -63,14 +63,14 @@ devDependencies:
   '@types/nprogress': registry.npmmirror.com/@types/nprogress/0.2.0
   '@types/qs': registry.npmmirror.com/@types/qs/6.9.7
   '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.3.3_vite@2.9.9+vue@3.2.33
-  '@vue/eslint-config-prettier': registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_bppm6sp3oxoychvfagx6tcd7pe
-  '@vue/eslint-config-typescript': registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0_p4if3q7l2moozcc73o6tbvomjq
+  '@vue/eslint-config-prettier': registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.15.0+prettier@2.6.2
+  '@vue/eslint-config-typescript': registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0_7f105dc3ebd31cec885fdbbd30d5cc4c
   eslint: registry.npmmirror.com/eslint/8.15.0
   eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.7.1_eslint@8.15.0
   prettier: registry.npmmirror.com/prettier/2.6.2
   sass: registry.npmmirror.com/sass/1.51.0
   typescript: registry.npmmirror.com/typescript/4.6.4
-  unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_4xyn6ao5ngwbgzbefoyccvabvi
+  unplugin-auto-import: registry.npmmirror.com/unplugin-auto-import/0.7.1_@vueuse+core@8.5.0+vite@2.9.9
   unplugin-vue-components: registry.npmmirror.com/unplugin-vue-components/0.19.5_vite@2.9.9+vue@3.2.33
   vite: registry.npmmirror.com/vite/2.9.9_sass@1.51.0
   vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.6.0_eslint@8.15.0+vite@2.9.9
@@ -230,7 +230,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/@sxzz/popperjs-es/2.11.7:
-    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz}
+    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz}
     name: '@sxzz/popperjs-es'
     version: 2.11.7
     dev: false
@@ -292,7 +292,7 @@ packages:
       '@types/node': registry.npmmirror.com/@types/node/17.0.34
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0_w4ec7awddsetq6k5phhi6huiuu:
+  registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0_b7082f82c31c8938795d79ce8f1e88a5:
     resolution: {integrity: sha512-6bqFGk6wa9+6RrU++eLknKyDqXU1Oc8nyoLu5a1fU17PNRJd9UBr56rMF7c4DRaRtnarlkQ4jwxUbvBo8cNlpw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.24.0.tgz}
     id: registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0
     name: '@typescript-eslint/eslint-plugin'
@@ -306,10 +306,10 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.24.0_hcfsmds2fshutdssjqluwm76uu
+      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.24.0_eslint@8.15.0+typescript@4.6.4
       '@typescript-eslint/scope-manager': registry.npmmirror.com/@typescript-eslint/scope-manager/5.24.0
-      '@typescript-eslint/type-utils': registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0_hcfsmds2fshutdssjqluwm76uu
-      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.24.0_hcfsmds2fshutdssjqluwm76uu
+      '@typescript-eslint/type-utils': registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0_eslint@8.15.0+typescript@4.6.4
+      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.24.0_eslint@8.15.0+typescript@4.6.4
       debug: registry.npmmirror.com/debug/4.3.4
       eslint: registry.npmmirror.com/eslint/8.15.0
       functional-red-black-tree: registry.npmmirror.com/functional-red-black-tree/1.0.1
@@ -322,7 +322,7 @@ packages:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/parser/5.24.0_hcfsmds2fshutdssjqluwm76uu:
+  registry.npmmirror.com/@typescript-eslint/parser/5.24.0_eslint@8.15.0+typescript@4.6.4:
     resolution: {integrity: sha512-4q29C6xFYZ5B2CXqSBBdcS0lPyfM9M09DoQLtHS5kf+WbpV8pBBhHDLNhXfgyVwFnhrhYzOu7xmg02DzxeF2Uw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.24.0.tgz}
     id: registry.npmmirror.com/@typescript-eslint/parser/5.24.0
     name: '@typescript-eslint/parser'
@@ -355,7 +355,7 @@ packages:
       '@typescript-eslint/visitor-keys': registry.npmmirror.com/@typescript-eslint/visitor-keys/5.24.0
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0_hcfsmds2fshutdssjqluwm76uu:
+  registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0_eslint@8.15.0+typescript@4.6.4:
     resolution: {integrity: sha512-uGi+sQiM6E5CeCZYBXiaIvIChBXru4LZ1tMoeKbh1Lze+8BO9syUG07594C4lvN2YPT4KVeIupOJkVI+9/DAmQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.24.0.tgz}
     id: registry.npmmirror.com/@typescript-eslint/type-utils/5.24.0
     name: '@typescript-eslint/type-utils'
@@ -368,7 +368,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.24.0_hcfsmds2fshutdssjqluwm76uu
+      '@typescript-eslint/utils': registry.npmmirror.com/@typescript-eslint/utils/5.24.0_eslint@8.15.0+typescript@4.6.4
       debug: registry.npmmirror.com/debug/4.3.4
       eslint: registry.npmmirror.com/eslint/8.15.0
       tsutils: registry.npmmirror.com/tsutils/3.21.0_typescript@4.6.4
@@ -408,7 +408,7 @@ packages:
       - supports-color
     dev: true
 
-  registry.npmmirror.com/@typescript-eslint/utils/5.24.0_hcfsmds2fshutdssjqluwm76uu:
+  registry.npmmirror.com/@typescript-eslint/utils/5.24.0_eslint@8.15.0+typescript@4.6.4:
     resolution: {integrity: sha512-K05sbWoeCBJH8KXu6hetBJ+ukG0k2u2KlgD3bN+v+oBKm8adJqVHpSSLHNzqyuv0Lh4GVSAUgZ5lB4icmPmWLw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.24.0.tgz}
     id: registry.npmmirror.com/@typescript-eslint/utils/5.24.0
     name: '@typescript-eslint/utils'
@@ -539,7 +539,7 @@ packages:
     version: 6.1.4
     dev: false
 
-  registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_bppm6sp3oxoychvfagx6tcd7pe:
+  registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.15.0+prettier@2.6.2:
     resolution: {integrity: sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz}
     id: registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0
     name: '@vue/eslint-config-prettier'
@@ -550,11 +550,11 @@ packages:
     dependencies:
       eslint: registry.npmmirror.com/eslint/8.15.0
       eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.5.0_eslint@8.15.0
-      eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_iqftbjqlxzn3ny5nablrkczhqi
+      eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_440b30a60bbe5bb6e3ad0057150b2782
       prettier: registry.npmmirror.com/prettier/2.6.2
     dev: true
 
-  registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0_p4if3q7l2moozcc73o6tbvomjq:
+  registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0_7f105dc3ebd31cec885fdbbd30d5cc4c:
     resolution: {integrity: sha512-F94cL8ug3FaYXlCfU5/wiGjk1qeadmoBpRGAOBq+qre3Smdupa59dd6ZJrsfRODpsMPyTG7330juMDsUvpZ3Rw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/eslint-config-typescript/-/eslint-config-typescript-10.0.0.tgz}
     id: registry.npmmirror.com/@vue/eslint-config-typescript/10.0.0
     name: '@vue/eslint-config-typescript'
@@ -564,8 +564,8 @@ packages:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
       eslint-plugin-vue: ^8.0.1
     dependencies:
-      '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0_w4ec7awddsetq6k5phhi6huiuu
-      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.24.0_hcfsmds2fshutdssjqluwm76uu
+      '@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.24.0_b7082f82c31c8938795d79ce8f1e88a5
+      '@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.24.0_eslint@8.15.0+typescript@4.6.4
       eslint: registry.npmmirror.com/eslint/8.15.0
       eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.7.1_eslint@8.15.0
       vue-eslint-parser: registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.15.0
@@ -1042,7 +1042,7 @@ packages:
       escape-html: registry.npmmirror.com/escape-html/1.0.3
       lodash: registry.npmmirror.com/lodash/4.17.21
       lodash-es: registry.npmmirror.com/lodash-es/4.17.21
-      lodash-unified: registry.npmmirror.com/lodash-unified/1.0.2_3ib2ivapxullxkx3xftsimdk7u
+      lodash-unified: registry.npmmirror.com/lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd
       memoize-one: registry.npmmirror.com/memoize-one/6.0.0
       normalize-wheel-es: registry.npmmirror.com/normalize-wheel-es/1.1.2
       vue: registry.npmmirror.com/vue/3.2.33
@@ -1058,7 +1058,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/esbuild-android-64/0.14.39:
-    resolution: {integrity: sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz}
+    resolution: {integrity: sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz}
     name: esbuild-android-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1069,7 +1069,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-android-arm64/0.14.39:
-    resolution: {integrity: sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz}
+    resolution: {integrity: sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz}
     name: esbuild-android-arm64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1080,7 +1080,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-64/0.14.39:
-    resolution: {integrity: sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz}
+    resolution: {integrity: sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz}
     name: esbuild-darwin-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1091,7 +1091,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-darwin-arm64/0.14.39:
-    resolution: {integrity: sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz}
+    resolution: {integrity: sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz}
     name: esbuild-darwin-arm64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1102,7 +1102,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-64/0.14.39:
-    resolution: {integrity: sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz}
+    resolution: {integrity: sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz}
     name: esbuild-freebsd-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1113,7 +1113,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-freebsd-arm64/0.14.39:
-    resolution: {integrity: sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz}
+    resolution: {integrity: sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz}
     name: esbuild-freebsd-arm64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1124,7 +1124,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-32/0.14.39:
-    resolution: {integrity: sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz}
+    resolution: {integrity: sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz}
     name: esbuild-linux-32
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1135,7 +1135,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-64/0.14.39:
-    resolution: {integrity: sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz}
+    resolution: {integrity: sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz}
     name: esbuild-linux-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1146,7 +1146,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm/0.14.39:
-    resolution: {integrity: sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz}
+    resolution: {integrity: sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz}
     name: esbuild-linux-arm
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1157,7 +1157,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-arm64/0.14.39:
-    resolution: {integrity: sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz}
+    resolution: {integrity: sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz}
     name: esbuild-linux-arm64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1168,7 +1168,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-mips64le/0.14.39:
-    resolution: {integrity: sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz}
+    resolution: {integrity: sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz}
     name: esbuild-linux-mips64le
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1179,7 +1179,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-ppc64le/0.14.39:
-    resolution: {integrity: sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz}
+    resolution: {integrity: sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz}
     name: esbuild-linux-ppc64le
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1190,7 +1190,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-riscv64/0.14.39:
-    resolution: {integrity: sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz}
+    resolution: {integrity: sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz}
     name: esbuild-linux-riscv64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1201,7 +1201,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-linux-s390x/0.14.39:
-    resolution: {integrity: sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz}
+    resolution: {integrity: sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz}
     name: esbuild-linux-s390x
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1212,7 +1212,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-netbsd-64/0.14.39:
-    resolution: {integrity: sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz}
+    resolution: {integrity: sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz}
     name: esbuild-netbsd-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1223,7 +1223,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-openbsd-64/0.14.39:
-    resolution: {integrity: sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz}
+    resolution: {integrity: sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz}
     name: esbuild-openbsd-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1234,7 +1234,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-sunos-64/0.14.39:
-    resolution: {integrity: sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz}
+    resolution: {integrity: sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz}
     name: esbuild-sunos-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1245,7 +1245,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-32/0.14.39:
-    resolution: {integrity: sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz}
+    resolution: {integrity: sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz}
     name: esbuild-windows-32
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1256,7 +1256,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-64/0.14.39:
-    resolution: {integrity: sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz}
+    resolution: {integrity: sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz}
     name: esbuild-windows-64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1267,7 +1267,7 @@ packages:
     optional: true
 
   registry.npmmirror.com/esbuild-windows-arm64/0.14.39:
-    resolution: {integrity: sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz}
+    resolution: {integrity: sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz}
     name: esbuild-windows-arm64
     version: 0.14.39
     engines: {node: '>=12'}
@@ -1339,7 +1339,7 @@ packages:
       eslint: registry.npmmirror.com/eslint/8.15.0
     dev: true
 
-  registry.npmmirror.com/eslint-plugin-prettier/4.0.0_iqftbjqlxzn3ny5nablrkczhqi:
+  registry.npmmirror.com/eslint-plugin-prettier/4.0.0_440b30a60bbe5bb6e3ad0057150b2782:
     resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz}
     id: registry.npmmirror.com/eslint-plugin-prettier/4.0.0
     name: eslint-plugin-prettier
@@ -1657,7 +1657,7 @@ packages:
     dev: true
 
   registry.npmmirror.com/fsevents/2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
     name: fsevents
     version: 2.3.2
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -1928,7 +1928,7 @@ packages:
     version: 4.17.21
     dev: false
 
-  registry.npmmirror.com/lodash-unified/1.0.2_3ib2ivapxullxkx3xftsimdk7u:
+  registry.npmmirror.com/lodash-unified/1.0.2_da03a4540fbd16bbaafbb96724306afd:
     resolution: {integrity: sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.2.tgz}
     id: registry.npmmirror.com/lodash-unified/1.0.2
     name: lodash-unified
@@ -2207,12 +2207,12 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      pinia: registry.npmmirror.com/pinia/2.0.14_ytvqwwdyss532bvoq2clv4ed5m
+      pinia: registry.npmmirror.com/pinia/2.0.14_typescript@4.6.4+vue@3.2.33
       vue: registry.npmmirror.com/vue/3.2.33
       vue-demi: registry.npmmirror.com/vue-demi/0.12.5_vue@3.2.33
     dev: false
 
-  registry.npmmirror.com/pinia/2.0.14_ytvqwwdyss532bvoq2clv4ed5m:
+  registry.npmmirror.com/pinia/2.0.14_typescript@4.6.4+vue@3.2.33:
     resolution: {integrity: sha512-0nPuZR4TetT/WcLN+feMSjWJku3SQU7dBbXC6uw+R6FLQJCsg+/0pzXyD82T1FmAYe0lsx+jnEDQ1BLgkRKlxA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia/-/pinia-2.0.14.tgz}
     id: registry.npmmirror.com/pinia/2.0.14
     name: pinia
@@ -2561,7 +2561,7 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
-  registry.npmmirror.com/unplugin-auto-import/0.7.1_4xyn6ao5ngwbgzbefoyccvabvi:
+  registry.npmmirror.com/unplugin-auto-import/0.7.1_@vueuse+core@8.5.0+vite@2.9.9:
     resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.7.1.tgz}
     id: registry.npmmirror.com/unplugin-auto-import/0.7.1
     name: unplugin-auto-import
diff --git a/diboot-admin-ui/src/hooks/list.ts b/diboot-admin-ui/src/hooks/list.ts
index 37c17670..29c57d07 100644
--- a/diboot-admin-ui/src/hooks/list.ts
+++ b/diboot-admin-ui/src/hooks/list.ts
@@ -5,10 +5,8 @@ import { reactive } from 'vue'
 
 type HookOptions<T> = {
   pageLoader?: BaseListPageLoader<T>
-  baseApi: string
-  listApi?: string
-  deleteApi?: string
-  exportApi?: string
+  options?: ListOptions<T>
+  baseApi?: string
   autoLoad?: boolean
 }
 
@@ -33,17 +31,17 @@ export interface ListOptions<T> {
   // 导出接口
   exportApi?: string
   // 自定义参数（不被查询表单重置和改变的参数）
-  customQueryParam?: { [key: string]: any }
+  customQueryParam?: Record<string, unknown>
   // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
-  queryParam?: { [key: string]: any }
+  queryParam?: Record<string, unknown>
   // 日期区间选择配置
-  dateRangeQuery?: any[]
+  dateRangeQuery?: Record<string, [string | number | Date, string | number | Date]>
   // 高级搜索 展开/关闭
   advanced?: boolean
   // 列表数据
   list?: T[]
   // 是否将children转化为_children
-  childrenConvert: boolean
+  childrenConvert?: boolean
   // 是否从mixin中自动获取初始的列表数据
   getListFromMixin?: boolean
   // 标记加载状态
@@ -77,7 +75,7 @@ export class BaseListPageLoader<T> {
     // 与查询条件绑定的参数（会被查询表单重置和改变的参数）
     queryParam: {},
     // 日期区间选择配置
-    dateRangeQuery: [],
+    dateRangeQuery: {},
     // 高级搜索 展开/关闭
     advanced: false,
     // 列表数据
@@ -112,6 +110,14 @@ export class BaseListPageLoader<T> {
     if (this.options?.pagination) this.options.pagination.current = 1
     this.getList()
   }
+
+  /**
+   * 防抖搜索（防止重复触发）
+   */
+  public onDebounceSearch = _.debounce(() => {
+    this.onSearch()
+  }, 300)
+
   public toggleLoading() {
     if (this.options) this.options.loading = true
   }
@@ -128,7 +134,6 @@ export class BaseListPageLoader<T> {
       )
       if (res.code === 0) {
         if (this.options) this.options.list = this.listFilter(res.data)
-        console.log('this.options.list', this.options.list)
         if (res.page) {
           if (this.options?.pagination) {
             this.options.pagination.pageSize = res.page.pageSize
@@ -148,7 +153,7 @@ export class BaseListPageLoader<T> {
         message: e as string
       })
     } finally {
-      // this.toggleLoadingData()
+      this.toggleLoading()
       console.log(this.options?.loading)
     }
   }
@@ -201,14 +206,13 @@ export class BaseListPageLoader<T> {
    * 构建区间查询参数
    */
   dateRange2queryParam() {
-    _.forEach(this.options?.dateRangeQuery || [], (v, k) => {
-      if (k && v && v.length === 2) {
-        if (this.options?.queryParam) {
-          this.options.queryParam[`${k}Begin`] = v[0]
-          this.options.queryParam[`${k}End`] = v[1]
-        }
+    const dateRangeQuery = this.options?.dateRangeQuery || {}
+    for (const [key, value] of Object.entries(dateRangeQuery)) {
+      if (this.options != null && this.options.queryParam != null) {
+        this.options.queryParam[`${key}Begin`] = value[0]
+        this.options.queryParam[`${key}End`] = value[1]
       }
-    })
+    }
   }
 }
 
@@ -222,9 +226,18 @@ type Results<T> = {
 
 export default function <T>(options: HookOptions<T>) {
   let { pageLoader, autoLoad } = options
-  const { baseApi } = options
+  const { baseApi, options: loaderOptions } = options
   pageLoader = pageLoader || new BaseListPageLoader<T>()
-  pageLoader.options.baseApi = baseApi
+  // 赋值所有选项参数
+  if (loaderOptions != null) {
+    for (const [key, value] of Object.entries(loaderOptions)) {
+      pageLoader.options[key as keyof ListOptions<any>] = value
+    }
+  }
+  // 赋值自定义参数
+  if (baseApi != null) {
+    pageLoader.options.baseApi = baseApi
+  }
   autoLoad = autoLoad == null ? true : autoLoad
   onMounted(() => {
     if (autoLoad) {
diff --git a/diboot-admin-ui/src/views/system/dictionary/list.vue b/diboot-admin-ui/src/views/system/dictionary/list.vue
index 8519bcf0..dadebe0b 100644
--- a/diboot-admin-ui/src/views/system/dictionary/list.vue
+++ b/diboot-admin-ui/src/views/system/dictionary/list.vue
@@ -10,7 +10,9 @@ interface Dictionary {
 }
 
 const { pageLoader, queryParam, dataList } = useList<Dictionary>({
-  baseApi: '/dictionary'
+  options: {
+    baseApi: '/dictionary'
+  }
 })
 const onReset = () => {
   pageLoader.onReset()
@@ -27,7 +29,7 @@ const onReset = () => {
           <el-input v-model="queryParam.itemValue" placeholder="类型编码" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="pageLoader.onSearch()">查询</el-button>
+          <el-button type="primary" @click="pageLoader.onDebounceSearch()">查询</el-button>
           <el-button @click="onReset">重置</el-button>
         </el-form-item>
       </el-form>
diff --git a/diboot-admin-ui/types/components.d.ts b/diboot-admin-ui/types/components.d.ts
index 7b09f592..74a7a1ae 100644
--- a/diboot-admin-ui/types/components.d.ts
+++ b/diboot-admin-ui/types/components.d.ts
@@ -5,13 +5,19 @@ import '@vue/runtime-core'
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -23,9 +29,14 @@ declare module '@vue/runtime-core' {
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
@@ -34,6 +45,7 @@ declare module '@vue/runtime-core' {
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     Icon: typeof import('@/components/icon/index.vue')['default']
     IconSelect: typeof import('@/components/icon/select.vue')['default']
+    Loading: typeof import('element-plus/es')['ElLoadingDirective']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
-- 
Gitee


From d4401163cc65b0fc8d61d9ba940955dd8072b17b Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 18 May 2022 19:26:23 +0800
Subject: [PATCH 136/195] =?UTF-8?q?+=20=E5=88=86=E5=8F=B7=E5=88=86?=
 =?UTF-8?q?=E9=9A=94=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-core/src/main/java/com/diboot/core/config/Cons.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/diboot-core/src/main/java/com/diboot/core/config/Cons.java b/diboot-core/src/main/java/com/diboot/core/config/Cons.java
index 80b8bf6b..b5071378 100644
--- a/diboot-core/src/main/java/com/diboot/core/config/Cons.java
+++ b/diboot-core/src/main/java/com/diboot/core/config/Cons.java
@@ -46,6 +46,10 @@ public class Cons {
      * 竖线分隔符，or
      */
     public final static  String SEPARATOR_OR = "|";
+    /**
+     * 分号分隔符
+     */
+    public final static  String SEPARATOR_SEMICOLON = ";";
     /**
      * 排序 - 降序标记
      */
-- 
Gitee


From 9db0cc1654c69ed5468a5c712149adcef5110d5c Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 18 May 2022 23:52:24 +0800
Subject: [PATCH 137/195] =?UTF-8?q?*=20(admin-ui)=20eslint=20=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=20any=20=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-admin-ui/.eslintignore                 |   2 -
 diboot-admin-ui/.eslintrc.js                  |   1 -
 diboot-admin-ui/mock/_prodServer.ts           |   2 +-
 diboot-admin-ui/mock/_util.ts                 |  57 +++--
 diboot-admin-ui/mock/auth/index.ts            |   6 +-
 diboot-admin-ui/mock/system/dictionary.ts     | 233 ++++++++++--------
 diboot-admin-ui/mock/system/role.ts           |  64 +++--
 diboot-admin-ui/mock/utils/relatedData.ts     |   4 +-
 .../src/components/icon/select.vue            |   3 +-
 diboot-admin-ui/src/config/iconLibrary.ts     |   6 +-
 diboot-admin-ui/src/hooks/list_default.ts     |  22 +-
 diboot-admin-ui/src/layout/main/index.vue     |   5 +-
 diboot-admin-ui/src/layout/tabs/index.vue     |  87 +++----
 diboot-admin-ui/src/router/router-guards.ts   |  20 +-
 diboot-admin-ui/src/store/auth.ts             |   2 +-
 diboot-admin-ui/src/utils/relatedData.ts      |   6 +-
 diboot-admin-ui/src/utils/request.ts          |  32 +--
 diboot-admin-ui/src/utils/route.ts            |  27 +-
 .../src/views/system/role/list.vue            |  14 +-
 diboot-admin-ui/src/views/system/role/type.ts |   8 +
 diboot-admin-ui/{src => types}/env.d.ts       |   0
 21 files changed, 319 insertions(+), 282 deletions(-)
 create mode 100644 diboot-admin-ui/src/views/system/role/type.ts
 rename diboot-admin-ui/{src => types}/env.d.ts (100%)

diff --git a/diboot-admin-ui/.eslintignore b/diboot-admin-ui/.eslintignore
index 0dc990b0..a4afa61e 100644
--- a/diboot-admin-ui/.eslintignore
+++ b/diboot-admin-ui/.eslintignore
@@ -15,5 +15,3 @@ dist
 .husky
 .local
 .eslintrc.js
-
-/src/mock/*
diff --git a/diboot-admin-ui/.eslintrc.js b/diboot-admin-ui/.eslintrc.js
index b832b5a1..aa8bc3f4 100644
--- a/diboot-admin-ui/.eslintrc.js
+++ b/diboot-admin-ui/.eslintrc.js
@@ -23,7 +23,6 @@ module.exports = {
     NodeJS: 'readonly'
   },
   rules: {
-    '@typescript-eslint/no-explicit-any': 0,
     'comma-dangle': ['warn', 'only-multiline'],
     'vue/multi-word-component-names': 'off',
     'vue/html-self-closing': ['warn', { html: { void: 'always' } }],
diff --git a/diboot-admin-ui/mock/_prodServer.ts b/diboot-admin-ui/mock/_prodServer.ts
index 52521a45..f93f0ed9 100644
--- a/diboot-admin-ui/mock/_prodServer.ts
+++ b/diboot-admin-ui/mock/_prodServer.ts
@@ -2,7 +2,7 @@ import { createProdMockServer } from 'vite-plugin-mock/es/createProdMockServer'
 
 const modules = import.meta.globEager('./**/*.ts')
 
-const mockModules: any[] = []
+const mockModules: unknown[] = []
 Object.keys(modules)
   .filter(path => !path.includes('/_')) // Ignore files and directories starting with _
   .forEach(key => mockModules.push(...modules[key].default))
diff --git a/diboot-admin-ui/mock/_util.ts b/diboot-admin-ui/mock/_util.ts
index b338c17c..794073c6 100644
--- a/diboot-admin-ui/mock/_util.ts
+++ b/diboot-admin-ui/mock/_util.ts
@@ -1,14 +1,25 @@
+import { Recordable } from 'vite-plugin-mock'
 import Mock from 'mockjs'
 
 // 分页
-export const pagination = <T = any>(pageNo: number, pageSize: number, array: T[]): T[] => {
+export const pagination = <T = unknown>(pageNo: number, pageSize: number, array: T[]): T[] => {
   const offset = (pageNo - 1) * Number(pageSize)
   return offset + Number(pageSize) >= array.length
     ? array.slice(offset, array.length)
     : array.slice(offset, offset + Number(pageSize))
 }
 
-const resultJson = (code: number, msg: string, data?: any, ext = {}) =>
+/**
+ * 接口请求
+ */
+export interface ApiRequest<B = Recordable, Q = B, H = Recordable> {
+  url: string
+  body: B
+  query: Q
+  headers: H
+}
+
+const resultJson = (code: number, msg: string, data?: unknown, ext = {}) =>
   Mock.mock({
     ...ext,
     code,
@@ -16,18 +27,21 @@ const resultJson = (code: number, msg: string, data?: any, ext = {}) =>
     msg
   })
 
-class JsonResult {
+/**
+ * 通用数据返回
+ */
+export const JsonResult = {
   /**
    * 操作成功
    */
-  OK(data?: any, msg = '操作成功') {
+  OK(data?: unknown, msg = '操作成功') {
     return resultJson(0, msg, data)
-  }
+  },
 
   /**
    * 数据分页
    */
-  PAGINATION<T = any>(page: number, pageSize: number, list: T[] = []) {
+  PAGINATION<T = unknown>(page: number, pageSize: number, list: T[] = []) {
     page = page ? page : 1
     pageSize = pageSize ? pageSize : 20
     return resultJson(0, '操作成功', pagination(page, pageSize, list), {
@@ -37,77 +51,77 @@ class JsonResult {
         totalCount: list.length
       }
     })
-  }
+  },
 
   /**
    * 部分成功（一般用于批量处理场景，只处理筛选后的合法数据）
    */
   WARN_PARTIAL_SUCCESS(msg?: string) {
     return resultJson(1001, '部分成功' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 有潜在的性能问题
    */
   WARN_PERFORMANCE_ISSUE(msg?: string) {
     return resultJson(1002, '潜在的性能问题' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 传入参数不对
    */
   FAIL_INVALID_PARAM(msg?: string) {
     return resultJson(4000, '请求参数不匹配' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * Token无效或已过期
    */
   FAIL_INVALID_TOKEN(msg?: string) {
     return resultJson(4001, 'Token无效或已过期' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 没有权限执行该操作
    */
   FAIL_NO_PERMISSION(msg?: string) {
     return resultJson(4003, '无权执行该操作' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 请求资源不存在
    */
   FAIL_NOT_FOUND(msg?: string) {
     return resultJson(4004, '请求资源不存在' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 数据校验不通过
    */
   FAIL_VALIDATION(msg?: string) {
     return resultJson(4005, '数据校验不通过' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 操作执行失败
    */
   FAIL_OPERATION(msg?: string) {
     return resultJson(4006, '操作执行失败' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 请求连接超时
    */
   FAIL_REQUEST_TIMEOUT(msg?: string) {
     return resultJson(4008, '请求连接超时' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 认证不通过（用户名密码错误等认证失败场景）
    */
   FAIL_AUTHENTICATION(msg?: string) {
     return resultJson(4009, '认证不通过' + (msg ? `:${msg}` : ''))
-  }
+  },
 
   /**
    * 系统异常
@@ -115,13 +129,4 @@ class JsonResult {
   FAIL_EXCEPTION(msg?: string) {
     return resultJson(5000, '系统异常' + (msg ? `:${msg}` : ''))
   }
-
-  /**
-   * 服务不可用
-   */
-  FAIL_SERVICE_UNAVAILABLE(msg?: string) {
-    return resultJson(5003, '服务不可用' + (msg ? `:${msg}` : ''))
-  }
 }
-
-export default new JsonResult()
diff --git a/diboot-admin-ui/mock/auth/index.ts b/diboot-admin-ui/mock/auth/index.ts
index d9fe29fc..73f623a8 100644
--- a/diboot-admin-ui/mock/auth/index.ts
+++ b/diboot-admin-ui/mock/auth/index.ts
@@ -1,5 +1,5 @@
 import { MockMethod } from 'vite-plugin-mock'
-import JsonResult from '../_util'
+import { JsonResult, ApiRequest } from '../_util'
 import { Random } from 'mockjs'
 import * as Element from '@element-plus/icons-vue'
 
@@ -22,7 +22,7 @@ export default [
     url: `${baseUrl}/login`,
     timeout: Random.natural(50, 300),
     method: 'post',
-    response: ({ body }: any) => {
+    response: ({ body }: ApiRequest) => {
       if (body.username === 'admin' && body.password === '123456') {
         return JsonResult.OK({ token: Random.string('lower', 32, 32) })
       }
@@ -33,7 +33,7 @@ export default [
     url: `${baseUrl}/userInfo`,
     timeout: Random.natural(50, 300),
     method: 'get',
-    response: ({ headers }: any) => {
+    response: ({ headers }: ApiRequest) => {
       const token = headers.authorization
       if (token && token.length >= 32) {
         const name = Random.cname()
diff --git a/diboot-admin-ui/mock/system/dictionary.ts b/diboot-admin-ui/mock/system/dictionary.ts
index c52388bf..eaa246ac 100644
--- a/diboot-admin-ui/mock/system/dictionary.ts
+++ b/diboot-admin-ui/mock/system/dictionary.ts
@@ -1,124 +1,139 @@
 import { MockMethod } from 'vite-plugin-mock'
-import JsonResult from '../_util'
+import { JsonResult } from '../_util'
 import { Random } from 'mockjs'
 
 const baseUrl = '/api/dictionary'
 
 export default [
+  {
+    url: `${baseUrl}/list`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    response: () => {
+      return JsonResult.OK(dictionaryDataMap.list)
+    }
+  },
+  {
+    url: `${baseUrl}/detail`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    response: () => {
+      return JsonResult.OK(dictionaryDataMap.detail)
+    }
+  }
+] as MockMethod[]
+
+const dictionaryDataMap = {
+  list: [
     {
-        url: `${baseUrl}/list`,
-        timeout: Random.natural(50, 300),
-        method: 'get',
-        response: () => {
-            return JsonResult.OK(dictionaryDataMap.list)
+      id: '1',
+      type: 'GENDER',
+      itemName: '用户性别',
+      itemValue: '',
+      description: '用户性别数据字典',
+      createTime: '2022-05-11',
+      children: [
+        {
+          id: '2',
+          type: 'GENDER',
+          itemName: '男',
+          itemValue: 'M',
+          description: '男性',
+          createTime: '2022-05-11'
+        },
+        {
+          id: '3',
+          type: 'GENDER',
+          itemName: '女',
+          itemValue: 'F',
+          description: '女性',
+          createTime: '2022-05-11'
         }
+      ]
     },
     {
-        url: `${baseUrl}/detail`,
-        timeout: Random.natural(50, 300),
-        method: 'get',
-        response: () => {
-            return JsonResult.OK(dictionaryDataMap.detail)
+      id: '4',
+      type: 'ACCOUNT_STATUS',
+      itemName: '账号状态',
+      itemValue: '',
+      description: '用户账号状态信息',
+      createTime: '2022-05-11',
+      children: [
+        {
+          id: '5',
+          type: 'ACCOUNT_STATUS',
+          itemName: '有效',
+          itemValue: 'A',
+          description: '有效',
+          createTime: '2022-05-11'
+        },
+        {
+          id: '6',
+          type: 'ACCOUNT_STATUS',
+          itemName: '无效',
+          itemValue: 'I',
+          description: '无效',
+          createTime: '2022-05-11'
+        },
+        {
+          id: '7',
+          type: 'ACCOUNT_STATUS',
+          itemName: '锁定',
+          itemValue: 'L',
+          description: '锁定',
+          createTime: '2022-05-11'
+        },
+        {
+          id: '8',
+          type: 'ACCOUNT_STATUS',
+          itemName: '停用',
+          itemValue: 'S',
+          description: '停用',
+          createTime: '2022-05-11'
         }
+      ]
     }
-]as MockMethod[]
-
-
-const dictionaryDataMap = {
-    list: [{
-        id: '1',
-        type: 'GENDER',
-        itemName: '用户性别',
-        itemValue: '',
-        description: '用户性别数据字典',
-        createTime: '2022-05-11',
-        children: [{
-            id: '2',
-            type: 'GENDER',
-            itemName: '男',
-            itemValue: 'M',
-            description: '男性',
-            createTime: '2022-05-11',
-        },{
-            id: '3',
-            type: 'GENDER',
-            itemName: '女',
-            itemValue: 'F',
-            description: '女性',
-            createTime: '2022-05-11',
-        }]
-    },{
-        id: '4',
+  ],
+  detail: {
+    id: '4',
+    type: 'ACCOUNT_STATUS',
+    itemName: '账号状态',
+    itemValue: '',
+    description: '用户账号状态信息',
+    createTime: '2022-05-11',
+    children: [
+      {
+        id: '5',
         type: 'ACCOUNT_STATUS',
-        itemName: '账号状态',
-        itemValue: '',
-        description: '用户账号状态信息',
-        createTime: '2022-05-11',
-        children: [{
-            id: '5',
-            type: 'ACCOUNT_STATUS',
-            itemName: '有效',
-            itemValue: 'A',
-            description: '有效',
-            createTime: '2022-05-11',
-        },{
-            id: '6',
-            type: 'ACCOUNT_STATUS',
-            itemName: '无效',
-            itemValue: 'I',
-            description: '无效',
-            createTime: '2022-05-11',
-        },{
-            id: '7',
-            type: 'ACCOUNT_STATUS',
-            itemName: '锁定',
-            itemValue: 'L',
-            description: '锁定',
-            createTime: '2022-05-11',
-        },{
-            id: '8',
-            type: 'ACCOUNT_STATUS',
-            itemName: '停用',
-            itemValue: 'S',
-            description: '停用',
-            createTime: '2022-05-11',
-        }]
-    }],
-    detail: {
-        id: '4',
+        itemName: '有效',
+        itemValue: 'A',
+        description: '有效',
+        createTime: '2022-05-11'
+      },
+      {
+        id: '6',
         type: 'ACCOUNT_STATUS',
-        itemName: '账号状态',
-        itemValue: '',
-        description: '用户账号状态信息',
-        createTime: '2022-05-11',
-        children: [{
-            id: '5',
-            type: 'ACCOUNT_STATUS',
-            itemName: '有效',
-            itemValue: 'A',
-            description: '有效',
-            createTime: '2022-05-11',
-        },{
-            id: '6',
-            type: 'ACCOUNT_STATUS',
-            itemName: '无效',
-            itemValue: 'I',
-            description: '无效',
-            createTime: '2022-05-11',
-        },{
-            id: '7',
-            type: 'ACCOUNT_STATUS',
-            itemName: '锁定',
-            itemValue: 'L',
-            description: '锁定',
-            createTime: '2022-05-11',
-        },{
-            id: '8',
-            type: 'ACCOUNT_STATUS',
-            itemName: '停用',
-            itemValue: 'S',
-            description: '停用',
-            createTime: '2022-05-11',
-        }]
-    }
+        itemName: '无效',
+        itemValue: 'I',
+        description: '无效',
+        createTime: '2022-05-11'
+      },
+      {
+        id: '7',
+        type: 'ACCOUNT_STATUS',
+        itemName: '锁定',
+        itemValue: 'L',
+        description: '锁定',
+        createTime: '2022-05-11'
+      },
+      {
+        id: '8',
+        type: 'ACCOUNT_STATUS',
+        itemName: '停用',
+        itemValue: 'S',
+        description: '停用',
+        createTime: '2022-05-11'
+      }
+    ]
+  }
 }
diff --git a/diboot-admin-ui/mock/system/role.ts b/diboot-admin-ui/mock/system/role.ts
index 7309f73b..2df6e2b3 100644
--- a/diboot-admin-ui/mock/system/role.ts
+++ b/diboot-admin-ui/mock/system/role.ts
@@ -1,39 +1,74 @@
 import { MockMethod } from 'vite-plugin-mock'
-import JsonResult from '../_util'
+import { JsonResult, ApiRequest } from '../_util'
 import { Random } from 'mockjs'
+import type { Role } from '@/views/system/role/type'
 
 const baseUrl = '/api/role'
 
 const deleteDataIds: string[] = []
 
+const dataList: Role[] = Array.from({ length: 50 }).map((_, index) => {
+  const id = String(50 - index)
+  return {
+    id,
+    name: '角色' + id,
+    code: 'role' + id,
+    description: '@csentence',
+    createTime: '@datetime',
+    updateTime: '@datetime'
+  }
+})
+
 export default [
   {
     url: `${baseUrl}/list`,
     timeout: Random.natural(50, 300),
     method: 'get',
-    response: ({ query }: any) => {
+    response: ({ query }: ApiRequest) => {
       return JsonResult.PAGINATION(
         query.pageIndex,
         query.pageSize,
-        Array.from({ length: 50 })
-          .map((_, index) => ({
-            id: String(index + 1),
-            name: '角色' + (index + 1),
-            code: 'role' + (index + 1),
-            description: '@csentence',
-            createTime: '@datetime',
-            updateTime: '@datetime'
-          }))
+        dataList
           .filter(e => !deleteDataIds.includes(e.id))
           .filter(e => e.name.match(query.name) && e.code.match(query.code))
       )
     }
   },
+  {
+    url: `${baseUrl}/:id`,
+    timeout: Random.natural(50, 300),
+    method: 'get',
+    response: ({ query }: ApiRequest) => {
+      return JsonResult.OK(dataList.filter(e => e.id === query.id))
+    }
+  },
+  {
+    url: `${baseUrl}`,
+    timeout: Random.natural(50, 300),
+    method: 'post',
+    response: ({ body }: ApiRequest<Role>) => {
+      return JsonResult.OK(!!dataList.unshift(body))
+    }
+  },
+  {
+    url: `${baseUrl}/:id`,
+    timeout: Random.natural(50, 300),
+    method: 'put',
+    response: ({ body, query }: ApiRequest<Role>) => {
+      return JsonResult.OK(
+        !!dataList.splice(
+          dataList.findIndex(e => e.id === query.id),
+          1,
+          body
+        )
+      )
+    }
+  },
   {
     url: `${baseUrl}/:id`,
     timeout: Random.natural(50, 300),
     method: 'delete',
-    response: ({ query }: any) => {
+    response: ({ query }: ApiRequest) => {
       deleteDataIds.push(query.id)
       return JsonResult.OK()
     }
@@ -42,7 +77,7 @@ export default [
     url: `${baseUrl}/cancelDeleted`,
     timeout: Random.natural(50, 300),
     method: 'patch',
-    response: ({ body }: any) => {
+    response: ({ body }: ApiRequest<Array<string>>) => {
       deleteDataIds.splice(0, deleteDataIds.length, ...deleteDataIds.filter(e => !body.includes(e)))
       return JsonResult.OK()
     }
@@ -51,9 +86,8 @@ export default [
     url: `${baseUrl}/batchDelete`,
     timeout: Random.natural(50, 300),
     method: 'post',
-    response: ({ body }: any) => {
+    response: ({ body }: ApiRequest<Array<string>>) => {
       deleteDataIds.push(...body)
-      console.log(deleteDataIds)
       return JsonResult.OK()
     }
   }
diff --git a/diboot-admin-ui/mock/utils/relatedData.ts b/diboot-admin-ui/mock/utils/relatedData.ts
index f317c798..5cf4418b 100644
--- a/diboot-admin-ui/mock/utils/relatedData.ts
+++ b/diboot-admin-ui/mock/utils/relatedData.ts
@@ -1,5 +1,5 @@
 import { MockMethod } from 'vite-plugin-mock'
-import JsonResult from '../_util'
+import { JsonResult } from '../_util'
 import { Random } from 'mockjs'
 
 const baseUrl = '/api'
@@ -46,4 +46,4 @@ export default [
       })
     }
   }
-]
+] as MockMethod[]
diff --git a/diboot-admin-ui/src/components/icon/select.vue b/diboot-admin-ui/src/components/icon/select.vue
index 7bccc92a..84ec7409 100644
--- a/diboot-admin-ui/src/components/icon/select.vue
+++ b/diboot-admin-ui/src/components/icon/select.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import IconLibrary from '@/config/iconLibrary'
 
-const getIconList = (key: string): any => Object.values(IconLibrary[key])
+const getIconList = (key: string) =>
+  Object.values(IconLibrary[key] as Record<string, { name: string } & Record<string, unknown>>)
 
 defineProps<{ modelValue?: string }>()
 
diff --git a/diboot-admin-ui/src/config/iconLibrary.ts b/diboot-admin-ui/src/config/iconLibrary.ts
index d0b4fcf6..542e6c06 100644
--- a/diboot-admin-ui/src/config/iconLibrary.ts
+++ b/diboot-admin-ui/src/config/iconLibrary.ts
@@ -9,7 +9,7 @@ const iconVueFiles = import.meta.globEager('@/assets/icon/**/*.vue')
 /**
  * 构建本地图标
  */
-const Local = Object.keys(iconSvgFiles).reduce((all: any, path: string) => {
+const Local = Object.keys(iconSvgFiles).reduce((all: Record<string, unknown>, path: string) => {
   const name = path.replace(/.*icon\/(.*)\.svg/, '$1')
   all[name] = defineComponent({
     name,
@@ -17,7 +17,7 @@ const Local = Object.keys(iconSvgFiles).reduce((all: any, path: string) => {
   })
   return all
 }, {})
-Object.keys(iconVueFiles).reduce((all: any, path: string) => {
+Object.keys(iconVueFiles).reduce((all: Record<string, unknown>, path: string) => {
   const name = path.replace(/.*icon\/(.*)\.vue/, '$1')
   all[name] = { name, ...iconVueFiles[path].default }
   return all
@@ -26,4 +26,4 @@ Object.keys(iconVueFiles).reduce((all: any, path: string) => {
 /**
  * 导出所有图标资源
  */
-export default { Element, Local } as any
+export default { Element, Local } as Record<string, Record<string, unknown>>
diff --git a/diboot-admin-ui/src/hooks/list_default.ts b/diboot-admin-ui/src/hooks/list_default.ts
index 6b19acd7..618ec702 100644
--- a/diboot-admin-ui/src/hooks/list_default.ts
+++ b/diboot-admin-ui/src/hooks/list_default.ts
@@ -19,7 +19,12 @@ export interface Pagination {
   total: number
 }
 
-export default <T>(option: ListOption<T> & DeleteOption) => {
+/**
+ * 列表操作
+ *
+ * @param option
+ */
+export default <T, D = T>(option: ListOption<D> & DeleteOption) => {
   // 标记加载状态
   const loading = ref(false)
 
@@ -27,7 +32,7 @@ export default <T>(option: ListOption<T> & DeleteOption) => {
 
   const pagination: Partial<Pagination> = reactive({})
 
-  const queryParam: QueryParam<T> = reactive(_.cloneDeep(option.initQueryParam ?? {}))
+  const queryParam: QueryParam<D> = reactive(_.cloneDeep(option.initQueryParam ?? {}))
 
   const dateRangeQuery: Record<string, [string | number | Date, string | number | Date]> = reactive({})
 
@@ -54,7 +59,7 @@ export default <T>(option: ListOption<T> & DeleteOption) => {
   /**
    * 获取数据列表
    */
-  const getList = _.debounce(() => {
+  const getList = () => {
     loading.value = true
     api
       .get<Array<T>>(option.listApi ? option.listApi : `${option.baseApi}/list`, buildQueryParam())
@@ -72,15 +77,15 @@ export default <T>(option: ListOption<T> & DeleteOption) => {
         })
       })
       .finally(() => (loading.value = false))
-  }, 300)
+  }
 
   /**
    * 搜索，查询第一页
    */
-  const onSearch = () => {
+  const onSearch = _.debounce(() => {
     pagination.current = 1
     getList()
-  }
+  }, 300)
 
   /**
    * 重置筛选条件
@@ -120,6 +125,11 @@ export interface DeleteOption {
   deleteCallback?: () => void
 }
 
+/**
+ * 删除数据
+ *
+ * @param option
+ */
 export const useDelete = (option: DeleteOption) => {
   /**
    * 删除数据
diff --git a/diboot-admin-ui/src/layout/main/index.vue b/diboot-admin-ui/src/layout/main/index.vue
index a0e71992..cdfc5f4e 100644
--- a/diboot-admin-ui/src/layout/main/index.vue
+++ b/diboot-admin-ui/src/layout/main/index.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import useViewTabsStore from '@/store/viewTabs'
+import { DefineComponent } from 'vue'
 import { RouteLocationNormalized } from 'vue-router'
 import useAppStore from '@/store/app'
+import useViewTabsStore from '@/store/viewTabs'
 
 const appStore = useAppStore()
 // Tabs 高度
@@ -28,7 +29,7 @@ const layoutUsedHeight = computed(
   () => (props.fullScreen ? (props.fullScreen === true ? 0 : tabsHeight.value) : 50 + tabsHeight.value) + 20
 )
 // 为需要已占可视高度的组件bind usedVisibleHeight
-const bindUsedVisibleHeight = (component: any, route: RouteLocationNormalized) => {
+const bindUsedVisibleHeight = (component: DefineComponent, route: RouteLocationNormalized) => {
   if (component.type?.props?.usedVisibleHeight)
     //                                 布局已用高度    +  bounded-padding
     return { usedVisibleHeight: layoutUsedHeight.value + (route.meta.hollow ? 0 : 20) }
diff --git a/diboot-admin-ui/src/layout/tabs/index.vue b/diboot-admin-ui/src/layout/tabs/index.vue
index f619b010..d89cad4c 100644
--- a/diboot-admin-ui/src/layout/tabs/index.vue
+++ b/diboot-admin-ui/src/layout/tabs/index.vue
@@ -22,7 +22,7 @@ onMounted(() => refreshButton())
 // tabs 位置
 const tabsPosition = ref(0)
 
-const scroll = ({ scrollLeft }: any) => {
+const scroll = ({ scrollLeft }: { scrollLeft: number }) => {
   tabsPosition.value = scrollLeft
 }
 
@@ -69,24 +69,6 @@ onUnmounted(() =>
   })
 )
 
-// 右键菜单
-const menu = reactive<{ route?: RouteLocationNormalized; locator?: any }>({ route })
-const contentMenuTarget = ref()
-const contentMenu = ref()
-
-const rightClick = (event: MouseEvent, route: RouteLocationNormalized) => {
-  contentMenu.value?.handleClose()
-  menu.route = route
-  menu.locator = {
-    position: 'fixed',
-    left: `${event.clientX + 1}px`, // X 轴坐标
-    top: `${event.clientY - 10}px` // Y 轴坐标
-  }
-  setTimeout(() => {
-    contentMenuTarget.value?.click()
-  }, 0)
-}
-
 // tab 操作
 const closeTab = (tab: RouteLocationNormalized) => {
   viewTabsStore.closeTab(tab, router)
@@ -148,16 +130,34 @@ const fullScreenTabsView = () => {
         <div ref="tabsRef">
           <draggable :list="viewTabsStore.tabList" animation="300" item-key="fullPath" class="tabs">
             <template #item="{ element }">
-              <el-button
-                :type="$route.name === element.name ? 'primary' : ''"
-                @contextmenu.prevent="event => rightClick(event, element)"
-                @click="$router.push(element.fullPath)"
-              >
-                {{ element.meta.title }}
-                <el-icon v-show="allowClose(element)" :size="18" @click="closeTab(element)">
-                  <Close />
-                </el-icon>
-              </el-button>
+              <el-dropdown trigger="contextmenu">
+                <el-button
+                  :type="$route.name === element.name ? 'primary' : ''"
+                  @click="$router.push(element.fullPath)"
+                >
+                  {{ element.meta.title }}
+                  <el-icon v-show="allowClose(element)" :size="18" @click="closeTab(element)">
+                    <Close />
+                  </el-icon>
+                </el-button>
+                <template #dropdown>
+                  <el-dropdown-menu>
+                    <el-dropdown-item :disabled="findTabIndex(element) === 0" @click="closeLeftTabs(element)">
+                      关闭左侧页签
+                    </el-dropdown-item>
+                    <el-dropdown-item
+                      :disabled="findTabIndex(element) === viewTabsStore.tabList.length - 1"
+                      @click="closeRightTabs(element)"
+                    >
+                      关闭右侧页签
+                    </el-dropdown-item>
+                    <el-dropdown-item :disabled="viewTabsStore.tabList.length === 1" @click="closeOtherTabs(element)">
+                      关闭其他页签
+                    </el-dropdown-item>
+                    <el-dropdown-item divided @click="fullScreenTabView(element)">当前页全屏</el-dropdown-item>
+                  </el-dropdown-menu>
+                </template>
+              </el-dropdown>
             </template>
           </draggable>
         </div>
@@ -196,27 +196,6 @@ const fullScreenTabsView = () => {
       <slot :full-screen="fullScreen" />
     </div>
   </div>
-  <!-- tab 菜单 -->
-  <el-dropdown ref="contentMenu" trigger="click" :style="menu.locator" style="position: fixed">
-    <div ref="contentMenuTarget" />
-    <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item :disabled="findTabIndex(menu.route) === 0" @click="closeLeftTabs(menu.route)">
-          关闭左侧页签
-        </el-dropdown-item>
-        <el-dropdown-item
-          :disabled="findTabIndex(menu.route) === viewTabsStore.tabList.length - 1"
-          @click="closeRightTabs(menu.route)"
-        >
-          关闭右侧页签
-        </el-dropdown-item>
-        <el-dropdown-item :disabled="viewTabsStore.tabList.length === 1" @click="closeOtherTabs(menu.route)">
-          关闭其他页签
-        </el-dropdown-item>
-        <el-dropdown-item divided @click="fullScreenTabView(menu.route)">当前页全屏</el-dropdown-item>
-      </el-dropdown-menu>
-    </template>
-  </el-dropdown>
 </template>
 
 <style scoped lang="scss">
@@ -238,6 +217,10 @@ const fullScreenTabsView = () => {
     display: flex;
     margin: 0 10px;
 
+    .el-dropdown {
+      padding-right: 5px;
+    }
+
     .el-button {
       height: 30px;
 
@@ -252,10 +235,6 @@ const fullScreenTabsView = () => {
         }
       }
     }
-
-    .el-button + .el-button {
-      margin-left: 5px;
-    }
   }
 
   .icon-button {
diff --git a/diboot-admin-ui/src/router/router-guards.ts b/diboot-admin-ui/src/router/router-guards.ts
index d0e32e5b..598777ee 100644
--- a/diboot-admin-ui/src/router/router-guards.ts
+++ b/diboot-admin-ui/src/router/router-guards.ts
@@ -1,4 +1,4 @@
-import { isNavigationFailure, Router } from 'vue-router'
+import { isNavigationFailure, Router, RouteRecordRaw } from 'vue-router'
 import nProgress from 'nprogress'
 import useAuthStore from '@/store/auth'
 import { buildAsyncRoutes } from '@/utils/route'
@@ -9,14 +9,13 @@ import auth from '@/utils/auth'
  * @param router - 路由实例
  */
 export function createRouterGuard(router: Router) {
-  router.beforeEach(async (to, from, next) => {
+  router.beforeEach(async (to, from) => {
     nProgress.start()
     // 未登录
     if (auth.getToken()) {
       const userStore = useAuthStore()
       // 已加载完基本数据
       if (userStore.info) {
-        next()
         return
       }
 
@@ -24,25 +23,22 @@ export function createRouterGuard(router: Router) {
         await userStore.getInfo()
 
         // 加载异步路由
-        const res = await api.get<Array<any>>('/auth/menu')
+        const res = await api.get<Array<RouteRecordRaw>>('/auth/menu')
         if (res.data?.length) {
           buildAsyncRoutes(res.data).forEach(e => router.addRoute(e))
         }
 
         const redirectPath = ((to.name === '404' && to.query.path) || from.query.redirect || to.path) as string
         const redirect = decodeURIComponent(redirectPath)
-        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
-        next(nextData)
-        return
+        return to.path === redirect ? { ...to, replace: true } : { path: redirect }
       } catch (e) {
         // 获取数据异常
-        console.log('动态加载授权路由失败', e)
+        console.error('动态加载授权路由失败', e)
       }
     }
 
     // You can access without permissions. You need to set the routing meta.ignoreAuth to true
     if (to.meta.ignoreAuth) {
-      next()
       return
     }
 
@@ -53,7 +49,7 @@ export function createRouterGuard(router: Router) {
       query: to.query
     }
     redirectData.query.redirect = to.path
-    next(redirectData)
+    return redirectData
   })
 
   router.afterEach((to, from, failure) => {
@@ -63,8 +59,4 @@ export function createRouterGuard(router: Router) {
     }
     nProgress.done()
   })
-
-  router.onError(error => {
-    console.log('路由错误', error)
-  })
 }
diff --git a/diboot-admin-ui/src/store/auth.ts b/diboot-admin-ui/src/store/auth.ts
index 67d24a71..ef6ec90b 100644
--- a/diboot-admin-ui/src/store/auth.ts
+++ b/diboot-admin-ui/src/store/auth.ts
@@ -24,7 +24,7 @@ export default defineStore('auth', {
     }
   },
   actions: {
-    login(account: any) {
+    login(account: unknown) {
       return new Promise((resolve, reject) => {
         api
           .post<{ token: string }>('/auth/login', account)
diff --git a/diboot-admin-ui/src/utils/relatedData.ts b/diboot-admin-ui/src/utils/relatedData.ts
index 88b07aaa..cd7a13f0 100644
--- a/diboot-admin-ui/src/utils/relatedData.ts
+++ b/diboot-admin-ui/src/utils/relatedData.ts
@@ -7,12 +7,12 @@ export interface RelatedDataConfig {
   label?: string // 对象的属性名，查询作为label的属性名称
   value?: string // 对象的属性名，，需要查询作为value的属性名称
   ext?: string // 对象的属性名，需要查询作为ext的属性名称 (扩展值，一般用于特殊情景)
-  condition?: { [label: string]: string | Array<any> | null } // 查询条件
+  condition?: Record<string, string | Array<unknown> | null> // 查询条件
 }
 export interface ILabelValue {
   label: string
-  value: any
-  ext?: any
+  value: string
+  ext?: unknown
 }
 export type LabelValue = { [label: string]: ILabelValue[] }
 /**
diff --git a/diboot-admin-ui/src/utils/request.ts b/diboot-admin-ui/src/utils/request.ts
index 5e82973d..a8cabeb4 100644
--- a/diboot-admin-ui/src/utils/request.ts
+++ b/diboot-admin-ui/src/utils/request.ts
@@ -64,7 +64,7 @@ service.interceptors.response.use(
         default:
           message = '网络可能出现问题'
       }
-      console.log(message)
+      console.error(message)
     }
     return Promise.reject(error)
   }
@@ -122,39 +122,39 @@ function unpack<T>(request: Promise<AxiosResponse<ApiData<T>>>): Promise<ApiData
 }
 
 const api = {
-  get<T>(url: string, params?: any) {
-    return unpack(service.get<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, { params }))
+  get<T>(url: string, params?: unknown) {
+    return unpack(service.get<ApiData<T>, AxiosResponse<ApiData<T>>, unknown>(url, { params }))
   },
-  post<T>(url: string, data?: any) {
+  post<T>(url: string, data?: unknown) {
     return unpack(
-      service.post<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
+      service.post<ApiData<T>, AxiosResponse<ApiData<T>>, unknown>(url, JSON.stringify(data), {
         headers: {
           'Content-Type': 'application/json;charset=UTF-8'
         }
       })
     )
   },
-  put<T>(url: string, data?: any) {
+  put<T>(url: string, data?: unknown) {
     return unpack(
-      service.put<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
+      service.put<ApiData<T>, AxiosResponse<ApiData<T>>, unknown>(url, JSON.stringify(data), {
         headers: {
           'Content-Type': 'application/json;charset=UTF-8'
         }
       })
     )
   },
-  patch<T>(url: string, data?: any) {
+  patch<T>(url: string, data?: unknown) {
     return unpack(
-      service.patch<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, JSON.stringify(data), {
+      service.patch<ApiData<T>, AxiosResponse<ApiData<T>>, unknown>(url, JSON.stringify(data), {
         headers: {
           'Content-Type': 'application/json;charset=UTF-8'
         }
       })
     )
   },
-  delete<T>(url: string, params?: any) {
+  delete<T>(url: string, params?: unknown) {
     return unpack(
-      service.delete<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, {
+      service.delete<ApiData<T>, AxiosResponse<ApiData<T>>, unknown>(url, {
         params,
         headers: {
           'X-Requested-With': 'XMLHttpRequest',
@@ -171,7 +171,7 @@ const api = {
    * @param formData
    */
   upload<T>(url: string, formData: FormData) {
-    return unpack(service.post<ApiData<T>, AxiosResponse<ApiData<T>>, any>(url, formData))
+    return unpack(service.post<ApiData<T>, AxiosResponse<ApiData<T>>, unknown>(url, formData))
   },
   /**
    * GET下载文件
@@ -179,9 +179,9 @@ const api = {
    * @param url
    * @param params
    */
-  download(url: string, params?: any) {
+  download(url: string, params?: unknown) {
     return unpack(
-      service.get<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, any>(url, {
+      service.get<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, unknown>(url, {
         responseType: 'arraybuffer',
         params,
         headers: {
@@ -197,9 +197,9 @@ const api = {
    * @param url
    * @param data
    */
-  postDownload(url: string, data?: any) {
+  postDownload(url: string, data?: unknown) {
     return unpack(
-      service.post<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, any>(url, JSON.stringify(data), {
+      service.post<ApiData<ArrayBuffer>, AxiosResponse<ApiData<ArrayBuffer>>, unknown>(url, JSON.stringify(data), {
         responseType: 'arraybuffer',
         headers: {
           'X-Requested-With': 'XMLHttpRequest',
diff --git a/diboot-admin-ui/src/utils/route.ts b/diboot-admin-ui/src/utils/route.ts
index 340db186..de70f890 100644
--- a/diboot-admin-ui/src/utils/route.ts
+++ b/diboot-admin-ui/src/utils/route.ts
@@ -6,25 +6,28 @@ const RouterView = defineComponent({
   render: () => h('router-view')
 })
 
+/**
+ * 视图组件
+ */
+export const viewComponents = Object.values(import.meta.globEager('@/views/**/*.{vue,tsx,jsx}'))
+  .map(e => e.default)
+  .filter(e => e.name)
+  .reduce(
+    (components, view) => {
+      components[view.name] = view
+      return components
+    },
+    { Layout }
+  )
+
 /**
  * 构建异步路由
  *
  * @param asyncRoutes
  */
 export const buildAsyncRoutes = (asyncRoutes: RouteRecordRaw[]) => {
-  // 加载所有页面
-  const viewComponents = Object.values(import.meta.globEager('@/views/**/*.{vue,tsx,jsx}'))
-    .map(e => e.default)
-    .filter(e => e.name)
-    .reduce(
-      (components, view) => {
-        components[view.name || '_'] = view
-        return components
-      },
-      { Layout }
-    )
   // 获取组件
-  const resolveComponent = (name: any) => {
+  const resolveComponent = (name: string) => {
     if (viewComponents[name]) return viewComponents[name]
     throw new Error(`Unknown component '${name}'. Is it located under 'views' with extension?`)
   }
diff --git a/diboot-admin-ui/src/views/system/role/list.vue b/diboot-admin-ui/src/views/system/role/list.vue
index 68c776a7..af5bcc20 100644
--- a/diboot-admin-ui/src/views/system/role/list.vue
+++ b/diboot-admin-ui/src/views/system/role/list.vue
@@ -1,17 +1,9 @@
 <script setup lang="ts" name="RoleList">
 import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'
+import type { Role } from './type'
 
 defineProps<{ usedVisibleHeight?: number }>()
 
-interface Role {
-  id: string
-  name: string
-  code: string
-  description: string
-  createTime: string
-  updateTime: string
-}
-
 const {
   queryParam,
   dateRangeQuery,
@@ -40,7 +32,7 @@ const openDetail = (id: string) => {
     type: 'success'
   })
 }
-const openEdit = (id: any) => {
+const openEdit = (id: string) => {
   ElMessage({
     message: 'open:Edit ' + id,
     grouping: true,
@@ -140,7 +132,7 @@ const openEdit = (id: any) => {
     </el-table-column>
   </el-table>
   <el-pagination
-    v-show="pagination.total > 0"
+    v-if="pagination.total"
     v-model:currentPage="pagination.current"
     v-model:page-size="pagination.pageSize"
     style="position: relative; top: 10px; margin-bottom: 10px; justify-content: flex-end"
diff --git a/diboot-admin-ui/src/views/system/role/type.ts b/diboot-admin-ui/src/views/system/role/type.ts
new file mode 100644
index 00000000..15a1314c
--- /dev/null
+++ b/diboot-admin-ui/src/views/system/role/type.ts
@@ -0,0 +1,8 @@
+export interface Role {
+  id: string
+  name: string
+  code: string
+  description: string
+  createTime: string
+  updateTime: string
+}
diff --git a/diboot-admin-ui/src/env.d.ts b/diboot-admin-ui/types/env.d.ts
similarity index 100%
rename from diboot-admin-ui/src/env.d.ts
rename to diboot-admin-ui/types/env.d.ts
-- 
Gitee


From c3cdfdfa77f2c6ac3c429f03a8b9848bc5da04a5 Mon Sep 17 00:00:00 2001
From: wuy <1311695042@qq.com>
Date: Thu, 19 May 2022 15:48:34 +0800
Subject: [PATCH 138/195] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=80=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/core/handler/DataAccessControlInterceptor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java b/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java
index 1228b846..1a6c3cb0 100644
--- a/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java
+++ b/diboot-core/src/main/java/com/diboot/core/handler/DataAccessControlInterceptor.java
@@ -142,7 +142,7 @@ public class DataAccessControlInterceptor implements InnerInterceptor {
                 EqualsTo equalsTo = new EqualsTo();
                 equalsTo.setLeftExpression(new Column(idCol));
                 if(idValues.get(0) instanceof Long){
-                    equalsTo.setRightExpression(new LongValue((long)idValues.get(0)));
+                    equalsTo.setRightExpression(new LongValue((Long)idValues.get(0)));
                 }
                 else{
                     equalsTo.setRightExpression(new StringValue(S.defaultValueOf(idValues.get(0))));
-- 
Gitee


From d6c5d418a5bbebbd515ebfac936a194dfd29859d Mon Sep 17 00:00:00 2001
From: Zjp <1215582715@qq.com>
Date: Fri, 20 May 2022 11:21:18 +0800
Subject: [PATCH 139/195] =?UTF-8?q?bugfix=20=E8=A7=92=E8=89=B2=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=9D=83=E9=99=90service=E4=B8=AD=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BA=E6=9E=9A=E4=B8=BE=E5=80=BC=E6=97=B6?=
 =?UTF-8?q?,=E5=BA=94=E8=AF=A5=E4=BD=BF=E7=94=A8=E5=85=B6name;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iam/service/impl/IamResourcePermissionServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
index 15629b3b..7f52975a 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamResourcePermissionServiceImpl.java
@@ -126,12 +126,12 @@ public class IamResourcePermissionServiceImpl extends BaseIamServiceImpl<IamReso
         List<IamResourcePermission> oldPermissionList = this.getEntityList(
                 Wrappers.<IamResourcePermission>lambdaQuery()
                         .eq(IamResourcePermission::getParentId, iamResourcePermissionDTO.getId())
-                        .eq(IamResourcePermission::getDisplayType, Cons.RESOURCE_PERMISSION_DISPLAY_TYPE.PERMISSION)
+                        .eq(IamResourcePermission::getDisplayType, Cons.RESOURCE_PERMISSION_DISPLAY_TYPE.PERMISSION.name())
         );
         if (V.notEmpty(oldPermissionList)){
             LambdaQueryWrapper<IamResourcePermission> deleteWrapper = Wrappers.<IamResourcePermission>lambdaQuery()
                     .eq(IamResourcePermission::getParentId, iamResourcePermissionDTO.getId())
-                    .eq(IamResourcePermission::getDisplayType, Cons.RESOURCE_PERMISSION_DISPLAY_TYPE.PERMISSION);
+                    .eq(IamResourcePermission::getDisplayType, Cons.RESOURCE_PERMISSION_DISPLAY_TYPE.PERMISSION.name());
             if (V.notEmpty(updatePermissionIdList)) {
                 deleteWrapper.notIn(IamResourcePermission::getId, updatePermissionIdList);
             }
-- 
Gitee


From e89f5c260c44e78bc85e0cd82027ac87c912b137 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 20 May 2022 14:21:31 +0800
Subject: [PATCH 140/195] =?UTF-8?q?*=20getStringProperty=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81map=E4=B8=AD=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/core/util/BeanUtils.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index b34775f9..9e8f0fa5 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -188,6 +188,10 @@ public class BeanUtils {
      * @return
      */
     public static String getStringProperty(Object obj, String field){
+        if(obj instanceof Map){
+            Map objMap = (Map)obj;
+            return objMap.containsKey(field)? S.valueOf(objMap.get(field)) : null;
+        }
         Object property = getProperty(obj, field);
         if(property == null){
             return null;
@@ -798,7 +802,6 @@ public class BeanUtils {
      * @return
      */
     public static Class getGenericityClass(Object instance, int index){
-        //TODO 可缓存
         Class hostClass = getTargetClass(instance);
         ResolvableType resolvableType = ResolvableType.forClass(hostClass).getSuperType();
         ResolvableType[] types = resolvableType.getGenerics();
-- 
Gitee


From 1db0e119b4e008d2efdd99f04b5069a827324004 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 20 May 2022 17:18:18 +0800
Subject: [PATCH 141/195] =?UTF-8?q?*=20getProperty=20=E6=94=AF=E6=8C=81map?=
 =?UTF-8?q?=E4=B8=AD=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index 9e8f0fa5..728e4b78 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -171,6 +171,10 @@ public class BeanUtils {
      * @return
      */
     public static Object getProperty(Object obj, String field){
+        if(obj instanceof Map){
+            Map objMap = (Map)obj;
+            return objMap.get(field);
+        }
         try {
             BeanWrapper wrapper = PropertyAccessorFactory.forBeanPropertyAccess(obj);
             return wrapper.getPropertyValue(field);
-- 
Gitee


From e7621fd19b6410faac0bf52424612e10fc97392d Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 21 May 2022 17:02:17 +0800
Subject: [PATCH 142/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96log=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/core/binding/cache/BindingCacheManager.java   | 4 ++++
 .../src/main/java/com/diboot/core/util/ContextHelper.java    | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index 076cf1fe..a8ca5276 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -111,8 +111,12 @@ public class BindingCacheManager {
                             cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
                             cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
                             uniqueEntitySet.add(entityClass.getName());
+                            log.debug("缓存entity: {} , service: {}", entityClass.getSimpleName(), entry.getKey());
                         }
                     }
+                    else{
+                        log.warn("从service: {} 中提取 entityClass 失败", entry.getKey());
+                    }
                 }
             } else {
                 log.debug("未获取到任何有效@Service.");
diff --git a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
index d0eb5581..62a8005e 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
@@ -66,13 +66,13 @@ public class ContextHelper implements ApplicationContextAware, ApplicationListen
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         APPLICATION_CONTEXT = applicationContext;
-        log.debug("ApplicationContext已赋值: {}", APPLICATION_CONTEXT.toString());
+        log.debug("ApplicationContext已赋值: {}", APPLICATION_CONTEXT.getDisplayName());
     }
 
     @Override
     public void onApplicationEvent(ApplicationReadyEvent event) {
         APPLICATION_CONTEXT = event.getApplicationContext();
-        log.debug("ApplicationContext已注入: {}", APPLICATION_CONTEXT.toString());
+        log.debug("ApplicationContext已注入: {}", APPLICATION_CONTEXT.getDisplayName());
     }
 
     /***
@@ -182,6 +182,7 @@ public class ContextHelper implements ApplicationContextAware, ApplicationListen
         if(iService instanceof BaseService){
             return (BaseService)iService;
         }
+        log.warn("Entity的service实现类: {} 非BaseService实现！", entityInfoCache.getService());
         return null;
     }
 
-- 
Gitee


From b5725683fb2e375f7c2f5da2eb3add7063134201 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 21 May 2022 17:03:12 +0800
Subject: [PATCH 143/195] =?UTF-8?q?*=20=E5=8D=87=E7=BA=A7spring=20boot=202?=
 =?UTF-8?q?.7,easyexcel=203.1..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-core/pom.xml         | 2 +-
 diboot-file-starter/pom.xml | 2 +-
 pom.xml                     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/diboot-core/pom.xml b/diboot-core/pom.xml
index 38a3f025..22d0b45d 100644
--- a/diboot-core/pom.xml
+++ b/diboot-core/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
diff --git a/diboot-file-starter/pom.xml b/diboot-file-starter/pom.xml
index 6a7bbdb2..085d524f 100644
--- a/diboot-file-starter/pom.xml
+++ b/diboot-file-starter/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.0.5</version>
+            <version>${easyexcel.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index c1a8b4d9..fa2a4d3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.7</version>
+        <version>2.7.0</version>
         <relativePath/>
     </parent>
 
@@ -32,6 +32,7 @@
         <okhttp.version>4.9.3</okhttp.version>
         <aspectjweaver.version>1.9.9.1</aspectjweaver.version>
         <commons-io.version>2.11.0</commons-io.version>
+        <easyexcel.version>3.1.0</easyexcel.version>
         <diboot.version>2.6.0</diboot.version>
     </properties>
 
-- 
Gitee


From 9b7ad1483abccbf4474020ed45dd1ee2c8e9351b Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Tue, 24 May 2022 18:38:48 +0800
Subject: [PATCH 144/195] =?UTF-8?q?*=20=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=B2=97=E4=BD=8D=E8=B5=8B=E5=80=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java | 2 +-
 .../com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java  | 4 ++--
 .../main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java   | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java
index 8d409738..a69907e6 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/auth/impl/IamExtensibleImpl.java
@@ -80,7 +80,7 @@ public class IamExtensibleImpl implements IamExtensible {
                 });
             }
             positionDataScope.setAccessibleOrgIds(accessibleOrgIds);
-            return new LabelValue(position.getName(), positionDataScope);
+            return new LabelValue(position.getName(), position.getCode()).setExt(positionDataScope);
         }
         return null;
     }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
index 750c88e7..f2e3d357 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/data/DataAccessPermissionUserOrgImpl.java
@@ -55,7 +55,7 @@ public class DataAccessPermissionUserOrgImpl implements DataAccessInterface {
         }
         // 获取用户岗位对应的数据权限
         LabelValue extensionObj = currentUser.getExtensionObj();
-        if(extensionObj == null){
+        if(extensionObj == null || extensionObj.getExt() == null){
             // 提取其可访问ids
             if(isOrgFieldName(fieldName)){
                 return buildOrgIdsScope(currentUser);
@@ -69,7 +69,7 @@ public class DataAccessPermissionUserOrgImpl implements DataAccessInterface {
             }
         }
         // 处理岗位对应的数据范围权限
-        PositionDataScope positionDataScope = (PositionDataScope)extensionObj.getValue();
+        PositionDataScope positionDataScope = (PositionDataScope)extensionObj.getExt();
         // 可看全部数据，不拦截
         if(Cons.DICTCODE_DATA_PERMISSION_TYPE.ALL.name().equalsIgnoreCase(positionDataScope.getDataPermissionType())){
             return null;
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
index 3288878a..3f5a984b 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/shiro/IamAuthorizingRealm.java
@@ -135,7 +135,9 @@ public class IamAuthorizingRealm extends AuthorizingRealm {
         Long extensionObjId = null;
         LabelValue extensionObj = currentUser.getExtensionObj();
         if(extensionObj != null){
-            extensionObjId = ((PositionDataScope)extensionObj.getValue()).getPositionId();
+            if(extensionObj.getExt() != null && extensionObj.getExt() instanceof PositionDataScope){
+                extensionObjId = ((PositionDataScope)extensionObj.getExt()).getPositionId();
+            }
         }
         // 获取角色列表
         List<IamRole> roleList = getIamUserRoleService().getUserRoleList(currentUser.getClass().getSimpleName(), currentUser.getId(), extensionObjId);
-- 
Gitee


From 8e4e7cbeb9067064583bcf60cd300fa0ecb99aa8 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Tue, 24 May 2022 18:39:31 +0800
Subject: [PATCH 145/195] =?UTF-8?q?*=20=E6=8E=A5=E5=8F=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/holder/AnnotationRestApiHolder.java  | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java b/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java
index 2277cd46..d4afb437 100644
--- a/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java
+++ b/diboot-core/src/main/java/com/diboot/core/holder/AnnotationRestApiHolder.java
@@ -32,7 +32,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 注解 RestApi 信息缓存
@@ -79,7 +81,7 @@ public class AnnotationRestApiHolder {
      * @param category
      * @return
      */
-    public static List<RestApi> getRestApiList(String category){
+    public synchronized static List<RestApi> getRestApiList(String category){
         List<RestApi> apiList = getCacheManager()
                 .getCacheObj(CACHE_NAME_CATEGORY_TO_APILIST, category, List.class);
         if(apiList == null && getCacheManager().isUninitializedCache(CACHE_NAME_CATEGORY_TO_APILIST)){
@@ -95,7 +97,7 @@ public class AnnotationRestApiHolder {
      * @param className
      * @return
      */
-    public static RestApiWrapper getRestApiWrapper(String className){
+    public synchronized static RestApiWrapper getRestApiWrapper(String className){
         RestApiWrapper apiWrapper = getCacheManager()
                 .getCacheObj(CACHE_NAME_CLASS_TO_WRAPPER, className, RestApiWrapper.class);
         if(apiWrapper == null && getCacheManager().isUninitializedCache(CACHE_NAME_CLASS_TO_WRAPPER)){
@@ -109,7 +111,7 @@ public class AnnotationRestApiHolder {
     /**
      * 初始化
      */
-    private static void initRestApiCache() {
+    private synchronized static void initRestApiCache() {
         List<Object> controllerList = ContextHelper.getBeansByAnnotation(RestController.class);
         if(V.isEmpty(controllerList)) {
             return;
@@ -126,16 +128,31 @@ public class AnnotationRestApiHolder {
                 getCacheManager()
                         .putCacheObj(CACHE_NAME_CLASS_TO_WRAPPER, wrapper.getClassName(), wrapper);
                 if(V.notEmpty(wrapper.getChildren())){
+                    Map<String, List<RestApi>> categoryApisMap = new HashMap<>(8);
                     for(RestApi api : wrapper.getChildren()){
-                        List<RestApi> categoryApis = getCacheManager()
-                                .getCacheObj(CACHE_NAME_CATEGORY_TO_APILIST, api.getCategory(), List.class);
+                        List<RestApi> categoryApis = categoryApisMap.get(api.getCategory());
                         if(categoryApis == null){
                             categoryApis = new ArrayList<>();
-                            getCacheManager()
-                                    .putCacheObj(CACHE_NAME_CATEGORY_TO_APILIST, api.getCategory(), categoryApis);
+                            categoryApisMap.put(api.getCategory(), categoryApis);
                         }
                         categoryApis.add(api);
                     }
+                    for(Map.Entry<String, List<RestApi>> entry : categoryApisMap.entrySet()){
+                        List<RestApi> categoryApis = getCacheManager()
+                                .getCacheObj(CACHE_NAME_CATEGORY_TO_APILIST, entry.getKey(), List.class);
+                        if(categoryApis == null){
+                            categoryApis = entry.getValue();
+                        }
+                        else{
+                            for(RestApi api : entry.getValue()){
+                                if(!categoryApis.contains(api)){
+                                    categoryApis.add(api);
+                                }
+                            }
+                        }
+                        getCacheManager()
+                                .putCacheObj(CACHE_NAME_CATEGORY_TO_APILIST, entry.getKey(), categoryApis);
+                    }
                 }
             }
         }
-- 
Gitee


From c65c4005a8514bea1d83d404e6b84c0d5c214842 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 26 May 2022 14:38:36 +0800
Subject: [PATCH 146/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B2=97=E4=BD=8D=E6=8C=89=E9=92=AE=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/iam/starter/IamPluginInitializer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
index 58848fc8..78d21bfd 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/starter/IamPluginInitializer.java
@@ -100,7 +100,7 @@ public class IamPluginInitializer implements ApplicationRunner {
         if(resourcePermissionService != null && !resourcePermissionService.exists(IamResourcePermission::getResourceCode, "system")){
             String[] RESOURCE_PERMISSION_DATA = {
                     "{\"displayType\":\"MENU\",\"displayName\":\"系统管理\",\"resourceCode\":\"system\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"数据字典管理\",\"resourceCode\":\"Dictionary\",\"permissionCode\":\"Dictionary:read\",\"sortId\":\"10030\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Dictionary:read\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"Dictionary:write\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"Dictionary:write,Dictionary:read\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"Dictionary:write\",\"sortId\":\"3\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统用户管理\",\"resourceCode\":\"IamUser\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"10029\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"部门查看\",\"resourceCode\":\"orgTree\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"12\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"11\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"10\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:write,IamUser:read\",\"sortId\":\"9\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"8\"}]},{\"displayType\":\"MENU\",\"displayName\":\"角色资源管理\",\"resourceCode\":\"IamRole\",\"permissionCode\":\"IamRole:read\",\"sortId\":\"10023\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamRole:read\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamRole:write\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamRole:write,IamRole:read,IamResourcePermission:read\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamRole:write\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"资源权限管理\",\"resourceCode\":\"IamResourcePermission\",\"permissionCode\":\"IamResourcePermission:read\",\"sortId\":\"10017\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamResourcePermission:read\",\"sortId\":\"23\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamResourcePermission:write\",\"sortId\":\"21\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamResourcePermission:write,IamResourcePermission:read\",\"sortId\":\"20\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamResourcePermission:write\",\"sortId\":\"19\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamResourcePermission:write\",\"sortId\":\"18\"}]},{\"displayType\":\"MENU\",\"displayName\":\"定时任务管理\",\"resourceCode\":\"ScheduleJob\",\"permissionCode\":\"ScheduleJob:read\",\"sortId\":\"10012\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"7\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"ScheduleJob:write,ScheduleJob:read\",\"sortId\":\"6\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"5\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"ScheduleJob:read\",\"sortId\":\"4\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"运行一次\",\"resourceCode\":\"executeOnce\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"3\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志记录\",\"resourceCode\":\"logList\",\"permissionCode\":\"ScheduleJob:read\",\"sortId\":\"2\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"日志删除\",\"resourceCode\":\"logDelete\",\"permissionCode\":\"ScheduleJob:write\",\"sortId\":\"1\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息模板管理\",\"resourceCode\":\"MessageTemplate\",\"permissionCode\":\"MessageTemplate:read\",\"sortId\":\"10010\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"MessageTemplate:read\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"MessageTemplate:write\",\"sortId\":\"15\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"MessageTemplate:write,MessageTemplate:read\",\"sortId\":\"14\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"MessageTemplate:write\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"消息记录管理\",\"resourceCode\":\"Message\",\"permissionCode\":\"Message:read\",\"sortId\":\"10009\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"Message:read\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"上传文件管理\",\"resourceCode\":\"UploadFile\",\"permissionCode\":\"UploadFile:read\",\"sortId\":\"10008\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"UploadFile:read\",\"sortId\":\"16\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"UploadFile:write,UploadFile:read\",\"sortId\":\"14\"}]},{\"displayType\":\"MENU\",\"displayName\":\"系统配置管理\",\"resourceCode\":\"SystemConfig\",\"permissionCode\":\"SystemConfig:read\",\"sortId\":\"10007\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"SystemConfig:write\",\"sortId\":\"13\"}]},{\"displayType\":\"MENU\",\"displayName\":\"操作日志查看\",\"resourceCode\":\"IamOperationLog\",\"permissionCode\":\"IamOperationLog:read\",\"sortId\":\"10006\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOperationLog:read\",\"sortId\":\"16\"}]},{\"displayType\":\"MENU\",\"displayName\":\"登录日志查看\",\"resourceCode\":\"IamLoginTrace\",\"permissionCode\":\"IamLoginTrace:read\",\"sortId\":\"10001\",\"children\":[]}]}",
-                    "{\"displayType\":\"MENU\",\"displayName\":\"组织机构\",\"resourceCode\":\"orgStructure\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"组织机构管理\",\"resourceCode\":\"IamOrg\",\"permissionCode\":\"IamOrg:read\",\"sortId\":\"10044\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"106\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"105\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamOrg:write,IamOrg:read\",\"sortId\":\"104\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"103\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOrg:read\",\"sortId\":\"102\"}]},{\"displayType\":\"MENU\",\"displayName\":\"岗位管理\",\"resourceCode\":\"IamPosition\",\"permissionCode\":\"IamPosition:read\",\"sortId\":\"10038\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"112\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamPosition:read\",\"sortId\":\"111\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamPosition:write,IamPosition:read\",\"sortId\":\"110\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"108\"}]},{\"displayType\":\"MENU\",\"displayName\":\"组织人员管理\",\"resourceCode\":\"IamOrgUser\",\"permissionCode\":\"IamOrg:read,IamUser:read\",\"sortId\":\"10032\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"40\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:write,IamUser:read\",\"sortId\":\"39\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"38\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"37\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导入\",\"resourceCode\":\"import\",\"permissionCode\":\"IamUserExcel:import\",\"sortId\":\"36\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导出\",\"resourceCode\":\"export\",\"permissionCode\":\"IamUserExcel:export\",\"sortId\":\"35\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"人员岗位设置\",\"resourceCode\":\"position\",\"permissionCode\":\"IamPosition:write,IamPosition:read\",\"sortId\":\"34\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"添加岗位\",\"resourceCode\":\"addPosition\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"33\"}]}]}"
+                    "{\"displayType\":\"MENU\",\"displayName\":\"组织机构\",\"resourceCode\":\"orgStructure\",\"children\":[{\"displayType\":\"MENU\",\"displayName\":\"组织机构管理\",\"resourceCode\":\"IamOrg\",\"permissionCode\":\"IamOrg:read\",\"sortId\":\"10044\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"排序\",\"resourceCode\":\"sort\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"106\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"105\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamOrg:write,IamOrg:read\",\"sortId\":\"104\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamOrg:write\",\"sortId\":\"103\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamOrg:read\",\"sortId\":\"102\"}]},{\"displayType\":\"MENU\",\"displayName\":\"岗位管理\",\"resourceCode\":\"IamPosition\",\"permissionCode\":\"IamPosition:read\",\"sortId\":\"10038\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"112\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamPosition:read\",\"sortId\":\"111\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamPosition:write,IamPosition:read\",\"sortId\":\"110\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamPosition:write\",\"sortId\":\"108\"}]},{\"displayType\":\"MENU\",\"displayName\":\"组织人员管理\",\"resourceCode\":\"IamOrgUser\",\"permissionCode\":\"IamOrg:read,IamUser:read\",\"sortId\":\"10032\",\"children\":[{\"displayType\":\"PERMISSION\",\"displayName\":\"新建\",\"resourceCode\":\"create\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"40\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"更新\",\"resourceCode\":\"update\",\"permissionCode\":\"IamUser:write,IamUser:read\",\"sortId\":\"39\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"删除\",\"resourceCode\":\"delete\",\"permissionCode\":\"IamUser:write\",\"sortId\":\"38\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"详情\",\"resourceCode\":\"detail\",\"permissionCode\":\"IamUser:read\",\"sortId\":\"37\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导入\",\"resourceCode\":\"import\",\"permissionCode\":\"IamUserExcel:import\",\"sortId\":\"36\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"导出\",\"resourceCode\":\"export\",\"permissionCode\":\"IamUserExcel:export\",\"sortId\":\"35\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"人员岗位设置\",\"resourceCode\":\"position\",\"permissionCode\":\"IamPosition:write,IamPosition:read\",\"sortId\":\"34\"},{\"displayType\":\"PERMISSION\",\"displayName\":\"添加岗位\",\"resourceCode\":\"addPosition\",\"permissionCode\":\"IamPosition:write,IamPosition:read\",\"sortId\":\"33\"}]}]}"
             };
             // 插入多层级资源权限初始数据
             try {
-- 
Gitee


From 8d8c8af3097a65fce1ccbaed26fcf6dea8de60e2 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 26 May 2022 23:05:15 +0800
Subject: [PATCH 147/195] =?UTF-8?q?*=20=E8=BF=98=E5=8E=9FEntityInfo?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=87=92=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/cache/BindingCacheManager.java    | 173 +++++++++---------
 1 file changed, 87 insertions(+), 86 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index a8ca5276..95e9489c 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -26,7 +26,6 @@ import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.context.annotation.Primary;
@@ -46,6 +45,10 @@ import java.util.*;
 @SuppressWarnings({"JavaDoc","rawtypes", "unchecked"})
 @Slf4j
 public class BindingCacheManager {
+    /**
+     * 实体相关定义缓存管理器
+     */
+    private static StaticMemoryCacheManager cacheManager;
     /**
      * 类-EntityInfo缓存key
      */
@@ -71,92 +74,17 @@ public class BindingCacheManager {
      */
     private static final String CACHE_NAME_CLASS_NAME2FLDMAP = "CLASS_NAME2FLDMAP";
 
-    /**
-     * 保证单例,以及彻底加载完缓存数据后再返回
-     */
-    private static class Singleton {
-        /**
-         * 实体相关定义缓存管理器
-         */
-        static StaticMemoryCacheManager cacheManager = new StaticMemoryCacheManager(
-                CACHE_NAME_CLASS_ENTITY,
-                CACHE_NAME_TABLE_ENTITY,
-                CACHE_NAME_CLASS_PROP,
-                CACHE_NAME_ENTITYNAME_CLASS,
-                CACHE_NAME_CLASS_FIELDS,
-                CACHE_NAME_CLASS_NAME2FLDMAP
-        );
-
-        static {
-            // 初始化有service的entity缓存
-            Map<String, IService> serviceMap = ContextHelper.getApplicationContext().getBeansOfType(IService.class);
-            Set<String> uniqueEntitySet = new HashSet<>();
-            if (V.notEmpty(serviceMap)) {
-                for (Map.Entry<String, IService> entry : serviceMap.entrySet()) {
-                    Class<?> entityClass = BeanUtils.getGenericityClass(entry.getValue(), 1);
-                    if (entityClass != null) {
-                        IService<?> entityService = entry.getValue();
-                        if (uniqueEntitySet.contains(entityClass.getName())) {
-                            if (entityService.getClass().getAnnotation(Primary.class) != null) {
-                                EntityInfoCache entityInfoCache = cacheManager.getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), EntityInfoCache.class);
-                                if (entityInfoCache != null) {
-                                    entityInfoCache.setService(entry.getKey());
-                                }
-                            } else {
-                                log.warn("Entity: {} 存在多个service实现类，可能导致调用实例与预期不一致!", entityClass.getName());
-                            }
-                        } else {
-                            EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, entry.getKey());
-                            cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
-                            cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
-                            cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
-                            uniqueEntitySet.add(entityClass.getName());
-                            log.debug("缓存entity: {} , service: {}", entityClass.getSimpleName(), entry.getKey());
-                        }
-                    }
-                    else{
-                        log.warn("从service: {} 中提取 entityClass 失败", entry.getKey());
-                    }
-                }
-            } else {
-                log.debug("未获取到任何有效@Service.");
-            }
-            // 初始化没有service的table-mapper缓存
-            SqlSessionFactory sqlSessionFactory = ContextHelper.getBean(SqlSessionFactory.class);
-            if(sqlSessionFactory != null){
-                Collection<Class<?>> mappers = sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers();
-                if (V.notEmpty(mappers)) {
-                    for (Class<?> mapperClass : mappers) {
-                        Type[] types = mapperClass.getGenericInterfaces();
-                        try {
-                            if (types.length > 0 && types[0] != null) {
-                                ParameterizedType genericType = (ParameterizedType) types[0];
-                                Type[] superTypes = genericType.getActualTypeArguments();
-                                if (superTypes != null && superTypes.length > 0 && superTypes[0] != null) {
-                                    String entityClassName = superTypes[0].getTypeName();
-                                    if (!uniqueEntitySet.contains(entityClassName) && entityClassName.length() > 1) {
-                                        Class<?> entityClass = Class.forName(entityClassName);
-                                        EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, null);
-                                        entityInfoCache.setBaseMapper((Class<? extends BaseMapper>) mapperClass);
-                                        cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
-                                        cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
-                                        cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
-                                        uniqueEntitySet.add(entityClass.getName());
-                                    }
-                                }
-                            }
-                        } catch (Exception e) {
-                            log.warn("解析mapper异常", e);
-                        }
-                    }
-                }
-            }
+    private static StaticMemoryCacheManager getCacheManager(){
+        if(cacheManager == null){
+            cacheManager = new StaticMemoryCacheManager(
+                    CACHE_NAME_CLASS_ENTITY,
+                    CACHE_NAME_TABLE_ENTITY,
+                    CACHE_NAME_CLASS_PROP,
+                    CACHE_NAME_ENTITYNAME_CLASS,
+                    CACHE_NAME_CLASS_FIELDS,
+                    CACHE_NAME_CLASS_NAME2FLDMAP);
         }
-    }
-
-    @SneakyThrows
-    private static StaticMemoryCacheManager getCacheManager() {
-        return Singleton.cacheManager;
+        return cacheManager;
     }
 
     /**
@@ -165,6 +93,7 @@ public class BindingCacheManager {
      * @return
      */
     public static EntityInfoCache getEntityInfoByTable(String tableName){
+        initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_TABLE_ENTITY, tableName, EntityInfoCache.class);
     }
 
@@ -174,6 +103,7 @@ public class BindingCacheManager {
      * @return
      */
     public static EntityInfoCache getEntityInfoByClass(Class<?> entityClazz){
+        initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClazz.getName(), EntityInfoCache.class);
     }
 
@@ -220,6 +150,7 @@ public class BindingCacheManager {
      * @return
      */
     public static Class<?> getEntityClassBySimpleName(String classSimpleName){
+        initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_ENTITYNAME_CLASS, classSimpleName, Class.class);
     }
 
@@ -293,6 +224,76 @@ public class BindingCacheManager {
         return fieldsMap;
     }
 
+    /**
+     * 初始化
+     */
+    private static void initEntityInfoCache() {
+        StaticMemoryCacheManager cacheManager = getCacheManager();
+        if (cacheManager.isUninitializedCache(CACHE_NAME_CLASS_ENTITY) == false) {
+            return;
+        }
+        // 初始化有service的entity缓存
+        Map<String, IService> serviceMap = ContextHelper.getApplicationContext().getBeansOfType(IService.class);
+        Set<String> uniqueEntitySet = new HashSet<>();
+        if (V.notEmpty(serviceMap)) {
+            for (Map.Entry<String, IService> entry : serviceMap.entrySet()) {
+                Class entityClass = BeanUtils.getGenericityClass(entry.getValue(), 1);
+                if (entityClass != null) {
+                    IService entityIService = entry.getValue();
+                    if (uniqueEntitySet.contains(entityClass.getName())) {
+                        if (entityIService.getClass().getAnnotation(Primary.class) != null) {
+                            EntityInfoCache entityInfoCache = cacheManager.getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), EntityInfoCache.class);
+                            if (entityInfoCache != null) {
+                                entityInfoCache.setService(entry.getKey());
+                            }
+                        } else {
+                            log.warn("Entity: {} 存在多个service实现类，可能导致调用实例与预期不一致!", entityClass.getName());
+                        }
+                    } else {
+                        EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, entry.getKey());
+                        cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
+                        cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
+                        cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
+                        uniqueEntitySet.add(entityClass.getName());
+                    }
+                }
+            }
+        } else {
+            log.debug("未获取到任何有效@Service.");
+        }
+        // 初始化没有service的table-mapper缓存
+        SqlSessionFactory sqlSessionFactory = ContextHelper.getBean(SqlSessionFactory.class);
+        if (sqlSessionFactory != null) {
+            Collection<Class<?>> mappers = sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers();
+            if (V.notEmpty(mappers)) {
+                for (Class<?> mapperClass : mappers) {
+                    Type[] types = mapperClass.getGenericInterfaces();
+                    try {
+                        if (types.length > 0 && types[0] != null) {
+                            ParameterizedType genericType = (ParameterizedType) types[0];
+                            Type[] superTypes = genericType.getActualTypeArguments();
+                            if (superTypes != null && superTypes.length > 0 && superTypes[0] != null) {
+                                String entityClassName = superTypes[0].getTypeName();
+                                if (!uniqueEntitySet.contains(entityClassName) && entityClassName.length() > 1) {
+                                    Class<?> entityClass = Class.forName(entityClassName);
+                                    EntityInfoCache entityInfoCache = new EntityInfoCache(entityClass, null);
+                                    entityInfoCache.setBaseMapper((Class<? extends BaseMapper>) mapperClass);
+                                    cacheManager.putCacheObj(CACHE_NAME_CLASS_ENTITY, entityClass.getName(), entityInfoCache);
+                                    cacheManager.putCacheObj(CACHE_NAME_TABLE_ENTITY, entityInfoCache.getTableName(), entityInfoCache);
+                                    cacheManager.putCacheObj(CACHE_NAME_ENTITYNAME_CLASS, entityClass.getSimpleName(), entityClass);
+                                    uniqueEntitySet.add(entityClass.getName());
+                                }
+                            }
+                        }
+                    } catch (Exception e) {
+                        log.warn("解析mapper异常", e);
+                    }
+                }
+            }
+        }
+        uniqueEntitySet = null;
+    }
+
     /**
      * 初始化bean的属性缓存
      * @param beanClazz
-- 
Gitee


From 621c26eab1c1f22fbfe7c9889d05ebac58368f5d Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 27 May 2022 09:31:44 +0800
Subject: [PATCH 148/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96extractFields?=
 =?UTF-8?q?=E4=B8=8E=E7=BB=91=E5=AE=9A=E7=BC=93=E5=AD=98=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/cache/BindingCacheManager.java    | 44 ++-----------------
 .../java/com/diboot/core/util/BeanUtils.java  | 43 +++++++++++++++++-
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index 95e9489c..ba7a0336 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -74,7 +74,7 @@ public class BindingCacheManager {
      */
     private static final String CACHE_NAME_CLASS_NAME2FLDMAP = "CLASS_NAME2FLDMAP";
 
-    private static StaticMemoryCacheManager getCacheManager(){
+    private static synchronized StaticMemoryCacheManager getCacheManager(){
         if(cacheManager == null){
             cacheManager = new StaticMemoryCacheManager(
                     CACHE_NAME_CLASS_ENTITY,
@@ -188,7 +188,7 @@ public class BindingCacheManager {
     public static List<Field> getFields(Class<?> beanClazz){
         List<Field> fields = getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, beanClazz.getName(), List.class);
         if(fields == null){
-            fields = initClassFields(beanClazz, null);
+            fields = BeanUtils.extractAllFields(beanClazz);
             getCacheManager().putCacheObj(CACHE_NAME_CLASS_FIELDS, beanClazz.getName(), fields);
         }
         return fields;
@@ -203,7 +203,7 @@ public class BindingCacheManager {
         String key = S.joinWith(Cons.SEPARATOR_COMMA, beanClazz.getName(), annotation.getName());
         List<Field> fields = getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, key, List.class);
         if(fields == null){
-            fields = initClassFields(beanClazz, annotation);
+            fields = BeanUtils.extractFields(beanClazz, annotation);
             getCacheManager().putCacheObj(CACHE_NAME_CLASS_FIELDS, key, fields);
         }
         return fields;
@@ -305,42 +305,4 @@ public class BindingCacheManager {
         return propInfoCache;
     }
 
-    /**
-     * 初始化fields
-     * @param beanClazz
-     * @return
-     */
-    private static List<Field> initClassFields(Class<?> beanClazz, Class<? extends Annotation> annotation){
-        List<Field> fieldList = new ArrayList<>();
-        Set<String> fieldNameSet = new HashSet<>();
-        loopFindFields(beanClazz, annotation, fieldList, fieldNameSet);
-        return fieldList;
-    }
-
-    /**
-     * 循环向上查找fields
-     * @param beanClazz
-     * @param annotation
-     * @param fieldList
-     * @param fieldNameSet
-     */
-    private static void loopFindFields(Class<?> beanClazz, Class<? extends Annotation> annotation, List<Field> fieldList, Set<String> fieldNameSet){
-        if(beanClazz == null) {
-            return;
-        }
-        Field[] fields = beanClazz.getDeclaredFields();
-        if (V.notEmpty(fields)) {
-            for (Field field : fields) {
-                // 被重写属性，以子类的为准
-                if (!fieldNameSet.add(field.getName())) {
-                    continue;
-                }
-                if (annotation == null || field.getAnnotation(annotation) != null) {
-                    fieldList.add(field);
-                }
-            }
-        }
-        loopFindFields(beanClazz.getSuperclass(), annotation, fieldList, fieldNameSet);
-    }
-
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index 728e4b78..0aa69a8a 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -752,7 +752,7 @@ public class BeanUtils {
      * @return
      */
     public static List<Field> extractAllFields(Class clazz){
-        return BindingCacheManager.getFields(clazz);
+        return extractClassFields(clazz, null);
     }
 
     /**
@@ -761,7 +761,7 @@ public class BeanUtils {
      * @return
      */
     public static List<Field> extractFields(Class<?> clazz, Class<? extends Annotation> annotation){
-        return BindingCacheManager.getFields(clazz, annotation);
+        return extractClassFields(clazz, annotation);
     }
 
     /**
@@ -908,4 +908,43 @@ public class BeanUtils {
             wrapper.setPropertyValue(fieldName, null);
         }
     }
+
+    /**
+     * 初始化fields
+     * @param beanClazz
+     * @return
+     */
+    private static List<Field> extractClassFields(Class<?> beanClazz, Class<? extends Annotation> annotation){
+        List<Field> fieldList = new ArrayList<>();
+        Set<String> fieldNameSet = new HashSet<>();
+        loopFindFields(beanClazz, annotation, fieldList, fieldNameSet);
+        return fieldList;
+    }
+
+    /**
+     * 循环向上查找fields
+     * @param beanClazz
+     * @param annotation
+     * @param fieldList
+     * @param fieldNameSet
+     */
+    private static void loopFindFields(Class<?> beanClazz, Class<? extends Annotation> annotation, List<Field> fieldList, Set<String> fieldNameSet){
+        if(beanClazz == null) {
+            return;
+        }
+        Field[] fields = beanClazz.getDeclaredFields();
+        if (V.notEmpty(fields)) {
+            for (Field field : fields) {
+                // 被重写属性，以子类的为准
+                if (!fieldNameSet.add(field.getName())) {
+                    continue;
+                }
+                if (annotation == null || field.getAnnotation(annotation) != null) {
+                    fieldList.add(field);
+                }
+            }
+        }
+        loopFindFields(beanClazz.getSuperclass(), annotation, fieldList, fieldNameSet);
+    }
+
 }
-- 
Gitee


From 8db263b06b3f6502527bc1291965483728a8f844 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 2 Jun 2022 11:30:20 +0800
Subject: [PATCH 149/195] =?UTF-8?q?*=20Excel=E5=AF=BC=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=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

---
 .../com/diboot/file/excel/listener/ReadExcelListener.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/diboot-file-starter/src/main/java/com/diboot/file/excel/listener/ReadExcelListener.java b/diboot-file-starter/src/main/java/com/diboot/file/excel/listener/ReadExcelListener.java
index 8c54f266..8e898cd3 100644
--- a/diboot-file-starter/src/main/java/com/diboot/file/excel/listener/ReadExcelListener.java
+++ b/diboot-file-starter/src/main/java/com/diboot/file/excel/listener/ReadExcelListener.java
@@ -385,7 +385,7 @@ public abstract class ReadExcelListener<T extends BaseExcelModel> implements Rea
                                 BeanUtils.setProperty(data, setFieldName, 0);
                             }
                         } else if (excelBindField.empty().equals(EmptyStrategy.WARN)) {
-                            data.addComment(entry.getKey(), name + " 值不存在");
+                            data.addComment(entry.getKey(), "关联值不存在");
                         } else if (excelBindField.empty().equals(EmptyStrategy.IGNORE) && valueNotNull) {
                             log.warn("非空字段 {} 不应设置 EmptyStrategy.IGNORE.", entry.getKey());
                         }
@@ -396,7 +396,7 @@ public abstract class ReadExcelListener<T extends BaseExcelModel> implements Rea
                         }
                     } else {
                         if (excelBindField.duplicate().equals(DuplicateStrategy.WARN)) {
-                            data.addComment(entry.getKey(), name + " 匹配到多个值");
+                            data.addComment(entry.getKey(), "匹配到多个关联值");
                         } else if (excelBindField.duplicate().equals(DuplicateStrategy.FIRST)) {
                             // 非预览时 赋值
                             if (!preview) {
@@ -417,7 +417,7 @@ public abstract class ReadExcelListener<T extends BaseExcelModel> implements Rea
                         }
                         // 非空才报错
                         if (valueNotNull && V.isEmpty(valList)) {
-                            data.addComment(entry.getKey(), name + " 无匹配字典");
+                            data.addComment(entry.getKey(), "无匹配字典");
                             continue;
                         }
                     }
-- 
Gitee


From d7ac01d1b3de133e76e2d16a9b49635d429f4d2c Mon Sep 17 00:00:00 2001
From: Zjp <1215582715@qq.com>
Date: Thu, 2 Jun 2022 14:05:46 +0800
Subject: [PATCH 150/195] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB=20V:=201.isEmpty()=E5=92=8CnotEmpty()=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81Iterator=E3=80=81Iterable=E3=80=81Enumeration=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=88=A4=E6=96=AD;=202.=E8=B0=83=E6=95=B4isE?=
 =?UTF-8?q?mpty=E5=92=8CnotEmpty=E6=96=B9=E6=B3=95=E7=9A=84=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F,=20=E5=B9=B6=E5=BD=92=E7=B1=BB;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/core/util/V.java | 162 +++++++++++++-----
 1 file changed, 118 insertions(+), 44 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/V.java b/diboot-core/src/main/java/com/diboot/core/util/V.java
index d828adce..e93a03ed 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/V.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/V.java
@@ -45,6 +45,9 @@ public class V {
      */
     private static Validator VALIDATOR = null;
 
+    // region 判空方法
+    /* ================================================== 判空方法 =================================================== */
+
     /**
      * 对象是否为空
      */
@@ -59,6 +62,12 @@ public class V {
             return isEmpty((Map<?, ?>) obj);
         } else if (obj.getClass().isArray()) {
             return Array.getLength(obj) == 0;
+        } else if (obj instanceof Iterator) {
+            return isEmpty((Iterator<?>) obj);
+        } else if (obj instanceof Iterable) {
+            return isEmpty((Iterable<?>) obj);
+        } else if (obj instanceof Enumeration) {
+            return isEmpty((Enumeration<?>) obj);
         }
         return false;
     }
@@ -98,6 +107,18 @@ public class V {
         return obj == null || obj.isEmpty();
     }
 
+    public static <T> boolean isEmpty(Iterator<T> iterator) {
+        return iterator == null || !iterator.hasNext();
+    }
+
+    public static <T> boolean isEmpty(Iterable<T> iterable) {
+        return iterable == null || isEmpty(iterable.iterator());
+    }
+
+    public static <T> boolean isEmpty(Enumeration<T> enumeration) {
+        return enumeration == null || !enumeration.hasMoreElements();
+    }
+
     public static boolean isEmpty(boolean[] array) {
         return array == null || array.length == 0;
     }
@@ -134,42 +155,6 @@ public class V {
         return array == null || array.length == 0;
     }
 
-    public static boolean notEmpty(boolean[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(byte[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(char[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(double[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(float[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(int[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(long[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(short[] array) {
-        return array != null && array.length != 0;
-    }
-
-    public static boolean notEmpty(Object[] array) {
-        return array != null && array.length != 0;
-    }
-
     /**
      * 任意元素为空则返回true
      *
@@ -188,14 +173,16 @@ public class V {
         return false;
     }
 
-    /**
-     * 全都不为空则返回true
-     *
-     * @param objs objs
-     * @return true/false
-     */
-    public static boolean isNoneEmpty(Object... objs) {
-        return !isAnyEmpty(objs);
+    public static <T> boolean isAnyEmpty(Collection<T> collection) {
+        if (isEmpty(collection)) {
+            return true;
+        }
+        for (T obj : collection) {
+            if (isEmpty(obj)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -216,6 +203,23 @@ public class V {
         return true;
     }
 
+    public static <T> boolean isAllEmpty(Collection<T> collection) {
+        if (isEmpty(collection)) {
+            return true;
+        }
+        for (T obj : collection) {
+            if (notEmpty(obj)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    /* ================================================== end ======================================================= */
+    // endregion
+
+    // region 非空判断方法
+    /* ================================================== 非空判断方法 ================================================ */
+
     /**
      * 对象是否为空
      */
@@ -230,6 +234,12 @@ public class V {
             return notEmpty((Map<?, ?>) obj);
         } else if (obj.getClass().isArray()) {
             return Array.getLength(obj) != 0;
+        } else if (obj instanceof Iterator) {
+            return notEmpty((Iterator<?>) obj);
+        } else if (obj instanceof Iterable) {
+            return notEmpty((Iterable<?>) obj);
+        } else if (obj instanceof Enumeration) {
+            return notEmpty((Enumeration<?>) obj);
         }
         return true;
     }
@@ -269,6 +279,54 @@ public class V {
         return obj != null && !obj.isEmpty();
     }
 
+    public static <T> boolean notEmpty(Iterator<T> iterator) {
+        return iterator != null && iterator.hasNext();
+    }
+
+    public static <T> boolean notEmpty(Iterable<T> iterable) {
+        return iterable != null && notEmpty(iterable.iterator());
+    }
+
+    public static <T> boolean notEmpty(Enumeration<T> enumeration) {
+        return enumeration != null && enumeration.hasMoreElements();
+    }
+
+    public static boolean notEmpty(boolean[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(byte[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(char[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(short[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(int[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(long[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(double[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(float[] array) {
+        return array != null && array.length != 0;
+    }
+
+    public static boolean notEmpty(Object[] array) {
+        return array != null && array.length != 0;
+    }
+
     /**
      * 对象不为空且不为0
      */
@@ -283,6 +341,22 @@ public class V {
         return intObj != null && intObj != 0;
     }
 
+    /**
+     * 全都不为空则返回true
+     *
+     * @param objs objs
+     * @return true/false
+     */
+    public static boolean isNoneEmpty(Object... objs) {
+        return !isAnyEmpty(objs);
+    }
+
+    public static <T> boolean isNoneEmpty(Collection<T> collection) {
+        return !isAnyEmpty(collection);
+    }
+    /* ================================================== end ======================================================= */
+    // endregion
+
     /**
      * 集合中是否包含指定元素
      *
-- 
Gitee


From c7b604c6778d9854769527afaa26065874e33b0e Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 28 May 2022 12:24:46 +0800
Subject: [PATCH 151/195] =?UTF-8?q?*=20message=E7=BB=84=E4=BB=B6=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-message-starter/pom.xml                | 13 +++
 .../message/annotation/BindVariable.java      | 23 +++++
 ...annelStrategy.java => MessageChannel.java} | 10 +-
 .../message/channel/SimpleEmailChannel.java   | 11 ++-
 .../java/com/diboot/message/config/Cons.java  | 53 ++++-------
 ...riableData.java => BaseUserVariables.java} |  7 +-
 .../com/diboot/message/entity/Message.java    |  9 ++
 .../message/service/MessageService.java       | 13 ++-
 .../service/MessageTemplateService.java       |  4 +-
 .../service/TemplateVariableService.java      | 95 -------------------
 .../service/impl/MessageServiceImpl.java      | 87 ++++++++++-------
 .../impl/MessageTemplateServiceImpl.java      | 32 ++++++-
 .../SystemTemplateVariableServiceImpl.java    | 87 -----------------
 .../message/starter/MessageAutoConfig.java    | 24 ++---
 .../diboot/message/utils/TemplateUtils.java   | 82 ++++++++++++----
 .../message/test/MessageServiceTest.java      | 49 ++++++++++
 .../message/test/StartupApplication.java}     | 34 +++----
 .../message/test/channel/SMSChannel.java      | 24 +++++
 .../message/test/config/SpringMvcConfig.java  | 54 +++++++++++
 .../message/test/variable/MyVariableObj.java  | 27 ++++++
 .../src/test/resources/application.properties | 21 ++++
 21 files changed, 437 insertions(+), 322 deletions(-)
 create mode 100644 diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java
 rename diboot-message-starter/src/main/java/com/diboot/message/channel/{ChannelStrategy.java => MessageChannel.java} (88%)
 rename diboot-message-starter/src/main/java/com/diboot/message/entity/{BaseVariableData.java => BaseUserVariables.java} (80%)
 delete mode 100644 diboot-message-starter/src/main/java/com/diboot/message/service/TemplateVariableService.java
 delete mode 100644 diboot-message-starter/src/main/java/com/diboot/message/service/impl/SystemTemplateVariableServiceImpl.java
 create mode 100644 diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java
 rename diboot-message-starter/src/{main/java/com/diboot/message/annotation/TemplateVariable.java => test/java/diboot/message/test/StartupApplication.java} (52%)
 create mode 100644 diboot-message-starter/src/test/java/diboot/message/test/channel/SMSChannel.java
 create mode 100644 diboot-message-starter/src/test/java/diboot/message/test/config/SpringMvcConfig.java
 create mode 100644 diboot-message-starter/src/test/java/diboot/message/test/variable/MyVariableObj.java
 create mode 100644 diboot-message-starter/src/test/resources/application.properties

diff --git a/diboot-message-starter/pom.xml b/diboot-message-starter/pom.xml
index 85948a3c..b871c52c 100644
--- a/diboot-message-starter/pom.xml
+++ b/diboot-message-starter/pom.xml
@@ -33,5 +33,18 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
+
+        <!-- 单元测试依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java b/diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java
new file mode 100644
index 00000000..b495f5b6
--- /dev/null
+++ b/diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java
@@ -0,0 +1,23 @@
+package com.diboot.message.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 绑定变量
+ * @author JerryMa
+ * @version v3.0.0
+ * @date 2022/5/27
+ * Copyright © diboot.com
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface BindVariable {
+
+    /**
+     * 绑定变量名称，如 ${用户姓名}
+     *
+     * @return
+     */
+    String name();
+}
\ No newline at end of file
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/channel/ChannelStrategy.java b/diboot-message-starter/src/main/java/com/diboot/message/channel/MessageChannel.java
similarity index 88%
rename from diboot-message-starter/src/main/java/com/diboot/message/channel/ChannelStrategy.java
rename to diboot-message-starter/src/main/java/com/diboot/message/channel/MessageChannel.java
index f9f386ba..60bd98ca 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/channel/ChannelStrategy.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/channel/MessageChannel.java
@@ -19,7 +19,7 @@ package com.diboot.message.channel;
 import com.diboot.message.entity.Message;
 
 /**
- * 通道策略接口
+ * 消息通道接口
  *
  * <p>
  * 所有发送通道实现该接口，并实现发送方法
@@ -30,7 +30,13 @@ import com.diboot.message.entity.Message;
  * @Date 2021/2/18  18:42
  * @Copyright © diboot.com
  */
-public interface ChannelStrategy {
+public interface MessageChannel {
+
+    /**
+     * 消息通道类型，如Email
+     * @return
+     */
+    String type();
 
     /**
      * 发送消息， 并更新发送结果
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java b/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java
index 120c3fa6..4f011118 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java
@@ -43,7 +43,7 @@ import java.util.Date;
  * @Copyright © diboot.com
  */
 @Slf4j
-public class SimpleEmailChannel implements ChannelStrategy {
+public class SimpleEmailChannel implements MessageChannel {
 
     @Autowired(required = false)
     private JavaMailSender javaMailSender;
@@ -51,12 +51,17 @@ public class SimpleEmailChannel implements ChannelStrategy {
     @Autowired
     private MessageService messageService;
 
+    @Override
+    public String type() {
+        return Cons.MESSAGE_CHANNEL.EMAIL.name();
+    }
+
     @Override
     @Async
     public void send(Message message) {
         log.debug("[开始发送邮件]：邮件内容：{}", JSON.stringify(message));
         String result = "success";
-        String status = Cons.MESSAGE_STATUS.DELIVERY.getItemValue();
+        String status = Cons.MESSAGE_STATUS.DELIVERY.name();
         try {
             MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             //发送有附件邮件
@@ -91,7 +96,7 @@ public class SimpleEmailChannel implements ChannelStrategy {
         } catch (Exception e) {
             log.error("[发送邮件失败]：信息为： {} , 异常", message, e);
             result = e.getMessage();
-            status = Cons.MESSAGE_STATUS.EXCEPTION.getItemValue();
+            status = Cons.MESSAGE_STATUS.EXCEPTION.name();
         }
         // 更新结果
         messageService.updateEntity(
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java b/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java
index 97af8208..a0d52509 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java
@@ -32,41 +32,33 @@ public class Cons extends com.diboot.core.config.Cons {
         /**
          * 发送中
          */
-        SENDING("发送中", "SENDING"),
+        SENDING("发送中"),
         /**
          * 异常
          */
-        EXCEPTION("发送异常", "EXCEPTION"),
+        EXCEPTION("发送异常"),
         // 如果是短信、邮件则送达表示发送成功
         /**
          * 签收
          */
-        DELIVERY("已送达", "DELIVERY"),
+        DELIVERY("已送达"),
         // 如果是站内信，那么状态是已读、未读
         /**
          * 未读
          */
-        UNREAD("未读", "UNREAD"),
+        UNREAD("未读"),
         /**
          * 已读
          */
-        READ("已读", "READ");
+        READ("已读");
 
-        private String itemName;
-
-        private String itemValue;
-
-        MESSAGE_STATUS(String itemName, String itemValue) {
-            this.itemName = itemName;
-            this.itemValue = itemValue;
-        }
-
-        public String getItemName() {
-            return itemName;
+        private String label;
+        MESSAGE_STATUS(String label){
+            this.label = label;
         }
 
-        public String getItemValue() {
-            return itemValue;
+        public String label(){
+            return label;
         }
     }
 
@@ -74,25 +66,18 @@ public class Cons extends com.diboot.core.config.Cons {
      * 消息发送通道
      */
     public enum MESSAGE_CHANNEL {
-        WEBSOCKET("站内信", "WEBSOCKET"),
-        TEXT_MESSAGE("短信", "TEXT_MESSAGE"),
-        EMAIL("邮件", "EMAIL");
-
-        private String itemName;
-
-        private String itemValue;
-
-        MESSAGE_CHANNEL(String itemName, String itemValue) {
-            this.itemName = itemName;
-            this.itemValue = itemValue;
-        }
+        SMS("短信"),
+        SYS_MSG("系统消息"),
+        WEBSOCKET("站内信"),
+        EMAIL("邮件");
 
-        public String getItemName() {
-            return itemName;
+        private String label;
+        MESSAGE_CHANNEL(String label){
+            this.label = label;
         }
 
-        public String getItemValue() {
-            return itemValue;
+        public String label(){
+            return label;
         }
     }
 
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseVariableData.java b/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseUserVariables.java
similarity index 80%
rename from diboot-message-starter/src/main/java/com/diboot/message/entity/BaseVariableData.java
rename to diboot-message-starter/src/main/java/com/diboot/message/entity/BaseUserVariables.java
index 29180494..b61169eb 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseVariableData.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseUserVariables.java
@@ -15,6 +15,7 @@
  */
 package com.diboot.message.entity;
 
+import com.diboot.message.annotation.BindVariable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -32,15 +33,19 @@ import java.io.Serializable;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class BaseVariableData implements Serializable {
+public class BaseUserVariables implements Serializable {
+    private static final long serialVersionUID = 6254327279941140819L;
 
     /**
      * 姓名
      */
+    @BindVariable(name = "${用户姓名}")
     private String realName;
 
     /**
      * 手机号
      */
+    @BindVariable(name = "${手机号}")
     private String phone;
+
 }
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/entity/Message.java b/diboot-message-starter/src/main/java/com/diboot/message/entity/Message.java
index 1bd5200a..c6def0cd 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/entity/Message.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/entity/Message.java
@@ -21,6 +21,7 @@ import com.diboot.core.entity.BaseEntity;
 import com.diboot.core.util.D;
 import com.diboot.core.util.JSON;
 import com.diboot.core.util.V;
+import com.diboot.message.config.Cons;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
@@ -271,4 +272,12 @@ public class Message extends BaseEntity {
         String attachments = (String) extDataMap.get(ATTACHMENTS);
         return attachments.split(",");
     }
+
+    /**
+     * 是否有关联模板
+     * @return
+     */
+    public boolean hasTemplate() {
+        return V.notEmpty(this.templateId) || V.notEmpty(this.templateCode);
+    }
 }
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/service/MessageService.java b/diboot-message-starter/src/main/java/com/diboot/message/service/MessageService.java
index eb7c418b..1dbc2bd5 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/service/MessageService.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/service/MessageService.java
@@ -16,7 +16,6 @@
 package com.diboot.message.service;
 
 import com.diboot.core.service.BaseService;
-import com.diboot.message.entity.BaseVariableData;
 import com.diboot.message.entity.Message;
 
 /**
@@ -28,12 +27,20 @@ import com.diboot.message.entity.Message;
  * @Copyright © diboot.com
  */
 public interface MessageService extends BaseService<Message> {
+    /**
+     * 发送信息（消息模板无变量）
+     *
+     * @param message      {@link Message} 待发送的消息
+     * @return
+     */
+    boolean send(Message message);
+
     /**
      * 发送信息
      *
      * @param message      {@link Message} 待发送的消息
-     * @param variableData {@link BaseVariableData} 变量替换值
+     * @param variableData {@link Object} 变量替换值
      * @return
      */
-    boolean send(Message message, BaseVariableData variableData);
+    boolean send(Message message, Object variableData);
 }
\ No newline at end of file
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/service/MessageTemplateService.java b/diboot-message-starter/src/main/java/com/diboot/message/service/MessageTemplateService.java
index 113b2099..968cd933 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/service/MessageTemplateService.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/service/MessageTemplateService.java
@@ -36,7 +36,7 @@ public interface MessageTemplateService extends BaseService<MessageTemplate> {
      * @return
      * @throws Exception
      */
-    List<String> getTemplateVariableList() throws Exception;
+    List<String> getTemplateVariableList() ;
 
     /**
      * 检查是否有重复的code
@@ -46,5 +46,5 @@ public interface MessageTemplateService extends BaseService<MessageTemplate> {
      * @return
      * @throws Exception
      */
-    boolean existCode(Long id, String code) throws Exception;
+    boolean existCode(Long id, String code) ;
 }
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/service/TemplateVariableService.java b/diboot-message-starter/src/main/java/com/diboot/message/service/TemplateVariableService.java
deleted file mode 100644
index 5412304a..00000000
--- a/diboot-message-starter/src/main/java/com/diboot/message/service/TemplateVariableService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.message.service;
-
-import com.diboot.core.util.S;
-import com.diboot.core.util.V;
-import com.diboot.message.annotation.TemplateVariable;
-import com.diboot.message.entity.BaseVariableData;
-import com.diboot.message.utils.TemplateUtils;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 模版变量 + 构建Message 解析
- *
- * @author : uu
- * @version : v1.0
- * @Date 2021/2/18  18:36
- * @Copyright © diboot.com
- */
-public interface TemplateVariableService {
-
-    /**
-     * 非贪婪 解析正则 ${}
-     */
-    Pattern TEMPLATE_VARIABLE = Pattern.compile("\\$\\{.+?\\}");
-
-    /**
-     * 变量方法缓存<{@link TemplateVariable#name()}, Method>
-     */
-    Map<String, Method> TEMPLATE_STRATEGY_CACHE = new HashMap<>(128);
-
-    /**
-     * 将模版内容解析成具体内容
-     *
-     * @param templateContent
-     * @param variableData
-     * @return
-     */
-    String parseTemplate2Content(String templateContent, BaseVariableData variableData) throws Exception;
-
-
-    /**
-     * 获取模版内容中的变量
-     *
-     * @param templateContent
-     * @return
-     * @throws Exception
-     */
-    default String[] getMessageTemplateVariables(String templateContent) throws Exception {
-        // 提取变量之前校验方法缓存是否有值，无值需要重新加载
-        if (V.isEmpty(TEMPLATE_STRATEGY_CACHE)) {
-            TemplateUtils.loadTemplateVariableList();
-        }
-        // 提取模版变量并将值设置
-        Matcher matcher = TEMPLATE_VARIABLE.matcher(templateContent);
-        return getMatcherVariable(matcher);
-    }
-
-    /**
-     * 获取匹配器 匹配的内容
-     *
-     * @param matcher
-     * @return
-     * @throws Exception
-     */
-    default String[] getMatcherVariable(Matcher matcher) throws Exception {
-        // 提取模版中的所有变量
-        List<String> templateVariableList = new ArrayList<>();
-        while (matcher.find()) {
-            templateVariableList.add(matcher.group());
-        }
-        return S.toStringArray(templateVariableList);
-    }
-
-}
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java b/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java
index c920d0dc..a16bd416 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java
@@ -22,19 +22,19 @@ import com.diboot.core.exception.InvalidUsageException;
 import com.diboot.core.service.impl.BaseServiceImpl;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.Status;
-import com.diboot.message.channel.ChannelStrategy;
-import com.diboot.message.entity.BaseVariableData;
+import com.diboot.message.channel.MessageChannel;
+import com.diboot.message.config.Cons;
 import com.diboot.message.entity.Message;
 import com.diboot.message.entity.MessageTemplate;
 import com.diboot.message.mapper.MessageMapper;
 import com.diboot.message.service.MessageService;
-import com.diboot.message.service.MessageTemplateService;
-import com.diboot.message.service.TemplateVariableService;
+import com.diboot.message.utils.TemplateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -45,67 +45,82 @@ import java.util.Map;
  * @Date 2021/2/25  09:39
  * @Copyright © diboot.com
  */
-@Service
 @Slf4j
 public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message> implements MessageService {
 
-    /**
-     * 模版策略
-     */
+    @Lazy
     @Autowired
-    private TemplateVariableService templateVariableService;
+    private MessageTemplateServiceImpl messageTemplateService;
 
     /**
      * 发送通道
      */
-    @Autowired
-    @Lazy
-    private Map<String, ChannelStrategy> channelStrategyMap;
+    private Map<String, MessageChannel> typeToChannelMap = new HashMap<>();
 
-    @Autowired
-    private MessageTemplateService messageTemplateService;
+    public MessageServiceImpl(List<MessageChannel> messageChannels, List<Class<?>> variableObjectClasses) {
+        if(messageChannels != null) {
+            for(MessageChannel channel : messageChannels) {
+                typeToChannelMap.put(channel.type(), channel);
+            }
+        }
+        MessageTemplateServiceImpl.extractVariablesFrom(variableObjectClasses);
+    }
 
     @Override
-    public boolean send(Message message, BaseVariableData variableData) {
+    public boolean send(Message message) {
+        return send(message, null);
+    }
+
+    @Override
+    public boolean send(Message message, Object variableData) {
         // 获取发送通道
-        ChannelStrategy channelStrategy = channelStrategyMap.get(message.getChannel());
-        if (V.isEmpty(channelStrategy)) {
+        MessageChannel channel = typeToChannelMap.get(message.getChannel());
+        if (V.isEmpty(channel)) {
             log.error("[获取发送通道失败]，当前发送通道为：{}", message.getChannel());
             throw new InvalidUsageException("获取发送通道失败! " + message.getChannel());
         }
-        // 是否根据模板构建邮件内容
-        LambdaQueryWrapper<MessageTemplate> queryWrapper = Wrappers.<MessageTemplate>lambdaQuery()
-                .eq(V.notEmpty(message.getTemplateId()), MessageTemplate::getId, message.getTemplateId())
-                .eq(V.notEmpty(message.getTemplateCode()), MessageTemplate::getCode, message.getTemplateCode());
-        if (queryWrapper.nonEmptyOfNormal()) {
-            MessageTemplate messageTemplate = messageTemplateService.getSingleEntity(queryWrapper);
-            if (V.isEmpty(messageTemplate)) {
-                if (V.isEmpty(message.getTemplateCode())) {
-                    log.error("[获取模版失败] 模版id为：{}", message.getTemplateId());
-                } else if (V.isEmpty(message.getTemplateId())) {
-                    log.error("[获取模版失败] 模版code为：{}", message.getTemplateCode());
-                } else {
-                    log.error("[获取模版失败] 模版id为：{} ，模版code为：{}", message.getTemplateId(), message.getTemplateCode());
+        String content = message.getContent();
+        if(message.hasTemplate()) {
+            // 是否根据模板构建邮件内容
+            LambdaQueryWrapper<MessageTemplate> queryWrapper = Wrappers.<MessageTemplate>lambdaQuery()
+                    .eq(V.notEmpty(message.getTemplateId()), MessageTemplate::getId, message.getTemplateId())
+                    .eq(V.notEmpty(message.getTemplateCode()), MessageTemplate::getCode, message.getTemplateCode());
+            if (queryWrapper.nonEmptyOfNormal()) {
+                MessageTemplate messageTemplate = messageTemplateService.getSingleEntity(queryWrapper);
+                if (V.isEmpty(messageTemplate)) {
+                    if (V.isEmpty(message.getTemplateCode())) {
+                        log.error("[获取模版失败] 模版id为：{}", message.getTemplateId());
+                    } else if (V.isEmpty(message.getTemplateId())) {
+                        log.error("[获取模版失败] 模版code为：{}", message.getTemplateCode());
+                    } else {
+                        log.error("[获取模版失败] 模版id为：{} ，模版code为：{}", message.getTemplateId(), message.getTemplateCode());
+                    }
+                    throw new BusinessException(Status.FAIL_OPERATION, "获取模版失败!");
                 }
-                throw new BusinessException(Status.FAIL_OPERATION, "获取模版失败!");
+                message.setTemplateId(messageTemplate.getId());
+                content = messageTemplate.getContent();
             }
-            message.setTemplateId(messageTemplate.getId());
+        }
+        if(V.notEmpty(content)){
             try {
                 // 设置模版内容
-                String content = templateVariableService.parseTemplate2Content(messageTemplate.getContent(), variableData);
+                content = TemplateUtils.parseTemplateContent(content, variableData);
                 message.setContent(content);
             } catch (Exception e) {
                 log.error("[消息解析失败]，消息体为：{}", message);
                 throw new BusinessException(Status.FAIL_OPERATION, "消息解析失败!");
             }
         }
-        if (V.isEmpty(message.getContent())) {
+        else {
             throw new BusinessException("消息内容不能为 null");
         }
         // 设置定时发送，则等待定时任务发送
         if (V.notEmpty(message.getScheduleTime())) {
             message.setStatus("SCHEDULE");
         }
+        else if(V.isEmpty(message.getStatus())){
+            message.setStatus(Cons.MESSAGE_STATUS.SENDING.name());
+        }
         // 创建Message
         boolean success = createEntity(message);
         // 停止发送
@@ -117,7 +132,7 @@ public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message>
             throw new BusinessException(Status.FAIL_OPERATION, "消息发送失败！");
         }
         // 异步发送消息
-        channelStrategy.send(message);
+        channel.send(message);
         return true;
     }
 
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageTemplateServiceImpl.java b/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageTemplateServiceImpl.java
index f39ba359..6036e92f 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageTemplateServiceImpl.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageTemplateServiceImpl.java
@@ -19,8 +19,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diboot.core.exception.BusinessException;
 import com.diboot.core.service.impl.BaseServiceImpl;
+import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.Status;
+import com.diboot.message.annotation.BindVariable;
 import com.diboot.message.entity.MessageTemplate;
 import com.diboot.message.mapper.MessageTemplateMapper;
 import com.diboot.message.service.MessageTemplateService;
@@ -28,6 +30,8 @@ import com.diboot.message.utils.TemplateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,13 +45,35 @@ import java.util.List;
 @Slf4j
 public class MessageTemplateServiceImpl extends BaseServiceImpl<MessageTemplateMapper, MessageTemplate> implements MessageTemplateService {
 
+    /**
+     * 模板变量列表
+     */
+    private static List<String> templateVariableList = new ArrayList<>();
+
+    public static void extractVariablesFrom(List<Class<?>> variableObjectClasses) {
+        if(variableObjectClasses != null) {
+            for(Class<?> objClass : variableObjectClasses) {
+                List<Field> fields = BeanUtils.extractFields(objClass, BindVariable.class);
+                if(V.isEmpty(fields)){
+                    continue;
+                }
+                fields.forEach( fld -> {
+                    BindVariable bindVariable = fld.getAnnotation(BindVariable.class);
+                    if(!templateVariableList.contains(bindVariable.name())) {
+                        templateVariableList.add(bindVariable.name());
+                    }
+                });
+            }
+        }
+    }
+
     @Override
-    public List<String> getTemplateVariableList() throws Exception{
-        return TemplateUtils.loadTemplateVariableList();
+    public List<String> getTemplateVariableList() {
+        return templateVariableList;
     }
 
     @Override
-    public boolean existCode(Long id, String code) throws Exception {
+    public boolean existCode(Long id, String code) {
         if (V.isEmpty(code)) {
             return false;
         }
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/SystemTemplateVariableServiceImpl.java b/diboot-message-starter/src/main/java/com/diboot/message/service/impl/SystemTemplateVariableServiceImpl.java
deleted file mode 100644
index bf4a82d4..00000000
--- a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/SystemTemplateVariableServiceImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.diboot.message.service.impl;
-
-import com.diboot.core.util.S;
-import com.diboot.core.util.V;
-import com.diboot.message.annotation.TemplateVariable;
-import com.diboot.message.entity.BaseVariableData;
-import com.diboot.message.service.TemplateVariableService;
-import lombok.extern.slf4j.Slf4j;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 系统模版默认实现
- *
- * @author : uu
- * @version : v1.0
- * @Date 2021/2/18  19:25
- * @Copyright © diboot.com
- */
-@Slf4j
-public class SystemTemplateVariableServiceImpl implements TemplateVariableService {
-
-    @Override
-    public String parseTemplate2Content(String templateContent, BaseVariableData baseVariableData) throws Exception {
-        // 提取模版中使用到的模版变量
-        String[] messageTemplateVariables = getMessageTemplateVariables(templateContent);
-        // 从缓存中获取变量对应的方法
-        List<String> variableValueList = new ArrayList<>();
-        for (String variable : messageTemplateVariables) {
-            Method method = TEMPLATE_STRATEGY_CACHE.get(variable);
-            // 方法不存在，则当前变量无法替换，那么使用空字符串
-            if (method == null) {
-                log.warn("【提取变量方法失败】：当前变量为：{}", variable);
-                variableValueList.add("");
-                continue;
-            }
-            // 执行方法，获取变量值
-            Object value = method.invoke(this, baseVariableData);
-            if (value != null) {
-                variableValueList.add(String.valueOf(value));
-            } else {
-                log.warn("【执行方法获取内容为空】：当前变量为：{}", variable);
-                variableValueList.add("");
-            }
-        }
-        return S.replaceEach(templateContent, messageTemplateVariables, S.toStringArray(variableValueList));
-    }
-
-    /**
-     * 用户名变量
-     *
-     * @param baseVariableData
-     * @return
-     */
-    @TemplateVariable(name = "${用户姓名}")
-    private String getRealName(BaseVariableData baseVariableData) {
-        return V.notEmpty(baseVariableData.getRealName()) ? baseVariableData.getRealName() : "";
-    }
-
-    /**
-     * 手机号变量
-     *
-     * @param baseVariableData
-     * @return
-     */
-    @TemplateVariable(name = "${手机号}")
-    private String getMobilePhone(BaseVariableData baseVariableData) {
-        return V.notEmpty(baseVariableData.getPhone()) ? baseVariableData.getPhone() : "";
-    }
-}
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/starter/MessageAutoConfig.java b/diboot-message-starter/src/main/java/com/diboot/message/starter/MessageAutoConfig.java
index 1988aa2a..112ae206 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/starter/MessageAutoConfig.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/starter/MessageAutoConfig.java
@@ -15,10 +15,10 @@
  */
 package com.diboot.message.starter;
 
-import com.diboot.message.channel.ChannelStrategy;
 import com.diboot.message.channel.SimpleEmailChannel;
-import com.diboot.message.service.TemplateVariableService;
-import com.diboot.message.service.impl.SystemTemplateVariableServiceImpl;
+import com.diboot.message.entity.BaseUserVariables;
+import com.diboot.message.service.MessageService;
+import com.diboot.message.service.impl.MessageServiceImpl;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -26,6 +26,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Arrays;
+
 /**
  * 组件初始化
  *
@@ -46,17 +48,11 @@ public class MessageAutoConfig {
      */
     @Bean
     @ConditionalOnMissingBean
-    public TemplateVariableService templateVariableService() {
-        return new SystemTemplateVariableServiceImpl();
+    public MessageService messageService() {
+        return new MessageServiceImpl(
+            Arrays.asList(new SimpleEmailChannel()),
+            Arrays.asList(BaseUserVariables.class)
+        );
     }
 
-    /**
-     * 简单邮箱发送通道
-     * @return
-     */
-    @Bean("EMAIL")
-    @ConditionalOnMissingBean(name = "EMAIL")
-    public ChannelStrategy simpleEmailChannel() {
-        return new SimpleEmailChannel();
-    }
 }
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java b/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java
index 61968abd..a72cabf5 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java
@@ -16,14 +16,16 @@
 package com.diboot.message.utils;
 
 import com.diboot.core.util.BeanUtils;
-import com.diboot.core.util.ContextHelper;
+import com.diboot.core.util.S;
 import com.diboot.core.util.V;
-import com.diboot.message.annotation.TemplateVariable;
-import com.diboot.message.service.TemplateVariableService;
+import com.diboot.message.annotation.BindVariable;
+import lombok.extern.slf4j.Slf4j;
 
-import java.lang.reflect.Method;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 模版工具方法
@@ -33,31 +35,69 @@ import java.util.List;
  * @Date 2021/2/19  11:05
  * @Copyright © diboot.com
  */
+@Slf4j
 public class TemplateUtils {
 
-    public static final List<String> TEMPLATE_STRATEGY_LIST = new ArrayList<>();
+    /**
+     * 非贪婪 解析正则 ${}
+     */
+    private static Pattern TEMPLATE_VARIABLE = Pattern.compile("\\$\\{.+?\\}");
+
+    /**
+     * 获取模版内容中的变量
+     *
+     * @param templateContent
+     * @return
+     * @throws Exception
+     */
+    private static List<String> getMessageTemplateVariables(String templateContent) throws Exception {
+        // 提取模版变量并将值设置
+        Matcher matcher = TEMPLATE_VARIABLE.matcher(templateContent);
+        // 提取模版中的所有变量
+        List<String> templateVariableList = new ArrayList<>();
+        while (matcher.find()) {
+            templateVariableList.add(matcher.group());
+        }
+        return templateVariableList;
+    }
 
     /**
-     * 加载所有TemplateVariableService实现类
+     * 解析模板内容
+     * @param templateContent
+     * @param variableData
+     * @return
+     * @throws Exception
      */
-    public static List<String> loadTemplateVariableList() {
-        if (V.notEmpty(TEMPLATE_STRATEGY_LIST)) {
-            return TEMPLATE_STRATEGY_LIST;
+    public static String parseTemplateContent(String templateContent, Object variableData) throws Exception {
+        // 提取模版中使用到的模版变量
+        List<String> messageTemplateVariables = getMessageTemplateVariables(templateContent);
+        if(V.isEmpty(messageTemplateVariables)){
+            return templateContent;
         }
-        TemplateVariableService templateVariableService = ContextHelper.getBean(TemplateVariableService.class);
-        if (V.isEmpty(templateVariableService)) {
-            return TEMPLATE_STRATEGY_LIST;
+        // 从缓存中获取变量对应的方法
+        List<String> variableValueList = new ArrayList<>();
+        List<Field> fields = BeanUtils.extractFields(variableData.getClass(), BindVariable.class);
+        if(V.isEmpty(fields)){
+            log.warn("{} 类中无@BindVariable变量绑定注解，无法替换变量");
+            return templateContent;
         }
-        Class<?> targetClass = BeanUtils.getTargetClass(templateVariableService);
-        Method[] methods = targetClass.getDeclaredMethods();
-        for (Method method : methods) {
-            TemplateVariable templateVariable = method.getAnnotation(TemplateVariable.class);
-            if (templateVariable == null) {
-                continue;
+        for (String variable : messageTemplateVariables) {
+            // 执行方法，获取变量值
+            for(Field field : fields){
+                BindVariable bindVariable = field.getAnnotation(BindVariable.class);
+                if(variable.equals(bindVariable.name())) {
+                    Object value = BeanUtils.getProperty(variableData, field.getName());
+                    if (value != null) {
+                        variableValueList.add(String.valueOf(value));
+                    } else {
+                        log.warn("【执行方法获取内容为空】：当前变量为：{}", variable);
+                        variableValueList.add("");
+                    }
+                    break;
+                }
             }
-            TEMPLATE_STRATEGY_LIST.add(templateVariable.name());
-            TemplateVariableService.TEMPLATE_STRATEGY_CACHE.put(templateVariable.name(), method);
         }
-        return TEMPLATE_STRATEGY_LIST;
+        return S.replaceEach(templateContent, S.toStringArray(messageTemplateVariables), S.toStringArray(variableValueList));
     }
+
 }
diff --git a/diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java b/diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java
new file mode 100644
index 00000000..04d6a607
--- /dev/null
+++ b/diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java
@@ -0,0 +1,49 @@
+package diboot.message.test;
+
+import com.diboot.message.config.Cons;
+import com.diboot.message.entity.Message;
+import com.diboot.message.service.MessageService;
+import com.diboot.message.service.MessageTemplateService;
+import diboot.message.test.config.SpringMvcConfig;
+import diboot.message.test.variable.MyVariableObj;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/28
+ * Copyright © diboot.com
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SpringMvcConfig.class})
+@SpringBootTest(classes = {StartupApplication.class})
+public class MessageServiceTest {
+
+    @Autowired
+    private MessageService messageService;
+    @Autowired
+    private MessageTemplateService messageTemplateService;
+
+    @Test
+    public void test() {
+        Assert.assertTrue(messageTemplateService.getTemplateVariableList().contains("${手机号}"));
+        Assert.assertTrue(messageTemplateService.getTemplateVariableList().contains("${验证码}"));
+
+        MyVariableObj myVariableObj = new MyVariableObj();
+        myVariableObj.setVcode("876622").setSn("UDYY-9JDF-MNF8-NBS7");
+        Message message = new Message();
+        message.setChannel(Cons.MESSAGE_CHANNEL.SMS.name()).setStatus(Cons.MESSAGE_STATUS.SENDING.name());
+        message.setBusinessType("A").setBusinessCode("B").setSender("admin").setReceiver("123");
+        message.setContent("您的验证码是: ${验证码}，产品序列号是: ${序列号}");
+        messageService.send(message, myVariableObj);
+        Assert.assertTrue(message.getContent().contains("876622"));
+        Assert.assertTrue(message.getContent().contains("UDYY-9JDF-MNF8-NBS7"));
+    }
+
+}
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/annotation/TemplateVariable.java b/diboot-message-starter/src/test/java/diboot/message/test/StartupApplication.java
similarity index 52%
rename from diboot-message-starter/src/main/java/com/diboot/message/annotation/TemplateVariable.java
rename to diboot-message-starter/src/test/java/diboot/message/test/StartupApplication.java
index 0737723e..8aa7ea4b 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/annotation/TemplateVariable.java
+++ b/diboot-message-starter/src/test/java/diboot/message/test/StartupApplication.java
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
+package diboot.message.test;/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -13,27 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.diboot.message.annotation;
 
-import java.lang.annotation.*;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 /**
- * 绑定的变量
- *
- * @author : uu
- * @version v1.0
- * @Date 2021/2/18  19:39
- * @Copyright © diboot.com
+ * @author Administrator
  */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface TemplateVariable {
+@SpringBootApplication
+public class StartupApplication extends SpringBootServletInitializer {
 
-    /**
-     * 绑定变量名称
-     *
-     * @return
-     */
-    String name();
-}
+	public static void main(String[] args) {
+		SpringApplication.run(StartupApplication.class, args);
+	}
+
+}
\ No newline at end of file
diff --git a/diboot-message-starter/src/test/java/diboot/message/test/channel/SMSChannel.java b/diboot-message-starter/src/test/java/diboot/message/test/channel/SMSChannel.java
new file mode 100644
index 00000000..c6d3403d
--- /dev/null
+++ b/diboot-message-starter/src/test/java/diboot/message/test/channel/SMSChannel.java
@@ -0,0 +1,24 @@
+package diboot.message.test.channel;
+
+import com.diboot.message.channel.MessageChannel;
+import com.diboot.message.config.Cons;
+import com.diboot.message.entity.Message;
+
+/**
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/28
+ * Copyright © diboot.com
+ */
+public class SMSChannel implements MessageChannel {
+
+    @Override
+    public String type() {
+        return Cons.MESSAGE_CHANNEL.SMS.name();
+    }
+
+    @Override
+    public void send(Message message) {
+        System.out.println("SMSChannel 发送短信: "+ message.getContent());
+    }
+}
diff --git a/diboot-message-starter/src/test/java/diboot/message/test/config/SpringMvcConfig.java b/diboot-message-starter/src/test/java/diboot/message/test/config/SpringMvcConfig.java
new file mode 100644
index 00000000..a428413f
--- /dev/null
+++ b/diboot-message-starter/src/test/java/diboot/message/test/config/SpringMvcConfig.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.message.test.config;
+
+import com.diboot.message.channel.SimpleEmailChannel;
+import com.diboot.message.entity.BaseUserVariables;
+import com.diboot.message.service.MessageService;
+import com.diboot.message.service.impl.MessageServiceImpl;
+import diboot.message.test.channel.SMSChannel;
+import diboot.message.test.variable.MyVariableObj;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.Arrays;
+
+/***
+ * Spring配置文件
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2019/6/10
+ */
+@TestConfiguration
+@ComponentScan(basePackages={"com.diboot.message"})
+@MapperScan({"com.diboot.message.mapper"})
+public class SpringMvcConfig implements WebMvcConfigurer {
+    private static final Logger log = LoggerFactory.getLogger(SpringMvcConfig.class);
+
+    @Bean
+    public MessageService messageService() {
+        return new MessageServiceImpl(
+                Arrays.asList(new SimpleEmailChannel(), new SMSChannel()),
+                Arrays.asList(BaseUserVariables.class, MyVariableObj.class)
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/diboot-message-starter/src/test/java/diboot/message/test/variable/MyVariableObj.java b/diboot-message-starter/src/test/java/diboot/message/test/variable/MyVariableObj.java
new file mode 100644
index 00000000..4c54122b
--- /dev/null
+++ b/diboot-message-starter/src/test/java/diboot/message/test/variable/MyVariableObj.java
@@ -0,0 +1,27 @@
+package diboot.message.test.variable;
+
+import com.diboot.message.annotation.BindVariable;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/5/28
+ * Copyright © diboot.com
+ */
+@Getter @Setter @Accessors(chain = true)
+public class MyVariableObj implements Serializable {
+
+    private static final long serialVersionUID = -1993000690817844748L;
+
+    @BindVariable(name = "${验证码}")
+    private String vcode;
+
+    @BindVariable(name = "${序列号}")
+    private String sn;
+
+}
diff --git a/diboot-message-starter/src/test/resources/application.properties b/diboot-message-starter/src/test/resources/application.properties
new file mode 100644
index 00000000..a030edc6
--- /dev/null
+++ b/diboot-message-starter/src/test/resources/application.properties
@@ -0,0 +1,21 @@
+server.port=8080
+server.servlet.context-path=/api
+
+#datasource config
+spring.datasource.url=jdbc:mysql://localhost:3306/playground?characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.username=diboot
+spring.datasource.password=123456
+spring.datasource.hikari.maximum-pool-size=5
+spring.datasource.hikari.driver-class-name=com.mysql.cj.jdbc.Driver
+
+spring.main.allow-bean-definition-overriding=true
+
+mybatis-plus.global-config.mapper-locations=classpath*:mapper/*Mapper.xml
+mybatis-plus.global-config.db-config.logic-delete-value=1
+mybatis-plus.global-config.db-config.logic-not-delete-value=0
+
+logging.level.root=DEBUG
+logging.level.org.apache=info
+logging.level.org.hibernate.validator=info
+logging.level.org.springframework=info
+logging.level.com.zaxxer.hikari=info
\ No newline at end of file
-- 
Gitee


From ea4af914c8b4a013ed38a2f1b8e9c6cb3638f703 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 30 May 2022 18:55:33 +0800
Subject: [PATCH 152/195] =?UTF-8?q?*=20=E7=BB=91=E5=AE=9A=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=B8=BB=E8=A1=A8=E6=89=A9=E5=B1=95eq=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/test/binder/vo/FieldBinderVO.java    |  2 +-
 .../core/binding/binder/BaseBinder.java       | 31 +++++++++++++-
 .../core/binding/parser/ConditionManager.java | 32 ++++++++++++---
 .../java/com/diboot/core/util/BeanUtils.java  | 41 +++++++++++++++++++
 4 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java
index b82c3abd..cc7df083 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java
@@ -38,7 +38,7 @@ public class FieldBinderVO extends User {
     private static final long serialVersionUID = 3526115343377985725L;
 
     // 字段关联，相同条件的entity+condition将合并为一条SQL查询
-    @BindField(entity= Department.class, field="name", condition="this.department_id=id AND parent_id IS NOT NULL")
+    @BindField(entity= Department.class, field="name", condition="this.department_id=id AND parent_id IS NOT NULL AND this.gender='M'")
     private String deptName;
 
     // 支持级联字段关联，相同条件的entity+condition将合并为一条SQL查询
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
index a71c59ae..2ed5013d 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
@@ -51,6 +51,10 @@ public abstract class BaseBinder<T> {
      * VO注解对象中的join on对象列名集合
      */
     protected List<String> annoObjJoinCols;
+    /***
+     * VO注解对象中的join on对象附加过滤条件
+     */
+    protected Map<String, Object> annoObjJoinFilterMap;
     /***
      * DO对象中的关联join on对象列名集合
      */
@@ -174,6 +178,29 @@ public abstract class BaseBinder<T> {
         return this;
     }
 
+    /**
+     * join连接条件的附加条件，指定当前VO的取值方法和关联entity的取值方法
+     * @param annoObjectFieldKey 当前VO的取值属性名
+     * @param eqFilterConsVal 常量条件值
+     * @return
+     */
+    public BaseBinder<T> joinOnAndEQ(String annoObjectFieldKey, Object eqFilterConsVal){
+        if(annoObjectFieldKey != null && eqFilterConsVal != null){
+            if(annoObjJoinFilterMap == null){
+                annoObjJoinFilterMap = new HashMap<>();
+            }
+            String fieldName = this.annoObjPropInfo.getFieldByColumn(annoObjectFieldKey);
+            if(fieldName == null && this.annoObjPropInfo.getFieldToColumnMap().containsKey(annoObjectFieldKey)) {
+                fieldName = annoObjectFieldKey;
+            }
+            if(fieldName == null) {
+                throw new InvalidUsageException("字段/列 "+ annoObjectFieldKey +" 不存在");
+            }
+            annoObjJoinFilterMap.put(fieldName, eqFilterConsVal);
+        }
+        return this;
+    }
+
     public BaseBinder<T> andEQ(String fieldName, Object value){
         queryWrapper.eq(toRefObjColumn(fieldName), formatValue(fieldName, value));
         return this;
@@ -283,10 +310,10 @@ public abstract class BaseBinder<T> {
     protected void buildQueryWrapperJoinOn() {
         for (int i = 0; i < annoObjJoinCols.size(); i++) {
             String annoObjJoinOnCol = annoObjJoinCols.get(i);
-            List<?> annoObjectJoinOnList = BeanUtils.collectToList(annoObjectList, toAnnoObjField(annoObjJoinOnCol));
+            List<?> annoObjectJoinOnList = BeanUtils.collectToList(annoObjectList, toAnnoObjField(annoObjJoinOnCol), annoObjJoinFilterMap);
             // 构建查询条件
-            String refObjJoinOnCol = refObjJoinCols.get(i);
             if (V.notEmpty(annoObjectJoinOnList)) {
+                String refObjJoinOnCol = refObjJoinCols.get(i);
                 List<?> unpackAnnoObjectJoinOnList = V.notEmpty(this.splitBy) ? ResultAssembler.unpackValueList(annoObjectJoinOnList, this.splitBy)
                         : annoObjectJoinOnList;
                 queryWrapper.in(refObjJoinOnCol, unpackAnnoObjectJoinOnList);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java
index 16e67b6b..c3974145 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java
@@ -16,10 +16,13 @@
 package com.diboot.core.binding.parser;
 
 import com.diboot.core.binding.binder.BaseBinder;
+import com.diboot.core.exception.InvalidUsageException;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
+import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.schema.Column;
 
@@ -83,12 +86,30 @@ public class ConditionManager extends BaseConditionManager{
                     }
                 }
                 else{
-                    binder.andEQ(annoColumn, express.getRightExpression().toString());
-                    binder.additionalCondition(annoColumn + " = " + express.getRightExpression().toString());
+                    // this.xx = 'abc'
+                    if(isCurrentObjColumn(express.getLeftExpression().toString())){
+                        Object consValue = null;
+                        if(express.getRightExpression() instanceof StringValue) {
+                            consValue = ((StringValue)express.getRightExpression()).getValue();
+                        }
+                        else if(express.getRightExpression() instanceof LongValue) {
+                            consValue = ((LongValue)express.getRightExpression()).getValue();
+                        }
+                        else {
+                            String warnMsg = "不支持的附加条件类型: "+express.getRightExpression().toString();
+                            log.warn(warnMsg);
+                            throw new InvalidUsageException(warnMsg);
+                        }
+                        binder.joinOnAndEQ(annoColumn, consValue);
+                    }
+                    else{
+                        binder.andEQ(annoColumn, express.getRightExpression().toString());
+                        binder.additionalCondition(annoColumn + " = " + express.getRightExpression().toString());
+                    }
                 }
                 continue;
             }
-            if(operator instanceof NotEqualsTo){
+            else if(operator instanceof NotEqualsTo){
                 NotEqualsTo express = (NotEqualsTo)operator;
                 String annoColumn = removeLeftAlias(express.getLeftExpression().toString());
                 if(express.getRightExpression() instanceof Column){
@@ -180,8 +201,9 @@ public class ConditionManager extends BaseConditionManager{
                 }
             }
             else{
-                log.warn("不支持的条件: "+operator.toString());
-                continue;
+                String warnMsg = "不支持的条件: "+operator.toString();
+                log.warn(warnMsg);
+                throw new InvalidUsageException(warnMsg);
             }
             binder.additionalCondition(operator.toString().replaceAll("^\\w+\\.", ""));
         }
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index 0aa69a8a..a8f6df95 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -622,6 +622,47 @@ public class BeanUtils {
         return fieldValueList;
     }
 
+    /***
+     * 从list对象列表中提取指定属性值到新的List
+     * @param objectList
+     * @param getterPropName
+     * @param filterConditions 附加过滤条件
+     * @param <E>
+     * @return
+     */
+    public static <E> List collectToList(List<E> objectList, String getterPropName, Map<String, Object> filterConditions) {
+        if(V.isEmpty(objectList)){
+            return Collections.emptyList();
+        }
+        List fieldValueList = V.isEmpty(filterConditions)? new ArrayList(objectList.size()) : new ArrayList();
+        try{
+            for(E object : objectList){
+                if(V.notEmpty(filterConditions)) {
+                    boolean matched = true;
+                    for(Map.Entry<String, Object> entry : filterConditions.entrySet()) {
+                        Object fieldValue = getProperty(object, entry.getKey());
+                        if(!V.fuzzyEqual(fieldValue, entry.getValue())) {
+                            matched = false;
+                            break;
+                        }
+                    }
+                    if(!matched) {
+                        continue;
+                    }
+                }
+                Object fieldValue = getProperty(object, getterPropName);
+                // E类型中的提取的字段值不需要进行重复判断，如果一定要查重，那应该使用Set代替List
+                if (fieldValue != null) {
+                    fieldValueList.add(fieldValue);
+                }
+            }
+        }
+        catch (Exception e){
+            log.warn("提取属性值异常, getterPropName="+getterPropName, e);
+        }
+        return fieldValueList;
+    }
+
     /***
      * 从list对象列表中提取指定属性值到新的List
      * @param objectList
-- 
Gitee


From b90081fde99f6f7ac56fa6b0d1cacd73895195b9 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 1 Jun 2022 20:04:41 +0800
Subject: [PATCH 153/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/message/entity/BaseUserVariables.java | 12 ++++++++++++
 .../com/diboot/message/entity/MessageTemplate.java   |  7 -------
 .../resources/META-INF/sql/init-message-mysql.sql    |  1 -
 .../resources/META-INF/sql/init-message-oracle.sql   |  2 --
 .../META-INF/sql/init-message-postgresql.sql         |  2 --
 .../META-INF/sql/init-message-sqlserver.sql          |  2 --
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseUserVariables.java b/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseUserVariables.java
index b61169eb..cfdd6300 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseUserVariables.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/entity/BaseUserVariables.java
@@ -42,10 +42,22 @@ public class BaseUserVariables implements Serializable {
     @BindVariable(name = "${用户姓名}")
     private String realName;
 
+    /**
+     * 称呼
+     */
+    @BindVariable(name = "${称呼}")
+    private String title;
+
     /**
      * 手机号
      */
     @BindVariable(name = "${手机号}")
     private String phone;
 
+    /**
+     * 验证码
+     */
+    @BindVariable(name = "${验证码}")
+    private String verificationCode;
+
 }
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/entity/MessageTemplate.java b/diboot-message-starter/src/main/java/com/diboot/message/entity/MessageTemplate.java
index bfccfad6..2480babe 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/entity/MessageTemplate.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/entity/MessageTemplate.java
@@ -83,13 +83,6 @@ public class MessageTemplate extends BaseEntity {
     @TableField()
     private String content;
 
-    /**
-     * 模版变量
-     */
-    @Length(max = 200, message = "模版变量长度应小于200")
-    @TableField()
-    private String variables;
-
     /**
      * 扩展数据
      */
diff --git a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-mysql.sql b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-mysql.sql
index 6895260b..06c2d417 100644
--- a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-mysql.sql
+++ b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-mysql.sql
@@ -6,7 +6,6 @@ CREATE TABLE `message_template` (
   `code` varchar(20) NOT NULL COMMENT '模版编码',
   `title` varchar(100) NOT NULL COMMENT '模版标题',
   `content` varchar(500) NOT NULL COMMENT '模版内容',
-  `variables` varchar(200) DEFAULT NULL COMMENT '模版变量',
   `ext_data` varchar(500) DEFAULT NULL COMMENT '扩展数据',
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '删除标记',
   `create_by` bigint DEFAULT '0' COMMENT '创建人',
diff --git a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-oracle.sql b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-oracle.sql
index cbdd84ee..6be79627 100644
--- a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-oracle.sql
+++ b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-oracle.sql
@@ -6,7 +6,6 @@ CREATE TABLE ${SCHEMA}.message_template (
      code VARCHAR2(20) NOT NULL,
      title VARCHAR2(100) NOT NULL,
      content VARCHAR2(500) NOT NULL,
-     variables varchar(200),
      ext_data VARCHAR2(500),
      is_deleted   NUMBER(1) DEFAULT 0    not null,
      create_time  timestamp default CURRENT_TIMESTAMP   not null,
@@ -21,7 +20,6 @@ comment on column ${SCHEMA}.message_template.app_module is '应用模块';
 comment on column ${SCHEMA}.message_template.code is '模版编码';
 comment on column ${SCHEMA}.message_template.title is '模版标题';
 comment on column ${SCHEMA}.message_template.content is '模版内容';
-comment on column ${SCHEMA}.message_template.variables is '模版变量';
 comment on column ${SCHEMA}.message_template.ext_data is '扩展数据';
 comment on column ${SCHEMA}.message_template.create_by is '创建人';
 comment on column ${SCHEMA}.message_template.update_time is '更新时间';
diff --git a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-postgresql.sql b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-postgresql.sql
index 9c228ec8..8a721781 100644
--- a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-postgresql.sql
+++ b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-postgresql.sql
@@ -6,7 +6,6 @@ CREATE TABLE message_template (
      code VARCHAR(20) NOT NULL,
      title VARCHAR(100) NOT NULL,
      content VARCHAR(500) NOT NULL,
-     variables varchar(200),
      ext_data VARCHAR(500),
      is_deleted   BOOLEAN default FALSE   not null,
      create_by bigint DEFAULT 0 NOT NULL,
@@ -20,7 +19,6 @@ comment on column message_template.app_module is '应用模块';
 comment on column message_template.code is '模版编码';
 comment on column message_template.title is '模版标题';
 comment on column message_template.content is '模版内容';
-comment on column message_template.variables is '模版变量';
 comment on column message_template.ext_data is '扩展数据';
 comment on column message_template.is_deleted is '是否删除';
 comment on column message_template.create_by is '创建人';
diff --git a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-sqlserver.sql b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-sqlserver.sql
index 7f3156f7..a543474a 100644
--- a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-sqlserver.sql
+++ b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-sqlserver.sql
@@ -6,7 +6,6 @@ CREATE TABLE message_template (
      code VARCHAR(20) NOT NULL,
      title VARCHAR(100) NOT NULL,
      content VARCHAR(500) NOT NULL,
-     variables varchar(200),
      ext_data VARCHAR(500),
      is_deleted   tinyint not null DEFAULT 0,
      create_by bigint DEFAULT 0 NOT NULL,
@@ -21,7 +20,6 @@ execute sp_addextendedproperty 'MS_Description', N'应用模块', 'SCHEMA', '${S
 execute sp_addextendedproperty 'MS_Description', N'模版编码', 'SCHEMA', '${SCHEMA}', 'table', message_template, 'column', 'code';
 execute sp_addextendedproperty 'MS_Description', N'模版标题', 'SCHEMA', '${SCHEMA}', 'table', message_template, 'column', 'title';
 execute sp_addextendedproperty 'MS_Description', N'模版内容', 'SCHEMA', '${SCHEMA}', 'table', message_template, 'column', 'content';
-execute sp_addextendedproperty 'MS_Description', N'模版变量', 'SCHEMA', '${SCHEMA}', 'table', message_template, 'column', 'variables';
 execute sp_addextendedproperty 'MS_Description', N'扩展数据', 'SCHEMA', '${SCHEMA}', 'table', message_template, 'column', 'ext_data';
 execute sp_addextendedproperty 'MS_Description', N'是否删除', 'SCHEMA', '${SCHEMA}', 'table', message_template, 'column', 'is_deleted';
 execute sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', '${SCHEMA}', 'table', message_template, 'column', 'create_by';
-- 
Gitee


From 685bf48307d6372cf6684daeb424786311aed870 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 1 Jun 2022 20:05:05 +0800
Subject: [PATCH 154/195] =?UTF-8?q?*=20=E5=8D=87=E7=BA=A7mp=E8=87=B33.5.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index fa2a4d3c..88c8db1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
     <properties>
         <hibernate-validator.version>6.2.3.Final</hibernate-validator.version>
-        <mybatis-plus.version>3.5.1</mybatis-plus.version>
+        <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <okhttp.version>4.9.3</okhttp.version>
         <aspectjweaver.version>1.9.9.1</aspectjweaver.version>
         <commons-io.version>2.11.0</commons-io.version>
-- 
Gitee


From c1921d6a13408d4f2d8d474e0d1a885e081e0098 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 2 Jun 2022 09:13:29 +0800
Subject: [PATCH 155/195] =?UTF-8?q?*=20=E5=AE=8C=E5=96=84BindQuery?=
 =?UTF-8?q?=E4=B8=AD=E9=97=B4=E8=A1=A8=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/core/test/binder/dto/UserDTO.java  |  3 +++
 .../diboot/core/test/query/TestJoinQuery.java | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/UserDTO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/UserDTO.java
index 7dee6794..ef993e6f 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/UserDTO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/UserDTO.java
@@ -58,4 +58,7 @@ public class UserDTO extends User {
     // LEFT JOIN user_role r3m ON self.id = r3m.user_id
     // LEFT JOIN role r3 ON r3m.role_id = r3.id
 
+    @BindQuery(entity = Role.class, field = "id", condition = "this.id=user_role.user_id AND user_role.role_id=id")
+    private Long roleId;
+
 }
\ No newline at end of file
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
index 3bc441c7..b4e05d88 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
@@ -27,6 +27,7 @@ import diboot.core.test.binder.dto.UserDTO;
 import diboot.core.test.binder.entity.Department;
 import diboot.core.test.binder.entity.User;
 import diboot.core.test.binder.service.DepartmentService;
+import diboot.core.test.binder.service.UserService;
 import diboot.core.test.binder.vo.DepartmentVO;
 import diboot.core.test.config.SpringMvcConfig;
 import org.apache.ibatis.jdbc.SQL;
@@ -56,6 +57,9 @@ public class TestJoinQuery {
     @Autowired
     DepartmentService departmentService;
 
+    @Autowired
+    UserService userService;
+
     @Test
     public void testDateCompaire(){
         Department example = departmentService.list(null).get(0);
@@ -210,6 +214,21 @@ public class TestJoinQuery {
         Assert.assertTrue(builderResultList.size() == 1);
     }
 
+    /**
+     * 测试有中间表的动态sql join
+     */
+    @Test
+    public void testDynamicSqlQueryWithMiddleTable2() {
+        // 初始化DTO，测试不涉及关联的情况
+        UserDTO dto = new UserDTO();
+        dto.setRoleId(101L);
+        List<User> builderResultList = QueryBuilder.toDynamicJoinQueryWrapper(dto).queryList(User.class);
+        Assert.assertTrue(builderResultList.size() == 1);
+        QueryWrapper<User> queryWrapper = QueryBuilder.toQueryWrapper(dto);
+        List<User> userList = userService.getEntityList(queryWrapper, new Pagination());
+        Assert.assertTrue(userList.size() > 0);
+    }
+
     @Test
     public void testBindQueryGroup(){
         DepartmentDTO departmentDTO = new DepartmentDTO();
-- 
Gitee


From b01df353bf0582d6009a734bf668375d6691ae38 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 2 Jun 2022 11:14:08 +0800
Subject: [PATCH 156/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/message/service/impl/MessageServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java b/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java
index a16bd416..4bebc67e 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/service/impl/MessageServiceImpl.java
@@ -119,7 +119,7 @@ public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message>
             message.setStatus("SCHEDULE");
         }
         else if(V.isEmpty(message.getStatus())){
-            message.setStatus(Cons.MESSAGE_STATUS.SENDING.name());
+            message.setStatus(Cons.MESSAGE_STATUS.PENDING.name());
         }
         // 创建Message
         boolean success = createEntity(message);
-- 
Gitee


From e81750fccab0f8a831a301087abac7ca3e2d1af0 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 2 Jun 2022 12:18:11 +0800
Subject: [PATCH 157/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/diboot/message/test/MessageServiceTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java b/diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java
index 04d6a607..5c6a0af8 100644
--- a/diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java
+++ b/diboot-message-starter/src/test/java/diboot/message/test/MessageServiceTest.java
@@ -38,7 +38,7 @@ public class MessageServiceTest {
         MyVariableObj myVariableObj = new MyVariableObj();
         myVariableObj.setVcode("876622").setSn("UDYY-9JDF-MNF8-NBS7");
         Message message = new Message();
-        message.setChannel(Cons.MESSAGE_CHANNEL.SMS.name()).setStatus(Cons.MESSAGE_STATUS.SENDING.name());
+        message.setChannel(Cons.MESSAGE_CHANNEL.SMS.name()).setStatus(Cons.MESSAGE_STATUS.PENDING.name());
         message.setBusinessType("A").setBusinessCode("B").setSender("admin").setReceiver("123");
         message.setContent("您的验证码是: ${验证码}，产品序列号是: ${序列号}");
         messageService.send(message, myVariableObj);
-- 
Gitee


From c9436cb7966c65bed8247dcbe2b11ac9f50c57be Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 2 Jun 2022 13:01:27 +0800
Subject: [PATCH 158/195] =?UTF-8?q?*=20=E7=BB=91=E5=AE=9A=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=B8=BB=E8=A1=A8=E6=89=A9=E5=B1=95=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=8C=E6=94=AF=E6=8C=81EQ,IN,LIKE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binder/TestLeadExtConditionBinder.java    |  83 +++++++++++++++
 .../diboot/core/test/binder/vo/UserExtVO.java |  61 +++++++++++
 .../com/diboot/core/binding/QueryBuilder.java |  14 +++
 .../core/binding/binder/BaseBinder.java       | 100 ++++++++++++++++--
 .../core/binding/binder/EntityBinder.java     |   4 +-
 .../core/binding/binder/EntityListBinder.java |   4 +-
 .../core/binding/binder/FieldBinder.java      |   4 +-
 .../core/binding/binder/FieldListBinder.java  |   4 +-
 .../core/binding/parser/ConditionManager.java |  95 +++++++++++++----
 .../core/binding/parser/FieldComparison.java  |  50 +++++++++
 .../diboot/core/binding/query/Comparison.java |   1 +
 .../java/com/diboot/core/util/BeanUtils.java  |  45 --------
 12 files changed, 388 insertions(+), 77 deletions(-)
 create mode 100644 diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java
 create mode 100644 diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/binding/parser/FieldComparison.java

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java
new file mode 100644
index 00000000..8ba5a02f
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestLeadExtConditionBinder.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diboot.core.binding.Binder;
+import com.diboot.core.util.JSON;
+import com.diboot.core.util.V;
+import diboot.core.test.StartupApplication;
+import diboot.core.test.binder.entity.User;
+import diboot.core.test.binder.service.UserService;
+import diboot.core.test.binder.vo.FieldBinderVO;
+import diboot.core.test.binder.vo.UserExtVO;
+import diboot.core.test.config.SpringMvcConfig;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+/**
+ * 测试主表扩展条件
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/6/2
+ * Copyright © diboot.com
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SpringMvcConfig.class})
+@SpringBootTest(classes = {StartupApplication.class})
+public class TestLeadExtConditionBinder {
+    @Autowired
+    UserService userService;
+
+    @Test
+    public void testBinder(){
+        // 加载测试数据
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+        List<User> userList = userService.getEntityList(queryWrapper);
+        // 自动绑定
+        List<UserExtVO> voList = Binder.convertAndBindRelations(userList, UserExtVO.class);
+        // 验证绑定结果
+        Assert.assertTrue(V.notEmpty(voList));
+        for(UserExtVO vo : voList){
+            if(vo.getGender().equals("F")){
+                Assert.assertNotNull(vo.getDeptName());
+                Assert.assertNotNull(vo.getDeptNameLike());
+                Assert.assertNotNull(vo.getDeptNameIn());
+            }
+            else {
+                Assert.assertNull(vo.getDeptName());
+                Assert.assertNull(vo.getDeptNameLike());
+                Assert.assertNull(vo.getDeptNameIn());
+            }
+            if(vo.getDepartmentId().equals(10002l)) {
+                Assert.assertNotNull(vo.getDeptId());
+                Assert.assertNotNull(vo.getRoleCodes());
+            }
+            else{
+                Assert.assertNull(vo.getDeptId());
+            }
+            System.out.println(JSON.stringify(vo));
+        }
+    }
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java
new file mode 100644
index 00000000..be86b4e4
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserExtVO.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.vo;
+
+import com.diboot.core.binding.annotation.BindField;
+import com.diboot.core.binding.annotation.BindFieldList;
+import com.diboot.core.binding.query.BindQuery;
+import com.diboot.core.binding.query.Comparison;
+import com.diboot.core.binding.query.Strategy;
+import diboot.core.test.binder.entity.Department;
+import diboot.core.test.binder.entity.Organization;
+import diboot.core.test.binder.entity.Role;
+import diboot.core.test.binder.entity.User;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * User DTO
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2018/12/27
+ */
+@Getter
+@Setter
+public class UserExtVO extends User {
+
+    // 字段关联+主从表附属条件
+    @BindField(entity= Department.class, field = "name", condition="this.department_id=id AND this.gender='F' AND parent_id > 0")
+    private String deptName;
+
+    // 字段关联+主从表附属条件
+    @BindField(entity= Department.class, field = "name", condition="this.department_id=id AND this.gender like 'F%' AND parent_id > 0")
+    private String deptNameLike;
+
+    // 字段关联+主从表附属条件
+    @BindField(entity= Department.class, field = "name", condition="this.department_id=id AND this.gender IN('F', 'U') AND parent_id > 0")
+    private String deptNameIn;
+
+    // 字段关联
+    @BindField(entity= Department.class, field = "id", condition="this.department_id=id AND parent_id >= 0 AND this.department_id=10002") //
+    private Long deptId;
+
+    @BindFieldList(entity = Role.class, field = "code", condition = "this.id=user_role.user_id AND user_role.role_id=id AND this.department_id IN (10002,10001)")
+    private List<String> roleCodes;
+
+}
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
index 5933fb68..897f7d26 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
@@ -252,6 +252,20 @@ public class QueryBuilder {
                     log.warn("字段类型错误：IN仅支持List及数组.");
                 }
                 break;
+            case NOT_IN:
+                if (value.getClass().isArray()) {
+                    Object[] valueArray = (Object[]) value;
+                    if (valueArray.length == 1) {
+                        wrapper.ne(columnName, valueArray[0]);
+                    } else if (valueArray.length >= 2) {
+                        wrapper.notIn(columnName, valueArray);
+                    }
+                } else if (value instanceof Collection) {
+                    wrapper.notIn(!((Collection) value).isEmpty(), columnName, (Collection<?>) value);
+                } else {
+                    log.warn("字段类型错误：NOT_IN仅支持List及数组.");
+                }
+                break;
             case CONTAINS:
             case LIKE:
                 wrapper.like(columnName, value);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
index 2ed5013d..a74dc488 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
@@ -23,8 +23,10 @@ import com.diboot.core.binding.binder.remote.RemoteBindDTO;
 import com.diboot.core.binding.cache.BindingCacheManager;
 import com.diboot.core.binding.helper.ResultAssembler;
 import com.diboot.core.binding.helper.WrapperHelper;
+import com.diboot.core.binding.parser.FieldComparison;
 import com.diboot.core.binding.parser.MiddleTable;
 import com.diboot.core.binding.parser.PropInfo;
+import com.diboot.core.binding.query.Comparison;
 import com.diboot.core.config.BaseConfig;
 import com.diboot.core.exception.InvalidUsageException;
 import com.diboot.core.service.BaseService;
@@ -54,7 +56,7 @@ public abstract class BaseBinder<T> {
     /***
      * VO注解对象中的join on对象附加过滤条件
      */
-    protected Map<String, Object> annoObjJoinFilterMap;
+    protected List<FieldComparison> annoObjJoinFieldComparisons;
     /***
      * DO对象中的关联join on对象列名集合
      */
@@ -184,10 +186,10 @@ public abstract class BaseBinder<T> {
      * @param eqFilterConsVal 常量条件值
      * @return
      */
-    public BaseBinder<T> joinOnAndEQ(String annoObjectFieldKey, Object eqFilterConsVal){
+    public BaseBinder<T> joinOnFieldComparison(String annoObjectFieldKey, Comparison comparison, Object eqFilterConsVal){
         if(annoObjectFieldKey != null && eqFilterConsVal != null){
-            if(annoObjJoinFilterMap == null){
-                annoObjJoinFilterMap = new HashMap<>();
+            if(annoObjJoinFieldComparisons == null){
+                annoObjJoinFieldComparisons = new ArrayList<>(4);
             }
             String fieldName = this.annoObjPropInfo.getFieldByColumn(annoObjectFieldKey);
             if(fieldName == null && this.annoObjPropInfo.getFieldToColumnMap().containsKey(annoObjectFieldKey)) {
@@ -196,7 +198,7 @@ public abstract class BaseBinder<T> {
             if(fieldName == null) {
                 throw new InvalidUsageException("字段/列 "+ annoObjectFieldKey +" 不存在");
             }
-            annoObjJoinFilterMap.put(fieldName, eqFilterConsVal);
+            annoObjJoinFieldComparisons.add(new FieldComparison(fieldName, comparison, eqFilterConsVal));
         }
         return this;
     }
@@ -310,7 +312,7 @@ public abstract class BaseBinder<T> {
     protected void buildQueryWrapperJoinOn() {
         for (int i = 0; i < annoObjJoinCols.size(); i++) {
             String annoObjJoinOnCol = annoObjJoinCols.get(i);
-            List<?> annoObjectJoinOnList = BeanUtils.collectToList(annoObjectList, toAnnoObjField(annoObjJoinOnCol), annoObjJoinFilterMap);
+            List<?> annoObjectJoinOnList = BeanUtils.collectToList(getMatchedAnnoObjectList(), toAnnoObjField(annoObjJoinOnCol));
             // 构建查询条件
             if (V.notEmpty(annoObjectJoinOnList)) {
                 String refObjJoinOnCol = refObjJoinCols.get(i);
@@ -324,6 +326,14 @@ public abstract class BaseBinder<T> {
         }
     }
 
+    /**
+     * 获取匹配的
+     * @return
+     */
+    protected List<?> getMatchedAnnoObjectList() {
+        return filterObjectList(annoObjectList, annoObjJoinFieldComparisons);
+    }
+
     /**
      * 简化select列，仅select必需列
      */
@@ -540,4 +550,82 @@ public abstract class BaseBinder<T> {
         return value;
     }
 
+    /***
+     * 筛选list
+     * @param objectList
+     * @param filterConditions 附加过滤条件
+     * @param <E>
+     * @return
+     */
+    private <E> List filterObjectList(List<E> objectList, List<FieldComparison> filterConditions) {
+        if(V.isEmpty(objectList)){
+            return Collections.emptyList();
+        }
+        if(V.isEmpty(filterConditions)) {
+            return objectList;
+        }
+        List<E> newObjectList = new ArrayList<>();
+        for(E object : objectList){
+            boolean matched = true;
+            for(FieldComparison fieldCompare : filterConditions) {
+                Object fieldValue = BeanUtils.getProperty(object, fieldCompare.getFieldName());
+                if(Comparison.EQ.name().equals(fieldCompare.getComparison().name())){
+                    if(!V.fuzzyEqual(fieldValue, fieldCompare.getValue())) {
+                        matched = false;
+                        break;
+                    }
+                }
+                else if(Comparison.NOT_EQ.name().equals(fieldCompare.getComparison().name())) {
+                    if(V.fuzzyEqual(fieldValue, fieldCompare.getValue())) {
+                        matched = false;
+                        break;
+                    }
+                }
+                else if(Comparison.CONTAINS.name().equals(fieldCompare.getComparison().name())){
+                    if(!S.valueOf(fieldValue).contains((String)fieldCompare.getValue())) {
+                        matched = false;
+                        break;
+                    }
+                }
+                else if(Comparison.IN.name().equals(fieldCompare.getComparison().name())) {
+                    List inValues = (List)fieldCompare.getValue();
+                    boolean in = false;
+                    for(Object value : inValues) {
+                        if(V.fuzzyEqual(fieldValue, value)) {
+                            in = true;
+                            break;
+                        }
+                    }
+                    if(!in) {
+                        matched = false;
+                        break;
+                    }
+                }
+                else if(Comparison.NOT_IN.name().equals(fieldCompare.getComparison().name())) {
+                    List notInValues = (List)fieldCompare.getValue();
+                    boolean notIn = true;
+                    for(Object value : notInValues) {
+                        if(V.fuzzyEqual(fieldValue, value)) {
+                            notIn = false;
+                            break;
+                        }
+                    }
+                    if(!notIn) {
+                        matched = false;
+                        break;
+                    }
+                }
+                else{
+                    log.warn("暂不支持此类型对比: {}", fieldCompare.getComparison().name());
+                }
+            }
+            if(!matched) {
+                log.debug("{} 不匹配 {}， 忽略收集该字段", object, filterConditions);
+                continue;
+            }
+            newObjectList.add(object);
+        }
+        return newObjectList;
+    }
+
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityBinder.java
index 9cf91f06..f68009e7 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityBinder.java
@@ -121,7 +121,7 @@ public class EntityBinder<T> extends BaseBinder<T> {
             }
             if(V.notEmpty(entityList)){
                 Map<String, Object> valueEntityMap = this.buildMatchKey2EntityMap(entityList);
-                ResultAssembler.bindPropValue(annoObjectField, annoObjectList, getAnnoObjJoinFlds(), valueEntityMap, null);
+                ResultAssembler.bindPropValue(annoObjectField, super.getMatchedAnnoObjectList(), getAnnoObjJoinFlds(), valueEntityMap, null);
             }
         }
         // 通过中间表关联Entity
@@ -174,7 +174,7 @@ public class EntityBinder<T> extends BaseBinder<T> {
                 }
             }
             // 绑定结果
-            ResultAssembler.bindEntityPropValue(annoObjectField, annoObjectList, middleTable.getTrunkObjColMapping(), valueEntityMap, getAnnoObjColumnToFieldMap());
+            ResultAssembler.bindEntityPropValue(annoObjectField, super.getMatchedAnnoObjectList(), middleTable.getTrunkObjColMapping(), valueEntityMap, getAnnoObjColumnToFieldMap());
         }
     }
 
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
index ec1d8720..40ef7977 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
@@ -85,7 +85,7 @@ public class EntityListBinder<T> extends EntityBinder<T> {
             if(V.notEmpty(entityList)){
                 valueEntityListMap = this.buildMatchKey2EntityListMap(entityList);
             }
-            ResultAssembler.bindPropValue(annoObjectField, annoObjectList, getAnnoObjJoinFlds(), valueEntityListMap, this.splitBy);
+            ResultAssembler.bindPropValue(annoObjectField, super.getMatchedAnnoObjectList(), getAnnoObjJoinFlds(), valueEntityListMap, this.splitBy);
         }
         else{
             if(refObjJoinCols.size() > 1){
@@ -157,7 +157,7 @@ public class EntityListBinder<T> extends EntityBinder<T> {
                 valueEntityListMap.put(entry.getKey(), valueList);
             }
             // 绑定结果
-            ResultAssembler.bindEntityPropValue(annoObjectField, annoObjectList, middleTable.getTrunkObjColMapping(), valueEntityListMap, getAnnoObjColumnToFieldMap());
+            ResultAssembler.bindEntityPropValue(annoObjectField, super.getMatchedAnnoObjectList(), middleTable.getTrunkObjColMapping(), valueEntityListMap, getAnnoObjColumnToFieldMap());
         }
     }
 
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
index 43410f11..4a903e9c 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
@@ -126,7 +126,7 @@ public class FieldBinder<T> extends BaseBinder<T> {
             // 将结果list转换成map
             Map<String, Map<String, Object>> key2DataMap = this.buildMatchKey2ResultMap(mapList);
             // 遍历list并赋值
-            for(Object annoObject : annoObjectList){
+            for(Object annoObject : super.getMatchedAnnoObjectList()){
                 String matchKey = buildMatchKey(annoObject);
                 setFieldValueToTrunkObj(key2DataMap, annoObject, matchKey);
             }
@@ -165,7 +165,7 @@ public class FieldBinder<T> extends BaseBinder<T> {
             // 将结果list转换成map
             Map<String, Map<String, Object>> key2DataMap = this.buildMatchKey2ResultMap(mapList);
             // 遍历list并赋值
-            for(Object annoObject : annoObjectList){
+            for(Object annoObject : super.getMatchedAnnoObjectList()){
                 String matchKey = buildMatchKey(annoObject, middleTableResultMap);
                 setFieldValueToTrunkObj(key2DataMap, annoObject, matchKey);
             }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
index 86bd5ca2..bf092498 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
@@ -91,7 +91,7 @@ public class FieldListBinder<T> extends FieldBinder<T> {
                 valueEntityListMap = this.buildMatchKey2FieldListMap(entityList);
             }
             // 遍历list并赋值
-            ResultAssembler.bindFieldListPropValue(annoObjectList, getAnnoObjJoinFlds(), valueEntityListMap,
+            ResultAssembler.bindFieldListPropValue(super.getMatchedAnnoObjectList(), getAnnoObjJoinFlds(), valueEntityListMap,
                     annoObjectSetterPropNameList, referencedGetterFieldNameList, this.splitBy);
         }
         // 通过中间表关联
@@ -159,7 +159,7 @@ public class FieldListBinder<T> extends FieldBinder<T> {
                 valueEntityListMap.put(entry.getKey(), valueList);
             }
             // 遍历list并赋值
-            bindPropValue(annoObjectList, middleTable.getTrunkObjColMapping(), valueEntityListMap);
+            bindPropValue(super.getMatchedAnnoObjectList(), middleTable.getTrunkObjColMapping(), valueEntityListMap);
         }
     }
 
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java
index c3974145..a511651a 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionManager.java
@@ -16,6 +16,7 @@
 package com.diboot.core.binding.parser;
 
 import com.diboot.core.binding.binder.BaseBinder;
+import com.diboot.core.binding.query.Comparison;
 import com.diboot.core.exception.InvalidUsageException;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
@@ -27,6 +28,7 @@ import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.schema.Column;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -88,19 +90,8 @@ public class ConditionManager extends BaseConditionManager{
                 else{
                     // this.xx = 'abc'
                     if(isCurrentObjColumn(express.getLeftExpression().toString())){
-                        Object consValue = null;
-                        if(express.getRightExpression() instanceof StringValue) {
-                            consValue = ((StringValue)express.getRightExpression()).getValue();
-                        }
-                        else if(express.getRightExpression() instanceof LongValue) {
-                            consValue = ((LongValue)express.getRightExpression()).getValue();
-                        }
-                        else {
-                            String warnMsg = "不支持的附加条件类型: "+express.getRightExpression().toString();
-                            log.warn(warnMsg);
-                            throw new InvalidUsageException(warnMsg);
-                        }
-                        binder.joinOnAndEQ(annoColumn, consValue);
+                        Object consValue = extractConsValue(express.getRightExpression());
+                        binder.joinOnFieldComparison(annoColumn, Comparison.EQ, consValue);
                     }
                     else{
                         binder.andEQ(annoColumn, express.getRightExpression().toString());
@@ -116,7 +107,14 @@ public class ConditionManager extends BaseConditionManager{
                     binder.andApply(annoColumn + " != " + express.getRightExpression().toString());
                 }
                 else{
-                    binder.andNE(annoColumn, express.getRightExpression().toString());
+                    // this.xx != 'abc'
+                    if(isCurrentObjColumn(express.getLeftExpression().toString())){
+                        Object consValue = extractConsValue(express.getRightExpression());
+                        binder.joinOnFieldComparison(annoColumn, Comparison.NOT_EQ, consValue);
+                    }
+                    else {
+                        binder.andNE(annoColumn, express.getRightExpression().toString());
+                    }
                 }
             }
             else if(operator instanceof GreaterThan){
@@ -173,10 +171,24 @@ public class ConditionManager extends BaseConditionManager{
                 InExpression express = (InExpression)operator;
                 String annoColumn = removeLeftAlias(express.getLeftExpression().toString());
                 if(express.isNot() == false){
-                    binder.andApply(annoColumn + " IN " + express.getRightItemsList().toString());
+                    // this.xx in ('abc')
+                    if(isCurrentObjColumn(express.getLeftExpression().toString())){
+                        List<Object> consValues = extractConsValues(express.getRightItemsList());
+                        binder.joinOnFieldComparison(annoColumn, Comparison.IN, consValues);
+                    }
+                    else {
+                        binder.andApply(annoColumn + " IN " + express.getRightItemsList().toString());
+                    }
                 }
                 else{
-                    binder.andApply(annoColumn + " NOT IN " + express.getRightItemsList().toString());
+                    // this.xx not in ('abc')
+                    if(isCurrentObjColumn(express.getLeftExpression().toString())){
+                        List<Object> consValues = extractConsValues(express.getRightItemsList());
+                        binder.joinOnFieldComparison(annoColumn, Comparison.NOT_IN, consValues);
+                    }
+                    else {
+                        binder.andApply(annoColumn + " NOT IN " + express.getRightItemsList().toString());
+                    }
                 }
             }
             else if(operator instanceof Between){
@@ -194,7 +206,15 @@ public class ConditionManager extends BaseConditionManager{
                 String annoColumn = removeLeftAlias(express.getLeftExpression().toString());
                 String value = express.getRightExpression().toString();
                 if(express.isNot() == false){
-                    binder.andLike(annoColumn, value);
+                    // this.xx != 'abc'
+                    if(isCurrentObjColumn(express.getLeftExpression().toString())){
+                        StringValue valueObj = (StringValue) express.getRightExpression();
+                        String consValue = S.replace(valueObj.getValue(), "%", "");
+                        binder.joinOnFieldComparison(annoColumn, Comparison.CONTAINS, consValue);
+                    }
+                    else {
+                        binder.andLike(annoColumn, value);
+                    }
                 }
                 else{
                     binder.andNotLike(annoColumn, value);
@@ -348,4 +368,43 @@ public class ConditionManager extends BaseConditionManager{
         return annoColumn;
     }
 
-}
+    /**
+     * 提取常量
+     * @param expression
+     * @return
+     */
+    private static Object extractConsValue(Expression expression) {
+        Object consValue = null;
+        if(expression instanceof StringValue) {
+            consValue = ((StringValue)expression).getValue();
+        }
+        else if(expression instanceof LongValue) {
+            consValue = ((LongValue)expression).getValue();
+        }
+        else {
+            String warnMsg = "不支持的附加条件类型: " + expression.toString();
+            log.warn(warnMsg);
+            throw new InvalidUsageException(warnMsg);
+        }
+        return consValue;
+    }
+
+    /**
+     * 提取常量值
+     * @param itemsList
+     * @return
+     */
+    private static List<Object> extractConsValues(ItemsList itemsList) {
+        if(itemsList instanceof ExpressionList) {
+            List<Expression> expressions = ((ExpressionList)itemsList).getExpressions();
+            List list = new ArrayList();
+            for(Expression expression : expressions){
+                list.add(extractConsValue(expression));
+            }
+            return list;
+        }
+        log.warn("不支持的附加条件写法: {}", itemsList.toString());
+        return Collections.emptyList();
+    }
+
+}
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/FieldComparison.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/FieldComparison.java
new file mode 100644
index 00000000..84405731
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/FieldComparison.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.binding.parser;
+
+import com.diboot.core.binding.query.Comparison;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 字段
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/6/2
+ * Copyright © diboot.com
+ */
+@Getter @Setter @Accessors(chain = true)
+public class FieldComparison implements Serializable {
+    private static final long serialVersionUID = -1080962768714815036L;
+
+    private String fieldName;
+
+    private Comparison comparison;
+
+    private Object value;
+
+    public FieldComparison(){}
+
+    public FieldComparison(String fieldName, Comparison comparison, Object value) {
+        this.fieldName = fieldName;
+        this.comparison = comparison;
+        this.value = value;
+    }
+
+}
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/query/Comparison.java b/diboot-core/src/main/java/com/diboot/core/binding/query/Comparison.java
index 5d8d8bd0..293b6f75 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/query/Comparison.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/query/Comparison.java
@@ -40,4 +40,5 @@ public enum Comparison {
     BETWEEN_END, //介于之前
 
     NOT_EQ,  //不等于
+    NOT_IN // 不在...内
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index a8f6df95..b67cec6d 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -16,7 +16,6 @@
 package com.diboot.core.util;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.diboot.core.binding.cache.BindingCacheManager;
 import com.diboot.core.config.Cons;
 import com.diboot.core.converter.*;
 import com.diboot.core.data.copy.AcceptAnnoCopier;
@@ -31,11 +30,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.PropertyAccessorFactory;
-import org.springframework.boot.convert.ApplicationConversionService;
-import org.springframework.context.support.ConversionServiceFactoryBean;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.util.ReflectionUtils;
 
 import java.io.Serializable;
@@ -622,47 +618,6 @@ public class BeanUtils {
         return fieldValueList;
     }
 
-    /***
-     * 从list对象列表中提取指定属性值到新的List
-     * @param objectList
-     * @param getterPropName
-     * @param filterConditions 附加过滤条件
-     * @param <E>
-     * @return
-     */
-    public static <E> List collectToList(List<E> objectList, String getterPropName, Map<String, Object> filterConditions) {
-        if(V.isEmpty(objectList)){
-            return Collections.emptyList();
-        }
-        List fieldValueList = V.isEmpty(filterConditions)? new ArrayList(objectList.size()) : new ArrayList();
-        try{
-            for(E object : objectList){
-                if(V.notEmpty(filterConditions)) {
-                    boolean matched = true;
-                    for(Map.Entry<String, Object> entry : filterConditions.entrySet()) {
-                        Object fieldValue = getProperty(object, entry.getKey());
-                        if(!V.fuzzyEqual(fieldValue, entry.getValue())) {
-                            matched = false;
-                            break;
-                        }
-                    }
-                    if(!matched) {
-                        continue;
-                    }
-                }
-                Object fieldValue = getProperty(object, getterPropName);
-                // E类型中的提取的字段值不需要进行重复判断，如果一定要查重，那应该使用Set代替List
-                if (fieldValue != null) {
-                    fieldValueList.add(fieldValue);
-                }
-            }
-        }
-        catch (Exception e){
-            log.warn("提取属性值异常, getterPropName="+getterPropName, e);
-        }
-        return fieldValueList;
-    }
-
     /***
      * 从list对象列表中提取指定属性值到新的List
      * @param objectList
-- 
Gitee


From e8fd9b813d5ee19444c9809eb2fa287d78fc8d8f Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 2 Jun 2022 16:10:19 +0800
Subject: [PATCH 159/195] =?UTF-8?q?*=20=E9=80=82=E9=85=8DDM=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/META-INF/sql/init-core-dm.sql   |  38 ++
 .../core/service/impl/BaseServiceImpl.java    |  17 +-
 .../resources/META-INF/sql/init-file-dm.sql   |  37 ++
 .../META-INF/sql/init-file-oracle.sql         |  73 ++--
 .../META-INF/sql/init-file-postgresql.sql     |  73 ++--
 .../META-INF/sql/init-file-sqlserver.sql      |  73 ++--
 .../resources/META-INF/sql/init-iam-dm.sql    | 370 ++++++++++++++++++
 .../META-INF/sql/init-iam-oracle.sql          |   1 +
 .../message/channel/SimpleEmailChannel.java   |   2 +-
 .../java/com/diboot/message/config/Cons.java  |   9 +-
 .../META-INF/sql/init-message-dm.sql          |  74 ++++
 .../resources/META-INF/sql/init-mobile-dm.sql |  47 +++
 .../META-INF/sql/init-scheduler-dm.sql        |  69 ++++
 13 files changed, 754 insertions(+), 129 deletions(-)
 create mode 100644 diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql
 create mode 100644 diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
 create mode 100644 diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql
 create mode 100644 diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql
 create mode 100644 diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql
 create mode 100644 diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql

diff --git a/diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql b/diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql
new file mode 100644
index 00000000..35249147
--- /dev/null
+++ b/diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql
@@ -0,0 +1,38 @@
+-- 字典表
+create table ${SCHEMA}.dictionary (
+    id                 BIGINT identity ( 10000,1) primary key,
+    parent_id          BIGINT           default 0  not null,
+    tenant_id          BIGINT           default 0  not null,
+    app_module          VARCHAR(50),
+    type               VARCHAR(50)          not null,
+    item_name          VARCHAR(100)         not null,
+    item_value         VARCHAR(100),
+    description        VARCHAR(100),
+    extdata            VARCHAR(200),
+    sort_id            SMALLINT           default 99  not null,
+    is_deletable       BIT          default 1  not null,
+    is_editable        BIT          default 1  not null,
+    is_deleted         BIT          default 0  not null,
+    create_time        DATETIME    null
+);
+-- 添加备注
+comment on column ${SCHEMA}.dictionary.id is 'ID';
+comment on column ${SCHEMA}.dictionary.parent_id is '父ID';
+comment on column ${SCHEMA}.dictionary.tenant_id is '租户ID';
+comment on column ${SCHEMA}.dictionary.app_module is '应用模块';
+comment on column ${SCHEMA}.dictionary.type is '字典类型';
+comment on column ${SCHEMA}.dictionary.item_name is '显示名';
+comment on column ${SCHEMA}.dictionary.item_value is '存储值';
+comment on column ${SCHEMA}.dictionary.description is '备注';
+comment on column ${SCHEMA}.dictionary.extdata is '扩展JSON';
+comment on column ${SCHEMA}.dictionary.sort_id is '排序号';
+comment on column ${SCHEMA}.dictionary.is_editable is '是否可改';
+comment on column ${SCHEMA}.dictionary.is_deletable is '是否可删';
+comment on column ${SCHEMA}.dictionary.is_deleted is '删除标记';
+comment on column ${SCHEMA}.dictionary.create_time is '创建时间';
+
+comment on table ${SCHEMA}.dictionary is '数据字典';
+
+-- 创建索引
+create index idx_directory on ${SCHEMA}.dictionary (type, item_value);
+create index idx_directory_tenant on ${SCHEMA}.dictionary(tenant_id);
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java b/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
index e100b6ce..4de04498 100644
--- a/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
+++ b/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
@@ -312,23 +312,20 @@ public class BaseServiceImpl<M extends BaseCrudMapper<T>, T> extends ServiceImpl
 		} else {
 			selectOld.select(followerColumnName);
 		}
-		List<Map<String, Object>> oldMap;
 
 		IService<R> iService = entityInfo.getService();
 		BaseMapper<R> baseMapper = entityInfo.getBaseMapper();
-		if (iService != null) {
-			oldMap = iService.listMaps(selectOld);
-		} else {
-			oldMap = baseMapper.selectMaps(selectOld);
-		}
-
+		List<R> oldEntityList = (iService != null)? iService.list(selectOld) : baseMapper.selectList(selectOld);
 		// 删除失效关联
 		List<Serializable> delIds = new ArrayList<>();
-		for (Map<String, Object> map : oldMap) {
-			if (V.notEmpty(followerIdList) && followerIdList.remove((Serializable) map.get(followerColumnName))) {
+		for (R entity : oldEntityList) {
+			if (V.notEmpty(followerIdList) && followerIdList.remove(BeanUtils.getProperty(entity, followerFieldName))) {
 				continue;
 			}
-			delIds.add((Serializable) map.get(isExistPk ? entityInfo.getIdColumn() : followerColumnName));
+			Serializable id = (Serializable) BeanUtils.getProperty(entity, isExistPk ? entityInfo.getPropInfo().getIdFieldName() : followerFieldName);
+			if(id != null) {
+				delIds.add(id);
+			}
 		}
 		if (!delIds.isEmpty()) {
 			if (isExistPk) {
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
new file mode 100644
index 00000000..f9539071
--- /dev/null
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
@@ -0,0 +1,37 @@
+-- 文件记录
+CREATE TABLE ${SCHEMA}.file_record
+(
+    uuid          VARCHAR(32) NOT NULL primary key,
+    tenant_id     BIGINT DEFAULT 0 NOT NULL,
+    app_module    VARCHAR(50),
+    md5           VARCHAR(32),
+    file_name     VARCHAR(100) NOT NULL,
+    file_type     VARCHAR(20),
+    file_size     BIGINT NOT NULL,
+    storage_path  VARCHAR(200) NOT NULL,
+    access_url    VARCHAR(200),
+    thumbnail_url VARCHAR(200),
+    description   VARCHAR(100),
+    is_deleted    BIT DEFAULT 0 not null,
+    create_by     BIGINT DEFAULT 0,
+    create_time   timestamp DEFAULT CURRENT_TIMESTAMP not null
+);
+-- 添加备注
+comment on column ${SCHEMA}.file_record.uuid is 'UUID';
+comment on column ${SCHEMA}.file_record.tenant_id is '租户ID';
+comment on column ${SCHEMA}.file_record.app_module is '应用模块';
+comment on column ${SCHEMA}.file_record.md5 is 'MD5标识';
+comment on column ${SCHEMA}.file_record.file_name is '文件名';
+comment on column ${SCHEMA}.file_record.file_type is '文件类型';
+comment on column ${SCHEMA}.file_record.file_size is '文件大小';
+comment on column ${SCHEMA}.file_record.storage_path is '存储路径';
+comment on column ${SCHEMA}.file_record.access_url is '访问地址';
+comment on column ${SCHEMA}.file_record.thumbnail_url is '缩略图地址';
+comment on column ${SCHEMA}.file_record.description is '备注';
+comment on column ${SCHEMA}.file_record.is_deleted is '删除标记';
+comment on column ${SCHEMA}.file_record.create_by is '创建人';
+comment on column ${SCHEMA}.file_record.create_time is '创建时间';
+comment on table ${SCHEMA}.file_record is '文件记录';
+-- 索引
+create index idx_file_record_md5 on ${SCHEMA}.file_record (md5);
+create index idx_file_record_tenant on ${SCHEMA}.file_record (tenant_id);
\ No newline at end of file
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql
index 4e1804ea..e39a7e4a 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql
@@ -1,39 +1,38 @@
--- 上传文件表
-CREATE TABLE ${SCHEMA}.upload_file (
-     uuid VARCHAR2(32) NOT NULL,
-     tenant_id          NUMBER(20)           default 0  not null,
-     app_module          VARCHAR2(50),
-     rel_obj_type VARCHAR2(50),
-     rel_obj_id VARCHAR2(32),
-     rel_obj_field VARCHAR2(50),
-     file_name VARCHAR2(100) NOT NULL,
-     storage_path VARCHAR2(200) NOT NULL,
-     access_url VARCHAR2(200),
-     file_type VARCHAR2(20),
-     data_count NUMBER(9)   DEFAULT 0 not null,
-     description VARCHAR2(100),
-     is_deleted NUMBER(1)   DEFAULT 0 not null,
-     create_by NUMBER(20)   default 0 ,
-     create_time timestamp   default CURRENT_TIMESTAMP not null,
-     constraint PK_upload_file primary key (uuid)
+-- 文件记录
+CREATE TABLE ${SCHEMA}.file_record
+(
+    uuid          VARCHAR2(32) NOT NULL,
+    tenant_id     NUMBER(20) DEFAULT 0 NOT NULL,
+    app_module    VARCHAR2(50),
+    md5           VARCHAR2(32),
+    file_name     VARCHAR2(100) NOT NULL,
+    file_type     VARCHAR2(20),
+    file_size     NUMBER(20) NOT NULL,
+    storage_path  VARCHAR2(200) NOT NULL,
+    access_url    VARCHAR2(200),
+    thumbnail_url VARCHAR2(200),
+    description   VARCHAR2(100),
+    is_deleted    NUMBER(1) DEFAULT 0 not null,
+    create_by     NUMBER(20) DEFAULT 0,
+    create_time   timestamp DEFAULT CURRENT_TIMESTAMP not null,
+    constraint PK_file_record primary key (uuid)
 );
--- 添加备注,
-comment on column ${SCHEMA}.upload_file.uuid is 'UUID';
-comment on column ${SCHEMA}.upload_file.tenant_id is '租户ID';
-comment on column ${SCHEMA}.upload_file.app_module is '应用模块';
-comment on column ${SCHEMA}.upload_file.rel_obj_type is '关联对象类';
-comment on column ${SCHEMA}.upload_file.rel_obj_id is '关联对象ID';
-comment on column ${SCHEMA}.upload_file.rel_obj_field is '关联对象属性名称';
-comment on column ${SCHEMA}.upload_file.file_name is '文件名';
-comment on column ${SCHEMA}.upload_file.storage_path is '存储路径';
-comment on column ${SCHEMA}.upload_file.access_url is '访问地址';
-comment on column ${SCHEMA}.upload_file.file_type is '文件类型';
-comment on column ${SCHEMA}.upload_file.data_count is '数据量';
-comment on column ${SCHEMA}.upload_file.description is '备注';
-comment on column ${SCHEMA}.upload_file.is_deleted is '删除标记';
-comment on column ${SCHEMA}.upload_file.create_by is '创建人';
-comment on column ${SCHEMA}.upload_file.create_time is '创建时间';
-comment on table ${SCHEMA}.upload_file is '上传文件';
+-- 添加备注
+comment on column ${SCHEMA}.file_record.uuid is 'UUID';
+comment on column ${SCHEMA}.file_record.tenant_id is '租户ID';
+comment on column ${SCHEMA}.file_record.app_module is '应用模块';
+comment on column ${SCHEMA}.file_record.md5 is 'MD5标识';
+comment on column ${SCHEMA}.file_record.file_name is '文件名';
+comment on column ${SCHEMA}.file_record.file_type is '文件类型';
+comment on column ${SCHEMA}.file_record.file_size is '文件大小';
+comment on column ${SCHEMA}.file_record.storage_path is '存储路径';
+comment on column ${SCHEMA}.file_record.access_url is '访问地址';
+comment on column ${SCHEMA}.file_record.thumbnail_url is '缩略图地址';
+comment on column ${SCHEMA}.file_record.description is '备注';
+comment on column ${SCHEMA}.file_record.is_deleted is '删除标记';
+comment on column ${SCHEMA}.file_record.create_by is '创建人';
+comment on column ${SCHEMA}.file_record.create_time is '创建时间';
+comment on table ${SCHEMA}.file_record is '文件记录';
 -- 索引
-create index idx_upload_file on upload_file (rel_obj_type, rel_obj_id, rel_obj_field);
-create index idx_upload_file_tenant on upload_file (tenant_id);
+create index idx_file_record_md5 on file_record (md5);
+create index idx_file_record_tenant on file_record (tenant_id);
\ No newline at end of file
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql
index e05737e5..c5322c4b 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql
@@ -1,39 +1,38 @@
--- 上传文件表
-CREATE TABLE upload_file (
-   uuid varchar(32) NOT NULL,
-   tenant_id            bigint        not null default 0,
-   app_module          varchar(50),
-   rel_obj_type varchar(50),
-   rel_obj_id varchar(32),
-   rel_obj_field varchar(50),
-   file_name varchar(100) NOT NULL,
-   storage_path varchar(200) NOT NULL,
-   access_url varchar(200),
-   file_type varchar(20),
-   data_count int  not null DEFAULT 0,
-   description varchar(100),
-   is_deleted BOOLEAN not null DEFAULT FALSE,
-   create_by  bigint  default 0,
-   create_time  timestamp   not null default CURRENT_TIMESTAMP,
-   constraint PK_upload_file primary key (uuid)
+-- 文件记录
+CREATE TABLE file_record
+(
+    uuid          varchar(32)  NOT NULL,
+    tenant_id     bigint       NOT NULL DEFAULT 0,
+    app_module    varchar(50),
+    md5           varchar(32),
+    file_name     varchar(100) NOT NULL,
+    file_type     varchar(20),
+    file_size     bigint       NOT NULL,
+    storage_path  varchar(200) NOT NULL,
+    access_url    varchar(200),
+    thumbnail_url varchar(200),
+    description   varchar(100),
+    is_deleted    BOOLEAN      NOT NULL DEFAULT FALSE,
+    create_by     bigint                DEFAULT 0,
+    create_time   timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    constraint PK_file_record primary key (uuid)
 );
--- 添加备注,
-comment on column upload_file.uuid is 'UUID';
-comment on column upload_file.tenant_id is '租户ID';
-comment on column upload_file.app_module is '应用模块';
-comment on column upload_file.rel_obj_type is '关联对象类';
-comment on column upload_file.rel_obj_id is '关联对象ID';
-comment on column upload_file.rel_obj_field is '关联对象属性名称';
-comment on column upload_file.file_name is '文件名';
-comment on column upload_file.storage_path is '存储路径';
-comment on column upload_file.access_url is '访问地址';
-comment on column upload_file.file_type is '文件类型';
-comment on column upload_file.data_count is '数据量';
-comment on column upload_file.description is '备注';
-comment on column upload_file.is_deleted is '删除标记';
-comment on column upload_file.create_by is '创建人';
-comment on column upload_file.create_time is '创建时间';
-comment on table upload_file is '上传文件';
+-- 添加备注
+comment on column file_record.uuid is 'UUID';
+comment on column file_record.tenant_id is '租户ID';
+comment on column file_record.app_module is '应用模块';
+comment on column file_record.md5 is 'MD5标识';
+comment on column file_record.file_name is '文件名';
+comment on column file_record.file_type is '文件类型';
+comment on column file_record.file_size is '文件大小';
+comment on column file_record.storage_path is '存储路径';
+comment on column file_record.access_url is '访问地址';
+comment on column file_record.thumbnail_url is '缩略图地址';
+comment on column file_record.description is '备注';
+comment on column file_record.is_deleted is '删除标记';
+comment on column file_record.create_by is '创建人';
+comment on column file_record.create_time is '创建时间';
+comment on table file_record is '文件记录';
 -- 索引
-create index idx_upload_file on upload_file (rel_obj_type, rel_obj_id, rel_obj_field);
-create index idx_upload_file_tenant on upload_file(tenant_id);
+create index idx_file_record_md5 on file_record (md5);
+create index idx_file_record_tenant on file_record (tenant_id);
\ No newline at end of file
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql
index 80b50763..bdea3d45 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql
@@ -1,39 +1,38 @@
--- 上传文件表
-CREATE TABLE ${SCHEMA}.upload_file (
-    uuid varchar(32) NOT NULL,
-    tenant_id            bigint        not null default 0,
-    app_module          varchar(50),
-    rel_obj_type varchar(50),
-    rel_obj_id varchar(32),
-    rel_obj_field varchar(50),
-    file_name varchar(100) NOT NULL,
-    storage_path varchar(200) NOT NULL,
-    access_url varchar(200) NULL,
-    file_type varchar(20),
-    data_count int  not null DEFAULT 0,
-    description varchar(100),
-    is_deleted tinyint not null DEFAULT 0,
-    create_by bigint default 0,
-    create_time datetime not null default CURRENT_TIMESTAMP,
-    constraint PK_upload_file primary key (uuid)
+-- 文件记录
+CREATE TABLE ${SCHEMA}.file_record
+(
+    uuid          varchar(32)  NOT NULL,
+    tenant_id     bigint       NOT NULL DEFAULT 0,
+    app_module    varchar(50),
+    md5           varchar(32),
+    file_name     varchar(100) NOT NULL,
+    file_type     varchar(20),
+    file_size     bigint       NOT NULL,
+    storage_path  varchar(200) NOT NULL,
+    access_url    varchar(200),
+    thumbnail_url varchar(200),
+    description   varchar(100),
+    is_deleted    tinyint      NOT NULL DEFAULT 0,
+    create_by     bigint                DEFAULT 0,
+    create_time   timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    constraint PK_file_record primary key (uuid)
 );
--- 添加备注,
-execute sp_addextendedproperty 'MS_Description', N'UUID', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'uuid';
-execute sp_addextendedproperty 'MS_Description', N'租户ID','SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'tenant_id';
-execute sp_addextendedproperty 'MS_Description', N'应用模块','SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'app_module';
-execute sp_addextendedproperty 'MS_Description', N'关联对象类', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'rel_obj_type';
-execute sp_addextendedproperty 'MS_Description', N'关联对象ID', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'rel_obj_id';
-execute sp_addextendedproperty 'MS_Description', N'关联对象属性名称', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'rel_obj_field';
-execute sp_addextendedproperty 'MS_Description', N'文件名', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'file_name';
-execute sp_addextendedproperty 'MS_Description', N'存储路径', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'storage_path';
-execute sp_addextendedproperty 'MS_Description', N'访问地址', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'access_url';
-execute sp_addextendedproperty 'MS_Description', N'文件类型', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'file_type';
-execute sp_addextendedproperty 'MS_Description', N'数据量', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'data_count';
-execute sp_addextendedproperty 'MS_Description', N'备注', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'description';
-execute sp_addextendedproperty 'MS_Description', N'删除标记', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'is_deleted';
-execute sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'create_by';
-execute sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'create_time';
-execute sp_addextendedproperty 'MS_Description', N'上传文件', 'SCHEMA', '${SCHEMA}', 'table', upload_file, null, null;
+-- 添加备注
+execute sp_addextendedproperty 'MS_Description', N'UUID', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'uuid';
+execute sp_addextendedproperty 'MS_Description', N'租户ID','SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'tenant_id';
+execute sp_addextendedproperty 'MS_Description', N'应用模块','SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'app_module';
+execute sp_addextendedproperty 'MS_Description', N'MD5标识', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'md5';
+execute sp_addextendedproperty 'MS_Description', N'文件名', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'file_name';
+execute sp_addextendedproperty 'MS_Description', N'文件类型', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'file_type';
+execute sp_addextendedproperty 'MS_Description', N'文件大小', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'file_size';
+execute sp_addextendedproperty 'MS_Description', N'存储路径', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'storage_path';
+execute sp_addextendedproperty 'MS_Description', N'访问地址', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'access_url';
+execute sp_addextendedproperty 'MS_Description', N'缩略图地址', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'thumbnail_url';
+execute sp_addextendedproperty 'MS_Description', N'备注', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'description';
+execute sp_addextendedproperty 'MS_Description', N'删除标记', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'is_deleted';
+execute sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'create_by';
+execute sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'create_time';
+execute sp_addextendedproperty 'MS_Description', N'文件记录', 'SCHEMA', '${SCHEMA}', 'table', file_record, null, null;
 -- 索引
-create nonclustered index idx_upload_file on upload_file(rel_obj_type, rel_obj_id, rel_obj_field);
-create nonclustered index idx_upload_file_tenant on upload_file(tenant_id);
+create nonclustered index idx_file_record_md5 on file_record (md5);
+create nonclustered index idx_file_record_tenant on file_record (tenant_id);
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql
new file mode 100644
index 00000000..1898dd0e
--- /dev/null
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql
@@ -0,0 +1,370 @@
+-- 用户表
+create table ${SCHEMA}.iam_user
+(
+    id BIGINT not null primary key,
+    tenant_id          BIGINT           default 0  not null,
+    org_id BIGINT   default 0 not null,
+    user_num VARCHAR(20)   not null,
+    realname VARCHAR(50)   not null,
+    gender VARCHAR(10)   not null,
+    birthdate date   null,
+    mobile_phone VARCHAR(20)   null,
+    email VARCHAR(50)   null,
+    avatar_url VARCHAR(200)   null,
+    status VARCHAR(10)   default 'A' not null,
+    is_deleted BIT   DEFAULT 0 not null,
+    create_time timestamp   default CURRENT_TIMESTAMP not null,
+    update_time timestamp   default CURRENT_TIMESTAMP null
+);
+-- 添加备注,
+comment on column ${SCHEMA}.iam_user.id is 'ID';
+comment on column ${SCHEMA}.iam_user.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_user.org_id is '组织ID';
+comment on column ${SCHEMA}.iam_user.user_num is '用户编号';
+comment on column ${SCHEMA}.iam_user.realname is '真实姓名';
+comment on column ${SCHEMA}.iam_user.gender is '性别';
+comment on column ${SCHEMA}.iam_user.birthdate is '出生日期';
+comment on column ${SCHEMA}.iam_user.mobile_phone is '手机号';
+comment on column ${SCHEMA}.iam_user.email is 'Email';
+comment on column ${SCHEMA}.iam_user.avatar_url is '头像';
+comment on column ${SCHEMA}.iam_user.status is '状态';
+comment on column ${SCHEMA}.iam_user.is_deleted is '删除标记';
+comment on column ${SCHEMA}.iam_user.create_time is '创建时间';
+comment on column ${SCHEMA}.iam_user.update_time is '更新时间';
+comment on table ${SCHEMA}.iam_user is '系统用户';
+-- 索引
+create index idx_iam_user_1 on ${SCHEMA}.iam_user (org_id);
+create index idx_iam_user_2 on ${SCHEMA}.iam_user (mobile_phone);
+create index idx_iam_user_num on ${SCHEMA}.iam_user (user_num);
+create index idx_iam_user_tenant on ${SCHEMA}.iam_user (tenant_id);
+
+-- 账号表
+create table ${SCHEMA}.iam_account
+(
+    id BIGINT not null primary key,
+    tenant_id          BIGINT           default 0  not null,
+    user_type VARCHAR(100) default 'IamUser'   not null,
+    user_id BIGINT   not null,
+    auth_type VARCHAR(20) default 'PWD'   not null,
+    auth_account VARCHAR(100)   not null,
+    auth_secret VARCHAR(100)   null,
+    secret_salt VARCHAR(32)   null,
+    status VARCHAR(10) default 'A'   not null,
+    is_deleted BIT DEFAULT 0   not null,
+    create_time timestamp default CURRENT_TIMESTAMP   not null,
+    update_time timestamp   default CURRENT_TIMESTAMP null
+);
+comment on column ${SCHEMA}.iam_account.id is 'ID';
+comment on column ${SCHEMA}.iam_account.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_account.user_type is '用户类型';
+comment on column ${SCHEMA}.iam_account.user_id is '用户ID';
+comment on column ${SCHEMA}.iam_account.auth_type is '认证方式';
+comment on column ${SCHEMA}.iam_account.auth_account is '用户名';
+comment on column ${SCHEMA}.iam_account.auth_secret is '密码';
+comment on column ${SCHEMA}.iam_account.secret_salt is '加密盐';
+comment on column ${SCHEMA}.iam_account.status is '用户状态';
+comment on column ${SCHEMA}.iam_account.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_account.create_time is '创建时间';
+comment on column ${SCHEMA}.iam_account.update_time is '更新时间';
+comment on table ${SCHEMA}.iam_account is '登录账号';
+-- 创建索引
+create index idx_iam_account on ${SCHEMA}.iam_account(auth_account, auth_type, user_type);
+create index idx_iam_account_tenant on ${SCHEMA}.iam_account (tenant_id);
+
+-- 角色表
+create table ${SCHEMA}.iam_role
+(
+    id BIGINT not null primary key,
+    tenant_id          BIGINT           default 0  not null,
+    name VARCHAR(50)   not null,
+    code VARCHAR(50)   not null,
+    description VARCHAR(100)   null,
+    is_deleted BIT DEFAULT 0   not null,
+    create_time timestamp default CURRENT_TIMESTAMP   null,
+    update_time timestamp   default CURRENT_TIMESTAMP null
+);
+comment on column ${SCHEMA}.iam_role.id is 'ID';
+comment on column ${SCHEMA}.iam_role.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_role.name is '名称';
+comment on column ${SCHEMA}.iam_role.code is '编码';
+comment on column ${SCHEMA}.iam_role.description is '备注';
+comment on column ${SCHEMA}.iam_role.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_role.create_time is '创建时间';
+comment on table ${SCHEMA}.iam_role is '角色';
+-- 创建索引
+create index idx_iam_role_tenant on ${SCHEMA}.iam_role (tenant_id);
+
+-- 用户角色表
+create table ${SCHEMA}.iam_user_role
+(
+    id BIGINT identity ( 10000,1) primary key,
+    tenant_id          BIGINT           default 0  not null,
+    user_type VARCHAR(100) default 'IamUser' not null,
+    user_id BIGINT not null,
+    role_id BIGINT not null,
+    is_deleted BIT DEFAULT 0   not null,
+    create_time timestamp default CURRENT_TIMESTAMP not null,
+    update_time timestamp   default CURRENT_TIMESTAMP null
+);
+comment on column ${SCHEMA}.iam_user_role.id is 'ID';
+comment on column ${SCHEMA}.iam_user_role.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_user_role.user_type is '用户类型';
+comment on column ${SCHEMA}.iam_user_role.user_id is '用户ID';
+comment on column ${SCHEMA}.iam_user_role.role_id is '角色ID';
+comment on column ${SCHEMA}.iam_user_role.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_user_role.create_time is '创建时间';
+comment on column ${SCHEMA}.iam_user_role.update_time is '更新时间';
+comment on table ${SCHEMA}.iam_user_role is '用户角色关联';
+-- 索引
+create index idx_iam_user_role on ${SCHEMA}.iam_user_role (user_type, user_id);
+create index idx_iam_user_role_tenant on ${SCHEMA}.iam_user_role (tenant_id);
+
+-- 资源权限表
+create table ${SCHEMA}.iam_resource_permission
+(
+    id BIGINT identity ( 10000,1) primary key,
+    app_module          VARCHAR(50),
+    tenant_id          BIGINT           default 0  not null,
+    parent_id BIGINT default 0   not null,
+    display_type VARCHAR(20) not null,
+    display_name VARCHAR(100) not null,
+    resource_code VARCHAR(100)   null,
+    permission_code VARCHAR(200)   null,
+    sort_id BIGINT  null,
+    is_deleted BIT DEFAULT 0   not null,
+    create_time timestamp default CURRENT_TIMESTAMP   not null,
+    update_time timestamp default CURRENT_TIMESTAMP  null
+);
+comment on column ${SCHEMA}.iam_resource_permission.id is 'ID';
+comment on column ${SCHEMA}.iam_resource_permission.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_resource_permission.app_module is '应用模块';
+comment on column ${SCHEMA}.iam_resource_permission.parent_id is '父资源ID';
+comment on column ${SCHEMA}.iam_resource_permission.display_type is '展现类型';
+comment on column ${SCHEMA}.iam_resource_permission.display_name is '显示名称';
+comment on column ${SCHEMA}.iam_resource_permission.resource_code is '前端编码';
+comment on column ${SCHEMA}.iam_resource_permission.permission_code is '权限码';
+comment on column ${SCHEMA}.iam_resource_permission.sort_id is '排序号';
+comment on column ${SCHEMA}.iam_resource_permission.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_resource_permission.create_time is '创建时间';
+comment on column ${SCHEMA}.iam_resource_permission.update_time is '更新时间';
+comment on table ${SCHEMA}.iam_resource_permission is '资源权限表';
+
+-- 索引
+create index idx_iam_resource_permission on ${SCHEMA}.iam_resource_permission (parent_id);
+create index idx_resource_permission_tenant on ${SCHEMA}.iam_resource_permission (tenant_id);
+
+-- 角色-权限
+create table ${SCHEMA}.iam_role_resource
+(
+    id BIGINT identity ( 10000,1) primary key,
+    tenant_id          BIGINT           default 0  not null,
+    role_id int    not null,
+    resource_id int    not null,
+    is_deleted BIT DEFAULT 0    not null,
+    create_time timestamp default CURRENT_TIMESTAMP   not null
+);
+comment on column ${SCHEMA}.iam_role_resource.id is 'ID';
+comment on column ${SCHEMA}.iam_role_resource.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_role_resource.role_id is '角色ID';
+comment on column ${SCHEMA}.iam_role_resource.resource_id is '权限ID';
+comment on column ${SCHEMA}.iam_role_resource.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_role_resource.create_time is '创建时间';
+comment on table ${SCHEMA}.iam_role_resource is '角色资源';
+-- 索引
+create index idx_iam_role_resource on ${SCHEMA}.iam_role_resource (role_id, resource_id);
+create index idx_iam_role_resource_tenant on ${SCHEMA}.iam_role_resource (tenant_id);
+
+-- 登录日志表
+create table ${SCHEMA}.iam_login_trace
+(
+    id BIGINT identity ( 10000,1) primary key,
+    tenant_id          BIGINT           default 0  not null,
+    user_type VARCHAR(100) default 'IamUser'    not null,
+    user_id BIGINT    not null,
+    auth_type VARCHAR(20) default 'PWD'    not null,
+    auth_account VARCHAR(100)    not null,
+    ip_address VARCHAR(50)    null,
+    user_agent VARCHAR(200)    null,
+    is_success BIT DEFAULT 0    not null,
+    create_time timestamp default CURRENT_TIMESTAMP   not null
+);
+comment on column ${SCHEMA}.iam_login_trace.id is 'ID';
+comment on column ${SCHEMA}.iam_login_trace.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_login_trace.user_type is '用户类型';
+comment on column ${SCHEMA}.iam_login_trace.user_id is '用户ID';
+comment on column ${SCHEMA}.iam_login_trace.auth_type is '认证方式';
+comment on column ${SCHEMA}.iam_login_trace.auth_account is '用户名';
+comment on column ${SCHEMA}.iam_login_trace.ip_address is 'IP';
+comment on column ${SCHEMA}.iam_login_trace.user_agent is '客户端信息';
+comment on column ${SCHEMA}.iam_login_trace.is_success is '是否成功';
+comment on column ${SCHEMA}.iam_login_trace.create_time is '创建时间';
+comment on table ${SCHEMA}.iam_login_trace is '登录日志';
+-- 创建索引
+create index idx_iam_login_trace on ${SCHEMA}.iam_login_trace (user_type, user_id);
+create index idx_iam_login_trace_2 on ${SCHEMA}.iam_login_trace (auth_account);
+create index idx_iam_login_trace_tenant on ${SCHEMA}.iam_login_trace (tenant_id);
+
+-- 操作日志表
+create table ${SCHEMA}.iam_operation_log
+(
+    id BIGINT identity ( 10000,1) primary key,
+    tenant_id          BIGINT           default 0  not null,
+    app_module          VARCHAR(50),
+    business_obj VARCHAR(100)  not null,
+    operation   VARCHAR(100)  not null,
+    user_type VARCHAR(100) DEFAULT 'IamUser'    not null,
+    user_id BIGINT    not null,
+    user_realname    VARCHAR(100)  null,
+    request_uri    VARCHAR(500)                  not null,
+    request_method VARCHAR(20)                   not null,
+    request_params    VARCHAR(1000)              null,
+    request_ip   VARCHAR(50)                     null,
+    status_code   NUMBER(6)   default 0   not null,
+    error_msg     VARCHAR(1000)           null,
+    is_deleted BIT DEFAULT 0    not null,
+    create_time timestamp default CURRENT_TIMESTAMP   not null
+);
+comment on column ${SCHEMA}.iam_operation_log.id is 'ID';
+comment on column ${SCHEMA}.iam_operation_log.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_operation_log.app_module is '应用模块';
+comment on column ${SCHEMA}.iam_operation_log.business_obj is '业务对象';
+comment on column ${SCHEMA}.iam_operation_log.operation is '操作描述';
+comment on column ${SCHEMA}.iam_operation_log.user_type is '用户类型';
+comment on column ${SCHEMA}.iam_operation_log.user_id is '用户ID';
+comment on column ${SCHEMA}.iam_operation_log.user_realname is '用户姓名';
+comment on column ${SCHEMA}.iam_operation_log.request_uri is '请求URI';
+comment on column ${SCHEMA}.iam_operation_log.request_method is '请求方式';
+comment on column ${SCHEMA}.iam_operation_log.request_params is '请求参数';
+comment on column ${SCHEMA}.iam_operation_log.request_ip is 'IP';
+comment on column ${SCHEMA}.iam_operation_log.status_code is '状态码';
+comment on column ${SCHEMA}.iam_operation_log.error_msg is '异常信息';
+comment on column ${SCHEMA}.iam_operation_log.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_operation_log.create_time is '创建时间';
+comment on table ${SCHEMA}.iam_operation_log is '操作日志';
+-- 创建索引
+create index idx_iam_operation_log on ${SCHEMA}.iam_operation_log (user_type, user_id);
+create index idx_iam_operation_log_tenant on ${SCHEMA}.iam_operation_log (tenant_id);
+
+-- 部门表
+CREATE TABLE ${SCHEMA}.iam_org (
+   id BIGINT not null primary key,
+   tenant_id          BIGINT           default 0  not null,
+   parent_id BIGINT DEFAULT 0 NOT NULL,
+   top_org_id BIGINT DEFAULT 0 NOT NULL,
+   name VARCHAR(100) NOT NULL,
+   short_name VARCHAR(50) NOT NULL,
+   type        VARCHAR(100) DEFAULT 'DEPT' NOT NULL,
+   code        VARCHAR(50)  NOT NULL,
+   manager_id  BIGINT   DEFAULT 0 NOT NULL,
+   depth NUMBER(6) DEFAULT 1 NOT NULL,
+   sort_id BIGINT DEFAULT 1 NOT NULL,
+   status      VARCHAR(10)  DEFAULT 'A' NOT NULL,
+   org_comment VARCHAR(255)   null,
+   is_deleted BIT DEFAULT 0    not null,
+   create_time timestamp default CURRENT_TIMESTAMP   not null,
+   update_time timestamp   default CURRENT_TIMESTAMP null
+);
+comment on column ${SCHEMA}.iam_org.id is 'ID';
+comment on column ${SCHEMA}.iam_org.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_org.parent_id is '上级ID';
+comment on column ${SCHEMA}.iam_org.top_org_id is '企业ID';
+comment on column ${SCHEMA}.iam_org.name is '名称';
+comment on column ${SCHEMA}.iam_org.short_name is '简称';
+comment on column ${SCHEMA}.iam_org.type is '类型';
+comment on column ${SCHEMA}.iam_org.code is '编码';
+comment on column ${SCHEMA}.iam_org.manager_id is '负责人';
+comment on column ${SCHEMA}.iam_org.depth is '层级';
+comment on column ${SCHEMA}.iam_org.sort_id is '排序号';
+comment on column ${SCHEMA}.iam_org.status is '状态';
+comment on column ${SCHEMA}.iam_org.org_comment is '备注';
+comment on column ${SCHEMA}.iam_org.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_org.create_time is '创建时间';
+comment on column ${SCHEMA}.iam_org.update_time is '更新时间';
+comment on table ${SCHEMA}.iam_org is '部门';
+create index idx_iam_org on ${SCHEMA}.iam_org (parent_id);
+create index idx_iam_org_tenant on ${SCHEMA}.iam_org (tenant_id);
+
+-- 岗位
+create table ${SCHEMA}.iam_position
+(
+    id BIGINT not null primary key,
+    tenant_id          BIGINT           default 0  not null,
+    name                 VARCHAR(100)                          not null,
+    code                 VARCHAR(50)                           not null,
+    is_virtual           BIT  default 0                 not null,
+    grade_name           VARCHAR(50)                           null,
+    grade_value          VARCHAR(30) default '0'               null,
+    data_permission_type VARCHAR(20) default 'SELF'            null,
+    is_deleted BIT DEFAULT 0    not null,
+    create_time timestamp default CURRENT_TIMESTAMP   not null,
+    update_time timestamp   default CURRENT_TIMESTAMP null
+);
+comment on column ${SCHEMA}.iam_position.id is 'ID';
+comment on column ${SCHEMA}.iam_position.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_position.name is '名称';
+comment on column ${SCHEMA}.iam_position.code is '编码';
+comment on column ${SCHEMA}.iam_position.is_virtual is '是否虚拟岗';
+comment on column ${SCHEMA}.iam_position.grade_name is '职级头衔';
+comment on column ${SCHEMA}.iam_position.grade_value is '职级';
+comment on column ${SCHEMA}.iam_position.data_permission_type is '数据权限类型';
+comment on column ${SCHEMA}.iam_position.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_position.create_time is '创建时间';
+comment on column ${SCHEMA}.iam_position.update_time is '更新时间';
+comment on table ${SCHEMA}.iam_position is '岗位';
+create index idx_iam_position on ${SCHEMA}.iam_position (code);
+create index idx_iam_position_tenant on ${SCHEMA}.iam_position (tenant_id);
+
+-- 用户岗位
+create table ${SCHEMA}.iam_user_position
+(
+    id BIGINT identity ( 100000,1 ) primary key,
+    tenant_id          BIGINT           default 0  not null,
+    user_type           VARCHAR(100) default 'IamUser'         not null,
+    user_id             BIGINT                                  not null,
+    org_id              BIGINT        default 0                 not null,
+    position_id         BIGINT                             not null,
+    is_primary_position BIT   default 1                 not null,
+    is_deleted BIT DEFAULT 0    not null,
+    create_time timestamp default CURRENT_TIMESTAMP   not null,
+    update_time timestamp default CURRENT_TIMESTAMP null
+);
+comment on column ${SCHEMA}.iam_user_position.id is 'ID';
+comment on column ${SCHEMA}.iam_user_position.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_user_position.user_type is '用户类型';
+comment on column ${SCHEMA}.iam_user_position.user_id is '用户ID';
+comment on column ${SCHEMA}.iam_user_position.org_id is '组织ID';
+comment on column ${SCHEMA}.iam_user_position.position_id is '岗位ID';
+comment on column ${SCHEMA}.iam_user_position.is_primary_position is '是否主岗';
+comment on column ${SCHEMA}.iam_user_position.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_user_position.create_time is '创建时间';
+comment on column ${SCHEMA}.iam_user_position.update_time is '更新时间';
+comment on table ${SCHEMA}.iam_user_position is '用户岗位关联';
+create index idx_iam_user_position on ${SCHEMA}.iam_user_position (user_type, user_id);
+create index idx_iam_user_position_pos on ${SCHEMA}.iam_user_position (position_id);
+
+-- 系统配置表
+create table ${SCHEMA}.system_config
+(
+    id BIGINT identity ( 100000,1 ) primary key,
+    tenant_id NUMBER (20) default 0 not null,
+    type VARCHAR (50) not null,
+    prop VARCHAR (50) not null,
+    value VARCHAR (255),
+    is_deleted NUMBER (1) default 0 not null,
+    create_time TIMESTAMP default CURRENT_TIMESTAMP not null,
+    update_time timestamp default CURRENT_TIMESTAMP null
+);
+-- 添加备注
+comment on column ${SCHEMA}.system_config.id is 'ID';
+comment on column ${SCHEMA}.system_config.tenant_id is '租户ID';
+comment on column ${SCHEMA}.system_config.type is '类型';
+comment on column ${SCHEMA}.system_config.prop is '属性';
+comment on column ${SCHEMA}.system_config.value is '属性值';
+comment on column ${SCHEMA}.system_config.is_deleted is '删除标记';
+comment on column ${SCHEMA}.system_config.create_time is '创建时间';
+comment on column ${SCHEMA}.system_config.update_time is '更新时间';
+
+comment on table ${SCHEMA}.system_config is '系统配置';
+-- 创建索引
+create index idx_system_config on ${SCHEMA}.system_config (type, prop);
+create index idx_system_config_tenant on ${SCHEMA}.system_config (tenant_id);
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
index 513228dd..bb6f8eb4 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-oracle.sql
@@ -83,6 +83,7 @@ create table ${SCHEMA}.iam_role
     description VARCHAR2(100)   null,
     is_deleted NUMBER(1) DEFAULT 0   not null,
     create_time timestamp default CURRENT_TIMESTAMP   null,
+    update_time timestamp   default CURRENT_TIMESTAMP null,
     constraint PK_iam_role primary key (id)
 );
 comment on column ${SCHEMA}.iam_role.id is 'ID';
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java b/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java
index 4f011118..4abbdd91 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/channel/SimpleEmailChannel.java
@@ -96,7 +96,7 @@ public class SimpleEmailChannel implements MessageChannel {
         } catch (Exception e) {
             log.error("[发送邮件失败]：信息为： {} , 异常", message, e);
             result = e.getMessage();
-            status = Cons.MESSAGE_STATUS.EXCEPTION.name();
+            status = Cons.MESSAGE_STATUS.FAILED.name();
         }
         // 更新结果
         messageService.updateEntity(
diff --git a/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java b/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java
index a0d52509..0c9aba2d 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/config/Cons.java
@@ -32,21 +32,16 @@ public class Cons extends com.diboot.core.config.Cons {
         /**
          * 发送中
          */
-        SENDING("发送中"),
+        PENDING("待发送"),
         /**
          * 异常
          */
-        EXCEPTION("发送异常"),
+        FAILED("发送失败"),
         // 如果是短信、邮件则送达表示发送成功
         /**
          * 签收
          */
         DELIVERY("已送达"),
-        // 如果是站内信，那么状态是已读、未读
-        /**
-         * 未读
-         */
-        UNREAD("未读"),
         /**
          * 已读
          */
diff --git a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql
new file mode 100644
index 00000000..026e4a58
--- /dev/null
+++ b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql
@@ -0,0 +1,74 @@
+-- 消息模版表
+CREATE TABLE ${SCHEMA}.message_template (
+     id                 BIGINT identity ( 100000,1 ) primary key,
+     tenant_id          BIGINT           default 0  not null,
+     app_module         VARCHAR(50),
+     code VARCHAR(20) NOT NULL,
+     title VARCHAR(100) NOT NULL,
+     content VARCHAR(500) NOT NULL,
+     ext_data VARCHAR(500),
+     is_deleted   BIT DEFAULT 0    not null,
+     create_time  timestamp default CURRENT_TIMESTAMP   not null,
+     create_by BIGINT DEFAULT 0 NOT NULL,
+     update_time  timestamp   default CURRENT_TIMESTAMP null
+);
+-- 添加备注
+comment on column ${SCHEMA}.message_template.id is 'ID';
+comment on column ${SCHEMA}.message_template.tenant_id is '租户ID';
+comment on column ${SCHEMA}.message_template.app_module is '应用模块';
+comment on column ${SCHEMA}.message_template.code is '模版编码';
+comment on column ${SCHEMA}.message_template.title is '模版标题';
+comment on column ${SCHEMA}.message_template.content is '模版内容';
+comment on column ${SCHEMA}.message_template.ext_data is '扩展数据';
+comment on column ${SCHEMA}.message_template.create_by is '创建人';
+comment on column ${SCHEMA}.message_template.update_time is '更新时间';
+comment on column ${SCHEMA}.message_template.is_deleted is '是否删除';
+comment on column ${SCHEMA}.message_template.create_time is '创建时间';
+comment on table ${SCHEMA}.message_template is '消息模版';
+-- 创建索引
+create index idx_msg_tmpl_tenant on ${SCHEMA}.message_template (tenant_id);
+create index idx_msg_tmpl_code ON ${SCHEMA}.message_template(code);
+
+-- 消息表
+CREATE TABLE ${SCHEMA}.message (
+  id BIGINT identity ( 100000,1 ) primary key,
+  tenant_id          BIGINT           default 0  not null,
+  app_module         VARCHAR(50),
+  template_id        BIGINT,
+  business_type       VARCHAR(100)          not null,
+  business_code       VARCHAR(100) default 0  not null,
+  sender VARCHAR(100)  not null,
+  receiver VARCHAR(100) not null,
+  title VARCHAR(100) NOT NULL,
+  content VARCHAR(500) NOT NULL,
+  channel VARCHAR(30) NOT NULL,
+  status VARCHAR(30) NOT NULL,
+  result      VARCHAR(200),
+  schedule_time  timestamp   null,
+  ext_data VARCHAR(200),
+  is_deleted   BIT DEFAULT 0    not null,
+  create_time  timestamp default CURRENT_TIMESTAMP   not null,
+  update_time  timestamp default CURRENT_TIMESTAMP null
+);
+comment on column ${SCHEMA}.message.id is 'ID';
+comment on column ${SCHEMA}.message.tenant_id is '租户ID';
+comment on column ${SCHEMA}.message.app_module is '应用模块';
+comment on column ${SCHEMA}.message.template_id is '模版id';
+comment on column ${SCHEMA}.message.business_type is '业务类型';
+comment on column ${SCHEMA}.message.business_code is '业务标识';
+comment on column ${SCHEMA}.message.sender is '发送方';
+comment on column ${SCHEMA}.message.receiver is '接收方';
+comment on column ${SCHEMA}.message.title is '标题';
+comment on column ${SCHEMA}.message.content is '内容';
+comment on column ${SCHEMA}.message.channel is '发送通道';
+comment on column ${SCHEMA}.message.status is '消息状态';
+comment on column ${SCHEMA}.message.result is '发送结果';
+comment on column ${SCHEMA}.message.schedule_time is '定时发送时间';
+comment on column ${SCHEMA}.message.ext_data is '扩展数据';
+comment on column ${SCHEMA}.message.is_deleted is '是否删除';
+comment on column ${SCHEMA}.message.update_time is '更新时间';
+comment on column ${SCHEMA}.message.create_time is '创建时间';
+comment on table ${SCHEMA}.message is '消息';
+create index idx_msg_tenant on ${SCHEMA}.message (tenant_id);
+create index idx_msg_template on ${SCHEMA}.message (template_id);
+create index idx_msg_receiver on ${SCHEMA}.message (receiver);
diff --git a/diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql b/diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql
new file mode 100644
index 00000000..4028ef8c
--- /dev/null
+++ b/diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql
@@ -0,0 +1,47 @@
+-- 移动端用户表
+CREATE TABLE ${SCHEMA}.iam_member (
+  id BIGINT identity ( 100000,1 ) primary key,
+  tenant_id BIGINT default 0  not null,
+  org_id BIGINT  default 0 not null,
+  user_id BIGINT default 0 not null,
+  user_type VARCHAR(100) NOT NULL DEFAULT 'IamUser',
+  openid VARCHAR(50) NOT NULL,
+  nickname VARCHAR(100),
+  avatar_url VARCHAR(255),
+  country VARCHAR(50),
+  province VARCHAR(50),
+  city VARCHAR(100),
+  mobile_phone VARCHAR(20),
+  email VARCHAR(100),
+  gender VARCHAR(10),
+  status VARCHAR(20) NOT NULL DEFAULT 'NORMAL',
+  description VARCHAR(200),
+  is_deleted   BIT DEFAULT 0    not null,
+  create_time  timestamp default CURRENT_TIMESTAMP   not null,
+  update_time  timestamp default CURRENT_TIMESTAMP  null
+);
+comment on column ${SCHEMA}.iam_member.id is 'ID';
+comment on column ${SCHEMA}.iam_member.tenant_id is '租户ID';
+comment on column ${SCHEMA}.iam_member.org_id is '组织';
+comment on column ${SCHEMA}.iam_member.user_id is '用户id';
+comment on column ${SCHEMA}.iam_member.user_type is '用户类型';
+comment on column ${SCHEMA}.iam_member.openid is 'openid';
+comment on column ${SCHEMA}.iam_member.nickname is '昵称';
+comment on column ${SCHEMA}.iam_member.avatar_url is '头像';
+comment on column ${SCHEMA}.iam_member.country is '国家';
+comment on column ${SCHEMA}.iam_member.province is '省';
+comment on column ${SCHEMA}.iam_member.city is '市';
+comment on column ${SCHEMA}.iam_member.mobile_phone is '手机号';
+comment on column ${SCHEMA}.iam_member.gender is '性别';
+comment on column ${SCHEMA}.iam_member.status is '状态';
+comment on column ${SCHEMA}.iam_member.description is '备注';
+comment on column ${SCHEMA}.iam_member.is_deleted is '是否删除';
+comment on column ${SCHEMA}.iam_member.update_time is '更新时间';
+comment on column ${SCHEMA}.iam_member.create_time is '创建时间';
+comment on table ${SCHEMA}.iam_member is '移动端用户';
+-- 索引
+create index idx_member_tenant on ${SCHEMA}.iam_member (tenant_id);
+create index idx_member_orgid on ${SCHEMA}.iam_member (org_id);
+create index idx_member_openid on ${SCHEMA}.iam_member (openid);
+create index idx_member_phone on ${SCHEMA}.iam_member (mobile_phone);
+create index idx_member_user on ${SCHEMA}.iam_member(user_id, user_type);
diff --git a/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql b/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
new file mode 100644
index 00000000..8c6f9530
--- /dev/null
+++ b/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
@@ -0,0 +1,69 @@
+-- 定时任务表
+CREATE TABLE ${SCHEMA}.schedule_job (
+  id BIGINT identity ( 100000,1) primary key,
+  tenant_id          BIGINT           default 0  not null,
+  job_key    VARCHAR(100)          not null,
+  job_name       VARCHAR(100)          not null,
+  cron       VARCHAR(50),
+  param_json VARCHAR(200),
+  init_strategy VARCHAR(50),
+  job_status       VARCHAR(10)   default 'A'  not null,
+  save_log   BIT DEFAULT 1    not null,
+  job_comment      VARCHAR(200),
+  is_deleted   BIT DEFAULT 0    not null,
+  create_by BIGINT DEFAULT 0 NOT NULL,
+  create_time  timestamp default CURRENT_TIMESTAMP   not null,
+  update_time  timestamp default CURRENT_TIMESTAMP  null
+);
+comment on column schedule_job.id is 'ID';
+comment on column ${SCHEMA}.schedule_job.tenant_id is '租户ID';
+comment on column ${SCHEMA}.schedule_job.job_key is 'job编码';
+comment on column ${SCHEMA}.schedule_job.job_name is 'job名称';
+comment on column ${SCHEMA}.schedule_job.cron is '定时表达式';
+comment on column ${SCHEMA}.schedule_job.param_json is '参数';
+comment on column ${SCHEMA}.schedule_job.init_strategy is '初始化策略';
+comment on column ${SCHEMA}.schedule_job.job_status is '状态';
+comment on column ${SCHEMA}.schedule_job.job_comment is '备注';
+comment on column ${SCHEMA}.schedule_job.save_log is '是否记录日志';
+comment on column ${SCHEMA}.schedule_job.is_deleted is '是否删除';
+comment on column ${SCHEMA}.schedule_job.create_by is '创建人';
+comment on column ${SCHEMA}.schedule_job.create_time is '创建时间';
+comment on column ${SCHEMA}.schedule_job.update_time is '更新时间';
+comment on table ${SCHEMA}.schedule_job is '定时任务';
+create index idx_schedule_job on ${SCHEMA}.schedule_job (job_key);
+create index idx_schedule_job_tenant on ${SCHEMA}.schedule_job (tenant_id);
+
+-- 定时任务日志表
+CREATE TABLE ${SCHEMA}.schedule_job_log (
+ id BIGINT identity ( 100000,1) primary key,
+ tenant_id          BIGINT           default 0  not null,
+ job_id    VARCHAR(100)          not null,
+ job_name       VARCHAR(100)          not null,
+ cron       VARCHAR(50),
+ param_json VARCHAR(200),
+ start_time timestamp         null,
+ end_time timestamp          null,
+ elapsed_seconds NUMBER(9),
+ run_status       VARCHAR(10)   default 'A'  not null,
+ data_count NUMBER(9),
+ execute_msg  VARCHAR(500)  not null,
+ is_deleted   BIT DEFAULT 0    not null,
+ create_time  timestamp default CURRENT_TIMESTAMP   not null
+);
+comment on column ${SCHEMA}.schedule_job_log.id is 'ID';
+comment on column ${SCHEMA}.schedule_job_log.tenant_id is '租户ID';
+comment on column ${SCHEMA}.schedule_job_log.job_id is 'job编码';
+comment on column ${SCHEMA}.schedule_job_log.job_name is 'job名称';
+comment on column ${SCHEMA}.schedule_job_log.cron is '定时表达式';
+comment on column ${SCHEMA}.schedule_job_log.param_json is '参数';
+comment on column ${SCHEMA}.schedule_job_log.start_time is '开始时间';
+comment on column ${SCHEMA}.schedule_job_log.end_time is '结束时间';
+comment on column ${SCHEMA}.schedule_job_log.elapsed_seconds is '耗时(s)';
+comment on column ${SCHEMA}.schedule_job_log.run_status is '运行状态';
+comment on column ${SCHEMA}.schedule_job_log.data_count is '数据计数';
+comment on column ${SCHEMA}.schedule_job_log.execute_msg is '执行结果信息';
+comment on column ${SCHEMA}.schedule_job_log.is_deleted is '是否删除';
+comment on column ${SCHEMA}.schedule_job_log.create_time is '创建时间';
+comment on table ${SCHEMA}.schedule_job_log is '定时任务日志';
+create index idx_sch_job_log on ${SCHEMA}.schedule_job_log (job_id);
+create index idx_sch_job_log_tenant on ${SCHEMA}.schedule_job_log (tenant_id);
-- 
Gitee


From 6968e102244151989552cdbee764554ad5910a43 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 2 Jun 2022 16:11:14 +0800
Subject: [PATCH 160/195] =?UTF-8?q?*=20=E9=80=82=E9=85=8DMP=203.5.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/core/binding/parser/ConditionParser.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionParser.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionParser.java
index 9d56eb35..51d9296b 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionParser.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionParser.java
@@ -350,6 +350,14 @@ public class ConditionParser implements ExpressionVisitor,ItemsListVisitor {
 
     }
 
+    @Override
+    public void visit(IsDistinctExpression isDistinctExpression) {
+    }
+
+    @Override
+    public void visit(GeometryDistance geometryDistance) {
+    }
+
     @Override
     public void visit(BitwiseRightShift aThis) {
     }
-- 
Gitee


From 837fdeef04983ae9936149f544c836151c6d173a Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 6 Jun 2022 11:53:25 +0800
Subject: [PATCH 161/195] =?UTF-8?q?*=20=E7=BB=91=E5=AE=9A=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E8=BE=BE=E6=A2=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/binder/TestEntityListBinder.java     |  2 +-
 .../core/test/binder/vo/FieldBinderVO.java    |  2 +-
 .../core/binding/binder/BaseBinder.java       |  1 +
 .../core/binding/binder/FieldBinder.java      | 58 +++++++++----------
 .../binder/remote/RemoteBindingManager.java   | 25 +-------
 5 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java
index 22971328..aa60c715 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestEntityListBinder.java
@@ -172,7 +172,7 @@ public class TestEntityListBinder {
             // 验证通过中间表间接关联的绑定
             if(vo.getManagerId().equals(1001L)){
                 Assert.assertTrue(vo.getManagerPhotos().size() == 1);
-                Assert.assertEquals(2, vo.getManagerPhotoList().size());
+                Assert.assertEquals(1, vo.getManagerPhotoList().size());
             }
             else{
                 Assert.assertTrue(vo.getManagerPhotos().size() == 2);
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java
index cc7df083..b82c3abd 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/FieldBinderVO.java
@@ -38,7 +38,7 @@ public class FieldBinderVO extends User {
     private static final long serialVersionUID = 3526115343377985725L;
 
     // 字段关联，相同条件的entity+condition将合并为一条SQL查询
-    @BindField(entity= Department.class, field="name", condition="this.department_id=id AND parent_id IS NOT NULL AND this.gender='M'")
+    @BindField(entity= Department.class, field="name", condition="this.department_id=id AND parent_id IS NOT NULL")
     private String deptName;
 
     // 支持级联字段关联，相同条件的entity+condition将合并为一条SQL查询
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
index a74dc488..66015409 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
@@ -359,6 +359,7 @@ public abstract class BaseBinder<T> {
      * @param queryWrapper
      * @return
      */
+    @Deprecated
     protected List<Map<String, Object>> getMapList(Wrapper queryWrapper) {
         if(referencedService instanceof BaseService){
             return ((BaseService)referencedService).getMapList(queryWrapper);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
index 4a903e9c..80c621ed 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldBinder.java
@@ -105,30 +105,30 @@ public class FieldBinder<T> extends BaseBinder<T> {
         }
         // 直接关联
         if(middleTable == null){
-            List<Map<String, Object>> mapList = null;
             this.simplifySelectColumns();
             super.buildQueryWrapperJoinOn();
             // 查询条件为空时不进行查询
             if (queryWrapper.isEmptyOfNormal()) {
                 return;
             }
+            List<T> entityList = null;
             if(V.isEmpty(this.module)){
-                // 本地查询获取匹配结果的mapList
-                mapList = getMapList(queryWrapper);
+                // 本地查询获取匹配结果的entityList
+                entityList = getEntityList(queryWrapper);
             }
             else{
                 // 远程调用获取
-                mapList = RemoteBindingManager.fetchMapList(module, remoteBindDTO);
+                entityList = RemoteBindingManager.fetchEntityList(module, remoteBindDTO, referencedEntityClass);
             }
-            if(V.isEmpty(mapList)){
+            if(V.isEmpty(entityList)){
                 return;
             }
-            // 将结果list转换成map
-            Map<String, Map<String, Object>> key2DataMap = this.buildMatchKey2ResultMap(mapList);
+            // 将结果list转换成entityMap
+            Map<String, T> key2EntityMap = this.buildMatchKey2EntityMap(entityList);
             // 遍历list并赋值
             for(Object annoObject : super.getMatchedAnnoObjectList()){
                 String matchKey = buildMatchKey(annoObject);
-                setFieldValueToTrunkObj(key2DataMap, annoObject, matchKey);
+                setFieldValueToTrunkObj(key2EntityMap, annoObject, matchKey);
             }
         }
         else{
@@ -148,26 +148,26 @@ public class FieldBinder<T> extends BaseBinder<T> {
             // 构建查询条件
             String refObjJoinOnCol = refObjJoinCols.get(0);
             // 获取匹配结果的mapList
-            List<Map<String, Object>> mapList = null;
+            List<T> entityList = null;
             if(V.isEmpty(this.module)){
-                // 本地查询获取匹配结果的mapList
                 queryWrapper.in(refObjJoinOnCol, refObjValues);
-                mapList = getMapList(queryWrapper);
+                // 本地查询获取匹配结果的entityList
+                entityList = getEntityList(queryWrapper);
             }
             else{
                 // 远程调用获取
                 remoteBindDTO.setRefJoinCol(refObjJoinOnCol).setInConditionValues(refObjValues);
-                mapList = RemoteBindingManager.fetchMapList(module, remoteBindDTO);
+                entityList = RemoteBindingManager.fetchEntityList(module, remoteBindDTO, referencedEntityClass);
             }
-            if(V.isEmpty(mapList)){
+            if(V.isEmpty(entityList)){
                 return;
             }
-            // 将结果list转换成map
-            Map<String, Map<String, Object>> key2DataMap = this.buildMatchKey2ResultMap(mapList);
+            // 将结果list转换成entityMap
+            Map<String, T> key2EntityMap = this.buildMatchKey2EntityMap(entityList);
             // 遍历list并赋值
             for(Object annoObject : super.getMatchedAnnoObjectList()){
                 String matchKey = buildMatchKey(annoObject, middleTableResultMap);
-                setFieldValueToTrunkObj(key2DataMap, annoObject, matchKey);
+                setFieldValueToTrunkObj(key2EntityMap, annoObject, matchKey);
             }
         }
 
@@ -175,37 +175,37 @@ public class FieldBinder<T> extends BaseBinder<T> {
 
     /**
      * 设置字段值
-     * @param key2DataMap
+     * @param key2EntityMap
      * @param annoObject
      * @param matchKey
      */
-    private void setFieldValueToTrunkObj(Map<String, Map<String, Object>> key2DataMap, Object annoObject, String matchKey) {
-        Map<String, Object> relationMap = key2DataMap.get(matchKey);
-        if (relationMap != null) {
+    private void setFieldValueToTrunkObj(Map<String, T> key2EntityMap, Object annoObject, String matchKey) {
+        T relationEntity = key2EntityMap.get(matchKey);
+        if (relationEntity != null) {
             BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(annoObject);
             for (int i = 0; i < annoObjectSetterPropNameList.size(); i++) {
-                Object valObj = getValueIgnoreKeyCase(relationMap, toRefObjColumn(referencedGetterFieldNameList.get(i)));
+                Object valObj = BeanUtils.getProperty(relationEntity, referencedGetterFieldNameList.get(i));
                 beanWrapper.setPropertyValue(annoObjectSetterPropNameList.get(i), valObj);
             }
         }
     }
 
     /**
-     * 构建匹配key-map目标的map
-     * @param mapList
+     * 构建匹配key-entity目标的map
+     * @param entityList
      * @return
      */
-    protected Map<String, Map<String, Object>> buildMatchKey2ResultMap(List<Map<String, Object>> mapList){
-        Map<String, Map<String, Object>> key2TargetMap = new HashMap<>(mapList.size());
-        for(Map<String, Object> map : mapList){
+    protected Map<String, T> buildMatchKey2EntityMap(List<T> entityList){
+        Map<String, T> key2TargetMap = new HashMap<>(entityList.size());
+        for(T entity : entityList){
             List<String> joinOnValues = new ArrayList<>(refObjJoinCols.size());
             for(String refObjJoinOnCol : refObjJoinCols){
-                Object valObj = getValueIgnoreKeyCase(map, refObjJoinOnCol);
+                Object valObj = BeanUtils.getProperty(entity, toRefObjField(refObjJoinOnCol));
                 joinOnValues.add(S.valueOf(valObj));
             }
             String matchKey = S.join(joinOnValues);
             if(matchKey != null){
-                key2TargetMap.put(matchKey, map);
+                key2TargetMap.put(matchKey, entity);
             }
         }
         return key2TargetMap;
@@ -244,7 +244,7 @@ public class FieldBinder<T> extends BaseBinder<T> {
             String fieldValue = BeanUtils.getStringProperty(annoObject, getterField);
             // 通过中间结果Map转换得到OrgId
             if(V.notEmpty(middleTableResultMap)){
-                Object value = middleTableResultMap.get(fieldValue);
+                Object value = getValueIgnoreKeyCase(middleTableResultMap, fieldValue);
                 fieldValue = String.valueOf(value);
             }
             if(appendComma){
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java
index 8eb3c17c..b767bc8e 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java
@@ -17,8 +17,8 @@ package com.diboot.core.binding.binder.remote;
 
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.JSON;
+import com.diboot.core.util.V;
 import com.diboot.core.vo.JsonResult;
-import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClientBuilder;
 
@@ -46,27 +46,6 @@ public class RemoteBindingManager {
      */
     private static FeignClientBuilder feignClientBuilder;
 
-    /**
-     * 从远程接口抓取 Map List
-     * @param module
-     * @param remoteBindDTO
-     * @return
-     */
-    public static List<Map<String, Object>> fetchMapList(String module, RemoteBindDTO remoteBindDTO){
-        remoteBindDTO.setResultType("Map");
-        RemoteBindingProvider bindingProvider = getRemoteBindingProvider(module);
-        JsonResult<String> jsonResult = bindingProvider.loadBindingData(remoteBindDTO);
-        if(jsonResult.isOK()){
-            log.debug("获取到绑定数据: {}", jsonResult.getData());
-            List<Map<String, Object>> mapList = JSON.parseObject(jsonResult.getData(), new TypeReference<List<Map<String, Object>>>(){});
-            return mapList;
-        }
-        else{
-            log.warn("获取绑定数据失败: {}", jsonResult.getMsg());
-            return Collections.EMPTY_LIST;
-        }
-    }
-
     /**
      * 从远程接口抓取 Entity List
      * @param module
@@ -79,7 +58,7 @@ public class RemoteBindingManager {
         remoteBindDTO.setResultType("Entity");
         RemoteBindingProvider bindingProvider = getRemoteBindingProvider(module);
         JsonResult<String> jsonResult = bindingProvider.loadBindingData(remoteBindDTO);
-        if(jsonResult.isOK()){
+        if(V.equals(jsonResult.getCode(), 0)){
             log.debug("获取到绑定数据: {}", jsonResult.getData());
             List<T> entityList = JSON.parseArray(jsonResult.getData(), entityClass);
             return entityList;
-- 
Gitee


From db51d5d4d6a1087cf4861b0f3eae77f2e85fef57 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 6 Jun 2022 21:37:36 +0800
Subject: [PATCH 162/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0file=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6DM=E5=BA=93=E5=88=9D=E5=A7=8Bsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/META-INF/sql/init-file-dm.sql   | 72 +++++++++---------
 .../META-INF/sql/init-file-oracle.sql         | 73 ++++++++++---------
 .../META-INF/sql/init-file-postgresql.sql     | 73 ++++++++++---------
 .../META-INF/sql/init-file-sqlserver.sql      | 73 ++++++++++---------
 4 files changed, 148 insertions(+), 143 deletions(-)

diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
index f9539071..6c4e204b 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
@@ -1,37 +1,39 @@
--- 文件记录
-CREATE TABLE ${SCHEMA}.file_record
-(
-    uuid          VARCHAR(32) NOT NULL primary key,
-    tenant_id     BIGINT DEFAULT 0 NOT NULL,
-    app_module    VARCHAR(50),
-    md5           VARCHAR(32),
-    file_name     VARCHAR(100) NOT NULL,
-    file_type     VARCHAR(20),
-    file_size     BIGINT NOT NULL,
-    storage_path  VARCHAR(200) NOT NULL,
-    access_url    VARCHAR(200),
-    thumbnail_url VARCHAR(200),
-    description   VARCHAR(100),
-    is_deleted    BIT DEFAULT 0 not null,
-    create_by     BIGINT DEFAULT 0,
-    create_time   timestamp DEFAULT CURRENT_TIMESTAMP not null
+-- 上传文件表
+CREATE TABLE ${SCHEMA}.upload_file (
+   uuid VARCHAR(32) NOT NULL,
+   tenant_id          BIGINT           default 0  not null,
+   app_module          VARCHAR(50),
+   rel_obj_type VARCHAR(50),
+   rel_obj_id VARCHAR(32),
+   rel_obj_field VARCHAR(50),
+   file_name VARCHAR(100) NOT NULL,
+   storage_path VARCHAR(200) NOT NULL,
+   access_url VARCHAR(200),
+   file_type VARCHAR(20),
+   data_count INT   DEFAULT 0 not null,
+   description VARCHAR(100),
+   is_deleted BIT   DEFAULT 0 not null,
+   create_by BIGINT   default 0 ,
+   create_time timestamp   default CURRENT_TIMESTAMP not null,
+   constraint PK_upload_file primary key (uuid)
 );
--- 添加备注
-comment on column ${SCHEMA}.file_record.uuid is 'UUID';
-comment on column ${SCHEMA}.file_record.tenant_id is '租户ID';
-comment on column ${SCHEMA}.file_record.app_module is '应用模块';
-comment on column ${SCHEMA}.file_record.md5 is 'MD5标识';
-comment on column ${SCHEMA}.file_record.file_name is '文件名';
-comment on column ${SCHEMA}.file_record.file_type is '文件类型';
-comment on column ${SCHEMA}.file_record.file_size is '文件大小';
-comment on column ${SCHEMA}.file_record.storage_path is '存储路径';
-comment on column ${SCHEMA}.file_record.access_url is '访问地址';
-comment on column ${SCHEMA}.file_record.thumbnail_url is '缩略图地址';
-comment on column ${SCHEMA}.file_record.description is '备注';
-comment on column ${SCHEMA}.file_record.is_deleted is '删除标记';
-comment on column ${SCHEMA}.file_record.create_by is '创建人';
-comment on column ${SCHEMA}.file_record.create_time is '创建时间';
-comment on table ${SCHEMA}.file_record is '文件记录';
+-- 添加备注,
+comment on column ${SCHEMA}.upload_file.uuid is 'UUID';
+comment on column ${SCHEMA}.upload_file.tenant_id is '租户ID';
+comment on column ${SCHEMA}.upload_file.app_module is '应用模块';
+comment on column ${SCHEMA}.upload_file.rel_obj_type is '关联对象类';
+comment on column ${SCHEMA}.upload_file.rel_obj_id is '关联对象ID';
+comment on column ${SCHEMA}.upload_file.rel_obj_field is '关联对象属性名称';
+comment on column ${SCHEMA}.upload_file.file_name is '文件名';
+comment on column ${SCHEMA}.upload_file.storage_path is '存储路径';
+comment on column ${SCHEMA}.upload_file.access_url is '访问地址';
+comment on column ${SCHEMA}.upload_file.file_type is '文件类型';
+comment on column ${SCHEMA}.upload_file.data_count is '数据量';
+comment on column ${SCHEMA}.upload_file.description is '备注';
+comment on column ${SCHEMA}.upload_file.is_deleted is '删除标记';
+comment on column ${SCHEMA}.upload_file.create_by is '创建人';
+comment on column ${SCHEMA}.upload_file.create_time is '创建时间';
+comment on table ${SCHEMA}.upload_file is '上传文件';
 -- 索引
-create index idx_file_record_md5 on ${SCHEMA}.file_record (md5);
-create index idx_file_record_tenant on ${SCHEMA}.file_record (tenant_id);
\ No newline at end of file
+create index idx_upload_file on upload_file (rel_obj_type, rel_obj_id, rel_obj_field);
+create index idx_upload_file_tenant on upload_file (tenant_id);
\ No newline at end of file
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql
index e39a7e4a..778c7126 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-oracle.sql
@@ -1,38 +1,39 @@
--- 文件记录
-CREATE TABLE ${SCHEMA}.file_record
-(
-    uuid          VARCHAR2(32) NOT NULL,
-    tenant_id     NUMBER(20) DEFAULT 0 NOT NULL,
-    app_module    VARCHAR2(50),
-    md5           VARCHAR2(32),
-    file_name     VARCHAR2(100) NOT NULL,
-    file_type     VARCHAR2(20),
-    file_size     NUMBER(20) NOT NULL,
-    storage_path  VARCHAR2(200) NOT NULL,
-    access_url    VARCHAR2(200),
-    thumbnail_url VARCHAR2(200),
-    description   VARCHAR2(100),
-    is_deleted    NUMBER(1) DEFAULT 0 not null,
-    create_by     NUMBER(20) DEFAULT 0,
-    create_time   timestamp DEFAULT CURRENT_TIMESTAMP not null,
-    constraint PK_file_record primary key (uuid)
+-- 上传文件表
+CREATE TABLE ${SCHEMA}.upload_file (
+    uuid VARCHAR2(32) NOT NULL,
+    tenant_id          NUMBER(20)           default 0  not null,
+    app_module          VARCHAR2(50),
+    rel_obj_type VARCHAR2(50),
+    rel_obj_id VARCHAR2(32),
+    rel_obj_field VARCHAR2(50),
+    file_name VARCHAR2(100) NOT NULL,
+    storage_path VARCHAR2(200) NOT NULL,
+    access_url VARCHAR2(200),
+    file_type VARCHAR2(20),
+    data_count NUMBER(9)   DEFAULT 0 not null,
+    description VARCHAR2(100),
+    is_deleted NUMBER(1)   DEFAULT 0 not null,
+    create_by NUMBER(20)   default 0 ,
+    create_time timestamp   default CURRENT_TIMESTAMP not null,
+    constraint PK_upload_file primary key (uuid)
 );
--- 添加备注
-comment on column ${SCHEMA}.file_record.uuid is 'UUID';
-comment on column ${SCHEMA}.file_record.tenant_id is '租户ID';
-comment on column ${SCHEMA}.file_record.app_module is '应用模块';
-comment on column ${SCHEMA}.file_record.md5 is 'MD5标识';
-comment on column ${SCHEMA}.file_record.file_name is '文件名';
-comment on column ${SCHEMA}.file_record.file_type is '文件类型';
-comment on column ${SCHEMA}.file_record.file_size is '文件大小';
-comment on column ${SCHEMA}.file_record.storage_path is '存储路径';
-comment on column ${SCHEMA}.file_record.access_url is '访问地址';
-comment on column ${SCHEMA}.file_record.thumbnail_url is '缩略图地址';
-comment on column ${SCHEMA}.file_record.description is '备注';
-comment on column ${SCHEMA}.file_record.is_deleted is '删除标记';
-comment on column ${SCHEMA}.file_record.create_by is '创建人';
-comment on column ${SCHEMA}.file_record.create_time is '创建时间';
-comment on table ${SCHEMA}.file_record is '文件记录';
+-- 添加备注,
+comment on column ${SCHEMA}.upload_file.uuid is 'UUID';
+comment on column ${SCHEMA}.upload_file.tenant_id is '租户ID';
+comment on column ${SCHEMA}.upload_file.app_module is '应用模块';
+comment on column ${SCHEMA}.upload_file.rel_obj_type is '关联对象类';
+comment on column ${SCHEMA}.upload_file.rel_obj_id is '关联对象ID';
+comment on column ${SCHEMA}.upload_file.rel_obj_field is '关联对象属性名称';
+comment on column ${SCHEMA}.upload_file.file_name is '文件名';
+comment on column ${SCHEMA}.upload_file.storage_path is '存储路径';
+comment on column ${SCHEMA}.upload_file.access_url is '访问地址';
+comment on column ${SCHEMA}.upload_file.file_type is '文件类型';
+comment on column ${SCHEMA}.upload_file.data_count is '数据量';
+comment on column ${SCHEMA}.upload_file.description is '备注';
+comment on column ${SCHEMA}.upload_file.is_deleted is '删除标记';
+comment on column ${SCHEMA}.upload_file.create_by is '创建人';
+comment on column ${SCHEMA}.upload_file.create_time is '创建时间';
+comment on table ${SCHEMA}.upload_file is '上传文件';
 -- 索引
-create index idx_file_record_md5 on file_record (md5);
-create index idx_file_record_tenant on file_record (tenant_id);
\ No newline at end of file
+create index idx_upload_file on upload_file (rel_obj_type, rel_obj_id, rel_obj_field);
+create index idx_upload_file_tenant on upload_file (tenant_id);
\ No newline at end of file
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql
index c5322c4b..994da5ef 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-postgresql.sql
@@ -1,38 +1,39 @@
--- 文件记录
-CREATE TABLE file_record
-(
-    uuid          varchar(32)  NOT NULL,
-    tenant_id     bigint       NOT NULL DEFAULT 0,
-    app_module    varchar(50),
-    md5           varchar(32),
-    file_name     varchar(100) NOT NULL,
-    file_type     varchar(20),
-    file_size     bigint       NOT NULL,
-    storage_path  varchar(200) NOT NULL,
-    access_url    varchar(200),
-    thumbnail_url varchar(200),
-    description   varchar(100),
-    is_deleted    BOOLEAN      NOT NULL DEFAULT FALSE,
-    create_by     bigint                DEFAULT 0,
-    create_time   timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    constraint PK_file_record primary key (uuid)
+-- 上传文件表
+CREATE TABLE upload_file (
+     uuid varchar(32) NOT NULL,
+     tenant_id            bigint        not null default 0,
+     app_module          varchar(50),
+     rel_obj_type varchar(50),
+     rel_obj_id varchar(32),
+     rel_obj_field varchar(50),
+     file_name varchar(100) NOT NULL,
+     storage_path varchar(200) NOT NULL,
+     access_url varchar(200),
+     file_type varchar(20),
+     data_count int  not null DEFAULT 0,
+     description varchar(100),
+     is_deleted BOOLEAN not null DEFAULT FALSE,
+     create_by  bigint  default 0,
+     create_time  timestamp   not null default CURRENT_TIMESTAMP,
+     constraint PK_upload_file primary key (uuid)
 );
--- 添加备注
-comment on column file_record.uuid is 'UUID';
-comment on column file_record.tenant_id is '租户ID';
-comment on column file_record.app_module is '应用模块';
-comment on column file_record.md5 is 'MD5标识';
-comment on column file_record.file_name is '文件名';
-comment on column file_record.file_type is '文件类型';
-comment on column file_record.file_size is '文件大小';
-comment on column file_record.storage_path is '存储路径';
-comment on column file_record.access_url is '访问地址';
-comment on column file_record.thumbnail_url is '缩略图地址';
-comment on column file_record.description is '备注';
-comment on column file_record.is_deleted is '删除标记';
-comment on column file_record.create_by is '创建人';
-comment on column file_record.create_time is '创建时间';
-comment on table file_record is '文件记录';
+-- 添加备注,
+comment on column upload_file.uuid is 'UUID';
+comment on column upload_file.tenant_id is '租户ID';
+comment on column upload_file.app_module is '应用模块';
+comment on column upload_file.rel_obj_type is '关联对象类';
+comment on column upload_file.rel_obj_id is '关联对象ID';
+comment on column upload_file.rel_obj_field is '关联对象属性名称';
+comment on column upload_file.file_name is '文件名';
+comment on column upload_file.storage_path is '存储路径';
+comment on column upload_file.access_url is '访问地址';
+comment on column upload_file.file_type is '文件类型';
+comment on column upload_file.data_count is '数据量';
+comment on column upload_file.description is '备注';
+comment on column upload_file.is_deleted is '删除标记';
+comment on column upload_file.create_by is '创建人';
+comment on column upload_file.create_time is '创建时间';
+comment on table upload_file is '上传文件';
 -- 索引
-create index idx_file_record_md5 on file_record (md5);
-create index idx_file_record_tenant on file_record (tenant_id);
\ No newline at end of file
+create index idx_upload_file on upload_file (rel_obj_type, rel_obj_id, rel_obj_field);
+create index idx_upload_file_tenant on upload_file(tenant_id);
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql
index bdea3d45..9e675dad 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-sqlserver.sql
@@ -1,38 +1,39 @@
--- 文件记录
-CREATE TABLE ${SCHEMA}.file_record
-(
-    uuid          varchar(32)  NOT NULL,
-    tenant_id     bigint       NOT NULL DEFAULT 0,
-    app_module    varchar(50),
-    md5           varchar(32),
-    file_name     varchar(100) NOT NULL,
-    file_type     varchar(20),
-    file_size     bigint       NOT NULL,
-    storage_path  varchar(200) NOT NULL,
-    access_url    varchar(200),
-    thumbnail_url varchar(200),
-    description   varchar(100),
-    is_deleted    tinyint      NOT NULL DEFAULT 0,
-    create_by     bigint                DEFAULT 0,
-    create_time   timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    constraint PK_file_record primary key (uuid)
+-- 上传文件表
+CREATE TABLE ${SCHEMA}.upload_file (
+   uuid varchar(32) NOT NULL,
+   tenant_id            bigint        not null default 0,
+   app_module          varchar(50),
+   rel_obj_type varchar(50),
+   rel_obj_id varchar(32),
+   rel_obj_field varchar(50),
+   file_name varchar(100) NOT NULL,
+   storage_path varchar(200) NOT NULL,
+   access_url varchar(200) NULL,
+   file_type varchar(20),
+   data_count int  not null DEFAULT 0,
+   description varchar(100),
+   is_deleted tinyint not null DEFAULT 0,
+   create_by bigint default 0,
+   create_time datetime not null default CURRENT_TIMESTAMP,
+   constraint PK_upload_file primary key (uuid)
 );
--- 添加备注
-execute sp_addextendedproperty 'MS_Description', N'UUID', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'uuid';
-execute sp_addextendedproperty 'MS_Description', N'租户ID','SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'tenant_id';
-execute sp_addextendedproperty 'MS_Description', N'应用模块','SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'app_module';
-execute sp_addextendedproperty 'MS_Description', N'MD5标识', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'md5';
-execute sp_addextendedproperty 'MS_Description', N'文件名', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'file_name';
-execute sp_addextendedproperty 'MS_Description', N'文件类型', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'file_type';
-execute sp_addextendedproperty 'MS_Description', N'文件大小', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'file_size';
-execute sp_addextendedproperty 'MS_Description', N'存储路径', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'storage_path';
-execute sp_addextendedproperty 'MS_Description', N'访问地址', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'access_url';
-execute sp_addextendedproperty 'MS_Description', N'缩略图地址', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'thumbnail_url';
-execute sp_addextendedproperty 'MS_Description', N'备注', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'description';
-execute sp_addextendedproperty 'MS_Description', N'删除标记', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'is_deleted';
-execute sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'create_by';
-execute sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', '${SCHEMA}', 'table', file_record, 'column', 'create_time';
-execute sp_addextendedproperty 'MS_Description', N'文件记录', 'SCHEMA', '${SCHEMA}', 'table', file_record, null, null;
+-- 添加备注,
+execute sp_addextendedproperty 'MS_Description', N'UUID', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'uuid';
+execute sp_addextendedproperty 'MS_Description', N'租户ID','SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'tenant_id';
+execute sp_addextendedproperty 'MS_Description', N'应用模块','SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'app_module';
+execute sp_addextendedproperty 'MS_Description', N'关联对象类', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'rel_obj_type';
+execute sp_addextendedproperty 'MS_Description', N'关联对象ID', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'rel_obj_id';
+execute sp_addextendedproperty 'MS_Description', N'关联对象属性名称', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'rel_obj_field';
+execute sp_addextendedproperty 'MS_Description', N'文件名', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'file_name';
+execute sp_addextendedproperty 'MS_Description', N'存储路径', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'storage_path';
+execute sp_addextendedproperty 'MS_Description', N'访问地址', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'access_url';
+execute sp_addextendedproperty 'MS_Description', N'文件类型', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'file_type';
+execute sp_addextendedproperty 'MS_Description', N'数据量', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'data_count';
+execute sp_addextendedproperty 'MS_Description', N'备注', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'description';
+execute sp_addextendedproperty 'MS_Description', N'删除标记', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'is_deleted';
+execute sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'create_by';
+execute sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', '${SCHEMA}', 'table', upload_file, 'column', 'create_time';
+execute sp_addextendedproperty 'MS_Description', N'上传文件', 'SCHEMA', '${SCHEMA}', 'table', upload_file, null, null;
 -- 索引
-create nonclustered index idx_file_record_md5 on file_record (md5);
-create nonclustered index idx_file_record_tenant on file_record (tenant_id);
\ No newline at end of file
+create nonclustered index idx_upload_file on upload_file(rel_obj_type, rel_obj_id, rel_obj_field);
+create nonclustered index idx_upload_file_tenant on upload_file(tenant_id);
-- 
Gitee


From 5172c35a215369f442faeacbec374ffcc18f85a9 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 6 Jun 2022 21:38:22 +0800
Subject: [PATCH 163/195] =?UTF-8?q?+=20=E8=8E=B7=E5=8F=96DM=E5=BA=93schema?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/core/util/SqlFileInitializer.java  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
index f6c09d1f..af428ee8 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
@@ -401,6 +401,38 @@ public class SqlFileInitializer {
         return CURRENT_SCHEMA;
     }
 
+    /**
+     * 获取当前schema，DM默认schema=当前user
+     * @return
+     */
+    public static String getDMCurrentSchema(){
+        if(CURRENT_SCHEMA == null){
+            String jdbcUrl = ContextHelper.getJdbcUrl();
+            if(V.notEmpty(jdbcUrl) && S.contains(jdbcUrl, "schema=")) {
+                CURRENT_SCHEMA = S.substringAfterLast(jdbcUrl, "schema=");
+                if(CURRENT_SCHEMA.contains("&")) {
+                    CURRENT_SCHEMA = S.substringBefore(CURRENT_SCHEMA, "&");
+                }
+                return CURRENT_SCHEMA;
+            }
+            // 先查找配置中是否存在指定
+            String alterSessionSql = environment.getProperty("spring.datasource.hikari.connection-init-sql");
+            if(V.notEmpty(alterSessionSql) && S.containsIgnoreCase(alterSessionSql," current_schema=")){
+                CURRENT_SCHEMA = S.substringAfterLast(alterSessionSql, "=");
+            }
+            if(CURRENT_SCHEMA == null){
+                CURRENT_SCHEMA = environment.getProperty(MYBATIS_PLUS_SCHEMA_CONFIG);
+            }
+            if(CURRENT_SCHEMA == null){
+                // 然后默认为当前用户名大写
+                String username = environment.getProperty("spring.datasource.username");
+                if(username != null){
+                    CURRENT_SCHEMA = username.toUpperCase();
+                }
+            }
+        }
+        return CURRENT_SCHEMA;
+    }
 
     /**
      * 查询SQL返回第一项
-- 
Gitee


From de646a4cec0b64fa4502ef53f3ec4f83ed79d010 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Tue, 7 Jun 2022 12:44:29 +0800
Subject: [PATCH 164/195] =?UTF-8?q?*=20=E5=88=9D=E5=A7=8B=E5=8C=96SQL?=
 =?UTF-8?q?=E9=80=82=E9=85=8DKingbase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/core/util/SqlFileInitializer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
index af428ee8..1ba84edc 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
@@ -63,6 +63,9 @@ public class SqlFileInitializer {
         if (DbType.MARIADB.getDb().equalsIgnoreCase(dbType)) {
             dbType = "mysql";
         }
+        else if(DbType.KINGBASE_ES.getDb().equalsIgnoreCase(dbType)) {
+            dbType = DbType.POSTGRE_SQL.getDb();
+        }
         String sqlPath = "META-INF/sql/init-" + module + "-" + dbType + ".sql";
         return sqlPath;
     }
-- 
Gitee


From 2d130076034fefcf3d478e3c0aafdc565ba20f07 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 15 Jun 2022 15:03:00 +0800
Subject: [PATCH 165/195] =?UTF-8?q?*=20=E4=BF=9D=E5=AD=98=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=97=B6setTenantId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/diboot/iam/service/impl/IamUserServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
index b13a9135..b47b4168 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
@@ -197,10 +197,11 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
         return iamUserNums;
     }
 
-    private void createAccount(IamUserAccountDTO userAccountDTO) {
+    protected void createAccount(IamUserAccountDTO userAccountDTO) {
         // 创建账号信息
         IamAccount iamAccount = new IamAccount();
         iamAccount
+                .setTenantId(userAccountDTO.getTenantId())
                 .setUserType(IamUser.class.getSimpleName())
                 .setUserId(userAccountDTO.getId())
                 .setAuthAccount(userAccountDTO.getUsername())
-- 
Gitee


From 04025b47179465e04ae6792a7d668ab0a5dac588 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 15 Jun 2022 18:26:42 +0800
Subject: [PATCH 166/195] + MapUtils

---
 .../java/com/diboot/core/util/MapUtils.java   | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 diboot-core/src/main/java/com/diboot/core/util/MapUtils.java

diff --git a/diboot-core/src/main/java/com/diboot/core/util/MapUtils.java b/diboot-core/src/main/java/com/diboot/core/util/MapUtils.java
new file mode 100644
index 00000000..1ac88bf9
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/util/MapUtils.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.util;
+
+import java.util.Map;
+
+/**
+ * Map相关工具类
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/6/15
+ * Copyright © diboot.com
+ */
+public class MapUtils {
+
+    /**
+     * 忽略key大小写，兼容多库等场景
+     * @param map
+     * @param key
+     * @return
+     * @param <T>
+     */
+    public static <T> T getIgnoreCase(Map<String, T> map, String key) {
+        if(map.containsKey(key)) {
+            return map.get(key);
+        }
+        return map.get(key.toUpperCase());
+    }
+
+}
-- 
Gitee


From 8cf63ae149ff7e2ccbdcdc960537baea83671169 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 16 Jun 2022 14:03:33 +0800
Subject: [PATCH 167/195] + containsIgnoreCase

---
 .../java/diboot/core/test/util/VTest.java     |  9 ++++++++
 .../src/main/java/com/diboot/core/util/V.java | 22 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java
index 39fd7db0..2f4ea21d 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -133,4 +134,12 @@ public class VTest {
         Assert.assertTrue(isValidCol);
     }
 
+    @Test
+    public void testContains(){
+        List<String> IGNORE_FIELDS = Arrays.asList("id", "is_deleted");
+        Assert.assertTrue(V.contains(IGNORE_FIELDS, "is_deleted"));
+        Assert.assertTrue(V.containsIgnoreCase(IGNORE_FIELDS, "IS_DELETED"));
+        Assert.assertTrue(V.notContainsIgnoreCase(IGNORE_FIELDS, "DELETED"));
+    }
+
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/util/V.java b/diboot-core/src/main/java/com/diboot/core/util/V.java
index e93a03ed..b14a196b 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/V.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/V.java
@@ -368,6 +368,17 @@ public class V {
         return collection != null && collection.contains(target);
     }
 
+    /**
+     * 集合中是否包含指定字符串或其大写字符串
+     *
+     * @param collection 集合
+     * @param target     查找字符串
+     * @return 集合为空或者不包含元素，则返回false
+     */
+    public static boolean containsIgnoreCase(Collection<String> collection, String target) {
+        return collection != null && (collection.contains(target) || collection.contains(target.toLowerCase()) || collection.contains(target.toUpperCase()));
+    }
+
     /**
      * 集合中是否不包含指定元素
      *
@@ -379,6 +390,17 @@ public class V {
         return collection != null && !collection.contains(target);
     }
 
+    /**
+     * 集合中是否不包含指定字符串或其大写字符串
+     *
+     * @param collection 集合
+     * @param target     查找字符串
+     * @return 集合为空或者不包含元素，则返回false
+     */
+    public static boolean notContainsIgnoreCase(Collection<String> collection, String target) {
+        return !(containsIgnoreCase(collection, target));
+    }
+
     /**
      * 判断是否为数字（允许小数点）
      *
-- 
Gitee


From 4018cd49016a135fbb1158adbba86896b4921285 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 16 Jun 2022 17:12:11 +0800
Subject: [PATCH 168/195] =?UTF-8?q?*=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96jars?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 88c8db1a..6126e199 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,10 +29,10 @@
     <properties>
         <hibernate-validator.version>6.2.3.Final</hibernate-validator.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
-        <okhttp.version>4.9.3</okhttp.version>
+        <okhttp.version>4.10.0</okhttp.version>
         <aspectjweaver.version>1.9.9.1</aspectjweaver.version>
         <commons-io.version>2.11.0</commons-io.version>
-        <easyexcel.version>3.1.0</easyexcel.version>
+        <easyexcel.version>3.1.1</easyexcel.version>
         <diboot.version>2.6.0</diboot.version>
     </properties>
 
-- 
Gitee


From 469607613927f434601f517a6c3adc53110a12a8 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 16 Jun 2022 18:09:19 +0800
Subject: [PATCH 169/195] =?UTF-8?q?*=20=E6=97=A5=E5=BF=97=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/message/utils/TemplateUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java b/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java
index a72cabf5..859d0820 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/utils/TemplateUtils.java
@@ -77,8 +77,8 @@ public class TemplateUtils {
         // 从缓存中获取变量对应的方法
         List<String> variableValueList = new ArrayList<>();
         List<Field> fields = BeanUtils.extractFields(variableData.getClass(), BindVariable.class);
-        if(V.isEmpty(fields)){
-            log.warn("{} 类中无@BindVariable变量绑定注解，无法替换变量");
+        if (V.isEmpty(fields)) {
+            log.warn("{} 类中无@BindVariable变量绑定注解，无法替换变量", variableData.getClass());
             return templateContent;
         }
         for (String variable : messageTemplateVariables) {
-- 
Gitee


From 521c7094a8f2c4bf070a3dd1728ee932fb7ba94e Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 16 Jun 2022 18:09:28 +0800
Subject: [PATCH 170/195] + license header

---
 .../diboot/message/annotation/BindVariable.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java b/diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java
index b495f5b6..a53b095c 100644
--- a/diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java
+++ b/diboot-message-starter/src/main/java/com/diboot/message/annotation/BindVariable.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015-2022, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.diboot.message.annotation;
 
 import java.lang.annotation.*;
@@ -5,7 +20,7 @@ import java.lang.annotation.*;
 /**
  * 绑定变量
  * @author JerryMa
- * @version v3.0.0
+ * @version v2.6.0
  * @date 2022/5/27
  * Copyright © diboot.com
  */
-- 
Gitee


From 78314cc646b8fa377e5f5e7db8600979ac1a9d29 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 16 Jun 2022 18:13:59 +0800
Subject: [PATCH 171/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E5=8F=AF=E6=89=A7=E8=A1=8C=E7=BA=AF=E5=87=80=E7=9A=84?=
 =?UTF-8?q?SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/diboot/core/util/ContextHelper.java   |  6 +++++-
 .../diboot/core/util/SqlFileInitializer.java  | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
index 62a8005e..35d6bc17 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
@@ -227,7 +227,11 @@ public class ContextHelper implements ApplicationContextAware, ApplicationListen
      * @return
      */
     public static String getJdbcUrl() {
-        Environment environment = getApplicationContext().getEnvironment();
+        ApplicationContext applicationContext = getApplicationContext();
+        if (applicationContext == null) {
+            return null;
+        }
+        Environment environment = applicationContext.getEnvironment();
         String jdbcUrl = environment.getProperty("spring.datasource.url");
         if(jdbcUrl == null){
             jdbcUrl = environment.getProperty("spring.datasource.druid.url");
diff --git a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
index 1ba84edc..49ce24e0 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
@@ -207,14 +207,17 @@ public class SqlFileInitializer {
         sqlStatement = clearComments(sqlStatement);
         // 替换sqlStatement中的变量，如{SCHEMA}
         if(sqlStatement.contains("${SCHEMA}")){
-            if(getDbType().equals(DbType.SQL_SERVER.getDb())){
-                sqlStatement = S.replace(sqlStatement, "${SCHEMA}", getSqlServerCurrentSchema());
-            }
-            else if(getDbType().equals(DbType.ORACLE.getDb())){
-                sqlStatement = S.replace(sqlStatement, "${SCHEMA}", getOracleCurrentSchema());
-            }
-            else{
-                sqlStatement = S.replace(sqlStatement, "${SCHEMA}.", "");
+            String dbType = getDbType();
+            if (dbType != null) {
+                if(dbType.equals(DbType.SQL_SERVER.getDb())){
+                    sqlStatement = S.replace(sqlStatement, "${SCHEMA}", getSqlServerCurrentSchema());
+                }
+                else if(dbType.equals(DbType.ORACLE.getDb())){
+                    sqlStatement = S.replace(sqlStatement, "${SCHEMA}", getOracleCurrentSchema());
+                }
+                else{
+                    sqlStatement = S.replace(sqlStatement, "${SCHEMA}.", "");
+                }
             }
         }
         return sqlStatement;
-- 
Gitee


From d4280080f23a5ea8e97313474438c638a1ac3646 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 16 Jun 2022 18:19:36 +0800
Subject: [PATCH 172/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0file=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6DM=E5=BA=93=E5=88=9D=E5=A7=8Bsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/META-INF/sql/init-file-dm.sql          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
index 6c4e204b..95f8f041 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
@@ -35,5 +35,5 @@ comment on column ${SCHEMA}.upload_file.create_by is '创建人';
 comment on column ${SCHEMA}.upload_file.create_time is '创建时间';
 comment on table ${SCHEMA}.upload_file is '上传文件';
 -- 索引
-create index idx_upload_file on upload_file (rel_obj_type, rel_obj_id, rel_obj_field);
-create index idx_upload_file_tenant on upload_file (tenant_id);
\ No newline at end of file
+create index idx_upload_file on ${SCHEMA}.upload_file (rel_obj_type, rel_obj_id, rel_obj_field);
+create index idx_upload_file_tenant on ${SCHEMA}.upload_file (tenant_id);
\ No newline at end of file
-- 
Gitee


From 548e1ae9b9f9224653bdb09f7cb7253d847889be Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 16 Jun 2022 23:20:16 +0800
Subject: [PATCH 173/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0schedule=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6DM=E5=BA=93=E5=88=9D=E5=A7=8Bsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/META-INF/sql/init-scheduler-dm.sql       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql b/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
index 8c6f9530..d6ba86dd 100644
--- a/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
+++ b/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
@@ -15,7 +15,7 @@ CREATE TABLE ${SCHEMA}.schedule_job (
   create_time  timestamp default CURRENT_TIMESTAMP   not null,
   update_time  timestamp default CURRENT_TIMESTAMP  null
 );
-comment on column schedule_job.id is 'ID';
+comment on column ${SCHEMA}.schedule_job.id is 'ID';
 comment on column ${SCHEMA}.schedule_job.tenant_id is '租户ID';
 comment on column ${SCHEMA}.schedule_job.job_key is 'job编码';
 comment on column ${SCHEMA}.schedule_job.job_name is 'job名称';
-- 
Gitee


From 36a4ad7ff4240ebf38474bc2b08b0a46dadd4021 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 17 Jun 2022 12:17:07 +0800
Subject: [PATCH 174/195] =?UTF-8?q?*=20BindQuery=E7=A9=BA=E5=80=BC?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96&=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BAisNull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/test/binder/entity/Department.java   |  4 ++-
 .../diboot/core/test/query/TestJoinQuery.java | 18 +++++++++++++
 .../com/diboot/core/binding/QueryBuilder.java | 26 +++++++++++++------
 .../diboot/core/binding/query/Strategy.java   |  4 +++
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
index 6576346e..03abb087 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
@@ -18,6 +18,7 @@ package diboot.core.test.binder.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.diboot.core.binding.query.BindQuery;
 import com.diboot.core.binding.query.Comparison;
+import com.diboot.core.binding.query.Strategy;
 import com.diboot.core.data.access.DataAccessCheckpoint;
 import com.diboot.core.entity.BaseEntity;
 import lombok.Getter;
@@ -36,6 +37,7 @@ import lombok.experimental.Accessors;
 public class Department extends BaseEntity {
     private static final long serialVersionUID = -4849732665419794547L;
 
+    @BindQuery(comparison = Comparison.EQ, strategy = Strategy.INCLUDE_NULL)
     @TableField
     private Long parentId;
 
@@ -43,7 +45,7 @@ public class Department extends BaseEntity {
     @DataAccessCheckpoint()
     private Long orgId;
 
-    @BindQuery(comparison = Comparison.CONTAINS)
+    @BindQuery(comparison = Comparison.STARTSWITH)
     @TableField
     private String name;
 
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
index b4e05d88..4f1ffde5 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
@@ -246,6 +246,24 @@ public class TestJoinQuery {
         Assert.assertTrue(list.size() > 5);
     }
 
+
+    /**
+     * 测试空值和null
+     */
+    @Test
+    public void testNullEmptyQuery() {
+        Department entity = new Department();
+        entity.setName("测试组");
+        entity.setOrgId(100001L);
+        QueryWrapper<Department> queryWrapper = QueryBuilder.toQueryWrapper(entity);
+        System.out.println(queryWrapper.getExpression());
+        Assert.assertTrue(queryWrapper.getSqlSegment().contains("parent_id IS NULL"));
+
+        entity.setParentId(10001L);
+        queryWrapper = QueryBuilder.toQueryWrapper(entity);
+        Assert.assertTrue(queryWrapper.getSqlSegment().contains("parent_id = #{"));
+    }
+
     @Test
     public void test(){
         String sql = buildCheckDeletedColSql("test");
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
index 897f7d26..de940ce4 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
@@ -199,14 +199,17 @@ public class QueryBuilder {
                             Class<?> clazz = getClass.apply(query);
                             String fieldName = getFieldName.apply(query, entry.getKey());
                             if (ParserCache.getProtectFieldList(clazz).contains(fieldName)) {
-                                buildQuery(queryWrapper.or(), Comparison.EQ, columnName, protectFieldHandler.encrypt(clazz, fieldName, value.toString()));
+                                buildQuery(queryWrapper.or(), bindQuery, columnName, protectFieldHandler.encrypt(clazz, fieldName, value.toString()));
                                 continue;
                             }
                         }
-                        buildQuery(queryWrapper.or(), bindQuery.comparison(), columnName, value);
+                        buildQuery(queryWrapper.or(), bindQuery, columnName, value);
                     }
                 });
             } else {
+                if(query == null && V.isEmpty(value)) {
+                    continue;
+                }
                 if (ignoreEmpty.test(value, query)) {
                     continue;
                 }
@@ -215,11 +218,11 @@ public class QueryBuilder {
                     Class<?> clazz = getClass.apply(query);
                     String fieldName = getFieldName.apply(query, entry.getKey());
                     if (ParserCache.getProtectFieldList(clazz).contains(fieldName)) {
-                        buildQuery(wrapper, Comparison.EQ, columnName, protectFieldHandler.encrypt(clazz, fieldName, value.toString()));
+                        buildQuery(wrapper, query, columnName, protectFieldHandler.encrypt(clazz, fieldName, value.toString()));
                         continue;
                     }
                 }
-                buildQuery(wrapper, query != null ? query.comparison() : Comparison.EQ, columnName, value);
+                buildQuery(wrapper, query, columnName, value);
             }
         }
         return wrapper;
@@ -229,14 +232,20 @@ public class QueryBuilder {
      * 建立条件
      *
      * @param wrapper    条件包装器
-     * @param comparison 比较类型
+     * @param bindQuery 注解
      * @param columnName 列名
      * @param value      值
      */
-    private static void buildQuery(QueryWrapper<?> wrapper, Comparison comparison, String columnName, Object value) {
+    private static void buildQuery(QueryWrapper<?> wrapper, BindQuery bindQuery, String columnName, Object value) {
+        Comparison comparison = bindQuery != null ? bindQuery.comparison() : Comparison.EQ;
         switch (comparison) {
             case EQ:
-                wrapper.eq(columnName, value);
+                if(value == null && bindQuery != null && bindQuery.strategy().equals(Strategy.INCLUDE_NULL)) {
+                    wrapper.isNull(columnName);
+                }
+                else{
+                    wrapper.eq(columnName, value);
+                }
                 break;
             case IN:
                 if (value.getClass().isArray()) {
@@ -374,7 +383,8 @@ public class QueryBuilder {
             if (field.isAnnotationPresent(TableLogic.class) && V.equals(false, value)) {
                 continue;
             }
-            if (value != null) {
+            BindQuery bindQuery = field.getAnnotation(BindQuery.class);
+            if (value != null || (bindQuery != null && bindQuery.strategy().equals(Strategy.INCLUDE_NULL))) {
                 resultMap.put(fieldName, new FieldAndValue(field, value));
             }
         }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/query/Strategy.java b/diboot-core/src/main/java/com/diboot/core/binding/query/Strategy.java
index b976fc54..770e047f 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/query/Strategy.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/query/Strategy.java
@@ -31,4 +31,8 @@ public enum Strategy {
      * 空字符串""参与查询
      */
     INCLUDE_EMPTY,
+    /**
+     * null参与构建isNull
+     */
+    INCLUDE_NULL,
 }
-- 
Gitee


From 2d618fb16051caa9059347596480415003d826c9 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 17 Jun 2022 16:54:43 +0800
Subject: [PATCH 175/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96schema=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/core/util/SqlFileInitializer.java  | 119 ++----------------
 1 file changed, 13 insertions(+), 106 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
index 49ce24e0..a4504283 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
@@ -22,13 +22,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 
+import javax.sql.DataSource;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -40,8 +40,6 @@ import java.util.stream.Collectors;
 public class SqlFileInitializer {
     private static final Logger log = LoggerFactory.getLogger(SqlFileInitializer.class);
 
-    // 数据字典SQL
-    private static final String MYBATIS_PLUS_SCHEMA_CONFIG = "mybatis-plus.global-config.db-config.schema";
     private static String CURRENT_SCHEMA = null;
     private static Environment environment;
 
@@ -207,18 +205,8 @@ public class SqlFileInitializer {
         sqlStatement = clearComments(sqlStatement);
         // 替换sqlStatement中的变量，如{SCHEMA}
         if(sqlStatement.contains("${SCHEMA}")){
-            String dbType = getDbType();
-            if (dbType != null) {
-                if(dbType.equals(DbType.SQL_SERVER.getDb())){
-                    sqlStatement = S.replace(sqlStatement, "${SCHEMA}", getSqlServerCurrentSchema());
-                }
-                else if(dbType.equals(DbType.ORACLE.getDb())){
-                    sqlStatement = S.replace(sqlStatement, "${SCHEMA}", getOracleCurrentSchema());
-                }
-                else{
-                    sqlStatement = S.replace(sqlStatement, "${SCHEMA}.", "");
-                }
-            }
+            String schema = getCurrentSchema();
+            sqlStatement = S.replace(sqlStatement, "${SCHEMA}.", schema);
         }
         return sqlStatement;
     }
@@ -360,107 +348,26 @@ public class SqlFileInitializer {
         return inputSql;
     }
 
-    //SQL Server查询当前schema
-    public static final String SQL_DEFAULT_SCHEMA = "SELECT DISTINCT default_schema_name FROM sys.database_principals where default_schema_name is not null AND name!='guest'";
-    /**
-     * 查询SqlServer当前schema
-     * @return
-     */
-    public static String getSqlServerCurrentSchema(){
-        if(CURRENT_SCHEMA == null){
-            Object firstValue = queryFirstValue(SQL_DEFAULT_SCHEMA, "default_schema_name");
-            if(firstValue != null){
-                CURRENT_SCHEMA = (String)firstValue;
-            }
-            if(CURRENT_SCHEMA == null){
-                CURRENT_SCHEMA = environment.getProperty(MYBATIS_PLUS_SCHEMA_CONFIG);
-            }
-            // dbo schema兜底
-            if(CURRENT_SCHEMA == null){
-                CURRENT_SCHEMA = "dbo";
-            }
-        }
-        return CURRENT_SCHEMA;
-    }
-    /**
-     * 获取当前schema，oracle默认schema=当前user
-     * @return
-     */
-    public static String getOracleCurrentSchema(){
-        if(CURRENT_SCHEMA == null){
-            // 先查找配置中是否存在指定
-            String alterSessionSql = environment.getProperty("spring.datasource.hikari.connection-init-sql");
-            if(V.notEmpty(alterSessionSql) && S.containsIgnoreCase(alterSessionSql," current_schema=")){
-                CURRENT_SCHEMA = S.substringAfterLast(alterSessionSql, "=");
-            }
-            if(CURRENT_SCHEMA == null){
-                CURRENT_SCHEMA = environment.getProperty(MYBATIS_PLUS_SCHEMA_CONFIG);
-            }
-            if(CURRENT_SCHEMA == null){
-                // 然后默认为当前用户名大写
-                String username = environment.getProperty("spring.datasource.username");
-                if(username != null){
-                    CURRENT_SCHEMA = username.toUpperCase();
-                }
-            }
-        }
-        return CURRENT_SCHEMA;
-    }
-
     /**
-     * 获取当前schema，DM默认schema=当前user
+     * 获取当前schema
      * @return
      */
-    public static String getDMCurrentSchema(){
-        if(CURRENT_SCHEMA == null){
-            String jdbcUrl = ContextHelper.getJdbcUrl();
-            if(V.notEmpty(jdbcUrl) && S.contains(jdbcUrl, "schema=")) {
-                CURRENT_SCHEMA = S.substringAfterLast(jdbcUrl, "schema=");
-                if(CURRENT_SCHEMA.contains("&")) {
-                    CURRENT_SCHEMA = S.substringBefore(CURRENT_SCHEMA, "&");
-                }
-                return CURRENT_SCHEMA;
+    public static String getCurrentSchema() {
+        if(CURRENT_SCHEMA == null) {
+            DataSource dataSource = ContextHelper.getBean(DataSource.class);
+            try{
+                CURRENT_SCHEMA = dataSource.getConnection().getSchema();
             }
-            // 先查找配置中是否存在指定
-            String alterSessionSql = environment.getProperty("spring.datasource.hikari.connection-init-sql");
-            if(V.notEmpty(alterSessionSql) && S.containsIgnoreCase(alterSessionSql," current_schema=")){
-                CURRENT_SCHEMA = S.substringAfterLast(alterSessionSql, "=");
+            catch (Exception e){
+                log.warn("获取schema异常: {}", e.getMessage());
             }
-            if(CURRENT_SCHEMA == null){
-                CURRENT_SCHEMA = environment.getProperty(MYBATIS_PLUS_SCHEMA_CONFIG);
-            }
-            if(CURRENT_SCHEMA == null){
-                // 然后默认为当前用户名大写
-                String username = environment.getProperty("spring.datasource.username");
-                if(username != null){
-                    CURRENT_SCHEMA = username.toUpperCase();
-                }
+            if(CURRENT_SCHEMA == null) {
+                CURRENT_SCHEMA = "";
             }
         }
         return CURRENT_SCHEMA;
     }
 
-    /**
-     * 查询SQL返回第一项
-     * @return
-     */
-    public static Object queryFirstValue(String sql, String key){
-        try{
-            List<Map<String, Object>> mapList = SqlExecutor.executeQuery(sql, null);
-            if(V.notEmpty(mapList)){
-                for (Map<String, Object> mapElement : mapList){
-                    if(mapElement.get(key) != null){
-                        return mapElement.get(key);
-                    }
-                }
-            }
-        }
-        catch(Exception e){
-            log.error("获取SqlServer默认Schema异常: {}", e.getMessage());
-        }
-        return null;
-    }
-
     /**
      * 获取数据库类型
      * @return
-- 
Gitee


From 35115477213345e23c0c75ced2bb255387b53872 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 17 Jun 2022 17:51:17 +0800
Subject: [PATCH 176/195] =?UTF-8?q?*=20=E8=8E=B7=E5=8F=96schema=E5=90=8Ecl?=
 =?UTF-8?q?ose=20connection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/core/util/SqlFileInitializer.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
index a4504283..74fc8221 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
@@ -356,7 +356,9 @@ public class SqlFileInitializer {
         if(CURRENT_SCHEMA == null) {
             DataSource dataSource = ContextHelper.getBean(DataSource.class);
             try{
-                CURRENT_SCHEMA = dataSource.getConnection().getSchema();
+                Connection connection = dataSource.getConnection();
+                CURRENT_SCHEMA = connection.getSchema();
+                connection.close();
             }
             catch (Exception e){
                 log.warn("获取schema异常: {}", e.getMessage());
-- 
Gitee


From 673316b98a9a4e22b5bc405e1a948329dd1f053c Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Fri, 17 Jun 2022 18:52:47 +0800
Subject: [PATCH 177/195] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E7=BA=AF=E5=87=80SQL=E7=9A=84SCHEMA=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/core/util/SqlFileInitializer.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
index 74fc8221..f9ac5781 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
@@ -206,7 +206,9 @@ public class SqlFileInitializer {
         // 替换sqlStatement中的变量，如{SCHEMA}
         if(sqlStatement.contains("${SCHEMA}")){
             String schema = getCurrentSchema();
-            sqlStatement = S.replace(sqlStatement, "${SCHEMA}.", schema);
+            if (V.notEmpty(schema)) {
+                sqlStatement = S.replace(sqlStatement, "${SCHEMA}", schema);
+            }
         }
         return sqlStatement;
     }
-- 
Gitee


From 4a0070c940f3845bbb9d88d8ba913ac6c5df3dea Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 16 Jun 2022 17:12:11 +0800
Subject: [PATCH 178/195] =?UTF-8?q?*=20=E6=81=A2=E5=A4=8Dmysql=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96schema=E5=90=8E=E7=9A=84=E6=9B=BF=E6=8D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/core/util/SqlFileInitializer.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
index f9ac5781..772d6c6d 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/SqlFileInitializer.java
@@ -206,7 +206,10 @@ public class SqlFileInitializer {
         // 替换sqlStatement中的变量，如{SCHEMA}
         if(sqlStatement.contains("${SCHEMA}")){
             String schema = getCurrentSchema();
-            if (V.notEmpty(schema)) {
+            if (V.isEmpty(schema)) {
+                sqlStatement = S.replace(sqlStatement, "${SCHEMA}.", "");
+            }
+            else {
                 sqlStatement = S.replace(sqlStatement, "${SCHEMA}", schema);
             }
         }
@@ -311,7 +314,7 @@ public class SqlFileInitializer {
      * @param inputSql
      * @return
      */
-    private static String clearComments(String inputSql){
+    public static String clearComments(String inputSql){
         String[] sqlRows = inputSql.split("\\n");
         List<String> cleanSql = new ArrayList();
         for(String row : sqlRows){
-- 
Gitee


From a54220fe8f7d5d071e84e937a9ff2c60966b9e11 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 18 Jun 2022 16:52:37 +0800
Subject: [PATCH 179/195] =?UTF-8?q?*=20=E7=BC=A9=E5=87=8FRequestParams?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/iam/entity/IamOperationLog.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamOperationLog.java b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamOperationLog.java
index ef3749f9..f604e09e 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamOperationLog.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/entity/IamOperationLog.java
@@ -126,8 +126,8 @@ public class IamOperationLog extends BaseEntity {
     private String errorMsg;
 
     public IamOperationLog setRequestParams(String requestParams){
-        if(V.notEmpty(requestParams) && requestParams.length() > 1000){
-            requestParams = S.cut(requestParams, 1000);
+        if(V.notEmpty(requestParams) && requestParams.length() > 980){
+            requestParams = S.cut(requestParams, 980);
         }
         this.requestParams = requestParams;
         return this;
-- 
Gitee


From affaf38527aa95a484ed7375b9acab389870d355 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Sat, 18 Jun 2022 17:24:01 +0800
Subject: [PATCH 180/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0DM=E5=88=97?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/META-INF/sql/init-core-dm.sql   | 12 ++---
 .../resources/META-INF/sql/init-file-dm.sql   | 16 +++---
 .../resources/META-INF/sql/init-iam-dm.sql    | 52 +++++++++----------
 .../META-INF/sql/init-message-dm.sql          | 24 ++++-----
 .../resources/META-INF/sql/init-mobile-dm.sql |  6 +--
 .../META-INF/sql/init-scheduler-dm.sql        | 10 ++--
 6 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql b/diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql
index 35249147..9e5271ff 100644
--- a/diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql
+++ b/diboot-core-starter/src/main/resources/META-INF/sql/init-core-dm.sql
@@ -3,12 +3,12 @@ create table ${SCHEMA}.dictionary (
     id                 BIGINT identity ( 10000,1) primary key,
     parent_id          BIGINT           default 0  not null,
     tenant_id          BIGINT           default 0  not null,
-    app_module          VARCHAR(50),
-    type               VARCHAR(50)          not null,
-    item_name          VARCHAR(100)         not null,
-    item_value         VARCHAR(100),
-    description        VARCHAR(100),
-    extdata            VARCHAR(200),
+    app_module          VARCHAR(150),
+    type               VARCHAR(150)          not null,
+    item_name          VARCHAR(300)         not null,
+    item_value         VARCHAR(300),
+    description        VARCHAR(300),
+    extdata            VARCHAR(600),
     sort_id            SMALLINT           default 99  not null,
     is_deletable       BIT          default 1  not null,
     is_editable        BIT          default 1  not null,
diff --git a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
index 95f8f041..9116049e 100644
--- a/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
+++ b/diboot-file-starter/src/main/resources/META-INF/sql/init-file-dm.sql
@@ -3,15 +3,15 @@ CREATE TABLE ${SCHEMA}.upload_file (
    uuid VARCHAR(32) NOT NULL,
    tenant_id          BIGINT           default 0  not null,
    app_module          VARCHAR(50),
-   rel_obj_type VARCHAR(50),
-   rel_obj_id VARCHAR(32),
-   rel_obj_field VARCHAR(50),
-   file_name VARCHAR(100) NOT NULL,
-   storage_path VARCHAR(200) NOT NULL,
-   access_url VARCHAR(200),
-   file_type VARCHAR(20),
+   rel_obj_type VARCHAR(150),
+   rel_obj_id VARCHAR(100),
+   rel_obj_field VARCHAR(150),
+   file_name VARCHAR(300) NOT NULL,
+   storage_path VARCHAR(500) NOT NULL,
+   access_url VARCHAR(500),
+   file_type VARCHAR(50),
    data_count INT   DEFAULT 0 not null,
-   description VARCHAR(100),
+   description VARCHAR(300),
    is_deleted BIT   DEFAULT 0 not null,
    create_by BIGINT   default 0 ,
    create_time timestamp   default CURRENT_TIMESTAMP not null,
diff --git a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql
index 1898dd0e..0f2cb3a3 100644
--- a/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql
+++ b/diboot-iam-starter/src/main/resources/META-INF/sql/init-iam-dm.sql
@@ -4,13 +4,13 @@ create table ${SCHEMA}.iam_user
     id BIGINT not null primary key,
     tenant_id          BIGINT           default 0  not null,
     org_id BIGINT   default 0 not null,
-    user_num VARCHAR(20)   not null,
+    user_num VARCHAR(50)   not null,
     realname VARCHAR(50)   not null,
-    gender VARCHAR(10)   not null,
+    gender VARCHAR(20)   not null,
     birthdate date   null,
-    mobile_phone VARCHAR(20)   null,
-    email VARCHAR(50)   null,
-    avatar_url VARCHAR(200)   null,
+    mobile_phone VARCHAR(30)   null,
+    email VARCHAR(100)   null,
+    avatar_url VARCHAR(500)   null,
     status VARCHAR(10)   default 'A' not null,
     is_deleted BIT   DEFAULT 0 not null,
     create_time timestamp   default CURRENT_TIMESTAMP not null,
@@ -45,10 +45,10 @@ create table ${SCHEMA}.iam_account
     tenant_id          BIGINT           default 0  not null,
     user_type VARCHAR(100) default 'IamUser'   not null,
     user_id BIGINT   not null,
-    auth_type VARCHAR(20) default 'PWD'   not null,
-    auth_account VARCHAR(100)   not null,
+    auth_type VARCHAR(50) default 'PWD'   not null,
+    auth_account VARCHAR(200)   not null,
     auth_secret VARCHAR(100)   null,
-    secret_salt VARCHAR(32)   null,
+    secret_salt VARCHAR(50)   null,
     status VARCHAR(10) default 'A'   not null,
     is_deleted BIT DEFAULT 0   not null,
     create_time timestamp default CURRENT_TIMESTAMP   not null,
@@ -76,9 +76,9 @@ create table ${SCHEMA}.iam_role
 (
     id BIGINT not null primary key,
     tenant_id          BIGINT           default 0  not null,
-    name VARCHAR(50)   not null,
-    code VARCHAR(50)   not null,
-    description VARCHAR(100)   null,
+    name VARCHAR(100)   not null,
+    code VARCHAR(100)   not null,
+    description VARCHAR(300)   null,
     is_deleted BIT DEFAULT 0   not null,
     create_time timestamp default CURRENT_TIMESTAMP   null,
     update_time timestamp   default CURRENT_TIMESTAMP null
@@ -126,10 +126,10 @@ create table ${SCHEMA}.iam_resource_permission
     app_module          VARCHAR(50),
     tenant_id          BIGINT           default 0  not null,
     parent_id BIGINT default 0   not null,
-    display_type VARCHAR(20) not null,
+    display_type VARCHAR(60) not null,
     display_name VARCHAR(100) not null,
     resource_code VARCHAR(100)   null,
-    permission_code VARCHAR(200)   null,
+    permission_code VARCHAR(300)   null,
     sort_id BIGINT  null,
     is_deleted BIT DEFAULT 0   not null,
     create_time timestamp default CURRENT_TIMESTAMP   not null,
@@ -181,10 +181,10 @@ create table ${SCHEMA}.iam_login_trace
     tenant_id          BIGINT           default 0  not null,
     user_type VARCHAR(100) default 'IamUser'    not null,
     user_id BIGINT    not null,
-    auth_type VARCHAR(20) default 'PWD'    not null,
+    auth_type VARCHAR(60) default 'PWD'    not null,
     auth_account VARCHAR(100)    not null,
-    ip_address VARCHAR(50)    null,
-    user_agent VARCHAR(200)    null,
+    ip_address VARCHAR(100)    null,
+    user_agent VARCHAR(500)    null,
     is_success BIT DEFAULT 0    not null,
     create_time timestamp default CURRENT_TIMESTAMP   not null
 );
@@ -217,10 +217,10 @@ create table ${SCHEMA}.iam_operation_log
     user_realname    VARCHAR(100)  null,
     request_uri    VARCHAR(500)                  not null,
     request_method VARCHAR(20)                   not null,
-    request_params    VARCHAR(1000)              null,
-    request_ip   VARCHAR(50)                     null,
+    request_params    VARCHAR(3000)              null,
+    request_ip   VARCHAR(100)                     null,
     status_code   NUMBER(6)   default 0   not null,
-    error_msg     VARCHAR(1000)           null,
+    error_msg     VARCHAR(3000)           null,
     is_deleted BIT DEFAULT 0    not null,
     create_time timestamp default CURRENT_TIMESTAMP   not null
 );
@@ -252,14 +252,14 @@ CREATE TABLE ${SCHEMA}.iam_org (
    parent_id BIGINT DEFAULT 0 NOT NULL,
    top_org_id BIGINT DEFAULT 0 NOT NULL,
    name VARCHAR(100) NOT NULL,
-   short_name VARCHAR(50) NOT NULL,
+   short_name VARCHAR(100) NOT NULL,
    type        VARCHAR(100) DEFAULT 'DEPT' NOT NULL,
    code        VARCHAR(50)  NOT NULL,
    manager_id  BIGINT   DEFAULT 0 NOT NULL,
    depth NUMBER(6) DEFAULT 1 NOT NULL,
    sort_id BIGINT DEFAULT 1 NOT NULL,
    status      VARCHAR(10)  DEFAULT 'A' NOT NULL,
-   org_comment VARCHAR(255)   null,
+   org_comment VARCHAR(500)   null,
    is_deleted BIT DEFAULT 0    not null,
    create_time timestamp default CURRENT_TIMESTAMP   not null,
    update_time timestamp   default CURRENT_TIMESTAMP null
@@ -293,8 +293,8 @@ create table ${SCHEMA}.iam_position
     code                 VARCHAR(50)                           not null,
     is_virtual           BIT  default 0                 not null,
     grade_name           VARCHAR(50)                           null,
-    grade_value          VARCHAR(30) default '0'               null,
-    data_permission_type VARCHAR(20) default 'SELF'            null,
+    grade_value          VARCHAR(50) default '0'               null,
+    data_permission_type VARCHAR(50) default 'SELF'            null,
     is_deleted BIT DEFAULT 0    not null,
     create_time timestamp default CURRENT_TIMESTAMP   not null,
     update_time timestamp   default CURRENT_TIMESTAMP null
@@ -347,9 +347,9 @@ create table ${SCHEMA}.system_config
 (
     id BIGINT identity ( 100000,1 ) primary key,
     tenant_id NUMBER (20) default 0 not null,
-    type VARCHAR (50) not null,
-    prop VARCHAR (50) not null,
-    value VARCHAR (255),
+    type VARCHAR (100) not null,
+    prop VARCHAR (100) not null,
+    value VARCHAR (500),
     is_deleted NUMBER (1) default 0 not null,
     create_time TIMESTAMP default CURRENT_TIMESTAMP not null,
     update_time timestamp default CURRENT_TIMESTAMP null
diff --git a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql
index 026e4a58..923d87df 100644
--- a/diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql
+++ b/diboot-message-starter/src/main/resources/META-INF/sql/init-message-dm.sql
@@ -3,10 +3,10 @@ CREATE TABLE ${SCHEMA}.message_template (
      id                 BIGINT identity ( 100000,1 ) primary key,
      tenant_id          BIGINT           default 0  not null,
      app_module         VARCHAR(50),
-     code VARCHAR(20) NOT NULL,
-     title VARCHAR(100) NOT NULL,
-     content VARCHAR(500) NOT NULL,
-     ext_data VARCHAR(500),
+     code VARCHAR(50) NOT NULL,
+     title VARCHAR(200) NOT NULL,
+     content VARCHAR(1000) NOT NULL,
+     ext_data VARCHAR(1000),
      is_deleted   BIT DEFAULT 0    not null,
      create_time  timestamp default CURRENT_TIMESTAMP   not null,
      create_by BIGINT DEFAULT 0 NOT NULL,
@@ -33,19 +33,19 @@ create index idx_msg_tmpl_code ON ${SCHEMA}.message_template(code);
 CREATE TABLE ${SCHEMA}.message (
   id BIGINT identity ( 100000,1 ) primary key,
   tenant_id          BIGINT           default 0  not null,
-  app_module         VARCHAR(50),
+  app_module         VARCHAR(100),
   template_id        BIGINT,
   business_type       VARCHAR(100)          not null,
   business_code       VARCHAR(100) default 0  not null,
-  sender VARCHAR(100)  not null,
-  receiver VARCHAR(100) not null,
-  title VARCHAR(100) NOT NULL,
-  content VARCHAR(500) NOT NULL,
-  channel VARCHAR(30) NOT NULL,
+  sender VARCHAR(200)  not null,
+  receiver VARCHAR(200) not null,
+  title VARCHAR(200) NOT NULL,
+  content VARCHAR(1500) NOT NULL,
+  channel VARCHAR(50) NOT NULL,
   status VARCHAR(30) NOT NULL,
-  result      VARCHAR(200),
+  result      VARCHAR(600),
   schedule_time  timestamp   null,
-  ext_data VARCHAR(200),
+  ext_data VARCHAR(600),
   is_deleted   BIT DEFAULT 0    not null,
   create_time  timestamp default CURRENT_TIMESTAMP   not null,
   update_time  timestamp default CURRENT_TIMESTAMP null
diff --git a/diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql b/diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql
index 4028ef8c..8bc37118 100644
--- a/diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql
+++ b/diboot-mobile-starter/src/main/resources/META-INF/sql/init-mobile-dm.sql
@@ -5,9 +5,9 @@ CREATE TABLE ${SCHEMA}.iam_member (
   org_id BIGINT  default 0 not null,
   user_id BIGINT default 0 not null,
   user_type VARCHAR(100) NOT NULL DEFAULT 'IamUser',
-  openid VARCHAR(50) NOT NULL,
+  openid VARCHAR(100) NOT NULL,
   nickname VARCHAR(100),
-  avatar_url VARCHAR(255),
+  avatar_url VARCHAR(500),
   country VARCHAR(50),
   province VARCHAR(50),
   city VARCHAR(100),
@@ -15,7 +15,7 @@ CREATE TABLE ${SCHEMA}.iam_member (
   email VARCHAR(100),
   gender VARCHAR(10),
   status VARCHAR(20) NOT NULL DEFAULT 'NORMAL',
-  description VARCHAR(200),
+  description VARCHAR(600),
   is_deleted   BIT DEFAULT 0    not null,
   create_time  timestamp default CURRENT_TIMESTAMP   not null,
   update_time  timestamp default CURRENT_TIMESTAMP  null
diff --git a/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql b/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
index d6ba86dd..4b528fa4 100644
--- a/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
+++ b/diboot-scheduler-starter/src/main/resources/META-INF/sql/init-scheduler-dm.sql
@@ -3,13 +3,13 @@ CREATE TABLE ${SCHEMA}.schedule_job (
   id BIGINT identity ( 100000,1) primary key,
   tenant_id          BIGINT           default 0  not null,
   job_key    VARCHAR(100)          not null,
-  job_name       VARCHAR(100)          not null,
+  job_name       VARCHAR(200)          not null,
   cron       VARCHAR(50),
-  param_json VARCHAR(200),
+  param_json VARCHAR(500),
   init_strategy VARCHAR(50),
   job_status       VARCHAR(10)   default 'A'  not null,
   save_log   BIT DEFAULT 1    not null,
-  job_comment      VARCHAR(200),
+  job_comment      VARCHAR(500),
   is_deleted   BIT DEFAULT 0    not null,
   create_by BIGINT DEFAULT 0 NOT NULL,
   create_time  timestamp default CURRENT_TIMESTAMP   not null,
@@ -40,13 +40,13 @@ CREATE TABLE ${SCHEMA}.schedule_job_log (
  job_id    VARCHAR(100)          not null,
  job_name       VARCHAR(100)          not null,
  cron       VARCHAR(50),
- param_json VARCHAR(200),
+ param_json VARCHAR(500),
  start_time timestamp         null,
  end_time timestamp          null,
  elapsed_seconds NUMBER(9),
  run_status       VARCHAR(10)   default 'A'  not null,
  data_count NUMBER(9),
- execute_msg  VARCHAR(500)  not null,
+ execute_msg  VARCHAR(1000)  not null,
  is_deleted   BIT DEFAULT 0    not null,
  create_time  timestamp default CURRENT_TIMESTAMP   not null
 );
-- 
Gitee


From baeea801c23bf64a42ff5a58ee1dad7ea11cd9ed Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Mon, 20 Jun 2022 15:00:51 +0800
Subject: [PATCH 181/195] =?UTF-8?q?*=20buildTree=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=9D=9Eid=E5=91=BD=E5=90=8D=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/test/binder/entity/TestRegion.java   | 73 +++++++++++++++++++
 .../diboot/core/test/util/BeanUtilsTest.java  | 54 +++++++++++++-
 .../java/com/diboot/core/util/BeanUtils.java  | 34 ++++++---
 3 files changed, 150 insertions(+), 11 deletions(-)
 create mode 100644 diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java
new file mode 100644
index 00000000..6a09f189
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/TestRegion.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diboot.core.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 地区，测试uuid
+ * @author wangyl@dibo.ltd
+ * @version v2.0
+ * @date 2021/08/27
+ */
+@Getter @Setter @Accessors(chain = true)
+public class TestRegion extends BaseEntity {
+    private static final long serialVersionUID = -1391001660726027259L;
+
+    // 废弃默认主键
+    @TableField(exist = false)
+    private Long id;
+    // 声明新主键uuid
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String uuid;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 层级
+     */
+    private Integer level;
+
+    /**
+     * 名称
+     */
+    private String code;
+
+    /**
+     * 父级id
+     */
+    private String parentId;
+
+    /**
+     * 子节点
+     */
+    private List<TestRegion> children;
+}
\ No newline at end of file
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
index 07ffc4f3..6b8d8bec 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
@@ -18,13 +18,16 @@ package diboot.core.test.util;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diboot.core.binding.cache.BindingCacheManager;
+import com.diboot.core.config.Cons;
 import com.diboot.core.entity.Dictionary;
 import com.diboot.core.service.DictionaryService;
 import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.JSON;
+import com.diboot.core.util.S;
 import com.diboot.core.vo.DictionaryVO;
 import com.sun.management.OperatingSystemMXBean;
 import diboot.core.test.StartupApplication;
+import diboot.core.test.binder.entity.TestRegion;
 import diboot.core.test.binder.entity.TestUploadFile;
 import diboot.core.test.binder.entity.User;
 import diboot.core.test.config.SpringMvcConfig;
@@ -227,7 +230,7 @@ public class BeanUtilsTest {
         Assert.assertEquals(list.get(0).getChildren().size(), 5);
 
         list = BeanUtils.convertList(dictionaryList, DictionaryVO.class);
-        list = BeanUtils.buildTree(list, 0, "parentId", "children");
+        list = BeanUtils.buildTree(list, 0, Cons.FieldName.id.name());
         Assert.assertEquals(list.size(), 1);
         Assert.assertEquals(list.get(0).getChildren().size(), 5);
 
@@ -246,6 +249,55 @@ public class BeanUtilsTest {
         }
     }
 
+    @Test
+    public void testBuildTreeWithUUID(){
+        // 准备节点数据
+        List<TestRegion> regionList = new ArrayList<>();
+        TestRegion province1 = new TestRegion().setUuid(S.newUuid()).setName("江苏省").setLevel(1).setCode("JS");
+        regionList.add(province1);
+        TestRegion province2 = new TestRegion().setUuid(S.newUuid()).setName("浙江省").setLevel(1).setCode("ZJ");
+        regionList.add(province2);
+
+        TestRegion city1 = new TestRegion().setUuid(S.newUuid()).setName("南京市").setLevel(2).setCode("NJ").setParentId(province1.getUuid());
+        regionList.add(city1);
+        TestRegion city2 = new TestRegion().setUuid(S.newUuid()).setName("苏州市").setLevel(2).setCode("SZ").setParentId(province1.getUuid());
+        regionList.add(city2);
+        TestRegion city3 = new TestRegion().setUuid(S.newUuid()).setName("杭州市").setLevel(2).setCode("HZ").setParentId(province2.getUuid());
+        regionList.add(city3);
+
+        TestRegion area1 = new TestRegion().setUuid(S.newUuid()).setName("建邺区").setLevel(3).setCode("JY").setParentId(city1.getUuid());
+        regionList.add(area1);
+        TestRegion area2 = new TestRegion().setUuid(S.newUuid()).setName("工业园区").setLevel(3).setCode("SIP").setParentId(city2.getUuid());
+        regionList.add(area2);
+        TestRegion area3 = new TestRegion().setUuid(S.newUuid()).setName("姑苏区").setLevel(3).setCode("GS").setParentId(city2.getUuid());
+        regionList.add(area3);
+
+        // 构建树形结构
+        List<TestRegion> list = BeanUtils.buildTree(regionList, null, "uuid");
+        //BeanUtils.buildTree(regionList, null, "uuid", Cons.FieldName.parentId.name(), Cons.FieldName.children.name());
+
+        // 检测结果
+        Assert.assertEquals(list.size(), 2);
+        for(TestRegion region : list) {
+            if(region.getCode().equals("JS")) {
+                Assert.assertEquals(region.getChildren().size(), 2);
+                for(TestRegion city : region.getChildren()) {
+                    if(city.getCode().equals("NJ")) {
+                        Assert.assertEquals(city.getChildren().size(), 1);
+                    }
+                    else{
+                        Assert.assertEquals(city.getChildren().size(), 2);
+                    }
+                }
+            }
+            else {
+                Assert.assertEquals(region.getChildren().size(), 1);
+                Assert.assertNull(region.getChildren().get(0).getChildren());
+            }
+        }
+    }
+
+
     @Test
     public void testSetProperty(){
         TestUploadFile object = new TestUploadFile();
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index b67cec6d..682571ac 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -410,26 +410,39 @@ public class BeanUtils {
     }
 
     /***
-     * 构建指定根节点的上下级关联的树形结构（上级parentId、子节点children）
+     * 构建指定根节点的上下级关联的树形结构（主键id，上级属性parentId、子节点属性children）
      * @param allNodes 所有节点对象
      * @param rootNodeId 跟节点ID
      * @param <T>
      * @return
      */
     public static <T> List<T> buildTree(List<T> allNodes, Object rootNodeId){
-        return buildTree(allNodes, rootNodeId, Cons.FieldName.parentId.name(), Cons.FieldName.children.name());
+        return buildTree(allNodes, rootNodeId, Cons.FieldName.id.name(), Cons.FieldName.parentId.name(), Cons.FieldName.children.name());
     }
 
     /***
-     * 构建指定根节点的上下级关联的树形结构（上级parentId、子节点children）
+     * 构建指定根节点的上下级关联的树形结构（主键指定，上级属性parentId、子节点属性children）
      * @param allNodes 所有节点对象
      * @param rootNodeId 根节点ID
+     * @param idFieldName 主键属性名
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> buildTree(List<T> allNodes, Object rootNodeId, String idFieldName){
+        return buildTree(allNodes, rootNodeId, idFieldName, Cons.FieldName.parentId.name(), Cons.FieldName.children.name());
+    }
+
+    /***
+     * 构建指定根节点的上下级关联的树形结构（指定主键属性，上级属性、子节点属性名）
+     * @param allNodes 所有节点对象
+     * @param rootNodeId 根节点ID
+     * @param idFieldName 主键属性名
      * @param parentIdFieldName 父节点属性名
      * @param childrenFieldName 子节点集合属性名
      * @param <T>
      * @return
      */
-    public static <T> List<T> buildTree(List<T> allNodes, Object rootNodeId, String parentIdFieldName, String childrenFieldName){
+    public static <T> List<T> buildTree(List<T> allNodes, Object rootNodeId, String idFieldName, String parentIdFieldName, String childrenFieldName){
         if(V.isEmpty(allNodes)){
             return null;
         }
@@ -440,7 +453,7 @@ public class BeanUtils {
             if(parentId == null || V.fuzzyEqual(parentId, rootNodeId)){
                 topLevelModels.add(node);
             }
-            Object nodeId = getProperty(node, Cons.FieldName.id.name());
+            Object nodeId = getProperty(node, idFieldName);
             if(V.equals(nodeId, parentId)){
                 throw new BusinessException(Status.WARN_PERFORMANCE_ISSUE, "parentId关联自身，请检查！" + node.getClass().getSimpleName()+":"+nodeId);
             }
@@ -450,8 +463,8 @@ public class BeanUtils {
         }
         // 遍历第一级节点，并挂载 children 子节点
         for(T node : allNodes) {
-            Object nodeId = getProperty(node, Cons.FieldName.id.name());
-            List<T> children = buildTreeChildren(nodeId, allNodes, parentIdFieldName, childrenFieldName);
+            Object nodeId = getProperty(node, idFieldName);
+            List<T> children = buildTreeChildren(nodeId, allNodes, idFieldName, parentIdFieldName, childrenFieldName);
             setProperty(node, childrenFieldName, children);
         }
         return topLevelModels;
@@ -461,11 +474,12 @@ public class BeanUtils {
      * 递归构建树节点的子节点
      * @param parentId
      * @param nodeList
+     * @param idFieldName
      * @param parentIdFieldName 父节点属性名
      * @param childrenFieldName 子节点集合属性名
      * @return
      */
-    public static <T> List<T> buildTreeChildren(Object parentId, List<T> nodeList, String parentIdFieldName, String childrenFieldName) {
+    public static <T> List<T> buildTreeChildren(Object parentId, List<T> nodeList, String idFieldName, String parentIdFieldName, String childrenFieldName) {
         List<T> children = null;
         for(T node : nodeList) {
             Object nodeParentId = getProperty(node, parentIdFieldName);
@@ -478,8 +492,8 @@ public class BeanUtils {
         }
         if(children != null){
             for(T child : children) {
-                Object nodeId = getProperty(child, Cons.FieldName.id.name());
-                List<T> childNodeChildren = buildTreeChildren(nodeId, nodeList, parentIdFieldName, childrenFieldName);
+                Object nodeId = getProperty(child, idFieldName);
+                List<T> childNodeChildren = buildTreeChildren(nodeId, nodeList, idFieldName, parentIdFieldName, childrenFieldName);
                 if(childNodeChildren == null) {
                     childNodeChildren = new ArrayList<>();
                 }
-- 
Gitee


From 32f019c28e684807d513608c8d03079ab6ff44cc Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Tue, 21 Jun 2022 16:33:31 +0800
Subject: [PATCH 182/195] =?UTF-8?q?*=20=E8=BF=9C=E7=A8=8B=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=94=AF=E6=8C=81=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E9=87=91=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/core/test/util/BeanUtilsTest.java  | 13 ++++++-
 .../remote/RemoteBindQueryExecutor.java       | 23 ++++++-----
 .../diboot/core/binding/parser/PropInfo.java  | 16 ++++++++
 .../java/com/diboot/core/util/BeanUtils.java  | 39 +++++++++++++++++++
 4 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
index 6b8d8bec..c4fda8cf 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
@@ -24,6 +24,7 @@ import com.diboot.core.service.DictionaryService;
 import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.JSON;
 import com.diboot.core.util.S;
+import com.diboot.core.util.V;
 import com.diboot.core.vo.DictionaryVO;
 import com.sun.management.OperatingSystemMXBean;
 import diboot.core.test.StartupApplication;
@@ -297,7 +298,6 @@ public class BeanUtilsTest {
         }
     }
 
-
     @Test
     public void testSetProperty(){
         TestUploadFile object = new TestUploadFile();
@@ -340,4 +340,15 @@ public class BeanUtilsTest {
         Assert.assertTrue(takes2 < takes1);
     }
 
+    @Test
+    public void testConvertType() {
+        Collection<String> list = new ArrayList<>();
+        list.add("123");
+        list.add("234");
+
+        Collection list2 = BeanUtils.convertIdValuesToType(list, Long.class);
+        Assert.assertTrue(list2.size() == 2);
+        Assert.assertTrue(V.equals(list2.iterator().next(), 123l));
+    }
+
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindQueryExecutor.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindQueryExecutor.java
index d90138a6..74eca987 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindQueryExecutor.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindQueryExecutor.java
@@ -18,19 +18,19 @@ package com.diboot.core.binding.binder.remote;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diboot.core.binding.cache.BindingCacheManager;
 import com.diboot.core.binding.helper.WrapperHelper;
+import com.diboot.core.binding.parser.PropInfo;
 import com.diboot.core.config.BaseConfig;
 import com.diboot.core.service.BaseService;
+import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.ContextHelper;
 import com.diboot.core.util.JSON;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.JsonResult;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 远程绑定查询执行器
@@ -61,17 +61,20 @@ public class RemoteBindQueryExecutor {
         if(inConditionValues == null){
             return JsonResult.OK();
         }
+        if (inConditionValues.isEmpty()) {
+            return JsonResult.OK(Collections.emptyList());
+        }
+        // 关联主键列名
+        String refJoinCol = remoteBindDTO.getRefJoinCol();
+        PropInfo propInfo = BindingCacheManager.getPropInfoByClass(entityClass);
+        Class idFieldType = propInfo.getFieldTypeByColumn(refJoinCol);
+        Collection<?> formatInValues = BeanUtils.convertIdValuesToType(inConditionValues, idFieldType);
         // 构建queryWrpper
         QueryWrapper<?> queryWrapper = new QueryWrapper<>();
         queryWrapper.setEntityClass(entityClass);
         queryWrapper.select(remoteBindDTO.getSelectColumns());
         // 构建查询条件
-        String refJoinCol = remoteBindDTO.getRefJoinCol();
-        if (inConditionValues.isEmpty()) {
-            return JsonResult.OK(Collections.emptyList());
-        } else {
-            queryWrapper.in(refJoinCol, inConditionValues);
-        }
+        queryWrapper.in(refJoinCol, formatInValues);
         queryWrapper.and(V.notEmpty(remoteBindDTO.getAdditionalConditions()), e -> remoteBindDTO.getAdditionalConditions().forEach(e::apply));
         // 排序
         WrapperHelper.buildOrderBy(queryWrapper, remoteBindDTO.getOrderBy(), e -> e);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
index 96688e21..85db8efc 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
@@ -50,6 +50,10 @@ public class PropInfo implements Serializable {
      * 列-字段的映射
      */
     private final Map<String, String> columnToFieldMap = new HashMap<>();
+    /**
+     * 列-字段类型的映射
+     */
+    private final Map<String, Class> columnToFieldTypeMap = new HashMap<>();
     /**
      * 自动更新字段列表
      */
@@ -110,6 +114,7 @@ public class PropInfo implements Serializable {
                 this.fieldToColumnMap.put(fldName, columnName);
                 if(V.notEmpty(columnName)){
                     this.columnToFieldMap.put(columnName, fldName);
+                    this.columnToFieldTypeMap.put(columnName, fld.getType());
                     this.columns.add(columnName);
                 }
             }
@@ -151,4 +156,15 @@ public class PropInfo implements Serializable {
         return this.columnToFieldMap.get(idColumn);
     }
 
+    /**
+     * 根据列名获取字段类型
+     * @return
+     */
+    public Class<?> getFieldTypeByColumn(String columnName){
+        if(V.isEmpty(this.columnToFieldTypeMap)){
+            return null;
+        }
+        return this.columnToFieldTypeMap.get(columnName);
+    }
+
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index 682571ac..28c87f69 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -919,6 +919,45 @@ public class BeanUtils {
         }
     }
 
+    /**
+     * 转换集合中的string类型id值为指定类型
+     * @param values
+     * @param fieldType
+     * @return
+     */
+    public static Collection convertIdValuesToType(Collection<?> values, Class fieldType) {
+        if(V.isEmpty(values)) {
+            return values;
+        }
+        if(V.equals(values.iterator().next().getClass(), fieldType)) {
+            return values;
+        }
+        Collection formatValues = new ArrayList(values.size());
+        for(Object value : values) {
+            formatValues.add(convertIdValueToType(value, fieldType));
+        }
+        return formatValues;
+    }
+
+    /**
+     * 转换string类型id值为指定类型
+     * @param value
+     * @param fieldType
+     * @return
+     */
+    public static Object convertIdValueToType(Object value, Class fieldType) {
+        if(V.isEmpty(value)) {
+            return null;
+        }
+        if(Long.class.equals(fieldType)) {
+            return Long.parseLong(S.valueOf(value));
+        }
+        if(Integer.class.equals(fieldType)) {
+            return Integer.parseInt(S.valueOf(value));
+        }
+        return value;
+    }
+
     /**
      * 初始化fields
      * @param beanClazz
-- 
Gitee


From afbbce234190f3639496da84e9a80355aa61b003 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 22 Jun 2022 15:01:54 +0800
Subject: [PATCH 183/195] =?UTF-8?q?*=20=E7=BC=93=E5=AD=98=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0synchronized?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/cache/BindingCacheManager.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
index ba7a0336..c05c5d4a 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/cache/BindingCacheManager.java
@@ -92,7 +92,7 @@ public class BindingCacheManager {
      * @param tableName
      * @return
      */
-    public static EntityInfoCache getEntityInfoByTable(String tableName){
+    public static synchronized EntityInfoCache getEntityInfoByTable(String tableName){
         initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_TABLE_ENTITY, tableName, EntityInfoCache.class);
     }
@@ -102,7 +102,7 @@ public class BindingCacheManager {
      * @param entityClazz
      * @return
      */
-    public static EntityInfoCache getEntityInfoByClass(Class<?> entityClazz){
+    public static synchronized EntityInfoCache getEntityInfoByClass(Class<?> entityClazz){
         initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_CLASS_ENTITY, entityClazz.getName(), EntityInfoCache.class);
     }
@@ -112,7 +112,7 @@ public class BindingCacheManager {
      * @param beanClazz
      * @return
      */
-    public static PropInfo getPropInfoByClass(Class<?> beanClazz){
+    public static synchronized PropInfo getPropInfoByClass(Class<?> beanClazz){
         PropInfo propInfo = getCacheManager().getCacheObj(CACHE_NAME_CLASS_PROP, beanClazz.getName(), PropInfo.class);
         if(propInfo == null){
             propInfo = initPropInfoCache(beanClazz);
@@ -125,7 +125,7 @@ public class BindingCacheManager {
      * @param tableName
      * @return
      */
-    public static PropInfo getPropInfoByTable(String tableName){
+    public static synchronized PropInfo getPropInfoByTable(String tableName){
         Class<?> entityClass = getEntityClassByTable(tableName);
         if(entityClass != null){
             return getPropInfoByClass(entityClass);
@@ -138,7 +138,7 @@ public class BindingCacheManager {
      * @param tableName
      * @return
      */
-    public static Class<?> getEntityClassByTable(String tableName){
+    public static synchronized Class<?> getEntityClassByTable(String tableName){
         EntityInfoCache entityInfoCache = getEntityInfoByTable(tableName);
         return entityInfoCache != null? entityInfoCache.getEntityClass() : null;
     }
@@ -149,7 +149,7 @@ public class BindingCacheManager {
      * @param classSimpleName
      * @return
      */
-    public static Class<?> getEntityClassBySimpleName(String classSimpleName){
+    public static synchronized Class<?> getEntityClassBySimpleName(String classSimpleName){
         initEntityInfoCache();
         return getCacheManager().getCacheObj(CACHE_NAME_ENTITYNAME_CLASS, classSimpleName, Class.class);
     }
@@ -159,7 +159,7 @@ public class BindingCacheManager {
      * @param table
      * @return
      */
-    public static BaseMapper getMapperByTable(String table){
+    public static synchronized BaseMapper getMapperByTable(String table){
         EntityInfoCache entityInfoCache = getEntityInfoByTable(table);
         if(entityInfoCache != null){
             return entityInfoCache.getBaseMapper();
@@ -172,7 +172,7 @@ public class BindingCacheManager {
      * @param entityClazz
      * @return
      */
-    public static BaseMapper getMapperByClass(Class<?> entityClazz){
+    public static synchronized BaseMapper getMapperByClass(Class<?> entityClazz){
         EntityInfoCache entityInfoCache = getEntityInfoByClass(entityClazz);
         if(entityInfoCache != null){
             return entityInfoCache.getBaseMapper();
@@ -185,7 +185,7 @@ public class BindingCacheManager {
      * @param beanClazz
      * @return
      */
-    public static List<Field> getFields(Class<?> beanClazz){
+    public static synchronized List<Field> getFields(Class<?> beanClazz){
         List<Field> fields = getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, beanClazz.getName(), List.class);
         if(fields == null){
             fields = BeanUtils.extractAllFields(beanClazz);
@@ -199,7 +199,7 @@ public class BindingCacheManager {
      * @param beanClazz
      * @return
      */
-    public static List<Field> getFields(Class<?> beanClazz, Class<? extends Annotation> annotation){
+    public static synchronized List<Field> getFields(Class<?> beanClazz, Class<? extends Annotation> annotation){
         String key = S.joinWith(Cons.SEPARATOR_COMMA, beanClazz.getName(), annotation.getName());
         List<Field> fields = getCacheManager().getCacheObj(CACHE_NAME_CLASS_FIELDS, key, List.class);
         if(fields == null){
-- 
Gitee


From 576a36eb1237e4844de12ec3d392b3aaad61cafd Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 22 Jun 2022 15:59:43 +0800
Subject: [PATCH 184/195] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除diboot.component.scheduler.enable配置
---
 .../diboot/scheduler/starter/SchedulerJobInitializer.java    | 2 +-
 .../com/diboot/scheduler/starter/SchedulerProperties.java    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerJobInitializer.java b/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerJobInitializer.java
index 7cda12f1..e03ff0c7 100644
--- a/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerJobInitializer.java
+++ b/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerJobInitializer.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-@ConditionalOnProperty(prefix = "diboot.component.scheduler", name = "enable", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.quartz", name = "job-store-type", havingValue = "MEMORY", matchIfMissing = true)
 public class SchedulerJobInitializer implements ApplicationRunner {
 
     @Autowired
diff --git a/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerProperties.java b/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerProperties.java
index 2c78af88..1e8cb3b9 100644
--- a/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerProperties.java
+++ b/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/starter/SchedulerProperties.java
@@ -34,9 +34,4 @@ public class SchedulerProperties {
      */
     private boolean initSql = true;
 
-    /**
-     * 是否启用（开发环境可禁用）
-     */
-    private boolean enable = true;
-
 }
-- 
Gitee


From 5c920f9e339869711d70f5ea5fe2d3cc88dd9d38 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 22 Jun 2022 17:18:02 +0800
Subject: [PATCH 185/195] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduler/service/impl/QuartzSchedulerServiceImpl.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/service/impl/QuartzSchedulerServiceImpl.java b/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/service/impl/QuartzSchedulerServiceImpl.java
index f74327f3..aca80d64 100644
--- a/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/service/impl/QuartzSchedulerServiceImpl.java
+++ b/diboot-scheduler-starter/src/main/java/com/diboot/scheduler/service/impl/QuartzSchedulerServiceImpl.java
@@ -24,7 +24,6 @@ import com.diboot.core.vo.Status;
 import com.diboot.scheduler.annotation.CollectThisJob;
 import com.diboot.scheduler.entity.ScheduleJob;
 import com.diboot.scheduler.service.QuartzSchedulerService;
-import com.diboot.scheduler.starter.SchedulerProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.quartz.impl.matchers.GroupMatcher;
@@ -42,8 +41,6 @@ import java.util.*;
  */
 @Slf4j
 public class QuartzSchedulerServiceImpl implements QuartzSchedulerService {
-    @Autowired
-    private SchedulerProperties schedulerProperties;
 
     /**
      * 任务初始化策略
@@ -65,10 +62,6 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService {
 
     @PostConstruct
     public void startScheduler() {
-        if (schedulerProperties.isEnable() == false) {
-            log.info("定时任务组件已暂停，如需启用设置:diboot.component.scheduler.enable=true");
-            return;
-        }
         try {
             scheduler.start();
         } catch (SchedulerException e) {
-- 
Gitee


From 6ecf1d895701933e2db6ec2e64642e31e5af845b Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Wed, 22 Jun 2022 19:05:10 +0800
Subject: [PATCH 186/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diboot/iam/config/SystemConfigType.java   | 23 +++++++++++++---
 .../iam/service/SystemConfigService.java      |  8 ++++++
 .../service/impl/SystemConfigServiceImpl.java | 27 +++++++++----------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/config/SystemConfigType.java b/diboot-iam-starter/src/main/java/com/diboot/iam/config/SystemConfigType.java
index 2eda5114..dfb9503d 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/config/SystemConfigType.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/config/SystemConfigType.java
@@ -20,6 +20,7 @@ import com.diboot.core.util.PropertiesUtils;
 import com.diboot.core.util.S;
 import com.diboot.iam.service.SystemConfigService;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -159,7 +160,7 @@ public interface SystemConfigType {
      * @return 指定类型配置值映射
      */
     static <E extends Enum<? extends SystemConfigType>> Values<E> values(Class<E> typeClass) {
-        return new Values<E>(ContextHelper.getBean(SystemConfigService.class).getConfigMapByType(typeClass.getSimpleName()));
+        return new Values<>(typeClass);
     }
 
     /**
@@ -168,13 +169,18 @@ public interface SystemConfigType {
      * 用于获取同类型获取配置值减少查询
      */
     class Values<E extends Enum<? extends SystemConfigType>> {
+        /**
+         * 类型 Class
+         */
+        private final String type;
         /**
          * 值映射
          */
         private final Map<String, String> valueMap;
 
-        private Values(Map<String, String> valueMap) {
-            this.valueMap = valueMap;
+        private Values(Class<E> typeClass) {
+            this.type = S.substringBefore(S.substringAfterLast(typeClass.getName(), "."), "$");
+            this.valueMap = ContextHelper.getBean(SystemConfigService.class).getConfigMapByType(type);
         }
 
         /**
@@ -230,6 +236,17 @@ public interface SystemConfigType {
             return S.isBlank(value) ? null : Enum.valueOf(clazz, value.trim());
         }
 
+        /**
+         * 获取配置 Map
+         *
+         * @return 属性值映射
+         */
+        public Map<String, String> getMap() {
+            ContextHelper.getBean(SystemConfigService.class).getConfigItemsMap()
+                    .getOrDefault(type, Collections.emptyList()).forEach(e -> get((E) e));
+            return valueMap;
+        }
+
     }
 
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/SystemConfigService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/SystemConfigService.java
index 86ca16c8..8a6ff9e5 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/SystemConfigService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/SystemConfigService.java
@@ -17,6 +17,7 @@ package com.diboot.iam.service;
 
 import com.diboot.core.service.BaseService;
 import com.diboot.core.vo.LabelValue;
+import com.diboot.iam.config.SystemConfigType;
 import com.diboot.iam.entity.SystemConfig;
 import com.diboot.iam.vo.SystemConfigVO;
 
@@ -39,6 +40,13 @@ public interface SystemConfigService extends BaseService<SystemConfig> {
      */
     List<LabelValue> getTypeList();
 
+    /**
+     * 获取配置元素类型映射
+     *
+     * @return 全部配置元素类型映射
+     */
+    Map<String, List<Enum<? extends SystemConfigType>>> getConfigItemsMap();
+
     /**
      * 根据类型获取配置
      *
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/SystemConfigServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/SystemConfigServiceImpl.java
index 9a697efb..ceba2be6 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/SystemConfigServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/SystemConfigServiceImpl.java
@@ -15,7 +15,6 @@
  */
 package com.diboot.iam.service.impl;
 
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diboot.core.exception.BusinessException;
@@ -32,6 +31,7 @@ import com.diboot.iam.entity.SystemConfig;
 import com.diboot.iam.mapper.SystemConfigMapper;
 import com.diboot.iam.service.SystemConfigService;
 import com.diboot.iam.vo.SystemConfigVO;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ResolvableType;
@@ -56,9 +56,11 @@ public class SystemConfigServiceImpl extends BaseServiceImpl<SystemConfigMapper,
     @Autowired(required = false)
     private List<SystemConfigInjection> configInjections;
 
-    private final List<LabelValue> configTypeList = new ArrayList<>();
-    private final Map<String, List<Enum<? extends SystemConfigType>>> configItemListMap = new HashMap<>();
-    private final Map<String, SystemConfigTest<?>> configTypeTestMap = new HashMap<>();
+    @Getter
+    private final List<LabelValue> typeList = new ArrayList<>();
+    @Getter
+    private final Map<String, List<Enum<? extends SystemConfigType>>> configItemsMap = new HashMap<>();
+    private final Map<String, SystemConfigTest<?>> configTestMap = new HashMap<>();
     private final Map<String, Class<?>> configTestDataClassMap = new HashMap<>();
 
     @PostConstruct
@@ -79,13 +81,13 @@ public class SystemConfigServiceImpl extends BaseServiceImpl<SystemConfigMapper,
                 String type = configType.getSimpleName();
                 LabelValue labelValue = new LabelValue(((SystemConfigType) enumConstants[0]).typeLabel(), type);
                 if (SystemConfigTest.class.isAssignableFrom(configType)) {
-                    configTypeTestMap.put(type, (SystemConfigTest<?>) enumConstants[0]);
+                    configTestMap.put(type, (SystemConfigTest<?>) enumConstants[0]);
                     Class<?> testDataClass = findTestDataClass(ResolvableType.forClass(configType));
                     configTestDataClassMap.put(type, testDataClass);
                     labelValue.setExt(BeanUtils.extractAllFields(testDataClass).stream().map(Field::getName).collect(Collectors.toSet()));
                 }
-                configTypeList.add(labelValue);
-                configItemListMap.put(type, Arrays.asList(enumConstants));
+                typeList.add(labelValue);
+                configItemsMap.put(type, Arrays.asList(enumConstants));
             }
         }
     }
@@ -108,20 +110,15 @@ public class SystemConfigServiceImpl extends BaseServiceImpl<SystemConfigMapper,
         return null;
     }
 
-    @Override
-    public List<LabelValue> getTypeList() {
-        return configTypeList;
-    }
-
     @Override
     public List<SystemConfigVO> getConfigByType(String type) {
-        if (!configItemListMap.containsKey(type)) {
+        if (!configItemsMap.containsKey(type)) {
             return Collections.emptyList();
         }
         LambdaQueryWrapper<SystemConfig> queryWrapper = Wrappers.<SystemConfig>lambdaQuery().eq(SystemConfig::getType, type);
         Map<String, SystemConfigVO> configInfoMap = this.getViewObjectList(queryWrapper, null, SystemConfigVO.class)
                 .stream().collect(Collectors.toMap(SystemConfig::getProp, e -> e));
-        return configItemListMap.get(type).stream().map(item -> {
+        return configItemsMap.get(type).stream().map(item -> {
             SystemConfigType configProp = (SystemConfigType) item;
             Object defaultValue = configProp.buildDefaultValue();
             return configInfoMap.getOrDefault(item.name(), new SystemConfigVO() {{
@@ -140,7 +137,7 @@ public class SystemConfigServiceImpl extends BaseServiceImpl<SystemConfigMapper,
 
     @Override
     public void configTest(String type, Map<String, Object> data) {
-        SystemConfigTest systemConfigTest = configTypeTestMap.get(type);
+        SystemConfigTest systemConfigTest = configTestMap.get(type);
         if (systemConfigTest == null) {
             throw new BusinessException("系统配置`" + type + "`未实现测试方法");
         }
-- 
Gitee


From 1f7365a2fcd40bdfec1b3c310b5404c6bd25ba3d Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 23 Jun 2022 17:52:14 +0800
Subject: [PATCH 187/195] =?UTF-8?q?*=20=E6=96=B0=E5=A2=9E=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7VO=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iam/service/IamUserPositionService.java   | 29 +++++++++++++
 .../diboot/iam/service/IamUserService.java    | 13 ++++++
 .../impl/IamUserPositionServiceImpl.java      | 35 ++++++++++++++++
 .../iam/service/impl/IamUserServiceImpl.java  | 42 +++++++++++++++++--
 .../java/com/diboot/iam/vo/IamUserVO.java     |  4 ++
 5 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserPositionService.java
 create mode 100644 diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserPositionServiceImpl.java

diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserPositionService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserPositionService.java
new file mode 100644
index 00000000..948c38a4
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserPositionService.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2015-2022, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.service;
+
+import com.diboot.iam.entity.IamUserPosition;
+
+/**
+ * 用户岗位关联相关Service
+ *
+ * @author wind
+ * @version v2.6.0
+ * @date 2022-06-23
+ */
+public interface IamUserPositionService extends BaseIamService<IamUserPosition> {
+
+}
\ No newline at end of file
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java
index 9385e131..3d466eb5 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/IamUserService.java
@@ -15,8 +15,11 @@
  */
 package com.diboot.iam.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diboot.core.vo.Pagination;
 import com.diboot.iam.dto.IamUserAccountDTO;
 import com.diboot.iam.entity.IamUser;
+import com.diboot.iam.vo.IamUserVO;
 
 import java.util.List;
 
@@ -72,4 +75,14 @@ public interface IamUserService extends BaseIamService<IamUser> {
      */
     List<Long> getUserIdsByManagerId(Long managerId);
 
+    /**
+     * 获取用户VO列表
+     *
+     * @param queryWrapper
+     * @param pagination
+     * @param orgId
+     * @return
+     */
+    List<IamUserVO> getUserViewList(LambdaQueryWrapper<IamUser> queryWrapper, Pagination pagination, Long orgId);
+
 }
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserPositionServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserPositionServiceImpl.java
new file mode 100644
index 00000000..f0d4ff1a
--- /dev/null
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserPositionServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015-2022, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.iam.service.impl;
+
+import com.diboot.iam.entity.IamUserPosition;
+import com.diboot.iam.mapper.IamUserPositionMapper;
+import com.diboot.iam.service.IamUserPositionService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户岗位关联相关Service实现
+ *
+ * @author wind
+ * @version v2.6.0
+ * @date 2022-06-23
+ */
+@Slf4j
+@Service
+public class IamUserPositionServiceImpl extends BaseIamServiceImpl<IamUserPositionMapper, IamUserPosition> implements IamUserPositionService {
+
+}
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
index b47b4168..435cb1e8 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
@@ -20,23 +20,24 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diboot.core.config.BaseConfig;
 import com.diboot.core.exception.BusinessException;
 import com.diboot.core.util.V;
+import com.diboot.core.vo.Pagination;
 import com.diboot.core.vo.Status;
 import com.diboot.iam.auth.IamCustomize;
 import com.diboot.iam.dto.IamUserAccountDTO;
 import com.diboot.iam.entity.IamAccount;
 import com.diboot.iam.entity.IamUser;
+import com.diboot.iam.entity.IamUserPosition;
 import com.diboot.iam.mapper.IamUserMapper;
-import com.diboot.iam.service.IamAccountService;
-import com.diboot.iam.service.IamOrgService;
-import com.diboot.iam.service.IamUserRoleService;
-import com.diboot.iam.service.IamUserService;
+import com.diboot.iam.service.*;
 import com.diboot.iam.util.IamSecurityUtils;
+import com.diboot.iam.vo.IamUserVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
 * 系统用户相关Service实现
@@ -58,6 +59,9 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
     @Autowired
     private IamOrgService iamOrgService;
 
+    @Autowired
+    private IamUserPositionService iamUserPositionService;
+
     @Autowired(required = false)
     private IamCustomize iamCustomize;
 
@@ -181,6 +185,36 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
         return iamUserIds;
     }
 
+    @Override
+    public List<IamUserVO> getUserViewList(LambdaQueryWrapper<IamUser> queryWrapper, Pagination pagination, Long orgId) {
+        List<Long> orgIds = new ArrayList<>();
+        // 获取当前部门及所有下属部门的人员列表
+        if (V.notEmpty(orgId) && V.notEquals(orgId, 0L)) {
+            orgIds.add(orgId);
+            // 获取所有下级部门列表
+            orgIds.addAll(iamOrgService.getChildOrgIds(orgId));
+            queryWrapper.in(IamUser::getOrgId, orgIds);
+            // 相应部门下岗位相关用户
+            LambdaQueryWrapper<IamUserPosition> queryUserIds = Wrappers.<IamUserPosition>lambdaQuery()
+                    .eq(IamUserPosition::getUserType, IamUser.class.getSimpleName())
+                    .in(IamUserPosition::getOrgId, orgIds);
+            List<Long> userIds = iamUserPositionService.getValuesOfField(queryUserIds, IamUserPosition::getUserId);
+            queryWrapper.or().in(V.notEmpty(userIds), IamUser::getId, userIds);
+        }
+        // 查询指定页的数据
+        List<IamUserVO> voList = getViewObjectList(queryWrapper, pagination, IamUserVO.class);
+        if (V.isEmpty(orgIds)) {
+            return voList;
+        }
+        for (IamUserVO user : voList) {
+            List<IamUserPosition> userPositionList = user.getUserPositionList();
+            if (V.notEmpty(userPositionList)) {
+                user.setUserPositionList(userPositionList.stream().filter(p -> orgIds.contains(p.getOrgId())).collect(Collectors.toList()));
+            }
+        }
+        return voList;
+    }
+
     /***
      * 检查重复用户编号
      * @param userNumList
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/vo/IamUserVO.java b/diboot-iam-starter/src/main/java/com/diboot/iam/vo/IamUserVO.java
index acdd6dfa..b8d48303 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/vo/IamUserVO.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/vo/IamUserVO.java
@@ -21,6 +21,7 @@ import com.diboot.core.binding.annotation.BindField;
 import com.diboot.iam.entity.IamOrg;
 import com.diboot.iam.entity.IamRole;
 import com.diboot.iam.entity.IamUser;
+import com.diboot.iam.entity.IamUserPosition;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -51,4 +52,7 @@ public class IamUserVO extends IamUser {
     // 字段关联：this.id=iam_user_role.user_id AND iam_user_role.role_id=id AND iam_user_role.user_type = 'IamUser'
     @BindEntityList(entity = IamRole.class, condition = "this.id=iam_user_role.user_id AND iam_user_role.role_id=id AND iam_user_role.user_type = 'IamUser'")
     private List<IamRole> roleList;
+
+    @BindEntityList(entity = IamUserPosition.class, condition = "this.id = user_id AND user_type = 'IamUser'")
+    private List<IamUserPosition> userPositionList;
 }
-- 
Gitee


From e63dee4dac774ae1cf902af9842e1a5c64cd3bb5 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 23 Jun 2022 18:15:51 +0800
Subject: [PATCH 188/195] =?UTF-8?q?+=20BindCount=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=85=B3=E8=81=94=E5=AD=90=E9=A1=B9=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/test/binder/TestCountBinder.java     |  97 +++++++++++
 .../core/test/binder/vo/CountSimpleVO.java    |  46 +++++
 .../test/binder/vo/EntityListComplexVO.java   |   4 +
 .../src/test/resources/init-mysql.sql         |   2 +-
 .../diboot/core/binding/RelationsBinder.java  |   9 +
 .../core/binding/annotation/BindCount.java    |  43 +++++
 .../core/binding/binder/CountBinder.java      | 159 ++++++++++++++++++
 .../core/binding/binder/EntityListBinder.java |  13 +-
 .../parallel/ParallelBindingManager.java      |  16 ++
 .../binding/parser/BindAnnotationGroup.java   |  22 ++-
 .../core/binding/parser/ParserCache.java      |   2 +-
 11 files changed, 407 insertions(+), 6 deletions(-)
 create mode 100644 diboot-core-starter/src/test/java/diboot/core/test/binder/TestCountBinder.java
 create mode 100644 diboot-core-starter/src/test/java/diboot/core/test/binder/vo/CountSimpleVO.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/binding/annotation/BindCount.java
 create mode 100644 diboot-core/src/main/java/com/diboot/core/binding/binder/CountBinder.java

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/TestCountBinder.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestCountBinder.java
new file mode 100644
index 00000000..05e96c66
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/TestCountBinder.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diboot.core.binding.Binder;
+import com.diboot.core.util.JSON;
+import com.diboot.core.util.V;
+import diboot.core.test.StartupApplication;
+import diboot.core.test.binder.entity.Department;
+import diboot.core.test.binder.entity.User;
+import diboot.core.test.binder.service.DepartmentService;
+import diboot.core.test.binder.service.UserService;
+import diboot.core.test.binder.vo.*;
+import diboot.core.test.config.SpringMvcConfig;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+/**
+ *  测试子项count计数绑定
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2019/06/22
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SpringMvcConfig.class})
+@SpringBootTest(classes = {StartupApplication.class})
+public class TestCountBinder {
+
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    DepartmentService departmentService;
+
+    /**
+     * 验证直接关联的绑定
+     */
+    @Test
+    public void testSimpleBinder(){
+        // 加载测试数据
+        LambdaQueryWrapper<Department> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(Department::getId, 10001L, 10003L);
+        List<Department> entityList = departmentService.list(queryWrapper);
+        // 自动绑定
+        List<CountSimpleVO> voList = Binder.convertAndBindRelations(entityList, CountSimpleVO.class);
+        // 验证绑定结果
+        Assert.assertTrue(V.notEmpty(voList));
+        for(CountSimpleVO vo : voList){
+            // 验证直接关联的绑定
+            Assert.assertTrue(vo.getChildrenCount() > 0);
+            Assert.assertTrue(vo.getChildrenIds().size() == vo.getChildrenCount());
+        }
+    }
+
+    /**
+     * 验证通过中间表间接关联的绑定
+     */
+    @Test
+    public void testComplexBinder(){
+        // 加载测试数据
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(User::getId, 1001L, 1002L);
+        List<User> userList = userService.getEntityList(queryWrapper);
+        // 自动绑定
+        List<EntityListComplexVO> voList = Binder.convertAndBindRelations(userList, EntityListComplexVO.class);
+        // 验证绑定结果
+        Assert.assertTrue(V.notEmpty(voList));
+        for(EntityListComplexVO vo : voList){
+            // 验证通过中间表间接关联的绑定
+            Assert.assertTrue(vo.getRoleCount() > 0);
+            Assert.assertTrue(vo.getRoleCount() == vo.getRoleCodes().size());
+            System.out.println(JSON.stringify(vo));
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/CountSimpleVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/CountSimpleVO.java
new file mode 100644
index 00000000..091099f4
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/CountSimpleVO.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.vo;
+
+import com.diboot.core.binding.annotation.BindCount;
+import com.diboot.core.binding.annotation.BindFieldList;
+import diboot.core.test.binder.entity.Department;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2019/1/5
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class CountSimpleVO extends Department {
+    private static final long serialVersionUID = -362116388664907924L;
+
+    // 直接关联多个Entity
+    @BindCount(entity = Department.class, condition = "this.id=parent_id")
+    private Long childrenCount;
+
+    // 1-n 关联，取单个属性
+    @BindFieldList(entity = Department.class, field = "id", condition = "this.id=parent_id")
+    private List<Long> childrenIds;
+
+}
\ No newline at end of file
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityListComplexVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityListComplexVO.java
index 6ba20d8f..7a62c648 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityListComplexVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/EntityListComplexVO.java
@@ -15,6 +15,7 @@
  */
 package diboot.core.test.binder.vo;
 
+import com.diboot.core.binding.annotation.BindCount;
 import com.diboot.core.binding.annotation.BindEntityList;
 import com.diboot.core.binding.annotation.BindFieldList;
 import diboot.core.test.binder.entity.Role;
@@ -44,6 +45,9 @@ public class EntityListComplexVO extends User {
     @BindEntityList(entity = Role.class, condition="this.id=user_role.user_id AND user_role.role_id=id AND user_role.user_id>1")
     private List<Role> roleList;
 
+    @BindCount(entity = Role.class, condition="this.id=user_role.user_id AND user_role.role_id=id")
+    private Integer roleCount;
+
     // 支持通过中间表的多-多Entity的单个属性集
     @BindFieldList(entity = Role.class, field = "code", condition="this.id=user_role.user_id AND user_role.role_id=id")
     private List<String> roleCodes;
diff --git a/diboot-core-starter/src/test/resources/init-mysql.sql b/diboot-core-starter/src/test/resources/init-mysql.sql
index ea741edb..80cece06 100644
--- a/diboot-core-starter/src/test/resources/init-mysql.sql
+++ b/diboot-core-starter/src/test/resources/init-mysql.sql
@@ -155,7 +155,7 @@ CREATE TABLE `demo_test_join` (
 ) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='关联测试';
 
 -- 初始化样例数据
-INSERT INTO department (id, parent_id, org_id, name, `character`) VALUES (10001, 0, 100001, '产品部', 'WW'), (10002, 10001, 100001, '研发组', '1001'), (10003, 10001, 100001, '测试组', '1001,1001'),
+INSERT INTO department (id, parent_id, org_id, name, `character`) VALUES (10001, 0, 100001, '产品部', 'WW'), (10002, 10001, 100001, '研发组', '1001'), (10003, 10001, 100001, '测试组', '1001,1002'),
                                                                          (10004, 10001, 100001, '市场部', '1001,1002'), (10005, 10003, 100001, '自动化测试', null), (10006, 10003, 100001, '功能测试', null);
 INSERT INTO dictionary (id, parent_id, app_module, type, item_name, item_value) VALUES (1, 0, '', 'GENDER', '性别', null), (2, 1, '', 'GENDER', '男', 'M'), (3, 1, '', 'GENDER', '女', 'F');
 INSERT INTO organization (id, parent_id, name, telphone, manager_id) VALUES (100001, 0, '苏州帝博', '0512-62988949', 1001), (100002, 0, '成都帝博', '028-62988949', 1002);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java
index cc7b59bf..f753c62b 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/RelationsBinder.java
@@ -163,6 +163,15 @@ public class RelationsBinder {
                 binderFutures.add(bindFieldFuture);
             }
         }
+        // 绑定count子项计数
+        List<FieldAnnotation> countAnnoList = bindAnnotationGroup.getBindCountAnnotations();
+        if(countAnnoList != null){
+            for(FieldAnnotation anno : countAnnoList){
+                // 绑定关联对象count计数
+                CompletableFuture<Boolean> bindCountFuture = parallelBindingManager.doBindingCount(voList, anno);
+                binderFutures.add(bindCountFuture);
+            }
+        }
         // 执行绑定
         CompletableFuture.allOf(binderFutures.toArray(new CompletableFuture[0])).join();
         // 深度绑定
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/annotation/BindCount.java b/diboot-core/src/main/java/com/diboot/core/binding/annotation/BindCount.java
new file mode 100644
index 00000000..b2f6a8f7
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/binding/annotation/BindCount.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.binding.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 绑定子项的条目计数
+ * @author JerryMa
+ * @version v2.6.0
+ * @date 2022/6/23
+ * Copyright © diboot.com
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+@Documented
+public @interface BindCount {
+    /***
+     * 绑定的Entity类
+     * @return
+     */
+    Class entity();
+
+    /***
+     * JOIN连接条件
+     * @return
+     */
+    String condition();
+}
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/CountBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/CountBinder.java
new file mode 100644
index 00000000..be1c6a6b
--- /dev/null
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/CountBinder.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2015-2029, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.diboot.core.binding.binder;
+
+import com.diboot.core.binding.annotation.BindCount;
+import com.diboot.core.binding.binder.remote.RemoteBindingManager;
+import com.diboot.core.binding.cache.BindingCacheManager;
+import com.diboot.core.binding.helper.ResultAssembler;
+import com.diboot.core.config.Cons;
+import com.diboot.core.exception.InvalidUsageException;
+import com.diboot.core.util.BeanUtils;
+import com.diboot.core.util.S;
+import com.diboot.core.util.V;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 关联子项count计数绑定
+ * @author mazc@dibo.ltd
+ * @version v2.6.0
+ * @date 2022/06/23
+ */
+public class CountBinder<T> extends EntityListBinder<T> {
+    private static final Logger log = LoggerFactory.getLogger(CountBinder.class);
+
+    /***
+     * 构造方法
+     * @param annotation
+     * @param voList
+     */
+    public CountBinder(BindCount annotation, List voList){
+        super(annotation.entity(), voList);
+    }
+
+
+    @Override
+    public void bind() {
+        if(V.isEmpty(annoObjectList)){
+            return;
+        }
+        if(V.isEmpty(refObjJoinCols)){
+            throw new InvalidUsageException("调用错误：无法从condition中解析出字段关联.");
+        }
+        Map<String, Integer> valueListCountMap;
+        if(middleTable == null){
+            this.simplifySelectColumns();
+            super.buildQueryWrapperJoinOn();
+            // 查询条件为空时不进行查询
+            if (queryWrapper.isEmptyOfNormal()) {
+                return;
+            }
+            List<T> entityList = null;
+            // 查询entity列表: List<Role>
+            if(V.isEmpty(this.module)){
+                // 本地查询获取匹配结果的entityList
+                entityList = getEntityList(queryWrapper);
+            }
+            else{
+                // 远程调用获取
+                entityList = RemoteBindingManager.fetchEntityList(module, remoteBindDTO, referencedEntityClass);
+            }
+            if(V.notEmpty(entityList)){
+                valueListCountMap = this.buildMatchKey2ListCountMap(entityList);
+                ResultAssembler.bindPropValue(annoObjectField, super.getMatchedAnnoObjectList(), getAnnoObjJoinFlds(), valueListCountMap, null);
+            }
+        }
+        else{
+            if(refObjJoinCols.size() > 1){
+                throw new InvalidUsageException(NOT_SUPPORT_MSG);
+            }
+            // 提取注解条件中指定的对应的列表
+            Map<String, List> trunkObjCol2ValuesMap = super.buildTrunkObjCol2ValuesMap();
+            Map<String, List> middleTableResultMap = middleTable.executeOneToManyQuery(trunkObjCol2ValuesMap);
+            if(V.isEmpty(middleTableResultMap)){
+                return;
+            }
+            valueListCountMap = new HashMap<>();
+            for(Map.Entry<String, List> entry : middleTableResultMap.entrySet()){
+                // List<roleId>
+                List annoObjFKList = entry.getValue();
+                if(V.isEmpty(annoObjFKList)){
+                    continue;
+                }
+                Integer count = entry.getValue() != null? entry.getValue().size() : 0;
+                valueListCountMap.put(entry.getKey(), count);
+            }
+            // 绑定结果
+            ResultAssembler.bindPropValue(annoObjectField, super.getMatchedAnnoObjectList(), getAnnoObjJoinFlds(), valueListCountMap, null);
+        }
+    }
+
+    /**
+     * 简化select列，仅select主键
+     */
+    @Override
+    protected void simplifySelectColumns() {
+        List<String> selectColumns = new ArrayList<>(8);
+        String idCol = BindingCacheManager.getPropInfoByClass(referencedEntityClass).getIdColumn();
+        selectColumns.add(idCol);
+        selectColumns.addAll(refObjJoinCols);
+        String[] selectColsArray = S.toStringArray(selectColumns);
+        if(remoteBindDTO != null){
+            remoteBindDTO.setSelectColumns(selectColsArray);
+        }
+        this.queryWrapper.select(selectColsArray);
+    }
+
+
+    /**
+     * 构建匹配key-count目标的map
+     * @param list
+     * @return
+     */
+    private Map<String, Integer> buildMatchKey2ListCountMap(List<T> list){
+        Map<String, Integer> key2TargetCountMap = new HashMap<>(list.size());
+        StringBuilder sb = new StringBuilder();
+        for(T entity : list){
+            sb.setLength(0);
+            for(int i=0; i<refObjJoinCols.size(); i++){
+                String refObjJoinOnCol = refObjJoinCols.get(i);
+                String pkValue = BeanUtils.getStringProperty(entity, toRefObjField(refObjJoinOnCol));
+                if(i > 0){
+                    sb.append(Cons.SEPARATOR_COMMA);
+                }
+                sb.append(pkValue);
+            }
+            // 查找匹配Key
+            String matchKey = sb.toString();
+            // 获取list
+            Integer entityCount = key2TargetCountMap.get(matchKey);
+            if(entityCount == null){
+                entityCount = 0;
+            }
+            entityCount++;
+            key2TargetCountMap.put(matchKey, entityCount);
+        }
+        sb.setLength(0);
+        return key2TargetCountMap;
+    }
+
+}
\ No newline at end of file
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
index 40ef7977..9df5025b 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
@@ -54,6 +54,15 @@ public class EntityListBinder<T> extends EntityBinder<T> {
         }
     }
 
+    /***
+     * 构造方法
+     * @param entityClass
+     * @param voList
+     */
+    public EntityListBinder(Class<T> entityClass, List voList){
+        super(entityClass, voList);
+    }
+
     @Override
     public void bind() {
         if(V.isEmpty(annoObjectList)){
@@ -64,7 +73,7 @@ public class EntityListBinder<T> extends EntityBinder<T> {
         }
         Map<String, List> valueEntityListMap = new HashMap<>();
         if(middleTable == null){
-            super.simplifySelectColumns();
+            this.simplifySelectColumns();
             super.buildQueryWrapperJoinOn();
             // 查询条件为空时不进行查询
             if (queryWrapper.isEmptyOfNormal()) {
@@ -97,7 +106,7 @@ public class EntityListBinder<T> extends EntityBinder<T> {
             if(V.isEmpty(middleTableResultMap)){
                 return;
             }
-            super.simplifySelectColumns();
+            this.simplifySelectColumns();
             // 收集查询结果values集合
             List entityIdList = extractIdValueFromMap(middleTableResultMap);
             if(V.notEmpty(this.splitBy)){
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/parallel/ParallelBindingManager.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/parallel/ParallelBindingManager.java
index 0a079bba..c5a31db6 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/parallel/ParallelBindingManager.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/parallel/ParallelBindingManager.java
@@ -134,6 +134,22 @@ public class ParallelBindingManager {
         return doBinding(binder, annotation.condition());
     }
 
+    /***
+     * 绑定count计数
+     * @param voList
+     * @param fieldAnnotation
+     */
+    @Async
+    public CompletableFuture<Boolean> doBindingCount(List voList, FieldAnnotation fieldAnnotation) {
+        BindCount annotation = (BindCount) fieldAnnotation.getAnnotation();
+        // 绑定关联对象entity
+        CountBinder binder = new CountBinder(annotation, voList);
+        // 构建binder
+        binder.set(fieldAnnotation.getFieldName(), fieldAnnotation.getFieldClass());
+        // 解析条件并且执行绑定
+        return doBinding(binder, annotation.condition());
+    }
+
     /**
      * 绑定表关联数据
      * @param binder
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/BindAnnotationGroup.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/BindAnnotationGroup.java
index a568711a..c0888f6f 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/BindAnnotationGroup.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/BindAnnotationGroup.java
@@ -54,6 +54,10 @@ public class BindAnnotationGroup {
      * BindFieldList分组Map
      */
     private Map<String, List<FieldAnnotation>> bindFieldListGroupMap;
+    /**
+     * count计数关联注解
+     */
+    private List<FieldAnnotation> bindCountAnnotations;
     /**
      * 深度绑定实体
      */
@@ -97,7 +101,11 @@ public class BindAnnotationGroup {
             } else if (annotation instanceof BindFieldList) {
                 BindFieldList bindField = (BindFieldList) annotation;
                 key = bindField.entity().getName() + ":" + bindField.condition() + ":" + bindField.orderBy();
-            } else if (annotation instanceof BindEntity) {
+            } else if (annotation instanceof BindCount) {
+                BindCount bindCount = (BindCount) annotation;
+                key = bindCount.entity().getName() + ":" + bindCount.condition();
+            }
+            else if (annotation instanceof BindEntity) {
                 BindEntity bindEntity = (BindEntity) annotation;
                 key = bindEntity.entity().getName();
             } else if (annotation instanceof BindEntityList) {
@@ -153,6 +161,12 @@ public class BindAnnotationGroup {
             List<FieldAnnotation> list = bindFieldListGroupMap.computeIfAbsent(key, k -> new ArrayList<>(4));
             list.add(fieldAnnotation);
         }
+        else if(annotation instanceof BindCount){
+            if(bindCountAnnotations == null){
+                bindCountAnnotations = new ArrayList<>(4);
+            }
+            bindCountAnnotations.add(fieldAnnotation);
+        }
     }
 
     public List<FieldAnnotation> getBindDictAnnotations() {
@@ -175,6 +189,10 @@ public class BindAnnotationGroup {
         return bindFieldListGroupMap;
     }
 
+    public List<FieldAnnotation> getBindCountAnnotations() {
+        return bindCountAnnotations;
+    }
+
     public List<FieldAnnotation> getDeepBindEntityAnnotations() {
         return deepBindEntityAnnotations;
     }
@@ -184,7 +202,7 @@ public class BindAnnotationGroup {
     }
 
     public boolean isEmpty() {
-        return V.isAllEmpty(bindDictAnnotations, bindFieldGroupMap, bindEntityAnnotations, bindEntityListAnnotations, bindFieldListGroupMap);
+        return V.isAllEmpty(bindDictAnnotations, bindFieldGroupMap, bindEntityAnnotations, bindEntityListAnnotations, bindFieldListGroupMap, bindCountAnnotations);
     }
 
     /**
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java
index 58f96d39..f5575ac2 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/ParserCache.java
@@ -65,7 +65,7 @@ public class ParserCache {
      * 用于查询注解是否是Bind相关注解
      */
     private static final Set<Class<?>> BIND_ANNOTATION_SET = new HashSet<>(Arrays.asList(
-            BindDict.class, BindField.class, BindFieldList.class, BindEntity.class, BindEntityList.class
+            BindDict.class, BindField.class, BindFieldList.class, BindEntity.class, BindEntityList.class, BindCount.class
     ));
 
     /**
-- 
Gitee


From a5a64e0988b1421efe4fade98990c5af4cb9d37e Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 24 Jun 2022 10:10:57 +0800
Subject: [PATCH 189/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96JdbcUrl=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=8F=E4=B8=BA=E9=A6=96=E9=80=89Connectio?=
 =?UTF-8?q?n=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/test/util/ContextHelperTest.java     | 54 +++++++++++++++++++
 .../com/diboot/core/util/ContextHelper.java   | 23 +++++---
 2 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
new file mode 100644
index 00000000..bfb9976a
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.util;
+
+import com.diboot.core.service.BaseService;
+import com.diboot.core.util.BeanUtils;
+import com.diboot.core.util.ContextHelper;
+import diboot.core.test.StartupApplication;
+import diboot.core.test.binder.entity.DemoTest;
+import diboot.core.test.binder.service.DemoTestService;
+import diboot.core.test.binder.service.impl.DemoTestServiceImpl;
+import diboot.core.test.config.SpringMvcConfig;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * ContextHelper单元测试
+ * @author mazc@dibo.ltd
+ * @version 1.0
+ * @date 2022/06/22
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SpringMvcConfig.class})
+@SpringBootTest(classes = {StartupApplication.class})
+public class ContextHelperTest {
+
+    @Test
+    public void testDatabaseType(){
+        String dbType = ContextHelper.getDatabaseType();
+        Assert.assertTrue(dbType.equals("mysql"));
+
+        BaseService baseService = ContextHelper.getBaseServiceByEntity(DemoTest.class);
+        Assert.assertTrue(BeanUtils.getTargetClass(baseService).getName().equals(DemoTestServiceImpl.class.getName()));
+
+    }
+
+}
diff --git a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
index 35d6bc17..7a52eb92 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/ContextHelper.java
@@ -24,7 +24,6 @@ import com.diboot.core.binding.parser.EntityInfoCache;
 import com.diboot.core.binding.parser.ParserCache;
 import com.diboot.core.binding.parser.PropInfo;
 import com.diboot.core.service.BaseService;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -37,7 +36,9 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.ContextLoader;
 
+import javax.sql.DataSource;
 import java.lang.annotation.Annotation;
+import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -231,8 +232,20 @@ public class ContextHelper implements ApplicationContextAware, ApplicationListen
         if (applicationContext == null) {
             return null;
         }
+        String jdbcUrl = null;
+        try{
+            DataSource dataSource = applicationContext.getBean(DataSource.class);
+            Connection connection = dataSource.getConnection();
+            jdbcUrl = connection.getMetaData().getURL();
+            connection.close();
+            return jdbcUrl;
+        }
+        catch (Exception e){
+            log.warn("获取JDBC URL异常: {}", e.getMessage());
+        }
+        // 候补识别方式，暂时保留
         Environment environment = applicationContext.getEnvironment();
-        String jdbcUrl = environment.getProperty("spring.datasource.url");
+        jdbcUrl = environment.getProperty("spring.datasource.url");
         if(jdbcUrl == null){
             jdbcUrl = environment.getProperty("spring.datasource.druid.url");
         }
@@ -273,12 +286,6 @@ public class ContextHelper implements ApplicationContextAware, ApplicationListen
                 DATABASE_TYPE = DbType.SQL_SERVER.getDb();
             }
         }
-        else{
-            SqlSessionFactory sqlSessionFactory = getBean(SqlSessionFactory.class);
-            if(sqlSessionFactory != null){
-                DATABASE_TYPE = sqlSessionFactory.getConfiguration().getDatabaseId();
-            }
-        }
         if(DATABASE_TYPE == null){
             log.warn("无法识别数据库类型，请检查数据源配置:spring.datasource.url等");
         }
-- 
Gitee


From aa58d8f347544f1aa5f420cb4a18a3141736401d Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 24 Jun 2022 13:32:55 +0800
Subject: [PATCH 190/195] =?UTF-8?q?*=20=E8=BE=BE=E6=A2=A6=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 diboot-core-starter/pom.xml                   |   8 +
 .../core/test/binder/dto/DepartmentDTO.java   |   1 +
 .../diboot/core/test/binder/entity/User.java  |   4 +-
 .../core/test/binder/vo/ComplexSplitVO.java   |   5 +
 .../core/test/binder/vo/SimpleSplitVO.java    |   2 +
 .../diboot/core/test/binder/vo/UserEscVO.java |   2 +
 .../core/test/service/BaseServiceTest.java    |  12 +-
 .../core/test/util/ContextHelperTest.java     |   2 +-
 .../java/diboot/core/test/util/VTest.java     |  11 +-
 .../src/test/resources/application.properties |  11 +-
 .../src/test/resources/unittest-dm.sql        | 186 ++++++++++++++++++
 .../{init-mysql.sql => unittest-mysql.sql}    |   0
 .../query/dynamic/DynamicSqlProvider.java     |  18 +-
 .../core/service/impl/BaseServiceImpl.java    |  22 ++-
 14 files changed, 260 insertions(+), 24 deletions(-)
 create mode 100644 diboot-core-starter/src/test/resources/unittest-dm.sql
 rename diboot-core-starter/src/test/resources/{init-mysql.sql => unittest-mysql.sql} (100%)

diff --git a/diboot-core-starter/pom.xml b/diboot-core-starter/pom.xml
index 86bf86c0..b147da86 100644
--- a/diboot-core-starter/pom.xml
+++ b/diboot-core-starter/pom.xml
@@ -56,5 +56,13 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--
+        <dependency>
+            <groupId>com.dm</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>1.8</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/DmJdbcDriver18.jar</systemPath>
+        </dependency>-->
     </dependencies>
 </project>
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
index 46f15c60..7679ff34 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
@@ -57,6 +57,7 @@ public class DepartmentDTO implements Serializable {
     // 多绑定or连接
     @BindQuery(comparison = Comparison.CONTAINS, field = "name")
     @BindQuery(comparison = Comparison.STARTSWITH, field = "`character`")
+    //@BindQuery(comparison = Comparison.STARTSWITH, field = "character")
     @BindQuery(comparison = Comparison.ENDSWITH, entity = Organization.class, field = "name", condition = "this.org_id=id")
     private String search;
 
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
index c3750c3c..96250a65 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
@@ -16,6 +16,7 @@
 package diboot.core.test.binder.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.diboot.core.data.copy.Accept;
 import com.diboot.core.entity.BaseEntity;
 import com.diboot.core.util.D;
@@ -35,6 +36,7 @@ import java.util.Date;
 @Getter
 @Setter
 @Accessors(chain = true)
+//@TableName("\"USER\"")
 public class User extends BaseEntity {
     private static final long serialVersionUID = 3050761344045195972L;
 
@@ -54,6 +56,6 @@ public class User extends BaseEntity {
     @JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
     private LocalDateTime localDatetime;
 
-    @TableField("`character`")
+    //@TableField("`character`")
     private String character;
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java
index af115868..9706824e 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java
@@ -41,15 +41,20 @@ public class ComplexSplitVO extends Organization {
     // ，拆分的id值绑定 （中间表1-n主键绑定）
     @BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=user.id AND user.`character`=uuid",
             splitBy= Cons.SEPARATOR_COMMA)
+//    @BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=\"USER\".id AND \"USER\".character=uuid",
+//            splitBy= Cons.SEPARATOR_COMMA)
     private List<TestUploadFile> managerPhotos;
 
     // ，拆分的id值绑定
     @BindFieldList(entity = TestUploadFile.class, field = "fileName",
             condition="this.manager_id=user.id AND user.`character`=uuid", splitBy= Cons.SEPARATOR_COMMA)
+//    @BindFieldList(entity = TestUploadFile.class, field = "fileName",
+//            condition="this.manager_id=\"USER\".id AND \"USER\".character=uuid", splitBy= Cons.SEPARATOR_COMMA)
     private List<String> managerPhotoNames;
 
     // 中间表1-n非主键绑定
     @BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=user.id AND user.id=rel_obj_id AND rel_obj_type = 'IamUser'")
+    //@BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=\"USER\".id AND \"USER\".id=rel_obj_id AND rel_obj_type = 'IamUser'")
     private List<TestUploadFile> managerPhotoList;
 
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java
index 7786651e..299817ab 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleSplitVO.java
@@ -40,11 +40,13 @@ public class SimpleSplitVO extends Department {
 
     // ，拆分的id值绑定
     @BindEntityList(entity = User.class, condition="this.`character`=id", splitBy= Cons.SEPARATOR_COMMA)
+    //@BindEntityList(entity = User.class, condition="this.character=id", splitBy= Cons.SEPARATOR_COMMA)
     private List<User> managers;
 
 
     // ，拆分的id值绑定
     @BindFieldList(entity = User.class, field = "username", condition="this.`character`=id", splitBy= Cons.SEPARATOR_COMMA)
+    //@BindFieldList(entity = User.class, field = "username", condition="this.character=id", splitBy= Cons.SEPARATOR_COMMA)
     private List<String> managerNames;
 
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserEscVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserEscVO.java
index 91433ef5..1bb5b7e2 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserEscVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/UserEscVO.java
@@ -40,8 +40,10 @@ public class UserEscVO extends User {
     private String deptCharacter;
 
     @BindField(entity = Department.class, field="name", condition="this.`character`=`character`")
+    //@BindField(entity = Department.class, field="name", condition="this.character=character")
     private String deptName;
 
     @BindField(entity = Organization.class, field="name", condition="this.`character`=department.`character` AND department.org_id=id")
+    //@BindField(entity = Organization.class, field="name", condition="this.character=department.character AND department.org_id=id")
     private String orgName;
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
index 6f77c7eb..63cbea78 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
@@ -300,13 +300,6 @@ public class BaseServiceTest {
         Assert.assertTrue(exists);
     }
 
-    @Test
-    public void testContextHelper(){
-        String database = ContextHelper.getDatabaseType();
-        System.out.println(database);
-        Assert.assertTrue(database.equals("mysql") || database.equals("oracle"));
-    }
-
     @Test
     public void testGetValuesOfField(){
         QueryWrapper<Dictionary> queryWrapper = new QueryWrapper<>();
@@ -451,13 +444,16 @@ public class BaseServiceTest {
                 .select("sum(id) as count");
         Map<String, Object> map = dictionaryService.getMap(queryWrapper);
         Assert.assertTrue(map!=null);
-        Assert.assertTrue(map.get("count") != null);
+        Assert.assertTrue(MapUtils.getIgnoreCase(map, "count") != null);
     }
 
     @Test
     public void tesExecuteMultipleUpdateSqls(){
         List<String> sqls = new ArrayList<>();
         Long dictId = 20000l;
+        if(ContextHelper.getDatabaseType().equals("dm")) {
+            sqls.add("SET IDENTITY_INSERT dictionary ON");
+        }
         sqls.add("INSERT INTO dictionary(id, parent_id, type, item_name) VALUES("+dictId+", 0, 'TEST', '')");
         sqls.add("DELETE FROM dictionary WHERE id=20000 AND is_deleted=1");
         boolean success = SqlFileInitializer.executeMultipleUpdateSqlsWithTransaction(sqls);
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
index bfb9976a..1c1226dc 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
@@ -44,7 +44,7 @@ public class ContextHelperTest {
     @Test
     public void testDatabaseType(){
         String dbType = ContextHelper.getDatabaseType();
-        Assert.assertTrue(dbType.equals("mysql"));
+        Assert.assertTrue(dbType.equals("mysql") || dbType.equals("dm"));
 
         BaseService baseService = ContextHelper.getBaseServiceByEntity(DemoTest.class);
         Assert.assertTrue(BeanUtils.getTargetClass(baseService).getName().equals(DemoTestServiceImpl.class.getName()));
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java
index 2f4ea21d..b134ff28 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/VTest.java
@@ -20,8 +20,14 @@ import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.JSON;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
+import diboot.core.test.StartupApplication;
+import diboot.core.test.config.SpringMvcConfig;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -35,6 +41,9 @@ import java.util.List;
  * @version 1.0
  * @date 2019/06/02
  */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SpringMvcConfig.class})
+@SpringBootTest(classes = {StartupApplication.class})
 public class VTest {
 
     @Test
@@ -95,7 +104,7 @@ public class VTest {
         Assert.assertTrue(V.equals(field.getType().getName(), "java.util.Date"));
 
         Dictionary dictionary = BeanUtils.cloneBean(new Dictionary());
-        Dictionary dictionary1 = JSON.parseObject("{}", Dictionary.class);
+        Dictionary dictionary1 = JSON.parseObject("{\"parentId\":0}", Dictionary.class);
         Assert.assertTrue(V.equals(dictionary.getClass(), dictionary1.getClass()));
 
         field = BeanUtils.extractField(Dictionary.class, "isDeletable");
diff --git a/diboot-core-starter/src/test/resources/application.properties b/diboot-core-starter/src/test/resources/application.properties
index a030edc6..6adc59da 100644
--- a/diboot-core-starter/src/test/resources/application.properties
+++ b/diboot-core-starter/src/test/resources/application.properties
@@ -1,12 +1,19 @@
 server.port=8080
 server.servlet.context-path=/api
 
-#datasource config
+# Mysql datasource config
 spring.datasource.url=jdbc:mysql://localhost:3306/playground?characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=diboot
 spring.datasource.password=123456
 spring.datasource.hikari.maximum-pool-size=5
-spring.datasource.hikari.driver-class-name=com.mysql.cj.jdbc.Driver
+
+# DM datasource config
+#spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver
+#spring.datasource.url=jdbc:dm://localhost:3652?schema=DIBOOT_PLAYGROUND&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.username=SYSDBA
+#spring.datasource.password=123456
+#spring.datasource.hikari.maximum-pool-size=5
 
 spring.main.allow-bean-definition-overriding=true
 
diff --git a/diboot-core-starter/src/test/resources/unittest-dm.sql b/diboot-core-starter/src/test/resources/unittest-dm.sql
new file mode 100644
index 00000000..ab06b462
--- /dev/null
+++ b/diboot-core-starter/src/test/resources/unittest-dm.sql
@@ -0,0 +1,186 @@
+--set schema diboot_unittest;
+
+-- create schema diboot_example collate utf8_general_ci;
+-- 建表
+-- 字典表
+create table dictionary (
+                            id                 BIGINT primary key,
+                            parent_id          BIGINT           default 0  not null,
+                            tenant_id          BIGINT           default 0  not null,
+                            app_module          VARCHAR(150),
+                            type               VARCHAR(150)          not null,
+                            item_name          VARCHAR(300)         not null,
+                            item_value         VARCHAR(300),
+                            description        VARCHAR(300),
+                            extdata            VARCHAR(600),
+                            sort_id            SMALLINT           default 99  not null,
+                            is_deletable       BIT          default 1  not null,
+                            is_editable        BIT          default 1  not null,
+                            is_deleted         BIT          default 0  not null,
+                            create_time        DATETIME    null
+);
+
+create table department
+(
+    id BIGINT primary key,
+    parent_id bigint default 0 not null,
+    org_id bigint not null ,
+    name varchar(50) not null,
+    extdata varchar(100) null ,
+    character varchar(100) null ,
+    is_deleted BIT default 0 not null ,
+    create_time datetime null
+);
+
+create table organization
+(
+    id INT identity ( 10000,1) primary key,
+    parent_id int default 0 not null,
+    name varchar(100) not null,
+    telphone varchar(20) null,
+    manager_id bigint not null,
+    is_deleted BIT default 0 not null,
+    create_time datetime default CURRENT_TIMESTAMP not null
+);
+
+create table role
+(
+    id INT identity ( 10000,1) primary key,
+    name varchar(20) null,
+    code varchar(20) null,
+    is_deleted BIT default 0 null,
+    create_time datetime default CURRENT_TIMESTAMP null
+);
+
+create table "USER"
+(
+    id INT identity ( 10000,1) primary key,
+    department_id int default 0 not null,
+    username varchar(20) null,
+    gender varchar(20) null,
+    birthdate date null,
+    character varchar(100) null,
+    is_deleted BIT default 0 null,
+    create_time datetime default CURRENT_TIMESTAMP null,
+    local_datetime datetime null
+);
+
+create table user_role
+(
+    user_type varchar(20) not null,
+    user_id int not null,
+    role_id int not null,
+    primary key (user_id, role_id)
+);
+
+create table cc_city_info
+(
+    id INT identity ( 10000,1) primary key,
+    parent_id   int          null,
+    region_id   int          not null,
+    region_name varchar(100) null
+);
+
+CREATE TABLE db_goods_goods_info (
+                                     goods_id bigint DEFAULT NULL,
+                                     goods_nm varchar(10) DEFAULT NULL,
+                                     create_ts datetime default CURRENT_TIMESTAMP null,
+                                     update_ts  datetime null,
+                                     is_del BIT DEFAULT 0
+);
+
+CREATE TABLE db_purchase_rel_plan_goods (
+                                            rel_id bigint DEFAULT NULL,
+                                            purchase_form_plan_id bigint DEFAULT NULL,
+                                            goods_id bigint DEFAULT NULL,
+                                            create_ts datetime default CURRENT_TIMESTAMP null,
+                                            update_ts  datetime null,
+                                            is_del BIT DEFAULT 0
+);
+
+CREATE TABLE db_purchase_form_plan (
+                                       purchase_form_plan_id bigint DEFAULT NULL,
+                                       name varchar(100) DEFAULT NULL,
+                                       is_del BIT DEFAULT 0,
+                                       create_ts datetime default CURRENT_TIMESTAMP null,
+                                       update_ts  datetime null
+);
+
+-- 上传文件表
+
+CREATE TABLE test_upload_file (
+                                  uuid varchar(32) NOT NULL primary key,
+                                  rel_obj_type varchar(50) DEFAULT NULL,
+                                  rel_obj_id varchar(32) DEFAULT NULL,
+                                  rel_obj_field varchar(50) DEFAULT NULL,
+                                  file_name varchar(100) NOT NULL,
+                                  storage_path varchar(200) NOT NULL,
+                                  access_url varchar(200) NULL,
+                                  file_type varchar(20) DEFAULT NULL,
+                                  is_deleted   BIT default 0                 not null,
+                                  create_time  datetime   default CURRENT_TIMESTAMP not null
+);
+
+-- playground.demo_test definition
+
+CREATE TABLE demo_test (
+                           id bigint identity ( 10000,1) primary key,
+                           is_deleted BIT NOT NULL DEFAULT 0,
+                           name varchar(100) NOT NULL,
+                           age bigint NOT NULL,
+                           id_card varchar(100) DEFAULT NULL,
+                           mobile_phone varchar(100) DEFAULT NULL,
+                           email varchar(100) DEFAULT NULL,
+                           sex varchar(100) DEFAULT NULL,
+                           birthday date DEFAULT NULL,
+                           sss_img varchar(200) DEFAULT NULL,
+                           mmm_img varchar(1000) DEFAULT NULL ,
+                           data_file varchar(1000) DEFAULT NULL ,
+                           file_test varchar(200) DEFAULT NULL ,
+                           create_by bigint DEFAULT '0' ,
+                           create_time datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ,
+                           update_time datetime NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- playground.demo_test_join definition
+
+CREATE TABLE demo_test_join (
+                                id bigint identity ( 10000,1) primary key,
+                                demo_test_id bigint DEFAULT NULL,
+                                name varchar(100) DEFAULT NULL ,
+                                email varchar(100) DEFAULT NULL ,
+                                is_deleted BIT NOT NULL DEFAULT 0,
+                                create_time datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- 初始化样例数据
+INSERT INTO department (id, parent_id, org_id, name, character) VALUES (10001, 0, 100001, '产品部', 'WW'), (10002, 10001, 100001, '研发组', '1001'), (10003, 10001, 100001, '测试组', '1001,1002'),
+                                                                       (10004, 10001, 100001, '市场部', '1001,1002'), (10005, 10003, 100001, '自动化测试', null), (10006, 10003, 100001, '功能测试', null);
+INSERT INTO dictionary (id, parent_id, app_module, type, item_name, item_value) VALUES (1, 0, '', 'GENDER', '性别', null), (2, 1, '', 'GENDER', '男', 'M'), (3, 1, '', 'GENDER', '女', 'F');
+SET IDENTITY_INSERT organization ON;
+INSERT INTO organization (id, parent_id, name, telphone, manager_id) VALUES (100001, 0, '苏州帝博', '0512-62988949', 1001), (100002, 0, '成都帝博', '028-62988949', 1002);
+SET IDENTITY_INSERT role ON;
+INSERT INTO role (id, name, code) VALUES (101, '管理员', 'ADMIN'), (102, '操作员', 'OPERATOR');
+SET IDENTITY_INSERT "USER" ON;
+INSERT INTO "USER" (id, department_id, username, gender, character) VALUES (1001, 10002, '张三', 'M', 'test123456'), (1002, 10002, '李四', 'F', 'test123456,test234567'), (1003, 10001, '王五', 'M', 'WW');
+INSERT INTO user_role (user_type, user_id, role_id) VALUES ('SysUser', 1001, 101),('SysUser', 1001, 102),('OrgUser', 1002, 102);
+SET IDENTITY_INSERT cc_city_info ON;
+INSERT INTO cc_city_info (id, parent_id, region_id, region_name) VALUES (10000, 0, 10000, '江苏省'), (10010, 10000, 10010, '苏州市'), (10020, 10010, 10020, '园区');
+INSERT INTO db_goods_goods_info (goods_id, goods_nm, is_del) VALUES(1001, 'abcde', 0), (1002, 'abcd', 0);
+INSERT INTO db_purchase_rel_plan_goods(rel_id, purchase_form_plan_id, goods_id, is_del)VALUES(1, 1, 1001, 0), (2, 1, 1002, 0);
+INSERT INTO db_purchase_form_plan(purchase_form_plan_id, name, is_del)VALUES(1, '5月份采购计划', 0);
+INSERT INTO test_upload_file(uuid, rel_obj_type, rel_obj_id, file_name, access_url, storage_path)
+values ('test123456', 'IamUser', 1001, '123456.jpg', 'http://www.baidu.com', '/temp'),
+       ('test234567', 'IamUser', 1001, '234567.jpg', 'http://www.baidu.com', '/temp');
+SET IDENTITY_INSERT demo_test ON;
+INSERT INTO demo_test
+(id, is_deleted, name, age, id_card, mobile_phone, email, sex, birthday, sss_img, mmm_img, data_file, file_test, create_by)
+VALUES(10000074, 0, '666', 666, 'kdt3kHX4lAEshODwXMaqAg==', 'dI7AKyanaPYiWL0c5CfuPQ==', 'kdt3kHX4lAEshODwXMaqAg==', NULL, NULL, NULL, NULL, NULL, NULL, 0),
+      (10000075, 0, '1', 111, 'kBzIU3XgeowKFQnyeGZfZZHbd5B1+JQBLITg8FzGqgI=', 'AYdMZnNVJwYmpHh8VmC11A==', '5tEbe9Q9hti2Z0spAE5fsA==', NULL, NULL, NULL, NULL, NULL, NULL, 0);
+SET IDENTITY_INSERT demo_test_join ON;
+INSERT INTO demo_test_join (id, demo_test_id, name, email)
+VALUES(10000081, 10000074, '111', 'L9vrF7wJBKbbLRZChI33WA=='),
+      (10000084, 10000074, '114', 'A2Y6CZ4tv0V7QxPbq9EYkg=='),
+      (10000089, 10000075, '119', 'VVnnuR7fXzsIHCMilEsgLw=='),
+      (10000091, 10000075, '112', 'BqAefnSadfixkCebXakUDg=='),
+      (10000093, 10000075, '114', 'A2Y6CZ4tv0V7QxPbq9EYkg==');
diff --git a/diboot-core-starter/src/test/resources/init-mysql.sql b/diboot-core-starter/src/test/resources/unittest-mysql.sql
similarity index 100%
rename from diboot-core-starter/src/test/resources/init-mysql.sql
rename to diboot-core-starter/src/test/resources/unittest-mysql.sql
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
index c15d72ca..b3f396ad 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
@@ -17,6 +17,7 @@ package com.diboot.core.binding.query.dynamic;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diboot.core.binding.QueryBuilder;
 import com.diboot.core.binding.parser.ParserCache;
@@ -72,7 +73,7 @@ public class DynamicSqlProvider {
                 SELECT_DISTINCT("self.*");
             }
             else{
-                SELECT_DISTINCT(formatSqlSelect(ew.getSqlSelect()));
+                SELECT_DISTINCT(formatSqlSelect(ew.getSqlSelect(), page));
             }
             FROM(wrapper.getEntityTable()+" self");
             //提取字段，根据查询条件中涉及的表，动态join
@@ -121,7 +122,7 @@ public class DynamicSqlProvider {
                     if(isDeletedCol != null && QueryBuilder.checkHasColumn(segments.getNormal(), isDeletedSection) == false){
                         WHERE(isDeletedSection+ " = " +BaseConfig.getActiveFlagValue());
                     }
-                    if(segments.getOrderBy() != null){
+                    if(segments.getOrderBy() != null && !segments.getOrderBy().isEmpty()){
                         String orderBySql = segments.getOrderBy().getSqlSegment();
                         int beginIndex = S.indexOfIgnoreCase(orderBySql,"ORDER BY ");
                         if(beginIndex >= 0){
@@ -139,15 +140,24 @@ public class DynamicSqlProvider {
      * @param sqlSelect
      * @return
      */
-    private String formatSqlSelect(String sqlSelect){
+    private String formatSqlSelect(String sqlSelect, Page<?> page){
         String[] columns = S.split(sqlSelect);
+        Set<String> columnSets = new HashSet<>();
         StringBuilder sb = new StringBuilder();
         for(int i=0; i<columns.length; i++){
             String column = S.removeDuplicateBlank(columns[i]).trim();
             if(i>0){
                 sb.append(Cons.SEPARATOR_COMMA);
             }
-            sb.append("self."+column);
+            sb.append("self.").append(column);
+            columnSets.add("self."+column);
+        }
+        if(page != null && page.getOrders() != null) {
+            for(OrderItem orderItem : page.getOrders()){
+                if(!columnSets.contains(orderItem.getColumn())){
+                    sb.append(Cons.SEPARATOR_COMMA).append(orderItem.getColumn()).append(" AS _").append(S.replace(orderItem.getColumn(), ".", "_"));
+                }
+            }
         }
         return sb.toString();
     }
diff --git a/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java b/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
index 4de04498..560585ef 100644
--- a/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
+++ b/diboot-core/src/main/java/com/diboot/core/service/impl/BaseServiceImpl.java
@@ -318,11 +318,14 @@ public class BaseServiceImpl<M extends BaseCrudMapper<T>, T> extends ServiceImpl
 		List<R> oldEntityList = (iService != null)? iService.list(selectOld) : baseMapper.selectList(selectOld);
 		// 删除失效关联
 		List<Serializable> delIds = new ArrayList<>();
+		List<Serializable> removeFollowerIds = new ArrayList<>();
 		for (R entity : oldEntityList) {
-			if (V.notEmpty(followerIdList) && followerIdList.remove(BeanUtils.getProperty(entity, followerFieldName))) {
+			Serializable followerId = (Serializable)BeanUtils.getProperty(entity, followerFieldName);
+			if (V.notEmpty(followerIdList) && followerIdList.contains(followerId)) {
+				removeFollowerIds.add(followerId);
 				continue;
 			}
-			Serializable id = (Serializable) BeanUtils.getProperty(entity, isExistPk ? entityInfo.getPropInfo().getIdFieldName() : followerFieldName);
+			Serializable id = isExistPk? (Serializable)BeanUtils.getProperty(entity, entityInfo.getPropInfo().getIdFieldName()) : followerId;
 			if(id != null) {
 				delIds.add(id);
 			}
@@ -347,12 +350,17 @@ public class BaseServiceImpl<M extends BaseCrudMapper<T>, T> extends ServiceImpl
 				}
 			}
 		}
-
         // 新增关联
         if (V.notEmpty(followerIdList)) {
-            List<R> n2nRelations = new ArrayList<>(followerIdList.size());
+			List<Serializable> newFollowIds = new ArrayList();
+			for(Serializable id : followerIdList) {
+				if(!removeFollowerIds.contains(id)) {
+					newFollowIds.add(id);
+				}
+			}
+            List<R> n2nRelations = new ArrayList<>(newFollowIds.size());
             try {
-                for (Serializable followerId : followerIdList) {
+                for (Serializable followerId : newFollowIds) {
                     R relation = middleTableClass.newInstance();
 					BeanWrapper beanWrapper = BeanUtils.getBeanWrapper(relation);
 					beanWrapper.setPropertyValue(driverFieldName, driverId);
@@ -702,8 +710,8 @@ public class BaseServiceImpl<M extends BaseCrudMapper<T>, T> extends ServiceImpl
 		}
 		Map<ID, String> idNameMap = new HashMap<>(mapList.size());
 		for(Map<String, Object> map : mapList){
-			ID key = (ID)map.get(entityInfo.getIdColumn());
-			String value = S.valueOf(map.get(columnName));
+			ID key = (ID)MapUtils.getIgnoreCase(map, entityInfo.getIdColumn());
+			String value = S.valueOf(MapUtils.getIgnoreCase(map, columnName));
 			idNameMap.put(key, value);
 		}
 		return idNameMap;
-- 
Gitee


From 7975404f42eebd7b83c5bbf167a4a5bae986da28 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Fri, 24 Jun 2022 13:46:16 +0800
Subject: [PATCH 191/195] =?UTF-8?q?*=20=E8=BE=BE=E6=A2=A6=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/diboot/core/test/binder/entity/User.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
index 96250a65..43c7712b 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
@@ -56,6 +56,6 @@ public class User extends BaseEntity {
     @JsonFormat(pattern = D.FORMAT_DATE_Y4MD)
     private LocalDateTime localDatetime;
 
-    //@TableField("`character`")
+    @TableField("`character`")
     private String character;
 }
-- 
Gitee


From ac50c59e54981c5b10d4d0e7e404ce2652417552 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Tue, 28 Jun 2022 15:00:52 +0800
Subject: [PATCH 192/195] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=89=E6=95=88=E8=AE=B0=E5=BD=95=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/diboot/core/config/BaseConfig.java  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/config/BaseConfig.java b/diboot-core/src/main/java/com/diboot/core/config/BaseConfig.java
index 64df54d4..585fdda4 100644
--- a/diboot-core/src/main/java/com/diboot/core/config/BaseConfig.java
+++ b/diboot-core/src/main/java/com/diboot/core/config/BaseConfig.java
@@ -121,14 +121,24 @@ public class BaseConfig {
 		return batchSize;
 	}
 
-	private static String ACTIVE_FLAG_VALUE = null;
+	private static Object ACTIVE_FLAG_VALUE = null;
 	/**
 	 * 获取有效记录的标记值，如 0
 	 * @return
 	 */
-	public static String getActiveFlagValue(){
+	public static Object getActiveFlagValue(){
 		if(ACTIVE_FLAG_VALUE == null){
-			ACTIVE_FLAG_VALUE = getProperty("mybatis-plus.global-config.db-config.logic-not-delete-value", "0");
+			String activeFlagValue = getProperty("mybatis-plus.global-config.db-config.logic-not-delete-value", "0");
+			switch (activeFlagValue) {
+				case "false":
+					ACTIVE_FLAG_VALUE = false;
+					break;
+				case "0":
+					ACTIVE_FLAG_VALUE = 0;
+					break;
+				default:
+					ACTIVE_FLAG_VALUE = activeFlagValue;
+			}
 		}
 		return ACTIVE_FLAG_VALUE;
 	}
-- 
Gitee


From d2f0221f081610df8e336fb23b7ef909cbe5c1ef Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Wed, 29 Jun 2022 17:58:39 +0800
Subject: [PATCH 193/195] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index dc726f10..30711b35 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 > 用上diboot，告别常规SQL和CRUD，写的更少，性能更好！
 
-> 新用户指南: [手把手来体验](https://www.diboot.com/guide/beginner/bootstrap.html) 、[看视频了解我](https://www.bilibili.com/video/BV17P4y1p7L4) 、[如何做到高性能](https://www.bilibili.com/video/BV1tL411p7CD)
+> 新用户指南: [手把手来体验](https://www.diboot.com/guide/beginner/bootstrap.html) 、[看视频了解 Diboot](https://www.bilibili.com/video/BV17P4y1p7L4) 、[了解Diboot如何做到高性能](https://www.bilibili.com/video/BV1tL411p7CD)
 
 # diboot - 基础组件化繁为简，高效工具以简驭繁
 <hr>
@@ -37,9 +37,9 @@
 ### 2、IAM 身份认证基础组件 及 配套VUE前端框架（diboot-antd-admin、diboot-element-admin）
 
 * 开箱即用的RBAC角色权限模型与预置组织人员岗位模型
-* 基于JWT的认证授权，支持申请token、刷新token、无状态认证
-* 简化的BindPermission注解，支持兼容shiro的简化权限绑定与自动鉴权
-* 自动提取需要验证的后端接口, 借助前端功能方便绑定前后端菜单按钮权限
+* 基于无状态token的认证授权，支持刷新token
+* 简化的BindPermission注解，支持兼容shiro的简化权限配置与自动鉴权
+* 自动提取需要鉴权的后端接口, 借助前端功能方便配置菜单按钮权限
 * 无缝适配redis，引入redis依赖即可启用shiro的redis缓存
 * 支持基于注解的数据权限实现、简化的Log注解记录操作日志等
 * 支持灵活的扩展能力（扩展多种登录方式、灵活替换用户实体类、自定义缓存等）
@@ -75,7 +75,7 @@
 * 功能强大（数据结构与代码同步、前后端代码一键生成、前端面板组件编排）
 * 配置灵活（可按需配置生成代码路径及启用`Lombok`、`Swagger`等）
 * 代码标准（devtools标准化了数据结构定义与代码实现，降低维护成本）
-* 支持多库（MySQL、MariaDB、ORACLE、SQLServer、PostgreSQL）
+* 支持多库（MySQL、MariaDB、ORACLE、SQLServer、PostgreSQL、达梦、人大金仓）
 
 > 详细文档: [diboot-devtools文档](https://www.diboot.com/guide/diboot-devtools/introduce.html).
 
@@ -87,7 +87,7 @@
 ## 技术交流
 如遇diboot相关技术问题，欢迎加群交流：
 
-* **VIP技术支持QQ群**（捐助/付费用户尊享）: [931266830]()
+* **VIP技术支持QQ群**（付费用户尊享）: [931266830]()
 
 * 技术交流QQ群: [731690096]()
 
-- 
Gitee


From a250fba75b8864be4d79e9aa9df452fbaf7f2d00 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 30 Jun 2022 09:29:42 +0800
Subject: [PATCH 194/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96getIgnoreCase?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=85=BC=E5=AE=B9key=E5=A4=A7=E5=86=99?=
 =?UTF-8?q?=E5=8F=8A=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/diboot/core/test/service/BaseServiceTest.java  | 1 +
 diboot-core/src/main/java/com/diboot/core/util/MapUtils.java | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
index 63cbea78..d44bccc7 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
@@ -445,6 +445,7 @@ public class BaseServiceTest {
         Map<String, Object> map = dictionaryService.getMap(queryWrapper);
         Assert.assertTrue(map!=null);
         Assert.assertTrue(MapUtils.getIgnoreCase(map, "count") != null);
+        Assert.assertTrue(MapUtils.getIgnoreCase(map, "COUNT") != null);
     }
 
     @Test
diff --git a/diboot-core/src/main/java/com/diboot/core/util/MapUtils.java b/diboot-core/src/main/java/com/diboot/core/util/MapUtils.java
index 1ac88bf9..058e582a 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/MapUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/MapUtils.java
@@ -37,7 +37,10 @@ public class MapUtils {
         if(map.containsKey(key)) {
             return map.get(key);
         }
-        return map.get(key.toUpperCase());
+        if(map.containsKey(key.toUpperCase())) {
+            return map.get(key.toUpperCase());
+        }
+        return map.get(key.toLowerCase());
     }
 
 }
-- 
Gitee


From 9779e71cb7747e0d576034330a750af6b9a3bf67 Mon Sep 17 00:00:00 2001
From: JerryMa <mazc@dibo.ltd>
Date: Thu, 30 Jun 2022 17:12:17 +0800
Subject: [PATCH 195/195] =?UTF-8?q?*=20=E4=BC=98=E5=8C=96buildTree?=
 =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AE=E7=A9=BA=E7=9A=84=E5=AD=90=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/diboot/core/util/BeanUtils.java        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index 28c87f69..94587945 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -494,10 +494,9 @@ public class BeanUtils {
             for(T child : children) {
                 Object nodeId = getProperty(child, idFieldName);
                 List<T> childNodeChildren = buildTreeChildren(nodeId, nodeList, idFieldName, parentIdFieldName, childrenFieldName);
-                if(childNodeChildren == null) {
-                    childNodeChildren = new ArrayList<>();
+                if(childNodeChildren != null) {
+                    setProperty(child, childrenFieldName, childNodeChildren);
                 }
-                setProperty(child, childrenFieldName, childNodeChildren);
             }
         }
         return children;
-- 
Gitee