Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.1

sql/bpm-flowable.sql

@@ -1343,7 +1343,7 @@ CREATE TABLE `FLW_CHANNEL_DEFINITION` (
   `DESCRIPTION_` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`ID_`),
   UNIQUE KEY `ACT_IDX_CHANNEL_DEF_UNIQ` (`KEY_`,`VERSION_`,`TENANT_ID_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of FLW_CHANNEL_DEFINITION
@@ -1370,7 +1370,7 @@ CREATE TABLE `FLW_EV_DATABASECHANGELOG` (
   `CONTEXTS` varchar(255) DEFAULT NULL,
   `LABELS` varchar(255) DEFAULT NULL,
   `DEPLOYMENT_ID` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of FLW_EV_DATABASECHANGELOG
@@ -1389,7 +1389,7 @@ CREATE TABLE `FLW_EV_DATABASECHANGELOGLOCK` (
   `LOCKGRANTED` datetime DEFAULT NULL,
   `LOCKEDBY` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of FLW_EV_DATABASECHANGELOGLOCK
@@ -1414,7 +1414,7 @@ CREATE TABLE `FLW_EVENT_DEFINITION` (
   `DESCRIPTION_` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`ID_`),
   UNIQUE KEY `ACT_IDX_EVENT_DEF_UNIQ` (`KEY_`,`VERSION_`,`TENANT_ID_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of FLW_EVENT_DEFINITION
@@ -1434,7 +1434,7 @@ CREATE TABLE `FLW_EVENT_DEPLOYMENT` (
   `TENANT_ID_` varchar(255) DEFAULT NULL,
   `PARENT_DEPLOYMENT_ID_` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`ID_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of FLW_EVENT_DEPLOYMENT
@@ -1452,7 +1452,7 @@ CREATE TABLE `FLW_EVENT_RESOURCE` (
   `DEPLOYMENT_ID_` varchar(255) DEFAULT NULL,
   `RESOURCE_BYTES_` longblob,
   PRIMARY KEY (`ID_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of FLW_EVENT_RESOURCE

yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java

@@ -75,16 +75,16 @@ public class TenantSecurityWebFilter extends ApiRequestFilter {
             }
         }
 
-        // 2. 如果请求未带租户的编号，检查是否是忽略的 URL，否则也不允许访问。
-        if (tenantId == null && !isIgnoreUrl(request)) {
-            log.error("[doFilterInternal][URL({}/{}) 未传递租户编号]", request.getRequestURI(), request.getMethod());
-            ServletUtils.writeJSON(response, CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),
-                    "租户的请求未传递，请进行排查"));
-            return;
-        }
-
-        // 3. 校验租户是合法，例如说被禁用、到期
-        if (tenantId != null) {
+        //检查是否是忽略的 URL, 如果是则允许访问
+        if (!isIgnoreUrl(request)) {
+            // 2. 如果请求未带租户的编号，不允许访问。
+            if (tenantId == null) {
+                log.error("[doFilterInternal][URL({}/{}) 未传递租户编号]", request.getRequestURI(), request.getMethod());
+                ServletUtils.writeJSON(response, CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),
+                        "租户的请求未传递，请进行排查"));
+                return;
+            }
+            // 3. 校验租户是合法，例如说被禁用、到期
             try {
                 tenantFrameworkService.validTenant(tenantId);
             } catch (Throwable ex) {

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.Duration;
@@ -24,11 +23,6 @@ public class SecurityProperties {
      */
     @NotNull(message = "Token 过期时间不能为空")
     private Duration tokenTimeout;
-    /**
-     * Token 秘钥
-     */
-    @NotEmpty(message = "Token 秘钥不能为空")
-    private String tokenSecret;
     /**
      * Session 过期时间
      *

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/JWTAuthenticationTokenFilter.java

@@ -66,7 +66,7 @@ public class JWTAuthenticationTokenFilter extends OncePerRequestFilter {
      * 注意，在线上环境下，一定要关闭该功能！！！
      *
      * @param request 请求
-     * @param token 模拟的 token，格式为 {@link SecurityProperties#getTokenSecret()} + 用户编号
+     * @param token 模拟的 token，格式为 {@link SecurityProperties#getMockSecret()} + 用户编号
      * @return 模拟的 LoginUser
      */
     private LoginUser mockLoginUser(HttpServletRequest request, String token) {

yudao-server/src/main/resources/application-dev.yaml

@@ -168,7 +168,6 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
 yudao:
   security:
     token-header: Authorization
-    token-secret: abcdefghijklmnopqrstuvwxyz
     token-timeout: 1d
     session-timeout: 30m
     mock-enable: true

yudao-server/src/main/resources/application-local.yaml

@@ -180,9 +180,7 @@ yudao:
     enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试
   security:
     token-header: Authorization
-    token-secret: abcdefghijklmnopqrstuvwxyz
     token-timeout: 1d
-#    session-timeout: 30m
     session-timeout: 1d
     mock-enable: true
     mock-secret: test

yudao-ui-admin/src/utils/request.js

@@ -97,9 +97,9 @@ service.interceptors.response.use(res => {
         type: 'error',
         duration: 0,
         dangerouslyUseHTMLString: true,
-        message: '<div>演示模式，不发进行写操作</div>'
+        message: '<div>演示模式，无法进行写操作</div>'
           + '<div> &nbsp; </div>'
-          + '<div>参考 https://www.iocoder.cn/Yudao/build-debugger-environment 教程</div>'
+          + '<div>参考 https://doc.iocoder.cn/ 教程</div>'
           + '<div> &nbsp; </div>'
           + '<div>5 分钟搭建本地环境</div>',
       })

yudao-ui-admin/src/views/infra/file/index.vue

@@ -110,7 +110,7 @@ export default {
         open: false, // 是否显示弹出层
         title: "", // 弹出层标题
         isUploading: false, // 是否禁用上传
-        url: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload", // 请求地址
+        url: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
         headers: { Authorization: "Bearer " + getToken() }, // 设置上传的请求头部
         data: {} // 上传的额外数据，用于文件名
       },