From f9401cabb2afcc9ce69f0ea3aa8a27f6f4284ed1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 9 Feb 2023 18:36:14 +0800
Subject: [PATCH 01/48] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86api=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/plugins/server/XAuthServer.java  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
index 331d6b1c58..1cd27cad47 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
@@ -16,19 +16,20 @@ import io.dataease.plugins.xpack.auth.dto.request.XpackSysAuthRequest;
 import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetail;
 import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetailDTO;
 import io.dataease.plugins.xpack.auth.dto.response.XpackVAuthModelDTO;
+import io.dataease.plugins.xpack.auth.service.AuthXpackService;
 import io.dataease.service.datasource.DatasourceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
-import io.dataease.plugins.xpack.auth.service.AuthXpackService;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@ApiIgnore
+@Api(tags = "权限管理")
 @RequestMapping("/plugin/auth")
 @RestController
 public class XAuthServer {
@@ -41,6 +42,7 @@ public class XAuthServer {
     @RequiresPermissions("auth:read")
     @PostMapping("/authModels")
     @I18n
+    @ApiOperation("根据类型查询权限树")
     public List<XpackVAuthModelDTO> authModels(@RequestBody XpackBaseTreeRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         CurrentUserDto user = AuthUtils.getUser();
@@ -49,6 +51,7 @@ public class XAuthServer {
 
     @RequiresPermissions("auth:read")
     @PostMapping("/authDetails")
+    @ApiOperation("查询权限源目标映射关系")
     public Map<String, List<XpackSysAuthDetailDTO>> authDetails(@RequestBody XpackSysAuthRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         return sysAuthService.searchAuthDetails(request);
@@ -57,6 +60,7 @@ public class XAuthServer {
     @RequiresPermissions("auth:read")
     @GetMapping("/authDetailsModel/{authType}/{direction}")
     @I18n
+    @ApiOperation("查询授权明细")
     public List<XpackSysAuthDetail> authDetailsModel(@PathVariable String authType, @PathVariable String direction) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         List<XpackSysAuthDetail> authDetails = sysAuthService.searchAuthDetailsModel(authType);
@@ -72,6 +76,7 @@ public class XAuthServer {
 
     @RequiresPermissions("auth:read")
     @PostMapping("/authChange")
+    @ApiOperation("变更授权信息")
     public void authChange(@RequestBody XpackSysAuthRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         CurrentUserDto user = AuthUtils.getUser();
@@ -157,17 +162,17 @@ public class XAuthServer {
     }
 
     @GetMapping("/getDatasourceTypes")
-    public List<DatasourceBaseType> getDatasourceTypes(){
-        Collection<DataSourceType> activeType =  datasourceService.types();
-        Map<String,String> activeTypeMap = activeType.stream().collect(Collectors.toMap(DataSourceType::getType, DataSourceType::getName));
-        activeTypeMap.put("all","所有数据源");
+    public List<DatasourceBaseType> getDatasourceTypes() {
+        Collection<DataSourceType> activeType = datasourceService.types();
+        Map<String, String> activeTypeMap = activeType.stream().collect(Collectors.toMap(DataSourceType::getType, DataSourceType::getName));
+        activeTypeMap.put("all", "所有数据源");
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         List<DatasourceBaseType> presentTypes = sysAuthService.getDatasourceTypes();
         presentTypes.stream().forEach(datasourceBaseType -> {
-            if(activeTypeMap.get(datasourceBaseType.getType())!=null){
+            if (activeTypeMap.get(datasourceBaseType.getType()) != null) {
                 datasourceBaseType.setName(activeTypeMap.get(datasourceBaseType.getType()));
             }
         });
-         return presentTypes;
+        return presentTypes;
     }
 }

From 1b83afc800928f21a46f8dc4c82252103624a250 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 9 Feb 2023 20:18:46 +0800
Subject: [PATCH 02/48] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Ddoris=E4=B8=AD=E4=BD=BF=E7=94=A8case=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/doris/DorisQueryProvider.java      | 25 +++++++++++++++----
 .../src/main/resources/sql/sqlTemplate.stg    | 14 +++++++++--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
index 204a3f73f0..26e12c4b12 100644
--- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
@@ -155,7 +155,10 @@ public class DorisQueryProvider extends QueryProvider {
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("previewSql");
         st_sql.add("isGroup", isGroup);
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
         String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // row permissions tree
@@ -345,7 +348,10 @@ public class DorisQueryProvider extends QueryProvider {
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@@ -435,7 +441,10 @@ public class DorisQueryProvider extends QueryProvider {
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("previewSql");
         st_sql.add("isGroup", false);
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
         String sql = st_sql.render();
@@ -558,7 +567,10 @@ public class DorisQueryProvider extends QueryProvider {
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@@ -672,7 +684,10 @@ public class DorisQueryProvider extends QueryProvider {
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
diff --git a/backend/src/main/resources/sql/sqlTemplate.stg b/backend/src/main/resources/sql/sqlTemplate.stg
index 41cd934e64..9a0485cd51 100644
--- a/backend/src/main/resources/sql/sqlTemplate.stg
+++ b/backend/src/main/resources/sql/sqlTemplate.stg
@@ -1,4 +1,4 @@
-querySql(limitFiled, groups, aggregators, filters, orders, table, notUseAs)
+querySql(limitFiled, groups, aggregators, filters, orders, table, notUseAs, useAliasForGroup)
 ::=<<
 SELECT
 <if(limitFiled)>
@@ -25,8 +25,13 @@ WHERE
 <endif>
 <if(groups)>
 GROUP BY
+<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
+<if(useAliasForGroup)>
+    <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
+<endif>
+<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">
@@ -34,7 +39,7 @@ ORDER BY
 >>
 
 
-previewSql(limitFiled, groups, aggregators, filters, orders, table, isGroup, notUseAs)
+previewSql(limitFiled, groups, aggregators, filters, orders, table, isGroup, notUseAs, useAliasForGroup)
 ::=<<
 SELECT
 <if(limitFiled)>
@@ -61,8 +66,13 @@ WHERE
 <endif>
 <if(isGroup && groups)>
 GROUP BY
+<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
+<if(useAliasForGroup)>
+    <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
+<endif>
+<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">

From e41295c36b49b22f6efc927c1f2fd72a69de5c18 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 10 Feb 2023 10:01:16 +0800
Subject: [PATCH 03/48] =?UTF-8?q?refactor:=20Api=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/auth/api/AuthApi.java    |  5 ++--
 .../io/dataease/auth/api/DynamicMenuApi.java  |  4 +++-
 .../dataease/config/Knife4jConfiguration.java | 23 +++++++++++--------
 .../dataease/plugins/server/XAuthServer.java  |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/api/AuthApi.java b/backend/src/main/java/io/dataease/auth/api/AuthApi.java
index aeaee10e13..2b15b62e51 100644
--- a/backend/src/main/java/io/dataease/auth/api/AuthApi.java
+++ b/backend/src/main/java/io/dataease/auth/api/AuthApi.java
@@ -6,14 +6,13 @@ import io.dataease.auth.api.dto.LoginDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
-import springfox.documentation.annotations.ApiIgnore;
-
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 
-@Api(tags = "权限：权限管理")
+@Api(tags = "登录：登录管理")
 @ApiSupport(order = 10)
 @RequestMapping("/api/auth")
 public interface AuthApi {
diff --git a/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java b/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java
index 790c4917bb..9b972800f7 100644
--- a/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java
+++ b/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java
@@ -8,15 +8,17 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+
 import java.util.List;
 
-@Api(tags = "权限：动态菜单")
+@Api(tags = "登录：动态菜单")
 @ApiSupport(order = 20)
 @RequestMapping("/api/dynamicMenu")
 public interface DynamicMenuApi {
 
     /**
      * 根据heads中获取的token 获取username 获取对应权限的菜单
+     *
      * @return
      */
     @ApiOperation("查询")
diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
index eff1bb147e..c5b13ab877 100644
--- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
+++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
@@ -7,15 +7,19 @@ import com.google.common.base.Predicate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.RequestHandler;
-import springfox.documentation.builders.*;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.oas.annotations.EnableOpenApi;
 import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,7 +27,7 @@ import java.util.List;
 @EnableOpenApi
 @Configuration
 @Import(BeanValidatorPluginsConfiguration.class)
-public class Knife4jConfiguration implements BeanPostProcessor{
+public class Knife4jConfiguration implements BeanPostProcessor {
 
     private static final String splitor = ",";
 
@@ -33,7 +37,6 @@ public class Knife4jConfiguration implements BeanPostProcessor{
     private String version;
 
 
-
     @Autowired
     public Knife4jConfiguration(OpenApiExtensionResolver openApiExtensionResolver) {
         this.openApiExtensionResolver = openApiExtensionResolver;
@@ -41,7 +44,7 @@ public class Knife4jConfiguration implements BeanPostProcessor{
 
     @Bean(value = "authApi")
     public Docket authApi() {
-        return defaultApi("权限管理", "io.dataease.auth");
+        return defaultApi("登录管理", "io.dataease.auth");
     }
 
     @Bean(value = "chartApi")
@@ -69,24 +72,24 @@ public class Knife4jConfiguration implements BeanPostProcessor{
         return defaultApi("系统管理", "io.dataease.controller.sys,io.dataease.plugins.server");
     }
 
-    private ApiInfo apiInfo(){
+    private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("DataEase")
                 .description("人人可用的开源数据可视化分析工具")
                 .termsOfServiceUrl("https://dataease.io")
-                .contact(new Contact("Dataease","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com"))
+                .contact(new Contact("Dataease", "https://www.fit2cloud.com/dataease/index.html", "dataease@fit2cloud.com"))
                 .version(version)
                 .build();
     }
 
     private Docket defaultApi(String groupName, String packageName) {
-        List<SecurityScheme> securitySchemes=new ArrayList<>();
+        List<SecurityScheme> securitySchemes = new ArrayList<>();
         securitySchemes.add(accessKey());
         securitySchemes.add(signature());
 
         List<SecurityContext> securityContexts = new ArrayList<>();
         securityContexts.add(securityContext());
-        Docket docket=new Docket(DocumentationType.OAS_30)
+        Docket docket = new Docket(DocumentationType.OAS_30)
                 .apiInfo(apiInfo())
                 .groupName(groupName)
                 .select()
@@ -131,7 +134,7 @@ public class Knife4jConfiguration implements BeanPostProcessor{
         return input -> declaringClass(input).transform(handlerPackage(basePackage)).or(true);
     }
 
-    private static Function<Class<?>, Boolean> handlerPackage(final String basePackage)     {
+    private static Function<Class<?>, Boolean> handlerPackage(final String basePackage) {
         return input -> {
             // 循环判断匹配
             for (String strPackage : basePackage.split(splitor)) {
diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
index 1cd27cad47..7a9952fa61 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
@@ -29,7 +29,7 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Api(tags = "权限管理")
+@Api(tags = "xpack：权限管理")
 @RequestMapping("/plugin/auth")
 @RestController
 public class XAuthServer {

From 7e01b14c859b2e5bcac618a44f417c1b7526d7cb Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 10 Feb 2023 10:02:19 +0800
Subject: [PATCH 04/48] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Ddoris=E4=B8=AD=E4=BD=BF=E7=94=A8case=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/sql/sqlTemplate.stg | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/resources/sql/sqlTemplate.stg b/backend/src/main/resources/sql/sqlTemplate.stg
index 9a0485cd51..d24d71b521 100644
--- a/backend/src/main/resources/sql/sqlTemplate.stg
+++ b/backend/src/main/resources/sql/sqlTemplate.stg
@@ -23,15 +23,14 @@ FROM
 WHERE
     <filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
 <endif>
-<if(groups)>
+<if(groups && !useAliasForGroup)>
 GROUP BY
-<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
-<if(useAliasForGroup)>
+<if(groups && useAliasForGroup)>
+GROUP BY
     <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
 <endif>
-<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">
@@ -64,15 +63,14 @@ FROM
 WHERE
     <filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
 <endif>
-<if(isGroup && groups)>
+<if(groups && !useAliasForGroup)>
 GROUP BY
-<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
-<if(useAliasForGroup)>
+<if(groups && useAliasForGroup)>
+GROUP BY
     <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
 <endif>
-<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">

From ad8746e1bcd07bae8f5996086947c3d831efbf96 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 10 Feb 2023 12:54:44 +0800
Subject: [PATCH 05/48] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0token=E5=AF=BC=E8=87=B4=E9=80=80=E5=87=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/auth/filter/JWTFilter.java |  3 ++-
 .../io/dataease/commons/utils/TokenCacheUtils.java   | 10 ++++++++++
 backend/src/main/resources/ehcache/ehcache.xml       | 12 ++++++++++++
 frontend/src/utils/request.js                        |  3 ++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index 973b0fced2..24ca87c8d6 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -66,7 +66,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         if (StringUtils.startsWith(authorization, "Basic")) {
             return false;
         }
-        if (!TokenCacheUtils.validate(authorization)) {
+        if (!TokenCacheUtils.validate(authorization) && TokenCacheUtils.validateDelay(authorization)) {
             throw new AuthenticationException(expireMessage);
         }
         // 当没有出现登录超时 且需要刷新token 则执行刷新token
@@ -75,6 +75,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
             throw new AuthenticationException(expireMessage);
         }
         if (JWTUtils.needRefresh(authorization)) {
+            TokenCacheUtils.addWithTtl(authorization, 1L);
             TokenCacheUtils.remove(authorization);
             authorization = refreshToken(request, response);
         }
diff --git a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
index e17f293b51..338adbf2da 100644
--- a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 public class TokenCacheUtils {
 
     private static final String KEY = "sys_token_store";
+    private static final String DELAY_KEY = "sys_token_store_delay";
 
     public static void add(String token, Long userId) {
         CacheUtils.put(KEY, token, userId, null, null);
@@ -25,4 +26,13 @@ public class TokenCacheUtils {
         Object sys_token_store = CacheUtils.get(KEY, token);
         return ObjectUtils.isNotEmpty(sys_token_store) && StringUtils.isNotBlank(sys_token_store.toString()) && userId == Long.parseLong(sys_token_store.toString());
     }
+
+    public static void addWithTtl(String token, Long userId) {
+        CacheUtils.put(DELAY_KEY, token, userId, 3, 5);
+    }
+
+    public static boolean validateDelay(String token) {
+        Object tokenObj = CacheUtils.get(DELAY_KEY, token);
+        return ObjectUtils.isNotEmpty(tokenObj) && StringUtils.isNotBlank(tokenObj.toString());
+    }
 }
diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml
index c1fedd7f25..f8d8591b20 100644
--- a/backend/src/main/resources/ehcache/ehcache.xml
+++ b/backend/src/main/resources/ehcache/ehcache.xml
@@ -279,5 +279,17 @@
             diskPersistent="false"
     />
 
+    <cache
+            name="sys_token_store_delay"
+            eternal="false"
+            maxElementsInMemory="100"
+            maxElementsOnDisk="3000"
+            overflowToDisk="true"
+            diskPersistent="false"
+            timeToIdleSeconds="3"
+            timeToLiveSeconds="5"
+            memoryStoreEvictionPolicy="LRU"
+    />
+
 
 </ehcache>
\ No newline at end of file
diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js
index 78536360fc..477c20817c 100644
--- a/frontend/src/utils/request.js
+++ b/frontend/src/utils/request.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import store from '@/store'
 import { $alert, $error } from './message'
-import { getToken, getIdToken } from '@/utils/auth'
+import { getToken, getIdToken, setToken } from '@/utils/auth'
 import Config from '@/settings'
 import i18n from '@/lang'
 import { tryShowLoading, tryHideLoading } from './loading'
@@ -157,6 +157,7 @@ const checkAuth = response => {
   // token到期后自动续命 刷新token
   if (response.headers[RefreshTokenKey]) {
     const refreshToken = response.headers[RefreshTokenKey]
+    setToken(refreshToken)
     store.dispatch('user/refreshToken', refreshToken)
   }
 

From 44978fad4fc98e7001c719551bdbfe38b7b3ee57 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 10 Feb 2023 14:12:02 +0800
Subject: [PATCH 06/48] =?UTF-8?q?refactor:=20Api=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/plugins/server/XAuthServer.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
index 7a9952fa61..9c1e1efbcd 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
@@ -162,6 +162,7 @@ public class XAuthServer {
     }
 
     @GetMapping("/getDatasourceTypes")
+    @ApiOperation("查询授权的数据类型")
     public List<DatasourceBaseType> getDatasourceTypes() {
         Collection<DataSourceType> activeType = datasourceService.types();
         Map<String, String> activeTypeMap = activeType.stream().collect(Collectors.toMap(DataSourceType::getType, DataSourceType::getName));

From 67d31c839da8190a3a5e285ed42a73978d500524 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 13 Feb 2023 11:15:28 +0800
Subject: [PATCH 07/48] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0token=E5=AF=BC=E8=87=B4=E7=94=A8=E6=88=B7=E9=A2=91?=
 =?UTF-8?q?=E7=B9=81=E6=8E=89=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/auth/filter/JWTFilter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index 24ca87c8d6..e5bd636789 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -66,7 +66,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         if (StringUtils.startsWith(authorization, "Basic")) {
             return false;
         }
-        if (!TokenCacheUtils.validate(authorization) && TokenCacheUtils.validateDelay(authorization)) {
+        if (!TokenCacheUtils.validate(authorization) && !TokenCacheUtils.validateDelay(authorization)) {
             throw new AuthenticationException(expireMessage);
         }
         // 当没有出现登录超时 且需要刷新token 则执行刷新token

From 82547eb12d47a64887691d201aab5875c288aa0a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 13 Feb 2023 14:00:33 +0800
Subject: [PATCH 08/48] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=86=E9=A1=B5=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE=E8=B7=B3=E8=BD=AC=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E5=8F=AA=E6=9C=89=E7=AC=AC=E4=B8=80=E9=A1=B5?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=20#4494?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponentS2.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index 63d8bbd690..deb834afdc 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -67,8 +67,8 @@
           >
             {{ $t('chart.total') }}
             <span>{{
-              (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
-            }}</span>
+                (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
+              }}</span>
             {{ $t('chart.items') }}
           </span>
           <de-pagination
@@ -339,7 +339,7 @@ export default {
       if (this.chart.type === 'table-pivot') {
         rowData = { ...meta.rowQuery, ...meta.colQuery }
         rowData[meta.valueField] = meta.fieldValue
-      } else if (this.showPage) {
+      } else if (this.showPage && (this.chart.datasetMode === 1 || (this.chart.datasetMode === 0 && this.not_support_page_dataset.includes(this.chart.datasourceType)))) {
         const rowIndex = (this.currentPage.page - 1) * this.currentPage.pageSize + meta.rowIndex
         rowData = this.chart.data.tableRow[rowIndex]
       } else {

From 80e9a9fe6ac768285de32b45b736bfce3c9571f7 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 14 Feb 2023 11:40:58 +0800
Subject: [PATCH 09/48] =?UTF-8?q?feat:=20=E6=A0=B9=E6=8D=AEdataease.proper?=
 =?UTF-8?q?ties=E9=85=8D=E7=BD=AE=E9=87=8C=E7=9A=84mysql=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9D=A5=E6=9B=B4=E6=96=B0demo=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/DataSourceInitStartListener.java |  1 +
 .../service/datasource/DatasourceService.java | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
index fed96e7708..157c2f97aa 100644
--- a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
+++ b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
@@ -26,6 +26,7 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
         datasourceService.initDsCheckJob();
         dataSetTableService.updateDatasetTableStatus();
         engineService.initSimpleEngine();
+        datasourceService.updateDemoDs();
         CacheUtils.removeAll("ENGINE");
     }
 
diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index 76d2f12ef4..cd8c115e50 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -63,6 +63,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service
@@ -646,4 +648,22 @@ public class DatasourceService {
         addJob(basicInfo.getDsCheckIntervalType(), Integer.valueOf(basicInfo.getDsCheckInterval()));
     }
 
+    public void updateDemoDs() {
+        Datasource datasource = datasourceMapper.selectByPrimaryKey("76026997-94f9-4a35-96ca-151084638969");
+        MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);
+        Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)");
+        Matcher matcher = WITH_SQL_FRAGMENT.matcher(env.getProperty("spring.datasource.url"));
+        if (!matcher.find()) {
+            return;
+        }
+        mysqlConfiguration.setHost(matcher.group(1));
+        mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2)));
+        mysqlConfiguration.setDataBase(matcher.group(3).split("\\?")[0]);
+        mysqlConfiguration.setExtraParams(matcher.group(3).split("\\?")[1]);
+        mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username"));
+        mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password"));
+        datasource.setConfiguration(new Gson().toJson(mysqlConfiguration));
+        datasourceMapper.updateByPrimaryKey(datasource);
+    }
+
 }

From 4662dbc054c80c195c0b1a3cc942d4756ae5b581 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 14 Feb 2023 14:08:37 +0800
Subject: [PATCH 10/48] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=88=B01.18.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                         | 8 ++++----
 backend/src/main/resources/db/migration/V50__1.18.3.sql | 4 ++++
 frontend/package.json                                   | 2 +-
 frontend/pom.xml                                        | 2 +-
 mobile/pom.xml                                          | 2 +-
 pom.xml                                                 | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V50__1.18.3.sql

diff --git a/backend/pom.xml b/backend/pom.xml
index f5ece1d4af..039930587b 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.18.2</version>
+        <version>1.18.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -204,7 +204,7 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.3</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -215,12 +215,12 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-view</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.3</version>
         </dependency>
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-datasource</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.3</version>
         </dependency>
         <!-- kettle及数据源依赖 -->
         <dependency>
diff --git a/backend/src/main/resources/db/migration/V50__1.18.3.sql b/backend/src/main/resources/db/migration/V50__1.18.3.sql
new file mode 100644
index 0000000000..f9f320fd3f
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V50__1.18.3.sql
@@ -0,0 +1,4 @@
+UPDATE `my_plugin`
+SET `version` = '1.18.3'
+where `plugin_id` > 0
+  and `version` = '1.18.2';
diff --git a/frontend/package.json b/frontend/package.json
index f312476501..3816f0a7ab 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dataease",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "description": "dataease front",
   "private": true,
   "scripts": {
diff --git a/frontend/pom.xml b/frontend/pom.xml
index d49c6b1aa2..123e82483a 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>dataease-server</artifactId>
     <groupId>io.dataease</groupId>
-    <version>1.18.2</version>
+    <version>1.18.3</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mobile/pom.xml b/mobile/pom.xml
index c565ce5e97..063e794c90 100644
--- a/mobile/pom.xml
+++ b/mobile/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.18.2</version>
+        <version>1.18.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 0fcfa4d2bd..e99f15476b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dataease</groupId>
     <artifactId>dataease-server</artifactId>
-    <version>1.18.2</version>
+    <version>1.18.3</version>
     <packaging>pom</packaging>
 
     <parent>

From fc60ba441b56bb419bef9e45d37705ceb4c6a8b9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 15 Feb 2023 11:11:04 +0800
Subject: [PATCH 11/48] =?UTF-8?q?feat:=20=E6=A0=B9=E6=8D=AEdataease.proper?=
 =?UTF-8?q?ties=E9=85=8D=E7=BD=AE=E9=87=8C=E7=9A=84mysql=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9D=A5=E6=9B=B4=E6=96=B0demo=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/datasource/DatasourceService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index cd8c115e50..80474a31b3 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -663,7 +663,7 @@ public class DatasourceService {
         mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username"));
         mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password"));
         datasource.setConfiguration(new Gson().toJson(mysqlConfiguration));
-        datasourceMapper.updateByPrimaryKey(datasource);
+        datasourceMapper.updateByPrimaryKeyWithBLOBs(datasource);
     }
 
 }

From cf2ccfd0dbf08b710880721c0106f15f57257c50 Mon Sep 17 00:00:00 2001
From: zhaoqian <qian.zhao@fit2cloud.com>
Date: Wed, 15 Feb 2023 11:50:41 +0800
Subject: [PATCH 12/48] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=AF=B7=E6=B1=82=E4=BD=93=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/ChartViewService.java  | 8 ++++++++
 .../io/dataease/service/dataset/DataSetTableService.java  | 2 ++
 .../service/dataset/impl/direct/DirectFieldService.java   | 1 +
 3 files changed, 11 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 582eae1a61..fb4ea88283 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -529,6 +529,9 @@ public class ChartViewService {
             xAxisForRequest.addAll(xAxis);
             xAxisForRequest.addAll(extStack);
             datasourceRequest.setXAxis(xAxisForRequest);
+            List<ChartViewFieldDTO> yAxisForRequest = new ArrayList<>();
+            yAxisForRequest.addAll(yAxis);
+            datasourceRequest.setYAxis(yAxisForRequest);
             data = datasourceProvider.getData(datasourceRequest);
         } else if (table.getMode() == 1) {// 抽取
             datasourceRequest.setDatasource(ds);
@@ -1037,6 +1040,7 @@ public class ChartViewService {
             }
             if (StringUtils.isNotEmpty(totalPageSql) && StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) {
                 datasourceRequest.setQuery(totalPageSql);
+                datasourceRequest.setTotalPageFlag(true);
                 java.util.List<java.lang.String[]> tmpData = datasourceProvider.getData(datasourceRequest);
                 totalItems = CollectionUtils.isEmpty(tmpData) ? 0 : Long.valueOf(tmpData.get(0)[0]);
                 totalPage = (totalItems / pageInfo.getPageSize()) + (totalItems % pageInfo.getPageSize() > 0 ? 1 : 0);
@@ -1047,6 +1051,10 @@ public class ChartViewService {
             xAxisForRequest.addAll(xAxis);
             xAxisForRequest.addAll(extStack);
             datasourceRequest.setXAxis(xAxisForRequest);
+            List<ChartViewFieldDTO> yAxisForRequest = new ArrayList<>();
+            yAxisForRequest.addAll(yAxis);
+            datasourceRequest.setYAxis(yAxisForRequest);
+            datasourceRequest.setTotalPageFlag(false);
             data = datasourceProvider.getData(datasourceRequest);
             if (CollectionUtils.isNotEmpty(assistFields)) {
                 datasourceAssistRequest.setQuery(assistSQL(datasourceRequest.getQuery(), assistFields));
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index fd494179ea..2a6ba0f346 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -34,6 +34,7 @@ import io.dataease.plugins.common.base.mapper.*;
 import io.dataease.plugins.common.constants.DatasetType;
 import io.dataease.plugins.common.constants.DatasourceTypes;
 import io.dataease.plugins.common.constants.DeTypeConstants;
+import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
 import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
 import io.dataease.plugins.common.dto.datasource.DataSourceType;
 import io.dataease.plugins.common.dto.datasource.TableField;
@@ -712,6 +713,7 @@ public class DataSetTableService {
                 datasourceRequest.setPreviewData(true);
                 try {
                     datasourceRequest.setPageable(true);
+                    datasourceRequest.setPermissionFields(fields);
                     data.addAll(datasourceProvider.getData(datasourceRequest));
                 } catch (Exception e) {
                     logger.error(e.getMessage());
diff --git a/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java b/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
index 4ad4eb61e4..a06283d097 100644
--- a/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
@@ -195,6 +195,7 @@ public class DirectFieldService implements DataSetFieldService {
             datasourceRequest.setQuery(qp.createQuerySQL(tableName, permissionFields, !needSort, null, customFilter, rowPermissionsTree, deSortFields));
         }
         LogUtil.info(datasourceRequest.getQuery());
+        datasourceRequest.setPermissionFields(permissionFields);
         List<String[]> rows = datasourceProvider.getData(datasourceRequest);
         if (!needMapping) {
             List<Object> results = rows.stream().map(row -> row[0]).distinct().collect(Collectors.toList());

From 5c2da88248a8b9933b2add1d38ac773b898ddb2a Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 15 Feb 2023 14:12:20 +0800
Subject: [PATCH 13/48] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                          |  31 ++++-
 frontend/src/store/modules/user.js            |   6 +-
 .../views/system/user/PasswordUpdateForm.vue  | 111 ++++++++++++++++++
 frontend/src/views/system/user/PersonPwd.vue  | 104 +---------------
 4 files changed, 147 insertions(+), 105 deletions(-)
 create mode 100644 frontend/src/views/system/user/PasswordUpdateForm.vue

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 184adffb84..48e6959159 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -6,17 +6,42 @@
       ref="de-theme"
       component-name="ThemeSetting"
     />
+    <el-dialog
+      :visible.sync="showPasswordModifiedDialog"
+      append-to-body
+      :title="$t('user.change_password')"
+      :show-close="false"
+    >
+      <PasswordUpdateForm oldPwd="DataEase" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import PluginCom from '@/views/system/plugin/PluginCom'
+import { mapState } from 'vuex'
+import PasswordUpdateForm from '@/views/system/user/PasswordUpdateForm.vue'
 
 export default {
   name: 'App',
-  components: { PluginCom },
-  beforeCreate() {
-
+  components: { PluginCom, PasswordUpdateForm },
+  computed: {
+    ...mapState('user', [
+      'passwordModified',
+    ])
+  },
+  data() {
+    return {
+      showPasswordModifiedDialog: false
+    }
+  },
+  watch: {
+    passwordModified: {
+      handler(val) {
+        this.showPasswordModifiedDialog = !val
+      },
+      immediate: true
+    }
   }
 }
 </script>
diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js
index 648afec6ad..18aca6f46a 100644
--- a/frontend/src/store/modules/user.js
+++ b/frontend/src/store/modules/user.js
@@ -13,6 +13,7 @@ const getDefaultState = () => {
     name: '',
     user: {},
     roles: [],
+    passwordModified: true,
     avatar: '',
     // 第一次加载菜单时用到
     loadMenus: false,
@@ -66,7 +67,10 @@ const mutations = {
     if (language && i18n.locale !== language) {
       i18n.locale = language
     }
-  }
+  },
+  SET_PASSWORD_MODIFIED: (state, passwordModified) => {
+    state.passwordModified = passwordModified
+  },
 }
 
 const actions = {
diff --git a/frontend/src/views/system/user/PasswordUpdateForm.vue b/frontend/src/views/system/user/PasswordUpdateForm.vue
new file mode 100644
index 0000000000..4962649982
--- /dev/null
+++ b/frontend/src/views/system/user/PasswordUpdateForm.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-form
+    ref="createUserForm"
+    :model="form"
+    :rules="rule"
+    size="small"
+    label-width="auto"
+    label-position="right"
+  >
+    <el-form-item v-if="!oldPwd" :label="$t('user.origin_passwd')" prop="oldPwd">
+      <dePwd v-model="form.oldPwd" />
+    </el-form-item>
+    <el-form-item :label="$t('user.new_passwd')" prop="newPwd">
+      <dePwd v-model="form.newPwd" />
+    </el-form-item>
+    <el-form-item :label="$t('user.confirm_passwd')" prop="repeatPwd">
+      <dePwd v-model="form.repeatPwd" />
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="save">{{
+        $t('commons.confirm')
+      }}</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updatePersonPwd } from '@/api/system/user'
+import dePwd from '@/components/deCustomCm/DePwd.vue'
+export default {
+  name: 'PasswordUpdateForm',
+  components: { dePwd },
+  props: {
+    oldPwd: {
+      type: String,
+      default: ""
+    }
+  },
+  data() {
+    return {
+      form: {},
+      rule: {
+        oldPwd: [
+          {
+            required: true,
+            message: this.$t('user.input_password'),
+            trigger: 'blur'
+          }
+        ],
+        newPwd: [
+          {
+            required: true,
+            message: this.$t('user.input_password'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,30}$/,
+            message: this.$t('member.password_format_is_incorrect'),
+            trigger: 'blur'
+          }
+        ],
+        repeatPwd: [
+          {
+            required: true,
+            message: this.$t('user.input_password'),
+            trigger: 'blur'
+          },
+          { required: true, trigger: 'blur', validator: this.repeatValidator }
+        ]
+      }
+    }
+  },
+  created() {
+    if (this.oldPwd) {
+      this.form.oldPwd = this.oldPwd
+    }
+  },
+  methods: {
+    repeatValidator(rule, value, callback) {
+      if (value !== this.form.newPwd) {
+        callback(new Error(this.$t('member.inconsistent_passwords')))
+      } else {
+        callback()
+      }
+    },
+
+    save() {
+      this.$refs.createUserForm.validate((valid) => {
+        if (valid) {
+          const param = {
+            password: this.form.oldPwd,
+            newPassword: this.form.newPwd
+          }
+          updatePersonPwd(param).then((res) => {
+            this.$success(this.$t('commons.save_success'))
+            this.$store.commit('user/SET_PASSWORD_MODIFIED', true)
+            this.logout()
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    async logout() {
+      await this.$store.dispatch('user/logout')
+      this.$router.push('/')
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/system/user/PersonPwd.vue b/frontend/src/views/system/user/PersonPwd.vue
index 55e6939488..8e5a4f1ca1 100644
--- a/frontend/src/views/system/user/PersonPwd.vue
+++ b/frontend/src/views/system/user/PersonPwd.vue
@@ -5,45 +5,7 @@
         <div class="form-header">
           <span>{{ $t('user.change_password') }}</span>
         </div>
-        <el-form
-          ref="createUserForm"
-          :model="form"
-          :rules="rule"
-          size="small"
-          label-width="auto"
-          label-position="right"
-        >
-          <el-form-item
-            :label="$t('user.origin_passwd')"
-            prop="oldPwd"
-          >
-            <dePwd
-              v-model="form.oldPwd"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="$t('user.new_passwd')"
-            prop="newPwd"
-          >
-            <dePwd
-              v-model="form.newPwd"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="$t('user.confirm_passwd')"
-            prop="repeatPwd"
-          >
-            <dePwd
-              v-model="form.repeatPwd"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              @click="save"
-            >{{ $t('commons.confirm') }}</el-button>
-          </el-form-item>
-        </el-form>
+        <PasswordUpdateForm />
       </el-card>
     </div>
   </layout-content>
@@ -51,39 +13,9 @@
 
 <script>
 import LayoutContent from '@/components/business/LayoutContent'
-import { updatePersonPwd } from '@/api/system/user'
-import dePwd from '@/components/deCustomCm/DePwd.vue'
+import PasswordUpdateForm from './PasswordUpdateForm'
 export default {
-
-  components: { LayoutContent, dePwd },
-  data() {
-    return {
-      form: {
-
-      },
-      rule: {
-
-        oldPwd: [
-          { required: true, message: this.$t('user.input_password'), trigger: 'blur' }
-        ],
-        newPwd: [
-          { required: true, message: this.$t('user.input_password'), trigger: 'blur' },
-          {
-            required: true,
-            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,30}$/,
-            message: this.$t('member.password_format_is_incorrect'),
-            trigger: 'blur'
-          }
-        ],
-        repeatPwd: [
-          { required: true, message: this.$t('user.input_password'), trigger: 'blur' },
-          { required: true, trigger: 'blur', validator: this.repeatValidator }
-        ]
-
-      }
-
-    }
-  },
+  components: { LayoutContent, PasswordUpdateForm },
   mounted() {
     this.$nextTick(() => {
       this.$store.dispatch('app/toggleSideBarHide', true)
@@ -92,36 +24,6 @@ export default {
   created() {
     this.$store.dispatch('app/toggleSideBarHide', true)
   },
-  methods: {
-    repeatValidator(rule, value, callback) {
-      if (value !== this.form.newPwd) {
-        callback(new Error(this.$t('member.inconsistent_passwords')))
-      } else {
-        callback()
-      }
-    },
-
-    save() {
-      this.$refs.createUserForm.validate(valid => {
-        if (valid) {
-          const param = {
-            password: this.form.oldPwd,
-            newPassword: this.form.newPwd
-          }
-          updatePersonPwd(param).then(res => {
-            this.$success(this.$t('commons.save_success'))
-            this.logout()
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    async logout() {
-      await this.$store.dispatch('user/logout')
-      this.$router.push('/')
-    }
-  }
 }
 </script>
 <style lang="scss" scoped>

From 9445c96b502e6e1a8f750269c251b6a85e6506de Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 15 Feb 2023 15:58:01 +0800
Subject: [PATCH 14/48] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/auth/server/AuthServer.java    | 5 ++++-
 frontend/src/App.vue                                         | 2 +-
 frontend/src/store/modules/user.js                           | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
index 3eefede2df..6e1fdafd57 100644
--- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java
+++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
@@ -63,6 +63,7 @@ public class AuthServer implements AuthApi {
 
     @Override
     public Object login(@RequestBody LoginDto loginDto) throws Exception {
+        Map<String, Object> result = new HashMap<>();
         String username = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, loginDto.getUsername());
         String pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, loginDto.getPassword());
 
@@ -147,9 +148,11 @@ public class AuthServer implements AuthApi {
                 AccountLockStatus lockStatus = authUserService.recordLoginFail(username, 0);
                 DataEaseException.throwException(appendLoginErrorMsg(Translator.get("i18n_id_or_pwd_error"), lockStatus));
             }
+            if(user.getIsAdmin() && user.getPassword().equals("40b8893ea9ebc2d631c4bb42bb1e8996")){
+                result.put("passwordModified", false);
+            }
         }
 
-        Map<String, Object> result = new HashMap<>();
         TokenInfo tokenInfo = TokenInfo.builder().userId(user.getUserId()).username(username).build();
         String token = JWTUtils.sign(tokenInfo, realPwd);
         // 记录token操作时间
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 48e6959159..2dc1dd4a5f 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -12,7 +12,7 @@
       :title="$t('user.change_password')"
       :show-close="false"
     >
-      <PasswordUpdateForm oldPwd="DataEase" />
+      <PasswordUpdateForm oldPwd="dataease" />
     </el-dialog>
   </div>
 </template>
diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js
index 18aca6f46a..4910519ee5 100644
--- a/frontend/src/store/modules/user.js
+++ b/frontend/src/store/modules/user.js
@@ -83,6 +83,9 @@ const actions = {
         commit('SET_TOKEN', data.token)
         commit('SET_LOGIN_MSG', null)
         setToken(data.token)
+        if(data.hasOwnProperty('passwordModified')){
+          commit('SET_PASSWORD_MODIFIED', data.passwordModified)
+        }
         resolve()
       }).catch(error => {
         reject(error)

From 221eb107ffd9afea167af9b6202c4fc4ab318838 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 15 Feb 2023 16:03:02 +0800
Subject: [PATCH 15/48] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E9=9B=86=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E7=BC=93=E5=AD=98=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableController.java       |   7 +-
 frontend/src/views/dataset/add/AddCustom.vue  |  86 +++++----
 frontend/src/views/dataset/add/AddExcel.vue   |  43 +++--
 frontend/src/views/dataset/add/AddSQL.vue     | 170 +++++++++++-------
 frontend/src/views/dataset/add/AddUnion.vue   |  34 ++--
 5 files changed, 209 insertions(+), 131 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index 471297caff..3fd116cee9 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -72,11 +72,12 @@ public class DataSetTableController {
     }, logical = Logical.AND)
     @ApiOperation("更新")
     @PostMapping("update")
-    public List<DatasetTable> save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
+    public List<VAuthModelDTO> save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
         if (datasetTable.getType().equalsIgnoreCase("excel")) {
-            return dataSetTableService.saveExcel(datasetTable);
+            List<String> ids = dataSetTableService.saveExcel(datasetTable).stream().map(DatasetTable::getId).collect(Collectors.toList());
+            return vAuthModelService.queryAuthModelByIds("dataset", ids);
         } else {
-            return Collections.singletonList(dataSetTableService.save(datasetTable));
+            return vAuthModelService.queryAuthModelByIds("dataset", Collections.singletonList(dataSetTableService.save(datasetTable).getId()));
         }
     }
 
diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue
index d2d473d78e..e336ce4bb0 100644
--- a/frontend/src/views/dataset/add/AddCustom.vue
+++ b/frontend/src/views/dataset/add/AddCustom.vue
@@ -5,7 +5,7 @@
       class="title-text"
     >
       <span style="line-height: 26px;">
-        {{ param.tableId?$t('dataset.edit_custom_table'):$t('dataset.add_custom_table') }}
+        {{ param.tableId ? $t('dataset.edit_custom_table') : $t('dataset.add_custom_table') }}
       </span>
       <el-row style="float: right">
         <el-button
@@ -24,7 +24,7 @@
         </el-button>
       </el-row>
     </el-row>
-    <el-divider />
+    <el-divider/>
     <el-row>
       <el-form :inline="true">
         <el-form-item
@@ -105,9 +105,10 @@
 </template>
 
 <script>
-import { post, getTable } from '@/api/dataset/dataset'
+import { getTable, post } from '@/api/dataset/dataset'
 import DatasetGroupSelector from '../common/DatasetGroupSelector'
 import DatasetCustomField from '../common/DatasetCustomField'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'AddCustom',
@@ -252,6 +253,12 @@ export default {
       }
       post('/dataset/table/update', table).then(response => {
         // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        if (table.id) {
+          const renameNode = { id: table.id, name: table.name, label: table.name }
+          updateCacheTree('rename', 'dataset-tree', renameNode, JSON.parse(localStorage.getItem('dataset-tree')))
+        } else {
+          updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+        }
         this.$emit('saveSuccess', table)
         this.cancel()
       })
@@ -296,49 +303,50 @@ export default {
 </script>
 
 <style scoped>
-  .el-divider--horizontal {
-    margin: 12px 0;
-  }
+.el-divider--horizontal {
+  margin: 12px 0;
+}
 
-  .form-item {
-    margin-bottom: 6px;
-  }
+.form-item {
+  margin-bottom: 6px;
+}
 
-  .el-checkbox {
-    margin-bottom: 14px;
-    margin-left: 0;
-    margin-right: 14px;
-  }
+.el-checkbox {
+  margin-bottom: 14px;
+  margin-left: 0;
+  margin-right: 14px;
+}
 
-  .el-checkbox.is-bordered + .el-checkbox.is-bordered {
-    margin-left: 0;
-  }
+.el-checkbox.is-bordered + .el-checkbox.is-bordered {
+  margin-left: 0;
+}
 
-  .dataPreview ::v-deep .el-card__header{
-    padding: 0 8px 12px;
-  }
+.dataPreview ::v-deep .el-card__header {
+  padding: 0 8px 12px;
+}
 
-  .dataPreview ::v-deep .el-card__body{
-    padding:10px;
-  }
+.dataPreview ::v-deep .el-card__body {
+  padding: 10px;
+}
 
-  span{
-    font-size: 14px;
-  }
+span {
+  font-size: 14px;
+}
 
-  .panel-height{
-    height: calc(100vh - 56px - 15px - 26px - 25px - 43px);
-  }
+.panel-height {
+  height: calc(100vh - 56px - 15px - 26px - 25px - 43px);
+}
 
-  .blackTheme .panel-height{
-    height: calc(100vh - 56px - 15px - 26px - 25px - 43px);
-    border-color: var(--TableBorderColor) !important;
-  }
+.blackTheme .panel-height {
+  height: calc(100vh - 56px - 15px - 26px - 25px - 43px);
+  border-color: var(--TableBorderColor) !important;
+}
 
-  .span-number{
-    color: #0a7be0;
-  }
-  .table-count{
-    color: #606266;
-  }
+.span-number {
+  color: #0a7be0;
+}
+
+.table-count {
+  color: #606266;
+}
 </style>
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index cae74db8ae..0766591964 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -8,7 +8,7 @@
       class="arrow-right"
       @click="showLeft = true"
     >
-      <i class="el-icon-d-arrow-right" />
+      <i class="el-icon-d-arrow-right"/>
     </p>
     <div
       v-show="showLeft"
@@ -21,16 +21,16 @@
             effect="dark"
             placement="right"
           >
-            <div slot="content">
-              {{ $t('dataset.excel_info_1') }}<br>
-              {{ $t('dataset.excel_info_2') }}<br>
-              {{ $t('dataset.excel_info_3') }}
-            </div>
-            <i class="el-icon-warning-outline" /> </el-tooltip></span>
-        <i
-          class="el-icon-d-arrow-left"
-          @click="showLeft = false"
-        />
+      <div slot="content">
+        {{ $t('dataset.excel_info_1') }}<br>
+        {{ $t('dataset.excel_info_2') }}<br>
+        {{ $t('dataset.excel_info_3') }}
+      </div>
+      <i class="el-icon-warning-outline"/> </el-tooltip></span>
+      <i
+        class="el-icon-d-arrow-left"
+        @click="showLeft = false"
+      />
       </p>
       <el-upload
         :action="baseUrl + 'dataset/table/excel/upload'"
@@ -160,7 +160,7 @@
                   :key="field.fieldName + field.fieldType"
                   @command="(type) => handleCommand(type, field)"
                 >
-                  <span  class="type-switch">
+                  <span class="type-switch">
                     <svg-icon
                       v-if="field.fieldType === 'TEXT'"
                       icon-class="field_text"
@@ -179,7 +179,7 @@
                       icon-class="field_value"
                       class="field-icon-value"
                     />
-                    <i class="el-icon-arrow-down el-icon--right" /></span>
+                    <i class="el-icon-arrow-down el-icon--right"/></span>
                   <el-dropdown-menu
                     slot="dropdown"
                     style="width: 178px"
@@ -237,6 +237,7 @@ import { $alert } from '@/utils/message'
 import store from '@/store'
 import msgCfm from '@/components/msgCfm/index'
 import cancelMix from './cancelMix'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
 
 const token = getToken()
 
@@ -569,6 +570,9 @@ export default {
             table.mergeSheet = false
             post('/dataset/table/update', table)
               .then((response) => {
+                if (!table.id) {
+                  updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+                }
                 this.openMessageSuccess('deDataset.set_saved_successfully')
                 this.cancel(response.data)
               })
@@ -582,6 +586,9 @@ export default {
         this.loading = true
         post('/dataset/table/update', table)
           .then((response) => {
+            if (!table.id) {
+              updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+            }
             this.openMessageSuccess('deDataset.set_saved_successfully')
             this.cancel(response.data)
           })
@@ -637,10 +644,12 @@ export default {
     border-top-right-radius: 13px;
     border-bottom-right-radius: 13px;
   }
+
   .table-list {
     p {
       margin: 0;
     }
+
     height: 100%;
     width: 240px;
     padding: 16px 12px;
@@ -653,6 +662,7 @@ export default {
       display: flex;
       justify-content: space-between;
       color: var(--deTextPrimary, #1f2329);
+
       i {
         font-size: 14px;
         color: var(--deTextPlaceholder, #8f959e);
@@ -666,10 +676,12 @@ export default {
     .table-checkbox-list {
       height: calc(100% - 100px);
       overflow-y: auto;
+
       .custom-tree-node {
         position: relative;
         width: 80%;
         display: flex;
+
         .label {
           overflow: hidden;
           white-space: nowrap;
@@ -677,11 +689,13 @@ export default {
           width: 85%;
         }
       }
+
       .error-name-exist {
         position: absolute;
         top: 0;
         right: 0;
       }
+
       .item {
         height: 40px;
         width: 215px;
@@ -719,6 +733,7 @@ export default {
       display: flex;
       align-items: center;
       position: relative;
+
       .name {
         font-size: 14px;
         font-weight: 400;
@@ -749,10 +764,12 @@ export default {
         padding: 2px 1.5px;
         display: inline-block;
         cursor: pointer;
+
         i {
           margin-left: 4px;
           font-size: 12px;
         }
+
         &:hover {
           background: rgba(31, 35, 41, 0.1);
           border-radius: 4px;
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index d3cef63e5c..fb193a2f0e 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -70,7 +70,7 @@
             class="de-text-btn"
             @click="dataReference = true"
           >
-            <svg-icon icon-class="data-reference" />
+            <svg-icon icon-class="data-reference"/>
             {{ $t('deDataset.data_reference') }}
           </el-button>
           <el-button
@@ -80,17 +80,17 @@
             class="de-text-btn"
             @click="variableMgm"
           >
-            <svg-icon icon-class="reference-setting" />
+            <svg-icon icon-class="reference-setting"/>
             {{ $t('sql_variable.variable_mgm') }}
           </el-button>
-          <el-divider direction="vertical" />
+          <el-divider direction="vertical"/>
           <el-button
             class="de-text-btn"
             type="text"
             size="small"
             @click="getSQLPreview"
           >
-            <svg-icon icon-class="reference-play" />
+            <svg-icon icon-class="reference-play"/>
             {{ $t('deDataset.run_a_query') }}
           </el-button>
         </el-col>
@@ -111,7 +111,7 @@
                 dataTable = ''
                 ;keywords = ''
               "
-            ><i class="el-icon-arrow-left" /> {{ $t('chart.back') }}</span>
+            ><i class="el-icon-arrow-left"/> {{ $t('chart.back') }}</span>
             <span v-else>{{ $t('deDataset.data_reference') }}</span>
             <i
               style="cursor: pointer"
@@ -131,7 +131,7 @@
               :title="(showTable && dataTable) || selectedDatasource.name"
               class="grey-name"
             >
-              <svg-icon icon-class="db-de" />
+              <svg-icon icon-class="db-de"/>
               {{ (showTable && dataTable) || selectedDatasource.name }}
             </span>
             <span class="grey">
@@ -146,59 +146,61 @@
           v-if="!dataSource"
           class="no-select-datasource"
         >{{
-          $t('deDataset.to_start_using')
-        }}</span>
+            $t('deDataset.to_start_using')
+          }}</span>
         <template v-else>
-          <el-input :placeholder="$t('fu.search_bar.please_input')" style="padding: 5px" size="small" v-model="keywords"></el-input>
+          <el-input :placeholder="$t('fu.search_bar.please_input')" style="padding: 5px" size="small"
+                    v-model="keywords"
+          ></el-input>
           <div
-          v-if="dataSource && !dataTable"
-          v-loading="tableLoading"
-          class="item-list"
-        >
-          <div
-            v-for="ele in tableDataCopy"
-            :key="ele.name"
-            class="table-or-field"
-            @click="typeSwitch(ele)"
+            v-if="dataSource && !dataTable"
+            v-loading="tableLoading"
+            class="item-list"
           >
+            <div
+              v-for="ele in tableDataCopy"
+              :key="ele.name"
+              class="table-or-field"
+              @click="typeSwitch(ele)"
+            >
             <span
               :title="ele.remark"
               class="name"
             >{{ ele.name }}</span>
-            <i
-              v-clipboard:copy="ele.name"
-              v-clipboard:success="onCopy"
-              v-clipboard:error="onError"
-              class="el-icon-document-copy"
-              @click.stop
-            />
+              <i
+                v-clipboard:copy="ele.name"
+                v-clipboard:success="onCopy"
+                v-clipboard:error="onError"
+                class="el-icon-document-copy"
+                @click.stop
+              />
+            </div>
           </div>
-        </div>
-        <div
-          v-else-if="dataSource && dataTable"
-          v-loading="tableLoading"
-          class="item-list"
-        >
           <div
-            v-for="ele in fieldDataCopy"
-            :key="ele.fieldName"
-            class="table-or-field field"
+            v-else-if="dataSource && dataTable"
+            v-loading="tableLoading"
+            class="item-list"
           >
+            <div
+              v-for="ele in fieldDataCopy"
+              :key="ele.fieldName"
+              class="table-or-field field"
+            >
             <span
               :title="ele.remarks"
               class="name"
             >{{ ele.fieldName }}</span>
-            <i
-              v-clipboard:copy="ele.fieldName"
-              v-clipboard:success="onCopy"
-              v-clipboard:error="onError"
-              class="el-icon-document-copy"
-              @click.stop
-            />
+              <i
+                v-clipboard:copy="ele.fieldName"
+                v-clipboard:success="onCopy"
+                v-clipboard:error="onError"
+                class="el-icon-document-copy"
+                @click.stop
+              />
+            </div>
           </div>
-        </div>
         </template>
-        
+
       </div>
       <div class="sql-table">
         <div
@@ -229,10 +231,10 @@
               v-if="tabActive === 'result'"
               class="result-num"
             >{{
-              `(${$t('dataset.preview_show')} 1000 ${$t(
-                'dataset.preview_item'
-              )})`
-            }}</span>
+                `(${$t('dataset.preview_show')} 1000 ${$t(
+                  'dataset.preview_item'
+                )})`
+              }}</span>
 
             <span
               class="drag"
@@ -269,7 +271,8 @@
               :image-size="60"
               :image="errImg"
               :description="$t('deDataset.run_failed')"
-            >{{ errMsgCont }}</el-empty>
+            >{{ errMsgCont }}
+            </el-empty>
             <el-table
               v-else
               :data="plxTableData"
@@ -365,7 +368,7 @@
             direction="rtl"
           >
             <div class="content">
-              <i class="el-icon-info" />
+              <i class="el-icon-info"/>
               {{ $t('dataset.sql_variable_limit_1') }}<br>
               {{ $t('dataset.sql_variable_limit_2') }}<br>
             </div>
@@ -451,7 +454,7 @@
                     :content="$t('commons.parameter_effect')"
                     placement="top"
                   >
-                    <i class="el-icon-warning" />
+                    <i class="el-icon-warning"/>
                   </el-tooltip>
                 </template>
                 <template slot-scope="scope">
@@ -519,14 +522,16 @@
                 secondary
                 @click="closeVariableMgm"
               >{{
-                $t('dataset.cancel')
-              }}</deBtn>
+                  $t('dataset.cancel')
+                }}
+              </deBtn>
               <deBtn
                 type="primary"
                 @click="saveVariable()"
               >{{
-                $t('dataset.confirm')
-              }}</deBtn>
+                  $t('dataset.confirm')
+                }}
+              </deBtn>
             </div>
           </el-drawer>
         </div>
@@ -536,9 +541,8 @@
 </template>
 
 <script>
-import { post, listDatasource, isKettleRunning } from '@/api/dataset/dataset'
+import { getTable, isKettleRunning, listDatasource, post } from '@/api/dataset/dataset'
 import { codemirror } from 'vue-codemirror'
-import { getTable } from '@/api/dataset/dataset'
 import { Base64 } from 'js-base64'
 // 核心样式
 import 'codemirror/lib/codemirror.css'
@@ -568,6 +572,8 @@ import cancelMix from './cancelMix'
 import { pySort } from './util'
 import _ from 'lodash'
 import GridTable from '@/components/gridTable/index.vue'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
+
 export default {
   name: 'AddSQL',
   components: { codemirror, GridTable },
@@ -575,7 +581,8 @@ export default {
   props: {
     param: {
       type: Object,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -762,7 +769,7 @@ export default {
         this.fieldData = res.data
         this.fieldDataCopy = this.arrSort([...this.fieldData])
       })
-      .finally(() => {
+        .finally(() => {
           this.tableLoading = false
         })
     },
@@ -827,8 +834,8 @@ export default {
     },
     arrSort(arr = [], field = 'fieldName') {
       arr.sort((a, b) => {
-            return a[field][0].toLowerCase().charCodeAt() - b[field][0].toLowerCase().charCodeAt()
-          })
+        return a[field][0].toLowerCase().charCodeAt() - b[field][0].toLowerCase().charCodeAt()
+      })
 
       return arr
     },
@@ -923,16 +930,17 @@ export default {
     listSqlLog() {
       post(
         '/dataset/table/sqlLog/' +
-          this.paginationConfig.currentPage +
-          '/' +
-          this.paginationConfig.pageSize,
+        this.paginationConfig.currentPage +
+        '/' +
+        this.paginationConfig.pageSize,
         { id: this.param.tableId, dataSourceId: this.dataSource }
       )
         .then((response) => {
           this.sqlData = response.data.listObject
           this.paginationConfig.total = response.data.itemCount
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     },
     save() {
       if (!this.dataSource || this.datasource === '') {
@@ -965,6 +973,12 @@ export default {
       }
       post('/dataset/table/update', table)
         .then((response) => {
+          if (table.id) {
+            const renameNode = { id: table.id, name: table.name, label: table.name }
+            updateCacheTree('rename', 'dataset-tree', renameNode, JSON.parse(localStorage.getItem('dataset-tree')))
+          } else {
+            updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+          }
           this.openMessageSuccess('deDataset.set_saved_successfully')
           this.cancel(response.data)
         })
@@ -975,14 +989,16 @@ export default {
     onCopy(e) {
       this.openMessageSuccess('commons.copy_success')
     },
-    onError(e) {},
+    onError(e) {
+    },
     showSQL(val) {
       this.sql = val || ''
     },
     onCmReady(cm) {
       this.codemirror.setSize('-webkit-fill-available', 'auto')
     },
-    onCmFocus(cm) {},
+    onCmFocus(cm) {
+    },
     onCmCodeChange(newCode) {
       this.sql = newCode
       this.$emit('codeChange', this.sql)
@@ -1068,6 +1084,7 @@ export default {
 
   .select-type {
     width: 180px;
+
     .el-input__inner {
       padding-left: 32px;
     }
@@ -1079,6 +1096,7 @@ export default {
     top: 50%;
     transform: translateY(-50%);
   }
+
   .content {
     height: 62px;
     width: 822px;
@@ -1097,14 +1115,17 @@ export default {
       font-size: 14px;
       color: var(--primary, #3370ff);
     }
+
     margin-bottom: 16px;
   }
 }
+
 .dataset-sql {
   height: 100%;
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .sql-editer {
     background: #f5f6f7;
     padding: 16px 24px;
@@ -1115,11 +1136,13 @@ export default {
     display: flex;
     flex-direction: row-reverse;
     overflow: hidden;
+
     .data-reference {
       width: 280px;
       height: 100%;
       overflow: hidden;
       border-left: 1px solid var(--deCardStrokeColor, #dee0e3);
+
       .no-select-datasource {
         font-family: PingFang SC;
         font-size: 14px;
@@ -1129,6 +1152,7 @@ export default {
         width: 100%;
         padding: 16px 12px;
       }
+
       .table-database-name {
         font-family: PingFang SC;
         font-size: 16px;
@@ -1136,6 +1160,7 @@ export default {
         color: var(--deTextPrimary, #1f2329);
         padding: 16px 12px;
         border-bottom: 1px solid var(--deCardStrokeColor, #dee0e3);
+
         p {
           display: flex;
           align-items: center;
@@ -1161,6 +1186,7 @@ export default {
         padding: 16px 8px;
         height: calc(100vh - 242px);
         overflow: auto;
+
         .table-or-field {
           height: 40px;
           width: 100%;
@@ -1203,34 +1229,40 @@ export default {
             i {
               display: block;
             }
+
             background: rgba(31, 35, 41, 0.1);
           }
         }
       }
     }
+
     .sql-table {
       flex: 1;
       height: 100%;
       display: flex;
       flex-direction: column;
       overflow: hidden;
+
       .code-container {
         background: #f5f6f7;
         box-sizing: border-box;
         min-height: 248px;
         color: var(--deTextPrimary, #1f2329);
+
         .CodeMirror {
           height: 100% !important;
         }
       }
     }
   }
+
   .sql-result {
     font-family: PingFang SC;
     font-size: 14px;
     overflow-y: auto;
     box-sizing: border-box;
     flex: 1;
+
     .sql-title {
       user-select: none;
       height: 54px;
@@ -1247,6 +1279,7 @@ export default {
         color: var(--deTextSecondary, #646a73);
         margin-left: 12px;
       }
+
       .drag {
         position: absolute;
         top: 0;
@@ -1271,6 +1304,7 @@ export default {
       padding: 0 25px 18px 25px;
       overflow-y: auto;
       box-sizing: border-box;
+
       .el-empty__bottom,
       .el-empty__description p {
         font-family: PingFang SC;
@@ -1281,16 +1315,20 @@ export default {
       }
     }
   }
+
   .table-container {
     height: calc(100% - 125px);
     padding: 0 24px;
+
     .mar6 {
       margin-right: 6px;
     }
+
     .mar3 {
       margin-left: -3px;
     }
   }
+
   .table-container-filter {
     height: calc(100% - 110px);
   }
diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue
index b4cc3fe473..1e59168035 100644
--- a/frontend/src/views/dataset/add/AddUnion.vue
+++ b/frontend/src/views/dataset/add/AddUnion.vue
@@ -53,8 +53,8 @@
       <div class="sql-title">
         {{ $t('deDataset.data_preview') }}
         <span class="result-num">{{
-          `(${$t('dataset.preview_show')} 1000 ${$t('dataset.preview_item')})`
-        }}</span>
+            `(${$t('dataset.preview_show')} 1000 ${$t('dataset.preview_item')})`
+          }}</span>
         <span
           class="drag"
           @mousedown="mousedownDrag"
@@ -96,13 +96,15 @@
           secondary
           @click="closeSelectDs()"
         >{{
-          $t('dataset.cancel')
-        }}</deBtn>
+            $t('dataset.cancel')
+          }}
+        </deBtn>
         <deBtn
           :disabled="!tempDs.id"
           type="primary"
           @click="confirmSelectDs()"
-        >{{ $t('dataset.confirm') }}</deBtn>
+        >{{ $t('dataset.confirm') }}
+        </deBtn>
       </div>
     </el-drawer>
 
@@ -120,20 +122,22 @@
       size="840px"
       direction="rtl"
     >
-      <union-edit :union-param="unionParam" />
+      <union-edit :union-param="unionParam"/>
       <div class="de-foot">
         <deBtn
           secondary
           @click="closeEditUnion()"
         >{{
-          $t('dataset.cancel')
-        }}</deBtn>
+            $t('dataset.cancel')
+          }}
+        </deBtn>
         <deBtn
           type="primary"
           @click="confirmEditUnion()"
         >{{
-          $t('dataset.confirm')
-        }}</deBtn>
+            $t('dataset.confirm')
+          }}
+        </deBtn>
       </div>
     </el-drawer>
   </div>
@@ -148,6 +152,8 @@ import { post } from '@/api/dataset/dataset'
 import UnionPreview from '@/views/dataset/add/union/UnionPreview'
 import cancelMix from './cancelMix'
 import msgCfm from '@/components/msgCfm/index'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
+
 export default {
   name: 'AddUnion',
   components: {
@@ -267,6 +273,12 @@ export default {
       }
       post('/dataset/table/update', table)
         .then((response) => {
+          if (table.id) {
+            const renameNode = { id: table.id, name: table.name, label: table.name }
+            updateCacheTree('rename', 'dataset-tree', renameNode, JSON.parse(localStorage.getItem('dataset-tree')))
+          } else {
+            updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+          }
           this.$emit('saveSuccess', table)
           this.cancel(response.data)
         })
@@ -413,6 +425,7 @@ export default {
     overflow-y: auto;
     box-sizing: border-box;
     flex: 1;
+
     .sql-title {
       user-select: none;
       height: 54px;
@@ -437,6 +450,7 @@ export default {
         color: var(--deTextSecondary, #646a73);
         margin-left: 12px;
       }
+
       .drag {
         position: absolute;
         top: 0;

From 8702af5db9f18e65a9a384164446b883ba93f11f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 15 Feb 2023 16:12:39 +0800
Subject: [PATCH 16/48] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E3=80=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/datasource/ApiProvider.java        | 17 +++++++++--------
 .../functionStyle/MapMarkSelector.vue           |  1 -
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
index ddbcb5c9e0..913168cf15 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
@@ -336,14 +336,15 @@ public class ApiProvider extends Provider {
         o.put("deType", 0);
         o.put("extField", 0);
         o.put("checked", false);
-//        for (DatasetTableFieldDTO fieldDTO : apiDefinition.getFields()) {
-//            if (StringUtils.isNotEmpty(o.getString("jsonPath")) && StringUtils.isNotEmpty(fieldDTO.getJsonPath()) && fieldDTO.getJsonPath().equals(o.getString("jsonPath"))) {
-//                o.put("checked", true);
-//                o.put("deExtractType", fieldDTO.getDeExtractType());
-//                o.put("name", fieldDTO.getName());
-//            }
-//        }
-
+        if (!apiDefinition.isUseJsonPath()) {
+            for (DatasetTableFieldDTO fieldDTO : apiDefinition.getFields()) {
+                if (StringUtils.isNotEmpty(o.getString("jsonPath")) && StringUtils.isNotEmpty(fieldDTO.getJsonPath()) && fieldDTO.getJsonPath().equals(o.getString("jsonPath"))) {
+                    o.put("checked", true);
+                    o.put("deExtractType", fieldDTO.getDeExtractType());
+                    o.put("name", fieldDTO.getName());
+                }
+            }
+        }
     }
 
     static private boolean hasItem(ApiDefinition apiDefinition, List<JSONObject> fields, JSONObject item) {
diff --git a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
index 8439fa2b92..0068368aa7 100644
--- a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
+++ b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
@@ -393,7 +393,6 @@ export default {
     },
     getItemTagType() {
       this.$refs['markForm'].validate((valid) => {
-        console.log(valid)
       })
     }
   }

From 2711415618407cf998f4af0fba92714aa236eb7f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 15 Feb 2023 16:34:20 +0800
Subject: [PATCH 17/48] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0excel=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E9=A2=91=E7=B9=81=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E8=BF=87=E6=9C=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/add/AddExcel.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index cae74db8ae..fe20317a1f 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -237,8 +237,10 @@ import { $alert } from '@/utils/message'
 import store from '@/store'
 import msgCfm from '@/components/msgCfm/index'
 import cancelMix from './cancelMix'
+import Config from "@/settings";
 
 const token = getToken()
+const RefreshTokenKey = Config.RefreshTokenKey
 
 export default {
   name: 'AddExcel',
@@ -453,6 +455,12 @@ export default {
         this.$refs.tree.setCheckedKeys(this.defaultCheckedKeys)
       })
       this.fileList = fileList
+
+      if (response.headers[RefreshTokenKey]) {
+        const refreshToken = response.headers[RefreshTokenKey]
+        setToken(refreshToken)
+        store.dispatch('user/refreshToken', refreshToken)
+      }
     },
 
     save() {

From 80d44dfc1aba72bdf14cfa6f64bb690b01d638b6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 15 Feb 2023 16:43:13 +0800
Subject: [PATCH 18/48] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98=E8=89=B2?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E8=A1=A8=E5=A4=B4=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B9=9F=E5=8F=98=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/utils/style.js      |  5 ++++-
 .../components/widget/deWidget/TitlePosition.vue   | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js
index d6e254e97a..448ac7e418 100644
--- a/frontend/src/components/canvas/utils/style.js
+++ b/frontend/src/components/canvas/utils/style.js
@@ -381,7 +381,10 @@ export function adaptCurThemeCommonStyle(component) {
   if (isFilterComponent(component.component)) {
     const filterStyle = store.state.canvasStyleData.chartInfo.filterStyle
     for (const styleKey in filterStyle) {
-      Vue.set(component.style, styleKey, filterStyle[styleKey])
+      // 位置属性不修改
+      if (styleKey !== 'horizontal' && styleKey !== 'vertical') {
+        Vue.set(component.style, styleKey, filterStyle[styleKey])
+      }
     }
   } else if (isTabComponent(component.component)) {
     const tabStyle = store.state.canvasStyleData.chartInfo.tabStyle
diff --git a/frontend/src/components/widget/deWidget/TitlePosition.vue b/frontend/src/components/widget/deWidget/TitlePosition.vue
index 1af68342f3..fb9b0e2645 100644
--- a/frontend/src/components/widget/deWidget/TitlePosition.vue
+++ b/frontend/src/components/widget/deWidget/TitlePosition.vue
@@ -19,12 +19,14 @@
           <el-radio-group
             v-model="styleInfo.horizontal"
             size="mini"
+            @change="styleChange"
           >
             <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>
             <el-radio-button
               :disabled="styleInfo.vertical === 'center' && elementType !== 'de-select-grid'"
               label="center"
-            >{{ $t('chart.text_pos_center') }}</el-radio-button>
+            >{{ $t('chart.text_pos_center') }}
+            </el-radio-button>
             <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
@@ -36,12 +38,14 @@
           <el-radio-group
             v-model="styleInfo.vertical"
             size="mini"
+            @change="styleChange"
           >
             <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>
             <el-radio-button
               :disabled="styleInfo.horizontal === 'center'"
               label="center"
-            >{{ $t('chart.text_pos_center') }}</el-radio-button>
+            >{{ $t('chart.text_pos_center') }}
+            </el-radio-button>
           </el-radio-group>
         </el-form-item>
 
@@ -73,6 +77,12 @@ export default {
       type: String,
       default: ''
     }
+  },
+
+  methods: {
+    styleChange() {
+      this.$store.commit('canvasChange')
+    }
   }
 
 }

From c37f86f7423daf5a36abe741aa5b5989d8049109 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 15 Feb 2023 17:08:45 +0800
Subject: [PATCH 19/48] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=89=8D=E7=AB=AF=E6=8C=81=E4=B9=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue               | 7 +++++++
 frontend/src/store/modules/user.js | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 2dc1dd4a5f..1ec6edbbca 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -7,6 +7,7 @@
       component-name="ThemeSetting"
     />
     <el-dialog
+      v-if="$route.path !== '/login'"
       :visible.sync="showPasswordModifiedDialog"
       append-to-body
       :title="$t('user.change_password')"
@@ -35,6 +36,12 @@ export default {
       showPasswordModifiedDialog: false
     }
   },
+  mounted() {
+    const passwordModified = JSON.parse(localStorage.getItem('passwordModified'))
+    if (typeof passwordModified === 'boolean') {
+      this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified)
+    }
+  },
   watch: {
     passwordModified: {
       handler(val) {
diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js
index 4910519ee5..91ca204667 100644
--- a/frontend/src/store/modules/user.js
+++ b/frontend/src/store/modules/user.js
@@ -83,9 +83,12 @@ const actions = {
         commit('SET_TOKEN', data.token)
         commit('SET_LOGIN_MSG', null)
         setToken(data.token)
-        if(data.hasOwnProperty('passwordModified')){
-          commit('SET_PASSWORD_MODIFIED', data.passwordModified)
+        let passwordModified = true
+        if (data.hasOwnProperty('passwordModified')) {
+          passwordModified = data.passwordModified
         }
+        commit('SET_PASSWORD_MODIFIED', passwordModified)
+        localStorage.setItem('passwordModified', passwordModified)
         resolve()
       }).catch(error => {
         reject(error)

From 1d3e48d3c5e89a7e7fb4a90d55cf1f6911a74adc Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 15 Feb 2023 17:36:06 +0800
Subject: [PATCH 20/48] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E6=9C=AC=E7=BB=84=E4=BB=B6=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/TextAttr.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 59a66cf145..d0fca3718b 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -466,7 +466,7 @@ export default {
       initFontSize: 12,
       initActiveFontSize: 18,
       miniFontSize: 12,
-      maxFontSize: 128,
+      maxFontSize: 256,
       textAlignOptions: [
         {
           icon: 'iconfont icon-juzuo',

From 02371b44416ab107cc6947fef221ff5469877466 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 16 Feb 2023 10:09:18 +0800
Subject: [PATCH 21/48] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8D=95=E9=80=89=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/index.scss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index e07bc87886..c76b43b777 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -828,8 +828,12 @@ div:focus {
   color: #1F2329 !important;
 }
 
-.de-select-grid-class {
-  .el-checkbox__input.is-checked:not(.is-disabled)+.el-checkbox__label {
+.el-radio__input.is-checked:not(.is-disabled)+.el-radio__label {
+  color: var(--deTextPrimary, #1F2329) !important;
+}
+
+.de-select-grid-class{
+  .el-checkbox__input.is-checked:not(.is-disabled)+.el-checkbox__label, .el-radio__input.is-checked:not(.is-disabled)+.el-radio__label {
     color: #3370ff !important;
   }
 }
@@ -1176,9 +1180,6 @@ div:focus {
   color: var(--deTextPrimary, #1F2329) !important;
 }
 
-.el-radio__input.is-checked:not(.is-disabled)+.el-radio__label {
-  color: var(--deTextPrimary, #1F2329) !important;
-}
 
 .date-filter-poper>.el-scrollbar>.el-select-dropdown__wrap {
   max-height: 230px !important;

From 9f6e66ad821bff63e99d793852e82d2fd33358f5 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 16 Feb 2023 18:30:24 +0800
Subject: [PATCH 22/48] fix(i18n): i18n

---
 .../panel/PanelPdfTemplateController.java     |  2 ++
 .../resources/db/migration/V50__1.18.3.sql    |  2 ++
 .../resources/i18n/messages_en_US.properties  | 20 +++++++++++++++----
 .../resources/i18n/messages_zh_CN.properties  |  2 ++
 .../resources/i18n/messages_zh_TW.properties  | 14 ++++++++++++-
 frontend/src/lang/en.js                       |  8 +++++++-
 frontend/src/lang/tw.js                       |  8 +++++++-
 frontend/src/lang/zh.js                       |  8 +++++++-
 frontend/src/utils/StringUtils.js             | 19 ++++++++++++++++++
 frontend/src/views/background/index.vue       |  8 ++++----
 .../src/views/panel/export/PDFPreExport.vue   |  3 ++-
 11 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelPdfTemplateController.java b/backend/src/main/java/io/dataease/controller/panel/PanelPdfTemplateController.java
index c499a468c5..01297b83e6 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelPdfTemplateController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelPdfTemplateController.java
@@ -1,6 +1,7 @@
 package io.dataease.controller.panel;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.controller.handler.annotation.I18n;
 import io.dataease.plugins.common.base.domain.PanelPdfTemplate;
 import io.dataease.service.panel.PanelPdfTemplateService;
 import io.swagger.annotations.Api;
@@ -26,6 +27,7 @@ public class PanelPdfTemplateController {
     private PanelPdfTemplateService panelPdfTemplateService;
 
     @GetMapping("queryAll")
+    @I18n
     @ApiOperation("查询所有仪表板模板")
     public List<PanelPdfTemplate> queryAll() {
         return panelPdfTemplateService.queryAll();
diff --git a/backend/src/main/resources/db/migration/V50__1.18.3.sql b/backend/src/main/resources/db/migration/V50__1.18.3.sql
index f9f320fd3f..4974cb230d 100644
--- a/backend/src/main/resources/db/migration/V50__1.18.3.sql
+++ b/backend/src/main/resources/db/migration/V50__1.18.3.sql
@@ -2,3 +2,5 @@ UPDATE `my_plugin`
 SET `version` = '1.18.3'
 where `plugin_id` > 0
   and `version` = '1.18.2';
+UPDATE `panel_pdf_template` SET `name` = 'I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS',`template_content` = '<div style=\"margin-top: 5px\">\n    <div contenteditable=\"true\"> \n		$t(''panel.panel_name'')：$panelName$ </br>\n		$t(''panel.export_time'')：$yyyy-MM-dd hh:mm:ss$ </br>\n		$t(''panel.export_user'')：$nickName$ </br>\n		$t(''panel.you_can_type_here'')\n		</div>\n    <div>\n      <img width=\"100%\" src=\"$snapshot$\">\n    </div>\n  </div>' WHERE id='1';
+UPDATE `panel_pdf_template` SET `name` = 'I18N_PANEL_PDF_TEMPLATE_ONLY_PIC' WHERE id='2';
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 63c80bb089..3e28818c0a 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -62,7 +62,7 @@ i18n_panel_list=Dashboard
 i18n_processing_data=Processing data now, Refresh later
 i18n_union_already_exists=Union relation already exists
 i18n_union_field_exists=The same field can't in two dataset
-i18n_cron_time_error=Start time can't greater then end time
+i18n_cron_time_error=Start time can't greater than end time
 i18n_auth_source_be_canceled=This Auth Resource Already Be Canceled,Please Connect Admin
 i18n_username_exists=ID is already exists
 i18n_nickname_exists=NickName is already exists
@@ -134,7 +134,7 @@ theme_name_empty=name can not be empty
 i18n_public_chart=\u3010Public Chart\u3011
 i18n_class_blue=Blue Tone
 \u63D2\u4EF6\u7BA1\u7406=Plugins
-i18n_plugin_not_allow_delete=The plugin in in use cannot be deleted
+i18n_plugin_not_allow_delete=The plugin in use cannot be deleted
 i18n_wrong_content=Wrong content
 i18n_wrong_tel=Wrong tel format
 i18n_wrong_email=Wrong email format
@@ -146,7 +146,7 @@ OPERATE_TYPE_DELETE=Delete
 OPERATE_TYPE_SHARE=Share
 OPERATE_TYPE_UNSHARE=Unshare
 OPERATE_TYPE_AUTHORIZE=Authorize
-OPERATE_TYPE_UNAUTHORIZE=Unauthorize
+OPERATE_TYPE_UNAUTHORIZE=Unauthorized
 OPERATE_TYPE_CREATELINK=Create Link
 OPERATE_TYPE_DELETELINK=Delete Link
 OPERATE_TYPE_MODIFYLINK=Modify Link
@@ -261,4 +261,16 @@ I18N_LOG_FORMAT_PREFIX=With authority of %s\u3010%s\u3011
 \u6C34\u5370\u7BA1\u7406=Watermark
 \u8840\u7F18\u5173\u7CFB=Relationship
 
-I18N_CRON_ERROR=Cron expression error
\ No newline at end of file
+I18N_CRON_ERROR=Cron expression error
+I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=Default template with params
+I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=Default template only screenshot
+\u8FB9\u68461=Border 1
+\u8FB9\u68462=Border 2
+\u8FB9\u68463=Border 3
+\u8FB9\u68464=Border 4
+\u8FB9\u68465=Border 5
+\u8FB9\u68466=Border 6
+\u8FB9\u68467=Border 7
+\u8FB9\u68468=Border 8
+\u8FB9\u68469=Border 9
+\u8FB9\u684610=Border 10
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index a0a278575f..c1afe1cd28 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -262,4 +262,6 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650
 \u8840\u7F18\u5173\u7CFB=\u8840\u7F18\u5173\u7CFB
 
 I18N_CRON_ERROR=cron\u8868\u8FBE\u5F0F\u9519\u8BEF
+I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8BA4\u6A21\u677F(\u52A0\u53C2\u6570\u6837\u5F0F)
+I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8BA4\u6A21\u677F(\u53EA\u622A\u56FE)
 
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index fe253c3b6f..b5b4f68656 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -257,4 +257,16 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6B0A\u9650
 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406
 \u8840\u7F18\u5173\u7CFB=\u8840\u7DE3\u95DC\u7CFB
 
-I18N_CRON_ERROR=cron\u8868\u9054\u5F0F\u932F\u8AA4
\ No newline at end of file
+I18N_CRON_ERROR=cron\u8868\u9054\u5F0F\u932F\u8AA4
+I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8A8D\u6A21\u677F(\u52A0\u53C3\u6578\u6A23\u5F0F)
+I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8A8D\u6A21\u677F(\u53EA\u622A\u5716)
+\u8FB9\u68461=\u908A\u6846 1
+\u8FB9\u68462=\u908A\u6846 2
+\u8FB9\u68463=\u908A\u6846 3
+\u8FB9\u68464=\u908A\u6846 4
+\u8FB9\u68465=\u908A\u6846 5
+\u8FB9\u68466=\u908A\u6846 6
+\u8FB9\u68467=\u908A\u6846 7
+\u8FB9\u68468=\u908A\u6846 8
+\u8FB9\u68469=\u908A\u6846 9
+\u8FB9\u684610=\u908A\u6846 10
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index f97d2eb399..765cc7595a 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -2316,7 +2316,13 @@ export default {
     fold: 'Fold',
     expand: 'Expand',
     pdf_export: 'PDF Export',
-    switch_pdf_template: 'Switch PDF Template'
+    switch_pdf_template: 'Switch PDF Template',
+    pdf_template_with_params: 'Default template(with params)',
+    pdf_template_only_pic: 'Default template(only screenshot)',
+    panel_name: 'Panel name',
+    export_user: 'Export User',
+    export_time: 'Export Time',
+    you_can_type_here: 'You can type here'
   },
   plugin: {
     local_install: 'Local installation',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index ee62fb3c3d..8c23dfbe84 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -2310,7 +2310,13 @@ export default {
     fold: '收起',
     expand: '展開',
     pdf_export: 'PDF 導出',
-    switch_pdf_template: '切換 PDF 模板'
+    switch_pdf_template: '切換 PDF 模板',
+    pdf_template_with_params: '默認模板(加參數樣式)',
+    pdf_template_only_pic: '默認模板(只截圖)',
+    panel_name: '儀錶板名稱',
+    export_user: '導出用戶',
+    export_time: '導出時間',
+    you_can_type_here: '可以在這裡輸入其他內容'
   },
   plugin: {
     local_install: '本地安裝',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 1fb1fe5f52..767c2d7f44 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -2310,7 +2310,13 @@ export default {
     fold: '收起',
     expand: '展开',
     pdf_export: 'PDF 导出',
-    switch_pdf_template: '切换 PDF 模板'
+    switch_pdf_template: '切换 PDF 模板',
+    pdf_template_with_params: '默认模板(加参数样式)',
+    pdf_template_only_pic: '默认模板(只截图)',
+    panel_name: '仪表板名称',
+    export_user: '导出用户',
+    export_time: '导出时间',
+    you_can_type_here: '可以在这里输入其他内容'
   },
   plugin: {
     local_install: '本地安装',
diff --git a/frontend/src/utils/StringUtils.js b/frontend/src/utils/StringUtils.js
index 0707dc2bd4..8fb157234e 100644
--- a/frontend/src/utils/StringUtils.js
+++ b/frontend/src/utils/StringUtils.js
@@ -1,3 +1,5 @@
+import i18n from '@/lang'
+
 // 替换所有 标准模板格式 为 $panelName$
 export function pdfTemplateReplaceAll(content, source, target) {
   const pattern = '\\$' + source + '\\$'
@@ -37,3 +39,20 @@ export function includesAny(target, ...sources) {
   }
   return false
 }
+
+// 替换字符串中的国际化内容, 格式为$t('xxx')
+export function replaceInlineI18n(rawString) {
+  const res = []
+  const reg = /\$t\('([\w.]+)'\)/gm
+  let tmp
+  if (!rawString) {
+    return res
+  }
+  while ((tmp = reg.exec(rawString)) !== null) {
+    res.push(tmp)
+  }
+  res.forEach((tmp) => {
+    rawString = rawString.replaceAll(tmp[0], i18n.t(tmp[1]))
+  })
+  return rawString
+}
diff --git a/frontend/src/views/background/index.vue b/frontend/src/views/background/index.vue
index bcb72f375f..58cd92aa7b 100644
--- a/frontend/src/views/background/index.vue
+++ b/frontend/src/views/background/index.vue
@@ -179,13 +179,13 @@
           :span="5"
           style="padding-left: 10px;padding-top: 8px"
         >
-          输入框样式(颜色):
+          {{ $t('panel.input_style') }}:
         </el-col>
         <el-col
           :span="2"
           style="padding-left: 10px;padding-top: 8px"
         >
-          边框
+          {{ $t('panel.board') }}
         </el-col>
         <el-col
           :span="3"
@@ -202,7 +202,7 @@
           :span="2"
           style="padding-left: 10px;padding-top: 8px"
         >
-          文字
+          {{ $t('panel.text') }}
         </el-col>
         <el-col
           :span="3"
@@ -219,7 +219,7 @@
           :span="2"
           style="padding-left: 10px;padding-top: 8px"
         >
-          背景
+          {{ $t('panel.background') }}
         </el-col>
         <el-col
           :span="3"
diff --git a/frontend/src/views/panel/export/PDFPreExport.vue b/frontend/src/views/panel/export/PDFPreExport.vue
index cc87cdb17a..83fc3e37d2 100644
--- a/frontend/src/views/panel/export/PDFPreExport.vue
+++ b/frontend/src/views/panel/export/PDFPreExport.vue
@@ -39,7 +39,7 @@
 import JsPDF from 'jspdf'
 import html2canvas from 'html2canvasde'
 import { formatTimeToStr } from './date.js'
-import { pdfTemplateReplaceAll } from '@/utils/StringUtils.js'
+import { pdfTemplateReplaceAll, replaceInlineI18n } from '@/utils/StringUtils.js'
 
 export default {
   name: 'PDFPreExport',
@@ -121,6 +121,7 @@ export default {
       for (const [key, value] of Object.entries(this.varsInfo)) {
         this.templateContentChange = pdfTemplateReplaceAll(this.templateContentChange, key, value || '')
       }
+      this.templateContentChange = replaceInlineI18n(this.templateContentChange)
     },
 
     cancel() {

From ee3ad5e0ddda966beef93f6a91848615cf34ab42 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 17 Feb 2023 18:37:19 +0800
Subject: [PATCH 23/48] =?UTF-8?q?feat(=E7=99=BB=E5=BD=95):=20=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=92=89=E9=92=89=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E5=85=8D=E7=99=BB=E8=BF=9B=E5=85=A5DE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/auth/util/JWTUtils.java  |   3 +-
 frontend/src/permission.js                    |  21 +-
 mobile/src/common/utils.js                    |  15 +-
 mobile/src/pages.json                         | 370 ++++-----
 mobile/src/pages/login/index.vue              | 713 +++++++++---------
 5 files changed, 582 insertions(+), 540 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
index 6d0aaef239..cebe34c5f5 100644
--- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -68,7 +68,8 @@ public class JWTUtils {
 
     public static boolean needRefresh(String token) {
         Date exp = JWTUtils.getExp(token);
-        return new Date().getTime() >= exp.getTime();
+        Long advanceTime = 5000L;
+        return (new Date().getTime() + advanceTime) >= exp.getTime();
     }
 
     /**
diff --git a/frontend/src/permission.js b/frontend/src/permission.js
index c5961184b6..c612f949c9 100644
--- a/frontend/src/permission.js
+++ b/frontend/src/permission.js
@@ -18,9 +18,13 @@ import {
   changeFavicon
 } from '@/utils/index'
 import Layout from '@/layout/index'
-import { getSysUI } from '@/utils/auth'
+import {
+  getSysUI
+} from '@/utils/auth'
 
-import { getSocket } from '@/websocket'
+import {
+  getSocket
+} from '@/websocket'
 
 NProgress.configure({
   showSpinner: false
@@ -53,14 +57,19 @@ const routeBefore = (callBack) => {
     callBack()
   }
 }
-router.beforeEach(async (to, from, next) => routeBefore(() => {
+router.beforeEach(async(to, from, next) => routeBefore(() => {
   // start progress bar
   NProgress.start()
-  const mobileIgnores = ['/delink']
+  const mobileIgnores = ['/delink', '/de-auto-login']
   const mobilePreview = '/preview/'
+  const hasToken = getToken()
 
   if (isMobile() && !to.path.includes(mobilePreview) && mobileIgnores.indexOf(to.path) === -1) {
-    window.location.href = window.origin + '/app.html'
+    let urlSuffix = '/app.html'
+    if (hasToken) {
+      urlSuffix += ('?detoken=' + hasToken)
+    }
+    window.location.href = window.origin + urlSuffix
     NProgress.done()
   }
 
@@ -68,7 +77,7 @@ router.beforeEach(async (to, from, next) => routeBefore(() => {
   document.title = getPageTitle(to.meta.title)
 
   // determine whether the user has logged in
-  const hasToken = getToken()
+
   if (hasToken) {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
diff --git a/mobile/src/common/utils.js b/mobile/src/common/utils.js
index f4c10d9700..2e6fa8b2f7 100644
--- a/mobile/src/common/utils.js
+++ b/mobile/src/common/utils.js
@@ -142,4 +142,17 @@ export function parseLanguage() {
     const language = getLanguage()
     if(language === 'sys') return uni.getLocale()
     return language
-}
\ No newline at end of file
+}
+
+export function getUrlParams(url){
+  const Params = {}
+  if(url.indexOf('?')>0){//判断是否有qurey
+    let parmas = url.slice(url.indexOf('?')+1)//截取出query
+    const paramlists = parmas.split('&')//分割键值对
+    for (const param of paramlists) {
+      let a = param.split('=')
+      Object.assign(Params,{[a[0]]:a[1]})//将键值对封装成对象
+    }
+  }
+  return Params
+}
diff --git a/mobile/src/pages.json b/mobile/src/pages.json
index 1e6be356ac..1fcfb0dc34 100644
--- a/mobile/src/pages.json
+++ b/mobile/src/pages.json
@@ -1,192 +1,192 @@
 {
-	"pages": [ 
+  "pages": [
+
+    {
+      "path": "pages/login/index",
+      "style": {
+        "navigationBarTitleText": "%navigate.login%",
+        "app-plus": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/home/index",
+      "style": {
+        "navigationBarTitleText": "%navigate.menuHome%",
+        "app-plus": {
+          "titleNView": false
 
-        {
-			"path": "pages/login/index",
-			"style": {
-                "navigationBarTitleText": "%navigate.login%",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-        {
-			"path": "pages/tabBar/home/index",
-			"style": {
-                "navigationBarTitleText": "%navigate.menuHome%",
-				"app-plus": {
-                    "titleNView": false
-					
-				},
-                "enablePullDownRefresh": true
-			}
-		},
-        
-        {
-            "path": "pages/tabBar/home/detail",
-            "style": {
-                "navigationBarTitleText": "",
-                "app-plus": {
-					"titleNView": false,
-					"bounce": "none"
-				}
-            }
         },
-        {
-			"path": "pages/tabBar/dir/index",
-			"style": {				
-                "navigationBarTitleText": "%navigate.menuDir%",
-                "app-plus": {
-                    "titleNView": {
-                        "type": "transparent",
-                        "titleColor": "#fff",
-                        "backgroundColor": "#0faeff",
-                        "buttons": [],
-                        "searchInput": {
-                            "backgroundColor": "#fff",
-                            "borderRadius": "6px",
-                            "placeholder": "%searchPlaceholder%",
-                            "disabled": true
-                        }
-                    }
-                },
-                "enablePullDownRefresh": true
-			}
-		},
-        {
-            "path": "pages/tabBar/dir/search",
-            "style": {
-                "navigationBarTitleText": "%navigate.search%",
-                "app-plus": {
-                    "titleNView": {
-                        "titleColor": "#fff",
-                        "backgroundColor": "#0faeff",
-                        
-                        "searchInput": {
-                            "backgroundColor": "#fff",
-                            "borderRadius": "6px",
-                            "placeholder": "%searchPlaceholder%",
-                            "autoFocus": true
-                        }
-                    }
-                }
+        "enablePullDownRefresh": true
+      }
+    },
+
+    {
+      "path": "pages/tabBar/home/detail",
+      "style": {
+        "navigationBarTitleText": "",
+        "app-plus": {
+          "titleNView": false,
+          "bounce": "none"
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/dir/index",
+      "style": {
+        "navigationBarTitleText": "%navigate.menuDir%",
+        "app-plus": {
+          "titleNView": {
+            "type": "transparent",
+            "titleColor": "#fff",
+            "backgroundColor": "#0faeff",
+            "buttons": [],
+            "searchInput": {
+              "backgroundColor": "#fff",
+              "borderRadius": "6px",
+              "placeholder": "%searchPlaceholder%",
+              "disabled": true
             }
+          }
         },
-        {
-            "path": "pages/tabBar/dir/folder",
-            "style": {
-                "navigationBarTitleText": "",
-                "app-plus": {
-                    "titleNView": {
-                        "type": "transparent"
-                    }
-                },
-                "h5": {
-                    "titleNView": {
-                        "type": "transparent",
-                        "buttons": []
-                    }
-                }
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/tabBar/dir/search",
+      "style": {
+        "navigationBarTitleText": "%navigate.search%",
+        "app-plus": {
+          "titleNView": {
+            "titleColor": "#fff",
+            "backgroundColor": "#0faeff",
+
+            "searchInput": {
+              "backgroundColor": "#fff",
+              "borderRadius": "6px",
+              "placeholder": "%searchPlaceholder%",
+              "autoFocus": true
             }
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/dir/folder",
+      "style": {
+        "navigationBarTitleText": "",
+        "app-plus": {
+          "titleNView": {
+            "type": "transparent"
+          }
         },
-        {
-			"path": "pages/tabBar/me/index",
-			"style": {
-                "navigationBarTitleText": "%navigate.menuMe%",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-        {
-			"path": "pages/tabBar/me/person",
-			"style": {
-				"navigationBarTitleText": "%navigate.personInfo%",
-                
-                "app-plus": {
-                    "titleNView": {
-                        "type": "transparent"
-                    }
-                }
-			}
-		},
-        {
-			"path": "pages/tabBar/me/language",
-			"style": {
-				"navigationBarTitleText": "%navigate.language%",
-                
-                "app-plus": {
-                    "titleNView": {
-                        "type": "transparent"
-                    }
-                }
-			}
-		},
-        {
-			"path": "pages/tabBar/me/about",
-			"style": {
-				"navigationBarTitleText": "%navigate.about%",
-                
-                "app-plus": {
-                    "titleNView": {
-                        "type": "transparent"
-                    }
-                }
-			}
-		},
-        {
-			"path": "pages/tabBar/me/outlink",
-			"style": {
-				"navigationBarTitleText": "",
-                
-                "app-plus": {
-                    "titleNView": {
-                        "type": "transparent"
-                    }
-                }
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "%app.name%",
-                "h5": {
-                    "maxWidth": 1190,
-                    "navigationBarTextStyle": "black",
-                    "navigationBarBackgroundColor": "#F1F1F1"
-                }
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "%app.name%",
-		"navigationBarBackgroundColor": "#ffffff",
-		"backgroundColor": "#ffffff"
-	},
-    "tabBar": {
-		"color": "#7A7E83",
-		"selectedColor": "#007AFF",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-        
-		"list": [{
-				"pagePath": "pages/tabBar/home/index",
-				"iconPath": "static/home.png",
-				"selectedIconPath": "static/home_select.png",
-				"text": "%navigate.menuHome%"
-			},
-			{
-				"pagePath": "pages/tabBar/dir/index",
-				"iconPath": "static/dir.png",
-				"selectedIconPath": "static/dir_select.png",
-				"text": "%navigate.menuDir%"
-			}, {
-				"pagePath": "pages/tabBar/me/index",
-				"iconPath": "static/me.png",
-				"selectedIconPath": "static/me_select.png",
-				"text": "%navigate.menuMe%"
-			}
-		]
-	}
-}
+        "h5": {
+          "titleNView": {
+            "type": "transparent",
+            "buttons": []
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/me/index",
+      "style": {
+        "navigationBarTitleText": "%navigate.menuMe%",
+        "app-plus": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/me/person",
+      "style": {
+        "navigationBarTitleText": "%navigate.personInfo%",
+
+        "app-plus": {
+          "titleNView": {
+            "type": "transparent"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/me/language",
+      "style": {
+        "navigationBarTitleText": "%navigate.language%",
+
+        "app-plus": {
+          "titleNView": {
+            "type": "transparent"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/me/about",
+      "style": {
+        "navigationBarTitleText": "%navigate.about%",
+
+        "app-plus": {
+          "titleNView": {
+            "type": "transparent"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/me/outlink",
+      "style": {
+        "navigationBarTitleText": "",
+
+        "app-plus": {
+          "titleNView": {
+            "type": "transparent"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "%app.name%",
+        "h5": {
+          "maxWidth": 1190,
+          "navigationBarTextStyle": "black",
+          "navigationBarBackgroundColor": "#F1F1F1"
+        }
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "%app.name%",
+    "navigationBarBackgroundColor": "#ffffff",
+    "backgroundColor": "#ffffff"
+  },
+  "tabBar": {
+    "color": "#7A7E83",
+    "selectedColor": "#007AFF",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+
+    "list": [{
+        "pagePath": "pages/tabBar/home/index",
+        "iconPath": "static/home.png",
+        "selectedIconPath": "static/home_select.png",
+        "text": "%navigate.menuHome%"
+      },
+      {
+        "pagePath": "pages/tabBar/dir/index",
+        "iconPath": "static/dir.png",
+        "selectedIconPath": "static/dir_select.png",
+        "text": "%navigate.menuDir%"
+      }, {
+        "pagePath": "pages/tabBar/me/index",
+        "iconPath": "static/me.png",
+        "selectedIconPath": "static/me_select.png",
+        "text": "%navigate.menuMe%"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/mobile/src/pages/login/index.vue b/mobile/src/pages/login/index.vue
index 5b10f91ac3..12b9d94dee 100644
--- a/mobile/src/pages/login/index.vue
+++ b/mobile/src/pages/login/index.vue
@@ -1,385 +1,404 @@
 <template>
-	<view 
-		v-if="axiosFinished" 
-		:class="mobileBG ? 'content-de' : 'content'"
-		:style="mobileBG ? {background:'url(' + mobileBG + ') no-repeat', 'backgroundSize':'cover'} : ''"
-		>
-		
-		<view class="input-group" >
-            <view class="input-row">
-				<text class="welcome">{{$t('login.title')}}</text>
-			</view>
-			<view class="input-row border">
-				<text class="title">{{$t('login.account')}}</text>
-				<m-input class="m-input" type="text" clearable focus v-model="username" :placeholder="$t('login.accountPlaceholder')"></m-input>
-			</view>
-			<view class="input-row border">
-				<text class="title">{{$t('login.password')}}</text>
-				<m-input type="password" displayable v-model="password" :placeholder="$t('login.passwordPlaceholder')"></m-input>
-			</view>
-			
-		</view>
-		<view class="btn-row">
-			<button type="primary" class="primary" :loading="loginBtnLoading" @tap="bindLogin">{{$t('login.loginbtn')}}</button>
-		</view>
-		
-	</view>
+  <view v-if="axiosFinished" :class="mobileBG ? 'content-de' : 'content'"
+    :style="mobileBG ? {background:'url(' + mobileBG + ') no-repeat', 'backgroundSize':'cover'} : ''">
+
+    <view class="input-group">
+      <view class="input-row">
+        <text class="welcome">{{$t('login.title')}}</text>
+      </view>
+      <view class="input-row border">
+        <text class="title">{{$t('login.account')}}</text>
+        <m-input class="m-input" type="text" clearable focus v-model="username"
+          :placeholder="$t('login.accountPlaceholder')"></m-input>
+      </view>
+      <view class="input-row border">
+        <text class="title">{{$t('login.password')}}</text>
+        <m-input type="password" displayable v-model="password" :placeholder="$t('login.passwordPlaceholder')">
+        </m-input>
+      </view>
+
+    </view>
+    <view class="btn-row">
+      <button type="primary" class="primary" :loading="loginBtnLoading"
+        @tap="bindLogin">{{$t('login.loginbtn')}}</button>
+    </view>
+
+  </view>
 </template>
 
 <script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import mInput from '../../components/m-input.vue'
-    import {login, getInfo, getPublicKey, getUIinfo } from '@/api/auth'
-    import {encrypt, setLocalPK, getLocalPK, setToken, getToken, setUserInfo, getUserInfo } from '@/common/utils'
+  import {
+    mapState,
+    mapMutations
+  } from 'vuex'
+  import mInput from '../../components/m-input.vue'
+  import {
+    login,
+    getInfo,
+    getPublicKey,
+    getUIinfo
+  } from '@/api/auth'
+  import {
+    encrypt,
+    setLocalPK,
+    getLocalPK,
+    setToken,
+    getToken,
+    setUserInfo,
+    getUserInfo,
+    getUrlParams
+  } from '@/common/utils'
 
-	export default {
-		components: {
-			mInput
-		},
-		data() {
-			return {
-				username: '',
-                loginBtnLoading: false,
-				password: '',
-				mobileBG: null,
-				axiosFinished: false
-				
-			}
-		},
-		computed: mapState(['forcedLogin', 'hasLogin', 'univerifyErrorMsg', 'hideUniverify']),
-		onLoad() {
-			uni.showLoading({
-				title: this.$t('commons.loading')
-			});
-            this.loadUiInfo()
-            this.loadPublicKey()
-            if(getToken() && getUserInfo()) {
-                this.toMain()
+  export default {
+    components: {
+      mInput
+    },
+    data() {
+      return {
+        username: '',
+        loginBtnLoading: false,
+        password: '',
+        mobileBG: null,
+        axiosFinished: false
+      }
+    },
+    computed: mapState(['forcedLogin', 'hasLogin', 'univerifyErrorMsg', 'hideUniverify']),
+
+    onLoad() {
+      uni.showLoading({
+        title: this.$t('commons.loading')
+      });
+      this.loadUiInfo()
+      this.loadPublicKey()      
+      if (!this.autoLogin() && getToken() && getUserInfo()) {
+        this.toMain()
+      }
+    },
+
+    methods: {
+      ...mapMutations(['login']),
+
+      async loginByPwd() {
+        if (this.username.length < 1) {
+          uni.showToast({
+            icon: 'none',
+            title: this.$t('login.accFmtError')
+          });
+          return;
+        }
+        if (this.password.length < 1) {
+          uni.showToast({
+            icon: 'none',
+            title: this.$t('login.passwordPlaceholder')
+          });
+          return;
+        }
+        const data = {
+          username: encrypt(this.username),
+          password: encrypt(this.password)
+        };
+        this.loginBtnLoading = true
+        login(data).then(res => {
+          if (res.success) {
+            setToken(res.data.token)
+            this.toMain()
+          }
+
+        }).catch(error => {
+          this.loginBtnLoading = false
+          uni.showToast({
+            icon: 'error',
+            title: error.response.data.message,
+          });
+        })
+      },
+
+      bindLogin() {
+        this.loginByPwd()
+      },
+
+      toMain(userName) {
+        getInfo().then(res => {
+          setUserInfo(res.data)
+          uni.reLaunch({
+            url: '../tabBar/home/index',
+          });
+        })
+      },
+
+      loadUiInfo() {
+        getUIinfo().then(res => {
+          const list = res.data
+          list.forEach(item => {
+            if (item.paramKey === 'ui.mobileBG' && item.paramValue) {
+              this.mobileBG = '/system/ui/image/' + item.paramValue
+              return false
             }
-            
-		},
-		
-		methods: {
-			...mapMutations(['login']),
-			
-			async loginByPwd() {
-				
-				if (this.username.length < 1) {
-					uni.showToast({
-						icon: 'none',
-						title: this.$t('login.accFmtError')
-					});
-					return;
-				}
-				if (this.password.length < 1) {
-					uni.showToast({
-						icon: 'none',
-						title: this.$t('login.passwordPlaceholder')
-					});
-					return;
-				}
-				const data = {
-					username: encrypt(this.username),
-					password: encrypt(this.password)
-				};
-				this.loginBtnLoading = true
-                login(data).then(res => {
-                    if(res.success) {
-                        setToken(res.data.token)
-                        this.toMain()
-                    }
-                     
-                }).catch(error => {
-                    this.loginBtnLoading = false
-                    uni.showToast({
-						icon: 'error',
-						title: error.response.data.message,
-					});
-                })
-                
-			},
-			
-			bindLogin() {
-				this.loginByPwd()
-			},
-			
-			toMain(userName) {
-				getInfo().then(res => {
-                    setUserInfo(res.data)
-                    uni.reLaunch({
-                        url: '../tabBar/home/index',
-                    });
-                })
-				
-			},
-			
-			loadUiInfo() {
-				getUIinfo().then(res => {
-					
-				    
-				    const list = res.data
-				    list.forEach(item => {
-				    	if(item.paramKey === 'ui.mobileBG' && item.paramValue) {
-				    		this.mobileBG = '/system/ui/image/' + item.paramValue
-				    		return false
-				    	}
-				    })
-					setTimeout(() => {
-						uni.hideLoading()
-						this.axiosFinished = true
-					}, 1500)
-					
-				})     
-			},
+          })
+          setTimeout(() => {
+            uni.hideLoading()
+            this.axiosFinished = true
+          }, 1500)
 
-            loadPublicKey() {
-                if(!getLocalPK()) {
-                    getPublicKey().then(res => {
-                        setLocalPK(res.data)
-                    })                    
-                }                
-            },
-			
-			
-		},
-		onReady() {
-			
-		}
-	}
+        })
+      },
+
+      loadPublicKey() {
+        if (!getLocalPK()) {
+          getPublicKey().then(res => {
+            setLocalPK(res.data)
+          })
+        }
+      },
+      autoLogin() {
+        const url = window.location.href
+        const param = getUrlParams(url)
+        if (param?.detoken) {
+          setToken(param.detoken)
+          this.toMain()
+          return true
+        }
+        return false
+      }
+
+    },
+    onReady() {
+
+    }
+  }
 </script>
 
 <style>
-@import "@/components/m-icon/m-icon.css";
+  @import "@/components/m-icon/m-icon.css";
 
-	/*每个页面公共css */
-	page {
-		min-height: 100%;
-		display: flex;
-		font-size: 14px;
-	}
+  /*每个页面公共css */
+  page {
+    min-height: 100%;
+    display: flex;
+    font-size: 14px;
+  }
 
-	input,
-	textarea,
-	button {
-		font-size: 14px;
-	}
+  input,
+  textarea,
+  button {
+    font-size: 14px;
+  }
 
-	/* #ifdef MP-BAIDU */
-	page {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
+  /* #ifdef MP-BAIDU */
+  page {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
 
-	swan-template {
-		width: 100%;
-		min-height: 100%;
-		display: flex;
-	}
+  swan-template {
+    width: 100%;
+    min-height: 100%;
+    display: flex;
+  }
 
-	/* 原生组件模式下需要注意组件外部样式 */
-	custom-component {
-		width: 100%;
-		min-height: 100%;
-		display: flex;
-	}
+  /* 原生组件模式下需要注意组件外部样式 */
+  custom-component {
+    width: 100%;
+    min-height: 100%;
+    display: flex;
+  }
 
-	/* #endif */
+  /* #endif */
 
-	/* #ifdef MP-ALIPAY */
-	page {
-		min-height: 100vh;
-	}
+  /* #ifdef MP-ALIPAY */
+  page {
+    min-height: 100vh;
+  }
 
-	/* #endif */
+  /* #endif */
 
-	/* 原生组件模式下需要注意组件外部样式 */
-	m-input {
-		width: 100%;
-		/* min-height: 100%; */
-		display: flex;
-		flex: 1;
-	}
+  /* 原生组件模式下需要注意组件外部样式 */
+  m-input {
+    width: 100%;
+    /* min-height: 100%; */
+    display: flex;
+    flex: 1;
+  }
 
-	.content {
-		display: flex;
-		flex: 1;
-		flex-direction: column;
-		background-color: #000000;
-        background-image: url(../../static/logo-bg.jpg);
-		padding: 10px;
-        justify-content: center;
-        background-repeat: no-repeat;
-        background-size: 100% 100%;
-        opacity: 0.75;
-	}
-	
-	.content-de {
-		display: flex;
-		flex: 1;
-		flex-direction: column;
-		background-color: #000000;
-		padding: 10px;
-	    justify-content: center;
-	    background-repeat: no-repeat;
-	    background-size: 100% 100%;
-	    opacity: 0.75;
-	}
+  .content {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    background-color: #000000;
+    background-image: url(../../static/logo-bg.jpg);
+    padding: 10px;
+    justify-content: center;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    opacity: 0.75;
+  }
 
-	.input-group {
-		background-color: #ffffff;
-		margin-top: 20px;
-		position: relative;
-        opacity: 0.95;
-        border-radius: 10px;
-        overflow: hidden;
-	}
+  .content-de {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    background-color: #000000;
+    padding: 10px;
+    justify-content: center;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    opacity: 0.75;
+  }
 
-	.input-group::before {
-		position: absolute;
-		right: 0;
-		top: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(.5);
-		transform: scaleY(.5);
-		background-color: #c8c7cc;
-	}
+  .input-group {
+    background-color: #ffffff;
+    margin-top: 20px;
+    position: relative;
+    opacity: 0.95;
+    border-radius: 10px;
+    overflow: hidden;
+  }
 
-	.input-group::after {
-		position: absolute;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(.5);
-		transform: scaleY(.5);
-		background-color: #c8c7cc;
-	}
+  .input-group::before {
+    position: absolute;
+    right: 0;
+    top: 0;
+    left: 0;
+    height: 1px;
+    content: '';
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+    background-color: #c8c7cc;
+  }
 
-	.input-row {
-		display: flex;
-		flex-direction: row;
-		position: relative;
-		/* font-size: 18px; */
-		height: 50px;
-		line-height: 50px;
-	}
+  .input-group::after {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    height: 1px;
+    content: '';
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+    background-color: #c8c7cc;
+  }
 
-	.input-row .title {
-		width: 70px;
-		padding-left: 15px;
-	}
+  .input-row {
+    display: flex;
+    flex-direction: row;
+    position: relative;
+    /* font-size: 18px; */
+    height: 50px;
+    line-height: 50px;
+  }
 
-	.input-row.border::after {
-		position: absolute;
-		right: 0;
-		bottom: 0;
-		left: 8px;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(.5);
-		transform: scaleY(.5);
-		background-color: #c8c7cc;
-	}
+  .input-row .title {
+    width: 70px;
+    padding-left: 15px;
+  }
 
-	.btn-row {
-		margin-top: 10px;
-		padding: 10px 0;
-	}
+  .input-row.border::after {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    left: 8px;
+    height: 1px;
+    content: '';
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+    background-color: #c8c7cc;
+  }
 
-	button.primary {
-		background-color: #0faeff;
-        line-height: 40px;
-        border-radius: 5px;
-        overflow: hidden;
-	}
-	.login-type {
-		display: flex;
-		justify-content: center;
-	}
+  .btn-row {
+    margin-top: 10px;
+    padding: 10px 0;
+  }
 
-	.login-type-btn {
-		line-height: 30px;
-		margin: 0px 15px;
-	}
+  button.primary {
+    background-color: #0faeff;
+    line-height: 40px;
+    border-radius: 5px;
+    overflow: hidden;
+  }
 
-	.login-type-btn.act {
-		color: #0FAEFF;
-		border-bottom: solid 1px #0FAEFF;
-	}
+  .login-type {
+    display: flex;
+    justify-content: center;
+  }
 
-	.send-code-btn {
-		width: 120px;
-		text-align: center;
-		background-color: #0FAEFF;
-		color: #FFFFFF;
-	}
+  .login-type-btn {
+    line-height: 30px;
+    margin: 0px 15px;
+  }
 
-	.action-row {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-	}
+  .login-type-btn.act {
+    color: #0FAEFF;
+    border-bottom: solid 1px #0FAEFF;
+  }
 
-	.action-row navigator {
-		color: #007aff;
-		padding: 0 10px;
-	}
+  .send-code-btn {
+    width: 120px;
+    text-align: center;
+    background-color: #0FAEFF;
+    color: #FFFFFF;
+  }
 
-	.oauth-row {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-around;
-		flex-wrap: wrap;
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-	}
+  .action-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+  }
 
-	.oauth-image {
-		position: relative;
-		width: 50px;
-		height: 50px;
-		border: 1px solid #dddddd;
-		border-radius: 50px;
-		background-color: #ffffff;
-	}
+  .action-row navigator {
+    color: #007aff;
+    padding: 0 10px;
+  }
 
-	.oauth-image image {
-		width: 30px;
-		height: 30px;
-		margin: 10px;
-	}
+  .oauth-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-around;
+    flex-wrap: wrap;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+  }
 
-	.oauth-image button {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		opacity: 0;
-	}
+  .oauth-image {
+    position: relative;
+    width: 50px;
+    height: 50px;
+    border: 1px solid #dddddd;
+    border-radius: 50px;
+    background-color: #ffffff;
+  }
 
-	.captcha-view {
-		line-height: 0;
-		justify-content: center;
-		align-items: center;
-		display: flex;
-		position: relative;
-		background-color: #f3f3f3;
-	}
-    .welcome {
-        padding-left: 15px;
-        font-size: x-large;
-        font-weight: 500;
-        letter-spacing: 2px;
-    }
-</style>
+  .oauth-image image {
+    width: 30px;
+    height: 30px;
+    margin: 10px;
+  }
+
+  .oauth-image button {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+  }
+
+  .captcha-view {
+    line-height: 0;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+    position: relative;
+    background-color: #f3f3f3;
+  }
+
+  .welcome {
+    padding-left: 15px;
+    font-size: x-large;
+    font-weight: 500;
+    letter-spacing: 2px;
+  }
+</style>
\ No newline at end of file

From 0e6cb26ba9c9a3aa6647108f95f214da8503ec0b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 17 Feb 2023 21:53:57 +0800
Subject: [PATCH 24/48] =?UTF-8?q?perf(token):=20=E7=A6=81=E7=94=A8token?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/filter/JWTFilter.java    |  4 +---
 .../java/io/dataease/auth/util/JWTUtils.java  | 21 +++----------------
 .../commons/utils/TokenCacheUtils.java        |  9 --------
 .../src/main/resources/ehcache/ehcache.xml    | 12 +----------
 4 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index e5bd636789..db9be9a709 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -66,7 +66,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         if (StringUtils.startsWith(authorization, "Basic")) {
             return false;
         }
-        if (!TokenCacheUtils.validate(authorization) && !TokenCacheUtils.validateDelay(authorization)) {
+        if (!TokenCacheUtils.validate(authorization)) {
             throw new AuthenticationException(expireMessage);
         }
         // 当没有出现登录超时 且需要刷新token 则执行刷新token
@@ -75,8 +75,6 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
             throw new AuthenticationException(expireMessage);
         }
         if (JWTUtils.needRefresh(authorization)) {
-            TokenCacheUtils.addWithTtl(authorization, 1L);
-            TokenCacheUtils.remove(authorization);
             authorization = refreshToken(request, response);
         }
         JWTToken token = new JWTToken(authorization);
diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
index cebe34c5f5..2c671abda9 100644
--- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -20,9 +20,6 @@ import java.util.Date;
 
 public class JWTUtils {
 
-    // token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token )
-    private static final long EXPIRE_TIME = 1 * 60 * 1000;
-    // 登录间隔时间10min 超过这个时间强制重新登录
     private static long Login_Interval;
 
     /**
@@ -67,9 +64,7 @@ public class JWTUtils {
     }
 
     public static boolean needRefresh(String token) {
-        Date exp = JWTUtils.getExp(token);
-        Long advanceTime = 5000L;
-        return (new Date().getTime() + advanceTime) >= exp.getTime();
+        return false;
     }
 
     /**
@@ -95,18 +90,9 @@ public class JWTUtils {
         return isExpire;
     }
 
-    public static Date getExp(String token) {
-        try {
-            DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim("exp").asDate();
-        } catch (JWTDecodeException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
+
 
     /**
-     * 生成签名,5min后过期
      *
      * @param tokenInfo 用户信息
      * @param secret    用户的密码
@@ -114,12 +100,11 @@ public class JWTUtils {
      */
     public static String sign(TokenInfo tokenInfo, String secret) {
         try {
-            Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
             Algorithm algorithm = Algorithm.HMAC256(secret);
             Builder builder = JWT.create()
                     .withClaim("username", tokenInfo.getUsername())
                     .withClaim("userId", tokenInfo.getUserId());
-            String sign = builder.withExpiresAt(date).sign(algorithm);
+            String sign = builder.sign(algorithm);
             TokenCacheUtils.add(sign, tokenInfo.getUserId());
             return sign;
 
diff --git a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
index 338adbf2da..bc936c3be5 100644
--- a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
@@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils;
 public class TokenCacheUtils {
 
     private static final String KEY = "sys_token_store";
-    private static final String DELAY_KEY = "sys_token_store_delay";
 
     public static void add(String token, Long userId) {
         CacheUtils.put(KEY, token, userId, null, null);
@@ -27,12 +26,4 @@ public class TokenCacheUtils {
         return ObjectUtils.isNotEmpty(sys_token_store) && StringUtils.isNotBlank(sys_token_store.toString()) && userId == Long.parseLong(sys_token_store.toString());
     }
 
-    public static void addWithTtl(String token, Long userId) {
-        CacheUtils.put(DELAY_KEY, token, userId, 3, 5);
-    }
-
-    public static boolean validateDelay(String token) {
-        Object tokenObj = CacheUtils.get(DELAY_KEY, token);
-        return ObjectUtils.isNotEmpty(tokenObj) && StringUtils.isNotBlank(tokenObj.toString());
-    }
 }
diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml
index f8d8591b20..eccd3b1661 100644
--- a/backend/src/main/resources/ehcache/ehcache.xml
+++ b/backend/src/main/resources/ehcache/ehcache.xml
@@ -277,19 +277,9 @@
             maxElementsOnDisk="3000"
             overflowToDisk="true"
             diskPersistent="false"
-    />
-
-    <cache
-            name="sys_token_store_delay"
-            eternal="false"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="3000"
-            overflowToDisk="true"
-            diskPersistent="false"
-            timeToIdleSeconds="3"
-            timeToLiveSeconds="5"
             memoryStoreEvictionPolicy="LRU"
     />
 
 
+
 </ehcache>
\ No newline at end of file

From a34e99d7c1bab3a1555c67e7ed81eae0d571f466 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 17 Feb 2023 22:05:00 +0800
Subject: [PATCH 25/48] =?UTF-8?q?Revert=20"perf(token):=20=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8token=E5=88=B7=E6=96=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0e6cb26ba9c9a3aa6647108f95f214da8503ec0b.
---
 .../io/dataease/auth/filter/JWTFilter.java    |  4 +++-
 .../java/io/dataease/auth/util/JWTUtils.java  | 21 ++++++++++++++++---
 .../commons/utils/TokenCacheUtils.java        |  9 ++++++++
 .../src/main/resources/ehcache/ehcache.xml    | 12 ++++++++++-
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index db9be9a709..e5bd636789 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -66,7 +66,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         if (StringUtils.startsWith(authorization, "Basic")) {
             return false;
         }
-        if (!TokenCacheUtils.validate(authorization)) {
+        if (!TokenCacheUtils.validate(authorization) && !TokenCacheUtils.validateDelay(authorization)) {
             throw new AuthenticationException(expireMessage);
         }
         // 当没有出现登录超时 且需要刷新token 则执行刷新token
@@ -75,6 +75,8 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
             throw new AuthenticationException(expireMessage);
         }
         if (JWTUtils.needRefresh(authorization)) {
+            TokenCacheUtils.addWithTtl(authorization, 1L);
+            TokenCacheUtils.remove(authorization);
             authorization = refreshToken(request, response);
         }
         JWTToken token = new JWTToken(authorization);
diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
index 2c671abda9..cebe34c5f5 100644
--- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -20,6 +20,9 @@ import java.util.Date;
 
 public class JWTUtils {
 
+    // token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token )
+    private static final long EXPIRE_TIME = 1 * 60 * 1000;
+    // 登录间隔时间10min 超过这个时间强制重新登录
     private static long Login_Interval;
 
     /**
@@ -64,7 +67,9 @@ public class JWTUtils {
     }
 
     public static boolean needRefresh(String token) {
-        return false;
+        Date exp = JWTUtils.getExp(token);
+        Long advanceTime = 5000L;
+        return (new Date().getTime() + advanceTime) >= exp.getTime();
     }
 
     /**
@@ -90,9 +95,18 @@ public class JWTUtils {
         return isExpire;
     }
 
-
+    public static Date getExp(String token) {
+        try {
+            DecodedJWT jwt = JWT.decode(token);
+            return jwt.getClaim("exp").asDate();
+        } catch (JWTDecodeException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
     /**
+     * 生成签名,5min后过期
      *
      * @param tokenInfo 用户信息
      * @param secret    用户的密码
@@ -100,11 +114,12 @@ public class JWTUtils {
      */
     public static String sign(TokenInfo tokenInfo, String secret) {
         try {
+            Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
             Algorithm algorithm = Algorithm.HMAC256(secret);
             Builder builder = JWT.create()
                     .withClaim("username", tokenInfo.getUsername())
                     .withClaim("userId", tokenInfo.getUserId());
-            String sign = builder.sign(algorithm);
+            String sign = builder.withExpiresAt(date).sign(algorithm);
             TokenCacheUtils.add(sign, tokenInfo.getUserId());
             return sign;
 
diff --git a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
index bc936c3be5..338adbf2da 100644
--- a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 public class TokenCacheUtils {
 
     private static final String KEY = "sys_token_store";
+    private static final String DELAY_KEY = "sys_token_store_delay";
 
     public static void add(String token, Long userId) {
         CacheUtils.put(KEY, token, userId, null, null);
@@ -26,4 +27,12 @@ public class TokenCacheUtils {
         return ObjectUtils.isNotEmpty(sys_token_store) && StringUtils.isNotBlank(sys_token_store.toString()) && userId == Long.parseLong(sys_token_store.toString());
     }
 
+    public static void addWithTtl(String token, Long userId) {
+        CacheUtils.put(DELAY_KEY, token, userId, 3, 5);
+    }
+
+    public static boolean validateDelay(String token) {
+        Object tokenObj = CacheUtils.get(DELAY_KEY, token);
+        return ObjectUtils.isNotEmpty(tokenObj) && StringUtils.isNotBlank(tokenObj.toString());
+    }
 }
diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml
index eccd3b1661..f8d8591b20 100644
--- a/backend/src/main/resources/ehcache/ehcache.xml
+++ b/backend/src/main/resources/ehcache/ehcache.xml
@@ -277,9 +277,19 @@
             maxElementsOnDisk="3000"
             overflowToDisk="true"
             diskPersistent="false"
+    />
+
+    <cache
+            name="sys_token_store_delay"
+            eternal="false"
+            maxElementsInMemory="100"
+            maxElementsOnDisk="3000"
+            overflowToDisk="true"
+            diskPersistent="false"
+            timeToIdleSeconds="3"
+            timeToLiveSeconds="5"
             memoryStoreEvictionPolicy="LRU"
     />
 
 
-
 </ehcache>
\ No newline at end of file

From 13adc3de0bac706b84940699d649169004e1e372 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 Feb 2023 09:15:14 +0800
Subject: [PATCH 26/48] =?UTF-8?q?perf(token):=20token=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=87=87=E7=94=A8token=E9=BB=91=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/config/F2CRealm.java     |  2 +-
 .../io/dataease/auth/filter/JWTFilter.java    |  4 +-
 .../io/dataease/auth/server/AuthServer.java   |  6 +-
 .../java/io/dataease/auth/util/JWTUtils.java  |  2 -
 .../commons/utils/TokenCacheUtils.java        | 72 ++++++++++++++-----
 5 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
index 2084145759..504d8cfb6f 100644
--- a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
+++ b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
@@ -84,7 +84,7 @@ public class F2CRealm extends AuthorizingRealm {
             token = (String) auth.getCredentials();
             // 解密获得username，用于和数据库进行对比
             tokenInfo = JWTUtils.tokenInfoByToken(token);
-            if (!TokenCacheUtils.validate(token)) {
+            if (TokenCacheUtils.invalid(token)) {
                 throw new AuthenticationException("token invalid");
             }
         } catch (Exception e) {
diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index e5bd636789..0d70181289 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -66,7 +66,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         if (StringUtils.startsWith(authorization, "Basic")) {
             return false;
         }
-        if (!TokenCacheUtils.validate(authorization) && !TokenCacheUtils.validateDelay(authorization)) {
+        if (TokenCacheUtils.invalid(authorization)) {
             throw new AuthenticationException(expireMessage);
         }
         // 当没有出现登录超时 且需要刷新token 则执行刷新token
@@ -75,8 +75,6 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
             throw new AuthenticationException(expireMessage);
         }
         if (JWTUtils.needRefresh(authorization)) {
-            TokenCacheUtils.addWithTtl(authorization, 1L);
-            TokenCacheUtils.remove(authorization);
             authorization = refreshToken(request, response);
         }
         JWTToken token = new JWTToken(authorization);
diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
index 6e1fdafd57..ed7cdb0328 100644
--- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java
+++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
@@ -148,7 +148,7 @@ public class AuthServer implements AuthApi {
                 AccountLockStatus lockStatus = authUserService.recordLoginFail(username, 0);
                 DataEaseException.throwException(appendLoginErrorMsg(Translator.get("i18n_id_or_pwd_error"), lockStatus));
             }
-            if(user.getIsAdmin() && user.getPassword().equals("40b8893ea9ebc2d631c4bb42bb1e8996")){
+            if (user.getIsAdmin() && user.getPassword().equals("40b8893ea9ebc2d631c4bb42bb1e8996")) {
                 result.put("passwordModified", false);
             }
         }
@@ -237,7 +237,7 @@ public class AuthServer implements AuthApi {
             if (StringUtils.isBlank(result)) {
                 result = "success";
             }
-            TokenCacheUtils.remove(token);
+            TokenCacheUtils.add(token, userId);
         } catch (Exception e) {
             LogUtil.error(e);
             if (StringUtils.isBlank(result)) {
@@ -291,7 +291,7 @@ public class AuthServer implements AuthApi {
             if (StringUtils.isBlank(result)) {
                 result = "success";
             }
-            TokenCacheUtils.remove(token);
+            TokenCacheUtils.add(token, userId);
         } catch (Exception e) {
             LogUtil.error(e);
             if (StringUtils.isBlank(result)) {
diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
index cebe34c5f5..fc297d1e17 100644
--- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -10,7 +10,6 @@ import com.auth0.jwt.interfaces.Verification;
 import io.dataease.auth.entity.TokenInfo;
 import io.dataease.auth.entity.TokenInfo.TokenInfoBuilder;
 import io.dataease.commons.utils.CommonBeanFactory;
-import io.dataease.commons.utils.TokenCacheUtils;
 import io.dataease.exception.DataEaseException;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -120,7 +119,6 @@ public class JWTUtils {
                     .withClaim("username", tokenInfo.getUsername())
                     .withClaim("userId", tokenInfo.getUserId());
             String sign = builder.withExpiresAt(date).sign(algorithm);
-            TokenCacheUtils.add(sign, tokenInfo.getUserId());
             return sign;
 
         } catch (Exception e) {
diff --git a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
index 338adbf2da..0bcec3b8c8 100644
--- a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
@@ -3,36 +3,76 @@ package io.dataease.commons.utils;
 import io.dataease.listener.util.CacheUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
 
+import java.util.concurrent.TimeUnit;
+
+
+@Component
 public class TokenCacheUtils {
 
+
     private static final String KEY = "sys_token_store";
-    private static final String DELAY_KEY = "sys_token_store_delay";
+
+    private static String cacheType;
+
+    private static Long expTime;
+
+    @Value("${spring.cache.type:ehcache}")
+    public void setCacheType(String cacheType) {
+        TokenCacheUtils.cacheType = cacheType;
+    }
+
+    @Value("${dataease.login_timeout:480}")
+    public void setExpTime(Long expTime) {
+        TokenCacheUtils.expTime = expTime;
+    }
+
+    private static boolean useRedis() {
+        return StringUtils.equals(cacheType, "redis");
+    }
+
+
+    private static ValueOperations cacheHandler() {
+        RedisTemplate redisTemplate = (RedisTemplate) CommonBeanFactory.getBean("redisTemplate");
+        ValueOperations valueOperations = redisTemplate.opsForValue();
+        return valueOperations;
+    }
 
     public static void add(String token, Long userId) {
-        CacheUtils.put(KEY, token, userId, null, null);
+        if (useRedis()) {
+            ValueOperations valueOperations = cacheHandler();
+            valueOperations.set(KEY + token, userId, expTime, TimeUnit.MINUTES);
+            return;
+        }
+
+        Long time = expTime * 60;
+        CacheUtils.put(KEY, token, userId, time.intValue(), null);
+
     }
 
     public static void remove(String token) {
+        if (useRedis()) {
+            RedisTemplate redisTemplate = (RedisTemplate) CommonBeanFactory.getBean("redisTemplate");
+            String key = KEY + token;
+            if (redisTemplate.hasKey(key)) {
+                redisTemplate.delete(key);
+            }
+            return;
+        }
         CacheUtils.remove(KEY, token);
     }
 
-    public static boolean validate(String token) {
+    public static boolean invalid(String token) {
+        if (useRedis()) {
+            RedisTemplate redisTemplate = (RedisTemplate) CommonBeanFactory.getBean("redisTemplate");
+            return redisTemplate.hasKey(KEY + token);
+        }
         Object sys_token_store = CacheUtils.get(KEY, token);
         return ObjectUtils.isNotEmpty(sys_token_store) && StringUtils.isNotBlank(sys_token_store.toString());
     }
 
-    public static boolean validate(String token, Long userId) {
-        Object sys_token_store = CacheUtils.get(KEY, token);
-        return ObjectUtils.isNotEmpty(sys_token_store) && StringUtils.isNotBlank(sys_token_store.toString()) && userId == Long.parseLong(sys_token_store.toString());
-    }
-
-    public static void addWithTtl(String token, Long userId) {
-        CacheUtils.put(DELAY_KEY, token, userId, 3, 5);
-    }
-
-    public static boolean validateDelay(String token) {
-        Object tokenObj = CacheUtils.get(DELAY_KEY, token);
-        return ObjectUtils.isNotEmpty(tokenObj) && StringUtils.isNotBlank(tokenObj.toString());
-    }
 }

From 2a350c61c78643f9418811b3e492fb7f3ccabfee Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 Feb 2023 12:52:08 +0800
Subject: [PATCH 27/48] =?UTF-8?q?revert:=20excel=20=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/commons/utils/ExcelXlsxReader.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
index 2300f7dded..15014155a6 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
@@ -359,8 +359,8 @@ public class ExcelXlsxReader extends DefaultHandler {
             formatIndex = style.getDataFormat();
             formatString = style.getDataFormatString();
             short format = this.formatIndex;
-            if ((14 <= format && format <= 17) || format == 0 || format == 20 || format == 22 || format == 31 || format == 35 || (45 <= format && format <= 49) || format == 46 || format == 47 || (57 <= format && format <= 59)
-                    || (59 < format && format <= 76) || (175 < format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期
+            if ((14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59)
+                    || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期
                 isDateFormat = true;
             }
 

From dfadeb6dbb6e00871fdcb563d408ab3a6cb70b95 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 Feb 2023 12:58:32 +0800
Subject: [PATCH 28/48] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96=20oralce=20data?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/query/oracle/OracleQueryProvider.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index e5dada23c6..ebd8846aa9 100644
--- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -916,6 +916,9 @@ public class OracleQueryProvider extends QueryProvider {
                     continue;
                 }
                 String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                if(datasetTableField.getType().equals("DATE")){
+                    originField = String.format(OracleConstants.TO_CHAR, originField, OracleConstants.DEFAULT_DATE_FORMAT);
+                }
                 String fieldAlias = String.format(OracleConstants.KEYWORD_TABLE, x.getOriginName());
                 xFields.add(getXFields(x, originField, fieldAlias));
             }

From 67672fbc94e0cca4e2f78214f19f744f016b4c90 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 Feb 2023 13:49:59 +0800
Subject: [PATCH 29/48] =?UTF-8?q?perf(=E7=99=BB=E5=BD=95):=20=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=92=89=E9=92=89=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E5=85=8D=E7=99=BB=E4=BD=BF=E7=94=A8DE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/ehcache/ehcache.xml | 18 ++++--------------
 mobile/src/locale/zh-Hans.json                 |  2 +-
 mobile/src/locale/zh-Hant.json                 |  2 +-
 mobile/src/pages.json                          |  2 +-
 mobile/src/pages/login/index.vue               | 11 +++++++++--
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml
index f8d8591b20..5976911a62 100644
--- a/backend/src/main/resources/ehcache/ehcache.xml
+++ b/backend/src/main/resources/ehcache/ehcache.xml
@@ -273,23 +273,13 @@
     <cache
             name="sys_token_store"
             eternal="true"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="3000"
+            maxElementsInMemory="1"
+            maxElementsOnDisk="0"
             overflowToDisk="true"
-            diskPersistent="false"
+            diskPersistent="true"
     />
 
-    <cache
-            name="sys_token_store_delay"
-            eternal="false"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="3000"
-            overflowToDisk="true"
-            diskPersistent="false"
-            timeToIdleSeconds="3"
-            timeToLiveSeconds="5"
-            memoryStoreEvictionPolicy="LRU"
-    />
+
 
 
 </ehcache>
\ No newline at end of file
diff --git a/mobile/src/locale/zh-Hans.json b/mobile/src/locale/zh-Hans.json
index afaed12e0f..3da2e19ea1 100644
--- a/mobile/src/locale/zh-Hans.json
+++ b/mobile/src/locale/zh-Hans.json
@@ -1,5 +1,5 @@
 {
-    "app.name": "Hello uni-app",
+    "app.name": "DataEase",
 
     "navigate.menuHome": "首页",
     "navigate.menuDir": "目录",
diff --git a/mobile/src/locale/zh-Hant.json b/mobile/src/locale/zh-Hant.json
index a3b8f5f97c..ff6fb1f846 100644
--- a/mobile/src/locale/zh-Hant.json
+++ b/mobile/src/locale/zh-Hant.json
@@ -1,5 +1,5 @@
 {
-    "app.name": "Hello uni-app",
+    "app.name": "DataEase",
     "navigate.menuHome": "首頁",
     "navigate.menuDir": "目錄",
     "navigate.menuMe": "我的",
diff --git a/mobile/src/pages.json b/mobile/src/pages.json
index 1fcfb0dc34..11a720f61d 100644
--- a/mobile/src/pages.json
+++ b/mobile/src/pages.json
@@ -4,7 +4,7 @@
     {
       "path": "pages/login/index",
       "style": {
-        "navigationBarTitleText": "%navigate.login%",
+        "navigationBarTitleText": "%app.name%",
         "app-plus": {
           "titleNView": false
         }
diff --git a/mobile/src/pages/login/index.vue b/mobile/src/pages/login/index.vue
index 12b9d94dee..5c68fc6808 100644
--- a/mobile/src/pages/login/index.vue
+++ b/mobile/src/pages/login/index.vue
@@ -69,7 +69,7 @@
         title: this.$t('commons.loading')
       });
       this.loadUiInfo()
-      this.loadPublicKey()      
+      this.loadPublicKey()     
       if (!this.autoLogin() && getToken() && getUserInfo()) {
         this.toMain()
       }
@@ -154,8 +154,15 @@
         const url = window.location.href
         const param = getUrlParams(url)
         if (param?.detoken) {
+          if(param.detoken.endsWith('#/'))
+          param.detoken = param.detoken.substr(0, param.detoken.length - 2)
           setToken(param.detoken)
-          this.toMain()
+          getInfo().then(res => {
+            setUserInfo(res.data)
+            const redirect = window.location.href.split('?')[0]
+           
+            window.location.href = redirect
+          })
           return true
         }
         return false

From d9b664f86db371b19bd1a3142eb17809e44d4880 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 Feb 2023 15:01:22 +0800
Subject: [PATCH 30/48] =?UTF-8?q?perf(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?):=20=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E9=A1=B5=E9=9D=A2=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/system/user.js               | 1 +
 frontend/src/views/system/user/UserEditer.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/api/system/user.js b/frontend/src/api/system/user.js
index cdfc543a6d..6b366912e4 100644
--- a/frontend/src/api/system/user.js
+++ b/frontend/src/api/system/user.js
@@ -35,6 +35,7 @@ export const addUser = (data) => {
   return request({
     url: pathMap.createPath,
     method: 'post',
+    loading: true,
     data
   })
 }
diff --git a/frontend/src/views/system/user/UserEditer.vue b/frontend/src/views/system/user/UserEditer.vue
index 5635d732a8..5e58d7b4c8 100644
--- a/frontend/src/views/system/user/UserEditer.vue
+++ b/frontend/src/views/system/user/UserEditer.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="formType == 'add' ? $t('user.create') : $t('user.modify')"
     :visible.sync="dialogVisible"
     class="user-editer-form"
@@ -229,6 +230,7 @@ import { pluginLoaded, defaultPwd, wecomStatus, dingtalkStatus, larkStatus } fro
 export default {
   data() {
     return {
+      loading: false,
       defaultProps: {
         children: 'children',
         label: 'label',
@@ -553,12 +555,13 @@ export default {
     save() {
       this.$refs.createUserForm.validate((valid) => {
         if (valid) {
-          // !this.form.deptId && (this.form.deptId = 0)
+          this.loading = true
           const method = this.formType === 'add' ? addUser : editUser
           method(this.form).then((res) => {
             this.$success(this.$t('commons.save_success'))
             this.reset()
             this.$emit('saved')
+            this.loading = false
           })
         } else {
           return false

From 7cd63c9131f9eeb8cf34faaf9a77376f1a2b296e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 Feb 2023 15:16:30 +0800
Subject: [PATCH 31/48] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96=20oralce=20data?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/query/oracle/OracleQueryProvider.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index ebd8846aa9..28e43d0b1d 100644
--- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -880,6 +880,7 @@ public class OracleQueryProvider extends QueryProvider {
             ChartViewFieldDTO f = new ChartViewFieldDTO();
             f.setOriginName(datasetTableField.getOriginName());
             f.setDeType(0);
+            f.setType(datasetTableField.getType());
             xAxis.add(f);
         });
 
@@ -916,7 +917,7 @@ public class OracleQueryProvider extends QueryProvider {
                     continue;
                 }
                 String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
-                if(datasetTableField.getType().equals("DATE")){
+                if(xAxis.get(i).getType().equals("DATE")){
                     originField = String.format(OracleConstants.TO_CHAR, originField, OracleConstants.DEFAULT_DATE_FORMAT);
                 }
                 String fieldAlias = String.format(OracleConstants.KEYWORD_TABLE, x.getOriginName());

From d0debd5c2201154386a039fe21928c828e99bb59 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 Feb 2023 15:58:28 +0800
Subject: [PATCH 32/48] =?UTF-8?q?fix:=20mysql=20=E5=90=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/query/mysql/MysqlQueryProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index d7bc42a7f2..1ccc4b2893 100644
--- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -808,7 +808,7 @@ public class MysqlQueryProvider extends QueryProvider {
             }
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        return MessageFormat.format("SELECT {0} FROM {1}  LIMIT DE_OFFSET, DE_PAGE_SIZE ", StringUtils.join(array, ","), table);
+        return MessageFormat.format("SELECT {0} FROM {1}  LIMIT DE_OFFSET, DE_PAGE_SIZE ", StringUtils.join(array, ","), String.format(MySQLConstants.KEYWORD_TABLE, table));
     }
 
     public String getTotalCount(boolean isTable, String sql, Datasource ds) {

From 450427d28e762327d0699ba0b578c1f020bd48d8 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Mon, 20 Feb 2023 16:17:40 +0800
Subject: [PATCH 33/48] =?UTF-8?q?fix:=20=E8=A1=80=E7=BC=98=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=A4=B1=E7=9C=9F=20=E6=9B=B4=E6=8D=A2svg=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/relationship/consanguinity.vue | 6 +++---
 frontend/static/svg/de-dashboard.svg                     | 1 +
 frontend/static/svg/de-dataset.svg                       | 1 +
 frontend/static/svg/de-datasource.svg                    | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 frontend/static/svg/de-dashboard.svg
 create mode 100644 frontend/static/svg/de-dataset.svg
 create mode 100644 frontend/static/svg/de-datasource.svg

diff --git a/frontend/src/views/system/relationship/consanguinity.vue b/frontend/src/views/system/relationship/consanguinity.vue
index 769290965e..7d83ab73cd 100644
--- a/frontend/src/views/system/relationship/consanguinity.vue
+++ b/frontend/src/views/system/relationship/consanguinity.vue
@@ -425,9 +425,9 @@ export default {
               let height = 22
 
               const imageType = {
-                datasource: 'data:image/png;base64,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',
-                panel: 'data:image/png;base64,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',
-                dataset: 'data:image/png;base64,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',
+                datasource: '/static/svg/de-datasource.svg',
+                panel: '/static/svg/de-dashboard.svg',
+                dataset: '/static/svg/de-dataset.svg'
               }
 
               
diff --git a/frontend/static/svg/de-dashboard.svg b/frontend/static/svg/de-dashboard.svg
new file mode 100644
index 0000000000..f900aa8174
--- /dev/null
+++ b/frontend/static/svg/de-dashboard.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676880438895" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2075" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M913.408 202.752c0 12.288-8.192 20.48-20.48 20.48s-20.48-8.192-20.48-20.48v-18.432c0-45.056-36.864-81.92-81.92-81.92h-573.44c-45.056 0-81.92 36.864-81.92 81.92v655.36c0 45.056 36.864 81.92 81.92 81.92h573.44c45.056 0 81.92-36.864 81.92-81.92v-464.896c0-12.288 8.192-20.48 20.48-20.48s20.48 8.192 20.48 20.48V839.68c0 67.584-55.296 122.88-122.88 122.88h-573.44c-67.584 0-122.88-55.296-122.88-122.88v-655.36c0-67.584 55.296-122.88 122.88-122.88h573.44c67.584 0 122.88 55.296 122.88 122.88v18.432z m-665.6 73.728h102.4v552.96h-102.4v-552.96z m204.8 122.88h102.4v430.08h-102.4v-430.08z m204.8 102.4h102.4v327.68h-102.4v-327.68z" fill="#32373B" p-id="2076"></path></svg>
\ No newline at end of file
diff --git a/frontend/static/svg/de-dataset.svg b/frontend/static/svg/de-dataset.svg
new file mode 100644
index 0000000000..60b3e4032c
--- /dev/null
+++ b/frontend/static/svg/de-dataset.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676880471027" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3111" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M483.555556 56.888889L910.222222 284.444444v455.111112l-426.666666 227.555555L56.888889 739.555556V284.444444l426.666667-227.555555zM113.777778 318.577778v386.844444l369.777778 193.422222 369.777777-193.422222V318.577778L483.555556 125.155556 113.777778 318.577778z" fill="#333333" p-id="3112"></path><path d="M494.933333 540.444444h-28.444444l-398.222222-187.733333 28.444444-51.2 386.844445 182.044445 386.844444-182.044445 22.755556 51.2z" fill="#333333" p-id="3113"></path><path d="M455.111111 523.377778h56.888889V910.222222H455.111111z" fill="#333333" p-id="3114"></path></svg>
\ No newline at end of file
diff --git a/frontend/static/svg/de-datasource.svg b/frontend/static/svg/de-datasource.svg
new file mode 100644
index 0000000000..c94abf8f3f
--- /dev/null
+++ b/frontend/static/svg/de-datasource.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676880491070" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4150" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 160a115.936 115.936 0 0 1 114.816 99.328 313.28 313.28 0 0 1 192.224 355.392A115.52 115.52 0 0 1 864 706.304a115.904 115.904 0 0 1-115.968 115.84c-20.48 0-39.712-5.344-56.416-14.624A312.16 312.16 0 0 1 512 864a312.576 312.576 0 0 1-179.648-56.448c-16.64 9.28-35.904 14.56-56.384 14.56A115.904 115.904 0 0 1 160 706.272c0-37.248 17.6-70.4 44.992-91.584-4.352-26.112-6.56-47.424-6.56-63.84a313.28 313.28 0 0 1 198.784-291.52A115.904 115.904 0 0 1 512 160z m105.12 164.704c-20.384 41.856-59.68 66.944-105.12 66.944a116 116 0 0 1-105.152-66.88 249.28 249.28 0 0 0-144.416 226.08c-0.736 15.488 3.2 40.128 3.2 40.128 73.248-5.312 126.304 51.36 126.304 115.328a115.2 115.2 0 0 1-13.824 54.88A248.192 248.192 0 0 0 512 800.096c48.288 0 94.4-13.728 133.92-38.88a115.04 115.04 0 0 1-13.856-54.912c0-64 54.144-121.76 126.24-115.328 0 0 3.264-26.56 3.264-40.128a249.344 249.344 0 0 0-144.448-226.144z m130.912 329.696A51.936 51.936 0 1 0 800 706.304c0-28.672-23.264-51.904-51.968-51.904z m-472.064 0a51.936 51.936 0 1 0 51.968 51.904c0-28.672-23.264-51.904-51.968-51.904zM512 223.904a51.936 51.936 0 1 0 51.968 51.904c0-28.64-23.264-51.904-51.968-51.904z" fill="#686C78" p-id="4151"></path></svg>
\ No newline at end of file

From 44c339e7e72e30a03e92f41cd89a45d276f84acb Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:10:22 +0800
Subject: [PATCH 34/48] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/datasource/DsTree.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index b546ca3449..e3c2be026d 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -262,7 +262,7 @@
         v-dialogDrag
         :title="$t('datasource.create')"
         :visible.sync="dsTypeRelate"
-        width="1005px"
+        width="1010px"
         class="de-dialog-form none-scroll-bar"
         append-to-body
       >

From 7feeed50155bb1efbcf00f466385e6b3dc8fda64 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 21 Feb 2023 11:39:46 +0800
Subject: [PATCH 35/48] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=98=8E=E7=BB=86=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=97=A0=E6=B3=95=E6=BB=9A=E5=8A=A8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/customComponent/UserViewDialog.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/frontend/src/components/canvas/customComponent/UserViewDialog.vue
index a3a4d023ce..58a4e5fee1 100644
--- a/frontend/src/components/canvas/customComponent/UserViewDialog.vue
+++ b/frontend/src/components/canvas/customComponent/UserViewDialog.vue
@@ -64,7 +64,7 @@
         :enable-scroll="false"
         :chart="chartTable"
         :show-summary="false"
-        class="table-class"
+        class="table-class-dialog"
       />
     </de-main-container>
   </de-container>
@@ -342,8 +342,9 @@ export default {
   height: 100%;
 }
 
-.table-class {
+.table-class-dialog {
   height: 100%;
+  overflow-y: auto !important;
 }
 
 .canvas-class {

From 2658cc4cef5ede5b6bf0d9c369b244d5c455f531 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 21 Feb 2023 11:58:43 +0800
Subject: [PATCH 36/48] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=98=8E=E7=BB=86=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/customComponent/UserView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index da4713b75f..e5de90d083 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -759,7 +759,7 @@ export default {
           const attrSize = JSON.parse(this.view.customAttr).size
           if (this.chart.type === 'table-info' && this.view.datasetMode === 0 && (!attrSize.tablePageMode || attrSize.tablePageMode === 'page')) {
             requestInfo.goPage = this.currentPage.page
-            requestInfo.pageSize = this.currentPage.pageSize
+            requestInfo.pageSize = this.currentPage.pageSize === parseInt(attrSize.tablePageSize) ? this.currentPage.pageSize : parseInt(attrSize.tablePageSize)
           }
         }
         if (this.isFirstLoad) {

From 203ed10aa393e23bc56ba82fec6337f77e559f2f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 21 Feb 2023 12:43:50 +0800
Subject: [PATCH 37/48] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=9C=AA=E7=BB=91=E5=AE=9A=E4=B9=9F=E8=83=BD=E4=BB=8E?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E8=BF=9B=E5=85=A5DE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/permission.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/permission.js b/frontend/src/permission.js
index c612f949c9..96aa5902fd 100644
--- a/frontend/src/permission.js
+++ b/frontend/src/permission.js
@@ -57,7 +57,7 @@ const routeBefore = (callBack) => {
     callBack()
   }
 }
-router.beforeEach(async(to, from, next) => routeBefore(() => {
+router.beforeEach(async (to, from, next) => routeBefore(() => {
   // start progress bar
   NProgress.start()
   const mobileIgnores = ['/delink', '/de-auto-login']
@@ -69,6 +69,9 @@ router.beforeEach(async(to, from, next) => routeBefore(() => {
     if (hasToken) {
       urlSuffix += ('?detoken=' + hasToken)
     }
+    localStorage.removeItem('user-info')
+    localStorage.removeItem('userId')
+    localStorage.removeItem('Authorization')
     window.location.href = window.origin + urlSuffix
     NProgress.done()
   }

From ee6697a5b9c4acea1ff89f99664d531971482a8c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 21 Feb 2023 13:57:53 +0800
Subject: [PATCH 38/48] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E9=98=B2=E8=8C=83XSS=E6=94=BB=E5=87=BB=20#4585?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                                     | 3 ++-
 .../src/components/canvas/customComponent/DeRichText.vue  | 3 ++-
 .../components/canvas/customComponent/DeRichTextView.vue  | 3 ++-
 frontend/src/components/canvas/customComponent/VText.vue  | 8 ++++----
 frontend/src/main.js                                      | 6 ++++++
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 3816f0a7ab..1a2b29da57 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -88,7 +88,8 @@
     "vuedraggable": "^2.24.3",
     "vuex": "3.1.0",
     "webpack": "^4.46.0",
-    "xlsx": "^0.17.0"
+    "xlsx": "^0.17.0",
+    "xss": "^1.0.14"
   },
   "devDependencies": {
     "@babel/core": "^7.4.0-0",
diff --git a/frontend/src/components/canvas/customComponent/DeRichText.vue b/frontend/src/components/canvas/customComponent/DeRichText.vue
index 4e5a76ab38..195a4bc263 100644
--- a/frontend/src/components/canvas/customComponent/DeRichText.vue
+++ b/frontend/src/components/canvas/customComponent/DeRichText.vue
@@ -37,6 +37,7 @@ import 'tinymce/plugins/nonbreaking'
 import 'tinymce/plugins/pagebreak'
 import { mapState } from 'vuex'
 import Vue from 'vue'
+import xssCheck from 'xss'
 
 export default {
   name: 'DeRichText',
@@ -77,7 +78,7 @@ export default {
       canEdit: false,
       // 初始化配置
       tinymceId: 'tinymce-' + this.element.id,
-      myValue: this.propValue,
+      myValue: xssCheck(this.propValue),
       init: {
         selector: '#tinymce-' + this.element.id,
         toolbar_items_size: 'small',
diff --git a/frontend/src/components/canvas/customComponent/DeRichTextView.vue b/frontend/src/components/canvas/customComponent/DeRichTextView.vue
index 7b5f717876..fe66736ee2 100644
--- a/frontend/src/components/canvas/customComponent/DeRichTextView.vue
+++ b/frontend/src/components/canvas/customComponent/DeRichTextView.vue
@@ -38,6 +38,7 @@ import 'tinymce/plugins/pagebreak'
 import { mapState } from 'vuex'
 import bus from '@/utils/bus'
 import { uuid } from 'vue-uuid'
+import xssCheck from 'xss'
 
 export default {
   name: 'DeRichTextView',
@@ -152,7 +153,7 @@ export default {
     viewInit() {
       bus.$on('fieldSelect-' + this.element.propValue.viewId, this.fieldSelect)
       tinymce.init({})
-      this.myValue = this.assignment(this.element.propValue.textValue)
+      this.myValue = xssCheck(this.assignment(this.element.propValue.textValue))
       bus.$on('initCurFields-' + this.element.id, this.initCurFieldsChange)
       this.$nextTick(() => {
         this.initReady = true
diff --git a/frontend/src/components/canvas/customComponent/VText.vue b/frontend/src/components/canvas/customComponent/VText.vue
index f23c2ca559..8dbd863c42 100644
--- a/frontend/src/components/canvas/customComponent/VText.vue
+++ b/frontend/src/components/canvas/customComponent/VText.vue
@@ -18,7 +18,7 @@
       @mousedown="handleMousedown"
       @blur="handleBlur"
       @input="handleInput"
-      v-html="element.propValue"
+      v-html="$xss(element.propValue)"
     />
     <div
       v-if="!canEdit"
@@ -28,7 +28,7 @@
       @mousedown="handleMousedown"
       @blur="handleBlur"
       @input="handleInput"
-      v-html="element.propValue"
+      v-html="$xss(element.propValue)"
     />
   </div>
   <div
@@ -37,7 +37,7 @@
   >
     <div
       :style="{ verticalAlign: element.style.verticalAlign }"
-      v-html="textInfo"
+      v-html="$xss(textInfo)"
     />
   </div>
 </template>
@@ -80,7 +80,7 @@ export default {
     },
     textInfo() {
       if (this.element && this.element.hyperlinks && this.element.hyperlinks.enable) {
-        return "<a title='" + this.element.hyperlinks.content + "' target='" + this.element.hyperlinks.openMode + "' href='" + this.element.hyperlinks.content + "'>" + this.element.propValue + '</a>'
+        return '<a title=\'' + this.element.hyperlinks.content + '\' target=\'' + this.element.hyperlinks.openMode + '\' href=\'' + this.element.hyperlinks.content + '\'>' + this.element.propValue + '</a>'
       } else {
         return this.element.propValue
       }
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 459f66280a..673cf928ec 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -43,6 +43,12 @@ import 'video.js/dist/video-js.css'
 // 控制标签宽高成比例的指令
 import proportion from 'vue-proportion-directive'
 
+import xss from 'xss'
+// 定义全局XSS解决方法
+Object.defineProperty(Vue.prototype, '$xss', {
+  value: xss
+})
+
 Vue.config.productionTip = false
 Vue.use(VueClipboard)
 Vue.use(widgets)

From 2a5e9cdf3dd63252f22cd9efd4a7e04949187516 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:01:58 +0800
Subject: [PATCH 39/48] =?UTF-8?q?fix:=20URL=E9=80=80=E5=87=BA=E5=90=8E?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8URL=E7=99=BB=E9=99=86=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/permission.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/permission.js b/frontend/src/permission.js
index c612f949c9..afe2e5421e 100644
--- a/frontend/src/permission.js
+++ b/frontend/src/permission.js
@@ -127,7 +127,7 @@ router.beforeEach(async(to, from, next) => routeBefore(() => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`)
+      next(`/login?redirect=${to.fullPath}`)
       NProgress.done()
     }
   }

From d9cfc4dfc50e0d1676b74db787837860b91d65de Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 21 Feb 2023 14:05:36 +0800
Subject: [PATCH 40/48] =?UTF-8?q?fix(=E8=B7=AF=E7=94=B1):=20=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=B7=AF=E7=94=B1=E5=88=B0=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/permission.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/permission.js b/frontend/src/permission.js
index 96aa5902fd..efcede886b 100644
--- a/frontend/src/permission.js
+++ b/frontend/src/permission.js
@@ -130,7 +130,7 @@ router.beforeEach(async (to, from, next) => routeBefore(() => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`)
+      next(`/login?redirect=${to.fullPath}`)
       NProgress.done()
     }
   }

From 6bb338a36433a24a9044f2030f445507d65cc4c3 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 21 Feb 2023 14:41:22 +0800
Subject: [PATCH 41/48] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E7=89=88):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=8B?=
 =?UTF-8?q?Tab=E7=BB=84=E4=BB=B6=E5=86=85=E9=83=A8=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E6=9D=BF=E5=88=87=E6=8D=A2=E6=97=B6=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/deWidget/DeTabs.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue
index 3e9fe23856..786622fa4e 100644
--- a/frontend/src/components/widget/deWidget/DeTabs.vue
+++ b/frontend/src/components/widget/deWidget/DeTabs.vue
@@ -411,6 +411,10 @@ export default {
         const _this = this
         _this.$nextTick(() => {
           try {
+            const targetRef = _this.$refs['canvasTabRef-' + _this.activeTabName]
+            if (targetRef) {
+              targetRef[0].restore()
+            }
             _this.$refs[this.activeTabName][0].resizeChart()
           } catch (e) {
             // ignore

From ac4bf63a8949a92e00cbdf4a8f7651fac7c9ae41 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 21 Feb 2023 16:35:27 +0800
Subject: [PATCH 42/48] =?UTF-8?q?perf(token):=20=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E6=AF=8F=E5=88=86=E9=92=9F=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?token=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/filter/F2CDocFilter.java | 21 +-----
 .../io/dataease/auth/filter/JWTFilter.java    | 46 ++-----------
 .../java/io/dataease/auth/util/JWTUtils.java  | 67 ++-----------------
 .../commons/utils/TokenCacheUtils.java        |  5 +-
 .../ApplicationCloseEventListener.java        | 24 +++++++
 .../io/dataease/listener/util/CacheUtils.java |  6 ++
 .../src/main/resources/ehcache/ehcache.xml    | 14 ++--
 7 files changed, 55 insertions(+), 128 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/listener/ApplicationCloseEventListener.java

diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java b/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java
index d5d8438c3a..ef1c304810 100644
--- a/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java
@@ -79,12 +79,7 @@ public class F2CDocFilter extends AccessControlFilter {
         if (StringUtils.isBlank(authorization)) {
             return false;
         }
-        if (JWTUtils.loginExpire(authorization)) {
-            return false;
-        }
-        if (JWTUtils.needRefresh(authorization)) {
-            authorization = refreshToken(authorization);
-        }
+
         TokenInfo tokenInfo = JWTUtils.tokenInfoByToken(authorization);
         AuthUserService authUserService = CommonBeanFactory.getBean(AuthUserService.class);
         SysUserEntity user = authUserService.getUserById(tokenInfo.getUserId());
@@ -96,20 +91,6 @@ public class F2CDocFilter extends AccessControlFilter {
         return verify;
     }
 
-    private String refreshToken(String token) throws Exception {
-        TokenInfo tokenInfo = JWTUtils.tokenInfoByToken(token);
-        AuthUserService authUserService = CommonBeanFactory.getBean(AuthUserService.class);
-        SysUserEntity user = authUserService.getUserById(tokenInfo.getUserId());
-        if (user == null) {
-            DataEaseException.throwException(Translator.get("i18n_not_find_user"));
-        }
-        String password = user.getPassword();
-        Algorithm algorithm = Algorithm.HMAC256(password);
-        JWTUtils.verifySign(algorithm, token);
-        String newToken = JWTUtils.sign(tokenInfo, password);
-        return newToken;
-    }
-
     @Override
     protected boolean onAccessDenied(ServletRequest req, ServletResponse res) throws Exception {
         HttpServletResponse response = (HttpServletResponse) res;
diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index 0d70181289..83c73fc1ca 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -1,24 +1,18 @@
 package io.dataease.auth.filter;
 
-import com.auth0.jwt.algorithms.Algorithm;
 import io.dataease.auth.entity.ASKToken;
 import io.dataease.auth.entity.JWTToken;
-import io.dataease.auth.entity.SysUserEntity;
-import io.dataease.auth.entity.TokenInfo;
+
 import io.dataease.auth.handler.ApiKeyHandler;
-import io.dataease.auth.service.AuthUserService;
-import io.dataease.auth.util.JWTUtils;
-import io.dataease.commons.utils.CommonBeanFactory;
+
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.commons.utils.TokenCacheUtils;
-import io.dataease.exception.DataEaseException;
-import io.dataease.i18n.Translator;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -30,7 +24,6 @@ import javax.servlet.http.HttpServletResponse;
 
 public class JWTFilter extends BasicHttpAuthenticationFilter {
 
-    private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
     public final static String expireMessage = "Login token is expire.";
 
@@ -69,14 +62,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         if (TokenCacheUtils.invalid(authorization)) {
             throw new AuthenticationException(expireMessage);
         }
-        // 当没有出现登录超时 且需要刷新token 则执行刷新token
-        if (JWTUtils.loginExpire(authorization)) {
-            TokenCacheUtils.remove(authorization);
-            throw new AuthenticationException(expireMessage);
-        }
-        if (JWTUtils.needRefresh(authorization)) {
-            authorization = refreshToken(request, response);
-        }
+
         JWTToken token = new JWTToken(authorization);
         Subject subject = getSubject(request, response);
         // 提交给realm进行登入，如果错误他会抛出异常并被捕获
@@ -110,28 +96,6 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
     }
 
 
-    private String refreshToken(ServletRequest request, ServletResponse response) throws Exception {
-        // 获取AccessToken(Shiro中getAuthzHeader方法已经实现)
-        String token = this.getAuthzHeader(request);
-        // 获取当前Token的帐号信息
-        TokenInfo tokenInfo = JWTUtils.tokenInfoByToken(token);
-        AuthUserService authUserService = CommonBeanFactory.getBean(AuthUserService.class);
-        SysUserEntity user = authUserService.getUserById(tokenInfo.getUserId());
-        if (user == null) {
-            DataEaseException.throwException(Translator.get("i18n_not_find_user"));
-        }
-        String password = user.getPassword();
-        Algorithm algorithm = Algorithm.HMAC256(password);
-        JWTUtils.verifySign(algorithm, token);
-        String newToken = JWTUtils.sign(tokenInfo, password);
-        // 设置响应的Header头新Token
-        HttpServletResponse httpServletResponse = (HttpServletResponse) response;
-        httpServletResponse.addHeader("Access-Control-Expose-Headers", "RefreshAuthorization");
-        httpServletResponse.setHeader("RefreshAuthorization", newToken);
-        return newToken;
-    }
-
-
     /**
      * 对跨域提供支持
      */
diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
index fc297d1e17..a541433842 100644
--- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -4,7 +4,6 @@ import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.JWTCreator.Builder;
 import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.Verification;
 import io.dataease.auth.entity.TokenInfo;
@@ -19,10 +18,8 @@ import java.util.Date;
 
 public class JWTUtils {
 
-    // token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token )
-    private static final long EXPIRE_TIME = 1 * 60 * 1000;
-    // 登录间隔时间10min 超过这个时间强制重新登录
-    private static long Login_Interval;
+
+    private static Long expireTime;
 
     /**
      * 校验token是否正确
@@ -65,62 +62,24 @@ public class JWTUtils {
         return tokenInfoBuilder.build();
     }
 
-    public static boolean needRefresh(String token) {
-        Date exp = JWTUtils.getExp(token);
-        Long advanceTime = 5000L;
-        return (new Date().getTime() + advanceTime) >= exp.getTime();
-    }
-
     /**
-     * 当前token是否登录超时
-     *
-     * @param token
-     * @return
-     */
-    public static boolean loginExpire(String token) {
-        if (Login_Interval == 0) {
-            // 默认超时时间是8h
-            Long minute = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Long.class,
-                    8 * 60L);
-            // 分钟换算成毫秒
-            Login_Interval = minute * 1000 * 60;
-        }
-        Long lastOperateTime = tokenLastOperateTime(token);
-        boolean isExpire = true;
-        if (lastOperateTime != null) {
-            Long now = System.currentTimeMillis();
-            isExpire = now - lastOperateTime > Login_Interval;
-        }
-        return isExpire;
-    }
-
-    public static Date getExp(String token) {
-        try {
-            DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim("exp").asDate();
-        } catch (JWTDecodeException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 生成签名,5min后过期
-     *
      * @param tokenInfo 用户信息
      * @param secret    用户的密码
      * @return 加密的token
      */
     public static String sign(TokenInfo tokenInfo, String secret) {
         try {
-            Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
+            if (ObjectUtils.isEmpty(expireTime)) {
+                expireTime = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Long.class, 480L);
+            }
+            long expireTimeMillis = expireTime * 60000L;
+            Date date = new Date(System.currentTimeMillis() + expireTimeMillis);
             Algorithm algorithm = Algorithm.HMAC256(secret);
             Builder builder = JWT.create()
                     .withClaim("username", tokenInfo.getUsername())
                     .withClaim("userId", tokenInfo.getUserId());
             String sign = builder.withExpiresAt(date).sign(algorithm);
             return sign;
-
         } catch (Exception e) {
             return null;
         }
@@ -143,7 +102,6 @@ public class JWTUtils {
         } else {
             verifier = JWT.require(algorithm).withClaim("resourceId", resourceId).withClaim("userId", userId).build();
         }
-
         try {
             verifier.verify(token);
             return true;
@@ -152,16 +110,5 @@ public class JWTUtils {
         }
     }
 
-    /**
-     * 获取当前token上次操作时间
-     *
-     * @param token
-     * @return
-     */
-    public static Long tokenLastOperateTime(String token) {
-        DecodedJWT jwt = JWT.decode(token);
-        Date expiresAt = jwt.getExpiresAt();
-        return expiresAt.getTime();
-    }
 
 }
diff --git a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
index 0bcec3b8c8..32b68267ab 100644
--- a/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/TokenCacheUtils.java
@@ -50,8 +50,9 @@ public class TokenCacheUtils {
         }
 
         Long time = expTime * 60;
-        CacheUtils.put(KEY, token, userId, time.intValue(), null);
-
+        Double v = time * 0.6;
+        CacheUtils.put(KEY, token, userId, time.intValue(), v.intValue());
+        CacheUtils.flush(KEY);
     }
 
     public static void remove(String token) {
diff --git a/backend/src/main/java/io/dataease/listener/ApplicationCloseEventListener.java b/backend/src/main/java/io/dataease/listener/ApplicationCloseEventListener.java
new file mode 100644
index 0000000000..4fde79311f
--- /dev/null
+++ b/backend/src/main/java/io/dataease/listener/ApplicationCloseEventListener.java
@@ -0,0 +1,24 @@
+package io.dataease.listener;
+
+import io.dataease.commons.utils.LogUtil;
+import net.sf.ehcache.CacheManager;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ApplicationCloseEventListener implements ApplicationListener<ContextClosedEvent> {
+
+    @Autowired(required = false)
+    CacheManager cacheManager;
+
+    @Override
+    public void onApplicationEvent(ContextClosedEvent event) {
+
+        if (ObjectUtils.isNotEmpty(cacheManager))
+            cacheManager.shutdown();
+        LogUtil.info("DataEase is stopping");
+    }
+}
diff --git a/backend/src/main/java/io/dataease/listener/util/CacheUtils.java b/backend/src/main/java/io/dataease/listener/util/CacheUtils.java
index 22ebed424a..9a4fd3aa88 100644
--- a/backend/src/main/java/io/dataease/listener/util/CacheUtils.java
+++ b/backend/src/main/java/io/dataease/listener/util/CacheUtils.java
@@ -66,6 +66,12 @@ public class CacheUtils {
         return cache(cacheName).remove(key);
     }
 
+    public static void flush(String cacheName) {
+        CacheManager manager = getCacheManager();
+        if (manager instanceof RedisCacheManager) return;
+        cache(cacheName).flush();
+    }
+
     public static void removeAll(String cacheName) {
         if (getCacheManager() instanceof RedisCacheManager) {
             org.springframework.cache.Cache cache = getCacheManager().getCache(cacheName);
diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml
index 5976911a62..144cdb7ad6 100644
--- a/backend/src/main/resources/ehcache/ehcache.xml
+++ b/backend/src/main/resources/ehcache/ehcache.xml
@@ -272,12 +272,16 @@
 
     <cache
             name="sys_token_store"
-            eternal="true"
-            maxElementsInMemory="1"
-            maxElementsOnDisk="0"
+            eternal="false"
+            maxElementsInMemory="5000"
+            maxElementsOnDisk="50000"
             overflowToDisk="true"
-            diskPersistent="true"
-    />
+            timeToIdleSeconds="28800"
+            timeToLiveSeconds="28800"
+            memoryStoreEvictionPolicy="LRU"
+            diskPersistent="true">
+            <BootstrapCacheLoaderFactory class="net.sf.ehcache.store.DiskStoreBootstrapCacheLoaderFactory" properties="bootstrapAsynchronously=true" />
+    </cache>
 
 
 

From 2d18c0aa45511e6b66401d962e9ccfc3c2026e80 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 22 Feb 2023 11:58:09 +0800
Subject: [PATCH 43/48] =?UTF-8?q?fix:=20info=20=E5=9B=BE=E6=A0=87=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/icons/svg/icon_info_filled.svg          |  5 +++++
 frontend/src/icons/svg/icon_info_outlined.svg        | 12 ++++++++++++
 .../dragItem/components/FieldErrorTips.vue           |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue          |  6 +-----
 frontend/src/views/dataset/add/AddExcel.vue          |  2 +-
 frontend/src/views/dataset/add/AddSQL.vue            |  2 +-
 frontend/src/views/dataset/data/ViewTable.vue        |  5 +----
 frontend/src/views/panel/list/PanelViewShow.vue      |  6 +-----
 .../src/views/system/datasource/DsConfiguration.vue  |  2 +-
 frontend/src/views/system/sysParam/BasicSetting.vue  |  2 +-
 frontend/src/views/system/sysParam/EmailSetting.vue  |  6 +++---
 frontend/src/views/system/user/index.vue             |  2 +-
 12 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 frontend/src/icons/svg/icon_info_filled.svg
 create mode 100644 frontend/src/icons/svg/icon_info_outlined.svg

diff --git a/frontend/src/icons/svg/icon_info_filled.svg b/frontend/src/icons/svg/icon_info_filled.svg
new file mode 100644
index 0000000000..34439a4850
--- /dev/null
+++ b/frontend/src/icons/svg/icon_info_filled.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23Z"/>
+<path d="M12 5.5C12.6903 5.5 13.25 6.05965 13.25 6.75C13.25 7.44035 12.6903 8 12 8C11.3097 8 10.75 7.44035 10.75 6.75C10.75 6.05965 11.3097 5.5 12 5.5Z" fill="white"/>
+<path d="M12.25 9H10.75C10.4739 9 10.25 9.22386 10.25 9.5V10.5C10.25 10.7761 10.4739 11 10.75 11H11.25V16H10C9.72386 16 9.5 16.2239 9.5 16.5V17.5C9.5 17.7761 9.72386 18 10 18H14.5C14.7761 18 15 17.7761 15 17.5V16.5C15 16.2239 14.7761 16 14.5 16H13.25V10C13.25 9.44772 12.8023 9 12.25 9Z" fill="white"/>
+</svg>
diff --git a/frontend/src/icons/svg/icon_info_outlined.svg b/frontend/src/icons/svg/icon_info_outlined.svg
new file mode 100644
index 0000000000..eebdd2f505
--- /dev/null
+++ b/frontend/src/icons/svg/icon_info_outlined.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3234_102287)">
+<path d="M12 5.5C12.6903 5.5 13.25 6.05965 13.25 6.75C13.25 7.44035 12.6903 8 12 8C11.3097 8 10.75 7.44035 10.75 6.75C10.75 6.05965 11.3097 5.5 12 5.5Z"/>
+<path d="M12.25 9H10.75C10.4739 9 10.25 9.22386 10.25 9.5V10.5C10.25 10.7761 10.4739 11 10.75 11H11.25V16H10C9.72386 16 9.5 16.2239 9.5 16.5V17.5C9.5 17.7761 9.72386 18 10 18H14.5C14.7761 18 15 17.7761 15 17.5V16.5C15 16.2239 14.7761 16 14.5 16H13.25V10C13.25 9.44772 12.8023 9 12.25 9Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 22.9998C5.925 22.9998 1 18.0748 1 11.9998C1 5.92476 5.925 0.999756 12 0.999756C18.075 0.999756 23 5.92476 23 11.9998C23 18.0748 18.075 22.9998 12 22.9998ZM12 20.9998C16.9705 20.9998 21 16.9703 21 11.9998C21 7.02926 16.9705 2.99976 12 2.99976C7.0295 2.99976 3 7.02926 3 11.9998C3 16.9703 7.0295 20.9998 12 20.9998Z"/>
+</g>
+<defs>
+<clipPath id="clip0_3234_102287">
+<rect width="24" height="24" rx="4"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/frontend/src/views/chart/components/dragItem/components/FieldErrorTips.vue b/frontend/src/views/chart/components/dragItem/components/FieldErrorTips.vue
index 8f184ef6bc..30e56d3d1c 100644
--- a/frontend/src/views/chart/components/dragItem/components/FieldErrorTips.vue
+++ b/frontend/src/views/chart/components/dragItem/components/FieldErrorTips.vue
@@ -6,7 +6,7 @@
       :content="$t('chart.field_error_tips')"
       placement="bottom"
     >
-      <span><i class="el-icon-warning" /></span>
+      <span><svg-icon icon-class="icon_info_filled" /></span>
     </el-tooltip>
   </div>
 </template>
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 48c63a2925..82756d5a20 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -28,11 +28,7 @@
           :data="view"
           :tab-status="tabStatus"
         />
-        <i
-          slot="reference"
-          class="el-icon-warning icon-class"
-          style="position:absolute; margin-left: 30px; top:14px;cursor: pointer;"
-        />
+        <svg-icon slot="reference" class="icon-class" style="position:absolute; margin-left: 30px; top:14px;cursor: pointer;" icon-class="icon_info_filled" />
       </el-popover>
       <span
         class="title-text view-title-name"
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index 83c3f58d83..1a2a50abbe 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -26,7 +26,7 @@
         {{ $t('dataset.excel_info_2') }}<br>
         {{ $t('dataset.excel_info_3') }}
       </div>
-      <i class="el-icon-warning-outline"/> </el-tooltip></span>
+      <svg-icon icon-class="icon_info_outlined" /></el-tooltip></span>
       <i
         class="el-icon-d-arrow-left"
         @click="showLeft = false"
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index fb193a2f0e..76ae340e49 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -454,7 +454,7 @@
                     :content="$t('commons.parameter_effect')"
                     placement="top"
                   >
-                    <i class="el-icon-warning"/>
+                    <svg-icon icon-class="icon_info_filled" />
                   </el-tooltip>
                 </template>
                 <template slot-scope="scope">
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index feaf71e105..6d75c04484 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -48,10 +48,7 @@
             :data="table"
             :tab-status="tabStatus"
           />
-          <i
-            slot="reference"
-            class="el-icon-warning-outline detail"
-          />
+          <svg-icon slot="reference" class="detail" icon-class="icon_info_outlined" />
         </el-popover>
       </el-col>
       <el-col
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index ce238dea27..85eee9d883 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -77,11 +77,7 @@
               trigger="click"
             >
               <panel-detail-info />
-              <i
-                slot="reference"
-                class="el-icon-warning-outline icon-class"
-                style="margin-left: 4px;cursor: pointer;font-size: 14px;"
-              />
+              <svg-icon slot="reference" style="margin-left: 4px;cursor: pointer;font-size: 14px;" class="icon-class" icon-class="icon_info_outlined" />
             </el-popover>
           </el-col>
           <el-col :span="12">
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index 32cefd2a3b..b76c5fbec4 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -71,7 +71,7 @@
                     popper-class="api-table-delete"
                     trigger="click"
                   >
-                    <i :disabled="disabled" class="el-icon-warning" />
+                    <svg-icon :disabled="disabled" icon-class="icon_info_filled" />
                     <div class="tips">
                       {{ $t('datasource.delete_this_item') }}
                     </div>
diff --git a/frontend/src/views/system/sysParam/BasicSetting.vue b/frontend/src/views/system/sysParam/BasicSetting.vue
index 8f1cfa19e5..e544bf03e2 100644
--- a/frontend/src/views/system/sysParam/BasicSetting.vue
+++ b/frontend/src/views/system/sysParam/BasicSetting.vue
@@ -47,7 +47,7 @@
             :content="$t('system_parameter_setting.front_time_out')"
             placement="top"
           >
-            <i class="el-icon-warning-outline tips" />
+            <svg-icon class="tips" icon-class="icon_info_outlined" />
           </el-tooltip>
         </template>
         <el-input
diff --git a/frontend/src/views/system/sysParam/EmailSetting.vue b/frontend/src/views/system/sysParam/EmailSetting.vue
index 4ff1473d75..698c4e15d0 100644
--- a/frontend/src/views/system/sysParam/EmailSetting.vue
+++ b/frontend/src/views/system/sysParam/EmailSetting.vue
@@ -90,7 +90,7 @@
             :content="$t('system_parameter_setting.test_mail_recipient')"
             placement="top"
           >
-            <i class="el-icon-warning-outline tips-not-absolute" />
+            <svg-icon icon-class="icon_info_outlined" class="tips-not-absolute" />
           </el-tooltip>
         </template>
         <dePwd
@@ -106,7 +106,7 @@
             :content="$t('system_parameter_setting.to_enable_ssl')"
             placement="top"
           >
-            <i class="el-icon-warning-outline tips-not-absolute" />
+            <svg-icon icon-class="icon_info_outlined" class="tips-not-absolute" />
           </el-tooltip>
         </el-checkbox>
 
@@ -118,7 +118,7 @@
             :content="$t('system_parameter_setting.to_enable_tsl')"
             placement="top"
           >
-            <i class="el-icon-warning-outline tips-not-absolute" />
+            <svg-icon icon-class="icon_info_outlined" class="tips-not-absolute" />
           </el-tooltip>
         </el-checkbox>
       </el-form-item>
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index a45d78fb37..c1f4fc52f2 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -261,7 +261,7 @@
               popper-class="reset-pwd"
               trigger="click"
             >
-              <i class="el-icon-warning" />
+              <svg-icon icon-class="icon_info_filled" />
               <div class="tips">{{ $t('user.recover_pwd') }}</div>
               <div class="editer-form-title">
                 <span

From df03e734b58fa2baabaf51ba30350eb0ce04af85 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 22 Feb 2023 23:12:26 +0800
Subject: [PATCH 44/48] =?UTF-8?q?fix(=E5=88=86=E7=BB=84=E6=9F=B1=E7=8A=B6?=
 =?UTF-8?q?=E5=9B=BE-=E4=B8=8B=E9=92=BB):=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E6=9F=B1=E7=8A=B6=E5=9B=BE=E5=AD=90=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=8B=E9=92=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复分组柱状图在在下钻初始维度为子维度时数据不准确的问题
https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001023529
---
 .../service/chart/ChartViewService.java       | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index fb4ea88283..76916b2905 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -844,22 +844,37 @@ public class ChartViewService {
         // 下钻
         List<ChartExtFilterRequest> drillFilters = new ArrayList<>();
         boolean isDrill = false;
-        List<ChartDrillRequest> drillRequest = chartExtRequest.getDrill();
-        if (CollectionUtils.isNotEmpty(drillRequest) && (drill.size() > drillRequest.size())) {
-            for (int i = 0; i < drillRequest.size(); i++) {
-                ChartDrillRequest request = drillRequest.get(i);
-                for (ChartDimensionDTO dto : request.getDimensionList()) {
-                    ChartViewFieldDTO chartViewFieldDTO = drill.get(i);
+        List<ChartDrillRequest> drillRequestList = chartExtRequest.getDrill();
+        if (CollectionUtils.isNotEmpty(drillRequestList) && (drill.size() > drillRequestList.size())) {
+//            如果是从子维度开始下钻，那么先把主维度的条件先加上去
+            if (CollectionUtils.isNotEmpty(xAxisExt) && StringUtils.equalsIgnoreCase(drill.get(0).getId(),xAxisExt.get(0).getId())) {
+                ChartDrillRequest head = drillRequestList.get(0);
+                for (int i = 0; i < xAxisBase.size(); i++) {
+                    ChartDimensionDTO dimensionDTO = head.getDimensionList().get(i);
+                    DatasetTableField datasetTableField = dataSetTableFieldsService.get(dimensionDTO.getId());
+                    ChartExtFilterRequest tmp = new ChartExtFilterRequest();
+                    tmp.setFieldId(tmp.getFieldId());
+                    tmp.setValue(Collections.singletonList(dimensionDTO.getValue()));
+                    tmp.setOperator("in");
+                    tmp.setDatasetTableField(datasetTableField);
+                    extFilterList.add(tmp);
+                    drillFilters.add(tmp);
+                }
+            }
+            for (int i = 0; i < drillRequestList.size(); i++) {
+                ChartDrillRequest request = drillRequestList.get(i);
+                ChartViewFieldDTO chartViewFieldDTO = drill.get(i);
+                for (ChartDimensionDTO requestDimension : request.getDimensionList()) {
                     // 将钻取值作为条件传递，将所有钻取字段作为xAxis并加上下一个钻取字段
-                    if (StringUtils.equalsIgnoreCase(dto.getId(), chartViewFieldDTO.getId())) {
+                    if (StringUtils.equalsIgnoreCase(requestDimension.getId(), chartViewFieldDTO.getId())) {
                         isDrill = true;
-                        DatasetTableField datasetTableField = dataSetTableFieldsService.get(dto.getId());
+                        DatasetTableField datasetTableField = dataSetTableFieldsService.get(requestDimension.getId());
                         ChartViewFieldDTO d = new ChartViewFieldDTO();
                         BeanUtils.copyBean(d, datasetTableField);
 
                         ChartExtFilterRequest drillFilter = new ChartExtFilterRequest();
-                        drillFilter.setFieldId(dto.getId());
-                        drillFilter.setValue(Collections.singletonList(dto.getValue()));
+                        drillFilter.setFieldId(requestDimension.getId());
+                        drillFilter.setValue(Collections.singletonList(requestDimension.getValue()));
                         drillFilter.setOperator("in");
                         drillFilter.setDatasetTableField(datasetTableField);
                         extFilterList.add(drillFilter);
@@ -869,7 +884,8 @@ public class ChartViewService {
                         if (!checkDrillExist(xAxis, extStack, d, view)) {
                             xAxis.add(d);
                         }
-                        if (i == drillRequest.size() - 1) {
+//
+                        if (i == drillRequestList.size() - 1) {
                             ChartViewFieldDTO nextDrillField = drill.get(i + 1);
                             if (!checkDrillExist(xAxis, extStack, nextDrillField, view)) {
                                 // get drill list first element's sort,then assign to nextDrillField

From 345f0c03bf85881c087135ef184c00e2bcdbbc3d Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 23 Feb 2023 10:31:25 +0800
Subject: [PATCH 45/48] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=87=8D=E5=88=B6=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index c1f4fc52f2..9b63cfa36e 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -261,7 +261,7 @@
               popper-class="reset-pwd"
               trigger="click"
             >
-              <svg-icon icon-class="icon_info_filled" />
+              <svg-icon class="reset-pwd-icon" icon-class="icon_info_filled" />
               <div class="tips">{{ $t('user.recover_pwd') }}</div>
               <div class="editer-form-title">
                 <span
@@ -681,6 +681,10 @@ export default {
 }
 </style>
 <style lang="scss">
+.reset-pwd-icon {
+  margin-top: 4px;
+  color: rgb(255, 153, 0);
+}
 .reset-pwd {
   padding: 20px 24px !important;
   display: flex;

From aca40cfcde59a237532c678d7c15a859ae66ed55 Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Thu, 23 Feb 2023 13:15:04 +0800
Subject: [PATCH 46/48] Update README.md

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

diff --git a/README.md b/README.md
index 9395c3b127..7340f116f4 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数
 2. 以 root 用户执行如下命令一键安装 DataEase。
 
 ```sh
-curl -sSL https://github.com/dataease/dataease/releases/latest/download/quick_start.sh | sh
+curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | sh
 ```
 
 **学习资料**

From 391e4782e0692d4c5a800d74cbd920ed00bd8f9e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 23 Feb 2023 17:43:15 +0800
Subject: [PATCH 47/48] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E8=A1=A8=E6=A0=BC=E5=85=A8=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/chart/ChartViewService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 76916b2905..f504c372f4 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -671,7 +671,7 @@ public class ChartViewService {
                 if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
                     chartExtRequest.setGoPage(1L);
                     chartExtRequest.setPageSize(view.getResultCount().longValue());
-                } else {
+                } else if (!chartExtRequest.getExcelExportFlag()) {
                     chartExtRequest.setGoPage(null);
                     chartExtRequest.setPageSize(null);
                 }
@@ -847,7 +847,7 @@ public class ChartViewService {
         List<ChartDrillRequest> drillRequestList = chartExtRequest.getDrill();
         if (CollectionUtils.isNotEmpty(drillRequestList) && (drill.size() > drillRequestList.size())) {
 //            如果是从子维度开始下钻，那么先把主维度的条件先加上去
-            if (CollectionUtils.isNotEmpty(xAxisExt) && StringUtils.equalsIgnoreCase(drill.get(0).getId(),xAxisExt.get(0).getId())) {
+            if (CollectionUtils.isNotEmpty(xAxisExt) && StringUtils.equalsIgnoreCase(drill.get(0).getId(), xAxisExt.get(0).getId())) {
                 ChartDrillRequest head = drillRequestList.get(0);
                 for (int i = 0; i < xAxisBase.size(); i++) {
                     ChartDimensionDTO dimensionDTO = head.getDimensionList().get(i);

From a711b60ebdb9d51dbfc077a13078b170e3943f59 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 23 Feb 2023 17:59:49 +0800
Subject: [PATCH 48/48] =?UTF-8?q?fix:=20=E6=9D=83=E9=99=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E9=80=89=E6=A1=86=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/index.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index c76b43b777..14d5fb9187 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1760,4 +1760,10 @@ div:focus {
 
 .el-table__fixed-right::before {
   display: none;
+}
+
+.auth-tab {
+  .custom-tree-node {
+    padding-right: 0 !important;
+  }
 }
\ No newline at end of file