From 310b5b00a7c382778804c56b40707539e3925837 Mon Sep 17 00:00:00 2001
From: airhead <L4qiang@gmail.com>
Date: Tue, 23 Aug 2022 16:56:51 +0800
Subject: [PATCH 01/48] =?UTF-8?q?feat(redis):=20=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E7=A7=9F=E6=88=B7=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.增加多租户Cache
2.修复Mac M1启动报错
---
 yudao-dependencies/pom.xml                    |  7 +++++
 .../config/YudaoTenantAutoConfiguration.java  | 19 ++++++++++++
 .../core/redis/TenantRedisCacheManager.java   | 29 +++++++++++++++++++
 .../yudao-spring-boot-starter-redis/pom.xml   |  6 ++++
 .../config/YudaoCacheAutoConfiguration.java   |  2 ++
 5 files changed, 63 insertions(+)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 44d7bdf68..b681f2661 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -57,6 +57,7 @@
         <commons-net.version>3.8.0</commons-net.version>
         <jsch.version>0.1.55</jsch.version>
         <tika-core.version>2.4.1</tika-core.version>
+        <netty-all.version>4.1.75.Final</netty-all.version>
         <!-- 三方云服务相关 -->
         <minio.version>8.2.2</minio.version>
         <aliyun-java-sdk-core.version>4.5.25</aliyun-java-sdk-core.version>
@@ -509,6 +510,12 @@
                 <version>${jsch.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>${netty-all.version}</version>
+            </dependency>
+
             <!-- 三方云服务相关 -->
             <dependency>
                 <groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
index c1c969439..7896a3ad1 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.tenant.core.db.TenantDatabaseInterceptor;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJobHandlerDecorator;
 import cn.iocoder.yudao.framework.tenant.core.mq.TenantRedisMessageInterceptor;
+import cn.iocoder.yudao.framework.tenant.core.redis.TenantRedisCacheManager;
 import cn.iocoder.yudao.framework.tenant.core.security.TenantSecurityWebFilter;
 import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService;
 import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkServiceImpl;
@@ -25,6 +26,13 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.util.Objects;
 
 @Configuration
 @ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
@@ -110,4 +118,15 @@ public class YudaoTenantAutoConfiguration {
         };
     }
 
+    @Bean
+    @Primary
+    public RedisCacheManager tenantRedisCacheManager(
+            RedisTemplate<String, Object> redisTemplate,
+            RedisCacheConfiguration redisCacheConfiguration) {
+        RedisCacheWriter cacheWriter =
+                RedisCacheWriter.nonLockingRedisCacheWriter(
+                        Objects.requireNonNull(redisTemplate.getConnectionFactory()));
+        return new TenantRedisCacheManager(cacheWriter, redisCacheConfiguration);
+    }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
new file mode 100644
index 000000000..ab191f0d4
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.framework.tenant.core.redis;
+
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.Cache;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+
+/**
+ * @author airhead
+ */
+@Slf4j
+public class TenantRedisCacheManager extends RedisCacheManager {
+  public TenantRedisCacheManager(
+      RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) {
+    super(cacheWriter, defaultCacheConfiguration);
+  }
+
+  @Override
+  public Cache getCache(String name) {
+    if (TenantContextHolder.getTenantId() == null) {
+      return super.getCache(name);
+    }
+
+    name = name + ":" + TenantContextHolder.getTenantId();
+    return super.getCache(name);
+  }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
index 750cd4881..5c14c02fd 100644
--- a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
@@ -32,6 +32,12 @@
             <artifactId>spring-boot-starter-cache</artifactId> <!-- 实现对 Caches 的自动化配置 -->
         </dependency>
 
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.75.Final</version>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java
index e8c716203..6a8f92efc 100644
--- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.framework.redis.config;
 
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -13,6 +14,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
  * Cache 配置类，基于 Redis 实现
  */
 @Configuration
+@EnableConfigurationProperties({CacheProperties.class})
 @EnableCaching
 public class YudaoCacheAutoConfiguration {
 

From 8527bd3c77eed465304fd19238cb662e44dccefa Mon Sep 17 00:00:00 2001
From: airhead <L4qiang@gmail.com>
Date: Thu, 25 Aug 2022 15:53:01 +0800
Subject: [PATCH 02/48] =?UTF-8?q?fix(tenant):=20=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/YudaoTenantAutoConfiguration.java    | 17 ++++++++++++-----
 .../core/redis/TenantRedisCacheManager.java     |  6 ++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
index 7896a3ad1..8911f49d5 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
@@ -118,11 +118,18 @@ public class YudaoTenantAutoConfiguration {
         };
     }
 
-    @Bean
-    @Primary
-    public RedisCacheManager tenantRedisCacheManager(
-            RedisTemplate<String, Object> redisTemplate,
-            RedisCacheConfiguration redisCacheConfiguration) {
+  /**
+   * 引入租户时，tenantRedisCacheManager为主Bean
+   *
+   * @param redisTemplate
+   * @param redisCacheConfiguration
+   * @return
+   */
+  @Bean
+  @Primary
+  public RedisCacheManager tenantRedisCacheManager(
+      RedisTemplate<String, Object> redisTemplate,
+      RedisCacheConfiguration redisCacheConfiguration) {
         RedisCacheWriter cacheWriter =
                 RedisCacheWriter.nonLockingRedisCacheWriter(
                         Objects.requireNonNull(redisTemplate.getConnectionFactory()));
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
index ab191f0d4..fa5adfa4d 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
@@ -8,10 +8,15 @@ import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.cache.RedisCacheWriter;
 
 /**
+ * 租户缓存管理
+ *
+ * 为cacheName增加自动增加租户表示，格式：name+":"+tenantId
+ *
  * @author airhead
  */
 @Slf4j
 public class TenantRedisCacheManager extends RedisCacheManager {
+
   public TenantRedisCacheManager(
       RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) {
     super(cacheWriter, defaultCacheConfiguration);
@@ -19,6 +24,7 @@ public class TenantRedisCacheManager extends RedisCacheManager {
 
   @Override
   public Cache getCache(String name) {
+    //租户未设置时，返回原始name
     if (TenantContextHolder.getTenantId() == null) {
       return super.getCache(name);
     }

From 0e1babd7f41e87ecabab71524504be6466c42b78 Mon Sep 17 00:00:00 2001
From: airhead <L4qiang@gmail.com>
Date: Tue, 23 Aug 2022 16:56:51 +0800
Subject: [PATCH 03/48] =?UTF-8?q?feat(redis):=20=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E7=A7=9F=E6=88=B7=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.增加多租户Cache
2.修复Mac M1启动报错
---
 yudao-dependencies/pom.xml                    | 18 +++++-------
 .../config/YudaoTenantAutoConfiguration.java  | 19 ++++++++++++
 .../core/redis/TenantRedisCacheManager.java   | 29 +++++++++++++++++++
 .../yudao-spring-boot-starter-redis/pom.xml   |  6 ++++
 .../config/YudaoCacheAutoConfiguration.java   |  2 ++
 5 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index d7912ba69..d918cb654 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -58,6 +58,7 @@
         <jsch.version>0.1.55</jsch.version>
         <tika-core.version>2.4.1</tika-core.version>
         <aj-captcha.version>1.3.0</aj-captcha.version>
+        <netty-all.version>4.1.75.Final</netty-all.version>
         <!-- 三方云服务相关 -->
         <minio.version>8.2.2</minio.version>
         <aliyun-java-sdk-core.version>4.6.0</aliyun-java-sdk-core.version>
@@ -131,11 +132,6 @@
                 <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.iocoder.boot</groupId>
-                <artifactId>yudao-spring-boot-starter-captcha</artifactId>
-                <version>${revision}</version>
-            </dependency>
 
             <!-- Spring 核心 -->
             <dependency>
@@ -458,12 +454,6 @@
                 <version>${tika-core.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.anji-plus</groupId>
-                <artifactId>spring-boot-starter-captcha</artifactId>
-                <version>${aj-captcha.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity-engine-core</artifactId>
@@ -521,6 +511,12 @@
                 <version>${jsch.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>${netty-all.version}</version>
+            </dependency>
+
             <!-- 三方云服务相关 -->
             <dependency>
                 <groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
index c1c969439..7896a3ad1 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.tenant.core.db.TenantDatabaseInterceptor;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJobHandlerDecorator;
 import cn.iocoder.yudao.framework.tenant.core.mq.TenantRedisMessageInterceptor;
+import cn.iocoder.yudao.framework.tenant.core.redis.TenantRedisCacheManager;
 import cn.iocoder.yudao.framework.tenant.core.security.TenantSecurityWebFilter;
 import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService;
 import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkServiceImpl;
@@ -25,6 +26,13 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.util.Objects;
 
 @Configuration
 @ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
@@ -110,4 +118,15 @@ public class YudaoTenantAutoConfiguration {
         };
     }
 
+    @Bean
+    @Primary
+    public RedisCacheManager tenantRedisCacheManager(
+            RedisTemplate<String, Object> redisTemplate,
+            RedisCacheConfiguration redisCacheConfiguration) {
+        RedisCacheWriter cacheWriter =
+                RedisCacheWriter.nonLockingRedisCacheWriter(
+                        Objects.requireNonNull(redisTemplate.getConnectionFactory()));
+        return new TenantRedisCacheManager(cacheWriter, redisCacheConfiguration);
+    }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
new file mode 100644
index 000000000..ab191f0d4
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.framework.tenant.core.redis;
+
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.Cache;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+
+/**
+ * @author airhead
+ */
+@Slf4j
+public class TenantRedisCacheManager extends RedisCacheManager {
+  public TenantRedisCacheManager(
+      RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) {
+    super(cacheWriter, defaultCacheConfiguration);
+  }
+
+  @Override
+  public Cache getCache(String name) {
+    if (TenantContextHolder.getTenantId() == null) {
+      return super.getCache(name);
+    }
+
+    name = name + ":" + TenantContextHolder.getTenantId();
+    return super.getCache(name);
+  }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
index 750cd4881..5c14c02fd 100644
--- a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
@@ -32,6 +32,12 @@
             <artifactId>spring-boot-starter-cache</artifactId> <!-- 实现对 Caches 的自动化配置 -->
         </dependency>
 
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.75.Final</version>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java
index e8c716203..6a8f92efc 100644
--- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.framework.redis.config;
 
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -13,6 +14,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
  * Cache 配置类，基于 Redis 实现
  */
 @Configuration
+@EnableConfigurationProperties({CacheProperties.class})
 @EnableCaching
 public class YudaoCacheAutoConfiguration {
 

From 6b429584bfb384211bfb573a6d5303993551236d Mon Sep 17 00:00:00 2001
From: airhead <L4qiang@gmail.com>
Date: Thu, 25 Aug 2022 15:53:01 +0800
Subject: [PATCH 04/48] =?UTF-8?q?fix(tenant):=20=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/YudaoTenantAutoConfiguration.java    | 17 ++++++++++++-----
 .../core/redis/TenantRedisCacheManager.java     |  6 ++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
index 7896a3ad1..8911f49d5 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
@@ -118,11 +118,18 @@ public class YudaoTenantAutoConfiguration {
         };
     }
 
-    @Bean
-    @Primary
-    public RedisCacheManager tenantRedisCacheManager(
-            RedisTemplate<String, Object> redisTemplate,
-            RedisCacheConfiguration redisCacheConfiguration) {
+  /**
+   * 引入租户时，tenantRedisCacheManager为主Bean
+   *
+   * @param redisTemplate
+   * @param redisCacheConfiguration
+   * @return
+   */
+  @Bean
+  @Primary
+  public RedisCacheManager tenantRedisCacheManager(
+      RedisTemplate<String, Object> redisTemplate,
+      RedisCacheConfiguration redisCacheConfiguration) {
         RedisCacheWriter cacheWriter =
                 RedisCacheWriter.nonLockingRedisCacheWriter(
                         Objects.requireNonNull(redisTemplate.getConnectionFactory()));
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
index ab191f0d4..fa5adfa4d 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
@@ -8,10 +8,15 @@ import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.cache.RedisCacheWriter;
 
 /**
+ * 租户缓存管理
+ *
+ * 为cacheName增加自动增加租户表示，格式：name+":"+tenantId
+ *
  * @author airhead
  */
 @Slf4j
 public class TenantRedisCacheManager extends RedisCacheManager {
+
   public TenantRedisCacheManager(
       RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) {
     super(cacheWriter, defaultCacheConfiguration);
@@ -19,6 +24,7 @@ public class TenantRedisCacheManager extends RedisCacheManager {
 
   @Override
   public Cache getCache(String name) {
+    //租户未设置时，返回原始name
     if (TenantContextHolder.getTenantId() == null) {
       return super.getCache(name);
     }

From 72883aa975cc4f51d2eed403fa593c6321e79412 Mon Sep 17 00:00:00 2001
From: airhead <L4qiang@gmail.com>
Date: Fri, 9 Sep 2022 23:06:58 +0800
Subject: [PATCH 05/48] =?UTF-8?q?fix(dependencies):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index d918cb654..866763d0a 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -132,6 +132,11 @@
                 <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>cn.iocoder.boot</groupId>
+                <artifactId>yudao-spring-boot-starter-captcha</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!-- Spring 核心 -->
             <dependency>
@@ -454,6 +459,12 @@
                 <version>${tika-core.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.anji-plus</groupId>
+                <artifactId>spring-boot-starter-captcha</artifactId>
+                <version>${aj-captcha.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity-engine-core</artifactId>

From 9054a772b031244a9c2a79c492f355b7e00b125d Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 20 Sep 2022 18:00:43 +0800
Subject: [PATCH 06/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 +-
 yudao-dependencies/pom.xml                    | 22 +++---
 .../yudao-spring-boot-starter-biz-pay/pom.xml |  4 +-
 .../pom.xml                                   |  4 +-
 .../convert/message/BpmMessageConvert.java    |  5 ++
 .../app/banner/AppBannerController.java       |  5 +-
 .../dto/send/SmsSendSingleToUserReqDTO.java   |  1 -
 yudao-ui-admin-vue3/package.json              | 70 +++++++++----------
 8 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index 63aa70ecb..4fe52775b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <!-- 看看咋放到 bom 里 -->
-        <lombok.version>1.18.20</lombok.version>
-        <mapstruct.version>1.4.1.Final</mapstruct.version>
+        <lombok.version>1.18.24</lombok.version>
+        <mapstruct.version>1.5.2.Final</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index d7912ba69..99998b5eb 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -22,11 +22,11 @@
         <swagger-annotations.version>1.6.6</swagger-annotations.version>
         <servlet.versoin>2.5</servlet.versoin>
         <!-- DB 相关 -->
-        <druid.version>1.2.11</druid.version>
+        <druid.version>1.2.12</druid.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version>
-        <dynamic-datasource.version>3.5.0</dynamic-datasource.version>
-        <redisson.version>3.17.4</redisson.version>
+        <dynamic-datasource.version>3.5.2</dynamic-datasource.version>
+        <redisson.version>3.17.6</redisson.version>
         <!-- Config 配置中心相关 -->
         <apollo.version>1.9.2</apollo.version>
         <!-- 服务保障相关 -->
@@ -37,21 +37,21 @@
         <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
         <opentracing.version>0.31.0</opentracing.version>
         <!-- Test 测试相关 -->
-        <podam.version>7.2.6.RELEASE</podam.version>
-        <jedis-mock.version>0.1.16</jedis-mock.version>
+        <podam.version>7.2.9.RELEASE</podam.version>
+        <jedis-mock.version>1.0.3</jedis-mock.version>
         <mockito-inline.version>4.0.0</mockito-inline.version>
         <!-- Bpm 工作流相关 -->
         <flowable.version>6.7.2</flowable.version>
         <!-- 工具类相关 -->
         <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version>
-        <lombok.version>1.18.20</lombok.version>
-        <mapstruct.version>1.4.1.Final</mapstruct.version>
-        <hutool.version>5.8.5</hutool.version>
+        <lombok.version>1.18.24</lombok.version>
+        <mapstruct.version>1.5.2.Final</mapstruct.version>
+        <hutool.version>5.8.6</hutool.version>
         <easyexcel.verion>3.1.1</easyexcel.verion>
         <velocity.version>2.3</velocity.version>
         <screw.version>1.0.5</screw.version>
-		<fastjson.version>1.2.83</fastjson.version>
-        <guava.version>30.1.1-jre</guava.version>
+        <fastjson.version>1.2.83</fastjson.version>
+        <guava.version>31.1-jre</guava.version>
         <guice.version>5.1.0</guice.version>
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
         <commons-net.version>3.8.0</commons-net.version>
@@ -60,7 +60,7 @@
         <aj-captcha.version>1.3.0</aj-captcha.version>
         <!-- 三方云服务相关 -->
         <minio.version>8.2.2</minio.version>
-        <aliyun-java-sdk-core.version>4.6.0</aliyun-java-sdk-core.version>
+        <aliyun-java-sdk-core.version>4.6.1</aliyun-java-sdk-core.version>
         <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
         <tencentcloud-sdk-java.version>3.1.561</tencentcloud-sdk-java.version>
         <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
index e6106b9d9..4a6f92dca 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
-            <version>4.31.72.ALL</version>
+            <version>4.33.39.ALL</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-pay</artifactId>
-            <version>4.3.8.B</version>
+            <version>4.4.0</version>
         </dependency>
         <!-- TODO 芋艿：清理 -->
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
index 2dc2fe688..8af0041a9 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
@@ -35,12 +35,12 @@
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>wx-java-mp-spring-boot-starter</artifactId>
-            <version>4.3.8.B</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
-            <version>4.3.8.B</version>
+            <version>4.4.0</version>
         </dependency>
         <!-- TODO 芋艿：清理 -->
     </dependencies>
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
index 92683f4c9..99b7bebf2 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bpm.convert.message;
 
 import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
 import java.util.Map;
@@ -11,6 +12,10 @@ public interface BpmMessageConvert {
 
     BpmMessageConvert INSTANCE = Mappers.getMapper(BpmMessageConvert.class);
 
+    @Mapping(target = "mobile", ignore = true)
+    @Mapping(source = "userId", target = "userId")
+    @Mapping(source = "templateCode", target = "templateCode")
+    @Mapping(source = "templateParams", target = "templateParams")
     SmsSendSingleToUserReqDTO convert(Long userId, String templateCode, Map<String, Object> templateParams);
 
 }
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java
index 3d9d58eb8..9af420a61 100644
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java
@@ -7,13 +7,13 @@ import cn.iocoder.yudao.module.market.dal.dataobject.banner.BannerDO;
 import cn.iocoder.yudao.module.market.service.banner.BannerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -27,8 +27,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @Validated
 public class AppBannerController {
 
-    // TODO @xia：使用 @Resource 哈
-    @Autowired
+    @Resource
     private BannerService bannerService;
 
     // TODO @xia：新建一个 AppBannerRespVO，只返回必要的字段。status 要过滤下。然后 sort 下结果
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
index 67a5d93d2..ef77780de 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.validation.Mobile;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 /**
diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 81c41cc42..0a3de9a1c 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-pro-vue3",
-  "version": "1.6.3.1611",
+  "version": "1.6.4.1611",
   "description": "基于vue3、element-plus、typesScript、vite3",
   "author": "xingyu",
   "private": false,
@@ -25,57 +25,57 @@
     "p": "plop"
   },
   "dependencies": {
-    "@iconify/iconify": "^2.2.1",
-    "@vueuse/core": "^9.1.0",
-    "@wangeditor/editor": "^5.1.14",
+    "@iconify/iconify": "^3.0.0",
+    "@vueuse/core": "^9.2.0",
+    "@wangeditor/editor": "^5.1.18",
     "@wangeditor/editor-for-vue": "^5.1.10",
-    "@zxcvbn-ts/core": "^2.0.4",
+    "@zxcvbn-ts/core": "^2.0.5",
     "animate.css": "^4.1.1",
     "axios": "^0.27.2",
     "crypto-js": "^4.1.1",
-    "dayjs": "^1.11.4",
+    "dayjs": "^1.11.5",
     "echarts": "^5.3.3",
     "echarts-wordcloud": "^2.0.0",
-    "element-plus": "2.2.12",
+    "element-plus": "2.2.17",
     "intro.js": "^6.0.0",
     "jsencrypt": "^3.2.1",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.17",
+    "pinia": "^2.0.22",
     "pinia-plugin-persist": "^1.0.0",
     "qrcode": "^1.5.1",
     "qs": "^6.11.0",
     "url": "^0.11.0",
-    "vue": "3.2.37",
+    "vue": "3.2.39",
     "vue-cropper": "^1.0.3",
     "vue-i18n": "9.2.2",
-    "vue-router": "^4.1.3",
+    "vue-router": "^4.1.5",
     "vue-types": "^4.2.1",
     "web-storage-cache": "^1.1.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.3",
-    "@commitlint/config-conventional": "^17.0.3",
-    "@iconify/json": "^2.1.89",
-    "@intlify/vite-plugin-vue-i18n": "^6.0.0",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@iconify/json": "^2.1.110",
+    "@intlify/vite-plugin-vue-i18n": "^6.0.1",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.6.5",
+    "@types/node": "^18.7.18",
     "@types/nprogress": "^0.2.0",
-    "@types/qrcode": "^1.4.2",
+    "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.33.0",
-    "@typescript-eslint/parser": "^5.33.0",
-    "@vitejs/plugin-vue": "^3.0.1",
-    "@vitejs/plugin-vue-jsx": "^2.0.0",
-    "autoprefixer": "^10.4.8",
-    "eslint": "^8.21.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@typescript-eslint/parser": "^5.38.0",
+    "@vitejs/plugin-vue": "^3.1.0",
+    "@vitejs/plugin-vue-jsx": "^2.0.1",
+    "autoprefixer": "^10.4.11",
+    "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-define-config": "^1.6.0",
+    "eslint-define-config": "^1.7.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.3.0",
+    "eslint-plugin-vue": "^9.5.1",
     "less": "^4.1.3",
     "lint-staged": "^13.0.3",
     "plop": "^3.1.1",
@@ -84,24 +84,24 @@
     "postcss-less": "^6.0.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.77.2",
-    "stylelint": "^14.9.1",
+    "rollup": "^2.79.0",
+    "stylelint": "^14.12.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-recommended": "^8.0.0",
-    "stylelint-config-standard": "^26.0.0",
+    "stylelint-config-recommended": "^9.0.0",
+    "stylelint-config-standard": "^28.0.0",
     "stylelint-order": "^5.0.0",
-    "typescript": "4.7.4",
-    "unplugin-vue-define-options": "^0.7.3",
-    "vite": "3.0.5",
+    "typescript": "4.8.3",
+    "unplugin-vue-define-options": "^0.11.2",
+    "vite": "3.1.3",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-eslint": "^1.7.0",
+    "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
-    "vite-plugin-purge-icons": "^0.9.0",
+    "vite-plugin-purge-icons": "^0.9.1",
     "vite-plugin-style-import": "^2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-windicss": "^1.8.7",
-    "vue-tsc": "^0.39.5",
+    "vite-plugin-windicss": "^1.8.8",
+    "vue-tsc": "^0.40.13",
     "windicss": "^3.5.6"
   },
   "engines": {

From 65c86878e912bb32e37fe7cfe5de8aee0caa247c Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 21 Sep 2022 16:17:53 +0800
Subject: [PATCH 07/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/package.json              |  2 +-
 .../src/components/Dialog/src/Dialog.vue      |  2 +-
 .../src/components/Editor/src/Editor.vue      |  2 +-
 .../infra/codegen/components/GenInfoForm.vue  | 46 +++++++++++++++++--
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 0a3de9a1c..e35ea5779 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-pro-vue3",
-  "version": "1.6.4.1611",
+  "version": "1.6.4.1641",
   "description": "基于vue3、element-plus、typesScript、vite3",
   "author": "xingyu",
   "private": false,
diff --git a/yudao-ui-admin-vue3/src/components/Dialog/src/Dialog.vue b/yudao-ui-admin-vue3/src/components/Dialog/src/Dialog.vue
index c23d04fcf..a30c728ea 100644
--- a/yudao-ui-admin-vue3/src/components/Dialog/src/Dialog.vue
+++ b/yudao-ui-admin-vue3/src/components/Dialog/src/Dialog.vue
@@ -74,7 +74,7 @@ const dialogStyle = computed(() => {
         </slot>
         <Icon
           v-if="fullscreen"
-          class="mr-22px cursor-pointer is-hover mt-2px"
+          class="mr-22px cursor-pointer is-hover mt-2px z-10"
           :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
           color="var(--el-color-info)"
           @click="toggleFull"
diff --git a/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue b/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue
index f78ffd5a9..00f636e2c 100644
--- a/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue
+++ b/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue
@@ -177,7 +177,7 @@ defineExpose({
 </script>
 
 <template>
-  <div class="border-1 border-solid border-[var(--tags-view-border-color)]">
+  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-3000">
     <!-- 工具栏 -->
     <Toolbar
       :editor="editorRef"
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
index e0172b3af..abfa91d3d 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
@@ -1,16 +1,24 @@
 <script setup lang="ts">
-import { PropType, reactive, watch } from 'vue'
+import { onMounted, PropType, reactive, ref, watch } from 'vue'
 import { required } from '@/utils/formRules'
-import { CodegenTableVO } from '@/api/infra/codegen/types'
 import { Form } from '@/components/Form'
+import { handleTree } from '@/utils/tree'
+import { ElTreeSelect } from 'element-plus'
 import { useForm } from '@/hooks/web/useForm'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { listSimpleMenusApi } from '@/api/system/menu'
+import { CodegenTableVO } from '@/api/infra/codegen/types'
 const props = defineProps({
   genInfo: {
     type: Object as PropType<Nullable<CodegenTableVO>>,
     default: () => null
   }
 })
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+  value: 'id'
+}
 const rules = reactive({
   templateType: [required],
   scene: [required],
@@ -22,6 +30,13 @@ const rules = reactive({
 })
 const templateTypeOptions = getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)
 const sceneOptions = getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)
+const parentMenuId = ref()
+const treeRef = ref<InstanceType<typeof ElTreeSelect>>()
+const menuOptions = ref<any>([]) // 树形结构
+const getTree = async () => {
+  const res = await listSimpleMenusApi()
+  menuOptions.value = handleTree(res)
+}
 const schema = reactive<FormSchema[]>([
   {
     label: '生成模板',
@@ -84,7 +99,9 @@ const schema = reactive<FormSchema[]>([
   {
     label: '上级菜单',
     field: 'parentMenuId',
-    component: 'Input',
+    componentProps: {
+      optionsSlot: true
+    },
     labelMessage: '分配到指定菜单下，例如 系统管理',
     colProps: {
       span: 12
@@ -94,6 +111,13 @@ const schema = reactive<FormSchema[]>([
 const { register, methods, elFormRef } = useForm({
   schema
 })
+const handleNodeClick = () => {
+  console.log(parentMenuId.value)
+}
+// ========== 初始化 ==========
+onMounted(async () => {
+  await getTree()
+})
 watch(
   () => props.genInfo,
   (genInfo) => {
@@ -106,12 +130,24 @@ watch(
     immediate: true
   }
 )
-
 defineExpose({
   elFormRef,
   getFormData: methods.getFormData
 })
 </script>
 <template>
-  <Form :rules="rules" @register="register" />
+  <Form :rules="rules" @register="register">
+    <template #parentMenuId>
+      <el-tree-select
+        v-model="parentMenuId"
+        ref="treeRef"
+        node-key="id"
+        check-on-click-node
+        expand-on-click-node="false"
+        :props="defaultProps"
+        :data="menuOptions"
+        @node-click="handleNodeClick"
+      />
+    </template>
+  </Form>
 </template>

From 1be09d092bf18c641f6391900bba8beca142749e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 24 Sep 2022 12:26:01 +0800
Subject: [PATCH 08/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E2=80=9C=E9=80=9A=E8=BF=87=E6=B3=A8=E8=A7=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E7=BC=93=E5=AD=98=E2=80=9D=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml                    |  2 +-
 .../config/YudaoTenantAutoConfiguration.java  | 24 +++++---------
 .../core/redis/TenantRedisCacheManager.java   | 33 ++++++++++---------
 .../yudao-spring-boot-starter-redis/pom.xml   |  1 -
 .../src/main/resources/application-local.yaml |  4 +--
 5 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 866763d0a..bd90ad8e7 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -58,7 +58,7 @@
         <jsch.version>0.1.55</jsch.version>
         <tika-core.version>2.4.1</tika-core.version>
         <aj-captcha.version>1.3.0</aj-captcha.version>
-        <netty-all.version>4.1.75.Final</netty-all.version>
+        <netty-all.version>4.1.82.Final</netty-all.version>
         <!-- 三方云服务相关 -->
         <minio.version>8.2.2</minio.version>
         <aliyun-java-sdk-core.version>4.6.0</aliyun-java-sdk-core.version>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
index 8911f49d5..7958b7a44 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
@@ -30,6 +30,7 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.Objects;
@@ -118,21 +119,14 @@ public class YudaoTenantAutoConfiguration {
         };
     }
 
-  /**
-   * 引入租户时，tenantRedisCacheManager为主Bean
-   *
-   * @param redisTemplate
-   * @param redisCacheConfiguration
-   * @return
-   */
-  @Bean
-  @Primary
-  public RedisCacheManager tenantRedisCacheManager(
-      RedisTemplate<String, Object> redisTemplate,
-      RedisCacheConfiguration redisCacheConfiguration) {
-        RedisCacheWriter cacheWriter =
-                RedisCacheWriter.nonLockingRedisCacheWriter(
-                        Objects.requireNonNull(redisTemplate.getConnectionFactory()));
+    @Bean
+    @Primary // 引入租户时，tenantRedisCacheManager 为主 Bean
+    public RedisCacheManager tenantRedisCacheManager(RedisTemplate<String, Object> redisTemplate,
+                                                     RedisCacheConfiguration redisCacheConfiguration) {
+        // 创建 RedisCacheWriter 对象
+        RedisConnectionFactory connectionFactory = Objects.requireNonNull(redisTemplate.getConnectionFactory());
+        RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory);
+        // 创建 TenantRedisCacheManager 对象
         return new TenantRedisCacheManager(cacheWriter, redisCacheConfiguration);
     }
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
index fa5adfa4d..10d62232d 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
@@ -2,34 +2,37 @@ package cn.iocoder.yudao.framework.tenant.core.redis;
 
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.cache.Cache;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.cache.RedisCacheWriter;
 
 /**
- * 租户缓存管理
+ * 多租户的 {@link RedisCacheManager} 实现类
  *
- * 为cacheName增加自动增加租户表示，格式：name+":"+tenantId
+ * 操作指定 name 的 {@link Cache} 时，自动拼接租户后缀，格式为 name + ":" + tenantId
  *
  * @author airhead
  */
 @Slf4j
 public class TenantRedisCacheManager extends RedisCacheManager {
 
-  public TenantRedisCacheManager(
-      RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) {
-    super(cacheWriter, defaultCacheConfiguration);
-  }
-
-  @Override
-  public Cache getCache(String name) {
-    //租户未设置时，返回原始name
-    if (TenantContextHolder.getTenantId() == null) {
-      return super.getCache(name);
+    public TenantRedisCacheManager(RedisCacheWriter cacheWriter,
+                                   RedisCacheConfiguration defaultCacheConfiguration) {
+        super(cacheWriter, defaultCacheConfiguration);
+    }
+
+    @Override
+    public Cache getCache(@NotNull String name) {
+        // 如果开启多租户，则 name 拼接租户后缀
+        if (!TenantContextHolder.isIgnore()
+            && TenantContextHolder.getTenantId() != null) {
+            name = name + ":" + TenantContextHolder.getTenantId();
+        }
+
+        // 继续基于父方法
+        return super.getCache(name);
     }
 
-    name = name + ":" + TenantContextHolder.getTenantId();
-    return super.getCache(name);
-  }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
index 5c14c02fd..430ede255 100644
--- a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml
@@ -35,7 +35,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.75.Final</version>
         </dependency>
 
     </dependencies>
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index c26354ead..197649b5e 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -51,7 +51,7 @@ spring:
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
           username: root
-          password: 123456
+          password: ${RUOYI_VUE_PRO}
         #          username: sa
         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
         slave: # 模拟从库，可根据自己需要修改
@@ -62,7 +62,7 @@ spring:
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
           username: root
-          password: 123456
+          password: ${RUOYI_VUE_PRO}
   #          username: sa
   #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
 

From 1aca24b63623e3b7b46a9b7d89698d21d60c277e Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 28 Sep 2022 21:04:13 +0800
Subject: [PATCH 09/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml                    | 20 +++++++++----------
 .../yudao-spring-boot-starter-biz-pay/pom.xml |  2 +-
 .../core/DefaultLockFailureStrategy.java      |  7 ++++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 99998b5eb..3a07b01b2 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -16,57 +16,57 @@
     <properties>
         <revision>1.6.4-snapshot</revision>
         <!-- 统一依赖管理 -->
-        <spring.boot.version>2.6.10</spring.boot.version>
+        <spring.boot.version>2.6.11</spring.boot.version>
         <!-- Web 相关 -->
         <knife4j.version>3.0.3</knife4j.version>
         <swagger-annotations.version>1.6.6</swagger-annotations.version>
         <servlet.versoin>2.5</servlet.versoin>
         <!-- DB 相关 -->
-        <druid.version>1.2.12</druid.version>
+        <druid.version>1.2.13-SNSAPSHOT</druid.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
-        <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version>
+        <mybatis-plus-generator.version>3.5.3</mybatis-plus-generator.version>
         <dynamic-datasource.version>3.5.2</dynamic-datasource.version>
         <redisson.version>3.17.6</redisson.version>
         <!-- Config 配置中心相关 -->
         <apollo.version>1.9.2</apollo.version>
         <!-- 服务保障相关 -->
-        <lock4j.version>2.2.0</lock4j.version>
+        <lock4j.version>2.2.2</lock4j.version>
         <resilience4j.version>1.7.1</resilience4j.version>
         <!-- 监控相关 -->
-        <skywalking.version>8.7.0</skywalking.version>
+        <skywalking.version>8.12.0</skywalking.version>
         <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
         <opentracing.version>0.31.0</opentracing.version>
         <!-- Test 测试相关 -->
         <podam.version>7.2.9.RELEASE</podam.version>
         <jedis-mock.version>1.0.3</jedis-mock.version>
-        <mockito-inline.version>4.0.0</mockito-inline.version>
+        <mockito-inline.version>4.8.0</mockito-inline.version>
         <!-- Bpm 工作流相关 -->
         <flowable.version>6.7.2</flowable.version>
         <!-- 工具类相关 -->
         <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version>
         <lombok.version>1.18.24</lombok.version>
         <mapstruct.version>1.5.2.Final</mapstruct.version>
-        <hutool.version>5.8.6</hutool.version>
+        <hutool.version>5.8.8</hutool.version>
         <easyexcel.verion>3.1.1</easyexcel.verion>
         <velocity.version>2.3</velocity.version>
         <screw.version>1.0.5</screw.version>
         <fastjson.version>1.2.83</fastjson.version>
         <guava.version>31.1-jre</guava.version>
         <guice.version>5.1.0</guice.version>
-        <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+        <transmittable-thread-local.version>2.14.0</transmittable-thread-local.version>
         <commons-net.version>3.8.0</commons-net.version>
         <jsch.version>0.1.55</jsch.version>
         <tika-core.version>2.4.1</tika-core.version>
         <aj-captcha.version>1.3.0</aj-captcha.version>
         <!-- 三方云服务相关 -->
         <minio.version>8.2.2</minio.version>
-        <aliyun-java-sdk-core.version>4.6.1</aliyun-java-sdk-core.version>
+        <aliyun-java-sdk-core.version>4.6.2</aliyun-java-sdk-core.version>
         <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
         <tencentcloud-sdk-java.version>3.1.561</tencentcloud-sdk-java.version>
         <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
         <justauth.version>1.4.0</justauth.version>
         <jimureport.version>1.5.2</jimureport.version>
-        <xercesImpl.version>2.12.0</xercesImpl.version>
+        <xercesImpl.version>2.12.2</xercesImpl.version>
     </properties>
 
     <dependencyManagement>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
index 4a6f92dca..1c3a3bde1 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
-            <version>4.33.39.ALL</version>
+            <version>4.33.44.ALL</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java
index 3af543530..2cea08bf8 100644
--- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java
+++ b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java
@@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstant
 import com.baomidou.lock.LockFailureStrategy;
 import lombok.extern.slf4j.Slf4j;
 
+import java.lang.reflect.Method;
+
 /**
  * 自定义获取锁失败策略，抛出 {@link ServiceException} 异常
  */
@@ -12,9 +14,8 @@ import lombok.extern.slf4j.Slf4j;
 public class DefaultLockFailureStrategy implements LockFailureStrategy {
 
     @Override
-    public void onLockFailure(String key, long acquireTimeout, int acquireCount) {
-        log.debug("[onLockFailure][线程:{} 获取锁失败，key:{} 获取超时时长:{} ms]", Thread.currentThread().getName(), key, acquireTimeout);
+    public void onLockFailure(String key, Method method, Object[] arguments) {
+        log.debug("[onLockFailure][线程:{} 获取锁失败，key:{} 获取失败:{} ]", Thread.currentThread().getName(), key, arguments);
         throw new ServiceException(GlobalErrorCodeConstants.LOCKED);
     }
-
 }

From 2b784d180ed32b206d2d4593e1c8a9ab1ef7a04d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 29 Sep 2022 21:17:08 +0800
Subject: [PATCH 10/48] =?UTF-8?q?=E8=B0=83=E6=95=B4=20sso=20=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=A4=9A=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/sso.vue | 41 --------------------------------
 1 file changed, 41 deletions(-)

diff --git a/yudao-ui-admin/src/views/sso.vue b/yudao-ui-admin/src/views/sso.vue
index 2a21e0af9..090c953d3 100644
--- a/yudao-ui-admin/src/views/sso.vue
+++ b/yudao-ui-admin/src/views/sso.vue
@@ -20,11 +20,6 @@
           </el-tabs>
           <div>
             <el-form ref="loginForm" :model="loginForm" :rules="LoginRules" class="login-form">
-              <el-form-item prop="tenantName" v-if="tenantEnable">
-                <el-input v-model="loginForm.tenantName" type="text" auto-complete="off" placeholder='租户'>
-                  <svg-icon slot="prefix" icon-class="tree" class="el-input__icon input-icon"/>
-                </el-input>
-              </el-form-item>
               <!-- 授权范围的选择 -->
               此第三方应用请求获得以下权限：
               <el-form-item prop="scopes">
@@ -56,10 +51,7 @@
 </template>
 
 <script>
-import {getTenantIdByName} from "@/api/system/tenant";
-import {getTenantEnable} from "@/utils/ruoyi";
 import {authorize, getAuthorize} from "@/api/login";
-import {getTenantName, setTenantId} from "@/utils/auth";
 
 export default {
   name: "Login",
@@ -67,7 +59,6 @@ export default {
     return {
       tenantEnable: true,
       loginForm: {
-        tenantName: "芋道源码",
         scopes: [], // 已选中的 scope 数组
       },
       params: { // URL 上的 client_id、scope 等参数
@@ -81,35 +72,10 @@ export default {
         name: '',
         logo: '',
       },
-      LoginRules: {
-        tenantName: [
-          {required: true, trigger: "blur", message: "租户不能为空"},
-          {
-            validator: (rule, value, callback) => {
-              // debugger
-              getTenantIdByName(value).then(res => {
-                const tenantId = res.data;
-                if (tenantId && tenantId >= 0) {
-                  // 设置租户
-                  setTenantId(tenantId)
-                  callback();
-                } else {
-                  callback('租户不存在');
-                }
-              });
-            },
-            trigger: 'blur'
-          }
-        ]
-      },
       loading: false
     };
   },
   created() {
-    // 租户开关
-    this.tenantEnable = getTenantEnable();
-    this.getCookie();
-
     // 解析参数
     // 例如说【自动授权不通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read%20user.write
     // 例如说【自动授权通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read
@@ -162,13 +128,6 @@ export default {
     })
   },
   methods: {
-    getCookie() {
-      const tenantName = getTenantName();
-      this.loginForm = {
-        ...this.loginForm,
-        tenantName: tenantName ? tenantName : this.loginForm.tenantName,
-      };
-    },
     handleAuthorize(approved) {
       this.$refs.loginForm.validate(valid => {
         if (!valid) {

From eef233644cc489f30ce1b1bec1a5279ff5c6316f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 29 Sep 2022 21:26:31 +0800
Subject: [PATCH 11/48] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=20yudao-sso-demo-?=
 =?UTF-8?q?by-code=20=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E6=8E=88=E6=9D=83=E7=A0=81=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=202.=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=20yudao-sso-demo-by-code=20=E7=9A=84=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=20SSO=20=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  1 +
 yudao-example/pom.xml                         | 21 ++++++++
 yudao-example/yudao-sso-demo-by-code/pom.xml  | 53 +++++++++++++++++++
 .../yudao/ssodemo/SSODemoApplication.java     | 13 +++++
 .../ssodemo/controller/AuthController.java    | 14 +++++
 .../framework/SecurityConfiguration.java      | 20 +++++++
 .../src/main/resources/application.yaml       |  2 +
 .../src/main/resources/static/login.html      | 34 ++++++++++++
 .../dataobject/tenant/TenantPackageDO.java    |  2 +-
 9 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 yudao-example/pom.xml
 create mode 100644 yudao-example/yudao-sso-demo-by-code/pom.xml
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/resources/application.yaml
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/resources/static/login.html

diff --git a/pom.xml b/pom.xml
index 63aa70ecb..29f18bfc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
         <module>yudao-module-pay</module>
         <module>yudao-module-mall</module>
         <module>yudao-module-visualization</module>
+        <module>yudao-example</module>
     </modules>
 
     <name>${project.artifactId}</name>
diff --git a/yudao-example/pom.xml b/yudao-example/pom.xml
new file mode 100644
index 000000000..588b86387
--- /dev/null
+++ b/yudao-example/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- 由于方便大家拷贝，使用不使用 yudao 作为 Maven parent -->
+
+    <groupId>cn.iocoder.boot</groupId>
+    <artifactId>yudao-example</artifactId>
+    <version>1.0.0-snapshot</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>yudao-sso-demo-by-code</module>
+    </modules>
+
+    <name>${project.artifactId}</name>
+    <description>提供各种示例，例如说：SSO 单点登录</description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+
+</project>
diff --git a/yudao-example/yudao-sso-demo-by-code/pom.xml b/yudao-example/yudao-sso-demo-by-code/pom.xml
new file mode 100644
index 000000000..0227d37c3
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- 由于方便大家拷贝，使用不使用 yudao 作为 Maven parent -->
+
+    <groupId>cn.iocoder.boot</groupId>
+    <artifactId>yudao-sso-demo-by-code</artifactId>
+    <version>1.0.0-snapshot</version>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>基于授权码模式，如何实现 SSO 单点登录？</description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+
+    <properties>
+        <!-- Maven 相关 -->
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- 统一依赖管理 -->
+        <spring.boot.version>2.6.10</spring.boot.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- 统一依赖管理 -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java
new file mode 100644
index 000000000..f6b160745
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.ssodemo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SSODemoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SSODemoApplication.class, args);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
new file mode 100644
index 000000000..8445ff288
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.ssodemo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller("/auth")
+public class AuthController {
+
+    @PostMapping("/login-by-code")
+    public void loginByCode() {
+
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
new file mode 100644
index 000000000..9e925913a
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.ssodemo.framework;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity httpSecurity) throws Exception {
+        httpSecurity.authorizeRequests()
+                // 1. 静态资源，可匿名访问
+                .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
+                // last. 兜底规则，必须认证
+                .and().authorizeRequests()
+                .anyRequest().authenticated();
+    }
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/application.yaml b/yudao-example/yudao-sso-demo-by-code/src/main/resources/application.yaml
new file mode 100644
index 000000000..a62cf97dc
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/application.yaml
@@ -0,0 +1,2 @@
+server:
+  port: 18080
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/login.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/login.html
new file mode 100644
index 000000000..b468d84f1
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/login.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>首页</title>
+	<!-- jQuery：操作 dom、发起请求等 -->
+	<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.1.2/jquery.min.js" type="application/javascript"></script>
+	<!-- jQuery Cookie：操作 cookie 等 -->
+	<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery-cookie/1.4.1/jquery.cookie.min.js" type="application/javascript"/></script>
+
+	<script type="application/javascript">
+
+		/**
+		 * 跳转单点登录
+     */
+		function ssoLogin() {
+			const clientId = 'yudao-sso-demo-by-code'; // 可以改写成，你的 clientId
+      const redirectUri = encodeURIComponent('http://127.0.0.1:18080/callback'); // 注意，需要使用 encodeURIComponent 编码地址
+      const responseType = 'code'; // 1）授权码模式，对应 code；2）简化模式，对应 token
+      window.location.href = 'http://127.0.0.1:1024/sso?client_id=' + clientId
+				+ '&redirect_uri=' + redirectUri
+				+ '&response_type=' + responseType;
+    }
+	</script>
+</head>
+<body>
+<!-- 情况一：未登录：1）跳转 ruoyi-vue-pro 的 SSO 登录页 -->
+<div>
+	您未登录，点击 <a href="#" onclick="ssoLogin()">跳转 </a> SSO 单点登录
+</div>
+
+<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
+</body>
+</html>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantPackageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantPackageDO.java
index 430c3a080..dba7569af 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantPackageDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantPackageDO.java
@@ -34,7 +34,7 @@ public class TenantPackageDO extends BaseDO {
      */
     private String name;
     /**
-     * 租户状态
+     * 租户套餐状态
      *
      * 枚举 {@link CommonStatusEnum}
      */

From 0df44b51e43c5d1501d8e64b3a28a77d26243a1d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 29 Sep 2022 23:59:42 +0800
Subject: [PATCH 12/48] =?UTF-8?q?=E5=AE=8C=E6=88=90=20yudao-sso-demo-by-co?=
 =?UTF-8?q?de=20=E4=BD=BF=E7=94=A8=20code=20=E6=8E=88=E6=9D=83=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=BE=97=E8=AE=BF=E9=97=AE=E4=BB=A4=E7=89=8C?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-example/yudao-sso-demo-by-code/pom.xml  |  6 ++
 .../yudao/ssodemo/client/OAuth2Client.java    | 75 +++++++++++++++++++
 .../ssodemo/client/dto/CommonResult.java      | 28 +++++++
 .../client/dto/OAuth2AccessTokenRespDTO.java  | 45 +++++++++++
 .../ssodemo/controller/AuthController.java    | 27 ++++++-
 .../framework/SecurityConfiguration.java      |  5 +-
 .../src/main/resources/static/callback.html   | 61 +++++++++++++++
 .../static/{login.html => index.html}         |  4 +-
 8 files changed, 243 insertions(+), 8 deletions(-)
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/OAuth2AccessTokenRespDTO.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html
 rename yudao-example/yudao-sso-demo-by-code/src/main/resources/static/{login.html => index.html} (80%)

diff --git a/yudao-example/yudao-sso-demo-by-code/pom.xml b/yudao-example/yudao-sso-demo-by-code/pom.xml
index 0227d37c3..3ea138ac4 100644
--- a/yudao-example/yudao-sso-demo-by-code/pom.xml
+++ b/yudao-example/yudao-sso-demo-by-code/pom.xml
@@ -48,6 +48,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
new file mode 100644
index 000000000..351224bf0
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -0,0 +1,75 @@
+package cn.iocoder.yudao.ssodemo.client;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.OAuth2AccessTokenRespDTO;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.springframework.util.Base64Utils;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * OAuth 2.0 客户端
+ */
+@Component
+public class OAuth2Client {
+
+    private static final String BASE_URL = "http://127.0.0.1:48080/admin-api/system/oauth2/";
+
+    /**
+     * 租户编号
+     *
+     * 默认使用 1；如果使用别的租户，可以调整
+     */
+    private static final Long TENANT_ID = 1L;
+
+    private static final String CLIENT_ID = "yudao-sso-demo-by-code";
+    private static final String CLIENT_SECRET = "test";
+
+
+//    @Resource // 可优化，注册一个 RestTemplate Bean，然后注入
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    /**
+     * 使用 code 授权码，获得访问令牌
+     *
+     * @param code        授权码
+     * @param redirectUri 重定向 URI
+     * @return 访问令牌
+     */
+    public CommonResult<OAuth2AccessTokenRespDTO> postAccessToken(String code, String redirectUri) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", TENANT_ID.toString());
+        addClientHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("grant_type", "authorization_code");
+        body.add("code", code);
+        body.add("redirect_uri", redirectUri);
+//        body.add("state", ""); // 选填；填了会校验
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<OAuth2AccessTokenRespDTO>> exchange = restTemplate.exchange(
+                BASE_URL + "/token",
+                HttpMethod.POST,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<OAuth2AccessTokenRespDTO>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+    private static void addClientHeader(HttpHeaders headers) {
+        // client 拼接，需要 BASE64 编码
+        String client = CLIENT_ID + ":" + CLIENT_SECRET;
+        client = Base64Utils.encodeToString(client.getBytes(StandardCharsets.UTF_8));
+        headers.add("Authorization", "Basic " + client);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java
new file mode 100644
index 000000000..548fe51e4
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.ssodemo.client.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 通用返回
+ *
+ * @param <T> 数据泛型
+ */
+@Data
+public class CommonResult<T> implements Serializable {
+
+    /**
+     * 错误码
+     */
+    private Integer code;
+    /**
+     * 返回数据
+     */
+    private T data;
+    /**
+     * 错误提示，用户可阅读
+     */
+    private String msg;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/OAuth2AccessTokenRespDTO.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/OAuth2AccessTokenRespDTO.java
new file mode 100644
index 000000000..14c01b843
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/OAuth2AccessTokenRespDTO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.ssodemo.client.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 访问令牌 Response DTO
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OAuth2AccessTokenRespDTO {
+
+    /**
+     * 访问令牌
+     */
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    /**
+     * 刷新令牌
+     */
+    @JsonProperty("refresh_token")
+    private String refreshToken;
+
+    /**
+     * 令牌类型
+     */
+    @JsonProperty("token_type")
+    private String tokenType;
+
+    /**
+     * 过期时间；单位：秒
+     */
+    @JsonProperty("expires_in")
+    private Long expiresIn;
+
+    /**
+     * 授权范围；如果多个授权范围，使用空格分隔
+     */
+    private String scope;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
index 8445ff288..8ed601ba5 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
@@ -1,14 +1,33 @@
 package cn.iocoder.yudao.ssodemo.controller;
 
-import org.springframework.stereotype.Controller;
+import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.OAuth2AccessTokenRespDTO;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller("/auth")
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/auth")
 public class AuthController {
 
-    @PostMapping("/login-by-code")
-    public void loginByCode() {
+    @Resource
+    private OAuth2Client oauth2Client;
 
+    /**
+     * 使用 code 访问令牌，获得访问令牌
+     *
+     * @param code 授权码
+     * @param redirectUri 重定向 URI
+     * @return 访问令牌；注意，实际项目中，最好创建对应的 ResponseVO 类，只返回必要的字段
+     */
+    @PostMapping("/login-by-code")
+    public CommonResult<OAuth2AccessTokenRespDTO> loginByCode(@RequestParam("code") String code,
+                                                              @RequestParam("redirectUri") String redirectUri) {
+        return oauth2Client.postAccessToken(code, redirectUri);
     }
 
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
index 9e925913a..608191350 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
@@ -10,9 +10,12 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(HttpSecurity httpSecurity) throws Exception {
-        httpSecurity.authorizeRequests()
+        httpSecurity.csrf().disable() // 禁用 CSRF 保护
+                .authorizeRequests()
                 // 1. 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
+                // 2. 登录相关的接口，可匿名访问
+                .antMatchers("/auth/login-by-code").permitAll()
                 // last. 兜底规则，必须认证
                 .and().authorizeRequests()
                 .anyRequest().authenticated();
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html
new file mode 100644
index 000000000..60199e29e
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>SSO 授权后的回调页</title>
+	<!-- jQuery：操作 dom、发起请求等 -->
+	<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.1.2/jquery.min.js" type="application/javascript"></script>
+	<!-- 工具类 -->
+	<script type="application/javascript">
+    (function ($) {
+      /**
+			 * 获得 URL 的指定参数的值
+			 *
+       * @param name 参数名
+       * @returns 参数值
+       */
+      $.getUrlParam = function (name) {
+        const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+        const r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]); return null;
+      }
+    })(jQuery);
+	</script>
+
+	<script type="application/javascript">
+    $(function () {
+      // 获得 code 授权码
+			const code = $.getUrlParam('code');
+      if (!code) {
+        alert('获取不到 code 参数，请排查！')
+        return;
+			}
+
+      // 提交
+			const redirectUri = 'http://127.0.0.1:18080/callback.html'; // 需要修改成，你回调的地址，就是在 index.html 拼接的 redirectUri
+      $.ajax({
+        url:  "http://127.0.0.1:18080/auth/login-by-code?code=" + code
+					+ '&redirectUri=' + redirectUri,
+        method: 'POST',
+        success: function( result ) {
+          if (result.code !== 0) {
+            alert('获得访问令牌失败，原因：' + result.msg)
+            return;
+          }
+          alert('获得访问令牌成功！点击确认，跳转回首页')
+
+          // 设置到 localStorage 中
+          localStorage.setItem('ACCESS-TOKEN', result.data.access_token);
+          localStorage.setItem('REFRESH-TOKEN', result.data.refresh_token);
+
+          // 跳转回首页
+          window.location.href = '/index.html';
+        }
+      })
+		})
+	</script>
+</head>
+<body>
+正在使用 code 授权码，进行 accessToken 访问令牌的获取
+</body>
+</html>
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/login.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
similarity index 80%
rename from yudao-example/yudao-sso-demo-by-code/src/main/resources/static/login.html
rename to yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index b468d84f1..2163a466c 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/login.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -5,8 +5,6 @@
 	<title>首页</title>
 	<!-- jQuery：操作 dom、发起请求等 -->
 	<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.1.2/jquery.min.js" type="application/javascript"></script>
-	<!-- jQuery Cookie：操作 cookie 等 -->
-	<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery-cookie/1.4.1/jquery.cookie.min.js" type="application/javascript"/></script>
 
 	<script type="application/javascript">
 
@@ -15,7 +13,7 @@
      */
 		function ssoLogin() {
 			const clientId = 'yudao-sso-demo-by-code'; // 可以改写成，你的 clientId
-      const redirectUri = encodeURIComponent('http://127.0.0.1:18080/callback'); // 注意，需要使用 encodeURIComponent 编码地址
+      const redirectUri = encodeURIComponent('http://127.0.0.1:18080/callback.html'); // 注意，需要使用 encodeURIComponent 编码地址
       const responseType = 'code'; // 1）授权码模式，对应 code；2）简化模式，对应 token
       window.location.href = 'http://127.0.0.1:1024/sso?client_id=' + clientId
 				+ '&redirect_uri=' + redirectUri

From b7b31f03d319b5322800ac462ced0f67c84e9ec9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 1 Oct 2022 08:35:19 +0800
Subject: [PATCH 13/48] =?UTF-8?q?=E5=AE=8C=E6=88=90=20yudao-sso-demo-by-co?=
 =?UTF-8?q?de=20=E5=AE=9E=E7=8E=B0=20token=20=E8=BF=87=E6=BB=A4=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/ssodemo/client/OAuth2Client.java    |  23 +++-
 .../OAuth2AccessTokenRespDTO.java             |   2 +-
 .../dto/oauth2/OAuth2CheckTokenRespDTO.java   |  59 ++++++++++
 .../ssodemo/controller/AuthController.java    |   2 +-
 .../ssodemo/controller/UserController.java    |  21 ++++
 .../{ => config}/SecurityConfiguration.java   |  21 +++-
 .../ssodemo/framework/core/LoginUser.java     |  32 ++++++
 .../core/TokenAuthenticationFilter.java       | 107 ++++++++++++++++++
 .../src/main/resources/static/index.html      |  53 ++++++++-
 9 files changed, 311 insertions(+), 9 deletions(-)
 rename yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/{ => oauth2}/OAuth2AccessTokenRespDTO.java (93%)
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
 rename yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/{ => config}/SecurityConfiguration.java (57%)
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java

diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
index 351224bf0..8449dd39b 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -1,7 +1,8 @@
 package cn.iocoder.yudao.ssodemo.client;
 
 import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
-import cn.iocoder.yudao.ssodemo.client.dto.OAuth2AccessTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2AccessTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2CheckTokenRespDTO;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
@@ -65,6 +66,26 @@ public class OAuth2Client {
         return exchange.getBody();
     }
 
+    public CommonResult<OAuth2CheckTokenRespDTO> checkToken(String token) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", TENANT_ID.toString());
+        addClientHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("token", token);
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<OAuth2CheckTokenRespDTO>> exchange = restTemplate.exchange(
+                BASE_URL + "/check-token",
+                HttpMethod.POST,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<OAuth2CheckTokenRespDTO>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
     private static void addClientHeader(HttpHeaders headers) {
         // client 拼接，需要 BASE64 编码
         String client = CLIENT_ID + ":" + CLIENT_SECRET;
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/OAuth2AccessTokenRespDTO.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2AccessTokenRespDTO.java
similarity index 93%
rename from yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/OAuth2AccessTokenRespDTO.java
rename to yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2AccessTokenRespDTO.java
index 14c01b843..6a5369a20 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/OAuth2AccessTokenRespDTO.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2AccessTokenRespDTO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.ssodemo.client.dto;
+package cn.iocoder.yudao.ssodemo.client.dto.oauth2;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java
new file mode 100644
index 000000000..862bcf04b
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.ssodemo.client.dto.oauth2;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 校验令牌 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OAuth2CheckTokenRespDTO {
+
+    /**
+     * 用户编号
+     */
+    @JsonProperty("user_id")
+    private Long userId;
+    /**
+     * 用户类型
+     */
+    @JsonProperty("user_type")
+    private Integer userType;
+    /**
+     * 租户编号
+     */
+    @JsonProperty("tenant_id")
+    private Long tenantId;
+
+    /**
+     * 客户端编号
+     */
+    @JsonProperty("client_id")
+    private String clientId;
+    /**
+     * 授权范围
+     */
+    private List<String> scopes;
+
+    /**
+     * 访问令牌
+     */
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    /**
+     * 过期时间
+     *
+     * 时间戳 / 1000，即单位：秒
+     */
+    private Long exp;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
index 8ed601ba5..21807170e 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.ssodemo.controller;
 
 import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
 import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
-import cn.iocoder.yudao.ssodemo.client.dto.OAuth2AccessTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2AccessTokenRespDTO;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
new file mode 100644
index 000000000..77e4a9113
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.ssodemo.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user")
+public class UserController {
+
+    /**
+     * 获得当前登录用户的基本信息
+     *
+     * @return TODO
+     */
+    @GetMapping("/get")
+    public String getUser() {
+        return "";
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
similarity index 57%
rename from yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
rename to yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
index 608191350..3a27f0102 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/SecurityConfiguration.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
@@ -1,15 +1,31 @@
-package cn.iocoder.yudao.ssodemo.framework;
+package cn.iocoder.yudao.ssodemo.framework.config;
 
+import cn.iocoder.yudao.ssodemo.framework.core.TokenAuthenticationFilter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+import javax.annotation.Resource;
 
 @Configuration
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
+//    /**
+//     * Token 认证过滤器 Bean
+//     */
+//    @Bean
+//    public TokenAuthenticationFilter authenticationTokenFilter(OAuth2Client oauth2Client) {
+//        return new TokenAuthenticationFilter(oauth2Client);
+//    }
+
+    @Resource
+    private TokenAuthenticationFilter tokenAuthenticationFilter;
+
     @Override
     protected void configure(HttpSecurity httpSecurity) throws Exception {
+        // 设置 URL 安全权限
         httpSecurity.csrf().disable() // 禁用 CSRF 保护
                 .authorizeRequests()
                 // 1. 静态资源，可匿名访问
@@ -19,5 +35,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 // last. 兜底规则，必须认证
                 .and().authorizeRequests()
                 .anyRequest().authenticated();
+
+        // 添加 Token Filter
+        httpSecurity.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
     }
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
new file mode 100644
index 000000000..e785e1544
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.ssodemo.framework.core;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 登录用户信息
+ *
+ * @author 芋道源码
+ */
+@Data
+public class LoginUser {
+
+    /**
+     * 用户编号
+     */
+    private Long id;
+    /**
+     * 用户类型
+     */
+    private Integer userType;
+    /**
+     * 租户编号
+     */
+    private Long tenantId;
+    /**
+     * 授权范围
+     */
+    private List<String> scopes;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java
new file mode 100644
index 000000000..a895fc2c5
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java
@@ -0,0 +1,107 @@
+package cn.iocoder.yudao.ssodemo.framework.core;
+
+import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2CheckTokenRespDTO;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.annotation.Resource;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Collections;
+
+/**
+ * Token 过滤器，验证 token 的有效性
+ * 验证通过后，获得 {@link LoginUser} 信息，并加入到 Spring Security 上下文
+ *
+ * @author 芋道源码
+ */
+@Component
+public class TokenAuthenticationFilter extends OncePerRequestFilter {
+
+    @Resource
+    private OAuth2Client oauth2Client;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
+        // 1. 获得访问令牌
+        String token = obtainAuthorization(request);
+        if (StringUtils.hasText(token)) {
+            // 2. 基于 token 构建登录用户
+            LoginUser loginUser = buildLoginUserByToken(token);
+            // 3. 设置当前用户
+            if (loginUser != null) {
+                setLoginUser(loginUser, request);
+            }
+        }
+
+        // 继续过滤链
+        filterChain.doFilter(request, response);
+    }
+
+    private LoginUser buildLoginUserByToken(String token) {
+        try {
+            CommonResult<OAuth2CheckTokenRespDTO> accessTokenResult = oauth2Client.checkToken(token);
+            OAuth2CheckTokenRespDTO accessToken = accessTokenResult.getData();
+            if (accessToken == null) {
+                return null;
+            }
+            // 构建登录用户
+            return new LoginUser().setId(accessToken.getUserId()).setUserType(accessToken.getUserType())
+                    .setTenantId(accessToken.getTenantId()).setScopes(accessToken.getScopes());
+        } catch (Exception exception) {
+            // 校验 Token 不通过时，考虑到一些接口是无需登录的，所以直接返回 null 即可
+            return null;
+        }
+    }
+
+    /**
+     * 从请求 Header 中，获得访问令牌
+     *
+     * @param request 请求
+     * @return 访问令牌
+     */
+    private static String obtainAuthorization(HttpServletRequest request) {
+        String authorization = request.getHeader("Authentication");
+        if (!StringUtils.hasText(authorization)) {
+            return null;
+        }
+        int index = authorization.indexOf("Bearer ");
+        if (index == -1) { // 未找到
+            return null;
+        }
+        return authorization.substring(index + 7).trim();
+    }
+
+    /**
+     * 设置当前用户
+     *
+     * @param loginUser 登录用户
+     * @param request 请求
+     */
+    private static void setLoginUser(LoginUser loginUser, HttpServletRequest request) {
+        // 创建 Authentication，并设置到上下文
+        Authentication authentication = buildAuthentication(loginUser, request);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
+
+    private static Authentication buildAuthentication(LoginUser loginUser, HttpServletRequest request) {
+        // 创建 UsernamePasswordAuthenticationToken 对象
+        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
+                loginUser, null, Collections.emptyList());
+        authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+        return authenticationToken;
+    }
+
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index 2163a466c..df037f4c5 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -19,14 +19,57 @@
 				+ '&redirect_uri=' + redirectUri
 				+ '&response_type=' + responseType;
     }
+
+    $(function () {
+      const accessToken = localStorage.getItem('ACCESS-TOKEN');
+      // 情况一：未登录
+			if (!accessToken) {
+        $('#noLoginDiv').css("display", "block");
+        return;
+			}
+
+      // 情况二：已登录
+      $('#yesLoginDiv').css("display", "block");
+      $('#accessTokenSpan').html(accessToken);
+      // 获得登录用户的信息
+      $.ajax({
+        url: "http://127.0.0.1:18080/user/get",
+        method: 'GET',
+        headers: {
+          'Authentication': 'Bearer ' + accessToken
+        },
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('获得个人信息失败，原因：' + result.msg)
+            return;
+          }
+          $('nicknameSpan').html(result.data.nickname);
+        }
+      });
+    })
 	</script>
 </head>
 <body>
-<!-- 情况一：未登录：1）跳转 ruoyi-vue-pro 的 SSO 登录页 -->
-<div>
-	您未登录，点击 <a href="#" onclick="ssoLogin()">跳转 </a> SSO 单点登录
-</div>
+	<!-- 情况一：未登录：1）跳转 ruoyi-vue-pro 的 SSO 登录页 -->
+	<div id="noLoginDiv" style="display: none">
+		您未登录，点击 <a href="#" onclick="ssoLogin()">跳转 </a> SSO 单点登录
+	</div>
 
-<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
+	<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
+	<div id="yesLoginDiv" style="display: none">
+		您已登录！点击 <a href="#" onclick="ssoLogin()">退出 </a> 系统 <br />
+		昵称：<span id="nicknameSpan"> 加载中... </span> <br />
+		访问令牌：<span id="accessTokenSpan"> 加载中... </span> <br />
+	</div>
 </body>
+<style>
+    body { /** 页面居中 */
+        border-radius: 20px;
+        height: 350px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+    }
+</style>
 </html>

From fc7a6c782a18074d41d80377e4ac993d65c35fe6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 1 Oct 2022 10:52:27 +0800
Subject: [PATCH 14/48] =?UTF-8?q?=E5=AE=8C=E6=88=90=20yudao-sso-demo-by-co?=
 =?UTF-8?q?de=20=E5=AE=9E=E7=8E=B0=E8=8E=B7=E5=BE=97=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/ssodemo/client/OAuth2Client.java    |   4 +-
 .../yudao/ssodemo/client/UserClient.java      |  50 +++++++++
 .../client/dto/user/UserInfoRespDTO.java      |  97 +++++++++++++++++
 .../ssodemo/controller/UserController.java    |  14 ++-
 .../ssodemo/framework/core/LoginUser.java     |   5 +
 .../ssodemo/framework/core/SecurityUtils.java | 102 ++++++++++++++++++
 .../core/TokenAuthenticationFilter.java       |  51 +--------
 .../src/main/resources/static/index.html      |   6 +-
 8 files changed, 274 insertions(+), 55 deletions(-)
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/SecurityUtils.java

diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
index 8449dd39b..f29da71a4 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -20,14 +20,14 @@ import java.nio.charset.StandardCharsets;
 @Component
 public class OAuth2Client {
 
-    private static final String BASE_URL = "http://127.0.0.1:48080/admin-api/system/oauth2/";
+    private static final String BASE_URL = "http://127.0.0.1:48080/admin-api/system/oauth2";
 
     /**
      * 租户编号
      *
      * 默认使用 1；如果使用别的租户，可以调整
      */
-    private static final Long TENANT_ID = 1L;
+    public static final Long TENANT_ID = 1L;
 
     private static final String CLIENT_ID = "yudao-sso-demo-by-code";
     private static final String CLIENT_SECRET = "test";
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
new file mode 100644
index 000000000..8b2fa2a2e
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.ssodemo.client;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserInfoRespDTO;
+import cn.iocoder.yudao.ssodemo.framework.core.LoginUser;
+import cn.iocoder.yudao.ssodemo.framework.core.SecurityUtils;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * OAuth 2.0 客户端
+ */
+@Component
+public class UserClient {
+
+    private static final String BASE_URL = "http://127.0.0.1:48080/admin-api//system/oauth2/user";
+
+    //    @Resource // 可优化，注册一个 RestTemplate Bean，然后注入
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    public CommonResult<UserInfoRespDTO> getUser() {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", OAuth2Client.TENANT_ID.toString());
+        addTokenHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<UserInfoRespDTO>> exchange = restTemplate.exchange(
+                BASE_URL + "/get",
+                HttpMethod.GET,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<UserInfoRespDTO>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+    private static void addTokenHeader(HttpHeaders headers) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Assert.notNull(loginUser, "登录用户不能为空");
+        headers.add("Authorization", "Bearer " + loginUser.getAccessToken());
+    }
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java
new file mode 100644
index 000000000..e81bea9eb
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java
@@ -0,0 +1,97 @@
+package cn.iocoder.yudao.ssodemo.client.dto.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 获得用户基本信息 Response dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserInfoRespDTO {
+
+    /**
+     * 用户编号
+     */
+    private Long id;
+
+    /**
+     * 用户账号
+     */
+    private String username;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+
+    /**
+     * 用户性别
+     */
+    private Integer sex;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 所在部门
+     */
+    private Dept dept;
+
+    /**
+     * 所属岗位数组
+     */
+    private List<Post> posts;
+
+    /**
+     * 部门
+     */
+    @Data
+    public static class Dept {
+
+        /**
+         * 部门编号
+         */
+        private Long id;
+
+        /**
+         * 部门名称
+         */
+        private String name;
+
+    }
+
+    /**
+     * 岗位
+     */
+    @Data
+    public static class Post {
+
+        /**
+         * 岗位编号
+         */
+        private Long id;
+
+        /**
+         * 岗位名称
+         */
+        private String name;
+
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
index 77e4a9113..5626b7140 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
@@ -1,21 +1,29 @@
 package cn.iocoder.yudao.ssodemo.controller;
 
+import cn.iocoder.yudao.ssodemo.client.UserClient;
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserInfoRespDTO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 @RestController
 @RequestMapping("/user")
 public class UserController {
 
+    @Resource
+    private UserClient userClient;
+
     /**
      * 获得当前登录用户的基本信息
      *
-     * @return TODO
+     * @return 用户信息；注意，实际项目中，最好创建对应的 ResponseVO 类，只返回必要的字段
      */
     @GetMapping("/get")
-    public String getUser() {
-        return "";
+    public CommonResult<UserInfoRespDTO> getUser() {
+        return userClient.getUser();
     }
 
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
index e785e1544..44f3edf54 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
@@ -29,4 +29,9 @@ public class LoginUser {
      */
     private List<String> scopes;
 
+    /**
+     * 访问令牌
+     */
+    private String accessToken;
+
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/SecurityUtils.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/SecurityUtils.java
new file mode 100644
index 000000000..adfd32b60
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/SecurityUtils.java
@@ -0,0 +1,102 @@
+package cn.iocoder.yudao.ssodemo.framework.core;
+
+import org.springframework.lang.Nullable;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+
+/**
+ * 安全服务工具类
+ *
+ * @author 芋道源码
+ */
+public class SecurityUtils {
+
+    public static final String AUTHORIZATION_BEARER = "Bearer";
+
+    private SecurityUtils() {}
+
+    /**
+     * 从请求中，获得认证 Token
+     *
+     * @param request 请求
+     * @param header 认证 Token 对应的 Header 名字
+     * @return 认证 Token
+     */
+    public static String obtainAuthorization(HttpServletRequest request, String header) {
+        String authorization = request.getHeader(header);
+        if (!StringUtils.hasText(authorization)) {
+            return null;
+        }
+        int index = authorization.indexOf(AUTHORIZATION_BEARER + " ");
+        if (index == -1) { // 未找到
+            return null;
+        }
+        return authorization.substring(index + 7).trim();
+    }
+
+    /**
+     * 获得当前认证信息
+     *
+     * @return 认证信息
+     */
+    public static Authentication getAuthentication() {
+        SecurityContext context = SecurityContextHolder.getContext();
+        if (context == null) {
+            return null;
+        }
+        return context.getAuthentication();
+    }
+
+    /**
+     * 获取当前用户
+     *
+     * @return 当前用户
+     */
+    @Nullable
+    public static LoginUser getLoginUser() {
+        Authentication authentication = getAuthentication();
+        if (authentication == null) {
+            return null;
+        }
+        return authentication.getPrincipal() instanceof LoginUser ? (LoginUser) authentication.getPrincipal() : null;
+    }
+
+    /**
+     * 获得当前用户的编号，从上下文中
+     *
+     * @return 用户编号
+     */
+    @Nullable
+    public static Long getLoginUserId() {
+        LoginUser loginUser = getLoginUser();
+        return loginUser != null ? loginUser.getId() : null;
+    }
+
+    /**
+     * 设置当前用户
+     *
+     * @param loginUser 登录用户
+     * @param request 请求
+     */
+    public static void setLoginUser(LoginUser loginUser, HttpServletRequest request) {
+        // 创建 Authentication，并设置到上下文
+        Authentication authentication = buildAuthentication(loginUser, request);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
+
+    private static Authentication buildAuthentication(LoginUser loginUser, HttpServletRequest request) {
+        // 创建 UsernamePasswordAuthenticationToken 对象
+        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
+                loginUser, null, Collections.emptyList());
+        authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+        return authenticationToken;
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java
index a895fc2c5..cb90b4840 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java
@@ -3,10 +3,6 @@ package cn.iocoder.yudao.ssodemo.framework.core;
 import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
 import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
 import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2CheckTokenRespDTO;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
@@ -17,7 +13,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Collections;
 
 /**
  * Token 过滤器，验证 token 的有效性
@@ -35,13 +30,13 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
                                     FilterChain filterChain) throws ServletException, IOException {
         // 1. 获得访问令牌
-        String token = obtainAuthorization(request);
+        String token = SecurityUtils.obtainAuthorization(request, "Authentication");
         if (StringUtils.hasText(token)) {
             // 2. 基于 token 构建登录用户
             LoginUser loginUser = buildLoginUserByToken(token);
             // 3. 设置当前用户
             if (loginUser != null) {
-                setLoginUser(loginUser, request);
+                SecurityUtils.setLoginUser(loginUser, request);
             }
         }
 
@@ -58,50 +53,12 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
             }
             // 构建登录用户
             return new LoginUser().setId(accessToken.getUserId()).setUserType(accessToken.getUserType())
-                    .setTenantId(accessToken.getTenantId()).setScopes(accessToken.getScopes());
+                    .setTenantId(accessToken.getTenantId()).setScopes(accessToken.getScopes())
+                    .setAccessToken(accessToken.getAccessToken());
         } catch (Exception exception) {
             // 校验 Token 不通过时，考虑到一些接口是无需登录的，所以直接返回 null 即可
             return null;
         }
     }
 
-    /**
-     * 从请求 Header 中，获得访问令牌
-     *
-     * @param request 请求
-     * @return 访问令牌
-     */
-    private static String obtainAuthorization(HttpServletRequest request) {
-        String authorization = request.getHeader("Authentication");
-        if (!StringUtils.hasText(authorization)) {
-            return null;
-        }
-        int index = authorization.indexOf("Bearer ");
-        if (index == -1) { // 未找到
-            return null;
-        }
-        return authorization.substring(index + 7).trim();
-    }
-
-    /**
-     * 设置当前用户
-     *
-     * @param loginUser 登录用户
-     * @param request 请求
-     */
-    private static void setLoginUser(LoginUser loginUser, HttpServletRequest request) {
-        // 创建 Authentication，并设置到上下文
-        Authentication authentication = buildAuthentication(loginUser, request);
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-    }
-
-    private static Authentication buildAuthentication(LoginUser loginUser, HttpServletRequest request) {
-        // 创建 UsernamePasswordAuthenticationToken 对象
-        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
-                loginUser, null, Collections.emptyList());
-        authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-        return authenticationToken;
-    }
-
-
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index df037f4c5..491982bf9 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -43,7 +43,7 @@
             alert('获得个人信息失败，原因：' + result.msg)
             return;
           }
-          $('nicknameSpan').html(result.data.nickname);
+          $('#nicknameSpan').html(result.data.nickname);
         }
       });
     })
@@ -57,8 +57,8 @@
 
 	<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
 	<div id="yesLoginDiv" style="display: none">
-		您已登录！点击 <a href="#" onclick="ssoLogin()">退出 </a> 系统 <br />
-		昵称：<span id="nicknameSpan"> 加载中... </span> <br />
+		您已登录！<button>退出登录</button> <br />
+		昵称：<span id="nicknameSpan"> 加载中... </span> <button>修改昵称</button> <br />
 		访问令牌：<span id="accessTokenSpan"> 加载中... </span> <br />
 	</div>
 </body>

From ea71002ed6e77fb0e58baa3ba5e9dc7ebd889585 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 1 Oct 2022 20:30:15 +0800
Subject: [PATCH 15/48] =?UTF-8?q?=E5=AE=8C=E6=88=90=20yudao-sso-demo-by-co?=
 =?UTF-8?q?de=20=E5=AE=9E=E7=8E=B0=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-example/yudao-sso-demo-by-code/pom.xml  |  6 +++
 .../yudao/ssodemo/client/OAuth2Client.java    |  2 +
 .../yudao/ssodemo/client/UserClient.java      | 27 +++++++++++-
 .../client/dto/user/UserUpdateReqDTO.java     | 35 +++++++++++++++
 .../ssodemo/controller/UserController.java    | 17 +++++--
 .../config/SecurityConfiguration.java         | 22 ++++++----
 .../TokenAuthenticationFilter.java            |  4 +-
 .../core/handler/AccessDeniedHandlerImpl.java | 44 +++++++++++++++++++
 .../handler/AuthenticationEntryPointImpl.java | 36 +++++++++++++++
 .../core/{ => util}/SecurityUtils.java        |  3 +-
 .../framework/core/util/ServletUtils.java     | 28 ++++++++++++
 .../src/main/resources/static/index.html      | 29 +++++++++++-
 12 files changed, 236 insertions(+), 17 deletions(-)
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java
 rename yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/{ => filter}/TokenAuthenticationFilter.java (93%)
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
 rename yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/{ => util}/SecurityUtils.java (96%)
 create mode 100644 yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java

diff --git a/yudao-example/yudao-sso-demo-by-code/pom.xml b/yudao-example/yudao-sso-demo-by-code/pom.xml
index 3ea138ac4..9b003c4fb 100644
--- a/yudao-example/yudao-sso-demo-by-code/pom.xml
+++ b/yudao-example/yudao-sso-demo-by-code/pom.xml
@@ -49,6 +49,12 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
index f29da71a4..bdb417c41 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -16,6 +16,8 @@ import java.nio.charset.StandardCharsets;
 
 /**
  * OAuth 2.0 客户端
+ *
+ * 对应调用 OAuth2OpenController 接口
  */
 @Component
 public class OAuth2Client {
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
index 8b2fa2a2e..666bd3ee4 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
@@ -2,8 +2,9 @@ package cn.iocoder.yudao.ssodemo.client;
 
 import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
 import cn.iocoder.yudao.ssodemo.client.dto.user.UserInfoRespDTO;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserUpdateReqDTO;
 import cn.iocoder.yudao.ssodemo.framework.core.LoginUser;
-import cn.iocoder.yudao.ssodemo.framework.core.SecurityUtils;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
@@ -13,7 +14,9 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 /**
- * OAuth 2.0 客户端
+ * 用户 User 信息的客户端
+ *
+ * 对应调用 OAuth2UserController 接口
  */
 @Component
 public class UserClient {
@@ -42,6 +45,26 @@ public class UserClient {
         return exchange.getBody();
     }
 
+    public CommonResult<Boolean> updateUser(UserUpdateReqDTO updateReqDTO) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("tenant-id", OAuth2Client.TENANT_ID.toString());
+        addTokenHeader(headers);
+        // 1.2 构建请求参数
+        // 使用 updateReqDTO 即可
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<Boolean>> exchange = restTemplate.exchange(
+                BASE_URL + "/update",
+                HttpMethod.PUT,
+                new HttpEntity<>(updateReqDTO, headers),
+                new ParameterizedTypeReference<CommonResult<Boolean>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+
     private static void addTokenHeader(HttpHeaders headers) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Assert.notNull(loginUser, "登录用户不能为空");
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java
new file mode 100644
index 000000000..e711d7311
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.ssodemo.client.dto.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 更新用户基本信息 Request DTO
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserUpdateReqDTO {
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String mobile;
+
+    /**
+     * 用户性别
+     */
+    private Integer sex;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
index 5626b7140..819c752bc 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
@@ -3,9 +3,8 @@ package cn.iocoder.yudao.ssodemo.controller;
 import cn.iocoder.yudao.ssodemo.client.UserClient;
 import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
 import cn.iocoder.yudao.ssodemo.client.dto.user.UserInfoRespDTO;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserUpdateReqDTO;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -26,4 +25,16 @@ public class UserController {
         return userClient.getUser();
     }
 
+    /**
+     * 更新当前登录用户的昵称
+     *
+     * @param nickname 昵称
+     * @return 成功
+     */
+    @PutMapping("/update")
+    public CommonResult<Boolean> updateUser(@RequestParam("nickname") String nickname) {
+        UserUpdateReqDTO updateReqDTO = new UserUpdateReqDTO(nickname, null, null, null);
+        return userClient.updateUser(updateReqDTO);
+    }
+
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
index 3a27f0102..5c8a4e4b7 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.ssodemo.framework.config;
 
-import cn.iocoder.yudao.ssodemo.framework.core.TokenAuthenticationFilter;
+import cn.iocoder.yudao.ssodemo.framework.core.filter.TokenAuthenticationFilter;
+import cn.iocoder.yudao.ssodemo.framework.core.handler.AccessDeniedHandlerImpl;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 import javax.annotation.Resource;
@@ -12,17 +14,14 @@ import javax.annotation.Resource;
 @Configuration
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
-//    /**
-//     * Token 认证过滤器 Bean
-//     */
-//    @Bean
-//    public TokenAuthenticationFilter authenticationTokenFilter(OAuth2Client oauth2Client) {
-//        return new TokenAuthenticationFilter(oauth2Client);
-//    }
-
     @Resource
     private TokenAuthenticationFilter tokenAuthenticationFilter;
 
+    @Resource
+    private AccessDeniedHandlerImpl accessDeniedHandler;
+    @Resource
+    private AuthenticationEntryPoint authenticationEntryPoint;
+
     @Override
     protected void configure(HttpSecurity httpSecurity) throws Exception {
         // 设置 URL 安全权限
@@ -36,7 +35,12 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .and().authorizeRequests()
                 .anyRequest().authenticated();
 
+        // 设置处理器
+        httpSecurity.exceptionHandling().accessDeniedHandler(accessDeniedHandler)
+                .authenticationEntryPoint(authenticationEntryPoint);
+
         // 添加 Token Filter
         httpSecurity.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
     }
+
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
similarity index 93%
rename from yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java
rename to yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
index cb90b4840..106e1bd0d 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/TokenAuthenticationFilter.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
@@ -1,8 +1,10 @@
-package cn.iocoder.yudao.ssodemo.framework.core;
+package cn.iocoder.yudao.ssodemo.framework.core.filter;
 
 import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
 import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
 import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2CheckTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.framework.core.LoginUser;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
new file mode 100644
index 000000000..dccc35eb1
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.ssodemo.framework.core.handler;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
+import cn.iocoder.yudao.ssodemo.framework.core.util.ServletUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.security.web.access.ExceptionTranslationFilter;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 访问一个需要认证的 URL 资源，已经认证（登录）但是没有权限的情况下，返回 {@link GlobalErrorCodeConstants#FORBIDDEN} 错误码。
+ *
+ * 补充：Spring Security 通过 {@link ExceptionTranslationFilter#handleAccessDeniedException(HttpServletRequest, HttpServletResponse, FilterChain, AccessDeniedException)} 方法，调用当前类
+ *
+ * @author 芋道源码
+ */
+@Component
+@SuppressWarnings("JavadocReference")
+@Slf4j
+public class AccessDeniedHandlerImpl implements AccessDeniedHandler {
+
+    @Override
+    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException e)
+            throws IOException, ServletException {
+        // 打印 warn 的原因是，不定期合并 warn，看看有没恶意破坏
+        log.warn("[commence][访问 URL({}) 时，用户({}) 权限不够]", request.getRequestURI(),
+                SecurityUtils.getLoginUserId(), e);
+        // 返回 403
+        CommonResult<Object> result = new CommonResult<>();
+        result.setCode(HttpStatus.FORBIDDEN.value());
+        result.setMsg("没有该操作权限");
+        ServletUtils.writeJSON(response, result);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
new file mode 100644
index 000000000..241ff56f5
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.ssodemo.framework.core.handler;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.framework.core.util.ServletUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.security.web.access.ExceptionTranslationFilter;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.FilterChain;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 访问一个需要认证的 URL 资源，但是此时自己尚未认证（登录）的情况下，返回 {@link GlobalErrorCodeConstants#UNAUTHORIZED} 错误码，从而使前端重定向到登录页
+ *
+ * 补充：Spring Security 通过 {@link ExceptionTranslationFilter#sendStartAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, AuthenticationException)} 方法，调用当前类
+ */
+@Component
+@Slf4j
+@SuppressWarnings("JavadocReference") // 忽略文档引用报错
+public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint {
+
+    @Override
+    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) {
+        log.debug("[commence][访问 URL({}) 时，没有登录]", request.getRequestURI(), e);
+        // 返回 401
+        CommonResult<Object> result = new CommonResult<>();
+        result.setCode(HttpStatus.UNAUTHORIZED.value());
+        result.setMsg("账号未登录");
+        ServletUtils.writeJSON(response, result);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/SecurityUtils.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
similarity index 96%
rename from yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/SecurityUtils.java
rename to yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
index adfd32b60..0352a4785 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/SecurityUtils.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
@@ -1,5 +1,6 @@
-package cn.iocoder.yudao.ssodemo.framework.core;
+package cn.iocoder.yudao.ssodemo.framework.core.util;
 
+import cn.iocoder.yudao.ssodemo.framework.core.LoginUser;
 import org.springframework.lang.Nullable;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
new file mode 100644
index 000000000..50f1836f7
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.ssodemo.framework.core.util;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import cn.hutool.json.JSONUtil;
+import org.springframework.http.MediaType;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 客户端工具类
+ *
+ * @author 芋道源码
+ */
+public class ServletUtils {
+
+    /**
+     * 返回 JSON 字符串
+     *
+     * @param response 响应
+     * @param object 对象，会序列化成 JSON 字符串
+     */
+    @SuppressWarnings("deprecation") // 必须使用 APPLICATION_JSON_UTF8_VALUE，否则会乱码
+    public static void writeJSON(HttpServletResponse response, Object object) {
+        String content = JSONUtil.toJsonStr(object);
+        ServletUtil.write(response, content, MediaType.APPLICATION_JSON_UTF8_VALUE);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index 491982bf9..0f69e6b58 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -20,6 +20,33 @@
 				+ '&response_type=' + responseType;
     }
 
+    /**
+		 * 修改昵称
+     */
+    function updateNickname() {
+      const nickname = prompt("请输入新的昵称", "");
+      if (!nickname) {
+        return;
+      }
+      // 更新用户的昵称
+      const accessToken = localStorage.getItem('ACCESS-TOKEN');
+      $.ajax({
+        url: "http://127.0.0.1:18080/user/update?nickname=" + nickname,
+        method: 'PUT',
+        headers: {
+          'Authentication': 'Bearer ' + accessToken
+        },
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('更新昵称失败，原因：' + result.msg)
+            return;
+          }
+          alert('更新昵称成功！');
+          $('#nicknameSpan').html(nickname);
+        }
+      });
+		}
+
     $(function () {
       const accessToken = localStorage.getItem('ACCESS-TOKEN');
       // 情况一：未登录
@@ -58,7 +85,7 @@
 	<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
 	<div id="yesLoginDiv" style="display: none">
 		您已登录！<button>退出登录</button> <br />
-		昵称：<span id="nicknameSpan"> 加载中... </span> <button>修改昵称</button> <br />
+		昵称：<span id="nicknameSpan"> 加载中... </span> <button onclick="updateNickname()">修改昵称</button> <br />
 		访问令牌：<span id="accessTokenSpan"> 加载中... </span> <br />
 	</div>
 </body>

From ff54f169079ceb5b77d93cc60f5d2a167c6c253e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 1 Oct 2022 20:49:11 +0800
Subject: [PATCH 16/48] =?UTF-8?q?=E5=AE=8C=E6=88=90=20yudao-sso-demo-by-co?=
 =?UTF-8?q?de=20=E5=88=B7=E6=96=B0=E8=AE=BF=E9=97=AE=E4=BB=A4=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/ssodemo/client/OAuth2Client.java    | 33 +++++++++++++++++++
 .../ssodemo/controller/AuthController.java    | 11 +++++++
 .../src/main/resources/static/index.html      | 29 +++++++++++++++-
 .../vo/open/OAuth2OpenCheckTokenRespVO.java   |  1 +
 .../oauth2/vo/user/OAuth2UserInfoRespVO.java  |  2 +-
 yudao-ui-admin/src/views/sso.vue              |  2 +-
 6 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
index bdb417c41..6e179c49c 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -68,6 +68,12 @@ public class OAuth2Client {
         return exchange.getBody();
     }
 
+    /**
+     * 校验访问令牌，并返回它的基本信息
+     *
+     * @param token 访问令牌
+     * @return 访问令牌的基本信息
+     */
     public CommonResult<OAuth2CheckTokenRespDTO> checkToken(String token) {
         // 1.1 构建请求头
         HttpHeaders headers = new HttpHeaders();
@@ -88,6 +94,33 @@ public class OAuth2Client {
         return exchange.getBody();
     }
 
+    /**
+     * 使用刷新令牌，获得（刷新）访问令牌
+     *
+     * @param refreshToken 刷新令牌
+     * @return 访问令牌
+     */
+    public CommonResult<OAuth2AccessTokenRespDTO> refreshToken(String refreshToken) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", TENANT_ID.toString());
+        addClientHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("grant_type", "refresh_token");
+        body.add("refresh_token", refreshToken);
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<OAuth2AccessTokenRespDTO>> exchange = restTemplate.exchange(
+                BASE_URL + "/token",
+                HttpMethod.POST,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<OAuth2AccessTokenRespDTO>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
     private static void addClientHeader(HttpHeaders headers) {
         // client 拼接，需要 BASE64 编码
         String client = CLIENT_ID + ":" + CLIENT_SECRET;
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
index 21807170e..4dfa3d0b5 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
@@ -30,4 +30,15 @@ public class AuthController {
         return oauth2Client.postAccessToken(code, redirectUri);
     }
 
+    /**
+     * 使用刷新令牌，获得（刷新）访问令牌
+     *
+     * @param refreshToken 刷新令牌
+     * @return 访问令牌；注意，实际项目中，最好创建对应的 ResponseVO 类，只返回必要的字段
+     */
+    @PostMapping("/refresh-token")
+    public CommonResult<OAuth2AccessTokenRespDTO> refreshToken(@RequestParam("refreshToken") String refreshToken) {
+        return oauth2Client.refreshToken(refreshToken);
+    }
+
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index 0f69e6b58..a4bfa666e 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -47,6 +47,33 @@
       });
 		}
 
+    /**
+		 * 刷新令牌
+     */
+    function refreshToken() {
+      const refreshToken = localStorage.getItem('REFRESH-TOKEN');
+      if (!refreshToken) {
+        alert("获取不到刷新令牌");
+        return;
+			}
+      $.ajax({
+        url: "http://127.0.0.1:18080/auth/refresh-token?refreshToken=" + refreshToken,
+        method: 'POST',
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('刷新访问令牌失败，原因：' + result.msg)
+            return;
+          }
+          alert('更新访问令牌成功！');
+          $('#accessTokenSpan').html(result.data.access_token);
+
+          // 设置到 localStorage 中
+          localStorage.setItem('ACCESS-TOKEN', result.data.access_token);
+          localStorage.setItem('REFRESH-TOKEN', result.data.refresh_token);
+        }
+      });
+		}
+
     $(function () {
       const accessToken = localStorage.getItem('ACCESS-TOKEN');
       // 情况一：未登录
@@ -86,7 +113,7 @@
 	<div id="yesLoginDiv" style="display: none">
 		您已登录！<button>退出登录</button> <br />
 		昵称：<span id="nicknameSpan"> 加载中... </span> <button onclick="updateNickname()">修改昵称</button> <br />
-		访问令牌：<span id="accessTokenSpan"> 加载中... </span> <br />
+		访问令牌：<span id="accessTokenSpan"> 加载中... </span> <button onclick="refreshToken()">刷新令牌</button> <br />
 	</div>
 </body>
 <style>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java
index f23838718..e1639e9ac 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java
@@ -26,6 +26,7 @@ public class OAuth2OpenCheckTokenRespVO {
     private Long tenantId;
 
     @ApiModelProperty(value = "客户端编号", required = true, example = "car")
+    @JsonProperty("client_id")
     private String clientId;
     @ApiModelProperty(value = "授权范围", required = true, example = "user_info")
     private List<String> scopes;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java
index ddd7aecc7..f22c14a9f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java
@@ -17,7 +17,7 @@ public class OAuth2UserInfoRespVO {
     @ApiModelProperty(value = "用户编号", required = true, example = "1")
     private Long id;
 
-    @ApiModelProperty(value = "用户昵称", required = true, example = "芋艿")
+    @ApiModelProperty(value = "用户账号", required = true, example = "芋艿")
     private String username;
 
     @ApiModelProperty(value = "用户昵称", required = true, example = "芋道")
diff --git a/yudao-ui-admin/src/views/sso.vue b/yudao-ui-admin/src/views/sso.vue
index 090c953d3..948a37469 100644
--- a/yudao-ui-admin/src/views/sso.vue
+++ b/yudao-ui-admin/src/views/sso.vue
@@ -19,7 +19,7 @@
             </el-tab-pane>
           </el-tabs>
           <div>
-            <el-form ref="loginForm" :model="loginForm" :rules="LoginRules" class="login-form">
+            <el-form ref="loginForm" :model="loginForm" class="login-form">
               <!-- 授权范围的选择 -->
               此第三方应用请求获得以下权限：
               <el-form-item prop="scopes">

From ab40254bc1591644394e07f34762eef2a598cc53 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 1 Oct 2022 21:26:45 +0800
Subject: [PATCH 17/48] =?UTF-8?q?=E5=AE=8C=E6=88=90=20yudao-sso-demo-by-co?=
 =?UTF-8?q?de=20=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/ssodemo/client/OAuth2Client.java    | 26 +++++++++++++++
 .../ssodemo/controller/AuthController.java    | 19 +++++++++++
 .../config/SecurityConfiguration.java         |  2 ++
 .../src/main/resources/static/index.html      | 32 ++++++++++++++++++-
 4 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
index 6e179c49c..d2e160f6f 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -121,6 +121,32 @@ public class OAuth2Client {
         return exchange.getBody();
     }
 
+    /**
+     * 删除访问令牌
+     *
+     * @param token 访问令牌
+     * @return 成功
+     */
+    public CommonResult<Boolean> revokeToken(String token) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", TENANT_ID.toString());
+        addClientHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("token", token);
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<Boolean>> exchange = restTemplate.exchange(
+                BASE_URL + "/token",
+                HttpMethod.DELETE,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<Boolean>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
     private static void addClientHeader(HttpHeaders headers) {
         // client 拼接，需要 BASE64 编码
         String client = CLIENT_ID + ":" + CLIENT_SECRET;
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
index 4dfa3d0b5..19b07e5b4 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
@@ -1,14 +1,17 @@
 package cn.iocoder.yudao.ssodemo.controller;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
 import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
 import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2AccessTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping("/auth")
@@ -41,4 +44,20 @@ public class AuthController {
         return oauth2Client.refreshToken(refreshToken);
     }
 
+    /**
+     * 退出登录
+     *
+     * @param request 请求
+     * @return 成功
+     */
+    @PostMapping("/logout")
+    public CommonResult<Boolean> logout(HttpServletRequest request) {
+        String token = SecurityUtils.obtainAuthorization(request, "Authentication");
+        if (StrUtil.isNotBlank(token)) {
+            return oauth2Client.revokeToken(token);
+        }
+        // 返回成功
+        return new CommonResult<>();
+    }
+
 }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
index 5c8a4e4b7..1d19fcfdb 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
@@ -31,6 +31,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
                 // 2. 登录相关的接口，可匿名访问
                 .antMatchers("/auth/login-by-code").permitAll()
+                .antMatchers("/auth/refresh-token").permitAll()
+                .antMatchers("/auth/logout").permitAll()
                 // last. 兜底规则，必须认证
                 .and().authorizeRequests()
                 .anyRequest().authenticated();
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index a4bfa666e..9c0dac659 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -74,6 +74,36 @@
       });
 		}
 
+    /**
+     * 刷新令牌
+     */
+    function logout() {
+      const accessToken = localStorage.getItem('ACCESS-TOKEN');
+      if (!accessToken) {
+        location.reload();
+        return;
+      }
+      $.ajax({
+        url: "http://127.0.0.1:18080/auth/logout",
+        method: 'POST',
+        headers: {
+          'Authentication': 'Bearer ' + accessToken
+        },
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('退出登录失败，原因：' + result.msg)
+            return;
+          }
+          alert('退出登录成功！');
+          // 删除 localStorage 中
+          localStorage.removeItem('ACCESS-TOKEN');
+          localStorage.removeItem('REFRESH-TOKEN');
+
+          location.reload();
+        }
+      });
+    }
+
     $(function () {
       const accessToken = localStorage.getItem('ACCESS-TOKEN');
       // 情况一：未登录
@@ -111,7 +141,7 @@
 
 	<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
 	<div id="yesLoginDiv" style="display: none">
-		您已登录！<button>退出登录</button> <br />
+		您已登录！<button onclick="logout()">退出登录</button> <br />
 		昵称：<span id="nicknameSpan"> 加载中... </span> <button onclick="updateNickname()">修改昵称</button> <br />
 		访问令牌：<span id="accessTokenSpan"> 加载中... </span> <button onclick="refreshToken()">刷新令牌</button> <br />
 	</div>

From 585d2a523bf74310b7b1dc10a00089d44ac5ac6d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 1 Oct 2022 21:37:45 +0800
Subject: [PATCH 18/48] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=20redirect=20=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=8F=82=E6=95=B0=E6=97=B6=EF=BC=8C=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=9B=9E=E8=B7=B3=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/permission.js         | 3 ++-
 yudao-ui-admin/src/views/login.vue       | 2 +-
 yudao-ui-admin/src/views/socialLogin.vue | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yudao-ui-admin/src/permission.js b/yudao-ui-admin/src/permission.js
index 525b8b566..3923eb55f 100644
--- a/yudao-ui-admin/src/permission.js
+++ b/yudao-ui-admin/src/permission.js
@@ -48,7 +48,8 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      const redirect = encodeURIComponent(to.fullPath) // 编码 URI，保证参数跳转回去后，可以继续带上
+      next(`/login?redirect=${redirect}`) // 否则全部重定向到登录页
       NProgress.done()
     }
   }
diff --git a/yudao-ui-admin/src/views/login.vue b/yudao-ui-admin/src/views/login.vue
index 1024577b6..3055cd168 100644
--- a/yudao-ui-admin/src/views/login.vue
+++ b/yudao-ui-admin/src/views/login.vue
@@ -190,7 +190,7 @@ export default {
     // 验证码开关
     this.captchaEnable = getCaptchaEnable();
     // 重定向地址
-    this.redirect = this.$route.query.redirect;
+    this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : undefined;
     this.getCookie();
   },
   methods: {
diff --git a/yudao-ui-admin/src/views/socialLogin.vue b/yudao-ui-admin/src/views/socialLogin.vue
index d3463ad66..0dc1abef7 100644
--- a/yudao-ui-admin/src/views/socialLogin.vue
+++ b/yudao-ui-admin/src/views/socialLogin.vue
@@ -117,7 +117,7 @@ export default {
     // 验证码开关
     this.captchaEnable = getCaptchaEnable();
     // 重定向地址
-    this.redirect = this.$route.query.redirect;
+    this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : undefined;
     // 社交登录相关
     this.type = this.$route.query.type;
     this.code = this.$route.query.code;

From f634ecf7c36a35ddb2caa0acb502a32cae57ad55 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 2 Oct 2022 13:05:19 +0800
Subject: [PATCH 19/48] =?UTF-8?q?=E5=AE=8C=E5=96=84=20pom.xml=20=E7=9A=84?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  3 ++-
 yudao-server/src/main/resources/application-local.yaml | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 29f18bfc6..a683f66fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
         <module>yudao-framework</module>
         <!-- Server 主项目 -->
         <module>yudao-server</module>
-        <!--  各种 module 拓展 -->
+        <!-- 各种 module 拓展 -->
         <module>yudao-module-member</module>
         <module>yudao-module-bpm</module>
         <module>yudao-module-system</module>
@@ -20,6 +20,7 @@
         <module>yudao-module-pay</module>
         <module>yudao-module-mall</module>
         <module>yudao-module-visualization</module>
+        <!-- 示例项目 -->
         <module>yudao-example</module>
     </modules>
 
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 197649b5e..e7eb34999 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -45,24 +45,24 @@ spring:
       datasource:
         master:
           name: ruoyi-vue-pro
-          url: jdbc:mysql://139.9.196.247:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
           username: root
-          password: ${RUOYI_VUE_PRO}
+          password: 123456
         #          username: sa
         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
         slave: # 模拟从库，可根据自己需要修改
           name: ruoyi-vue-pro
-          url: jdbc:mysql://139.9.196.247:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
           username: root
-          password: ${RUOYI_VUE_PRO}
+          password: 123456
   #          username: sa
   #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
 
@@ -197,7 +197,7 @@ wx:
 # 芋道配置项，设置当前项目所有自定义的配置
 yudao:
   captcha:
-    enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试
+    enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试；
   security:
     mock-enable: true
   xss:

From 6be30c0887117f67cb1cc577c65d7711df1b35a7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 3 Oct 2022 17:52:51 +0800
Subject: [PATCH 20/48] =?UTF-8?q?=E4=BC=98=E5=8C=96=20yudao-sso-demo-by-co?=
 =?UTF-8?q?de=20=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ssodemo/controller/AuthController.java    |  2 +-
 .../filter/TokenAuthenticationFilter.java     |  2 +-
 .../src/main/resources/static/callback.html   | 14 ++---
 .../src/main/resources/static/index.html      | 52 +++++++++----------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
index 19b07e5b4..fe64a1547 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
@@ -52,7 +52,7 @@ public class AuthController {
      */
     @PostMapping("/logout")
     public CommonResult<Boolean> logout(HttpServletRequest request) {
-        String token = SecurityUtils.obtainAuthorization(request, "Authentication");
+        String token = SecurityUtils.obtainAuthorization(request, "Authorization");
         if (StrUtil.isNotBlank(token)) {
             return oauth2Client.revokeToken(token);
         }
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
index 106e1bd0d..70bb40eaa 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
@@ -32,7 +32,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
                                     FilterChain filterChain) throws ServletException, IOException {
         // 1. 获得访问令牌
-        String token = SecurityUtils.obtainAuthorization(request, "Authentication");
+        String token = SecurityUtils.obtainAuthorization(request, "Authorization");
         if (StringUtils.hasText(token)) {
             // 2. 基于 token 构建登录用户
             LoginUser loginUser = buildLoginUserByToken(token);
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html
index 60199e29e..123a1af9b 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/callback.html
@@ -9,8 +9,8 @@
 	<script type="application/javascript">
     (function ($) {
       /**
-			 * 获得 URL 的指定参数的值
-			 *
+       * 获得 URL 的指定参数的值
+       *
        * @param name 参数名
        * @returns 参数值
        */
@@ -25,17 +25,17 @@
 	<script type="application/javascript">
     $(function () {
       // 获得 code 授权码
-			const code = $.getUrlParam('code');
+      const code = $.getUrlParam('code');
       if (!code) {
         alert('获取不到 code 参数，请排查！')
         return;
-			}
+      }
 
       // 提交
-			const redirectUri = 'http://127.0.0.1:18080/callback.html'; // 需要修改成，你回调的地址，就是在 index.html 拼接的 redirectUri
+      const redirectUri = 'http://127.0.0.1:18080/callback.html'; // 需要修改成，你回调的地址，就是在 index.html 拼接的 redirectUri
       $.ajax({
         url:  "http://127.0.0.1:18080/auth/login-by-code?code=" + code
-					+ '&redirectUri=' + redirectUri,
+          + '&redirectUri=' + redirectUri,
         method: 'POST',
         success: function( result ) {
           if (result.code !== 0) {
@@ -52,7 +52,7 @@
           window.location.href = '/index.html';
         }
       })
-		})
+    })
 	</script>
 </head>
 <body>
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index 9c0dac659..8511b668b 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -8,20 +8,20 @@
 
 	<script type="application/javascript">
 
-		/**
-		 * 跳转单点登录
+    /**
+     * 跳转单点登录
      */
-		function ssoLogin() {
-			const clientId = 'yudao-sso-demo-by-code'; // 可以改写成，你的 clientId
+    function ssoLogin() {
+      const clientId = 'yudao-sso-demo-by-code'; // 可以改写成，你的 clientId
       const redirectUri = encodeURIComponent('http://127.0.0.1:18080/callback.html'); // 注意，需要使用 encodeURIComponent 编码地址
       const responseType = 'code'; // 1）授权码模式，对应 code；2）简化模式，对应 token
       window.location.href = 'http://127.0.0.1:1024/sso?client_id=' + clientId
-				+ '&redirect_uri=' + redirectUri
-				+ '&response_type=' + responseType;
+        + '&redirect_uri=' + redirectUri
+        + '&response_type=' + responseType;
     }
 
     /**
-		 * 修改昵称
+     * 修改昵称
      */
     function updateNickname() {
       const nickname = prompt("请输入新的昵称", "");
@@ -34,7 +34,7 @@
         url: "http://127.0.0.1:18080/user/update?nickname=" + nickname,
         method: 'PUT',
         headers: {
-          'Authentication': 'Bearer ' + accessToken
+          'Authorization': 'Bearer ' + accessToken
         },
         success: function (result) {
           if (result.code !== 0) {
@@ -45,17 +45,17 @@
           $('#nicknameSpan').html(nickname);
         }
       });
-		}
+    }
 
     /**
-		 * 刷新令牌
+     * 刷新令牌
      */
     function refreshToken() {
       const refreshToken = localStorage.getItem('REFRESH-TOKEN');
       if (!refreshToken) {
         alert("获取不到刷新令牌");
         return;
-			}
+      }
       $.ajax({
         url: "http://127.0.0.1:18080/auth/refresh-token?refreshToken=" + refreshToken,
         method: 'POST',
@@ -72,7 +72,7 @@
           localStorage.setItem('REFRESH-TOKEN', result.data.refresh_token);
         }
       });
-		}
+    }
 
     /**
      * 刷新令牌
@@ -87,7 +87,7 @@
         url: "http://127.0.0.1:18080/auth/logout",
         method: 'POST',
         headers: {
-          'Authentication': 'Bearer ' + accessToken
+          'Authorization': 'Bearer ' + accessToken
         },
         success: function (result) {
           if (result.code !== 0) {
@@ -107,10 +107,10 @@
     $(function () {
       const accessToken = localStorage.getItem('ACCESS-TOKEN');
       // 情况一：未登录
-			if (!accessToken) {
+      if (!accessToken) {
         $('#noLoginDiv').css("display", "block");
         return;
-			}
+      }
 
       // 情况二：已登录
       $('#yesLoginDiv').css("display", "block");
@@ -120,7 +120,7 @@
         url: "http://127.0.0.1:18080/user/get",
         method: 'GET',
         headers: {
-          'Authentication': 'Bearer ' + accessToken
+          'Authorization': 'Bearer ' + accessToken
         },
         success: function (result) {
           if (result.code !== 0) {
@@ -134,17 +134,17 @@
 	</script>
 </head>
 <body>
-	<!-- 情况一：未登录：1）跳转 ruoyi-vue-pro 的 SSO 登录页 -->
-	<div id="noLoginDiv" style="display: none">
-		您未登录，点击 <a href="#" onclick="ssoLogin()">跳转 </a> SSO 单点登录
-	</div>
+<!-- 情况一：未登录：1）跳转 ruoyi-vue-pro 的 SSO 登录页 -->
+<div id="noLoginDiv" style="display: none">
+	您未登录，点击 <a href="#" onclick="ssoLogin()">跳转 </a> SSO 单点登录
+</div>
 
-	<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
-	<div id="yesLoginDiv" style="display: none">
-		您已登录！<button onclick="logout()">退出登录</button> <br />
-		昵称：<span id="nicknameSpan"> 加载中... </span> <button onclick="updateNickname()">修改昵称</button> <br />
-		访问令牌：<span id="accessTokenSpan"> 加载中... </span> <button onclick="refreshToken()">刷新令牌</button> <br />
-	</div>
+<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
+<div id="yesLoginDiv" style="display: none">
+	您已登录！<button onclick="logout()">退出登录</button> <br />
+	昵称：<span id="nicknameSpan"> 加载中... </span> <button onclick="updateNickname()">修改昵称</button> <br />
+	访问令牌：<span id="accessTokenSpan"> 加载中... </span> <button onclick="refreshToken()">刷新令牌</button> <br />
+</div>
 </body>
 <style>
     body { /** 页面居中 */

From 05951783dee6ad55dd8edb482d54d76f609296b0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 4 Oct 2022 17:51:30 +0800
Subject: [PATCH 21/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20yudao-sso-demo-by-pa?=
 =?UTF-8?q?ssword=20=E7=A4=BA=E4=BE=8B=EF=BC=8C=E5=9F=BA=E4=BA=8E=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=AE=9E=E7=8E=B0=20SSO=20?=
 =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-example/pom.xml                         |   1 +
 .../src/main/resources/static/index.html      |   2 +-
 .../yudao-sso-demo-by-password/pom.xml        |  65 ++++++++
 .../yudao/ssodemo/SSODemoApplication.java     |  13 ++
 .../yudao/ssodemo/client/OAuth2Client.java    | 127 +++++++++++++++
 .../yudao/ssodemo/client/UserClient.java      |  73 +++++++++
 .../ssodemo/client/dto/CommonResult.java      |  28 ++++
 .../dto/oauth2/OAuth2AccessTokenRespDTO.java  |  45 +++++
 .../dto/oauth2/OAuth2CheckTokenRespDTO.java   |  59 +++++++
 .../client/dto/user/UserInfoRespDTO.java      |  97 +++++++++++
 .../client/dto/user/UserUpdateReqDTO.java     |  35 ++++
 .../ssodemo/controller/AuthController.java    |  50 ++++++
 .../ssodemo/controller/UserController.java    |  40 +++++
 .../config/SecurityConfiguration.java         |  48 ++++++
 .../ssodemo/framework/core/LoginUser.java     |  37 +++++
 .../filter/TokenAuthenticationFilter.java     |  66 ++++++++
 .../core/handler/AccessDeniedHandlerImpl.java |  44 +++++
 .../handler/AuthenticationEntryPointImpl.java |  36 ++++
 .../framework/core/util/SecurityUtils.java    | 103 ++++++++++++
 .../framework/core/util/ServletUtils.java     |  28 ++++
 .../src/main/resources/application.yaml       |   2 +
 .../src/main/resources/static/index.html      | 154 ++++++++++++++++++
 .../src/main/resources/static/login.html      |  74 +++++++++
 23 files changed, 1226 insertions(+), 1 deletion(-)
 create mode 100644 yudao-example/yudao-sso-demo-by-password/pom.xml
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2AccessTokenRespDTO.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/resources/application.yaml
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/resources/static/index.html
 create mode 100644 yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html

diff --git a/yudao-example/pom.xml b/yudao-example/pom.xml
index 588b86387..82b85a5f9 100644
--- a/yudao-example/pom.xml
+++ b/yudao-example/pom.xml
@@ -12,6 +12,7 @@
     <packaging>pom</packaging>
     <modules>
         <module>yudao-sso-demo-by-code</module>
+        <module>yudao-sso-demo-by-password</module>
     </modules>
 
     <name>${project.artifactId}</name>
diff --git a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
index 8511b668b..a4f858363 100644
--- a/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
+++ b/yudao-example/yudao-sso-demo-by-code/src/main/resources/static/index.html
@@ -75,7 +75,7 @@
     }
 
     /**
-     * 刷新令牌
+     * 登出，删除访问令牌
      */
     function logout() {
       const accessToken = localStorage.getItem('ACCESS-TOKEN');
diff --git a/yudao-example/yudao-sso-demo-by-password/pom.xml b/yudao-example/yudao-sso-demo-by-password/pom.xml
new file mode 100644
index 000000000..e3f0d2e77
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- 由于方便大家拷贝，使用不使用 yudao 作为 Maven parent -->
+
+    <groupId>cn.iocoder.boot</groupId>
+    <artifactId>yudao-sso-demo-by-password</artifactId>
+    <version>1.0.0-snapshot</version>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>基于密码模式，如何实现 SSO 单点登录？</description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+
+    <properties>
+        <!-- Maven 相关 -->
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- 统一依赖管理 -->
+        <spring.boot.version>2.6.10</spring.boot.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- 统一依赖管理 -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java
new file mode 100644
index 000000000..f6b160745
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/SSODemoApplication.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.ssodemo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SSODemoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SSODemoApplication.class, args);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
new file mode 100644
index 000000000..b5f971989
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -0,0 +1,127 @@
+package cn.iocoder.yudao.ssodemo.client;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2AccessTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2CheckTokenRespDTO;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.springframework.util.Base64Utils;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * OAuth 2.0 客户端
+ *
+ * 对应调用 OAuth2OpenController 接口
+ */
+@Component
+public class OAuth2Client {
+
+    private static final String BASE_URL = "http://127.0.0.1:48080/admin-api/system/oauth2";
+
+    /**
+     * 租户编号
+     *
+     * 默认使用 1；如果使用别的租户，可以调整
+     */
+    public static final Long TENANT_ID = 1L;
+
+    private static final String CLIENT_ID = "yudao-sso-demo-by-code";
+    private static final String CLIENT_SECRET = "test";
+
+
+//    @Resource // 可优化，注册一个 RestTemplate Bean，然后注入
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    /**
+     * 校验访问令牌，并返回它的基本信息
+     *
+     * @param token 访问令牌
+     * @return 访问令牌的基本信息
+     */
+    public CommonResult<OAuth2CheckTokenRespDTO> checkToken(String token) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", TENANT_ID.toString());
+        addClientHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("token", token);
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<OAuth2CheckTokenRespDTO>> exchange = restTemplate.exchange(
+                BASE_URL + "/check-token",
+                HttpMethod.POST,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<OAuth2CheckTokenRespDTO>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+    /**
+     * 使用刷新令牌，获得（刷新）访问令牌
+     *
+     * @param refreshToken 刷新令牌
+     * @return 访问令牌
+     */
+    public CommonResult<OAuth2AccessTokenRespDTO> refreshToken(String refreshToken) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", TENANT_ID.toString());
+        addClientHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("grant_type", "refresh_token");
+        body.add("refresh_token", refreshToken);
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<OAuth2AccessTokenRespDTO>> exchange = restTemplate.exchange(
+                BASE_URL + "/token",
+                HttpMethod.POST,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<OAuth2AccessTokenRespDTO>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+    /**
+     * 删除访问令牌
+     *
+     * @param token 访问令牌
+     * @return 成功
+     */
+    public CommonResult<Boolean> revokeToken(String token) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", TENANT_ID.toString());
+        addClientHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("token", token);
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<Boolean>> exchange = restTemplate.exchange(
+                BASE_URL + "/token",
+                HttpMethod.DELETE,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<Boolean>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+    private static void addClientHeader(HttpHeaders headers) {
+        // client 拼接，需要 BASE64 编码
+        String client = CLIENT_ID + ":" + CLIENT_SECRET;
+        client = Base64Utils.encodeToString(client.getBytes(StandardCharsets.UTF_8));
+        headers.add("Authorization", "Basic " + client);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
new file mode 100644
index 000000000..666bd3ee4
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/UserClient.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.ssodemo.client;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserInfoRespDTO;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserUpdateReqDTO;
+import cn.iocoder.yudao.ssodemo.framework.core.LoginUser;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 用户 User 信息的客户端
+ *
+ * 对应调用 OAuth2UserController 接口
+ */
+@Component
+public class UserClient {
+
+    private static final String BASE_URL = "http://127.0.0.1:48080/admin-api//system/oauth2/user";
+
+    //    @Resource // 可优化，注册一个 RestTemplate Bean，然后注入
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    public CommonResult<UserInfoRespDTO> getUser() {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.set("tenant-id", OAuth2Client.TENANT_ID.toString());
+        addTokenHeader(headers);
+        // 1.2 构建请求参数
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<UserInfoRespDTO>> exchange = restTemplate.exchange(
+                BASE_URL + "/get",
+                HttpMethod.GET,
+                new HttpEntity<>(body, headers),
+                new ParameterizedTypeReference<CommonResult<UserInfoRespDTO>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+    public CommonResult<Boolean> updateUser(UserUpdateReqDTO updateReqDTO) {
+        // 1.1 构建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("tenant-id", OAuth2Client.TENANT_ID.toString());
+        addTokenHeader(headers);
+        // 1.2 构建请求参数
+        // 使用 updateReqDTO 即可
+
+        // 2. 执行请求
+        ResponseEntity<CommonResult<Boolean>> exchange = restTemplate.exchange(
+                BASE_URL + "/update",
+                HttpMethod.PUT,
+                new HttpEntity<>(updateReqDTO, headers),
+                new ParameterizedTypeReference<CommonResult<Boolean>>() {}); // 解决 CommonResult 的泛型丢失
+        Assert.isTrue(exchange.getStatusCode().is2xxSuccessful(), "响应必须是 200 成功");
+        return exchange.getBody();
+    }
+
+
+    private static void addTokenHeader(HttpHeaders headers) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Assert.notNull(loginUser, "登录用户不能为空");
+        headers.add("Authorization", "Bearer " + loginUser.getAccessToken());
+    }
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java
new file mode 100644
index 000000000..548fe51e4
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/CommonResult.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.ssodemo.client.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 通用返回
+ *
+ * @param <T> 数据泛型
+ */
+@Data
+public class CommonResult<T> implements Serializable {
+
+    /**
+     * 错误码
+     */
+    private Integer code;
+    /**
+     * 返回数据
+     */
+    private T data;
+    /**
+     * 错误提示，用户可阅读
+     */
+    private String msg;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2AccessTokenRespDTO.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2AccessTokenRespDTO.java
new file mode 100644
index 000000000..6a5369a20
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2AccessTokenRespDTO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.ssodemo.client.dto.oauth2;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 访问令牌 Response DTO
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OAuth2AccessTokenRespDTO {
+
+    /**
+     * 访问令牌
+     */
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    /**
+     * 刷新令牌
+     */
+    @JsonProperty("refresh_token")
+    private String refreshToken;
+
+    /**
+     * 令牌类型
+     */
+    @JsonProperty("token_type")
+    private String tokenType;
+
+    /**
+     * 过期时间；单位：秒
+     */
+    @JsonProperty("expires_in")
+    private Long expiresIn;
+
+    /**
+     * 授权范围；如果多个授权范围，使用空格分隔
+     */
+    private String scope;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java
new file mode 100644
index 000000000..862bcf04b
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/oauth2/OAuth2CheckTokenRespDTO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.ssodemo.client.dto.oauth2;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 校验令牌 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OAuth2CheckTokenRespDTO {
+
+    /**
+     * 用户编号
+     */
+    @JsonProperty("user_id")
+    private Long userId;
+    /**
+     * 用户类型
+     */
+    @JsonProperty("user_type")
+    private Integer userType;
+    /**
+     * 租户编号
+     */
+    @JsonProperty("tenant_id")
+    private Long tenantId;
+
+    /**
+     * 客户端编号
+     */
+    @JsonProperty("client_id")
+    private String clientId;
+    /**
+     * 授权范围
+     */
+    private List<String> scopes;
+
+    /**
+     * 访问令牌
+     */
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    /**
+     * 过期时间
+     *
+     * 时间戳 / 1000，即单位：秒
+     */
+    private Long exp;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java
new file mode 100644
index 000000000..e81bea9eb
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserInfoRespDTO.java
@@ -0,0 +1,97 @@
+package cn.iocoder.yudao.ssodemo.client.dto.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 获得用户基本信息 Response dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserInfoRespDTO {
+
+    /**
+     * 用户编号
+     */
+    private Long id;
+
+    /**
+     * 用户账号
+     */
+    private String username;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+
+    /**
+     * 用户性别
+     */
+    private Integer sex;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 所在部门
+     */
+    private Dept dept;
+
+    /**
+     * 所属岗位数组
+     */
+    private List<Post> posts;
+
+    /**
+     * 部门
+     */
+    @Data
+    public static class Dept {
+
+        /**
+         * 部门编号
+         */
+        private Long id;
+
+        /**
+         * 部门名称
+         */
+        private String name;
+
+    }
+
+    /**
+     * 岗位
+     */
+    @Data
+    public static class Post {
+
+        /**
+         * 岗位编号
+         */
+        private Long id;
+
+        /**
+         * 岗位名称
+         */
+        private String name;
+
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java
new file mode 100644
index 000000000..e711d7311
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/dto/user/UserUpdateReqDTO.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.ssodemo.client.dto.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 更新用户基本信息 Request DTO
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserUpdateReqDTO {
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String mobile;
+
+    /**
+     * 用户性别
+     */
+    private Integer sex;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
new file mode 100644
index 000000000..6aedc3b24
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.ssodemo.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2AccessTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/auth")
+public class AuthController {
+
+    @Resource
+    private OAuth2Client oauth2Client;
+
+    /**
+     * 使用刷新令牌，获得（刷新）访问令牌
+     *
+     * @param refreshToken 刷新令牌
+     * @return 访问令牌；注意，实际项目中，最好创建对应的 ResponseVO 类，只返回必要的字段
+     */
+    @PostMapping("/refresh-token")
+    public CommonResult<OAuth2AccessTokenRespDTO> refreshToken(@RequestParam("refreshToken") String refreshToken) {
+        return oauth2Client.refreshToken(refreshToken);
+    }
+
+    /**
+     * 退出登录
+     *
+     * @param request 请求
+     * @return 成功
+     */
+    @PostMapping("/logout")
+    public CommonResult<Boolean> logout(HttpServletRequest request) {
+        String token = SecurityUtils.obtainAuthorization(request, "Authorization");
+        if (StrUtil.isNotBlank(token)) {
+            return oauth2Client.revokeToken(token);
+        }
+        // 返回成功
+        return new CommonResult<>();
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
new file mode 100644
index 000000000..819c752bc
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.ssodemo.controller;
+
+import cn.iocoder.yudao.ssodemo.client.UserClient;
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserInfoRespDTO;
+import cn.iocoder.yudao.ssodemo.client.dto.user.UserUpdateReqDTO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/user")
+public class UserController {
+
+    @Resource
+    private UserClient userClient;
+
+    /**
+     * 获得当前登录用户的基本信息
+     *
+     * @return 用户信息；注意，实际项目中，最好创建对应的 ResponseVO 类，只返回必要的字段
+     */
+    @GetMapping("/get")
+    public CommonResult<UserInfoRespDTO> getUser() {
+        return userClient.getUser();
+    }
+
+    /**
+     * 更新当前登录用户的昵称
+     *
+     * @param nickname 昵称
+     * @return 成功
+     */
+    @PutMapping("/update")
+    public CommonResult<Boolean> updateUser(@RequestParam("nickname") String nickname) {
+        UserUpdateReqDTO updateReqDTO = new UserUpdateReqDTO(nickname, null, null, null);
+        return userClient.updateUser(updateReqDTO);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
new file mode 100644
index 000000000..1d19fcfdb
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.ssodemo.framework.config;
+
+import cn.iocoder.yudao.ssodemo.framework.core.filter.TokenAuthenticationFilter;
+import cn.iocoder.yudao.ssodemo.framework.core.handler.AccessDeniedHandlerImpl;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+import javax.annotation.Resource;
+
+@Configuration
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    @Resource
+    private TokenAuthenticationFilter tokenAuthenticationFilter;
+
+    @Resource
+    private AccessDeniedHandlerImpl accessDeniedHandler;
+    @Resource
+    private AuthenticationEntryPoint authenticationEntryPoint;
+
+    @Override
+    protected void configure(HttpSecurity httpSecurity) throws Exception {
+        // 设置 URL 安全权限
+        httpSecurity.csrf().disable() // 禁用 CSRF 保护
+                .authorizeRequests()
+                // 1. 静态资源，可匿名访问
+                .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
+                // 2. 登录相关的接口，可匿名访问
+                .antMatchers("/auth/login-by-code").permitAll()
+                .antMatchers("/auth/refresh-token").permitAll()
+                .antMatchers("/auth/logout").permitAll()
+                // last. 兜底规则，必须认证
+                .and().authorizeRequests()
+                .anyRequest().authenticated();
+
+        // 设置处理器
+        httpSecurity.exceptionHandling().accessDeniedHandler(accessDeniedHandler)
+                .authenticationEntryPoint(authenticationEntryPoint);
+
+        // 添加 Token Filter
+        httpSecurity.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
new file mode 100644
index 000000000..44f3edf54
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/LoginUser.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.ssodemo.framework.core;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 登录用户信息
+ *
+ * @author 芋道源码
+ */
+@Data
+public class LoginUser {
+
+    /**
+     * 用户编号
+     */
+    private Long id;
+    /**
+     * 用户类型
+     */
+    private Integer userType;
+    /**
+     * 租户编号
+     */
+    private Long tenantId;
+    /**
+     * 授权范围
+     */
+    private List<String> scopes;
+
+    /**
+     * 访问令牌
+     */
+    private String accessToken;
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
new file mode 100644
index 000000000..70bb40eaa
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.ssodemo.framework.core.filter;
+
+import cn.iocoder.yudao.ssodemo.client.OAuth2Client;
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.client.dto.oauth2.OAuth2CheckTokenRespDTO;
+import cn.iocoder.yudao.ssodemo.framework.core.LoginUser;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.annotation.Resource;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Token 过滤器，验证 token 的有效性
+ * 验证通过后，获得 {@link LoginUser} 信息，并加入到 Spring Security 上下文
+ *
+ * @author 芋道源码
+ */
+@Component
+public class TokenAuthenticationFilter extends OncePerRequestFilter {
+
+    @Resource
+    private OAuth2Client oauth2Client;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
+        // 1. 获得访问令牌
+        String token = SecurityUtils.obtainAuthorization(request, "Authorization");
+        if (StringUtils.hasText(token)) {
+            // 2. 基于 token 构建登录用户
+            LoginUser loginUser = buildLoginUserByToken(token);
+            // 3. 设置当前用户
+            if (loginUser != null) {
+                SecurityUtils.setLoginUser(loginUser, request);
+            }
+        }
+
+        // 继续过滤链
+        filterChain.doFilter(request, response);
+    }
+
+    private LoginUser buildLoginUserByToken(String token) {
+        try {
+            CommonResult<OAuth2CheckTokenRespDTO> accessTokenResult = oauth2Client.checkToken(token);
+            OAuth2CheckTokenRespDTO accessToken = accessTokenResult.getData();
+            if (accessToken == null) {
+                return null;
+            }
+            // 构建登录用户
+            return new LoginUser().setId(accessToken.getUserId()).setUserType(accessToken.getUserType())
+                    .setTenantId(accessToken.getTenantId()).setScopes(accessToken.getScopes())
+                    .setAccessToken(accessToken.getAccessToken());
+        } catch (Exception exception) {
+            // 校验 Token 不通过时，考虑到一些接口是无需登录的，所以直接返回 null 即可
+            return null;
+        }
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
new file mode 100644
index 000000000..dccc35eb1
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.ssodemo.framework.core.handler;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.framework.core.util.SecurityUtils;
+import cn.iocoder.yudao.ssodemo.framework.core.util.ServletUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.security.web.access.ExceptionTranslationFilter;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 访问一个需要认证的 URL 资源，已经认证（登录）但是没有权限的情况下，返回 {@link GlobalErrorCodeConstants#FORBIDDEN} 错误码。
+ *
+ * 补充：Spring Security 通过 {@link ExceptionTranslationFilter#handleAccessDeniedException(HttpServletRequest, HttpServletResponse, FilterChain, AccessDeniedException)} 方法，调用当前类
+ *
+ * @author 芋道源码
+ */
+@Component
+@SuppressWarnings("JavadocReference")
+@Slf4j
+public class AccessDeniedHandlerImpl implements AccessDeniedHandler {
+
+    @Override
+    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException e)
+            throws IOException, ServletException {
+        // 打印 warn 的原因是，不定期合并 warn，看看有没恶意破坏
+        log.warn("[commence][访问 URL({}) 时，用户({}) 权限不够]", request.getRequestURI(),
+                SecurityUtils.getLoginUserId(), e);
+        // 返回 403
+        CommonResult<Object> result = new CommonResult<>();
+        result.setCode(HttpStatus.FORBIDDEN.value());
+        result.setMsg("没有该操作权限");
+        ServletUtils.writeJSON(response, result);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
new file mode 100644
index 000000000..241ff56f5
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.ssodemo.framework.core.handler;
+
+import cn.iocoder.yudao.ssodemo.client.dto.CommonResult;
+import cn.iocoder.yudao.ssodemo.framework.core.util.ServletUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.security.web.access.ExceptionTranslationFilter;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.FilterChain;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 访问一个需要认证的 URL 资源，但是此时自己尚未认证（登录）的情况下，返回 {@link GlobalErrorCodeConstants#UNAUTHORIZED} 错误码，从而使前端重定向到登录页
+ *
+ * 补充：Spring Security 通过 {@link ExceptionTranslationFilter#sendStartAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, AuthenticationException)} 方法，调用当前类
+ */
+@Component
+@Slf4j
+@SuppressWarnings("JavadocReference") // 忽略文档引用报错
+public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint {
+
+    @Override
+    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) {
+        log.debug("[commence][访问 URL({}) 时，没有登录]", request.getRequestURI(), e);
+        // 返回 401
+        CommonResult<Object> result = new CommonResult<>();
+        result.setCode(HttpStatus.UNAUTHORIZED.value());
+        result.setMsg("账号未登录");
+        ServletUtils.writeJSON(response, result);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
new file mode 100644
index 000000000..0352a4785
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.ssodemo.framework.core.util;
+
+import cn.iocoder.yudao.ssodemo.framework.core.LoginUser;
+import org.springframework.lang.Nullable;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+
+/**
+ * 安全服务工具类
+ *
+ * @author 芋道源码
+ */
+public class SecurityUtils {
+
+    public static final String AUTHORIZATION_BEARER = "Bearer";
+
+    private SecurityUtils() {}
+
+    /**
+     * 从请求中，获得认证 Token
+     *
+     * @param request 请求
+     * @param header 认证 Token 对应的 Header 名字
+     * @return 认证 Token
+     */
+    public static String obtainAuthorization(HttpServletRequest request, String header) {
+        String authorization = request.getHeader(header);
+        if (!StringUtils.hasText(authorization)) {
+            return null;
+        }
+        int index = authorization.indexOf(AUTHORIZATION_BEARER + " ");
+        if (index == -1) { // 未找到
+            return null;
+        }
+        return authorization.substring(index + 7).trim();
+    }
+
+    /**
+     * 获得当前认证信息
+     *
+     * @return 认证信息
+     */
+    public static Authentication getAuthentication() {
+        SecurityContext context = SecurityContextHolder.getContext();
+        if (context == null) {
+            return null;
+        }
+        return context.getAuthentication();
+    }
+
+    /**
+     * 获取当前用户
+     *
+     * @return 当前用户
+     */
+    @Nullable
+    public static LoginUser getLoginUser() {
+        Authentication authentication = getAuthentication();
+        if (authentication == null) {
+            return null;
+        }
+        return authentication.getPrincipal() instanceof LoginUser ? (LoginUser) authentication.getPrincipal() : null;
+    }
+
+    /**
+     * 获得当前用户的编号，从上下文中
+     *
+     * @return 用户编号
+     */
+    @Nullable
+    public static Long getLoginUserId() {
+        LoginUser loginUser = getLoginUser();
+        return loginUser != null ? loginUser.getId() : null;
+    }
+
+    /**
+     * 设置当前用户
+     *
+     * @param loginUser 登录用户
+     * @param request 请求
+     */
+    public static void setLoginUser(LoginUser loginUser, HttpServletRequest request) {
+        // 创建 Authentication，并设置到上下文
+        Authentication authentication = buildAuthentication(loginUser, request);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
+
+    private static Authentication buildAuthentication(LoginUser loginUser, HttpServletRequest request) {
+        // 创建 UsernamePasswordAuthenticationToken 对象
+        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
+                loginUser, null, Collections.emptyList());
+        authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+        return authenticationToken;
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
new file mode 100644
index 000000000..50f1836f7
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.ssodemo.framework.core.util;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import cn.hutool.json.JSONUtil;
+import org.springframework.http.MediaType;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 客户端工具类
+ *
+ * @author 芋道源码
+ */
+public class ServletUtils {
+
+    /**
+     * 返回 JSON 字符串
+     *
+     * @param response 响应
+     * @param object 对象，会序列化成 JSON 字符串
+     */
+    @SuppressWarnings("deprecation") // 必须使用 APPLICATION_JSON_UTF8_VALUE，否则会乱码
+    public static void writeJSON(HttpServletResponse response, Object object) {
+        String content = JSONUtil.toJsonStr(object);
+        ServletUtil.write(response, content, MediaType.APPLICATION_JSON_UTF8_VALUE);
+    }
+
+}
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/resources/application.yaml b/yudao-example/yudao-sso-demo-by-password/src/main/resources/application.yaml
new file mode 100644
index 000000000..a62cf97dc
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/resources/application.yaml
@@ -0,0 +1,2 @@
+server:
+  port: 18080
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/index.html b/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/index.html
new file mode 100644
index 000000000..8a5372901
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/index.html
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>首页</title>
+	<!-- jQuery：操作 dom、发起请求等 -->
+	<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.1.2/jquery.min.js" type="application/javascript"></script>
+
+	<script type="application/javascript">
+
+    /**
+     * 跳转单点登录
+     */
+    function passwordLogin() {
+      window.location.href = '/login.html'
+    }
+
+    /**
+     * 修改昵称
+     */
+    function updateNickname() {
+      const nickname = prompt("请输入新的昵称", "");
+      if (!nickname) {
+        return;
+      }
+      // 更新用户的昵称
+      const accessToken = localStorage.getItem('ACCESS-TOKEN');
+      $.ajax({
+        url: "http://127.0.0.1:18080/user/update?nickname=" + nickname,
+        method: 'PUT',
+        headers: {
+          'Authorization': 'Bearer ' + accessToken
+        },
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('更新昵称失败，原因：' + result.msg)
+            return;
+          }
+          alert('更新昵称成功！');
+          $('#nicknameSpan').html(nickname);
+        }
+      });
+    }
+
+    /**
+     * 刷新令牌
+     */
+    function refreshToken() {
+      const refreshToken = localStorage.getItem('REFRESH-TOKEN');
+      if (!refreshToken) {
+        alert("获取不到刷新令牌");
+        return;
+      }
+      $.ajax({
+        url: "http://127.0.0.1:18080/auth/refresh-token?refreshToken=" + refreshToken,
+        method: 'POST',
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('刷新访问令牌失败，原因：' + result.msg)
+            return;
+          }
+          alert('更新访问令牌成功！');
+          $('#accessTokenSpan').html(result.data.access_token);
+
+          // 设置到 localStorage 中
+          localStorage.setItem('ACCESS-TOKEN', result.data.access_token);
+          localStorage.setItem('REFRESH-TOKEN', result.data.refresh_token);
+        }
+      });
+    }
+
+    /**
+     * 登出，删除访问令牌
+     */
+    function logout() {
+      const accessToken = localStorage.getItem('ACCESS-TOKEN');
+      if (!accessToken) {
+        location.reload();
+        return;
+      }
+      $.ajax({
+        url: "http://127.0.0.1:18080/auth/logout",
+        method: 'POST',
+        headers: {
+          'Authorization': 'Bearer ' + accessToken
+        },
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('退出登录失败，原因：' + result.msg)
+            return;
+          }
+          alert('退出登录成功！');
+          // 删除 localStorage 中
+          localStorage.removeItem('ACCESS-TOKEN');
+          localStorage.removeItem('REFRESH-TOKEN');
+
+          location.reload();
+        }
+      });
+    }
+
+    $(function () {
+      const accessToken = localStorage.getItem('ACCESS-TOKEN');
+      // 情况一：未登录
+      if (!accessToken) {
+        $('#noLoginDiv').css("display", "block");
+        return;
+      }
+
+      // 情况二：已登录
+      $('#yesLoginDiv').css("display", "block");
+      $('#accessTokenSpan').html(accessToken);
+      // 获得登录用户的信息
+      $.ajax({
+        url: "http://127.0.0.1:18080/user/get",
+        method: 'GET',
+        headers: {
+          'Authorization': 'Bearer ' + accessToken
+        },
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('获得个人信息失败，原因：' + result.msg)
+            return;
+          }
+          $('#nicknameSpan').html(result.data.nickname);
+        }
+      });
+    })
+	</script>
+</head>
+<body>
+<!-- 情况一：未登录：1）跳转 ruoyi-vue-pro 的 SSO 登录页 -->
+<div id="noLoginDiv" style="display: none">
+	您未登录，点击 <a href="#" onclick="passwordLogin()">跳转 </a> 账号密码登录
+</div>
+
+<!-- 情况二：已登录：1）展示用户信息；2）刷新访问令牌；3）退出登录 -->
+<div id="yesLoginDiv" style="display: none">
+	您已登录！<button onclick="logout()">退出登录</button> <br />
+	昵称：<span id="nicknameSpan"> 加载中... </span> <button onclick="updateNickname()">修改昵称</button> <br />
+	访问令牌：<span id="accessTokenSpan"> 加载中... </span> <button onclick="refreshToken()">刷新令牌</button> <br />
+</div>
+</body>
+<style>
+    body { /** 页面居中 */
+        border-radius: 20px;
+        height: 350px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+    }
+</style>
+</html>
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html b/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html
new file mode 100644
index 000000000..4dd6a9105
--- /dev/null
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>登录</title>
+	<!-- jQuery：操作 dom、发起请求等 -->
+	<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.1.2/jquery.min.js" type="application/javascript"></script>
+
+	<script type="application/javascript">
+
+    /**
+     * 账号密码登录
+     */
+    function login() {
+      const clientId = 'yudao-sso-demo-by-password'; // 可以改写成，你的 clientId
+			const clientSecret = 'test'; // 可以改写成，你的 clientSecret
+			const grantType = 'password'; // 密码模式
+
+			// 账号 + 密码
+			const username = $('#username').val();
+			const password = $('#password').val();
+      if (username.length === 0 || password.length === 0) {
+        alert('账号或密码未输入');
+        return;
+			}
+
+      // 发起请求
+      $.ajax({
+        url: "http://127.0.0.1:48080/admin-api/system/oauth2/token?"
+          // 客户端
+					+ "client_id=" + clientId
+          + "&client_secret=" + clientSecret
+					// 密码模式的参数
+					+ "&grant_type=" + grantType
+					+ "&username=" + username
+					+ "&password=" + password
+					+ '&scope=user.read user.write',
+        method: 'POST',
+        headers: {
+					'tenant-id': '1', // 多租户编号，写死
+        },
+        success: function (result) {
+          if (result.code !== 0) {
+            alert('登录失败，原因：' + result.msg)
+            return;
+          }
+          // 设置到 localStorage 中
+          localStorage.setItem('ACCESS-TOKEN', result.data.access_token);
+          localStorage.setItem('REFRESH-TOKEN', result.data.refresh_token);
+
+          // 提示登录成功
+          alert('登录成功！点击确认，跳转回首页');
+          window.location.href = '/index.html';
+        }
+      });
+    }
+	</script>
+</head>
+<body>
+	账号：<input id="username" value="admin" /> <br />
+	密码：<input id="password" value="admin123" > <br />
+	<button style="float: right; margin-top: 5px;" onclick="login()">登录</button>
+</body>
+<style>
+    body { /** 页面居中 */
+        border-radius: 20px;
+        height: 350px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+    }
+</style>
+</html>

From bf700ab1fc79d23b882533981517217e70ef627e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 4 Oct 2022 23:11:27 +0800
Subject: [PATCH 22/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20yudao-sso-demo-by-pa?=
 =?UTF-8?q?ssword=20=E7=A4=BA=E4=BE=8B=EF=BC=8C=E5=9F=BA=E4=BA=8E=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=AE=9E=E7=8E=B0=20SSO=20?=
 =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/ssodemo/client/OAuth2Client.java    |  2 +-
 .../src/main/resources/static/login.html      | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
index b5f971989..4f6b63481 100644
--- a/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/client/OAuth2Client.java
@@ -31,7 +31,7 @@ public class OAuth2Client {
      */
     public static final Long TENANT_ID = 1L;
 
-    private static final String CLIENT_ID = "yudao-sso-demo-by-code";
+    private static final String CLIENT_ID = "yudao-sso-demo-by-password";
     private static final String CLIENT_SECRET = "test";
 
 
diff --git a/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html b/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html
index 4dd6a9105..79b866bf2 100644
--- a/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html
+++ b/yudao-example/yudao-sso-demo-by-password/src/main/resources/static/login.html
@@ -13,31 +13,31 @@
      */
     function login() {
       const clientId = 'yudao-sso-demo-by-password'; // 可以改写成，你的 clientId
-			const clientSecret = 'test'; // 可以改写成，你的 clientSecret
-			const grantType = 'password'; // 密码模式
+      const clientSecret = 'test'; // 可以改写成，你的 clientSecret
+      const grantType = 'password'; // 密码模式
 
-			// 账号 + 密码
-			const username = $('#username').val();
-			const password = $('#password').val();
+      // 账号 + 密码
+      const username = $('#username').val();
+      const password = $('#password').val();
       if (username.length === 0 || password.length === 0) {
         alert('账号或密码未输入');
         return;
-			}
+      }
 
       // 发起请求
       $.ajax({
         url: "http://127.0.0.1:48080/admin-api/system/oauth2/token?"
           // 客户端
-					+ "client_id=" + clientId
+          + "client_id=" + clientId
           + "&client_secret=" + clientSecret
-					// 密码模式的参数
-					+ "&grant_type=" + grantType
-					+ "&username=" + username
-					+ "&password=" + password
-					+ '&scope=user.read user.write',
+          // 密码模式的参数
+          + "&grant_type=" + grantType
+          + "&username=" + username
+          + "&password=" + password
+          + '&scope=user.read user.write',
         method: 'POST',
         headers: {
-					'tenant-id': '1', // 多租户编号，写死
+          'tenant-id': '1', // 多租户编号，写死
         },
         success: function (result) {
           if (result.code !== 0) {
@@ -57,9 +57,9 @@
 	</script>
 </head>
 <body>
-	账号：<input id="username" value="admin" /> <br />
-	密码：<input id="password" value="admin123" > <br />
-	<button style="float: right; margin-top: 5px;" onclick="login()">登录</button>
+账号：<input id="username" value="admin" /> <br />
+密码：<input id="password" value="admin123" > <br />
+<button style="float: right; margin-top: 5px;" onclick="login()">登录</button>
 </body>
 <style>
     body { /** 页面居中 */

From 16eaa5f407867d2f808310dcbe2957970b1f2db4 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 5 Oct 2022 17:07:54 +0800
Subject: [PATCH 23/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml                       | 2 +-
 yudao-example/yudao-sso-demo-by-code/pom.xml     | 2 +-
 yudao-example/yudao-sso-demo-by-password/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 64d97f571..d6872e2e6 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -24,7 +24,7 @@
         <!-- DB 相关 -->
         <druid.version>1.2.13-SNSAPSHOT</druid.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
-        <mybatis-plus-generator.version>3.5.3</mybatis-plus-generator.version>
+        <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version>
         <dynamic-datasource.version>3.5.2</dynamic-datasource.version>
         <redisson.version>3.17.6</redisson.version>
         <!-- Config 配置中心相关 -->
diff --git a/yudao-example/yudao-sso-demo-by-code/pom.xml b/yudao-example/yudao-sso-demo-by-code/pom.xml
index 9b003c4fb..ffb4dc610 100644
--- a/yudao-example/yudao-sso-demo-by-code/pom.xml
+++ b/yudao-example/yudao-sso-demo-by-code/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.5</version>
+            <version>5.8.8</version>
         </dependency>
 
         <dependency>
diff --git a/yudao-example/yudao-sso-demo-by-password/pom.xml b/yudao-example/yudao-sso-demo-by-password/pom.xml
index e3f0d2e77..be86d771c 100644
--- a/yudao-example/yudao-sso-demo-by-password/pom.xml
+++ b/yudao-example/yudao-sso-demo-by-password/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.5</version>
+            <version>5.8.8</version>
         </dependency>
 
         <dependency>

From 6b79788b5aebdd7fd0d3a5ec663c5a0a3778dd86 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 6 Oct 2022 20:00:38 +0800
Subject: [PATCH 24/48] =?UTF-8?q?=E5=AE=8C=E5=96=84=20oauth2.0=20=E7=9A=84?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/oauth2/OAuth2OpenController.java       | 6 +++---
 .../module/system/service/oauth2/OAuth2GrantService.java    | 2 +-
 yudao-ui-admin/src/views/sso.vue                            | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java
index 8ab096587..608f5341a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java
@@ -106,7 +106,7 @@ public class OAuth2OpenController {
                                                                      @RequestParam(value = "scope", required = false) String scope, // 密码模式
                                                                      @RequestParam(value = "refresh_token", required = false) String refreshToken) { // 刷新模式
         List<String> scopes = OAuth2Utils.buildScopes(scope);
-        // 授权类型
+        // 1.1 校验授权类型
         OAuth2GrantTypeEnum grantTypeEnum = OAuth2GrantTypeEnum.getByGranType(grantType);
         if (grantTypeEnum == null) {
             throw exception0(BAD_REQUEST.getCode(), StrUtil.format("未知授权类型({})", grantType));
@@ -115,12 +115,12 @@ public class OAuth2OpenController {
             throw exception0(BAD_REQUEST.getCode(), "Token 接口不支持 implicit 授权模式");
         }
 
-        // 校验客户端
+        // 1.2 校验客户端
         String[] clientIdAndSecret = obtainBasicAuthorization(request);
         OAuth2ClientDO client = oauth2ClientService.validOAuthClientFromCache(clientIdAndSecret[0], clientIdAndSecret[1],
                 grantType, scopes, redirectUri);
 
-        // 根据授权模式，获取访问令牌
+        // 2. 根据授权模式，获取访问令牌
         OAuth2AccessTokenDO accessTokenDO;
         switch (grantTypeEnum) {
             case AUTHORIZATION_CODE:
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantService.java
index 6b7a8f56a..fef1d5e8d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 将自身的 AdminUser 用户，授权给第三方应用，采用 OAuth2.0 的协议。
  *
  * 问题：为什么自身也作为一个第三方应用，也走这套流程呢？
- * 回复：当然可以这么做，采用 Implicit 模式。考虑到大多数开发者使用不到这个特性，OAuth2.0 毕竟有一定学习成本，所以暂时没有采取这种方式。
+ * 回复：当然可以这么做，采用 password 模式。考虑到大多数开发者使用不到这个特性，OAuth2.0 毕竟有一定学习成本，所以暂时没有采取这种方式。
  *
  * @author 芋道源码
  */
diff --git a/yudao-ui-admin/src/views/sso.vue b/yudao-ui-admin/src/views/sso.vue
index 948a37469..c1d0e1138 100644
--- a/yudao-ui-admin/src/views/sso.vue
+++ b/yudao-ui-admin/src/views/sso.vue
@@ -57,7 +57,6 @@ export default {
   name: "Login",
   data() {
     return {
-      tenantEnable: true,
       loginForm: {
         scopes: [], // 已选中的 scope 数组
       },

From a98af3edbcfb29bc58a49d9325f92cd9430d7ef1 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Sat, 8 Oct 2022 18:51:50 +0800
Subject: [PATCH 25/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7vue3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  58 ++++-----
 yudao-dependencies/pom.xml                    |  14 +--
 yudao-ui-admin-vue3/package.json              |  46 ++++----
 .../Form/src/components/useRenderSelect.tsx   |   9 +-
 yudao-ui-admin-vue3/src/config/app.ts         | 104 ----------------
 yudao-ui-admin-vue3/src/config/axios/index.ts |  11 +-
 yudao-ui-admin-vue3/src/config/locale.ts      |  32 -----
 yudao-ui-admin-vue3/src/store/index.ts        |   3 -
 yudao-ui-admin-vue3/src/store/modules/app.ts  | 111 ++++++++++++++++--
 yudao-ui-admin-vue3/src/store/modules/dict.ts |   6 +-
 .../src/store/modules/locale.ts               |  37 ++++--
 .../src/store/modules/permission.ts           |   6 +-
 .../src/store/modules/tagsView.ts             |   3 +-
 yudao-ui-admin-vue3/src/store/modules/user.ts |   3 +-
 14 files changed, 213 insertions(+), 230 deletions(-)
 delete mode 100644 yudao-ui-admin-vue3/src/config/app.ts
 delete mode 100644 yudao-ui-admin-vue3/src/config/locale.ts

diff --git a/README.md b/README.md
index 7b2080bab..fb02346c3 100644
--- a/README.md
+++ b/README.md
@@ -169,29 +169,29 @@ ps：核心功能已经实现，正在对接微信小程序中...
 
 ### 后端
 
-| 框架                                                                                         | 说明                   | 版本      | 学习指南                                                           |
-|---------------------------------------------------------------------------------------------|-----------------------|---------|----------------------------------------------------------------|
-| [Spring Boot](https://spring.io/projects/spring-boot)                                       | 应用开发框架             | 2.6.10  | [文档](https://github.com/YunaiV/SpringBoot-Labs)                |
-| [MySQL](https://www.mysql.com/cn/)                                                          | 数据库服务器             | 5.7     |                                                                |
-| [Druid](https://github.com/alibaba/druid)                                                   | JDBC 连接池、监控组件     | 1.2.11  | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
-| [MyBatis Plus](https://mp.baomidou.com/)                                                    | MyBatis 增强工具包       | 3.5.2   | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao)         |
-| [Dynamic Datasource](https://dynamic-datasource.com/)                                       | 动态数据源               | 3.5.0   | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
-| [Redis](https://redis.io/)                                                                  | key-value 数据库        | 5.0     |                                                                |
-| [Redisson](https://github.com/redisson/redisson)                                            | Redis 客户端            | 3.17.4  | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao)           |
-| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架               | 5.3.20  | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao)               |
-| [Spring Security](https://github.com/spring-projects/spring-security)                       | Spring 安全框架         | 5.6.5   | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
-| [Hibernate Validator](https://github.com/hibernate/hibernate-validator)                     | 参数校验组件             | 6.2.3   | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao)      |
-| [Flowable](https://github.com/flowable/flowable-engine)                                     | 工作流引擎               | 6.7.2   | [文档](https://doc.iocoder.cn/bpm/)                                                     |
-| [Quartz](https://github.com/quartz-scheduler)                                               | 任务调度组件             | 2.3.2   | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao)             |
-| [Knife4j](https://gitee.com/xiaoym/knife4j)                                                 | Swagger 增强 UI 实现    | 3.0.3   | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao)         |
-| [Resilience4j](https://github.com/resilience4j/resilience4j)                                | 服务保障组件             | 1.7.1   | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao)    |
-| [SkyWalking](https://skywalking.apache.org/)                                                | 分布式应用追踪系统        | 8.5.0   | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao)      |
-| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin)                       | Spring Boot 监控平台    | 2.6.7   | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao)           |
-| [Jackson](https://github.com/FasterXML/jackson)                                             | JSON 工具库             | 2.13.3  |                                                                |
-| [MapStruct](https://mapstruct.org/)                                                         | Java Bean 转换         | 1.4.1   | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao)       |
-| [Lombok](https://projectlombok.org/)                                                        | 消除冗长的 Java 代码     | 1.16.14 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao)          |
-| [JUnit](https://junit.org/junit5/)                                                          | Java 单元测试框架        | 5.8.2   | -                                                              |
-| [Mockito](https://github.com/mockito/mockito)                                               | Java Mock 框架         | 4.0.0   | -                                                              |
+| 框架                                                                                         | 说明                   | 版本               | 学习指南                                                           |
+|---------------------------------------------------------------------------------------------|-----------------------|------------------|----------------------------------------------------------------|
+| [Spring Boot](https://spring.io/projects/spring-boot)                                       | 应用开发框架             | 2.6.11           | [文档](https://github.com/YunaiV/SpringBoot-Labs)                |
+| [MySQL](https://www.mysql.com/cn/)                                                          | 数据库服务器             | 5.7              |                                                                |
+| [Druid](https://github.com/alibaba/druid)                                                   | JDBC 连接池、监控组件     | 1.2.13-SNSAPSHOT | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
+| [MyBatis Plus](https://mp.baomidou.com/)                                                    | MyBatis 增强工具包       | 3.5.2            | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao)         |
+| [Dynamic Datasource](https://dynamic-datasource.com/)                                       | 动态数据源               | 3.5.2            | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
+| [Redis](https://redis.io/)                                                                  | key-value 数据库        | 5.0              |                                                                |
+| [Redisson](https://github.com/redisson/redisson)                                            | Redis 客户端            | 3.17.7           | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao)           |
+| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架               | 5.3.20           | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao)               |
+| [Spring Security](https://github.com/spring-projects/spring-security)                       | Spring 安全框架         | 5.6.5            | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
+| [Hibernate Validator](https://github.com/hibernate/hibernate-validator)                     | 参数校验组件             | 6.2.3            | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao)      |
+| [Flowable](https://github.com/flowable/flowable-engine)                                     | 工作流引擎               | 6.7.2            | [文档](https://doc.iocoder.cn/bpm/)                                                     |
+| [Quartz](https://github.com/quartz-scheduler)                                               | 任务调度组件             | 2.3.2            | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao)             |
+| [Knife4j](https://gitee.com/xiaoym/knife4j)                                                 | Swagger 增强 UI 实现    | 3.0.3            | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao)         |
+| [Resilience4j](https://github.com/resilience4j/resilience4j)                                | 服务保障组件             | 1.7.1            | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao)    |
+| [SkyWalking](https://skywalking.apache.org/)                                                | 分布式应用追踪系统        | 8.5.0            | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao)      |
+| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin)                       | Spring Boot 监控平台    | 2.6.9            | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao)           |
+| [Jackson](https://github.com/FasterXML/jackson)                                             | JSON 工具库             | 2.13.3           |                                                                |
+| [MapStruct](https://mapstruct.org/)                                                         | Java Bean 转换         | 1.5.2.Final      | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao)       |
+| [Lombok](https://projectlombok.org/)                                                        | 消除冗长的 Java 代码     | 1.18.24          | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao)          |
+| [JUnit](https://junit.org/junit5/)                                                          | Java 单元测试框架        | 5.8.2            | -                                                              |
+| [Mockito](https://github.com/mockito/mockito)                                               | Java Mock 框架         | 4.8.0            | -                                                              |
 
 ### [管理后台 Vue2 前端](./yudao-ui-admin)
 
@@ -204,14 +204,14 @@ ps：核心功能已经实现，正在对接微信小程序中...
 
 | 框架                                                                  | 说明              | 版本     |
 |----------------------------------------------------------------------|-----------------|--------|
-| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架          | 3.2.37 |
-| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具         | 3.0.4  |
-| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus    | 2.2.12 |
-| [TypeScript](https://www.typescriptlang.org/docs/)                   | TypeScript      | 4.7.4  |
-| [pinia](https://pinia.vuejs.org/)                                    | vuex5           | 2.0.17 |
+| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架          | 3.2.40 |
+| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具         | 3.1.6  |
+| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus    | 2.2.17 |
+| [TypeScript](https://www.typescriptlang.org/docs/)                   | TypeScript      | 4.8.4  |
+| [pinia](https://pinia.vuejs.org/)                                    | vuex5           | 2.0.22 |
 | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化             | 9.2.2  |
 | [windicss](https://cn.windicss.org/)                                 | 下一代工具优先的 CSS 框架 | 3.5.6  |
-| [iconify](https://icon-sets.iconify.design/)                         | 在线图标库           | 2.2.1  |
+| [iconify](https://icon-sets.iconify.design/)                         | 在线图标库           | 3.0.0  |
 
 ### [管理后台 uni-app 跨端](./yudao-ui-admin-uniapp)
 
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index d6872e2e6..bf446c21b 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -19,14 +19,14 @@
         <spring.boot.version>2.6.11</spring.boot.version>
         <!-- Web 相关 -->
         <knife4j.version>3.0.3</knife4j.version>
-        <swagger-annotations.version>1.6.6</swagger-annotations.version>
+        <swagger-annotations.version>1.6.7</swagger-annotations.version>
         <servlet.versoin>2.5</servlet.versoin>
         <!-- DB 相关 -->
         <druid.version>1.2.13-SNSAPSHOT</druid.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version>
         <dynamic-datasource.version>3.5.2</dynamic-datasource.version>
-        <redisson.version>3.17.6</redisson.version>
+        <redisson.version>3.17.7</redisson.version>
         <!-- Config 配置中心相关 -->
         <apollo.version>1.9.2</apollo.version>
         <!-- 服务保障相关 -->
@@ -34,11 +34,11 @@
         <resilience4j.version>1.7.1</resilience4j.version>
         <!-- 监控相关 -->
         <skywalking.version>8.12.0</skywalking.version>
-        <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
-        <opentracing.version>0.31.0</opentracing.version>
+        <spring-boot-admin.version>2.6.9</spring-boot-admin.version>
+        <opentracing.version>0.33.0</opentracing.version>
         <!-- Test 测试相关 -->
         <podam.version>7.2.9.RELEASE</podam.version>
-        <jedis-mock.version>1.0.3</jedis-mock.version>
+        <jedis-mock.version>1.0.4</jedis-mock.version>
         <mockito-inline.version>4.8.0</mockito-inline.version>
         <!-- Bpm 工作流相关 -->
         <flowable.version>6.7.2</flowable.version>
@@ -56,7 +56,7 @@
         <transmittable-thread-local.version>2.14.0</transmittable-thread-local.version>
         <commons-net.version>3.8.0</commons-net.version>
         <jsch.version>0.1.55</jsch.version>
-        <tika-core.version>2.4.1</tika-core.version>
+        <tika-core.version>2.5.0</tika-core.version>
         <aj-captcha.version>1.3.0</aj-captcha.version>
         <netty-all.version>4.1.82.Final</netty-all.version>
         <!-- 三方云服务相关 -->
@@ -66,7 +66,7 @@
         <tencentcloud-sdk-java.version>3.1.561</tencentcloud-sdk-java.version>
         <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
         <justauth.version>1.4.0</justauth.version>
-        <jimureport.version>1.5.2</jimureport.version>
+        <jimureport.version>1.5.3</jimureport.version>
         <xercesImpl.version>2.12.2</xercesImpl.version>
     </properties>
 
diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index e35ea5779..1bd227f87 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-pro-vue3",
-  "version": "1.6.4.1641",
+  "version": "1.6.4.1651",
   "description": "基于vue3、element-plus、typesScript、vite3",
   "author": "xingyu",
   "private": false,
@@ -26,15 +26,15 @@
   },
   "dependencies": {
     "@iconify/iconify": "^3.0.0",
-    "@vueuse/core": "^9.2.0",
-    "@wangeditor/editor": "^5.1.18",
+    "@vueuse/core": "^9.3.0",
+    "@wangeditor/editor": "^5.1.21",
     "@wangeditor/editor-for-vue": "^5.1.10",
     "@zxcvbn-ts/core": "^2.0.5",
     "animate.css": "^4.1.1",
     "axios": "^0.27.2",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.5",
-    "echarts": "^5.3.3",
+    "echarts": "^5.4.0",
     "echarts-wordcloud": "^2.0.0",
     "element-plus": "2.2.17",
     "intro.js": "^6.0.0",
@@ -43,11 +43,10 @@
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
     "pinia": "^2.0.22",
-    "pinia-plugin-persist": "^1.0.0",
     "qrcode": "^1.5.1",
     "qs": "^6.11.0",
     "url": "^0.11.0",
-    "vue": "3.2.39",
+    "vue": "3.2.40",
     "vue-cropper": "^1.0.3",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.1.5",
@@ -57,52 +56,53 @@
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@iconify/json": "^2.1.110",
-    "@intlify/vite-plugin-vue-i18n": "^6.0.1",
+    "@iconify/json": "^2.1.119",
+    "@intlify/vite-plugin-vue-i18n": "^6.0.3",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.7.18",
+    "@types/node": "^18.8.3",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
-    "@vitejs/plugin-vue": "^3.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.39.0",
+    "@typescript-eslint/parser": "^5.39.0",
+    "@vitejs/plugin-vue": "^3.1.2",
     "@vitejs/plugin-vue-jsx": "^2.0.1",
-    "autoprefixer": "^10.4.11",
-    "eslint": "^8.23.1",
+    "autoprefixer": "^10.4.12",
+    "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-define-config": "^1.7.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.5.1",
+    "eslint-plugin-vue": "^9.6.0",
     "less": "^4.1.3",
     "lint-staged": "^13.0.3",
     "plop": "^3.1.1",
-    "postcss": "^8.4.16",
+    "postcss": "^8.4.17",
     "postcss-html": "^1.5.0",
     "postcss-less": "^6.0.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.79.0",
-    "stylelint": "^14.12.0",
+    "rollup": "^2.79.1",
+    "stylelint": "^14.13.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recommended": "^9.0.0",
     "stylelint-config-standard": "^28.0.0",
     "stylelint-order": "^5.0.0",
-    "typescript": "4.8.3",
-    "unplugin-vue-define-options": "^0.11.2",
-    "vite": "3.1.3",
+    "typescript": "4.8.4",
+    "unplugin-vue-macros": "^0.12.0",
+    "vite": "3.1.6",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-purge-icons": "^0.9.1",
-    "vite-plugin-style-import": "^2.0.0",
+    "vite-plugin-style-import": "2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-windicss": "^1.8.8",
     "vue-tsc": "^0.40.13",
-    "windicss": "^3.5.6"
+    "windicss": "^3.5.6",
+    "windicss-analysis": "^0.3.5"
   },
   "engines": {
     "node": ">= 14.18.0"
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx
index 13793f59b..43943a4ea 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx
+++ b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx
@@ -29,8 +29,15 @@ export const useRenderSelect = (slots: Slots) => {
     // 如果有别名，就取别名
     const labelAlias = item?.componentProps?.optionsAlias?.labelField
     const valueAlias = item?.componentProps?.optionsAlias?.valueField
+
+    const { label, value, ...other } = option
+
     return (
-      <ElOption label={option[labelAlias || 'label']} value={option[valueAlias || 'value']}>
+      <ElOption
+        label={labelAlias ? option[labelAlias] : label}
+        value={valueAlias ? option[valueAlias] : value}
+        {...other}
+      >
         {{
           default: () =>
             // option 插槽名规则，{field}-option
diff --git a/yudao-ui-admin-vue3/src/config/app.ts b/yudao-ui-admin-vue3/src/config/app.ts
deleted file mode 100644
index 1b6baf6c8..000000000
--- a/yudao-ui-admin-vue3/src/config/app.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { useCache } from '@/hooks/web/useCache'
-
-const { wsCache } = useCache()
-
-export type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu'
-
-export type ThemeTypes = {
-  elColorPrimary?: string
-  leftMenuBorderColor?: string
-  leftMenuBgColor?: string
-  leftMenuBgLightColor?: string
-  leftMenuBgActiveColor?: string
-  leftMenuCollapseBgActiveColor?: string
-  leftMenuTextColor?: string
-  leftMenuTextActiveColor?: string
-  logoTitleTextColor?: string
-  logoBorderColor?: string
-  topHeaderBgColor?: string
-  topHeaderTextColor?: string
-  topHeaderHoverColor?: string
-  topToolBorderColor?: string
-}
-export interface AppState {
-  breadcrumb: boolean
-  breadcrumbIcon: boolean
-  collapse: boolean
-  uniqueOpened: boolean
-  hamburger: boolean
-  screenfull: boolean
-  size: boolean
-  locale: boolean
-  tagsView: boolean
-  tagsViewIcon: boolean
-  logo: boolean
-  fixedHeader: boolean
-  greyMode: boolean
-  pageLoading: boolean
-  layout: LayoutType
-  title: string
-  userInfo: string
-  isDark: boolean
-  currentSize: ElememtPlusSize
-  sizeMap: ElememtPlusSize[]
-  mobile: boolean
-  footer: boolean
-  theme: ThemeTypes
-}
-
-export const appModules: AppState = {
-  userInfo: 'userInfo', // 登录信息存储字段-建议每个项目换一个字段，避免与其他项目冲突
-  sizeMap: ['default', 'large', 'small'],
-  mobile: false, // 是否是移动端
-  title: import.meta.env.VITE_APP_TITLE, // 标题
-  pageLoading: false, // 路由跳转loading
-
-  breadcrumb: true, // 面包屑
-  breadcrumbIcon: false, // 面包屑图标
-  collapse: false, // 折叠菜单
-  uniqueOpened: true, // 是否只保持一个子菜单的展开
-  hamburger: true, // 折叠图标
-  screenfull: true, // 全屏图标
-  size: true, // 尺寸图标
-  locale: true, // 多语言图标
-  tagsView: true, // 标签页
-  tagsViewIcon: false, // 是否显示标签图标
-  logo: true, // logo
-  fixedHeader: true, // 固定toolheader
-  footer: true, // 显示页脚
-  greyMode: false, // 是否开始灰色模式，用于特殊悼念日
-
-  layout: wsCache.get('layout') || 'topLeft', // layout布局
-  isDark: wsCache.get('isDark') || false, // 是否是暗黑模式
-  currentSize: wsCache.get('default') || 'default', // 组件尺寸
-  theme: wsCache.get('theme') || {
-    // 主题色
-    elColorPrimary: '#409eff',
-    // 左侧菜单边框颜色
-    leftMenuBorderColor: 'inherit',
-    // 左侧菜单背景颜色
-    leftMenuBgColor: '#001529',
-    // 左侧菜单浅色背景颜色
-    leftMenuBgLightColor: '#0f2438',
-    // 左侧菜单选中背景颜色
-    leftMenuBgActiveColor: 'var(--el-color-primary)',
-    // 左侧菜单收起选中背景颜色
-    leftMenuCollapseBgActiveColor: 'var(--el-color-primary)',
-    // 左侧菜单字体颜色
-    leftMenuTextColor: '#bfcbd9',
-    // 左侧菜单选中字体颜色
-    leftMenuTextActiveColor: '#fff',
-    // logo字体颜色
-    logoTitleTextColor: '#fff',
-    // logo边框颜色
-    logoBorderColor: 'inherit',
-    // 头部背景颜色
-    topHeaderBgColor: '#fff',
-    // 头部字体颜色
-    topHeaderTextColor: 'inherit',
-    // 头部悬停颜色
-    topHeaderHoverColor: '#f6f6f6',
-    // 头部边框颜色
-    topToolBorderColor: '#eee'
-  }
-}
diff --git a/yudao-ui-admin-vue3/src/config/axios/index.ts b/yudao-ui-admin-vue3/src/config/axios/index.ts
index 75d4139d1..1512be132 100644
--- a/yudao-ui-admin-vue3/src/config/axios/index.ts
+++ b/yudao-ui-admin-vue3/src/config/axios/index.ts
@@ -1,4 +1,10 @@
-import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosError } from 'axios'
+import axios, {
+  AxiosInstance,
+  AxiosRequestConfig,
+  AxiosRequestHeaders,
+  AxiosResponse,
+  AxiosError
+} from 'axios'
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
 import qs from 'qs'
 import { config } from '@/config/axios/config'
@@ -48,7 +54,8 @@ service.interceptors.request.use(
     const data = config.data || false
     if (
       config.method?.toUpperCase() === 'POST' &&
-      config!.headers!['Content-Type'] === 'application/x-www-form-urlencoded'
+      (config.headers as AxiosRequestHeaders)['Content-Type'] ===
+        'application/x-www-form-urlencoded'
     ) {
       config.data = qs.stringify(data)
     }
diff --git a/yudao-ui-admin-vue3/src/config/locale.ts b/yudao-ui-admin-vue3/src/config/locale.ts
deleted file mode 100644
index c20a3d917..000000000
--- a/yudao-ui-admin-vue3/src/config/locale.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useCache } from '@/hooks/web/useCache'
-import zhCn from 'element-plus/es/locale/lang/zh-cn'
-import en from 'element-plus/es/locale/lang/en'
-
-const { wsCache } = useCache()
-
-export const elLocaleMap = {
-  'zh-CN': zhCn,
-  en: en
-}
-export interface LocaleState {
-  currentLocale: LocaleDropdownType
-  localeMap: LocaleDropdownType[]
-}
-
-export const localeModules: LocaleState = {
-  currentLocale: {
-    lang: wsCache.get('lang') || 'zh-CN',
-    elLocale: elLocaleMap[wsCache.get('lang') || 'zh-CN']
-  },
-  // 多语言
-  localeMap: [
-    {
-      lang: 'zh-CN',
-      name: '简体中文'
-    },
-    {
-      lang: 'en',
-      name: 'English'
-    }
-  ]
-}
diff --git a/yudao-ui-admin-vue3/src/store/index.ts b/yudao-ui-admin-vue3/src/store/index.ts
index 4038068be..65964ea8f 100644
--- a/yudao-ui-admin-vue3/src/store/index.ts
+++ b/yudao-ui-admin-vue3/src/store/index.ts
@@ -1,11 +1,8 @@
 import type { App } from 'vue'
 import { createPinia } from 'pinia'
-import piniaPluginPersist from 'pinia-plugin-persist'
 
 const store = createPinia()
 
-store.use(piniaPluginPersist)
-
 export const setupStore = (app: App<Element>) => {
   app.use(store)
 }
diff --git a/yudao-ui-admin-vue3/src/store/modules/app.ts b/yudao-ui-admin-vue3/src/store/modules/app.ts
index 8f00ed189..e85805897 100644
--- a/yudao-ui-admin-vue3/src/store/modules/app.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/app.ts
@@ -1,18 +1,113 @@
 import { defineStore } from 'pinia'
 import { store } from '../index'
-import { useCache } from '@/hooks/web/useCache'
-import { appModules } from '@/config/app'
-import type { AppState, LayoutType, ThemeTypes } from '@/config/app'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
+import { useCache } from '@/hooks/web/useCache'
 
 const { wsCache } = useCache()
 
-export const useAppStore = defineStore({
-  id: 'app',
-  state: (): AppState => appModules,
-  persist: {
-    enabled: true
+type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu'
+
+type ThemeTypes = {
+  elColorPrimary?: string
+  leftMenuBorderColor?: string
+  leftMenuBgColor?: string
+  leftMenuBgLightColor?: string
+  leftMenuBgActiveColor?: string
+  leftMenuCollapseBgActiveColor?: string
+  leftMenuTextColor?: string
+  leftMenuTextActiveColor?: string
+  logoTitleTextColor?: string
+  logoBorderColor?: string
+  topHeaderBgColor?: string
+  topHeaderTextColor?: string
+  topHeaderHoverColor?: string
+  topToolBorderColor?: string
+}
+interface AppState {
+  breadcrumb: boolean
+  breadcrumbIcon: boolean
+  collapse: boolean
+  uniqueOpened: boolean
+  hamburger: boolean
+  screenfull: boolean
+  size: boolean
+  locale: boolean
+  tagsView: boolean
+  tagsViewIcon: boolean
+  logo: boolean
+  fixedHeader: boolean
+  greyMode: boolean
+  pageLoading: boolean
+  layout: LayoutType
+  title: string
+  userInfo: string
+  isDark: boolean
+  currentSize: ElememtPlusSize
+  sizeMap: ElememtPlusSize[]
+  mobile: boolean
+  footer: boolean
+  theme: ThemeTypes
+}
+
+export const useAppStore = defineStore('app', {
+  state: (): AppState => {
+    return {
+      userInfo: 'userInfo', // 登录信息存储字段-建议每个项目换一个字段，避免与其他项目冲突
+      sizeMap: ['default', 'large', 'small'],
+      mobile: false, // 是否是移动端
+      title: import.meta.env.VITE_APP_TITLE, // 标题
+      pageLoading: false, // 路由跳转loading
+
+      breadcrumb: true, // 面包屑
+      breadcrumbIcon: true, // 面包屑图标
+      collapse: false, // 折叠菜单
+      uniqueOpened: true, // 是否只保持一个子菜单的展开
+      hamburger: true, // 折叠图标
+      screenfull: true, // 全屏图标
+      size: true, // 尺寸图标
+      locale: true, // 多语言图标
+      tagsView: true, // 标签页
+      tagsViewIcon: true, // 是否显示标签图标
+      logo: true, // logo
+      fixedHeader: true, // 固定toolheader
+      footer: true, // 显示页脚
+      greyMode: false, // 是否开始灰色模式，用于特殊悼念日
+
+      layout: wsCache.get('layout') || 'classic', // layout布局
+      isDark: wsCache.get('isDark') || false, // 是否是暗黑模式
+      currentSize: wsCache.get('default') || 'default', // 组件尺寸
+      theme: wsCache.get('theme') || {
+        // 主题色
+        elColorPrimary: '#409eff',
+        // 左侧菜单边框颜色
+        leftMenuBorderColor: 'inherit',
+        // 左侧菜单背景颜色
+        leftMenuBgColor: '#001529',
+        // 左侧菜单浅色背景颜色
+        leftMenuBgLightColor: '#0f2438',
+        // 左侧菜单选中背景颜色
+        leftMenuBgActiveColor: 'var(--el-color-primary)',
+        // 左侧菜单收起选中背景颜色
+        leftMenuCollapseBgActiveColor: 'var(--el-color-primary)',
+        // 左侧菜单字体颜色
+        leftMenuTextColor: '#bfcbd9',
+        // 左侧菜单选中字体颜色
+        leftMenuTextActiveColor: '#fff',
+        // logo字体颜色
+        logoTitleTextColor: '#fff',
+        // logo边框颜色
+        logoBorderColor: 'inherit',
+        // 头部背景颜色
+        topHeaderBgColor: '#fff',
+        // 头部字体颜色
+        topHeaderTextColor: 'inherit',
+        // 头部悬停颜色
+        topHeaderHoverColor: '#f6f6f6',
+        // 头部边框颜色
+        topToolBorderColor: '#eee'
+      }
+    }
   },
   getters: {
     getBreadcrumb(): boolean {
diff --git a/yudao-ui-admin-vue3/src/store/modules/dict.ts b/yudao-ui-admin-vue3/src/store/modules/dict.ts
index 7cd1d725b..56547ff55 100644
--- a/yudao-ui-admin-vue3/src/store/modules/dict.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/dict.ts
@@ -16,14 +16,10 @@ export interface DictState {
   dictMap: Recordable
 }
 
-export const useDictStore = defineStore({
-  id: 'dict',
+export const useDictStore = defineStore('dict', {
   state: (): DictState => ({
     dictMap: {}
   }),
-  persist: {
-    enabled: true
-  },
   getters: {
     getDictMap(): Recordable {
       return this.dictMap
diff --git a/yudao-ui-admin-vue3/src/store/modules/locale.ts b/yudao-ui-admin-vue3/src/store/modules/locale.ts
index 4b7d0640c..90a0d557d 100644
--- a/yudao-ui-admin-vue3/src/store/modules/locale.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/locale.ts
@@ -1,16 +1,39 @@
 import { defineStore } from 'pinia'
 import { store } from '../index'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
+import en from 'element-plus/es/locale/lang/en'
 import { useCache } from '@/hooks/web/useCache'
-import { localeModules, elLocaleMap } from '@/config/locale'
-import type { LocaleState } from '@/config/locale'
 
 const { wsCache } = useCache()
 
-export const useLocaleStore = defineStore({
-  id: 'locales',
-  state: (): LocaleState => localeModules,
-  persist: {
-    enabled: true
+const elLocaleMap = {
+  'zh-CN': zhCn,
+  en: en
+}
+interface LocaleState {
+  currentLocale: LocaleDropdownType
+  localeMap: LocaleDropdownType[]
+}
+
+export const useLocaleStore = defineStore('locales', {
+  state: (): LocaleState => {
+    return {
+      currentLocale: {
+        lang: wsCache.get('lang') || 'zh-CN',
+        elLocale: elLocaleMap[wsCache.get('lang') || 'zh-CN']
+      },
+      // 多语言
+      localeMap: [
+        {
+          lang: 'zh-CN',
+          name: '简体中文'
+        },
+        {
+          lang: 'en',
+          name: 'English'
+        }
+      ]
+    }
   },
   getters: {
     getCurrentLocale(): LocaleDropdownType {
diff --git a/yudao-ui-admin-vue3/src/store/modules/permission.ts b/yudao-ui-admin-vue3/src/store/modules/permission.ts
index cb76ef6f5..fac022d21 100644
--- a/yudao-ui-admin-vue3/src/store/modules/permission.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/permission.ts
@@ -14,16 +14,12 @@ export interface PermissionState {
   menuTabRouters: AppRouteRecordRaw[]
 }
 
-export const usePermissionStore = defineStore({
-  id: 'permission',
+export const usePermissionStore = defineStore('permission', {
   state: (): PermissionState => ({
     routers: [],
     addRouters: [],
     menuTabRouters: []
   }),
-  persist: {
-    enabled: true
-  },
   getters: {
     getRouters(): AppRouteRecordRaw[] {
       return this.routers
diff --git a/yudao-ui-admin-vue3/src/store/modules/tagsView.ts b/yudao-ui-admin-vue3/src/store/modules/tagsView.ts
index 33da805de..e9fbf3714 100644
--- a/yudao-ui-admin-vue3/src/store/modules/tagsView.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/tagsView.ts
@@ -10,8 +10,7 @@ export interface TagsViewState {
   cachedViews: Set<string>
 }
 
-export const useTagsViewStore = defineStore({
-  id: 'tagsView',
+export const useTagsViewStore = defineStore('tagsView', {
   state: (): TagsViewState => ({
     visitedViews: [],
     cachedViews: new Set()
diff --git a/yudao-ui-admin-vue3/src/store/modules/user.ts b/yudao-ui-admin-vue3/src/store/modules/user.ts
index a8aa17de8..9165ab785 100644
--- a/yudao-ui-admin-vue3/src/store/modules/user.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/user.ts
@@ -16,8 +16,7 @@ interface UserInfoVO {
   user: UserVO
 }
 
-export const useUserStore = defineStore({
-  id: 'admin-user',
+export const useUserStore = defineStore('admin-user', {
   state: (): UserInfoVO => ({
     permissions: [],
     roles: [],

From 7a717ef80dd2da1c2f25f25391b96f71ca190fe3 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 13:59:30 +0800
Subject: [PATCH 26/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7vue3=20v1.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/package.json              |  2 +-
 .../ConfigGlobal/src/ConfigGlobal.vue         |  3 +-
 .../ContextMenu/src/ContextMenu.vue           |  1 +
 .../Descriptions/src/Descriptions.vue         |  1 +
 .../src/components/Form/index.ts              |  1 +
 .../src/components/Form/src/Form.vue          |  1 +
 .../src/components/Form/src/componentMap.ts   |  1 +
 .../Form/src/components/useRenderCheckbox.tsx |  1 +
 .../Form/src/components/useRenderRadio.tsx    |  1 +
 .../Form/src/components/useRenderSelect.tsx   |  2 +
 .../src/components/Form/src/helper.ts         |  2 +
 .../src/components/Form/src/types.ts          |  2 +
 .../src/components/Infotip/src/Infotip.vue    |  3 +-
 .../src/components/Menu/src/Menu.vue          |  2 +-
 .../src/components/Qrcode/src/Qrcode.vue      |  1 +
 .../src/components/Search/src/Search.vue      |  1 +
 .../src/components/InterfaceDisplay.vue       | 27 +++++-
 .../SizeDropdown/src/SizeDropdown.vue         |  3 +-
 .../src/components/TabMenu/src/TabMenu.vue    | 48 +++++++--
 .../src/components/TabMenu/src/helper.ts      |  8 +-
 .../src/components/Table/index.ts             |  3 +
 .../src/components/Table/src/types.ts         |  2 +
 .../src/hooks/web/useConfigGlobal.ts          |  1 +
 .../src/hooks/web/useCrudSchemas.ts           |  3 +
 yudao-ui-admin-vue3/src/hooks/web/useForm.ts  |  1 +
 yudao-ui-admin-vue3/src/hooks/web/useIcon.ts  |  1 +
 yudao-ui-admin-vue3/src/hooks/web/useTable.ts | 11 ++-
 .../src/layout/components/useRenderLayout.tsx | 19 +++-
 yudao-ui-admin-vue3/src/locales/en.ts         |  5 +-
 yudao-ui-admin-vue3/src/locales/zh-CN.ts      |  5 +-
 yudao-ui-admin-vue3/src/store/modules/app.ts  | 40 ++++----
 .../src/store/modules/locale.ts               |  1 +
 .../types/componentType/configGlobal.d.ts     |  3 -
 .../types/componentType/contextMenu.d.ts      |  7 --
 .../types/componentType/descriptions.d.ts     | 11 ---
 .../types/componentType/form.d.ts             | 97 -------------------
 .../types/componentType/icon.d.ts             |  5 -
 .../types/componentType/infotip.d.ts          |  4 -
 .../types/componentType/localeDropdown.d.ts   | 10 --
 .../types/componentType/qrcode.d.ts           |  9 --
 .../types/componentType/table.d.ts            | 36 -------
 yudao-ui-admin-vue3/types/global.d.ts         | 77 ++++++++-------
 42 files changed, 191 insertions(+), 271 deletions(-)
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/configGlobal.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/contextMenu.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/descriptions.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/form.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/icon.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/infotip.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/localeDropdown.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/qrcode.d.ts
 delete mode 100644 yudao-ui-admin-vue3/types/componentType/table.d.ts

diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 1bd227f87..6963e8da9 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-pro-vue3",
-  "version": "1.6.4.1651",
+  "version": "1.6.4.1801",
   "description": "基于vue3、element-plus、typesScript、vite3",
   "author": "xingyu",
   "private": false,
diff --git a/yudao-ui-admin-vue3/src/components/ConfigGlobal/src/ConfigGlobal.vue b/yudao-ui-admin-vue3/src/components/ConfigGlobal/src/ConfigGlobal.vue
index 985d5dfbb..da6f8c710 100644
--- a/yudao-ui-admin-vue3/src/components/ConfigGlobal/src/ConfigGlobal.vue
+++ b/yudao-ui-admin-vue3/src/components/ConfigGlobal/src/ConfigGlobal.vue
@@ -7,13 +7,14 @@ import { useWindowSize } from '@vueuse/core'
 import { useAppStore } from '@/store/modules/app'
 import { setCssVar } from '@/utils'
 import { useDesign } from '@/hooks/web/useDesign'
+import { ElementPlusSize } from '@/types/elementPlus'
 
 const { variables } = useDesign()
 
 const appStore = useAppStore()
 
 const props = defineProps({
-  size: propTypes.oneOf<ElememtPlusSize[]>(['default', 'small', 'large']).def('default')
+  size: propTypes.oneOf<ElementPlusSize[]>(['default', 'small', 'large']).def('default')
 })
 
 provide('configGlobal', props)
diff --git a/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue b/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue
index 500712154..fc86c1ddb 100644
--- a/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue
+++ b/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue
@@ -4,6 +4,7 @@ import { PropType, ref } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useDesign } from '@/hooks/web/useDesign'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
+import { contextMenuSchema } from '../../../types/contextMenu'
 
 const { getPrefixCls } = useDesign()
 
diff --git a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
index c59d74a2d..946546680 100644
--- a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
+++ b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
@@ -4,6 +4,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
 import { ref, unref, PropType, computed, useAttrs } from 'vue'
 import { useAppStore } from '@/store/modules/app'
+import { DescriptionsSchema } from '@/types/descriptions'
 
 const appStore = useAppStore()
 
diff --git a/yudao-ui-admin-vue3/src/components/Form/index.ts b/yudao-ui-admin-vue3/src/components/Form/index.ts
index a9c5efc55..484c7a22d 100644
--- a/yudao-ui-admin-vue3/src/components/Form/index.ts
+++ b/yudao-ui-admin-vue3/src/components/Form/index.ts
@@ -1,5 +1,6 @@
 import Form from './src/Form.vue'
 import { ElForm } from 'element-plus'
+import { FormSchema, FormSetPropsType } from '@/types/form'
 
 export interface FormExpose {
   setValues: (data: Recordable) => void
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/Form.vue b/yudao-ui-admin-vue3/src/components/Form/src/Form.vue
index fee05dfe6..f1d2ca64b 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/Form.vue
+++ b/yudao-ui-admin-vue3/src/components/Form/src/Form.vue
@@ -20,6 +20,7 @@ import { findIndex } from '@/utils'
 import { set } from 'lodash-es'
 import { FormProps } from './types'
 import { Icon } from '@/components/Icon'
+import { FormSchema, FormSetPropsType } from '@/types/form'
 
 const { getPrefixCls } = useDesign()
 
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/componentMap.ts b/yudao-ui-admin-vue3/src/components/Form/src/componentMap.ts
index 822f64da1..9fdb1db7a 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/componentMap.ts
+++ b/yudao-ui-admin-vue3/src/components/Form/src/componentMap.ts
@@ -20,6 +20,7 @@ import {
 } from 'element-plus'
 import { InputPassword } from '@/components/InputPassword'
 import { Editor } from '@/components/Editor'
+import { ComponentName } from '@/types/components'
 
 const componentMap: Recordable<Component, ComponentName> = {
   Radio: ElRadioGroup,
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderCheckbox.tsx b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderCheckbox.tsx
index 26ac32e12..fb3f1beeb 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderCheckbox.tsx
+++ b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderCheckbox.tsx
@@ -1,3 +1,4 @@
+import { FormSchema } from '@/types/form'
 import { ElCheckbox, ElCheckboxButton } from 'element-plus'
 import { defineComponent } from 'vue'
 
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderRadio.tsx b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderRadio.tsx
index 98a477873..a5831eb78 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderRadio.tsx
+++ b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderRadio.tsx
@@ -1,3 +1,4 @@
+import { FormSchema } from '@/types/form'
 import { ElRadio, ElRadioButton } from 'element-plus'
 import { defineComponent } from 'vue'
 
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx
index 43943a4ea..5c33d7697 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx
+++ b/yudao-ui-admin-vue3/src/components/Form/src/components/useRenderSelect.tsx
@@ -1,3 +1,5 @@
+import { FormSchema } from '@/types/form'
+import { ComponentOptions } from '@/types/components'
 import { ElOption, ElOptionGroup } from 'element-plus'
 import { getSlot } from '@/utils/tsxHelper'
 import { Slots } from 'vue'
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/helper.ts b/yudao-ui-admin-vue3/src/components/Form/src/helper.ts
index b81409c7e..15c3cc861 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/helper.ts
+++ b/yudao-ui-admin-vue3/src/components/Form/src/helper.ts
@@ -2,6 +2,8 @@ import { useI18n } from '@/hooks/web/useI18n'
 import type { Slots } from 'vue'
 import { getSlot } from '@/utils/tsxHelper'
 import { PlaceholderMoel } from './types'
+import { FormSchema } from '@/types/form'
+import { ColProps } from '@/types/components'
 
 /**
  *
diff --git a/yudao-ui-admin-vue3/src/components/Form/src/types.ts b/yudao-ui-admin-vue3/src/components/Form/src/types.ts
index fb650ba33..92a49d850 100644
--- a/yudao-ui-admin-vue3/src/components/Form/src/types.ts
+++ b/yudao-ui-admin-vue3/src/components/Form/src/types.ts
@@ -1,3 +1,5 @@
+import { FormSchema } from '@/types/form'
+
 export interface PlaceholderMoel {
   placeholder?: string
   startPlaceholder?: string
diff --git a/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue b/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue
index 588cfb818..41ac96aed 100644
--- a/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue
+++ b/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { Highlight } from '@//components/Highlight'
+import { Highlight } from '@/components/Highlight'
 import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
+import { TipSchema } from '@/types/infoTip'
 
 const { getPrefixCls } = useDesign()
 
diff --git a/yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue b/yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue
index 9fc79961e..24d7f19bb 100644
--- a/yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue
+++ b/yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue
@@ -3,11 +3,11 @@ import { computed, defineComponent, unref, PropType } from 'vue'
 import { ElMenu, ElScrollbar } from 'element-plus'
 import { useAppStore } from '@/store/modules/app'
 import { usePermissionStore } from '@/store/modules/permission'
-import type { LayoutType } from '@/config/app'
 import { useRenderMenuItem } from './components/useRenderMenuItem'
 import { useRouter } from 'vue-router'
 import { isUrl } from '@/utils/is'
 import { useDesign } from '@/hooks/web/useDesign'
+import { LayoutType } from '@/types/layout'
 
 const { getPrefixCls } = useDesign()
 
diff --git a/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue b/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue
index 718cd224f..998c2dd3d 100644
--- a/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue
+++ b/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue
@@ -6,6 +6,7 @@ import { cloneDeep } from 'lodash-es'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
 import { isString } from '@/utils/is'
+import { QrcodeLogo } from '@/types/qrcode'
 
 const props = defineProps({
   // img 或者 canvas,img不支持logo嵌套
diff --git a/yudao-ui-admin-vue3/src/components/Search/src/Search.vue b/yudao-ui-admin-vue3/src/components/Search/src/Search.vue
index 92128b2df..57427a02a 100644
--- a/yudao-ui-admin-vue3/src/components/Search/src/Search.vue
+++ b/yudao-ui-admin-vue3/src/components/Search/src/Search.vue
@@ -7,6 +7,7 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { useForm } from '@/hooks/web/useForm'
 import { findIndex } from '@/utils'
 import { cloneDeep } from 'lodash-es'
+import { FormSchema } from '@/types/form'
 
 const { t } = useI18n()
 
diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue b/yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue
index 8112e9adc..8e7d7799b 100644
--- a/yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue
+++ b/yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ElSwitch } from 'element-plus'
+import { ElSwitch, ElMessage } from 'element-plus'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useAppStore } from '@/store/modules/app'
 import { computed, ref, watch } from 'vue'
@@ -107,6 +107,21 @@ const greyModeChange = (show: boolean) => {
   appStore.setGreyMode(show)
 }
 
+// 动态路由
+const dynamicRouter = ref(appStore.getDynamicRouter)
+
+const dynamicRouterChange = (show: boolean) => {
+  ElMessage.info(t('setting.reExperienced'))
+  appStore.setDynamicRouter(show)
+}
+
+// 固定菜单
+const fixedMenu = ref(appStore.getFixedMenu)
+
+const fixedMenuChange = (show: boolean) => {
+  appStore.setFixedMenu(show)
+}
+
 const layout = computed(() => appStore.getLayout)
 
 watch(
@@ -185,5 +200,15 @@ watch(
       <span class="text-14px">{{ t('setting.greyMode') }}</span>
       <ElSwitch v-model="greyMode" @change="greyModeChange" />
     </div>
+
+    <div class="flex justify-between items-center">
+      <span class="text-14px">{{ t('setting.dynamicRouter') }}</span>
+      <ElSwitch v-model="dynamicRouter" @change="dynamicRouterChange" />
+    </div>
+
+    <div class="flex justify-between items-center">
+      <span class="text-14px">{{ t('setting.fixedMenu') }}</span>
+      <ElSwitch v-model="fixedMenu" @change="fixedMenuChange" />
+    </div>
   </div>
 </template>
diff --git a/yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue b/yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue
index 773ad620a..cb8d9f849 100644
--- a/yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue
+++ b/yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue
@@ -5,6 +5,7 @@ import { useAppStore } from '@/store/modules/app'
 import { useI18n } from '@/hooks/web/useI18n'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
+import { ElementPlusSize } from '@/types/elementPlus'
 
 const { getPrefixCls } = useDesign()
 
@@ -20,7 +21,7 @@ const appStore = useAppStore()
 
 const sizeMap = computed(() => appStore.sizeMap)
 
-const setCurrentSize = (size: ElememtPlusSize) => {
+const setCurrentSize = (size: ElementPlusSize) => {
   appStore.setCurrentSize(size)
 }
 </script>
diff --git a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue b/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
index 061421b96..0625e21c5 100644
--- a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
+++ b/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { usePermissionStore } from '@/store/modules/permission'
 import { useAppStore } from '@/store/modules/app'
-import { computed, unref, defineComponent, watch, ref } from 'vue'
+import { computed, unref, defineComponent, watch, ref, onMounted } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { ElScrollbar } from 'element-plus'
 import { Icon } from '@/components/Icon'
@@ -28,6 +28,8 @@ export default defineComponent({
 
     const collapse = computed(() => appStore.getCollapse)
 
+    const fixedMenu = computed(() => appStore.getFixedMenu)
+
     const permissionStore = usePermissionStore()
 
     const routers = computed(() => permissionStore.getRouters)
@@ -38,6 +40,27 @@ export default defineComponent({
       appStore.setCollapse(!unref(collapse))
     }
 
+    onMounted(() => {
+      if (unref(fixedMenu)) {
+        const path = `/${unref(currentRoute).path.split('/')[1]}`
+        const children = unref(tabRouters).find(
+          (v) =>
+            (v.meta?.alwaysShow || (v?.children?.length && v?.children?.length > 1)) &&
+            v.path === path
+        )?.children
+
+        tabActive.value = path
+        if (children) {
+          permissionStore.setMenuTabRouters(
+            cloneDeep(children).map((v) => {
+              v.path = pathResolve(unref(tabActive), v.path)
+              return v
+            })
+          )
+        }
+      }
+    })
+
     watch(
       () => routers.value,
       (routers: AppRouteRecordRaw[]) => {
@@ -55,6 +78,9 @@ export default defineComponent({
     watch(
       () => collapse.value,
       (collapse: boolean) => {
+        if (unref(fixedMenu)) {
+          return
+        }
         if (!collapse) {
           setTimeout(() => {
             showTitle.value = !collapse
@@ -66,7 +92,7 @@ export default defineComponent({
     )
 
     // 是否显示菜单
-    const showMenu = ref(false)
+    const showMenu = ref(unref(fixedMenu) ? true : false)
 
     // tab高亮
     const tabActive = ref('')
@@ -77,9 +103,13 @@ export default defineComponent({
         window.open(item.path)
         return
       }
+      const newPath = item.children ? item.path : item.path.split('/')[0]
+      const oldPath = unref(tabActive)
       tabActive.value = item.children ? item.path : item.path.split('/')[0]
       if (item.children) {
-        showMenu.value = !unref(showMenu)
+        if (newPath === oldPath || !unref(showMenu)) {
+          showMenu.value = unref(fixedMenu) ? true : !unref(showMenu)
+        }
         if (unref(showMenu)) {
           permissionStore.setMenuTabRouters(
             cloneDeep(item.children).map((v) => {
@@ -96,7 +126,7 @@ export default defineComponent({
     }
 
     // 设置高亮
-    const isActice = (currentPath: string) => {
+    const isActive = (currentPath: string) => {
       const { path } = unref(currentRoute)
       if (tabPathMap[currentPath].includes(path)) {
         return true
@@ -105,7 +135,7 @@ export default defineComponent({
     }
 
     const mouseleave = () => {
-      if (!unref(showMenu)) return
+      if (!unref(showMenu) || unref(fixedMenu)) return
       showMenu.value = false
     }
 
@@ -114,7 +144,7 @@ export default defineComponent({
         id={`${variables.namespace}-menu`}
         class={[
           prefixCls,
-          'relative bg-[var(--left-menu-bg-color)] top-1px z-999',
+          'relative bg-[var(--left-menu-bg-color)] top-1px z-99999',
           {
             'w-[var(--tab-menu-max-width)]': !unref(collapse),
             'w-[var(--tab-menu-min-width)]': unref(collapse)
@@ -140,7 +170,7 @@ export default defineComponent({
                       `${prefixCls}__item`,
                       'text-center text-12px relative py-12px cursor-pointer',
                       {
-                        'is-active': isActice(v.path)
+                        'is-active': isActive(v.path)
                       }
                     ]}
                     onClick={() => {
@@ -174,8 +204,8 @@ export default defineComponent({
             {
               '!left-[var(--tab-menu-min-width)]': unref(collapse),
               '!left-[var(--tab-menu-max-width)]': !unref(collapse),
-              '!w-[calc(var(--left-menu-max-width)+1px)]': unref(showMenu),
-              '!w-0': !unref(showMenu)
+              '!w-[calc(var(--left-menu-max-width)+1px)]': unref(showMenu) || unref(fixedMenu),
+              '!w-0': !unref(showMenu) && !unref(fixedMenu)
             }
           ]}
           style="transition: width var(--transition-time-02), left var(--transition-time-02);"
diff --git a/yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts b/yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts
index 793f1325b..221313379 100644
--- a/yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts
+++ b/yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts
@@ -28,9 +28,9 @@ export const filterMenusPath = (
     let data: Nullable<AppRouteRecordRaw> = null
     const meta = (v.meta ?? {}) as RouteMeta
     if (!meta.hidden || meta.canTo) {
-      const allParentPaht = getAllParentPath<AppRouteRecordRaw>(allRoutes, v.path)
+      const allParentPath = getAllParentPath<AppRouteRecordRaw>(allRoutes, v.path)
 
-      const fullPath = isUrl(v.path) ? v.path : allParentPaht.join('/')
+      const fullPath = isUrl(v.path) ? v.path : allParentPath.join('/')
 
       data = cloneDeep(v)
       data.path = fullPath
@@ -42,8 +42,8 @@ export const filterMenusPath = (
         res.push(data)
       }
 
-      if (allParentPaht.length && Reflect.has(tabPathMap, allParentPaht[0])) {
-        tabPathMap[allParentPaht[0]].push(fullPath)
+      if (allParentPath.length && Reflect.has(tabPathMap, allParentPath[0])) {
+        tabPathMap[allParentPath[0]].push(fullPath)
       }
     }
   }
diff --git a/yudao-ui-admin-vue3/src/components/Table/index.ts b/yudao-ui-admin-vue3/src/components/Table/index.ts
index 59847e934..689f64a88 100644
--- a/yudao-ui-admin-vue3/src/components/Table/index.ts
+++ b/yudao-ui-admin-vue3/src/components/Table/index.ts
@@ -1,9 +1,12 @@
 import Table from './src/Table.vue'
+import { ElTable } from 'element-plus'
+import { TableSetPropsType } from '@/types/table'
 
 export interface TableExpose {
   setProps: (props: Recordable) => void
   setColumn: (columnProps: TableSetPropsType[]) => void
   selections: Recordable[]
+  elTableRef: ComponentRef<typeof ElTable>
 }
 
 export { Table }
diff --git a/yudao-ui-admin-vue3/src/components/Table/src/types.ts b/yudao-ui-admin-vue3/src/components/Table/src/types.ts
index 58ecd83c8..1c7ff7658 100644
--- a/yudao-ui-admin-vue3/src/components/Table/src/types.ts
+++ b/yudao-ui-admin-vue3/src/components/Table/src/types.ts
@@ -1,3 +1,5 @@
+import { Pagination, TableColumn } from '@/types/table'
+
 export type TableProps = {
   pageSize?: number
   currentPage?: number
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useConfigGlobal.ts b/yudao-ui-admin-vue3/src/hooks/web/useConfigGlobal.ts
index 59007d327..bde9d7881 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useConfigGlobal.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useConfigGlobal.ts
@@ -1,3 +1,4 @@
+import { ConfigGlobalTypes } from '@/types/configGlobal'
 import { inject } from 'vue'
 
 export const useConfigGlobal = () => {
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
index b75c7db88..5417dc7ab 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
@@ -1,6 +1,9 @@
 import { reactive } from 'vue'
 import { eachTree, treeMap, filter } from '@/utils/tree'
 import { getIntDictOptions } from '@/utils/dict'
+import { FormSchema } from '@/types/form'
+import { TableColumn } from '@/types/table'
+import { DescriptionsSchema } from '@/types/descriptions'
 
 export type CrudSchema = Omit<TableColumn, 'children'> & {
   search?: CrudSearchParams
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useForm.ts b/yudao-ui-admin-vue3/src/hooks/web/useForm.ts
index 21d2186f5..0d4f68871 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useForm.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useForm.ts
@@ -2,6 +2,7 @@ import type { Form, FormExpose } from '@/components/Form'
 import type { ElForm } from 'element-plus'
 import { ref, unref, nextTick } from 'vue'
 import type { FormProps } from '@/components/Form/src/types'
+import { FormSchema, FormSetPropsType } from '@/types/form'
 
 export const useForm = (props?: FormProps) => {
   // From实例
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useIcon.ts b/yudao-ui-admin-vue3/src/hooks/web/useIcon.ts
index b9a5ccb6a..35002049f 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useIcon.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useIcon.ts
@@ -1,6 +1,7 @@
 import { h } from 'vue'
 import type { VNode } from 'vue'
 import { Icon } from '@/components/Icon'
+import { IconTypes } from '@/types/icon'
 
 export const useIcon = (props: IconTypes): VNode => {
   return h(Icon, props)
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useTable.ts b/yudao-ui-admin-vue3/src/hooks/web/useTable.ts
index 7fdd04fa4..30c90bad3 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useTable.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useTable.ts
@@ -4,6 +4,7 @@ import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { computed, nextTick, reactive, ref, unref, watch } from 'vue'
 import type { TableProps } from '@/components/Table/src/types'
 import { useI18n } from '@/hooks/web/useI18n'
+import { TableSetPropsType } from '@/types/table'
 
 const { t } = useI18n()
 interface ResponseType<T = any> {
@@ -150,13 +151,17 @@ export const useTable = <T = any>(config?: UseTableConfig<T>) => {
     },
     // 与Search组件结合
     setSearchParams: (data: Recordable) => {
-      tableObject.currentPage = 1
       tableObject.params = Object.assign(tableObject.params, {
         pageSize: tableObject.pageSize,
-        pageNo: tableObject.currentPage,
+        pageNo: 1,
         ...data
       })
-      methods.getList()
+      // 页码不等于1时更新页码重新获取数据，页码等于1时重新获取数据
+      if (tableObject.currentPage !== 1) {
+        tableObject.currentPage = 1
+      } else {
+        methods.getList()
+      }
     },
     // 删除数据
     delList: async (
diff --git a/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx b/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
index 9e5f74400..40134a667 100644
--- a/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
+++ b/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
@@ -32,6 +32,9 @@ const fixedHeader = computed(() => appStore.getFixedHeader)
 // 是否是移动端
 const mobile = computed(() => appStore.getMobile)
 
+// 固定菜单
+const fixedMenu = computed(() => appStore.getFixedMenu)
+
 export const useRenderLayout = () => {
   const renderClassic = () => {
     return (
@@ -213,9 +216,13 @@ export const useRenderLayout = () => {
               'h-[100%]',
               {
                 'w-[calc(100%-var(--tab-menu-min-width))] left-[var(--tab-menu-min-width)]':
-                  collapse.value,
+                  collapse.value && !fixedMenu.value,
                 'w-[calc(100%-var(--tab-menu-max-width))] left-[var(--tab-menu-max-width)]':
-                  !collapse.value
+                  !collapse.value && !fixedMenu.value,
+                'w-[calc(100%-var(--tab-menu-min-width)-var(--left-menu-max-width))] ml-[var(--left-menu-max-width)]':
+                  collapse.value && fixedMenu.value,
+                'w-[calc(100%-var(--tab-menu-max-width)-var(--left-menu-max-width))] ml-[var(--left-menu-max-width)]':
+                  !collapse.value && fixedMenu.value
               }
             ]}
             style="transition: all var(--transition-time-02);"
@@ -239,7 +246,13 @@ export const useRenderLayout = () => {
                       'w-[calc(100%-var(--tab-menu-min-width))] left-[var(--tab-menu-min-width)] mt-[var(--logo-height)]':
                         collapse.value && fixedHeader.value,
                       'w-[calc(100%-var(--tab-menu-max-width))] left-[var(--tab-menu-max-width)] mt-[var(--logo-height)]':
-                        !collapse.value && fixedHeader.value
+                        !collapse.value && fixedHeader.value,
+                      '!fixed top-0 left-[var(--tab-menu-min-width)+var(--left-menu-max-width)] z-10':
+                        fixedHeader.value && fixedMenu.value,
+                      'w-[calc(100%-var(--tab-menu-min-width)-var(--left-menu-max-width))] left-[var(--tab-menu-min-width)+var(--left-menu-max-width)] mt-[var(--logo-height)]':
+                        collapse.value && fixedHeader.value && fixedMenu.value,
+                      'w-[calc(100%-var(--tab-menu-max-width)-var(--left-menu-max-width))] left-[var(--tab-menu-max-width)+var(--left-menu-max-width)] mt-[var(--logo-height)]':
+                        !collapse.value && fixedHeader.value && fixedMenu.value
                     }
                   ]}
                   style="transition: width var(--transition-time-02), left var(--transition-time-02);"
diff --git a/yudao-ui-admin-vue3/src/locales/en.ts b/yudao-ui-admin-vue3/src/locales/en.ts
index a7463a4f3..df1a5a611 100644
--- a/yudao-ui-admin-vue3/src/locales/en.ts
+++ b/yudao-ui-admin-vue3/src/locales/en.ts
@@ -91,7 +91,10 @@ export default {
     copyFailed: 'Copy failed',
     footer: 'Footer',
     uniqueOpened: 'Unique opened',
-    tagsViewIcon: 'Tags view icon'
+    tagsViewIcon: 'Tags view icon',
+    dynamicRouter: 'Dynamic router',
+    reExperienced: 'Please exit the login experience again',
+    fixedMenu: 'Fixed menu'
   },
   size: {
     default: 'Default',
diff --git a/yudao-ui-admin-vue3/src/locales/zh-CN.ts b/yudao-ui-admin-vue3/src/locales/zh-CN.ts
index 57a684c00..77ee81554 100644
--- a/yudao-ui-admin-vue3/src/locales/zh-CN.ts
+++ b/yudao-ui-admin-vue3/src/locales/zh-CN.ts
@@ -91,7 +91,10 @@ export default {
     copyFailed: '拷贝失败',
     footer: '页脚',
     uniqueOpened: '菜单手风琴',
-    tagsViewIcon: '标签页图标'
+    tagsViewIcon: '标签页图标',
+    dynamicRouter: '动态路由',
+    reExperienced: '请重新退出登录体验',
+    fixedMenu: '固定菜单'
   },
   size: {
     default: '默认',
diff --git a/yudao-ui-admin-vue3/src/store/modules/app.ts b/yudao-ui-admin-vue3/src/store/modules/app.ts
index e85805897..ac06dfaaf 100644
--- a/yudao-ui-admin-vue3/src/store/modules/app.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/app.ts
@@ -3,27 +3,12 @@ import { store } from '../index'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
 import { useCache } from '@/hooks/web/useCache'
+import { ElementPlusSize } from '@/types/elementPlus'
+import { LayoutType } from '@/types/layout'
+import { ThemeTypes } from '@/types/theme'
 
 const { wsCache } = useCache()
 
-type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu'
-
-type ThemeTypes = {
-  elColorPrimary?: string
-  leftMenuBorderColor?: string
-  leftMenuBgColor?: string
-  leftMenuBgLightColor?: string
-  leftMenuBgActiveColor?: string
-  leftMenuCollapseBgActiveColor?: string
-  leftMenuTextColor?: string
-  leftMenuTextActiveColor?: string
-  logoTitleTextColor?: string
-  logoBorderColor?: string
-  topHeaderBgColor?: string
-  topHeaderTextColor?: string
-  topHeaderHoverColor?: string
-  topToolBorderColor?: string
-}
 interface AppState {
   breadcrumb: boolean
   breadcrumbIcon: boolean
@@ -43,11 +28,12 @@ interface AppState {
   title: string
   userInfo: string
   isDark: boolean
-  currentSize: ElememtPlusSize
-  sizeMap: ElememtPlusSize[]
+  currentSize: ElementPlusSize
+  sizeMap: ElementPlusSize[]
   mobile: boolean
   footer: boolean
   theme: ThemeTypes
+  fixedMenu: boolean
 }
 
 export const useAppStore = defineStore('app', {
@@ -73,6 +59,7 @@ export const useAppStore = defineStore('app', {
       fixedHeader: true, // 固定toolheader
       footer: true, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
+      fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
 
       layout: wsCache.get('layout') || 'classic', // layout布局
       isDark: wsCache.get('isDark') || false, // 是否是暗黑模式
@@ -149,6 +136,9 @@ export const useAppStore = defineStore('app', {
     getGreyMode(): boolean {
       return this.greyMode
     },
+    getFixedMenu(): boolean {
+      return this.fixedMenu
+    },
     getPageLoading(): boolean {
       return this.pageLoading
     },
@@ -164,10 +154,10 @@ export const useAppStore = defineStore('app', {
     getIsDark(): boolean {
       return this.isDark
     },
-    getCurrentSize(): ElememtPlusSize {
+    getCurrentSize(): ElementPlusSize {
       return this.currentSize
     },
-    getSizeMap(): ElememtPlusSize[] {
+    getSizeMap(): ElementPlusSize[] {
       return this.sizeMap
     },
     getMobile(): boolean {
@@ -220,6 +210,10 @@ export const useAppStore = defineStore('app', {
     setGreyMode(greyMode: boolean) {
       this.greyMode = greyMode
     },
+    setFixedMenu(fixedMenu: boolean) {
+      wsCache.set('fixedMenu', fixedMenu)
+      this.fixedMenu = fixedMenu
+    },
     setPageLoading(pageLoading: boolean) {
       this.pageLoading = pageLoading
     },
@@ -245,7 +239,7 @@ export const useAppStore = defineStore('app', {
       }
       wsCache.set('isDark', this.isDark)
     },
-    setCurrentSize(currentSize: ElememtPlusSize) {
+    setCurrentSize(currentSize: ElementPlusSize) {
       this.currentSize = currentSize
       wsCache.set('currentSize', this.currentSize)
     },
diff --git a/yudao-ui-admin-vue3/src/store/modules/locale.ts b/yudao-ui-admin-vue3/src/store/modules/locale.ts
index 90a0d557d..1f7912f0b 100644
--- a/yudao-ui-admin-vue3/src/store/modules/locale.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/locale.ts
@@ -3,6 +3,7 @@ import { store } from '../index'
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import en from 'element-plus/es/locale/lang/en'
 import { useCache } from '@/hooks/web/useCache'
+import { LocaleDropdownType } from '@/types/localeDropdown'
 
 const { wsCache } = useCache()
 
diff --git a/yudao-ui-admin-vue3/types/componentType/configGlobal.d.ts b/yudao-ui-admin-vue3/types/componentType/configGlobal.d.ts
deleted file mode 100644
index 6a0bb1a73..000000000
--- a/yudao-ui-admin-vue3/types/componentType/configGlobal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare interface ConfigGlobalTypes {
-  size?: ElememtPlusSize
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/contextMenu.d.ts b/yudao-ui-admin-vue3/types/componentType/contextMenu.d.ts
deleted file mode 100644
index 3f9cac382..000000000
--- a/yudao-ui-admin-vue3/types/componentType/contextMenu.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare type contextMenuSchema = {
-  disabled?: boolean
-  divided?: boolean
-  icon?: string
-  label: string
-  command?: (item: contextMenuSchema) => viod
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/descriptions.d.ts b/yudao-ui-admin-vue3/types/componentType/descriptions.d.ts
deleted file mode 100644
index c695706b1..000000000
--- a/yudao-ui-admin-vue3/types/componentType/descriptions.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-declare interface DescriptionsSchema {
-  span?: number // 占多少分
-  field: string // 字段名
-  label?: string // label名
-  width?: string | number
-  minWidth?: string | number
-  align?: 'left' | 'center' | 'right'
-  labelAlign?: 'left' | 'center' | 'right'
-  className?: string
-  labelClassName?: string
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/form.d.ts b/yudao-ui-admin-vue3/types/componentType/form.d.ts
deleted file mode 100644
index 57d55a678..000000000
--- a/yudao-ui-admin-vue3/types/componentType/form.d.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import type { CSSProperties } from 'vue'
-
-declare global {
-  declare type ComponentName =
-    | 'Radio'
-    | 'RadioButton'
-    | 'Checkbox'
-    | 'CheckboxButton'
-    | 'Input'
-    | 'Autocomplete'
-    | 'InputNumber'
-    | 'Select'
-    | 'Cascader'
-    | 'Switch'
-    | 'Slider'
-    | 'TimePicker'
-    | 'DatePicker'
-    | 'Rate'
-    | 'ColorPicker'
-    | 'Transfer'
-    | 'Divider'
-    | 'TimeSelect'
-    | 'SelectV2'
-    | 'InputPassword'
-    | 'Editor'
-
-  declare type ColProps = {
-    span?: number
-    xs?: number
-    sm?: number
-    md?: number
-    lg?: number
-    xl?: number
-    tag?: string
-  }
-
-  declare type FormValueType = string | number | string[] | number[] | boolean | undefined | null
-
-  declare type FormItemProps = {
-    labelWidth?: string | number
-    required?: boolean
-    rules?: Recordable
-    error?: string
-    showMessage?: boolean
-    inlineMessage?: boolean
-    style?: CSSProperties
-  }
-
-  declare type ComponentOptions = {
-    label?: string
-    value?: FormValueType
-    disabled?: boolean
-    key?: string | number
-    children?: ComponentOptions[]
-    options?: ComponentOptions[]
-  } & Recordable
-
-  declare type ComponentOptionsAlias = {
-    labelField?: string
-    valueField?: string
-  }
-
-  declare type ComponentProps = {
-    optionsAlias?: ComponentOptionsAlias
-    options?: ComponentOptions[]
-    optionsSlot?: boolean
-  } & Recordable
-
-  declare type FormSchema = {
-    // 唯一值
-    field: string
-    // 标题
-    label?: string
-    // 提示
-    labelMessage?: string
-    // col组件属性
-    colProps?: ColProps
-    // 表单组件属性，slots对应的是表单组件的插槽，规则：${field}-xxx，具体可以查看element-plus文档
-    componentProps?: { slots?: Recordable } & ComponentProps
-    // formItem组件属性
-    formItemProps?: FormItemProps
-    // 渲染的组件
-    component?: ComponentName
-    // 初始值
-    value?: FormValueType
-    // 是否隐藏
-    hidden?: boolean
-    // 远程加载下拉项
-    api?: <T = any>() => Promise<T>
-  }
-
-  declare type FormSetPropsType = {
-    field: string
-    path: string
-    value: any
-  }
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/icon.d.ts b/yudao-ui-admin-vue3/types/componentType/icon.d.ts
deleted file mode 100644
index cc24543e4..000000000
--- a/yudao-ui-admin-vue3/types/componentType/icon.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare interface IconTypes {
-  size?: number
-  color?: string
-  icon: string
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/infotip.d.ts b/yudao-ui-admin-vue3/types/componentType/infotip.d.ts
deleted file mode 100644
index 9c2338a3e..000000000
--- a/yudao-ui-admin-vue3/types/componentType/infotip.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare interface TipSchema {
-  label: string
-  keys?: string[]
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/localeDropdown.d.ts b/yudao-ui-admin-vue3/types/componentType/localeDropdown.d.ts
deleted file mode 100644
index bbe851000..000000000
--- a/yudao-ui-admin-vue3/types/componentType/localeDropdown.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-declare interface Language {
-  el: Recordable
-  name: string
-}
-
-declare interface LocaleDropdownType {
-  lang: LocaleType
-  name?: string
-  elLocale?: Language
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/qrcode.d.ts b/yudao-ui-admin-vue3/types/componentType/qrcode.d.ts
deleted file mode 100644
index 369334fd0..000000000
--- a/yudao-ui-admin-vue3/types/componentType/qrcode.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-declare interface QrcodeLogo {
-  src?: string
-  logoSize?: number
-  bgColor?: string
-  borderSize?: number
-  crossOrigin?: string
-  borderRadius?: number
-  logoRadius?: number
-}
diff --git a/yudao-ui-admin-vue3/types/componentType/table.d.ts b/yudao-ui-admin-vue3/types/componentType/table.d.ts
deleted file mode 100644
index fe2100c14..000000000
--- a/yudao-ui-admin-vue3/types/componentType/table.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-declare type TableColumn = {
-  field: string
-  label?: string
-  children?: TableColumn[]
-} & Recordable
-
-declare type TableSlotDefault = {
-  row: Recordable
-  column: TableColumn
-  $index: number
-} & Recordable
-
-declare interface Pagination {
-  small?: boolean
-  background?: boolean
-  pageSize?: number
-  defaultPageSize?: number
-  total?: number
-  pageCount?: number
-  pagerCount?: number
-  currentPage?: number
-  defaultCurrentPage?: number
-  layout?: string
-  pageSizes?: number[]
-  popperClass?: string
-  prevText?: string
-  nextText?: string
-  disabled?: boolean
-  hideOnSinglePage?: boolean
-}
-
-declare interface TableSetPropsType {
-  field: string
-  path: string
-  value: any
-}
diff --git a/yudao-ui-admin-vue3/types/global.d.ts b/yudao-ui-admin-vue3/types/global.d.ts
index a14f2618d..7314557c5 100644
--- a/yudao-ui-admin-vue3/types/global.d.ts
+++ b/yudao-ui-admin-vue3/types/global.d.ts
@@ -1,40 +1,39 @@
-declare interface Fn<T = any> {
-  (...arg: T[]): T
-}
-
-declare type Nullable<T> = T | null
-
-declare type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T>
-
-declare type ElememtPlusSize = 'default' | 'small' | 'large'
-
-declare type ElementPlusInfoType = 'success' | 'info' | 'warning' | 'danger'
-
-declare type Recordable<T = any, K = string> = Record<K extends null | undefined ? string : K, T>
-
-declare type ComponentRef<T> = InstanceType<T>
-
-declare type LocaleType = 'zh-CN' | 'en'
-
-declare type AxiosHeaders =
-  | 'application/json'
-  | 'application/x-www-form-urlencoded'
-  | 'multipart/form-data'
-
-declare type AxiosMethod = 'GET' | 'POST' | 'DELETE' | 'PUT'
-
-declare type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'
-
-declare interface AxiosConfig {
-  params?: any
-  data?: any
-  url?: string
-  method?: AxiosMethod
-  headersType?: string
-  responseType?: AxiosResponseType
-}
-
-declare interface IResponse<T = any> {
-  code?: number
-  data: T extends any ? T : T & any
+import type { CSSProperties } from 'vue'
+declare global {
+  declare interface Fn<T = any> {
+    (...arg: T[]): T
+  }
+
+  declare type Nullable<T> = T | null
+
+  declare type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T>
+
+  declare type Recordable<T = any, K = string> = Record<K extends null | undefined ? string : K, T>
+
+  declare type ComponentRef<T> = InstanceType<T>
+
+  declare type LocaleType = 'zh-CN' | 'en'
+
+  declare type AxiosHeaders =
+    | 'application/json'
+    | 'application/x-www-form-urlencoded'
+    | 'multipart/form-data'
+
+  declare type AxiosMethod = 'get' | 'post' | 'delete' | 'put'
+
+  declare type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'
+
+  declare interface AxiosConfig {
+    params?: any
+    data?: any
+    url?: string
+    method?: AxiosMethod
+    headersType?: string
+    responseType?: AxiosResponseType
+  }
+
+  declare interface IResponse<T = any> {
+    code: string
+    data: T extends any ? T : T & any
+  }
 }

From 814f4211b0d780a55ad0c4a6f802dbc133cbb0d0 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 14:06:30 +0800
Subject: [PATCH 27/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=20vue3=201.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/package.json              | 12 ++---
 yudao-ui-admin-vue3/src/types/components.d.ts | 52 +++++++++++++++++++
 .../src/types/configGlobal.d.ts               |  4 ++
 .../src/types/contextMenu.d.ts                |  7 +++
 .../src/types/descriptions.d.ts               | 11 ++++
 .../src/types/elementPlus.d.ts                |  3 ++
 yudao-ui-admin-vue3/src/types/form.d.ts       | 45 ++++++++++++++++
 yudao-ui-admin-vue3/src/types/icon.d.ts       |  5 ++
 yudao-ui-admin-vue3/src/types/infoTip.d.ts    |  4 ++
 yudao-ui-admin-vue3/src/types/layout.d.ts     |  1 +
 .../src/types/localeDropdown.d.ts             | 10 ++++
 yudao-ui-admin-vue3/src/types/qrcode.d.ts     |  9 ++++
 yudao-ui-admin-vue3/src/types/table.d.ts      | 36 +++++++++++++
 yudao-ui-admin-vue3/src/types/theme.d.ts      | 16 ++++++
 14 files changed, 209 insertions(+), 6 deletions(-)
 create mode 100644 yudao-ui-admin-vue3/src/types/components.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/configGlobal.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/contextMenu.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/descriptions.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/elementPlus.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/form.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/icon.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/infoTip.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/layout.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/localeDropdown.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/qrcode.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/table.d.ts
 create mode 100644 yudao-ui-admin-vue3/src/types/theme.d.ts

diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 6963e8da9..52c0f5311 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -42,7 +42,7 @@
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.22",
+    "pinia": "^2.0.23",
     "qrcode": "^1.5.1",
     "qs": "^6.11.0",
     "url": "^0.11.0",
@@ -56,17 +56,17 @@
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@iconify/json": "^2.1.119",
+    "@iconify/json": "^2.1.120",
     "@intlify/vite-plugin-vue-i18n": "^6.0.3",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.8.3",
+    "@types/node": "^18.8.4",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.39.0",
-    "@typescript-eslint/parser": "^5.39.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.0",
+    "@typescript-eslint/parser": "^5.40.0",
     "@vitejs/plugin-vue": "^3.1.2",
     "@vitejs/plugin-vue-jsx": "^2.0.1",
     "autoprefixer": "^10.4.12",
@@ -92,7 +92,7 @@
     "stylelint-order": "^5.0.0",
     "typescript": "4.8.4",
     "unplugin-vue-macros": "^0.12.0",
-    "vite": "3.1.6",
+    "vite": "3.1.7",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
diff --git a/yudao-ui-admin-vue3/src/types/components.d.ts b/yudao-ui-admin-vue3/src/types/components.d.ts
new file mode 100644
index 000000000..45523f922
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/components.d.ts
@@ -0,0 +1,52 @@
+export type ComponentName =
+  | 'Radio'
+  | 'RadioButton'
+  | 'Checkbox'
+  | 'CheckboxButton'
+  | 'Input'
+  | 'Autocomplete'
+  | 'InputNumber'
+  | 'Select'
+  | 'Cascader'
+  | 'Switch'
+  | 'Slider'
+  | 'TimePicker'
+  | 'DatePicker'
+  | 'Rate'
+  | 'ColorPicker'
+  | 'Transfer'
+  | 'Divider'
+  | 'TimeSelect'
+  | 'SelectV2'
+  | 'InputPassword'
+  | 'Editor'
+
+export type ColProps = {
+  span?: number
+  xs?: number
+  sm?: number
+  md?: number
+  lg?: number
+  xl?: number
+  tag?: string
+}
+
+export type ComponentOptions = {
+  label?: string
+  value?: FormValueType
+  disabled?: boolean
+  key?: string | number
+  children?: ComponentOptions[]
+  options?: ComponentOptions[]
+} & Recordable
+
+export type ComponentOptionsAlias = {
+  labelField?: string
+  valueField?: string
+}
+
+export type ComponentProps = {
+  optionsAlias?: ComponentOptionsAlias
+  options?: ComponentOptions[]
+  optionsSlot?: boolean
+} & Recordable
diff --git a/yudao-ui-admin-vue3/src/types/configGlobal.d.ts b/yudao-ui-admin-vue3/src/types/configGlobal.d.ts
new file mode 100644
index 000000000..f6d7b3c39
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/configGlobal.d.ts
@@ -0,0 +1,4 @@
+import { ElementPlusSize } from './elementPlus'
+export interface ConfigGlobalTypes {
+  size?: ElementPlusSize
+}
diff --git a/yudao-ui-admin-vue3/src/types/contextMenu.d.ts b/yudao-ui-admin-vue3/src/types/contextMenu.d.ts
new file mode 100644
index 000000000..0738d0e35
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/contextMenu.d.ts
@@ -0,0 +1,7 @@
+export type contextMenuSchema = {
+  disabled?: boolean
+  divided?: boolean
+  icon?: string
+  label: string
+  command?: (item: contextMenuSchema) => void
+}
diff --git a/yudao-ui-admin-vue3/src/types/descriptions.d.ts b/yudao-ui-admin-vue3/src/types/descriptions.d.ts
new file mode 100644
index 000000000..6fb99b047
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/descriptions.d.ts
@@ -0,0 +1,11 @@
+export interface DescriptionsSchema {
+  span?: number // 占多少分
+  field: string // 字段名
+  label?: string // label名
+  width?: string | number
+  minWidth?: string | number
+  align?: 'left' | 'center' | 'right'
+  labelAlign?: 'left' | 'center' | 'right'
+  className?: string
+  labelClassName?: string
+}
diff --git a/yudao-ui-admin-vue3/src/types/elementPlus.d.ts b/yudao-ui-admin-vue3/src/types/elementPlus.d.ts
new file mode 100644
index 000000000..2c6b76e77
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/elementPlus.d.ts
@@ -0,0 +1,3 @@
+export type ElementPlusSize = 'default' | 'small' | 'large'
+
+export type ElementPlusInfoType = 'success' | 'info' | 'warning' | 'danger'
diff --git a/yudao-ui-admin-vue3/src/types/form.d.ts b/yudao-ui-admin-vue3/src/types/form.d.ts
new file mode 100644
index 000000000..8673ec7d5
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/form.d.ts
@@ -0,0 +1,45 @@
+import type { CSSProperties } from 'vue'
+import { ColProps, ComponentProps, ComponentName } from '@/types/components'
+import { FormValueType, FormValueType } from '@/types/form'
+import type { AxiosPromise } from 'axios'
+
+export type FormSetPropsType = {
+  field: string
+  path: string
+  value: any
+}
+
+export type FormValueType = string | number | string[] | number[] | boolean | undefined | null
+
+export type FormItemProps = {
+  labelWidth?: string | number
+  required?: boolean
+  rules?: Recordable
+  error?: string
+  showMessage?: boolean
+  inlineMessage?: boolean
+  style?: CSSProperties
+}
+
+export type FormSchema = {
+  // 唯一值
+  field: string
+  // 标题
+  label?: string
+  // 提示
+  labelMessage?: string
+  // col组件属性
+  colProps?: ColProps
+  // 表单组件属性，slots对应的是表单组件的插槽，规则：${field}-xxx，具体可以查看element-plus文档
+  componentProps?: { slots?: Recordable } & ComponentProps
+  // formItem组件属性
+  formItemProps?: FormItemProps
+  // 渲染的组件
+  component?: ComponentName
+  // 初始值
+  value?: FormValueType
+  // 是否隐藏
+  hidden?: boolean
+  // 远程加载下拉项
+  api?: <T = any>() => AxiosPromise<T>
+}
diff --git a/yudao-ui-admin-vue3/src/types/icon.d.ts b/yudao-ui-admin-vue3/src/types/icon.d.ts
new file mode 100644
index 000000000..d1ffcdb50
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/icon.d.ts
@@ -0,0 +1,5 @@
+export interface IconTypes {
+  size?: number
+  color?: string
+  icon: string
+}
diff --git a/yudao-ui-admin-vue3/src/types/infoTip.d.ts b/yudao-ui-admin-vue3/src/types/infoTip.d.ts
new file mode 100644
index 000000000..6eff083dc
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/infoTip.d.ts
@@ -0,0 +1,4 @@
+export interface TipSchema {
+  label: string
+  keys?: string[]
+}
diff --git a/yudao-ui-admin-vue3/src/types/layout.d.ts b/yudao-ui-admin-vue3/src/types/layout.d.ts
new file mode 100644
index 000000000..cad3e2af0
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/layout.d.ts
@@ -0,0 +1 @@
+export type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu'
diff --git a/yudao-ui-admin-vue3/src/types/localeDropdown.d.ts b/yudao-ui-admin-vue3/src/types/localeDropdown.d.ts
new file mode 100644
index 000000000..c749dce72
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/localeDropdown.d.ts
@@ -0,0 +1,10 @@
+export interface Language {
+  el: Recordable
+  name: string
+}
+
+export interface LocaleDropdownType {
+  lang: LocaleType
+  name?: string
+  elLocale?: Language
+}
diff --git a/yudao-ui-admin-vue3/src/types/qrcode.d.ts b/yudao-ui-admin-vue3/src/types/qrcode.d.ts
new file mode 100644
index 000000000..86cdf0b96
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/qrcode.d.ts
@@ -0,0 +1,9 @@
+export interface QrcodeLogo {
+  src?: string
+  logoSize?: number
+  bgColor?: string
+  borderSize?: number
+  crossOrigin?: string
+  borderRadius?: number
+  logoRadius?: number
+}
diff --git a/yudao-ui-admin-vue3/src/types/table.d.ts b/yudao-ui-admin-vue3/src/types/table.d.ts
new file mode 100644
index 000000000..5adf91f47
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/table.d.ts
@@ -0,0 +1,36 @@
+export type TableColumn = {
+  field: string
+  label?: string
+  children?: TableColumn[]
+} & Recordable
+
+export type TableSlotDefault = {
+  row: Recordable
+  column: TableColumn
+  $index: number
+} & Recordable
+
+export interface Pagination {
+  small?: boolean
+  background?: boolean
+  pageSize?: number
+  defaultPageSize?: number
+  total?: number
+  pageCount?: number
+  pagerCount?: number
+  currentPage?: number
+  defaultCurrentPage?: number
+  layout?: string
+  pageSizes?: number[]
+  popperClass?: string
+  prevText?: string
+  nextText?: string
+  disabled?: boolean
+  hideOnSinglePage?: boolean
+}
+
+export interface TableSetPropsType {
+  field: string
+  path: string
+  value: any
+}
diff --git a/yudao-ui-admin-vue3/src/types/theme.d.ts b/yudao-ui-admin-vue3/src/types/theme.d.ts
new file mode 100644
index 000000000..ad649b027
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/types/theme.d.ts
@@ -0,0 +1,16 @@
+export type ThemeTypes = {
+  elColorPrimary?: string
+  leftMenuBorderColor?: string
+  leftMenuBgColor?: string
+  leftMenuBgLightColor?: string
+  leftMenuBgActiveColor?: string
+  leftMenuCollapseBgActiveColor?: string
+  leftMenuTextColor?: string
+  leftMenuTextActiveColor?: string
+  logoTitleTextColor?: string
+  logoBorderColor?: string
+  topHeaderBgColor?: string
+  topHeaderTextColor?: string
+  topHeaderHoverColor?: string
+  topToolBorderColor?: string
+}

From 21b0e1fdedf984e4568883425d273d5dc4285d38 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 14:10:13 +0800
Subject: [PATCH 28/48] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     |  4 ++--
 yudao-ui-admin-vue3/README.md | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index fb02346c3..1c3a05886 100644
--- a/README.md
+++ b/README.md
@@ -205,10 +205,10 @@ ps：核心功能已经实现，正在对接微信小程序中...
 | 框架                                                                  | 说明              | 版本     |
 |----------------------------------------------------------------------|-----------------|--------|
 | [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架          | 3.2.40 |
-| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具         | 3.1.6  |
+| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具         | 3.1.7  |
 | [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus    | 2.2.17 |
 | [TypeScript](https://www.typescriptlang.org/docs/)                   | TypeScript      | 4.8.4  |
-| [pinia](https://pinia.vuejs.org/)                                    | vuex5           | 2.0.22 |
+| [pinia](https://pinia.vuejs.org/)                                    | vuex5           | 2.0.23 |
 | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化             | 9.2.2  |
 | [windicss](https://cn.windicss.org/)                                 | 下一代工具优先的 CSS 框架 | 3.5.6  |
 | [iconify](https://icon-sets.iconify.design/)                         | 在线图标库           | 3.0.0  |
diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md
index 8379c7f7e..77b589ee4 100644
--- a/yudao-ui-admin-vue3/README.md
+++ b/yudao-ui-admin-vue3/README.md
@@ -27,17 +27,17 @@
 
 | 框架 | 说明 | 版本     |
 | --- | --- |--------|
-| [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.37 |
-| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.0.4 |
-| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.12 |
-| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.7.4 |
-| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.17 |
-| [vueuse](https://vueuse.org//) | 常用工具集 | 9.0.2 |
-| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.0 |
-| [vue-router](https://router.vuejs.org/) | vue 路由 | 4.1.3 |
+| [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.40 |
+| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.7 |
+| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.17 |
+| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.8.4 |
+| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.23 |
+| [vueuse](https://vueuse.org//) | 常用工具集 | 9.3.0 |
+| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
+| [vue-router](https://router.vuejs.org/) | vue 路由 | 4.1.5 |
 | [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
-| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 2.2.1 |
-| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.14 |
+| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.0 |
+| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.21 |
 
 ### 推荐 VScode 开发，插件如下
 

From 0c5101256b249752664ea97a7c8c606a3a5abe06 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 15:36:42 +0800
Subject: [PATCH 29/48] =?UTF-8?q?style:=20cutMenu=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/package.json                           | 2 +-
 yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue | 2 +-
 yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 52c0f5311..a02f90c9d 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-pro-vue3",
-  "version": "1.6.4.1801",
+  "version": "1.6.4.1811",
   "description": "基于vue3、element-plus、typesScript、vite3",
   "author": "xingyu",
   "private": false,
diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue b/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue
index 628a22ea0..558c81c9a 100644
--- a/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue
+++ b/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue
@@ -208,7 +208,7 @@ const clear = () => {
     <Icon icon="ep:setting" color="#fff" />
   </div>
 
-  <ElDrawer v-model="drawer" direction="rtl" size="350px">
+  <ElDrawer v-model="drawer" direction="rtl" size="350px" :z-index="4000">
     <template #header>
       <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
     </template>
diff --git a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue b/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
index 0625e21c5..1ec61ca27 100644
--- a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
+++ b/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
@@ -78,9 +78,6 @@ export default defineComponent({
     watch(
       () => collapse.value,
       (collapse: boolean) => {
-        if (unref(fixedMenu)) {
-          return
-        }
         if (!collapse) {
           setTimeout(() => {
             showTitle.value = !collapse
@@ -144,7 +141,7 @@ export default defineComponent({
         id={`${variables.namespace}-menu`}
         class={[
           prefixCls,
-          'relative bg-[var(--left-menu-bg-color)] top-1px z-99999',
+          'relative bg-[var(--left-menu-bg-color)] top-1px z-3000',
           {
             'w-[var(--tab-menu-max-width)]': !unref(collapse),
             'w-[var(--tab-menu-min-width)]': unref(collapse)

From b6347a46aadd617c23faf1762df1f59cce089442 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 16:02:28 +0800
Subject: [PATCH 30/48] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/src/components/Table/src/Table.vue          | 1 +
 yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts             | 1 +
 yudao-ui-admin-vue3/src/utils/dict.ts                           | 1 +
 yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue | 1 +
 .../src/views/infra/codegen/components/BasicInfoForm.vue        | 2 ++
 .../src/views/infra/codegen/components/GenInfoForm.vue          | 1 +
 yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts          | 2 ++
 yudao-ui-admin-vue3/types/global.d.ts                           | 2 +-
 8 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin-vue3/src/components/Table/src/Table.vue b/yudao-ui-admin-vue3/src/components/Table/src/Table.vue
index f196a5866..a34157857 100644
--- a/yudao-ui-admin-vue3/src/components/Table/src/Table.vue
+++ b/yudao-ui-admin-vue3/src/components/Table/src/Table.vue
@@ -6,6 +6,7 @@ import { setIndex } from './helper'
 import { getSlot } from '@/utils/tsxHelper'
 import type { TableProps } from './types'
 import { set } from 'lodash-es'
+import { Pagination, TableColumn, TableSetPropsType, TableSlotDefault } from '@/types/table'
 
 export default defineComponent({
   name: 'Table',
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
index 5417dc7ab..57d0f8131 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
@@ -4,6 +4,7 @@ import { getIntDictOptions } from '@/utils/dict'
 import { FormSchema } from '@/types/form'
 import { TableColumn } from '@/types/table'
 import { DescriptionsSchema } from '@/types/descriptions'
+import { ComponentOptions } from '@/types/components'
 
 export type CrudSchema = Omit<TableColumn, 'children'> & {
   search?: CrudSearchParams
diff --git a/yudao-ui-admin-vue3/src/utils/dict.ts b/yudao-ui-admin-vue3/src/utils/dict.ts
index 7b122cba4..5050d2e7b 100644
--- a/yudao-ui-admin-vue3/src/utils/dict.ts
+++ b/yudao-ui-admin-vue3/src/utils/dict.ts
@@ -2,6 +2,7 @@
  * 数据字典工具类
  */
 import { useDictStoreWithOut } from '@/store/modules/dict'
+import { ElementPlusInfoType } from '@/types/elementPlus'
 
 const dictStore = useDictStoreWithOut()
 
diff --git a/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue
index 1424a9c9d..2e6cd64af 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue
@@ -7,6 +7,7 @@ import { ElInput, FormRules } from 'element-plus'
 import { useValidator } from '@/hooks/web/useValidator'
 import { useLoginState, LoginStateEnum } from './useLogin'
 import LoginFormTitle from './LoginFormTitle.vue'
+import { FormSchema } from '@/types/form'
 
 const { register, elFormRef } = useForm()
 const { handleBackLogin, getLoginState } = useLoginState()
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue
index ad8beadf6..a61bf0f81 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue
@@ -4,6 +4,8 @@ import { required } from '@/utils/formRules'
 import { CodegenTableVO } from '@/api/infra/codegen/types'
 import { Form } from '@/components/Form'
 import { useForm } from '@/hooks/web/useForm'
+import { FormSchema } from '@/types/form'
+
 const props = defineProps({
   basicInfo: {
     type: Object as PropType<Nullable<CodegenTableVO>>,
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
index abfa91d3d..373e8d200 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
@@ -8,6 +8,7 @@ import { useForm } from '@/hooks/web/useForm'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { listSimpleMenusApi } from '@/api/system/menu'
 import { CodegenTableVO } from '@/api/infra/codegen/types'
+import { FormSchema } from '@/types/form'
 const props = defineProps({
   genInfo: {
     type: Object as PropType<Nullable<CodegenTableVO>>,
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
index 5bb7178c3..ae3b5a8b5 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
@@ -1,5 +1,7 @@
 import { required } from '@/utils/formRules'
 import { reactive } from 'vue'
+import { FormSchema } from '@/types/form'
+
 // 表单校验
 export const rules = reactive({
   name: [required],
diff --git a/yudao-ui-admin-vue3/types/global.d.ts b/yudao-ui-admin-vue3/types/global.d.ts
index 7314557c5..67338cd71 100644
--- a/yudao-ui-admin-vue3/types/global.d.ts
+++ b/yudao-ui-admin-vue3/types/global.d.ts
@@ -19,7 +19,7 @@ declare global {
     | 'application/x-www-form-urlencoded'
     | 'multipart/form-data'
 
-  declare type AxiosMethod = 'get' | 'post' | 'delete' | 'put'
+  declare type AxiosMethod = 'get' | 'post' | 'delete' | 'put' | 'GET' | 'POST' | 'DELETE' | 'PUT'
 
   declare type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'
 

From 9ab4165c4e78430b6a8babb18382855f2912539a Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 16:03:08 +0800
Subject: [PATCH 31/48] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/package.json   | 4 ++--
 yudao-ui-admin-vue3/tsconfig.json  | 2 +-
 yudao-ui-admin-vue3/vite.config.ts | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index a02f90c9d..b6c1c184d 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -10,7 +10,7 @@
     "ts:check": "vue-tsc --noEmit",
     "build:pro": "vite build --mode pro",
     "build:dev": "vite build --mode dev",
-    "build:test": "pnpm run ts:check && vite build --mode test",
+    "build:test": "npm run ts:check && vite build --mode test",
     "serve:pro": "vite preview --mode pro",
     "serve:dev": "vite preview --mode dev",
     "serve:test": "vite preview --mode test",
@@ -100,7 +100,7 @@
     "vite-plugin-style-import": "2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-windicss": "^1.8.8",
-    "vue-tsc": "^0.40.13",
+    "vue-tsc": "^1.0.3",
     "windicss": "^3.5.6",
     "windicss-analysis": "^0.3.5"
   },
diff --git a/yudao-ui-admin-vue3/tsconfig.json b/yudao-ui-admin-vue3/tsconfig.json
index d4a76c5b0..27d1dfdf5 100644
--- a/yudao-ui-admin-vue3/tsconfig.json
+++ b/yudao-ui-admin-vue3/tsconfig.json
@@ -30,7 +30,7 @@
       "@types/intro.js",
       "@types/qrcode",
       "vite-plugin-svg-icons/client",
-      "unplugin-vue-define-options"
+      "unplugin-vue-macros/macros-global"
     ],
     "typeRoots": ["./node_modules/@types/", "./types"]
   },
diff --git a/yudao-ui-admin-vue3/vite.config.ts b/yudao-ui-admin-vue3/vite.config.ts
index 9c91a9d61..83b03c0bc 100644
--- a/yudao-ui-admin-vue3/vite.config.ts
+++ b/yudao-ui-admin-vue3/vite.config.ts
@@ -9,9 +9,9 @@ import VueI18n from '@intlify/vite-plugin-vue-i18n'
 import { createStyleImportPlugin, ElementPlusResolve } from 'vite-plugin-style-import'
 import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
 import PurgeIcons from 'vite-plugin-purge-icons'
-import DefineOptions from 'unplugin-vue-define-options/vite'
 import { createHtmlPlugin } from 'vite-plugin-html'
 import viteCompression from 'vite-plugin-compression'
+import VueMarcos from 'unplugin-vue-macros/vite'
 
 // 当前执行node命令时文件夹的地址（工作目录）
 const root = process.cwd()
@@ -80,7 +80,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
         svgoOptions: true
       }),
       PurgeIcons(),
-      DefineOptions(),
+      VueMarcos(),
       viteCompression({
         verbose: true, // 是否在控制台输出压缩结果
         disable: true, // 是否禁用

From 0c362b64c2ab5bc2a86810543dc24ac7b0555930 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 17:10:57 +0800
Subject: [PATCH 32/48] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=A7=9F=E6=88=B7=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/tenant/types.ts            |  2 ++
 .../src/components/UserInfo/src/UserInfo.vue  |  2 +-
 .../src/views/system/tenant/index.vue         |  2 +-
 .../src/views/system/tenant/tenant.data.ts    | 25 ++++++++++++++++++-
 .../src/views/system/user/index.vue           |  6 ++---
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/api/system/tenant/types.ts b/yudao-ui-admin-vue3/src/api/system/tenant/types.ts
index 1fc58bd71..dc19b8e2c 100644
--- a/yudao-ui-admin-vue3/src/api/system/tenant/types.ts
+++ b/yudao-ui-admin-vue3/src/api/system/tenant/types.ts
@@ -4,6 +4,8 @@ export type TenantVO = {
   packageId: number
   contactName: string
   contactMobile: string
+  username: string
+  password: string
   accountCount: number
   expireTime: string
   domain: string
diff --git a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
index 5bccbe429..41650ae2c 100644
--- a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
+++ b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
@@ -37,7 +37,7 @@ const loginOut = () => {
     .then(async () => {
       userStore.loginOut()
       tagsViewStore.delAllViews
-      replace('/login')
+      replace('/login?redirect=/index')
     })
     .catch(() => {})
 }
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
index 76bdf9b9f..e432fbca4 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
@@ -199,7 +199,7 @@ onMounted(async () => {
       ref="formRef"
     >
       <template #packageId>
-        <el-select v-model="tenantPackageId" placeholder="Select">
+        <el-select v-model="tenantPackageId">
           <el-option
             v-for="item in tenantPackageOptions"
             :key="item.id"
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
index 73ef3cf10..64eb63d0c 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
@@ -55,6 +55,29 @@ const crudSchemas = reactive<CrudSchema[]>([
       show: true
     }
   },
+  {
+    label: '用户名称',
+    field: 'username',
+    table: {
+      show: false
+    },
+    detail: {
+      show: false
+    }
+  },
+  {
+    label: '用户密码',
+    field: 'password',
+    table: {
+      show: false
+    },
+    detail: {
+      show: false
+    },
+    form: {
+      component: 'InputPassword'
+    }
+  },
   {
     label: '账号额度',
     field: 'accountCount',
@@ -71,7 +94,7 @@ const crudSchemas = reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss'
+        valueFormat: 'x'
       }
     }
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue
index d6b4101c0..40357adff 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -112,20 +112,20 @@ const setDialogTile = async (type: string) => {
 
 // 新增操作
 const handleAdd = () => {
-  setDialogTile('create')
   // 重置表单
   deptId.value = 0
   unref(formRef)?.getElFormRef()?.resetFields()
+  setDialogTile('create')
 }
 
 // 修改操作
 const handleUpdate = async (row: UserVO) => {
-  await setDialogTile('update')
   // 设置数据
   const res = await UserApi.getUserApi(row.id)
   deptId.value = res.deptId
   postIds.value = res.postIds
   unref(formRef)?.setValues(res)
+  await setDialogTile('update')
 }
 
 // 提交按钮
@@ -281,9 +281,9 @@ const excelUploadError = (): void => {
 }
 // ========== 初始化 ==========
 onMounted(async () => {
-  await getTree()
   await getPostOptions()
   await getList()
+  await getTree()
 })
 </script>
 

From f49a55191c6402f21c09a68b6911623db8de8b4c Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 17:12:13 +0800
Subject: [PATCH 33/48] update springboot 2.6.12

---
 README.md                  | 4 ++--
 yudao-dependencies/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1c3a05886..3f23ca92c 100644
--- a/README.md
+++ b/README.md
@@ -171,8 +171,8 @@ ps：核心功能已经实现，正在对接微信小程序中...
 
 | 框架                                                                                         | 说明                   | 版本               | 学习指南                                                           |
 |---------------------------------------------------------------------------------------------|-----------------------|------------------|----------------------------------------------------------------|
-| [Spring Boot](https://spring.io/projects/spring-boot)                                       | 应用开发框架             | 2.6.11           | [文档](https://github.com/YunaiV/SpringBoot-Labs)                |
-| [MySQL](https://www.mysql.com/cn/)                                                          | 数据库服务器             | 5.7              |                                                                |
+| [Spring Boot](https://spring.io/projects/spring-boot)                                       | 应用开发框架             | 2.6.12           | [文档](https://github.com/YunaiV/SpringBoot-Labs)                |
+| [MySQL](https://www.mysql.com/cn/)                                                          | 数据库服务器             | 5.7 / 8.0+       |                                                                |
 | [Druid](https://github.com/alibaba/druid)                                                   | JDBC 连接池、监控组件     | 1.2.13-SNSAPSHOT | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
 | [MyBatis Plus](https://mp.baomidou.com/)                                                    | MyBatis 增强工具包       | 3.5.2            | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao)         |
 | [Dynamic Datasource](https://dynamic-datasource.com/)                                       | 动态数据源               | 3.5.2            | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index bf446c21b..d5a67a65f 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <revision>1.6.4-snapshot</revision>
         <!-- 统一依赖管理 -->
-        <spring.boot.version>2.6.11</spring.boot.version>
+        <spring.boot.version>2.6.12</spring.boot.version>
         <!-- Web 相关 -->
         <knife4j.version>3.0.3</knife4j.version>
         <swagger-annotations.version>1.6.7</swagger-annotations.version>

From ca7ea3309b8544c77b0221e4e6ab53e99eb25fd9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 13 Oct 2022 00:00:01 +0800
Subject: [PATCH 34/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b2080bab..ffda16746 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@
 >
 > 😜 给项目点点 Star 吧，这对我们真的很重要！
 
+![架构图](https://static.iocoder.cn/ruoyi-vue-pro-architecture.png)
+
 * 管理后台的 Vue3 版本采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin) ，Vue2 版本采用 [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) 
 * 管理后台的移动端采用 [uni-app](https://github.com/dcloudio/uni-app) 方案，一份代码多终端适配，同时支持 APP、小程序、H5！
 * 后端采用 Spring Boot、MySQL + MyBatis Plus、Redis + Redisson
@@ -42,7 +44,6 @@
 | `yudao-cloud`  | Spring Cloud 微服务       | **[Gitee](https://gitee.com/zhijiantianya/yudao-cloud)** &nbsp;&nbsp;&nbsp; [Github](https://github.com/YunaiV/yudao-cloud)         |
 | `Spring-Boot-Labs` | Spring Boot & Cloud 入门 | **[Gitee](https://gitee.com/zhijiantianya/SpringBoot-Labs)** &nbsp;&nbsp;&nbsp; [Github](https://github.com/YunaiV/SpringBoot-Labs) |
 
-
 ## 🐼 内置功能
 
 分成多种内置功能：

From 587360a54fbd9992560326d89218e0c9a07a6793 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 13 Oct 2022 23:17:40 +0800
Subject: [PATCH 35/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index ffda16746..b594643b1 100644
--- a/README.md
+++ b/README.md
@@ -46,13 +46,17 @@
 
 ## 🐼 内置功能
 
-分成多种内置功能：
+系统内置多种多种业务功能，可以用于快速你的业务系统：
+
+![功能分层](https://static.iocoder.cn/ruoyi-vue-pro-biz.png)
+
 * 系统功能
 * 基础设施
 * 工作流程
 * 支付系统
-* 商城系统
+* 会员中心
 * 数据报表
+* 商城系统
 
 > 友情提示：本项目基于 RuoYi-Vue 修改，**重构优化**后端的代码，**美化**前端的界面。
 >

From 00fbc7c5ba54b82f790a9295ad8ca3adf58eb67f Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Fri, 14 Oct 2022 14:38:55 +0800
Subject: [PATCH 36/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7apollo=20?=
 =?UTF-8?q?=E5=88=B02.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index d5a67a65f..c692fafa5 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -28,7 +28,7 @@
         <dynamic-datasource.version>3.5.2</dynamic-datasource.version>
         <redisson.version>3.17.7</redisson.version>
         <!-- Config 配置中心相关 -->
-        <apollo.version>1.9.2</apollo.version>
+        <apollo.version>2.0.1</apollo.version>
         <!-- 服务保障相关 -->
         <lock4j.version>2.2.2</lock4j.version>
         <resilience4j.version>1.7.1</resilience4j.version>

From cdeaf5b892bbf706bf365ea663203c730e6b0ad2 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Fri, 14 Oct 2022 16:37:18 +0800
Subject: [PATCH 37/48] feat: menu add parent

---
 .../src/components/UserInfo/src/UserInfo.vue       |  2 +-
 .../src/views/system/menu/index.vue                | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
index 41650ae2c..33dd11ddd 100644
--- a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
+++ b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
@@ -36,7 +36,7 @@ const loginOut = () => {
   })
     .then(async () => {
       userStore.loginOut()
-      tagsViewStore.delAllViews
+      tagsViewStore.delAllViews()
       replace('/login?redirect=/index')
     })
     .catch(() => {})
diff --git a/yudao-ui-admin-vue3/src/views/system/menu/index.vue b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
index 2273355e1..035b9d875 100644
--- a/yudao-ui-admin-vue3/src/views/system/menu/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
@@ -42,12 +42,18 @@ const menuProps = {
   label: 'name',
   value: 'id'
 }
-const menuOptions = ref() // 树形结构
+interface Tree {
+  id: number
+  name: string
+  children?: Tree[] | any[]
+}
+const menuOptions = ref<any[]>([]) // 树形结构
 const getTree = async () => {
+  menuOptions.value = []
   const res = await MenuApi.listSimpleMenusApi()
-  const menu = { id: 0, name: '主类目', children: [] as any[] }
+  let menu: Tree = { id: 0, name: '主类目', children: [] }
   menu.children = handleTree(res)
-  menuOptions.value = menu
+  menuOptions.value.push(menu)
 }
 // ========== 查询 ==========
 const queryParams = reactive({
@@ -268,7 +274,7 @@ onMounted(async () => {
               node-key="id"
               v-model="menuForm.parentId"
               :props="menuProps"
-              :data="menuData"
+              :data="menuOptions"
               check-strictly
             />
           </el-form-item>

From ff938a9e30eef6a5af6a36cce96ad216b010fea3 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Fri, 14 Oct 2022 16:54:17 +0800
Subject: [PATCH 38/48] fix: update user error

---
 yudao-ui-admin-vue3/src/views/system/user/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue
index 40357adff..78e702192 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -114,18 +114,19 @@ const setDialogTile = async (type: string) => {
 const handleAdd = () => {
   // 重置表单
   deptId.value = 0
-  unref(formRef)?.getElFormRef()?.resetFields()
   setDialogTile('create')
+  unref(formRef)?.getElFormRef()?.resetFields()
 }
 
 // 修改操作
 const handleUpdate = async (row: UserVO) => {
+  await setDialogTile('update')
   // 设置数据
   const res = await UserApi.getUserApi(row.id)
+  console.info(res)
   deptId.value = res.deptId
   postIds.value = res.postIds
   unref(formRef)?.setValues(res)
-  await setDialogTile('update')
 }
 
 // 提交按钮

From aa983a6fa978fe12efa8bb02156362c09c5a881c Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Fri, 14 Oct 2022 17:52:04 +0800
Subject: [PATCH 39/48] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ContextMenu/src/ContextMenu.vue    |  2 +-
 .../src/components/CountTo/src/CountTo.vue        |  2 +-
 .../src/components/Crontab/src/Crontab.vue        |  2 +-
 .../src/components/Error/src/Error.vue            |  1 +
 .../src/components/Icon/src/IconSelect.vue        |  2 +-
 .../src/components/Infotip/src/Infotip.vue        |  2 +-
 .../InputPassword/src/InputPassword.vue           |  2 +-
 .../src/components/Qrcode/src/Qrcode.vue          |  2 +-
 .../src/components/Search/src/Search.vue          |  2 +-
 .../Setting/src/components/ColorRadioPicker.vue   |  2 +-
 .../src/views/infra/codegen/EditTable.vue         | 11 ++++++++++-
 .../infra/codegen/components/GenInfoForm.vue      | 15 +++++++++------
 .../infra/codegen/components/ImportTable.vue      |  2 +-
 .../src/views/system/tenant/index.vue             |  2 --
 14 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue b/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue
index fc86c1ddb..bd53950e3 100644
--- a/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue
+++ b/yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus'
-import { PropType, ref } from 'vue'
+import { PropType, ref, defineEmits } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useDesign } from '@/hooks/web/useDesign'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
diff --git a/yudao-ui-admin-vue3/src/components/CountTo/src/CountTo.vue b/yudao-ui-admin-vue3/src/components/CountTo/src/CountTo.vue
index cab8ea965..54a39df91 100644
--- a/yudao-ui-admin-vue3/src/components/CountTo/src/CountTo.vue
+++ b/yudao-ui-admin-vue3/src/components/CountTo/src/CountTo.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, computed, watch, onMounted, unref, toRef, PropType } from 'vue'
+import { reactive, computed, watch, onMounted, unref, toRef, PropType, defineEmits } from 'vue'
 import { isNumber } from '@/utils/is'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
diff --git a/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue b/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue
index 96ae7cad5..150ffd958 100644
--- a/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue
+++ b/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue
@@ -24,7 +24,7 @@ import {
   ElRadioButton,
   ElMessage
 } from 'element-plus'
-import { ref, computed, onMounted, reactive, watch, PropType } from 'vue'
+import { ref, computed, onMounted, reactive, watch, PropType, defineEmits } from 'vue'
 interface shortcutsType {
   text: string
   value: string
diff --git a/yudao-ui-admin-vue3/src/components/Error/src/Error.vue b/yudao-ui-admin-vue3/src/components/Error/src/Error.vue
index c588af10b..a833c9b9b 100644
--- a/yudao-ui-admin-vue3/src/components/Error/src/Error.vue
+++ b/yudao-ui-admin-vue3/src/components/Error/src/Error.vue
@@ -4,6 +4,7 @@ import networkError from '@/assets/svgs/500.svg'
 import noPermission from '@/assets/svgs/403.svg'
 import { propTypes } from '@/utils/propTypes'
 import { useI18n } from '@/hooks/web/useI18n'
+import { defineEmits } from 'vue'
 
 interface ErrorMap {
   url: string
diff --git a/yudao-ui-admin-vue3/src/components/Icon/src/IconSelect.vue b/yudao-ui-admin-vue3/src/components/Icon/src/IconSelect.vue
index 73282b8f2..50b191d3f 100644
--- a/yudao-ui-admin-vue3/src/components/Icon/src/IconSelect.vue
+++ b/yudao-ui-admin-vue3/src/components/Icon/src/IconSelect.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cloneDeep } from 'lodash-es'
-import { ref, computed, CSSProperties, toRef, watch } from 'vue'
+import { ref, computed, CSSProperties, toRef, watch, defineEmits } from 'vue'
 import {
   ElInput,
   ElPopover,
diff --git a/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue b/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue
index 41ac96aed..a8256d0f4 100644
--- a/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue
+++ b/yudao-ui-admin-vue3/src/components/Infotip/src/Infotip.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { PropType } from 'vue'
+import { PropType, defineEmits } from 'vue'
 import { Highlight } from '@/components/Highlight'
 import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
diff --git a/yudao-ui-admin-vue3/src/components/InputPassword/src/InputPassword.vue b/yudao-ui-admin-vue3/src/components/InputPassword/src/InputPassword.vue
index c98cdd9a7..c43ef5a92 100644
--- a/yudao-ui-admin-vue3/src/components/InputPassword/src/InputPassword.vue
+++ b/yudao-ui-admin-vue3/src/components/InputPassword/src/InputPassword.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, unref, computed, watch } from 'vue'
+import { ref, unref, computed, watch, defineEmits } from 'vue'
 import { ElInput } from 'element-plus'
 import { propTypes } from '@/utils/propTypes'
 import { useConfigGlobal } from '@/hooks/web/useConfigGlobal'
diff --git a/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue b/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue
index 998c2dd3d..746dbd271 100644
--- a/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue
+++ b/yudao-ui-admin-vue3/src/components/Qrcode/src/Qrcode.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { PropType, nextTick, ref, watch, computed, unref } from 'vue'
+import { PropType, nextTick, ref, watch, computed, unref, defineEmits } from 'vue'
 import QRCode from 'qrcode'
 import { QRCodeRenderersOptions } from 'qrcode'
 import { cloneDeep } from 'lodash-es'
diff --git a/yudao-ui-admin-vue3/src/components/Search/src/Search.vue b/yudao-ui-admin-vue3/src/components/Search/src/Search.vue
index 57427a02a..03be4ab73 100644
--- a/yudao-ui-admin-vue3/src/components/Search/src/Search.vue
+++ b/yudao-ui-admin-vue3/src/components/Search/src/Search.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Form } from '@/components/Form'
-import { PropType, computed, unref, ref } from 'vue'
+import { PropType, computed, unref, ref, defineEmits } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { ElButton } from 'element-plus'
 import { useI18n } from '@/hooks/web/useI18n'
diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue b/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue
index bc40e1067..7bd4ec4dc 100644
--- a/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue
+++ b/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { PropType, watch, unref, ref } from 'vue'
+import { PropType, watch, unref, ref, defineEmits } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
 
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
index ef1123a04..968f308d6 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
@@ -26,6 +26,10 @@ const activeName = ref('cloum')
 const basicInfoRef = ref<ComponentRef<typeof BasicInfoForm>>()
 const genInfoRef = ref<ComponentRef<typeof GenInfoForm>>()
 const cloumInfoRef = ref(null)
+const parentMenuId = ref<number>()
+const menu = (id: number) => {
+  parentMenuId.value = id
+}
 const submitForm = async () => {
   const basicInfo = unref(basicInfoRef)
   const genInfo = unref(genInfoRef)
@@ -38,6 +42,11 @@ const submitForm = async () => {
       table: Object.assign({}, basicInfoData, genInfoData),
       columns: cloumCurrentRow.value
     }
+    if (parentMenuId.value) {
+      genInfoData.parentMenuId = parentMenuId.value
+    } else {
+      genInfoData.parentMenuId = 0
+    }
     await updateCodegenTableApi(genTable)
     ElMessage.success(t('common.updateSuccess'))
     push('/infra/codegen')
@@ -57,7 +66,7 @@ onMounted(() => {
         <CloumInfoForm ref="cloumInfoRef" :info="cloumCurrentRow" />
       </el-tab-pane>
       <el-tab-pane label="生成信息" name="genInfo">
-        <GenInfoForm ref="genInfoRef" :genInfo="tableCurrentRow" />
+        <GenInfoForm ref="genInfoRef" :genInfo="tableCurrentRow" @menu="menu" />
       </el-tab-pane>
     </el-tabs>
     <template #right>
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
index 373e8d200..e51a9a91f 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
@@ -15,7 +15,8 @@ const props = defineProps({
     default: () => null
   }
 })
-const defaultProps = {
+const menuProps = {
+  checkStrictly: true,
   children: 'children',
   label: 'name',
   value: 'id'
@@ -31,7 +32,6 @@ const rules = reactive({
 })
 const templateTypeOptions = getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)
 const sceneOptions = getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)
-const parentMenuId = ref()
 const treeRef = ref<InstanceType<typeof ElTreeSelect>>()
 const menuOptions = ref<any>([]) // 树形结构
 const getTree = async () => {
@@ -112,9 +112,13 @@ const schema = reactive<FormSchema[]>([
 const { register, methods, elFormRef } = useForm({
   schema
 })
+const parentMenuId = ref<number>()
+//子组件像父组件传值
+const emit = defineEmits(['menu'])
 const handleNodeClick = () => {
-  console.log(parentMenuId.value)
+  emit('menu', parentMenuId.value)
 }
+
 // ========== 初始化 ==========
 onMounted(async () => {
   await getTree()
@@ -143,10 +147,9 @@ defineExpose({
         v-model="parentMenuId"
         ref="treeRef"
         node-key="id"
-        check-on-click-node
-        expand-on-click-node="false"
-        :props="defaultProps"
+        :props="menuProps"
         :data="menuOptions"
+        check-strictly
         @node-click="handleNodeClick"
       />
     </template>
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
index 933d128ef..09a3d386a 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
+import { reactive, ref, defineEmits } from 'vue'
 import { getSchemaTableListApi, createCodegenListApi } from '@/api/infra/codegen'
 import {
   ElMessage,
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
index e432fbca4..204e0c7ef 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
@@ -150,7 +150,6 @@ onMounted(async () => {
         <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
       </template>
       <template #packageId="{ row }">
-        <!--        <DictTag :type="DICT_TYPE.SYSTEM_TENANT_PACKAGE_ID" :value="row.packageId" />-->
         <el-tag v-if="row.packageId === 0" type="danger">系统租户</el-tag>
         <el-tag v-else type="success"> {{ getPackageName(row.packageId) }} </el-tag>
       </template>
@@ -161,7 +160,6 @@ onMounted(async () => {
         <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
       </template>
       <template #action="{ row }">
-        <!-- <el-button type="text" v-hasPermi="['system:tenant:update']" @click="handleUpdate(row)">-->
         <el-button
           link
           type="primary"

From 855d23aec3c1e217a41c917ddd5d8b9175038ca8 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Mon, 17 Oct 2022 11:24:22 +0800
Subject: [PATCH 40/48] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=89=8D=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/codegen/vue3/views/index.vue.vm | 38 +++++----
 yudao-ui-admin-vue3/src/config/axios/index.ts | 15 ++--
 .../src/views/Login/components/LoginForm.vue  |  4 +
 .../src/views/bpm/form/index.vue              | 38 +++++----
 .../src/views/bpm/group/index.vue             | 40 ++++++----
 .../src/views/bpm/model/index.vue             | 38 +++++----
 .../src/views/infra/config/index.vue          | 38 +++++----
 .../views/infra/dataSourceConfig/index.vue    | 38 +++++----
 .../src/views/infra/fileConfig/index.vue      | 38 +++++----
 .../src/views/infra/job/index.vue             | 40 ++++++----
 .../src/views/pay/app/index.vue               | 38 +++++----
 .../src/views/pay/merchant/index.vue          | 38 +++++----
 .../src/views/pay/order/index.vue             | 38 +++++----
 .../src/views/system/dept/index.vue           | 36 +++++----
 .../src/views/system/dict/index.vue           | 78 +++++++++++--------
 .../src/views/system/errorCode/index.vue      | 38 +++++----
 .../src/views/system/menu/index.vue           |  2 +-
 .../src/views/system/notice/index.vue         | 38 +++++----
 .../src/views/system/oauth2/client/index.vue  | 38 +++++----
 .../src/views/system/post/index.vue           | 38 +++++----
 .../src/views/system/role/index.vue           | 38 +++++----
 .../src/views/system/sensitiveWord/index.vue  | 38 +++++----
 .../src/views/system/sms/smsChannel/index.vue | 38 +++++----
 .../views/system/sms/smsTemplate/index.vue    | 38 +++++----
 .../src/views/system/tenant/index.vue         | 44 ++++++-----
 .../src/views/system/tenantPackage/index.vue  | 40 ++++++----
 26 files changed, 548 insertions(+), 397 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index c497a1801..ca4adc1a6 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -50,23 +50,29 @@
 
   // 提交按钮
   const submitForm = async () => {
-    actionLoading.value = true
-    // 提交请求
-    try {
-      const data = unref(formRef)?.formModel as ${simpleClassName}VO
-      if (actionType.value === 'create') {
-        await ${simpleClassName}Api.create${simpleClassName}Api(data)
-        ElMessage.success(t('common.createSuccess'))
-      } else {
-        await ${simpleClassName}Api.update${simpleClassName}Api(data)
-        ElMessage.success(t('common.updateSuccess'))
+    const elForm = unref(formRef)?.getElFormRef()
+    if (!elForm) return
+    elForm.validate(async (valid) => {
+      if (valid) {
+        actionLoading.value = true
+        // 提交请求
+        try {
+          const data = unref(formRef)?.formModel as ${simpleClassName}VO
+          if (actionType.value === 'create') {
+            await ${simpleClassName}Api.create${simpleClassName}Api(data)
+            ElMessage.success(t('common.createSuccess'))
+          } else {
+            await ${simpleClassName}Api.update${simpleClassName}Api(data)
+            ElMessage.success(t('common.updateSuccess'))
+          }
+          // 操作成功，重新加载列表
+          dialogVisible.value = false
+          await getList()
+        } finally {
+          actionLoading.value = false
+        }
       }
-      // 操作成功，重新加载列表
-      dialogVisible.value = false
-      await getList()
-    } finally {
-      actionLoading.value = false
-    }
+    })
   }
 
   // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/config/axios/index.ts b/yudao-ui-admin-vue3/src/config/axios/index.ts
index 1512be132..064cb2268 100644
--- a/yudao-ui-admin-vue3/src/config/axios/index.ts
+++ b/yudao-ui-admin-vue3/src/config/axios/index.ts
@@ -128,12 +128,18 @@ service.interceptors.response.use(
           const refreshTokenRes = await refreshToken()
           // 2.1 刷新成功，则回放队列的请求 + 当前请求
           setToken(refreshTokenRes.data)
-          requestList.forEach((cb: any) => cb())
+          ;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken()
+          requestList.forEach((cb: any) => {
+            cb()
+          })
+          requestList = []
           return service(response.config)
         } catch (e) {
           // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
           // 2.2 刷新失败，只回放队列的请求
-          requestList.forEach((cb: any) => cb())
+          requestList.forEach((cb: any) => {
+            cb()
+          })
           // 提示是否要登出。即不回放当前请求！不然会形成递归
           return handleAuthorized()
         } finally {
@@ -194,10 +200,7 @@ service.interceptors.response.use(
 )
 
 const refreshToken = async () => {
-  return await service({
-    url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken(),
-    method: 'post'
-  })
+  return await axios.post(base_url + '/system/auth/refresh-token?refreshToken=' + getRefreshToken())
 }
 const handleAuthorized = () => {
   const { t } = useI18n()
diff --git a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
index bb4e73cf5..a9e53a01a 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
@@ -111,6 +111,10 @@ const handleLogin = async (params) => {
   }
   loginData.loginForm.captchaVerification = params.captchaVerification
   const res = await LoginApi.loginApi(loginData.loginForm)
+  if (!res) {
+    loginLoading.value = false
+    return
+  }
   setToken(res)
   if (!redirect.value) {
     redirect.value = '/'
diff --git a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue
index fc509207b..2fb70aabf 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue
@@ -49,23 +49,29 @@ const handleUpdate = async (row: FormVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as FormVO
-    if (actionType.value === 'create') {
-      await FormApi.createFormApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await FormApi.updateFormApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as FormVO
+        if (actionType.value === 'create') {
+          await FormApi.createFormApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await FormApi.updateFormApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/bpm/group/index.vue b/yudao-ui-admin-vue3/src/views/bpm/group/index.vue
index aa6af4cf2..fe327f9e4 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/group/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/group/index.vue
@@ -62,24 +62,30 @@ const handleUpdate = async (row: UserGroupVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as UserGroupVO
-    data.memberUserIds = userIds.value
-    if (actionType.value === 'create') {
-      await UserGroupApi.createUserGroupApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await UserGroupApi.updateUserGroupApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as UserGroupVO
+        data.memberUserIds = userIds.value
+        if (actionType.value === 'create') {
+          await UserGroupApi.createUserGroupApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await UserGroupApi.updateUserGroupApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // 根据用户名获取用户真实名
diff --git a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
index bbf0199e4..b85c50990 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
@@ -51,23 +51,29 @@ const handleUpdate = async (row: ModelVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as ModelVO
-    if (actionType.value === 'create') {
-      await ModelApi.createModelApi(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ModelApi.updateModelApi(data)
-      message.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as ModelVO
+        if (actionType.value === 'create') {
+          await ModelApi.createModelApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await ModelApi.updateModelApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 /** 流程表单的详情按钮操作 */
diff --git a/yudao-ui-admin-vue3/src/views/infra/config/index.vue b/yudao-ui-admin-vue3/src/views/infra/config/index.vue
index 991c47a9b..b7a3c4b9d 100644
--- a/yudao-ui-admin-vue3/src/views/infra/config/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/config/index.vue
@@ -50,23 +50,29 @@ const handleUpdate = async (row: ConfigVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as ConfigVO
-    if (actionType.value === 'create') {
-      await ConfigApi.createConfigApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await ConfigApi.updateConfigApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as ConfigVO
+        if (actionType.value === 'create') {
+          await ConfigApi.createConfigApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await ConfigApi.updateConfigApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
index 5a9f205ef..c8b363c1e 100644
--- a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
@@ -44,23 +44,29 @@ const handleUpdate = async (row: DataSourceConfigVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  loading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as DataSourceConfigVO
-    if (actionType.value === 'create') {
-      await DataSourceConfiggApi.createDataSourceConfigApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await DataSourceConfiggApi.updateDataSourceConfigApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as DataSourceConfigVO
+        if (actionType.value === 'create') {
+          await DataSourceConfiggApi.createDataSourceConfigApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await DataSourceConfiggApi.updateDataSourceConfigApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        loading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    loading.value = false
-  }
+  })
 }
 
 // 删除操作
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
index dd70921b9..b24bbb534 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
@@ -60,23 +60,29 @@ const handleMaster = (row: FileConfigVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as FileConfigVO
-    if (actionType.value === 'create') {
-      await FileConfigApi.createFileConfigApi(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await FileConfigApi.updateFileConfigApi(data)
-      message.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as FileConfigVO
+        if (actionType.value === 'create') {
+          await FileConfigApi.createFileConfigApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await FileConfigApi.updateFileConfigApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/infra/job/index.vue b/yudao-ui-admin-vue3/src/views/infra/job/index.vue
index b88dbf5cd..e5b9fff9e 100644
--- a/yudao-ui-admin-vue3/src/views/infra/job/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/job/index.vue
@@ -98,24 +98,30 @@ const handleRun = (row: JobVO) => {
 }
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as JobVO
-    data.cronExpression = cronExpression.value
-    if (actionType.value === 'create') {
-      await JobApi.createJobApi(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await JobApi.updateJobApi(data)
-      message.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as JobVO
+        data.cronExpression = cronExpression.value
+        if (actionType.value === 'create') {
+          await JobApi.createJobApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await JobApi.updateJobApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/pay/app/index.vue b/yudao-ui-admin-vue3/src/views/pay/app/index.vue
index 36ded7be7..2968eb6ee 100644
--- a/yudao-ui-admin-vue3/src/views/pay/app/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/app/index.vue
@@ -50,23 +50,29 @@ const handleUpdate = async (row: AppVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as AppVO
-    if (actionType.value === 'create') {
-      await AppApi.createAppApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await AppApi.updateAppApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as AppVO
+        if (actionType.value === 'create') {
+          await AppApi.createAppApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await AppApi.updateAppApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
index e30cad5ef..e5f3e7ea1 100644
--- a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
@@ -50,23 +50,29 @@ const handleUpdate = async (row: MerchantVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as MerchantVO
-    if (actionType.value === 'create') {
-      await MerchantApi.createMerchantApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await MerchantApi.updateMerchantApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as MerchantVO
+        if (actionType.value === 'create') {
+          await MerchantApi.createMerchantApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await MerchantApi.updateMerchantApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/pay/order/index.vue b/yudao-ui-admin-vue3/src/views/pay/order/index.vue
index 63a8da7d2..25c482560 100644
--- a/yudao-ui-admin-vue3/src/views/pay/order/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/order/index.vue
@@ -48,23 +48,29 @@ const handleUpdate = async (row: OrderVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as OrderVO
-    if (actionType.value === 'create') {
-      await OrderApi.createOrderApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await OrderApi.updateOrderApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as OrderVO
+        if (actionType.value === 'create') {
+          await OrderApi.createOrderApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await OrderApi.updateOrderApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/index.vue b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
index 129510621..43c356bda 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
@@ -82,22 +82,28 @@ const handleDelete = async (data: { id: number }) => {
 }
 // 提交按钮
 const submitForm = async () => {
-  loading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as DeptVO
-    data.parentId = deptParentId.value
-    data.leaderUserId = leaderUserId.value
-    if (formTitle.value.startsWith('新增')) {
-      await DeptApi.createDeptApi(data)
-    } else if (formTitle.value.startsWith('修改')) {
-      await DeptApi.updateDeptApi(data)
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as DeptVO
+        data.parentId = deptParentId.value
+        data.leaderUserId = leaderUserId.value
+        if (formTitle.value.startsWith('新增')) {
+          await DeptApi.createDeptApi(data)
+        } else if (formTitle.value.startsWith('修改')) {
+          await DeptApi.updateDeptApi(data)
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+      } finally {
+        loading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-  } finally {
-    loading.value = false
-  }
+  })
 }
 onMounted(async () => {
   await getTree()
diff --git a/yudao-ui-admin-vue3/src/views/system/dict/index.vue b/yudao-ui-admin-vue3/src/views/system/dict/index.vue
index a49354591..26cc911a3 100644
--- a/yudao-ui-admin-vue3/src/views/system/dict/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dict/index.vue
@@ -92,43 +92,55 @@ const setDialogTile = (type: string) => {
 }
 // 提交按钮
 const submitTypeForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(typeFormRef)?.formModel as DictTypeVO
-    if (actionType.value === 'typeCreate') {
-      await DictTypeApi.createDictTypeApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else if (actionType.value === 'typeUpdate') {
-      await DictTypeApi.updateDictTypeApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(typeFormRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(typeFormRef)?.formModel as DictTypeVO
+        if (actionType.value === 'typeCreate') {
+          await DictTypeApi.createDictTypeApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else if (actionType.value === 'typeUpdate') {
+          await DictTypeApi.updateDictTypeApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        await getTypeList()
+        dialogVisible.value = false
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    await getTypeList()
-    dialogVisible.value = false
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 const submitDataForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(dataFormRef)?.formModel as DictDataVO
-    if (actionType.value === 'dataCreate') {
-      data.dictType = parentType.value
-      await DictDataApi.createDictDataApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else if (actionType.value === 'dataUpdate') {
-      await DictDataApi.updateDictDataApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(dataFormRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(dataFormRef)?.formModel as DictDataVO
+        if (actionType.value === 'dataCreate') {
+          data.dictType = parentType.value
+          await DictDataApi.createDictDataApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else if (actionType.value === 'dataUpdate') {
+          await DictDataApi.updateDictDataApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        await getDataList()
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+      } finally {
+        actionLoading.value = false
+      }
     }
-    await getDataList()
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 // 初始化查询
 onMounted(async () => {
diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
index b35579fd1..a0fb96c32 100644
--- a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
@@ -49,23 +49,29 @@ const handleUpdate = async (row: ErrorCodeVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  loading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as ErrorCodeVO
-    if (actionType.value === 'create') {
-      await ErrorCodeApi.createErrorCodeApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await ErrorCodeApi.updateErrorCodeApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as ErrorCodeVO
+        if (actionType.value === 'create') {
+          await ErrorCodeApi.createErrorCodeApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await ErrorCodeApi.updateErrorCodeApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        loading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    loading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/menu/index.vue b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
index 035b9d875..73cb78587 100644
--- a/yudao-ui-admin-vue3/src/views/system/menu/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
@@ -127,7 +127,7 @@ const handleDelete = async (row: MenuVO) => {
   await getList()
 }
 // 保存操作
-function isExternal(path: string) {
+const isExternal = (path: string) => {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 const submitForm = async () => {
diff --git a/yudao-ui-admin-vue3/src/views/system/notice/index.vue b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
index 44fe19091..738a3f060 100644
--- a/yudao-ui-admin-vue3/src/views/system/notice/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
@@ -48,23 +48,29 @@ const handleUpdate = async (row: NoticeVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as NoticeVO
-    if (actionType.value === 'create') {
-      await NoticeApi.createNoticeApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await NoticeApi.updateNoticeApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as NoticeVO
+        if (actionType.value === 'create') {
+          await NoticeApi.createNoticeApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await NoticeApi.updateNoticeApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
index e08f6d32a..bd1ba5a2c 100644
--- a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
@@ -49,23 +49,29 @@ const handleUpdate = async (row: OAuth2ClientVo) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as OAuth2ClientVo
-    if (actionType.value === 'create') {
-      await ClientApi.createOAuth2ClientApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await ClientApi.updateOAuth2ClientApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as OAuth2ClientVo
+        if (actionType.value === 'create') {
+          await ClientApi.createOAuth2ClientApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await ClientApi.updateOAuth2ClientApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/post/index.vue b/yudao-ui-admin-vue3/src/views/system/post/index.vue
index 3995b6759..4275ec15b 100644
--- a/yudao-ui-admin-vue3/src/views/system/post/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue
@@ -50,23 +50,29 @@ const handleUpdate = async (row: PostVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as PostVO
-    if (actionType.value === 'create') {
-      await PostApi.createPostApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await PostApi.updatePostApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as PostVO
+        if (actionType.value === 'create') {
+          await PostApi.createPostApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await PostApi.updatePostApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/role/index.vue b/yudao-ui-admin-vue3/src/views/system/role/index.vue
index c9bcca564..39273f4f0 100644
--- a/yudao-ui-admin-vue3/src/views/system/role/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/role/index.vue
@@ -68,23 +68,29 @@ const handleUpdate = async (row: RoleVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  loading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as RoleVO
-    if (actionType.value === 'create') {
-      await RoleApi.createRoleApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await RoleApi.updateRoleApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as RoleVO
+        if (actionType.value === 'create') {
+          await RoleApi.createRoleApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await RoleApi.updateRoleApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        loading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    loading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
index 69f9f97c5..5dbd6f5ea 100644
--- a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
@@ -56,23 +56,29 @@ const handleUpdate = async (row: SensitiveWordVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as SensitiveWordVO
-    if (actionType.value === 'create') {
-      await SensitiveWordApi.createSensitiveWordApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await SensitiveWordApi.updateSensitiveWordApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as SensitiveWordVO
+        if (actionType.value === 'create') {
+          await SensitiveWordApi.createSensitiveWordApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await SensitiveWordApi.updateSensitiveWordApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
index 083e1cc3d..bb77f2e02 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
@@ -49,23 +49,29 @@ const handleUpdate = async (row: SmsChannelVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  loading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as SmsChannelVO
-    if (actionType.value === 'create') {
-      await SmsChannelApi.createSmsChannelApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await SmsChannelApi.updateSmsChannelApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as SmsChannelVO
+        if (actionType.value === 'create') {
+          await SmsChannelApi.createSmsChannelApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await SmsChannelApi.updateSmsChannelApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        loading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    loading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
index 71d455ec5..e1c192eee 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
@@ -49,23 +49,29 @@ const handleUpdate = async (row: SmsTemplateVO) => {
 
 // 提交按钮
 const submitForm = async () => {
-  loading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as SmsTemplateVO
-    if (actionType.value === 'create') {
-      await SmsTemplateApi.createSmsTemplateApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await SmsTemplateApi.updateSmsTemplateApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as SmsTemplateVO
+        if (actionType.value === 'create') {
+          await SmsTemplateApi.createSmsTemplateApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await SmsTemplateApi.updateSmsTemplateApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        loading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    loading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
index 204e0c7ef..696d15e96 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
@@ -71,26 +71,32 @@ const handleUpdate = async (row: any) => {
 
 // 提交按钮
 const submitForm = async () => {
-  actionLoading.value = true
-  // 提交请求 unix()
-  try {
-    const data = unref(formRef)?.formModel as TenantVO
-    data.packageId = tenantPackageId.value
-    if (actionType.value === 'create') {
-      data.expireTime = dayjs(data.expireTime).valueOf().toString()
-      await TenantApi.createTenantApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      data.expireTime = dayjs(data.expireTime).valueOf().toString()
-      await TenantApi.updateTenantApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as TenantVO
+        data.packageId = tenantPackageId.value
+        if (actionType.value === 'create') {
+          data.expireTime = dayjs(data.expireTime).valueOf().toString()
+          await TenantApi.createTenantApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          data.expireTime = dayjs(data.expireTime).valueOf().toString()
+          await TenantApi.updateTenantApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    actionLoading.value = false
-  }
+  })
 }
 
 // ========== 详情相关 ==========
diff --git a/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue b/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue
index 9bed7cef9..9d2cd4970 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue
@@ -76,24 +76,30 @@ const handleUpdate = async (row: any) => {
 }
 // 提交按钮
 const submitForm = async () => {
-  loading.value = true
-  // 提交请求
-  try {
-    const data = unref(formRef)?.formModel as TenantPackageVO
-    data.menuIds = treeRef.value!.getCheckedKeys(false) as string[]
-    if (actionType.value === 'create') {
-      await TenantPackageApi.createTenantPackageTypeApi(data)
-      ElMessage.success(t('common.createSuccess'))
-    } else {
-      await TenantPackageApi.updateTenantPackageTypeApi(data)
-      ElMessage.success(t('common.updateSuccess'))
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as TenantPackageVO
+        data.menuIds = treeRef.value!.getCheckedKeys(false) as string[]
+        if (actionType.value === 'create') {
+          await TenantPackageApi.createTenantPackageTypeApi(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await TenantPackageApi.updateTenantPackageTypeApi(data)
+          ElMessage.success(t('common.updateSuccess'))
+        }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        loading.value = false
+      }
     }
-    // 操作成功，重新加载列表
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    loading.value = false
-  }
+  })
 }
 
 // ========== 初始化 ==========

From 922b39c02cd3f5a533f4a7c763b9d7f8ef9c2589 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Mon, 17 Oct 2022 13:02:23 +0800
Subject: [PATCH 41/48] docs: update

---
 README.md                                     |  6 ++--
 yudao-ui-admin-vue3/README.md                 |  8 ++---
 yudao-ui-admin-vue3/package.json              | 22 ++++++-------
 .../src/views/Login/components/LoginForm.vue  | 33 ++++++++++---------
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 5f65867b9..03bb45912 100644
--- a/README.md
+++ b/README.md
@@ -209,9 +209,9 @@ ps：核心功能已经实现，正在对接微信小程序中...
 
 | 框架                                                                  | 说明              | 版本     |
 |----------------------------------------------------------------------|-----------------|--------|
-| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架          | 3.2.40 |
-| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具         | 3.1.7  |
-| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus    | 2.2.17 |
+| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架          | 3.2.41 |
+| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具         | 3.1.8  |
+| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus    | 2.2.18 |
 | [TypeScript](https://www.typescriptlang.org/docs/)                   | TypeScript      | 4.8.4  |
 | [pinia](https://pinia.vuejs.org/)                                    | vuex5           | 2.0.23 |
 | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化             | 9.2.2  |
diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md
index 77b589ee4..b9032638e 100644
--- a/yudao-ui-admin-vue3/README.md
+++ b/yudao-ui-admin-vue3/README.md
@@ -27,12 +27,12 @@
 
 | 框架 | 说明 | 版本     |
 | --- | --- |--------|
-| [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.40 |
-| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.7 |
-| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.17 |
+| [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.41 |
+| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.8 |
+| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.18 |
 | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.8.4 |
 | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.23 |
-| [vueuse](https://vueuse.org//) | 常用工具集 | 9.3.0 |
+| [vueuse](https://vueuse.org//) | 常用工具集 | 9.3.1 |
 | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
 | [vue-router](https://router.vuejs.org/) | vue 路由 | 4.1.5 |
 | [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index b6c1c184d..ab056d30b 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@iconify/iconify": "^3.0.0",
-    "@vueuse/core": "^9.3.0",
+    "@vueuse/core": "^9.3.1",
     "@wangeditor/editor": "^5.1.21",
     "@wangeditor/editor-for-vue": "^5.1.10",
     "@zxcvbn-ts/core": "^2.0.5",
@@ -36,7 +36,7 @@
     "dayjs": "^1.11.5",
     "echarts": "^5.4.0",
     "echarts-wordcloud": "^2.0.0",
-    "element-plus": "2.2.17",
+    "element-plus": "2.2.18",
     "intro.js": "^6.0.0",
     "jsencrypt": "^3.2.1",
     "lodash-es": "^4.17.21",
@@ -46,7 +46,7 @@
     "qrcode": "^1.5.1",
     "qs": "^6.11.0",
     "url": "^0.11.0",
-    "vue": "3.2.40",
+    "vue": "3.2.41",
     "vue-cropper": "^1.0.3",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.1.5",
@@ -56,12 +56,12 @@
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@iconify/json": "^2.1.120",
+    "@iconify/json": "^2.1.122",
     "@intlify/vite-plugin-vue-i18n": "^6.0.3",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.8.4",
+    "@types/node": "^18.11.0",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
@@ -78,21 +78,21 @@
     "less": "^4.1.3",
     "lint-staged": "^13.0.3",
     "plop": "^3.1.1",
-    "postcss": "^8.4.17",
+    "postcss": "^8.4.18",
     "postcss-html": "^1.5.0",
     "postcss-less": "^6.0.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.1",
-    "stylelint": "^14.13.0",
+    "stylelint": "^14.14.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recommended": "^9.0.0",
-    "stylelint-config-standard": "^28.0.0",
+    "stylelint-config-standard": "^29.0.0",
     "stylelint-order": "^5.0.0",
     "typescript": "4.8.4",
-    "unplugin-vue-macros": "^0.12.0",
-    "vite": "3.1.7",
+    "unplugin-vue-macros": "^0.13.2",
+    "vite": "3.1.8",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
@@ -100,7 +100,7 @@
     "vite-plugin-style-import": "2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-windicss": "^1.8.8",
-    "vue-tsc": "^1.0.3",
+    "vue-tsc": "^1.0.8",
     "windicss": "^3.5.6",
     "windicss-analysis": "^0.3.5"
   },
diff --git a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
index a9e53a01a..04a4eb8c8 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
@@ -103,24 +103,25 @@ const getCookie = () => {
 // 登录
 const handleLogin = async (params) => {
   loginLoading.value = true
-  await getTenantId()
-  const data = await validForm()
-  if (!data) {
+  try {
+    await getTenantId()
+    const data = await validForm()
+    if (!data) {
+      return
+    }
+    loginData.loginForm.captchaVerification = params.captchaVerification
+    const res = await LoginApi.loginApi(loginData.loginForm)
+    if (!res) {
+      return
+    }
+    setToken(res)
+    if (!redirect.value) {
+      redirect.value = '/'
+    }
+    push({ path: redirect.value || permissionStore.addRouters[0].path })
+  } finally {
     loginLoading.value = false
-    return
   }
-  loginData.loginForm.captchaVerification = params.captchaVerification
-  const res = await LoginApi.loginApi(loginData.loginForm)
-  if (!res) {
-    loginLoading.value = false
-    return
-  }
-  setToken(res)
-  if (!redirect.value) {
-    redirect.value = '/'
-  }
-  push({ path: redirect.value || permissionStore.addRouters[0].path })
-  loginLoading.value = false
 }
 
 // 社交登录

From dc8eb8e362bf057bcff92c405f3174fca0437539 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 18 Oct 2022 19:57:48 +0800
Subject: [PATCH 42/48] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Redis=20=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-server/src/main/resources/application-local.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index e7eb34999..2136e5e4f 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -68,10 +68,10 @@ spring:
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
-    host: 139.9.196.247 # 地址
+    host: 127.0.0.1 # 地址
     port: 6379 # 端口
     database: 0 # 数据库索引
-    password: 123456 # 密码，建议生产环境开启
+#    password: 123456 # 密码，建议生产环境开启
 
 jasypt:
   encryptor:

From a13fb61359d2aa415fbd9e74f5b995b9e42503bf Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 18 Oct 2022 23:32:42 +0800
Subject: [PATCH 43/48] =?UTF-8?q?=E4=BC=98=E5=8C=96=20pom.xml=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=87=8F=E5=B0=91=E6=97=A0=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-module-mall/yudao-module-coupon-biz/pom.xml  | 14 ++++++++------
 .../coupon/service/coupon/CouponServiceImpl.java   |  1 -
 yudao-module-mall/yudao-module-market-biz/pom.xml  | 14 ++++++++++----
 yudao-module-mall/yudao-module-product-biz/pom.xml | 11 ++++++-----
 yudao-module-mall/yudao-module-trade-biz/pom.xml   | 12 +++++++-----
 .../admin/permission/MenuController.java           |  3 ---
 yudao-ui-admin/src/views/bpm/group/index.vue       |  1 -
 7 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/yudao-module-mall/yudao-module-coupon-biz/pom.xml b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
index eda16bd16..225c24d4e 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
@@ -30,10 +30,6 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
 
         <!-- Web 相关 -->
         <dependency>
@@ -42,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+            <artifactId>yudao-spring-boot-starter-security</artifactId>
         </dependency>
 
         <!-- DB 相关 -->
@@ -57,6 +53,12 @@
             <artifactId>yudao-spring-boot-starter-test</artifactId>
         </dependency>
 
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
+
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
index 0a1737a31..14f3cacc4 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
 import cn.iocoder.yudao.module.coupon.dal.mysql.CouponTemplete.CouponTempleteMapper;
-import io.micrometer.core.instrument.Counter;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-mall/yudao-module-market-biz/pom.xml b/yudao-module-mall/yudao-module-market-biz/pom.xml
index e7fa33e9d..e3f9f0670 100644
--- a/yudao-module-mall/yudao-module-market-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-market-biz/pom.xml
@@ -34,16 +34,16 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
 
         <!-- Web 相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-security</artifactId>
+        </dependency>
 
         <!-- DB 相关 -->
         <dependency>
@@ -56,6 +56,12 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-test</artifactId>
         </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-module-mall/yudao-module-product-biz/pom.xml b/yudao-module-mall/yudao-module-product-biz/pom.xml
index bb9a36f94..e89ed105e 100644
--- a/yudao-module-mall/yudao-module-product-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-product-biz/pom.xml
@@ -29,10 +29,6 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
 
         <!-- Web 相关 -->
         <dependency>
@@ -41,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+            <artifactId>yudao-spring-boot-starter-security</artifactId>
         </dependency>
 
         <!-- DB 相关 -->
@@ -56,6 +52,11 @@
             <artifactId>yudao-spring-boot-starter-test</artifactId>
         </dependency>
 
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-module-mall/yudao-module-trade-biz/pom.xml b/yudao-module-mall/yudao-module-trade-biz/pom.xml
index c9b582d93..5a8512232 100644
--- a/yudao-module-mall/yudao-module-trade-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-trade-biz/pom.xml
@@ -47,10 +47,6 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
 
         <!-- Web 相关 -->
         <dependency>
@@ -59,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+            <artifactId>yudao-spring-boot-starter-security</artifactId>
         </dependency>
 
         <!-- DB 相关 -->
@@ -73,6 +69,12 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-test</artifactId>
         </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
index e8e200911..9813d8c0a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
@@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.*;
 import cn.iocoder.yudao.module.system.convert.permission.MenuConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
 import cn.iocoder.yudao.module.system.service.permission.MenuService;
-import cn.iocoder.yudao.module.system.service.tenant.TenantService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -29,8 +28,6 @@ public class MenuController {
 
     @Resource
     private MenuService menuService;
-    @Resource
-    private TenantService tenantService;
 
     @PostMapping("/create")
     @ApiOperation("创建菜单")
diff --git a/yudao-ui-admin/src/views/bpm/group/index.vue b/yudao-ui-admin/src/views/bpm/group/index.vue
index 775aecda1..c280179da 100644
--- a/yudao-ui-admin/src/views/bpm/group/index.vue
+++ b/yudao-ui-admin/src/views/bpm/group/index.vue
@@ -127,7 +127,6 @@ export default {
         pageSize: 10,
         name: null,
         status: null,
-        tenantId: null,
         createTime: []
       },
       // 表单参数

From 3cee922e69a36fef734173e6d510bd97e486d8d4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 23 Oct 2022 20:21:04 +0800
Subject: [PATCH 44/48] =?UTF-8?q?=E4=BC=98=E5=8C=96=20permission=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/components/TopNav/index.vue     |  2 +-
 yudao-ui-admin/src/directive/index.js              |  1 +
 .../src/directive/permission/hasPermi.js           |  9 ++++-----
 yudao-ui-admin/src/directive/permission/hasRole.js |  8 ++++----
 .../src/layout/components/Sidebar/index.vue        |  1 +
 yudao-ui-admin/src/permission.js                   |  4 ++--
 yudao-ui-admin/src/router/index.js                 | 14 ++++++++------
 yudao-ui-admin/src/store/modules/permission.js     | 11 ++++++-----
 8 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/yudao-ui-admin/src/components/TopNav/index.vue b/yudao-ui-admin/src/components/TopNav/index.vue
index 0425f8cd0..c9862433b 100644
--- a/yudao-ui-admin/src/components/TopNav/index.vue
+++ b/yudao-ui-admin/src/components/TopNav/index.vue
@@ -67,7 +67,7 @@ export default {
     },
     // 设置子路由
     childrenMenus() {
-      var childrenMenus = [];
+      const childrenMenus = [];
       this.routers.map((router) => {
         for (var item in router.children) {
           if (router.children[item].parentPath === undefined) {
diff --git a/yudao-ui-admin/src/directive/index.js b/yudao-ui-admin/src/directive/index.js
index b9b07da3c..954f80973 100644
--- a/yudao-ui-admin/src/directive/index.js
+++ b/yudao-ui-admin/src/directive/index.js
@@ -5,6 +5,7 @@ import dialogDragWidth from './dialog/dragWidth'
 import dialogDragHeight from './dialog/dragHeight'
 import clipboard from './module/clipboard'
 
+// Vue：自定义指令：https://v2.cn.vuejs.org/v2/guide/custom-directive.html
 const install = function(Vue) {
   Vue.directive('hasRole', hasRole)
   Vue.directive('hasPermi', hasPermi)
diff --git a/yudao-ui-admin/src/directive/permission/hasPermi.js b/yudao-ui-admin/src/directive/permission/hasPermi.js
index d7107cec0..27909ffe8 100644
--- a/yudao-ui-admin/src/directive/permission/hasPermi.js
+++ b/yudao-ui-admin/src/directive/permission/hasPermi.js
@@ -2,22 +2,21 @@
  * 操作权限处理
  * Copyright (c) 2019 ruoyi
  */
- 
 import store from '@/store'
 
 export default {
   inserted(el, binding, vnode) {
     const { value } = binding
-    const all_permission = "*:*:*";
-    const permissions = store.getters && store.getters.permissions
+    const all_permission = "*:*:*"; // 全部权限
+    const permissions = store.getters && store.getters.permissions // 用户拥有的权限标识的数组
 
     if (value && value instanceof Array && value.length > 0) {
+      // 判断是否有权限
       const permissionFlag = value
-
       const hasPermissions = permissions.some(permission => {
         return all_permission === permission || permissionFlag.includes(permission)
       })
-
+      // 如果没有权限，则移除元素
       if (!hasPermissions) {
         el.parentNode && el.parentNode.removeChild(el)
       }
diff --git a/yudao-ui-admin/src/directive/permission/hasRole.js b/yudao-ui-admin/src/directive/permission/hasRole.js
index 13038099d..af221ce44 100644
--- a/yudao-ui-admin/src/directive/permission/hasRole.js
+++ b/yudao-ui-admin/src/directive/permission/hasRole.js
@@ -2,22 +2,22 @@
  * 角色权限处理
  * Copyright (c) 2019 ruoyi
  */
- 
+
 import store from '@/store'
 
 export default {
   inserted(el, binding, vnode) {
     const { value } = binding
     const super_admin = "admin";
-    const roles = store.getters && store.getters.roles
+    const roles = store.getters && store.getters.roles // 用户拥有的角色标识的数组
 
     if (value && value instanceof Array && value.length > 0) {
+      // 判断是否有角色
       const roleFlag = value
-
       const hasRole = roles.some(role => {
         return super_admin === role || roleFlag.includes(role)
       })
-
+      // 如果没有角色，则移除元素
       if (!hasRole) {
         el.parentNode && el.parentNode.removeChild(el)
       }
diff --git a/yudao-ui-admin/src/layout/components/Sidebar/index.vue b/yudao-ui-admin/src/layout/components/Sidebar/index.vue
index d46418659..cdb4e604d 100644
--- a/yudao-ui-admin/src/layout/components/Sidebar/index.vue
+++ b/yudao-ui-admin/src/layout/components/Sidebar/index.vue
@@ -12,6 +12,7 @@
         :collapse-transition="false"
         mode="vertical"
       >
+        <!-- 根据 sidebarRouters 路由，生成菜单 -->
         <sidebar-item
           v-for="(route, index) in sidebarRouters"
           :key="route.path  + index"
diff --git a/yudao-ui-admin/src/permission.js b/yudao-ui-admin/src/permission.js
index 3923eb55f..7125eeaa7 100644
--- a/yudao-ui-admin/src/permission.js
+++ b/yudao-ui-admin/src/permission.js
@@ -24,11 +24,11 @@ router.beforeEach((to, from, next) => {
         isRelogin.show = true
         // 获取字典数据 add by 芋艿
         store.dispatch('dict/loadDictDatas')
-        // 判断当前用户是否已拉取完user_info信息
+        // 判断当前用户是否已拉取完 user_info 信息
         store.dispatch('GetInfo').then(() => {
           isRelogin.show = false
           store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
+            // 根据 roles 权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
diff --git a/yudao-ui-admin/src/router/index.js b/yudao-ui-admin/src/router/index.js
index 7446a2f2b..4257fd514 100644
--- a/yudao-ui-admin/src/router/index.js
+++ b/yudao-ui-admin/src/router/index.js
@@ -8,18 +8,20 @@ Vue.use(Router)
 /**
  * Note: 路由配置项
  *
- * hidden: true                   // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
+ * hidden: true                   // 【重要】当设置 true 的时候该路由不会再侧边栏出现 如 401，login 等页面，或者如一些编辑页面 /edit/1
  * alwaysShow: true               // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
  *                                // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
  *                                // 若你想不管路由下面的 children 声明的个数都显示你的根路由
  *                                // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
+ * path: '/login',                // 【重要】访问的 URL 路径
+ * component: Layout,             // 【重要】对应的组件；也可以是 (resolve) => require(['@/views/login'], resolve),
  * redirect: noRedirect           // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- * name:'router-name'             // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
+ * name:'router-name'             // 【重要】设定路由的名字，一定要填写不然使用 <keep-alive> 时会出现各种问题
  * meta : {
-    noCache: true                // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
-    title: 'title'               // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'             // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false            // 如果设置为false，则不会在breadcrumb面包屑中显示
+    noCache: true                // 【重要】如果设置为 true，则不会被 <keep-alive> 缓存(默认 false)
+    title: 'title'               // 【重要】设置该路由在侧边栏和面包屑中展示的名字
+    icon: 'svg-name'             // 【重要】设置该路由的图标，对应路径 src/assets/icons/svg
+    breadcrumb: false            // 如果设置为 false，则不会在 breadcrumb 面包屑中显示
     activeMenu: '/system/user'   // 当路由设置了该属性，则会高亮相对应的侧边栏。
   }
  */
diff --git a/yudao-ui-admin/src/store/modules/permission.js b/yudao-ui-admin/src/store/modules/permission.js
index 4ddd9d2ac..caf99d59f 100644
--- a/yudao-ui-admin/src/store/modules/permission.js
+++ b/yudao-ui-admin/src/store/modules/permission.js
@@ -8,7 +8,8 @@ const permission = {
   state: {
     routes: [],
     addRoutes: [],
-    sidebarRouters: []
+    sidebarRouters: [], // 左侧边菜单的路由，被 Sidebar/index.vue 使用
+    topbarRouters: [], // 顶部菜单的路由，被 TopNav/index.vue 使用
   },
   mutations: {
     SET_ROUTES: (state, routes) => {
@@ -29,10 +30,10 @@ const permission = {
     // 生成路由
     GenerateRoutes({ commit }) {
       return new Promise(resolve => {
-        // 向后端请求路由数据
+        // 向后端请求路由数据（菜单）
         getRouters().then(res => {
-          const sdata = JSON.parse(JSON.stringify(res.data))
-          const rdata = JSON.parse(JSON.stringify(res.data))
+          const sdata = JSON.parse(JSON.stringify(res.data)) // 【重要】用于菜单中的数据
+          const rdata = JSON.parse(JSON.stringify(res.data)) // 用于最后添加到 Router 中的数据
           const sidebarRoutes = filterAsyncRouter(sdata)
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
@@ -57,7 +58,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       icon: route.icon,
       noCache: !route.keepAlive,
     }
-    // 路由地址转首字母大写驼峰，作为路由名称，适配keepAlive
+    // 路由地址转首字母大写驼峰，作为路由名称，适配 keepAlive
     route.name = toCamelCase(route.path, true)
     route.hidden = !route.visible
     // 处理 component 属性

From 74dfc60ef0b15be784f7bf601865ae6de240a311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=9D=A4?= <>
Date: Fri, 28 Oct 2022 09:28:20 +0800
Subject: [PATCH 45/48] =?UTF-8?q?fix=20:token=E5=88=B7=E6=96=B0=E3=80=81re?=
 =?UTF-8?q?memberMe=20=E3=80=81=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=20=E3=80=81=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=20bug=20add:=20=E5=AD=97=E4=BD=93=E6=8A=97?=
 =?UTF-8?q?=E9=94=AF=E9=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/.vscode/settings.json     |  3 +-
 yudao-ui-admin-vue3/package.json              |  1 +
 yudao-ui-admin-vue3/src/App.vue               | 13 +++----
 yudao-ui-admin-vue3/src/config/axios/index.ts | 11 +++---
 yudao-ui-admin-vue3/src/styles/var.css        |  6 ++++
 yudao-ui-admin-vue3/src/utils/jsencrypt.ts    |  2 +-
 .../src/views/Login/components/LoginForm.vue  | 34 +++++++++++--------
 yudao-ui-admin-vue3/types/env.d.ts            |  4 +--
 8 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/yudao-ui-admin-vue3/.vscode/settings.json b/yudao-ui-admin-vue3/.vscode/settings.json
index 7b2554efc..38cc3052a 100644
--- a/yudao-ui-admin-vue3/.vscode/settings.json
+++ b/yudao-ui-admin-vue3/.vscode/settings.json
@@ -39,5 +39,6 @@
   "i18n-ally.sourceLanguage": "en",
   "i18n-ally.displayLanguage": "zh-CN",
   "i18n-ally.enabledFrameworks": ["vue", "react"],
-  "god.tsconfig": "./tsconfig.json"
+  "god.tsconfig": "./tsconfig.json",
+  "vue-i18n.i18nPaths": "src/locales"
 }
diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index ab056d30b..b36f0cfd2 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -38,6 +38,7 @@
     "echarts-wordcloud": "^2.0.0",
     "element-plus": "2.2.18",
     "intro.js": "^6.0.0",
+    "js-cookie": "^3.0.1",
     "jsencrypt": "^3.2.1",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
diff --git a/yudao-ui-admin-vue3/src/App.vue b/yudao-ui-admin-vue3/src/App.vue
index 08d6b9997..20b5730bf 100644
--- a/yudao-ui-admin-vue3/src/App.vue
+++ b/yudao-ui-admin-vue3/src/App.vue
@@ -4,7 +4,7 @@ import { useAppStore } from '@/store/modules/app'
 import { ConfigGlobal } from '@/components/ConfigGlobal'
 import { isDark } from '@/utils/is'
 import { useDesign } from '@/hooks/web/useDesign'
-import { useCache } from '@/hooks/web/useCache'
+import Cookies from 'js-cookie'
 
 const { getPrefixCls } = useDesign()
 
@@ -16,18 +16,19 @@ const currentSize = computed(() => appStore.getCurrentSize)
 
 const greyMode = computed(() => appStore.getGreyMode)
 
-const { wsCache } = useCache()
-
 // 根据浏览器当前主题设置系统主题色
 const setDefaultTheme = () => {
-  if (wsCache.get('isDark')) {
-    appStore.setIsDark(wsCache.get('isDark'))
+  if (Cookies.get('isDark')) {
+    if (Cookies.get('isDark') === 'true') {
+      appStore.setIsDark(true)
+    } else {
+      appStore.setIsDark(false)
+    }
     return
   }
   const isDarkTheme = isDark()
   appStore.setIsDark(isDarkTheme)
 }
-
 setDefaultTheme()
 </script>
 
diff --git a/yudao-ui-admin-vue3/src/config/axios/index.ts b/yudao-ui-admin-vue3/src/config/axios/index.ts
index 064cb2268..60dad6aa0 100644
--- a/yudao-ui-admin-vue3/src/config/axios/index.ts
+++ b/yudao-ui-admin-vue3/src/config/axios/index.ts
@@ -96,6 +96,7 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   async (response: AxiosResponse<Recordable>) => {
     const { data } = response
+    const config = response.config
     if (!data) {
       // 返回“[HTTP]请求没有返回值”;
       throw new Error()
@@ -127,13 +128,13 @@ service.interceptors.response.use(
         try {
           const refreshTokenRes = await refreshToken()
           // 2.1 刷新成功，则回放队列的请求 + 当前请求
-          setToken(refreshTokenRes.data)
-          ;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken()
+          setToken(refreshTokenRes.data.data)
+          config.headers!.Authorization = 'Bearer ' + getAccessToken()
           requestList.forEach((cb: any) => {
             cb()
           })
           requestList = []
-          return service(response.config)
+          return service(config)
         } catch (e) {
           // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
           // 2.2 刷新失败，只回放队列的请求
@@ -150,8 +151,8 @@ service.interceptors.response.use(
         // 添加到队列，等待刷新获取到新的令牌
         return new Promise((resolve) => {
           requestList.push(() => {
-            ;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-            resolve(service(response.config))
+            config.headers!.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+            resolve(service(config))
           })
         })
       }
diff --git a/yudao-ui-admin-vue3/src/styles/var.css b/yudao-ui-admin-vue3/src/styles/var.css
index 23d8b6824..d0badc16b 100644
--- a/yudao-ui-admin-vue3/src/styles/var.css
+++ b/yudao-ui-admin-vue3/src/styles/var.css
@@ -65,3 +65,9 @@
 
   --transition-time-02: 0.2s;
 }
+
+html,
+body {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
diff --git a/yudao-ui-admin-vue3/src/utils/jsencrypt.ts b/yudao-ui-admin-vue3/src/utils/jsencrypt.ts
index c752b2f10..374d5f646 100644
--- a/yudao-ui-admin-vue3/src/utils/jsencrypt.ts
+++ b/yudao-ui-admin-vue3/src/utils/jsencrypt.ts
@@ -1,4 +1,4 @@
-import { JSEncrypt } from 'jsencrypt/bin/jsencrypt.min'
+import { JSEncrypt } from 'jsencrypt'
 
 // 密钥对生成 http://web.chacuo.net/netrsakeypair
 
diff --git a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
index 04a4eb8c8..44c13ea39 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
@@ -13,14 +13,7 @@ import {
 } from 'element-plus'
 import { reactive, ref, unref, onMounted, computed, watch } from 'vue'
 import * as LoginApi from '@/api/login'
-import {
-  setToken,
-  setTenantId,
-  getUsername,
-  getRememberMe,
-  getPassword,
-  getTenantName
-} from '@/utils/auth'
+import { setToken, setTenantId } from '@/utils/auth'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useRouter } from 'vue-router'
 import { useI18n } from '@/hooks/web/useI18n'
@@ -29,6 +22,8 @@ import { Icon } from '@/components/Icon'
 import { LoginStateEnum, useLoginState, useFormValid } from './useLogin'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
 import { Verify } from '@/components/Verifition'
+import Cookies from 'js-cookie'
+import { decrypt, encrypt } from '@/utils/jsencrypt'
 
 const { currentRoute, push } = useRouter()
 const permissionStore = usePermissionStore()
@@ -72,7 +67,7 @@ const captchaType = ref('blockPuzzle')
 // 获取验证码
 const getCode = async () => {
   // 情况一，未开启：则直接登录
-  if (!loginData.captchaEnable) {
+  if (loginData.captchaEnable === 'false') {
     await handleLogin({})
     return
   }
@@ -88,15 +83,15 @@ const getTenantId = async () => {
 }
 // 记住我
 const getCookie = () => {
-  const username = getUsername()
-  const password = getPassword()
-  const rememberMe = getRememberMe()
-  const tenantName = getTenantName()
+  const username = Cookies.get('username')
+  const password = Cookies.get('password') ? decrypt(Cookies.get('password')) : undefined
+  const rememberMe = Cookies.get('rememberMe')
+  const tenantName = Cookies.get('tenantName')
   loginData.loginForm = {
     ...loginData.loginForm,
     username: username ? username : loginData.loginForm.username,
     password: password ? password : loginData.loginForm.password,
-    rememberMe: rememberMe ? getRememberMe() : false,
+    rememberMe: rememberMe ? true : false,
     tenantName: tenantName ? tenantName : loginData.loginForm.tenantName
   }
 }
@@ -114,6 +109,17 @@ const handleLogin = async (params) => {
     if (!res) {
       return
     }
+    if (loginData.loginForm.rememberMe) {
+      Cookies.set('username', loginData.loginForm.username, { expires: 30 })
+      Cookies.set('password', encrypt(loginData.loginForm.password), { expires: 30 })
+      Cookies.set('rememberMe', loginData.loginForm.rememberMe, { expires: 30 })
+      Cookies.set('tenantName', loginData.loginForm.tenantName, { expires: 30 })
+    } else {
+      Cookies.remove('username')
+      Cookies.remove('password')
+      Cookies.remove('rememberMe')
+      Cookies.remove('tenantName')
+    }
     setToken(res)
     if (!redirect.value) {
       redirect.value = '/'
diff --git a/yudao-ui-admin-vue3/types/env.d.ts b/yudao-ui-admin-vue3/types/env.d.ts
index b42713656..b8cff557a 100644
--- a/yudao-ui-admin-vue3/types/env.d.ts
+++ b/yudao-ui-admin-vue3/types/env.d.ts
@@ -11,8 +11,8 @@ interface ImportMetaEnv {
   readonly VITE_APP_TITLE: string
   readonly VITE_PORT: number
   readonly VITE_OPEN: boolean
-  readonly VITE_APP_CAPTCHA_ENABLE: boolean
-  readonly VITE_APP_TENANT_ENABLE: boolean
+  readonly VITE_APP_CAPTCHA_ENABLE: string
+  readonly VITE_APP_TENANT_ENABLE: string
   readonly VITE_BASE_URL: string
   readonly VITE_UPLOAD_URL: string
   readonly VITE_API_BASEPATH: string

From 04fb4c0365879949a0b71d75801af41fe400f0cd Mon Sep 17 00:00:00 2001
From: weikun <>
Date: Fri, 28 Oct 2022 10:55:51 +0800
Subject: [PATCH 46/48] =?UTF-8?q?fix:=20=E8=B7=AF=E7=94=B1=E9=A1=B6?=
 =?UTF-8?q?=E7=BA=A7=E9=9D=9E=E7=9B=AE=E5=BD=95=E8=8F=9C=E5=8D=95=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/src/utils/routerHelper.ts | 59 ++++++++++++-------
 yudao-ui-admin-vue3/types/router.d.ts         |  1 +
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/utils/routerHelper.ts b/yudao-ui-admin-vue3/src/utils/routerHelper.ts
index 73e673037..79fd410d8 100644
--- a/yudao-ui-admin-vue3/src/utils/routerHelper.ts
+++ b/yudao-ui-admin-vue3/src/utils/routerHelper.ts
@@ -65,30 +65,49 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord
       redirect: route.redirect,
       meta: meta
     }
-    // 目录
-    if (route.children) {
+    //处理顶级非目录路由
+    if (!route.children && route.parentId == 0 && route.component) {
       data.component = Layout
-      data.redirect = getRedirect(route.path, route.children)
-      // 外链
-    } else if (isUrl(route.path)) {
-      data = {
-        path: '/external-link',
-        component: Layout,
-        meta: {
-          name: route.name
-        },
-        children: [data]
-      } as AppRouteRecordRaw
-      // 菜单
-    } else {
-      // 对后端传component组件路径和不传做兼容（如果后端传component组件路径，那么path可以随便写，如果不传，component组件路径会根path保持一致）
+      data.meta = {}
+      data.name = toCamelCase(route.path, true) + 'Parent'
+      data.redirect = ''
+      const childrenData: AppRouteRecordRaw = {
+        path: '',
+        name: toCamelCase(route.path, true),
+        redirect: route.redirect,
+        meta: meta
+      }
       const index = route?.component
         ? modulesRoutesKeys.findIndex((ev) => ev.includes(route.component))
         : modulesRoutesKeys.findIndex((ev) => ev.includes(route.path))
-      data.component = modules[modulesRoutesKeys[index]]
-    }
-    if (route.children) {
-      data.children = generateRoute(route.children)
+      childrenData.component = modules[modulesRoutesKeys[index]]
+      data.children = [childrenData]
+    } else {
+      // 目录
+      if (route.children) {
+        data.component = Layout
+        data.redirect = getRedirect(route.path, route.children)
+        // 外链
+      } else if (isUrl(route.path)) {
+        data = {
+          path: '/external-link',
+          component: Layout,
+          meta: {
+            name: route.name
+          },
+          children: [data]
+        } as AppRouteRecordRaw
+        // 菜单
+      } else {
+        // 对后端传component组件路径和不传做兼容（如果后端传component组件路径，那么path可以随便写，如果不传，component组件路径会根path保持一致）
+        const index = route?.component
+          ? modulesRoutesKeys.findIndex((ev) => ev.includes(route.component))
+          : modulesRoutesKeys.findIndex((ev) => ev.includes(route.path))
+        data.component = modules[modulesRoutesKeys[index]]
+      }
+      if (route.children) {
+        data.children = generateRoute(route.children)
+      }
     }
     res.push(data)
   }
diff --git a/yudao-ui-admin-vue3/types/router.d.ts b/yudao-ui-admin-vue3/types/router.d.ts
index ba24ac588..7cc1c2f3b 100644
--- a/yudao-ui-admin-vue3/types/router.d.ts
+++ b/yudao-ui-admin-vue3/types/router.d.ts
@@ -74,5 +74,6 @@ declare global {
     children?: AppCustomRouteRecordRaw[]
     keepAlive?: boolean
     visible?: boolean
+    parentId?: number
   }
 }

From faea04546e1004494b2a4444ce1da80fe1391097 Mon Sep 17 00:00:00 2001
From: jueying <hhbvictory@163.com>
Date: Mon, 31 Oct 2022 17:13:05 +0800
Subject: [PATCH 47/48] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=88=B6=E8=8F=9C=E5=8D=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=EF=BC=8C=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/codegen/vue3/api/api.ts.vm |  14 +-
 .../resources/codegen/vue3/api/types.ts.vm    |  18 +-
 .../resources/codegen/vue3/views/data.ts.vm   | 170 ++++++-------
 .../resources/codegen/vue3/views/index.vue.vm | 236 +++++++++---------
 .../src/views/infra/codegen/EditTable.vue     |   8 +-
 .../infra/codegen/components/GenInfoForm.vue  |   2 +-
 6 files changed, 227 insertions(+), 221 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
index 69da81493..7d13b5dec 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
@@ -1,35 +1,35 @@
 import { useAxios } from '@/hooks/web/useAxios'
-import { ${simpleClassName}VO,${simpleClassName}PageReqVO,${simpleClassName}ExcelReqVO } from './types'
+import { ${simpleClassName}VO, ${simpleClassName}PageReqVO, ${simpleClassName}ExcelReqVO } from './types'
 
 const request = useAxios()
 
 #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
 // 查询${table.classComment}列表
 export const get${simpleClassName}PageApi = async (params: ${simpleClassName}PageReqVO) => {
-    return await request.get({ url: '${baseURL}/page', params })
+  return await request.get({ url: '${baseURL}/page', params })
 }
 
 // 查询${table.classComment}详情
 export const get${simpleClassName}Api = async (id: number) => {
-    return await request.get({ url: '${baseURL}/get?id=' + id })
+  return await request.get({ url: '${baseURL}/get?id=' + id })
 }
 
 // 新增${table.classComment}
 export const create${simpleClassName}Api = async (data: ${simpleClassName}VO) => {
-    return await request.post({ url: '${baseURL}/create', data })
+  return await request.post({ url: '${baseURL}/create', data })
 }
 
 // 修改${table.classComment}
 export const update${simpleClassName}Api = async (data: ${simpleClassName}VO) => {
-    return await request.put({ url: '${baseURL}/update', data })
+  return await request.put({ url: '${baseURL}/update', data })
 }
 
 // 删除${table.classComment}
 export const delete${simpleClassName}Api = async (id: number) => {
-    return await request.delete({ url: '${baseURL}/delete?id=' + id })
+  return await request.delete({ url: '${baseURL}/delete?id=' + id })
 }
 
 // 导出${table.classComment} Excel
 export const export${simpleClassName}Api = async (params: ${simpleClassName}ExcelReqVO) => {
-    return await request.download({ url: '${baseURL}/export-excel', params })
+  return await request.download({ url: '${baseURL}/export-excel', params })
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/types.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/types.ts.vm
index d5b5d937d..54ab47e02 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/types.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/types.ts.vm
@@ -2,9 +2,11 @@ export type ${simpleClassName}VO = {
 #foreach ($column in $columns)
 #if ($column.createOperation || $column.updateOperation)
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-    ${column.javaField}: number
+  ${column.javaField}: number
+#elseif(${column.javaType.toLowerCase()} == "date")
+  ${column.javaField}: string
 #else
-    ${column.javaField}: ${column.javaType.toLowerCase()}
+  ${column.javaField}: ${column.javaType.toLowerCase()}
 #end
 #end
 #end
@@ -14,9 +16,11 @@ export type ${simpleClassName}PageReqVO = {
 #foreach ($column in $columns)
 #if (${column.listOperation})##查询操作
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-    ${column.javaField}: number
+  ${column.javaField}: number
+#elseif(${column.javaType.toLowerCase()} == "date")
+  ${column.javaField}: string
 #else
-    ${column.javaField}: ${column.javaType.toLowerCase()}
+  ${column.javaField}: ${column.javaType.toLowerCase()}
 #end
 #end
 #end
@@ -26,9 +30,11 @@ export type ${simpleClassName}ExcelReqVO = {
 #foreach ($column in $columns)
 #if (${column.listOperation})##查询操作
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-    ${column.javaField}: number
+  ${column.javaField}: number
+#elseif(${column.javaType.toLowerCase()} == "date")
+  ${column.javaField}: string
 #else
-    ${column.javaField}: ${column.javaType.toLowerCase()}
+  ${column.javaField}: ${column.javaType.toLowerCase()}
 #end
 #end
 #end
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
index 965fe49ab..fa64bc883 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
@@ -8,104 +8,104 @@ export const rules = reactive({
 #foreach ($column in $columns)
 #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
 #set($comment=$column.columnComment)
-    $column.javaField: [{ required: true, message: "${comment}不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }],
+  $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == "select")'change'#else'blur'#end }],
 #end
 #end
 })
 // CrudSchema
 const crudSchemas = reactive<CrudSchema[]>([
 #foreach($column in $columns)
-    #if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation)
-    #set ($dictType = $column.dictType)
-    {
-      label: '${column.columnComment}',
-      field: '${column.javaField}',
-      #if ("" != $dictType)## 有数据字典
-      dictType: DICT_TYPE.$dictType.toUpperCase(),
-      #end
-      #if($column.primaryKey)
-      type: 'index',
-      form: {
-         show: false
-      },
-      detail: {
-         show: false
+  #if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation)
+  #set ($dictType = $column.dictType)
+  {
+    label: '${column.columnComment}',
+    field: '${column.javaField}',
+    #if ("" != $dictType)## 有数据字典
+    dictType: DICT_TYPE.$dictType.toUpperCase(),
+    #end
+    #if($column.primaryKey)
+    type: 'index',
+    form: {
+      show: false
+    },
+    detail: {
+      show: false
+    }
+    #else
+    #if (!$column.createOperation && !$column.updateOperation)
+    form: {
+      show: false
+    },
+    #elseif(!("" != $column.dictType))
+    form: {
+      show: true,
+      #if ($column.htmlType == "datetime")## 时间框
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
-      #else
-      #if (!$column.createOperation && !$column.updateOperation)
-      form: {
-         false
+      #elseif($column.htmlType == "editor")## 文本编辑器
+      component: 'Editor',
+      colProps: {
+        span: 24
       },
-      #elseif(!("" != $column.dictType))
-      form: {
-          show: true,
-          #if ($column.htmlType == "datetime")## 时间框
-          component: 'DatePicker',
-          componentProps: {
-              type: 'datetime',
-              valueFormat: 'YYYY-MM-DD HH:mm:ss'
-          }
-          #elseif($column.htmlType == "editor")## 文本编辑器
-          component: 'Editor',
-          colProps: {
-              span: 24
-          },
-          componentProps: {
-              valueHtml: ''
-          }
-          #elseif($column.htmlType == "textarea")## 文本框
-          component: 'Input',
-          componentProps: {
-              type: 'textarea',
-              rows: 4
-          },
-          colProps: {
-              span: 24
-          }
-          #end
-      },
-      #end
-      #if ($column.listOperationResult)
-      search: {
-         #if($column.htmlType == "input")
-         show: true
-         #else
-         #if($column.htmlType == "datetime")
-         show: true,
-         component: 'DatePicker',
-         componentProps: {
-             type: 'datetimerange',
-             valueFormat: 'YYYY-MM-DD HH:mm:ss'
-         }
-         #elseif($column.htmlType == "select" || $column.htmlType == "radio")
-         #if ("" == $dictType)## 没有数据字典
-         show: true,
-         component: 'Select',
-         componentProps: {
-             option: [{'','请选择字典生成'}]
-         }
-         #else
-         show: true
-         #end
-         #end
-         #end
+      componentProps: {
+        valueHtml: ''
+      }
+      #elseif($column.htmlType == "textarea")## 文本框
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+        rows: 4
+      },
+      colProps: {
+        span: 24
       }
-      #end
       #end
     },
     #end
-#end
-    {
-        label: t('table.action'),
-        field: 'action',
-        width: '240px',
-        form: {
-            show: false
-        },
-        detail: {
-            show: false
-        }
+    #if ($column.listOperationResult)
+    search: {
+      #if($column.htmlType == "input")
+      show: true
+      #else
+      #if($column.htmlType == "datetime")
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
+      }
+      #elseif($column.htmlType == "select" || $column.htmlType == "radio")
+      #if ("" == $dictType)## 没有数据字典
+      show: true,
+      component: 'Select',
+      componentProps: {
+        option: [{'','请选择字典生成'}]
+      }
+      #else
+      show: true
+      #end
+      #end
+      #end
     }
+    #end
+    #end
+  },
+  #end
+#end
+  {
+    label: t('table.action'),
+    field: 'action',
+    width: '240px',
+    form: {
+      show: false
+    },
+    detail: {
+      show: false
+    }
+  }
 ])
 
 export const { allSchemas } = useCrudSchemas(crudSchemas)
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index ca4adc1a6..7a050b8bb 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -1,92 +1,92 @@
 <script setup lang="ts">
-  import { ref, unref } from 'vue'
-  import dayjs from 'dayjs'
-  import { ElMessage } from 'element-plus'
-  import { DICT_TYPE } from '@/utils/dict'
-  import { useTable } from '@/hooks/web/useTable'
-  import { useI18n } from '@/hooks/web/useI18n'
-  import { FormExpose } from '@/components/Form'
-  import type { ${simpleClassName}VO } from '@/api/${table.moduleName}/${simpleClassName}/types'
-  import { rules, allSchemas } from './${simpleClassName}.data'
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${simpleClassName}'
-  const { t } = useI18n() // 国际化
+import { ref, unref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { DICT_TYPE } from '@/utils/dict'
+import { useTable } from '@/hooks/web/useTable'
+import { useI18n } from '@/hooks/web/useI18n'
+import { FormExpose } from '@/components/Form'
+import type { ${simpleClassName}VO } from '@/api/${table.moduleName}/${simpleClassName}/types'
+import { rules, allSchemas } from './${simpleClassName}.data'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${simpleClassName}'
+const { t } = useI18n() // 国际化
 
-  // ========== 列表相关 ==========
-  const { register, tableObject, methods } = useTable<${simpleClassName}VO>({
-    getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
-    delListApi: ${simpleClassName}Api.delete${simpleClassName}Api,
-    exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
-  })
-  const { getList, setSearchParams, delList, exportList } = methods
+// ========== 列表相关 ==========
+const { register, tableObject, methods } = useTable<${simpleClassName}VO>({
+  getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
+  delListApi: ${simpleClassName}Api.delete${simpleClassName}Api,
+  exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
+})
+const { getList, setSearchParams, delList, exportList } = methods
 
-  // ========== CRUD 相关 ==========
-  const actionLoading = ref(false) // 遮罩层
-  const actionType = ref('') // 操作按钮的类型
-  const dialogVisible = ref(false) // 是否显示弹出层
-  const dialogTitle = ref('edit') // 弹出层标题
-  const formRef = ref<FormExpose>() // 表单 Ref
+// ========== CRUD 相关 ==========
+const actionLoading = ref(false) // 遮罩层
+const actionType = ref('') // 操作按钮的类型
+const dialogVisible = ref(false) // 是否显示弹出层
+const dialogTitle = ref('edit') // 弹出层标题
+const formRef = ref<FormExpose>() // 表单 Ref
 
-  // 设置标题
-  const setDialogTile = (type: string) => {
-    dialogTitle.value = t('action.' + type)
-    actionType.value = type
-    dialogVisible.value = true
-  }
+// 设置标题
+const setDialogTile = (type: string) => {
+  dialogTitle.value = t('action.' + type)
+  actionType.value = type
+  dialogVisible.value = true
+}
 
-  // 新增操作
-  const handleCreate = () => {
-    setDialogTile('create')
-    // 重置表单
-    unref(formRef)?.getElFormRef()?.resetFields()
-  }
+// 新增操作
+const handleCreate = () => {
+  setDialogTile('create')
+  // 重置表单
+  unref(formRef)?.getElFormRef()?.resetFields()
+}
 
-  // 修改操作
-  const handleUpdate = async (row: ${simpleClassName}VO) => {
-    setDialogTile('update')
-    // 设置数据
-    const res = await ${simpleClassName}Api.get${simpleClassName}Api(row.id)
-    unref(formRef)?.setValues(res)
-  }
+// 修改操作
+const handleUpdate = async (row: ${simpleClassName}VO) => {
+  setDialogTile('update')
+  // 设置数据
+  const res = await ${simpleClassName}Api.get${simpleClassName}Api(row.id)
+  unref(formRef)?.setValues(res)
+}
 
-  // 提交按钮
-  const submitForm = async () => {
-    const elForm = unref(formRef)?.getElFormRef()
-    if (!elForm) return
-    elForm.validate(async (valid) => {
-      if (valid) {
-        actionLoading.value = true
-        // 提交请求
-        try {
-          const data = unref(formRef)?.formModel as ${simpleClassName}VO
-          if (actionType.value === 'create') {
-            await ${simpleClassName}Api.create${simpleClassName}Api(data)
-            ElMessage.success(t('common.createSuccess'))
-          } else {
-            await ${simpleClassName}Api.update${simpleClassName}Api(data)
-            ElMessage.success(t('common.updateSuccess'))
-          }
-          // 操作成功，重新加载列表
-          dialogVisible.value = false
-          await getList()
-        } finally {
-          actionLoading.value = false
+// 提交按钮
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as ${simpleClassName}VO
+        if (actionType.value === 'create') {
+          await ${simpleClassName}Api.create${simpleClassName}Api(data)
+          ElMessage.success(t('common.createSuccess'))
+        } else {
+          await ${simpleClassName}Api.update${simpleClassName}Api(data)
+          ElMessage.success(t('common.updateSuccess'))
         }
+        // 操作成功，重新加载列表
+        dialogVisible.value = false
+        await getList()
+      } finally {
+        actionLoading.value = false
       }
-    })
-  }
+    }
+  })
+}
 
-  // ========== 详情相关 ==========
-  const detailRef = ref() // 详情 Ref
+// ========== 详情相关 ==========
+const detailRef = ref() // 详情 Ref
 
-  // 详情操作
-  const handleDetail = async (row: ${simpleClassName}VO) => {
-    // 设置数据
-    detailRef.value = row
-    setDialogTile('detail')
-  }
+// 详情操作
+const handleDetail = async (row: ${simpleClassName}VO) => {
+  // 设置数据
+  detailRef.value = row
+  setDialogTile('detail')
+}
 
-  // ========== 初始化 ==========
-  getList()
+// ========== 初始化 ==========
+getList()
 </script>
 
 <template>
@@ -101,63 +101,63 @@
         <Icon icon="ep:zoom-in" class="mr-5px" /> {{ t('action.add') }}
       </el-button>
       <el-button
-          type="warning"
-          v-hasPermi="['${permissionPrefix}:export']"
-          :loading="tableObject.exportLoading"
-          @click="exportList('数据.xls')"
+        type="warning"
+        v-hasPermi="['${permissionPrefix}:export']"
+        :loading="tableObject.exportLoading"
+        @click="exportList('数据.xls')"
       >
         <Icon icon="ep:download" class="mr-5px" /> {{ t('action.export') }}
       </el-button>
     </div>
     <!-- 列表 -->
     <Table
-        :columns="allSchemas.tableColumns"
-        :selection="false"
-        :data="tableObject.tableList"
-        :loading="tableObject.loading"
-        :pagination="{
+      :columns="allSchemas.tableColumns"
+      :selection="false"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
       }"
-        v-model:pageSize="tableObject.pageSize"
-        v-model:currentPage="tableObject.currentPage"
-        @register="register"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      @register="register"
     >
 #foreach($column in $columns)
 #if ($column.listOperationResult)
   #set ($dictType=$column.dictType)
   #if ($column.javaType == "Date")## 时间类型
-    <template #${column.javaField}="{ row }">
-      <span>{{ dayjs(row.${column.javaField}).format('YYYY-MM-DD HH:mm:ss') }}</span>
-    </template>
+      <template #${column.javaField}="{ row }">
+        <span>{{ dayjs(row.${column.javaField}).format('YYYY-MM-DD HH:mm:ss') }}</span>
+      </template>
   #elseif("" != $column.dictType)## 数据字典
-    <template #${column.javaField}="{ row }">
-      <DictTag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${column.javaField}" />
-    </template>
+      <template #${column.javaField}="{ row }">
+        <DictTag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${column.javaField}" />
+      </template>
   #end
 #end
 #end
       <template #action="{ row }">
         <el-button
-            link
-            type="primary"
-            v-hasPermi="['${permissionPrefix}:update']"
-            @click="handleUpdate(row)"
+          link
+          type="primary"
+          v-hasPermi="['${permissionPrefix}:update']"
+          @click="handleUpdate(row)"
         >
           <Icon icon="ep:edit" class="mr-1px" /> {{ t('action.edit') }}
         </el-button>
         <el-button
-            link
-            type="primary"
-            v-hasPermi="['${permissionPrefix}:update']"
-            @click="handleDetail(row)"
+          link
+          type="primary"
+          v-hasPermi="['${permissionPrefix}:update']"
+          @click="handleDetail(row)"
         >
           <Icon icon="ep:view" class="mr-1px" /> {{ t('action.detail') }}
         </el-button>
         <el-button
-            link
-            type="primary"
-            v-hasPermi="['${permissionPrefix}:delete']"
-            @click="delList(row.id, false)"
+          link
+          type="primary"
+          v-hasPermi="['${permissionPrefix}:delete']"
+          @click="delList(row.id, false)"
         >
           <Icon icon="ep:delete" class="mr-1px" /> {{ t('action.del') }}
         </el-button>
@@ -168,16 +168,16 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle">
     <!-- 对话框(添加 / 修改) -->
     <Form
-        v-if="['create', 'update'].includes(actionType)"
-        :schema="allSchemas.formSchema"
-        :rules="rules"
-        ref="formRef"
+      v-if="['create', 'update'].includes(actionType)"
+      :schema="allSchemas.formSchema"
+      :rules="rules"
+      ref="formRef"
     />
     <!-- 对话框(详情) -->
     <Descriptions
-        v-if="actionType === 'detail'"
-        :schema="allSchemas.detailSchema"
-        :data="detailRef"
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailRef"
     >
 #foreach($column in $columns)
   #if ($column.listOperationResult)
@@ -197,10 +197,10 @@
     <!-- 操作按钮 -->
     <template #footer>
       <el-button
-          v-if="['create', 'update'].includes(actionType)"
-          type="primary"
-          :loading="actionLoading"
-          @click="submitForm"
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :loading="actionLoading"
+        @click="submitForm"
       >
         {{ t('action.save') }}
       </el-button>
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
index 968f308d6..91bf847d0 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
@@ -38,15 +38,15 @@ const submitForm = async () => {
   if (basicForm && genForm) {
     const basicInfoData = (await basicInfo?.getFormData()) as CodegenTableVO
     const genInfoData = (await genInfo?.getFormData()) as CodegenTableVO
-    const genTable: CodegenUpdateReqVO = {
-      table: Object.assign({}, basicInfoData, genInfoData),
-      columns: cloumCurrentRow.value
-    }
     if (parentMenuId.value) {
       genInfoData.parentMenuId = parentMenuId.value
     } else {
       genInfoData.parentMenuId = 0
     }
+    const genTable: CodegenUpdateReqVO = {
+      table: Object.assign({}, basicInfoData, genInfoData),
+      columns: cloumCurrentRow.value
+    }
     await updateCodegenTableApi(genTable)
     ElMessage.success(t('common.updateSuccess'))
     push('/infra/codegen')
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
index e51a9a91f..c2b592207 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
@@ -150,7 +150,7 @@ defineExpose({
         :props="menuProps"
         :data="menuOptions"
         check-strictly
-        @node-click="handleNodeClick"
+        @change="handleNodeClick"
       />
     </template>
   </Form>

From 5596984e32fd9d454ceda81a524e166f5a86fabc Mon Sep 17 00:00:00 2001
From: weikun <>
Date: Tue, 1 Nov 2022 14:07:42 +0800
Subject: [PATCH 48/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/src/api/system/user/profile/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts b/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts
index 3eab59e01..34bbaf8c0 100644
--- a/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts
@@ -16,7 +16,7 @@ export const updateUserProfileApi = (params) => {
 export const updateUserPwdApi = (oldPassword: string, newPassword: string) => {
   return request.put({
     url: '/system/user/profile/update-password',
-    params: {
+    data: {
       oldPassword: oldPassword,
       newPassword: newPassword
     }