Merge pull request #8966 from dataease/dev

merge bug fix

.github/workflows/auto-pr.yml

@@ -1,13 +0,0 @@
-on: [push, pull_request, release]
-
-name: DataEase pull request handler
-
-jobs:
-  generic_handler:
-    name: Generic handler for DataEase Repos
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add labels
-        uses: jumpserver/action-generic-handler@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }}

.gitignore

@@ -59,3 +59,9 @@ pnpm-debug.log*
 .flattened-pom.xml
 
 package-lock.json
+/core/core-frontend/
+/core/core-backend/
+/sdk/common/
+/sdk/distributed/
+/sdk/api/
+/de-xpack/

.typos.toml

@@ -7,6 +7,9 @@ ba = "ba"
 referer = "referer"
 keynode = "keynode"
 SCHEM = "SCHEM"
+wheres = "wheres"
+Wheres = "Wheres"
+Parenthesed = "Parenthesed"
 
 [files]
 extend-exclude = [
@@ -24,6 +27,7 @@ extend-exclude = [
     "core/frontend/src/views/chart/components/table/TableNormal.vue",
     "core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml",
     "core/backend/src/main/java/io/dataease/ext/AuthMapper.xml",
+    "core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.xml",
     "installer/dataease/templates/be.conf"
 ]
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@ PR are always welcome, even if they only contain small fixes like typos or a few
 
 Please submit a PR broken down into small changes' bit by bit. A PR consisting of a lot of features and code changes may be hard to review. It is recommended to submit PRs in an incremental fashion.
 
-This [development guideline](https://dataease.io/docs/dev_manual/dev_manual/) contains information about repository structure, how to set up development environment, how to run it, and more.
+This [development guideline](https://dataease.io/docs/v1/dev_manual/dev_manual/) contains information about repository structure, how to set up development environment, how to run it, and more.
 
 Note: If you split your pull request to small changes, please make sure any of the changes goes to master will not break anything. Otherwise, it can not be merged until this feature complete.
 

README.md

@@ -7,6 +7,7 @@
   <a href="https://github.com/dataease/dataease"><img src="https://img.shields.io/github/stars/dataease/dataease?color=%231890FF&style=flat-square" alt="Stars"></a>
   <a href="https://app.fossa.com/projects/git%2Bgithub.com%2F1dataease%2Fdataease?ref=badge_shield"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=shield" alt="FOSSA Status"></a>  
 </p>
+
 <hr/>
 
 ## 什么是 DataEase？
@@ -80,14 +81,10 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash
 
 **学习资料**
 
--   [在线文档](https://dataease.io/docs/)
+-   [在线文档](https://dataease.io/docs/v1)
 -   [社区论坛](https://bbs.fit2cloud.com/c/de/6)
 
-**加入微信交流群**
-
-<img src="https://dataease.oss-cn-hangzhou.aliyuncs.com/img/wechat-helper.png" width="156" height="156"/>
-
-## DataEase 的技术栈
+## DataEase v1 的技术栈
 
 -   前端：[Vue.js](https://vuejs.org/)、[Element](https://element.eleme.cn/)
 -   图库：[Apache ECharts](https://github.com/apache/echarts)、[AntV](https://antv.vision/zh)
@@ -106,7 +103,7 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash
 
 ## License
 
-Copyright (c) 2014-2023 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved.
+Copyright (c) 2014-2024 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved.
 
 Licensed under The GNU General Public License version 3 (GPLv3)  (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 

core/backend/pom.xml

@@ -98,7 +98,18 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
-            <version>5.3.1</version>
+            <version>6.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jsqlparser</artifactId>
+                    <groupId>com.github.jsqlparser</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+            <version>4.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
@@ -169,7 +180,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.21</version>
+            <version>[1.26.0,)</version>
         </dependency>
         <!--xpath不加这个依赖会报错-->
         <dependency>

core/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java

@@ -37,6 +37,9 @@ public class DeCleanerAnnotationHandler {
 
 
             switch (type.name()) {
+                case "DATA_FILL":
+                    catchProcess().cleanDataFiling(paramValue);
+                    break;
                 case "DATASOURCE":
                     catchProcess().cleanDataSource(paramValue);
                     break;

core/backend/src/main/java/io/dataease/auth/aop/DePermissionProxyHandler.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 
+import io.dataease.plugins.common.exception.DataEaseException;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -18,7 +19,6 @@ import io.dataease.auth.annotation.DePermissionProxy;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.dto.PermissionProxy;
-import io.dataease.exception.DataEaseException;
 
 @Aspect
 @Component

core/backend/src/main/java/io/dataease/auth/aop/DeRateLimiterHandler.java

@@ -1,10 +1,10 @@
 package io.dataease.auth.aop;
 
-import cn.hutool.core.util.StrUtil;
 import io.dataease.auth.annotation.DeRateLimiter;
 import io.dataease.auth.service.DeLimitService;
 import io.dataease.commons.utils.IPUtils;
 import io.dataease.commons.utils.ServletUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -34,8 +34,8 @@ public class DeRateLimiterHandler {
         DeRateLimiter rateLimiter = AnnotationUtils.findAnnotation(method, DeRateLimiter.class);
         if (rateLimiter != null) {
             String key = rateLimiter.key();
-            if (StrUtil.isBlank(key)) {
-                key = method.getDeclaringClass().getName() + StrUtil.DOT + method.getName();
+            if (StringUtils.isBlank(key)) {
+                key = method.getDeclaringClass().getName() + "." + method.getName();
             }
             key = key + SEPARATOR + IPUtils.get();
 

core/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java

@@ -1,10 +1,10 @@
 package io.dataease.auth.aop;
 
-import cn.hutool.core.util.ArrayUtil;
 import io.dataease.auth.annotation.SqlInjectValidator;
-import io.dataease.commons.exception.DEException;
+import io.dataease.plugins.common.exception.DataEaseException;
 import io.dataease.plugins.common.request.KeywordRequest;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -47,7 +47,7 @@ public class SqlInjectAop {
             String[] value = annotation.value();
             boolean illegal = isIllegal(value, request.getOrders());
             if (illegal) {
-                DEException.throwException("Illegal sort exp");
+                DataEaseException.throwException("Illegal sort exp");
             }
             return point.proceed(args);
         } catch (Throwable e) {
@@ -56,7 +56,7 @@ public class SqlInjectAop {
     }
 
     private boolean isIllegal(String[] value, List<String> orderList) {
-        if (CollectionUtils.isEmpty(orderList) || ArrayUtil.isEmpty(value)) return false;
+        if (CollectionUtils.isEmpty(orderList) || ArrayUtils.isEmpty(value)) return false;
         Set<String> wordList = Arrays.stream(value).collect(Collectors.toSet());
         wordList.add("asc");
         wordList.add("desc");

core/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java

@@ -1,7 +1,5 @@
 package io.dataease.auth.filter;
 
-import cn.hutool.core.util.ArrayUtil;
-import com.auth0.jwt.algorithms.Algorithm;
 import io.dataease.auth.entity.SysUserEntity;
 import io.dataease.auth.entity.TokenInfo;
 import io.dataease.auth.service.AuthUserService;
@@ -10,8 +8,7 @@ import io.dataease.commons.license.DefaultLicenseService;
 import io.dataease.commons.license.F2CLicenseResponse;
 import io.dataease.commons.utils.CommonBeanFactory;
 import io.dataease.commons.utils.LogUtil;
-import io.dataease.exception.DataEaseException;
-import io.dataease.i18n.Translator;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.web.filter.AccessControlFilter;
@@ -69,7 +66,7 @@ public class F2CDocFilter extends AccessControlFilter {
         String authorization = request.getHeader("Authorization");
         if (StringUtils.isBlank(authorization)) {
             Cookie[] cookies = request.getCookies();
-            if (ArrayUtil.isNotEmpty(cookies)) {
+            if (ArrayUtils.isNotEmpty(cookies)) {
                 Cookie cookie = Arrays.stream(cookies).filter(item -> StringUtils.equals(item.getName(), "Authorization")).findFirst().orElse(null);
                 if (ObjectUtils.isNotEmpty(cookie) && StringUtils.isNotBlank(cookie.getValue())) {
                     authorization = cookie.getValue();

core/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java

@@ -1,12 +1,12 @@
 package io.dataease.auth.filter;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import io.dataease.auth.util.JWTUtils;
 import io.dataease.auth.util.LinkUtil;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.plugins.common.base.domain.PanelLink;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.web.filter.authc.AnonymousFilter;
 
 import javax.servlet.ServletRequest;
@@ -26,7 +26,7 @@ public class F2CLinkFilter extends AnonymousFilter {
             String resourceId = jwt.getClaim("resourceId").asString();
             Long userId = jwt.getClaim("userId").asLong();
             PanelLink panelLink = LinkUtil.queryLink(resourceId, userId);
-            if (ObjectUtil.isEmpty(panelLink)) return false;
+            if (ObjectUtils.isEmpty(panelLink)) return false;
             String pwd;
             if (!panelLink.getEnablePwd()) {
                 panelLink.setPwd("dataease");

core/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java

@@ -92,8 +92,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
 
         if (isLoginAttempt(request, response) || ApiKeyHandler.isApiKeyCall(hRequest)) {
             try {
-                boolean loginSuccess = executeLogin(request, response);
-                return loginSuccess;
+                return executeLogin(request, response);
             } catch (Exception e) {
                 LogUtil.error(e);
                 if (e instanceof AuthenticationException && StringUtils.equals(e.getMessage(), expireMessage)) {

core/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java

@@ -2,7 +2,7 @@ package io.dataease.auth.handler;
 
 import io.dataease.auth.entity.ASKToken;
 import io.dataease.commons.utils.CodingUtil;
-import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.common.util.SpringContextUtil;
 import io.dataease.plugins.xpack.ukey.dto.request.XpackUkeyDto;
 import io.dataease.plugins.xpack.ukey.service.UkeyXpackService;
 import org.apache.commons.lang3.StringUtils;

core/backend/src/main/java/io/dataease/auth/server/AuthServer.java

@@ -13,13 +13,12 @@ import io.dataease.auth.service.AuthUserService;
 import io.dataease.auth.util.JWTUtils;
 import io.dataease.auth.util.RsaUtil;
 import io.dataease.commons.constants.SysLogConstants;
-import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.*;
 import io.dataease.controller.sys.request.LdapAddRequest;
-import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.entity.XpackLdapUserEntity;
-import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.common.exception.DataEaseException;
+import io.dataease.plugins.common.util.SpringContextUtil;
 import io.dataease.plugins.util.PluginUtils;
 import io.dataease.plugins.xpack.cas.service.CasXpackService;
 import io.dataease.plugins.xpack.ldap.dto.request.LdapValidateRequest;
@@ -27,7 +26,6 @@ import io.dataease.plugins.xpack.ldap.dto.response.ValidateResult;
 import io.dataease.plugins.xpack.ldap.service.LdapXpackService;
 import io.dataease.plugins.xpack.oidc.service.OidcXpackService;
 import io.dataease.service.sys.SysUserService;
-
 import io.dataease.service.system.SystemParameterService;
 import io.dataease.websocket.entity.WsMessage;
 import io.dataease.websocket.service.WsService;
@@ -39,15 +37,14 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 @RestController
 public class AuthServer implements AuthApi {
 
@@ -196,13 +193,20 @@ public class AuthServer implements AuthApi {
             }
             if (user.getIsAdmin() && user.getPassword().equals("40b8893ea9ebc2d631c4bb42bb1e8996")) {
                 result.put("passwordModified", false);
+                result.put("defaultPwd", "dataease");
+            }
+
+            if (!user.getIsAdmin() && user.getPassword().equals(CodingUtil.md5(DEFAULT_PWD))) {
+                result.put("passwordModified", false);
+                result.put("defaultPwd", DEFAULT_PWD);
             }
         }
-
+        Long expireTime = System.currentTimeMillis() + JWTUtils.getExpireTime();
         TokenInfo tokenInfo = TokenInfo.builder().userId(user.getUserId()).username(username).build();
         String token = JWTUtils.sign(tokenInfo, realPwd);
         // 记录token操作时间
         result.put("token", token);
+        result.put("expireTime", expireTime);
         ServletUtils.setToken(token);
         DeLogUtils.save(SysLogConstants.OPERATE_TYPE.LOGIN, SysLogConstants.SOURCE_TYPE.USER, user.getUserId(), null, null, null);
         authUserService.unlockAccount(username, ObjectUtils.isEmpty(loginType) ? 0 : loginType);
@@ -323,7 +327,7 @@ public class AuthServer implements AuthApi {
                     oidcXpackService.logout(idToken);
                 } catch (Exception e) {
                     LogUtil.error(e.getMessage(), e);
-                    DEException.throwException("oidc_logout_error");
+                    DataEaseException.throwException("oidc_logout_error");
                 }
             }
         }
@@ -344,7 +348,7 @@ public class AuthServer implements AuthApi {
                 result = casXpackService.logout();
             } catch (Exception e) {
                 LogUtil.error(e.getMessage(), e);
-                DEException.throwException("cas_logout_error");
+                DataEaseException.throwException("cas_logout_error");
             }
         }
         try {

core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java

@@ -10,22 +10,38 @@ public interface ExtAuthService {
 
     Set<Long> userIdsByRD(AuthURD request);
 
+    Set<String> userNamesByRD(AuthURD request);
+
     AuthURD resourceTarget(String resourceId);
 
     List<AuthItem> dataSourceIdByUser(Long userId);
+
     List<AuthItem> dataSetIdByUser(Long userId);
+
     List<AuthItem> panelIdByUser(Long userId);
 
+    List<AuthItem> dataFillingIdByUser(Long userId);
+
     List<AuthItem> dataSourceIdByRole(Long roleId);
+
     List<AuthItem> dataSetIdByRole(Long roleId);
+
     List<AuthItem> panelIdByRole(Long roleId);
 
+    List<AuthItem> dataFillingIdByRole(Long roleId);
+
     List<AuthItem> dataSourceIdByDept(Long deptId);
+
     List<AuthItem> dataSetIdByDept(Long deptId);
+
     List<AuthItem> panelIdByDept(Long deptId);
 
+    List<AuthItem> dataFillingIdByDept(Long deptId);
+
     void clearUserResource(Long userId);
+
     void clearDeptResource(Long deptId);
+
     void clearRoleResource(Long roleId);
 
     List<String> parentResource(String resourceId, String type);

core/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java

@@ -8,7 +8,6 @@ import io.dataease.commons.constants.AuthConstants;
 import io.dataease.commons.constants.ParamConstants;
 import io.dataease.commons.utils.CodingUtil;
 import io.dataease.commons.utils.LogUtil;
-import io.dataease.exception.DataEaseException;
 import io.dataease.ext.AuthMapper;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.base.domain.SysLoginLimit;
@@ -16,8 +15,9 @@ import io.dataease.plugins.common.base.domain.SysLoginLimitExample;
 import io.dataease.plugins.common.base.domain.SysUser;
 import io.dataease.plugins.common.base.mapper.SysLoginLimitMapper;
 import io.dataease.plugins.common.base.mapper.SysUserMapper;
+import io.dataease.plugins.common.exception.DataEaseException;
 import io.dataease.plugins.common.service.PluginCommonService;
-import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.common.util.SpringContextUtil;
 import io.dataease.plugins.util.PluginUtils;
 import io.dataease.plugins.xpack.cas.service.CasXpackService;
 import io.dataease.plugins.xpack.dingtalk.service.DingtalkXpackService;

core/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java

@@ -90,7 +90,7 @@ public class DynamicMenuServiceImpl implements DynamicMenuService {
         dynamicMenuDto.setPermission(sysMenu.getPermission());
         dynamicMenuDto.setMenuSort(sysMenu.getMenuSort());
         dynamicMenuDto.setHidden(sysMenu.getHidden());
-        dynamicMenuDto.setIsPlugin(true);
+        dynamicMenuDto.setIsPlugin(!sysMenu.isUseBasicResource());
         dynamicMenuDto.setNoLayout(!!sysMenu.isNoLayout());
         return dynamicMenuDto;
     }

core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java

@@ -2,12 +2,12 @@ package io.dataease.auth.service.impl;
 
 import io.dataease.auth.entity.AuthItem;
 import io.dataease.auth.service.ExtAuthService;
-import io.dataease.commons.constants.SysAuthConstants;
-import io.dataease.plugins.common.base.domain.SysAuth;
-import io.dataease.ext.ExtAuthMapper;
 import io.dataease.commons.constants.AuthConstants;
+import io.dataease.commons.constants.SysAuthConstants;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.LogUtil;
+import io.dataease.ext.ExtAuthMapper;
+import io.dataease.plugins.common.base.domain.SysAuth;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.cache.annotation.CacheEvict;
@@ -43,6 +43,21 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         return result;
     }
 
+    @Override
+    public Set<String> userNamesByRD(AuthURD request) {
+        Set<String> result = new HashSet<>();
+        List<Long> roleIds = request.getRoleIds();
+        List<Long> deptIds = request.getDeptIds();
+        if (!CollectionUtils.isEmpty(roleIds)) {
+            result.addAll(extAuthMapper.queryUserNameWithRoleIds(roleIds));
+        }
+        if (!CollectionUtils.isEmpty(deptIds)) {
+            result.addAll(extAuthMapper.queryUserNameWithDeptIds(deptIds));
+        }
+
+        return result;
+    }
+
     @Override
     public AuthURD resourceTarget(String resourceId) {
         AuthURD authURD = new AuthURD();
@@ -94,6 +109,16 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         );
     }
 
+    @Cacheable(value = AuthConstants.USER_DATA_FILL_NAME, key = "'user' + #userId")
+    @Override
+    public List<AuthItem> dataFillingIdByUser(Long userId) {
+        return extAuthMapper.queryAuthItems(
+                SysAuthConstants.AUTH_TARGET_TYPE_USER,
+                userId.toString(),
+                SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING
+        );
+    }
+
 
     @Cacheable(value = AuthConstants.ROLE_LINK_NAME, key = "'role' + #roleId")
     @Override
@@ -125,6 +150,16 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         );
     }
 
+    @Cacheable(value = AuthConstants.ROLE_DATA_FILL_NAME, key = "'role' + #roleId")
+    @Override
+    public List<AuthItem> dataFillingIdByRole(Long roleId) {
+        return extAuthMapper.queryAuthItems(
+                SysAuthConstants.AUTH_TARGET_TYPE_ROLE,
+                roleId.toString(),
+                SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING
+        );
+    }
+
     @Cacheable(value = AuthConstants.DEPT_LINK_NAME, key = "'dept' + #deptId")
     @Override
     public List<AuthItem> dataSourceIdByDept(Long deptId) {
@@ -158,10 +193,22 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         );
     }
 
+    @Cacheable(value = AuthConstants.DEPT_DATA_FILL_NAME, key = "'dept' + #deptId")
+    @Override
+    public List<AuthItem> dataFillingIdByDept(Long deptId) {
+        if (ObjectUtils.isEmpty(deptId)) return emptyResult;
+        return extAuthMapper.queryAuthItems(
+                SysAuthConstants.AUTH_TARGET_TYPE_DEPT,
+                deptId.toString(),
+                SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING
+        );
+    }
+
     @Caching(evict = {
             @CacheEvict(value = AuthConstants.USER_LINK_NAME, key = "'user' + #userId"),
             @CacheEvict(value = AuthConstants.USER_DATASET_NAME, key = "'user' + #userId"),
-            @CacheEvict(value = AuthConstants.USER_PANEL_NAME, key = "'user' + #userId")
+            @CacheEvict(value = AuthConstants.USER_PANEL_NAME, key = "'user' + #userId"),
+            @CacheEvict(value = AuthConstants.USER_DATA_FILL_NAME, key = "'user' + #userId")
     })
     public void clearUserResource(Long userId) {
         LogUtil.info("all permission resource of user {} is cleaning...", userId);
@@ -170,7 +217,8 @@ public class ExtAuthServiceImpl implements ExtAuthService {
     @Caching(evict = {
             @CacheEvict(value = AuthConstants.DEPT_LINK_NAME, key = "'dept' + #deptId"),
             @CacheEvict(value = AuthConstants.DEPT_DATASET_NAME, key = "'dept' + #deptId"),
-            @CacheEvict(value = AuthConstants.DEPT_PANEL_NAME, key = "'dept' + #deptId")
+            @CacheEvict(value = AuthConstants.DEPT_PANEL_NAME, key = "'dept' + #deptId"),
+            @CacheEvict(value = AuthConstants.DEPT_DATA_FILL_NAME, key = "'dept' + #deptId")
     })
     public void clearDeptResource(Long deptId) {
         LogUtil.info("all permission resource of dept {} is cleaning...", deptId);
@@ -179,7 +227,8 @@ public class ExtAuthServiceImpl implements ExtAuthService {
     @Caching(evict = {
             @CacheEvict(value = AuthConstants.ROLE_LINK_NAME, key = "'role' + #roleId"),
             @CacheEvict(value = AuthConstants.ROLE_DATASET_NAME, key = "'role' + #roleId"),
-            @CacheEvict(value = AuthConstants.ROLE_PANEL_NAME, key = "'role' + #roleId")
+            @CacheEvict(value = AuthConstants.ROLE_PANEL_NAME, key = "'role' + #roleId"),
+            @CacheEvict(value = AuthConstants.ROLE_DATA_FILL_NAME, key = "'role' + #roleId")
     })
     public void clearRoleResource(Long roleId) {
         LogUtil.info("all permission resource of role {} is cleaning...", roleId);

core/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java

@@ -45,6 +45,7 @@ public class ShiroServiceImpl implements ShiroService {
         filterChainDefinitionMap.put("/link/**", ANON);
         filterChainDefinitionMap.put("/index.html", ANON);
         filterChainDefinitionMap.put("/link.html", ANON);
+        filterChainDefinitionMap.put("/mobile.html", ANON);
         filterChainDefinitionMap.put("/board/**", ANON);
         filterChainDefinitionMap.put("/websocket/**", ANON);
         filterChainDefinitionMap.put("/system/defaultLoginType", ANON);

core/backend/src/main/java/io/dataease/auth/util/JWTUtils.java

@@ -1,8 +1,8 @@
 package io.dataease.auth.util;
 
 import com.auth0.jwt.JWT;
-import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.JWTCreator.Builder;
+import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.Verification;
@@ -10,8 +10,11 @@ import com.google.gson.Gson;
 import io.dataease.auth.entity.TokenInfo;
 import io.dataease.auth.entity.TokenInfo.TokenInfoBuilder;
 import io.dataease.commons.model.OnlineUserModel;
-import io.dataease.commons.utils.*;
-import io.dataease.exception.DataEaseException;
+import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.commons.utils.IPUtils;
+import io.dataease.commons.utils.ServletUtils;
+import io.dataease.commons.utils.TokenCacheUtils;
+import io.dataease.plugins.common.exception.DataEaseException;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.env.Environment;
@@ -77,6 +80,13 @@ public class JWTUtils {
         return sign(tokenInfo, secret, true);
     }
 
+    public static Long getExpireTime() {
+        if (ObjectUtils.isEmpty(expireTime)) {
+            expireTime = Objects.requireNonNull(CommonBeanFactory.getBean(Environment.class)).getProperty("dataease.login_timeout", Long.class, 480L);
+        }
+        return expireTime * 60000L;
+    }
+
     private static boolean tokenValid(OnlineUserModel model) {
         String token = model.getToken();
         // 如果已经加入黑名单 则直接返回无效
@@ -84,10 +94,7 @@ public class JWTUtils {
         if (invalid) return false;
 
         Long loginTime = model.getLoginTime();
-        if (ObjectUtils.isEmpty(expireTime)) {
-            expireTime = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Long.class, 480L);
-        }
-        long expireTimeMillis = expireTime * 60000L;
+        long expireTimeMillis = getExpireTime();
         // 如果当前时间减去登录时间小于超时时间则说明token未过期 返回有效状态
         return System.currentTimeMillis() - loginTime < expireTimeMillis;
 
@@ -133,10 +140,7 @@ public class JWTUtils {
                 DataEaseException.throwException("MultiLoginError1");
             }
         }
-        if (ObjectUtils.isEmpty(expireTime)) {
-            expireTime = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Long.class, 480L);
-        }
-        long expireTimeMillis = expireTime * 60000L;
+        long expireTimeMillis = getExpireTime();
         Date date = new Date(System.currentTimeMillis() + expireTimeMillis);
         Algorithm algorithm = Algorithm.HMAC256(secret);
         Builder builder = JWT.create()

core/backend/src/main/java/io/dataease/commons/constants/AuthConstants.java

@@ -12,14 +12,17 @@ public class AuthConstants {
     public final static String USER_LINK_NAME = "user_link";
     public final static String USER_DATASET_NAME = "user_dataset";
     public final static String USER_PANEL_NAME = "user_panel";
+    public final static String USER_DATA_FILL_NAME = "user_data_fill";
 
     public final static String ROLE_LINK_NAME = "role_link";
     public final static String ROLE_DATASET_NAME = "role_dataset";
     public final static String ROLE_PANEL_NAME = "role_panel";
+    public final static String ROLE_DATA_FILL_NAME = "role_data_fill";
 
     public final static String DEPT_LINK_NAME = "dept_link";
     public final static String DEPT_DATASET_NAME = "dept_dataset";
     public final static String DEPT_PANEL_NAME = "dept_panel";
+    public final static String DEPT_DATA_FILL_NAME = "dept_data_fill";
 
 
 

core/backend/src/main/java/io/dataease/commons/constants/DataFillConstants.java

@@ -0,0 +1,19 @@
+package io.dataease.commons.constants;
+
+
+public class DataFillConstants {
+
+
+    public final static String DATA_FILL_NODE_TYPE_FOlDER = "folder";
+
+    public final static String DATA_FILL_NODE_TYPE_DATA_FILL = "data_fill";
+
+    public final static String OPT_TYPE_INSERT = "insert";
+
+    public final static String OPT_TYPE_UPDATE = "update";
+
+
+    public final static String DATA_FILL_GATHER_DATA_FILL_LIST = "data_fill_list";
+
+
+}

core/backend/src/main/java/io/dataease/commons/constants/DePermissionType.java

@@ -1,5 +1,5 @@
 package io.dataease.commons.constants;
 
 public enum DePermissionType {
-    DATASOURCE, DATASET, PANEL
+    DATASOURCE, DATASET, PANEL, DATA_FILL
 }

core/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java

@@ -112,6 +112,7 @@ public interface ParamConstants {
         MSG_TIME_OUT("basic.msgTimeOut"),
 
         LOG_TIME_OUT("basic.logTimeOut"),
+        DS_SYNC_LOG_TIME_OUT("basic.dsSyncLogTimeOut"),
         DS_CHECK_INTERVAL("basic.dsCheckInterval"),
         DS_CHECK_INTERVAL_TYPE("basic.dsCheckIntervalType"),
         DEFAULT_LOGIN_TYPE("basic.loginType"),

core/backend/src/main/java/io/dataease/commons/constants/ResourceAuthLevel.java

@@ -19,7 +19,12 @@ public enum ResourceAuthLevel {
 
     DATASOURCE_LEVEL_USE(1),
     DATASOURCE_LEVEL_MANAGE(3),
-    DATASOURCE_LEVEL_GRANT(15);
+    DATASOURCE_LEVEL_GRANT(15),
+
+
+    DATA_FILLING_LEVEL_USE(1),
+    DATA_FILLING_LEVEL_MANAGE(3),
+    DATA_FILLING_LEVEL_GRANT(15);
 
     private Integer level;
 

core/backend/src/main/java/io/dataease/commons/constants/SysAuthConstants.java

@@ -19,4 +19,6 @@ public class SysAuthConstants {
 
     public final static String AUTH_SOURCE_TYPE_DATASOURCE = "link";
 
+    public final static String AUTH_SOURCE_TYPE_DATA_FILLING = "data_fill";
+
 }

core/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java

@@ -70,7 +70,10 @@ public class SysLogConstants {
         DRIVER(9, "SOURCE_TYPE_DRIVER"),
         DRIVER_FILE(10, "SOURCE_TYPE_DRIVER_FILE"),
         MENU(11, "SOURCE_TYPE_MENU"),
-        APIKEY(12, "SOURCE_TYPE_APIKEY");
+        APIKEY(12, "SOURCE_TYPE_APIKEY"),
+        DATA_FILL_FORM(13,"SOURCE_TYPE_DATA_FILL_FORM"),
+        DATA_FILL_DATA(14,"SOURCE_TYPE_DATA_FILL_DATA");
+
         private Integer value;
         private String name;
 

core/backend/src/main/java/io/dataease/commons/exception/DEException.java

@@ -1,24 +0,0 @@
-package io.dataease.commons.exception;
-
-public class DEException extends RuntimeException {
-
-    private DEException(String message) {
-        super(message);
-    }
-
-    private DEException(Throwable t) {
-        super(t);
-    }
-
-    public static void throwException(String message) {
-        throw new DEException(message);
-    }
-
-    public static DEException getException(String message) {
-        throw new DEException(message);
-    }
-
-    public static void throwException(Throwable t) {
-        throw new DEException(t);
-    }
-}

core/backend/src/main/java/io/dataease/commons/filter/HtmlResourceFilter.java

@@ -0,0 +1,46 @@
+package io.dataease.commons.filter;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class HtmlResourceFilter implements Filter, Ordered {
+
+    @Override
+    public int getOrder() {
+        return 99;
+    }
+
+    @Value("${dataease.http.cache:false}")
+    private Boolean httpCache;
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        Filter.super.init(filterConfig);
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletResponse httpResponse = (HttpServletResponse) servletResponse;
+        if(httpCache == null || !httpCache){
+            // 禁用缓存
+            httpResponse.setHeader(HttpHeaders.CACHE_CONTROL, "no-cache");
+            httpResponse.setHeader("Cache", "no-cache");
+            httpResponse.setHeader(HttpHeaders.PRAGMA, "no-cache");
+            httpResponse.setHeader(HttpHeaders.EXPIRES, "0");
+        }
+        // 继续执行过滤器链
+        filterChain.doFilter(servletRequest, httpResponse);
+    }
+
+    @Override
+    public void destroy() {
+        Filter.super.destroy();
+    }
+}

core/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java

@@ -1,8 +1,8 @@
 package io.dataease.commons.filter;
 
-import io.dataease.commons.exception.DEException;
 import io.dataease.commons.holder.ThreadLocalContextHolder;
 import io.dataease.commons.wrapper.XssAndSqlHttpServletRequestWrapper;
+import io.dataease.plugins.common.exception.DataEaseException;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -54,7 +54,7 @@ public class SqlFilter implements Filter {
                         response.setCharacterEncoding("UTF-8");
                         response.setContentType("application/json;charset=UTF-8");
                         String msg = ThreadLocalContextHolder.getData().toString();
-                        DEException.throwException(msg);
+                        DataEaseException.throwException(msg);
                         return;
                     }
                 }
@@ -63,7 +63,7 @@ public class SqlFilter implements Filter {
                 response.setCharacterEncoding("UTF-8");
                 response.setContentType("application/json;charset=UTF-8");
                 String msg = ThreadLocalContextHolder.getData().toString();
-                DEException.throwException(msg);
+                DataEaseException.throwException(msg);
                 return;
             }
             chain.doFilter(xssRequest, response);

core/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java

@@ -1,9 +1,9 @@
 package io.dataease.commons.license;
 
 import com.google.gson.Gson;
-import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.plugins.common.base.domain.License;
+import io.dataease.plugins.common.exception.DataEaseException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -103,10 +103,10 @@ public class DefaultLicenseService {
     public License readLicense() {
         License license = innerLicenseService.getLicense(LICENSE_ID);
         if (license == null) {
-            DEException.throwException("i18n_no_license_record");
+            DataEaseException.throwException("i18n_no_license_record");
         }
         if (StringUtils.isBlank(license.getLicense())) {
-            DEException.throwException("i18n_license_is_empty");
+            DataEaseException.throwException("i18n_license_is_empty");
         }
         return license;
     }
@@ -114,7 +114,7 @@ public class DefaultLicenseService {
     // 创建或更新License
     private void writeLicense(String licenseKey, F2CLicenseResponse response) {
         if (StringUtils.isBlank(licenseKey)) {
-            DEException.throwException("i18n_license_is_empty");
+            DataEaseException.throwException("i18n_license_is_empty");
         }
         License license = new License();
         license.setId(LICENSE_ID);

core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java

@@ -9,7 +9,7 @@ import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.commons.model.AuthURD;
 
-import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.common.util.SpringContextUtil;
 import io.dataease.plugins.xpack.auth.dto.request.XpackBaseTreeRequest;
 import io.dataease.plugins.xpack.auth.dto.response.XpackVAuthModelDTO;
 import io.dataease.plugins.xpack.auth.service.AuthXpackService;
@@ -29,6 +29,7 @@ public class AuthUtils {
     private static final String[] defaultPanelPermissions = { "panel_list" };
     private static final String[] defaultDataSetPermissions = { "0" };
     private static final String[] defaultLinkPermissions = { "0" };
+    private static final String[] defaultDataFillingPermissions = { "0" };
 
     private static final ThreadLocal<CurrentUserDto> USER_INFO = new ThreadLocal<CurrentUserDto>();
 
@@ -71,6 +72,10 @@ public class AuthUtils {
         return userIds;
     }
 
+    public static Set<String> accountByURD(AuthURD request) {
+        return extAuthService.userNamesByRD(request);
+    }
+
     public static List<String> parentResources(String resourceId, String type) {
         return extAuthService.parentResource(resourceId, type);
     }
@@ -134,6 +139,18 @@ public class AuthUtils {
                 result.add(new AuthItem(item, ResourceAuthLevel.PANEL_LEVEL_MANAGE.getLevel()));
             });
             return result;
+        } else if (StringUtils.equals(DePermissionType.DATA_FILL.name().toLowerCase(), type)) {
+            Set<AuthItem> userSet = extAuthService.dataFillingIdByUser(userId).stream().collect(Collectors.toSet());
+            Set<AuthItem> roleSet = roles.stream().map(role -> extAuthService.dataFillingIdByRole(role.getId()))
+                    .flatMap(Collection::stream).collect(Collectors.toSet());
+            Set<AuthItem> deptSet = extAuthService.dataFillingIdByDept(deptId).stream().collect(Collectors.toSet());
+            result.addAll(userSet);
+            result.addAll(roleSet);
+            result.addAll(deptSet);
+            Arrays.stream(defaultDataFillingPermissions).forEach(item -> {
+                result.add(new AuthItem(item, ResourceAuthLevel.DATA_FILLING_LEVEL_MANAGE.getLevel()));
+            });
+            return result;
         }
         return result;
 

core/backend/src/main/java/io/dataease/commons/utils/BeanUtils.java

@@ -2,7 +2,10 @@ package io.dataease.commons.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
 
 public class BeanUtils {
 
@@ -65,4 +68,19 @@ public class BeanUtils {
             return null;
         }
     }
+
+    public static Map<String, Object> bean2Map(Object bean) {
+        Map<String, Object> result = new HashMap<>();
+        Class<?> aClass = bean.getClass();
+        Field[] fields = aClass.getDeclaredFields();
+        for (Field field : fields) {
+            field.setAccessible(true);
+            try {
+                result.put(field.getName(), field.get(bean));
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return result;
+    }
 }

core/backend/src/main/java/io/dataease/commons/utils/DatasetUtils.java

@@ -1,6 +1,6 @@
 package io.dataease.commons.utils;
 
-import io.dataease.dto.dataset.union.UnionDTO;
+import io.dataease.plugins.common.dto.dataset.union.UnionDTO;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;

core/backend/src/main/java/io/dataease/commons/utils/DeFileUtils.java

@@ -1,6 +1,6 @@
 package io.dataease.commons.utils;
 
-import io.dataease.commons.exception.DEException;
+import io.dataease.plugins.common.exception.DataEaseException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -47,11 +47,11 @@ public class DeFileUtils {
     public static void validateFile(MultipartFile file) {
         String name = getFileNameNoEx(file.getOriginalFilename());
         if (StringUtils.contains(name, "./")) {
-            DEException.throwException("file path invalid");
+            DataEaseException.throwException("file path invalid");
         }
         String suffix = getExtensionName(file.getOriginalFilename());
         if (!StringUtils.equalsIgnoreCase(suffix, "zip")) {
-            DEException.throwException("please upload valid zip file");
+            DataEaseException.throwException("please upload valid zip file");
         }
     }
     /**

core/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java

@@ -1,23 +1,20 @@
 package io.dataease.commons.utils;
 
+import io.dataease.commons.model.excel.ExcelSheetModel;
+import io.dataease.plugins.common.util.FileUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
-
-import cn.hutool.core.io.FileUtil;
-import io.dataease.commons.model.excel.ExcelSheetModel;
-
+import java.io.FileOutputStream;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
 
 public class ExcelUtils {
     private static final String suffix = ".xlsx";
@@ -78,10 +75,11 @@ public class ExcelUtils {
         folderPath += Thread.currentThread().getId() + "/";
 
         if (!FileUtil.exist(folderPath)) {
-            FileUtil.mkdir(folderPath);
+            new File(folderPath).mkdirs();
         }
         File result = new File(folderPath + realFileName.get());
-        BufferedOutputStream outputStream = FileUtil.getOutputStream(result);
+        FileOutputStream fos = new FileOutputStream(result);
+        BufferedOutputStream outputStream = new BufferedOutputStream(fos);
         try {
             wb.write(outputStream);
         } catch (Exception e) {

core/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java

@@ -1,6 +1,6 @@
 package io.dataease.commons.utils;
 
-import io.dataease.dto.dataset.ExcelSheetData;
+import io.dataease.plugins.common.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.dto.datasource.TableField;
 import org.apache.poi.hssf.eventusermodel.*;
@@ -331,6 +331,11 @@ public class ExcelXlsReader implements HSSFListener {
 
             if (flag && curRow != 0) { //该行不为空行且该行不是第一行，发送（第一行为列名，不需要）
                 if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) {
+                    if(cellList.size() < fields.size()){
+                        for (int i = 0; i < fields.size() - cellList.size(); i++) {
+                            cellList.add("");
+                        }
+                    }
                     ExcelSheetData excelSheetData = new ExcelSheetData();
                     excelSheetData.setData(new ArrayList<>(data));
                     excelSheetData.setExcelLabel(sheetName);
@@ -370,6 +375,9 @@ public class ExcelXlsReader implements HSSFListener {
 
 
     private String checkType(String str, int thisColumn) {
+        if (str.length() > 19) {
+            return "TEXT";
+        }
         String type = null;
         try {
             double d = Double.valueOf(str);

core/backend/src/main/java/io/dataease/commons/utils/ServletUtils.java

@@ -1,7 +1,7 @@
 package io.dataease.commons.utils;
 
 import io.dataease.commons.constants.AuthConstants;
-import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.common.util.SpringContextUtil;
 import org.springframework.core.env.Environment;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

core/backend/src/main/java/io/dataease/commons/utils/StaticResourceUtils.java

@@ -1,18 +1,17 @@
 package io.dataease.commons.utils;
 
-import static io.dataease.commons.constants.StaticResourceConstants.*;
-
-import cn.hutool.core.codec.Base64Encoder;
-import io.dataease.exception.DataEaseException;
-import io.dataease.i18n.Translator;
+import io.dataease.plugins.common.exception.DataEaseException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;
+import org.springframework.util.Base64Utils;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import static io.dataease.commons.constants.StaticResourceConstants.*;
+
 /**
  * Author: wangjiahao
  * Date: 2022/4/24
@@ -20,7 +19,7 @@ import java.io.InputStream;
  */
 public class StaticResourceUtils {
 
-    private final static String FILE_BASE_PATH = USER_HOME+ FILE_SEPARATOR+UPLOAD_URL_PREFIX;
+    private final static String FILE_BASE_PATH = USER_HOME + FILE_SEPARATOR + UPLOAD_URL_PREFIX;
 
     private static final String FILE_NAME_REGEX_PATTERN = "^[A-Za-z0-9.-]{1,255}$";
 
@@ -70,12 +69,11 @@ public class StaticResourceUtils {
     }
 
     /**
-     *
-     * @param imgFile  local storage path
+     * @param imgFile local storage path
      * @return
      */
     public static String getImgFileToBase64(String imgFile) {
-        if(!validateStringFilenameUsingRegex(imgFile)){
+        if (!validateStringFilenameUsingRegex(imgFile)) {
             DataEaseException.throwException("Illegal File Name");
         }
         //Convert the picture file into byte array  and encode it with Base64
@@ -83,7 +81,7 @@ public class StaticResourceUtils {
         byte[] buffer = null;
         //Read picture byte array
         try {
-            inputStream = new FileInputStream(FILE_BASE_PATH+FILE_SEPARATOR+imgFile);
+            inputStream = new FileInputStream(FILE_BASE_PATH + FILE_SEPARATOR + imgFile);
             int count = 0;
             while (count == 0) {
                 count = inputStream.available();
@@ -92,9 +90,9 @@ public class StaticResourceUtils {
             inputStream.read(buffer);
         } catch (IOException e) {
             LogUtil.error(e);
-        }catch (Exception e){
+        } catch (Exception e) {
             LogUtil.error(e);
-        }finally {
+        } finally {
             if (inputStream != null) {
                 try {
                     // Close InputStream
@@ -105,10 +103,9 @@ public class StaticResourceUtils {
             }
         }
         // Encode byte array as Base64
-        if(buffer!=null){
-
-             return Base64Encoder.encode(buffer);
-        }else{
+        if (buffer != null) {
+            return Base64Utils.encodeToString(buffer);
+        } else {
             return null;
         }
     }

core/backend/src/main/java/io/dataease/commons/utils/UrlTestUtils.java

@@ -1,5 +1,7 @@
 package io.dataease.commons.utils;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 
@@ -17,4 +19,16 @@ public class UrlTestUtils {
             return false;
         }
     }
+
+    public static boolean isURLAvailable(String urlString) {
+        try {
+            URL url = new URL(urlString);
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("HEAD");
+            int responseCode = connection.getResponseCode();
+            return responseCode == HttpURLConnection.HTTP_OK;
+        } catch (IOException e) {
+            return false;
+        }
+    }
 }

core/backend/src/main/java/io/dataease/controller/IndexController.java

@@ -1,10 +1,10 @@
 package io.dataease.controller;
 
-import io.dataease.commons.exception.DEException;
 import io.dataease.commons.license.DefaultLicenseService;
 import io.dataease.commons.utils.CodingUtil;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.commons.utils.ServletUtils;
+import io.dataease.plugins.common.exception.DataEaseException;
 import io.dataease.service.panel.PanelLinkService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -67,10 +67,18 @@ public class IndexController {
             if (StringUtils.isNotEmpty(attachParams)) {
                 url = url + "&attachParams=" + attachParams;
             }
+            String fromLink = request.getParameter("fromLink");
+            if (StringUtils.isNotEmpty(fromLink)) {
+                url = url + "&fromLink=" + fromLink;
+            }
+            String ticket = request.getParameter("ticket");
+            if (StringUtils.isNotEmpty(ticket)) {
+                url = url + "&ticket=" + ticket;
+            }
             response.sendRedirect(url);
         } catch (IOException e) {
             LogUtil.error(e.getMessage());
-            DEException.throwException(e);
+            DataEaseException.throwException(e);
         }
     }
 
@@ -86,7 +94,7 @@ public class IndexController {
             response.sendRedirect(url);
         } catch (IOException e) {
             LogUtil.error(e.getMessage());
-            DEException.throwException(e);
+            DataEaseException.throwException(e);
         }
     }
 

core/backend/src/main/java/io/dataease/controller/ai/AiComponentController.java

@@ -0,0 +1,26 @@
+package io.dataease.controller.ai;
+
+import io.dataease.service.ai.AiBaseService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @author : WangJiaHao
+ * @date : 2024/3/27 09:44
+ */
+
+@RestController
+@RequestMapping("aiBase")
+public class AiComponentController {
+    @Resource
+    private AiBaseService aiBaseService;
+
+    @GetMapping("findTargetUrl")
+    Map<String, String> findTargetUrl(){
+        return aiBaseService.findTargetUrl();
+    }
+}

core/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java

@@ -109,6 +109,13 @@ public class ChartViewController {
         return chartViewService.chartCopy(id, panelId);
     }
 
+    @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANEL_LEVEL_MANAGE, paramIndex = 1)
+    @ApiOperation("复制")
+    @PostMapping("chartCopyWithId/{id}/{panelId}/{newId}")
+    public String chartCopyWithId(@PathVariable String id, @PathVariable String panelId, @PathVariable String newId) {
+        return chartViewService.chartCopy(id, newId,panelId);
+    }
+
     @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANEL_LEVEL_MANAGE, paramIndex = 1)
     @ApiOperation("批量复制")
     @PostMapping("chartBatchCopy/{panelId}")

core/backend/src/main/java/io/dataease/controller/chart/ChartViewFieldController.java

@@ -4,13 +4,13 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.auth.annotation.DePermission;
 import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
-import io.dataease.commons.exception.DEException;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.response.ChartViewField4Type;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.base.domain.ChartViewField;
 import io.dataease.plugins.common.base.domain.DatasetTable;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
+import io.dataease.plugins.common.exception.DataEaseException;
 import io.dataease.service.chart.ChartViewFieldService;
 import io.dataease.service.dataset.DataSetTableService;
 import io.swagger.annotations.Api;
@@ -48,7 +48,7 @@ public class ChartViewFieldController {
             BeanUtils.copyProperties(chartViewField, datasetTableField);
             dataSetTableService.getPreviewData(dataSetTableRequest, 1, 1, Collections.singletonList(datasetTableField), null);
         } catch (Exception e) {
-            DEException.throwException(Translator.get("i18n_calc_field_error"));
+            DataEaseException.throwException(Translator.get("i18n_calc_field_error"));
         }
         return chartViewFieldService.save(chartViewField);
     }

core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java

@@ -0,0 +1,177 @@
+package io.dataease.controller.datafill;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.PageUtils;
+import io.dataease.commons.utils.Pager;
+import io.dataease.controller.ResultHolder;
+import io.dataease.controller.request.datafill.*;
+import io.dataease.controller.response.datafill.DataFillFormTableDataResponse;
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import io.dataease.dto.datafill.DataFillFormDTO;
+import io.dataease.dto.datafill.DataFillTaskDTO;
+import io.dataease.dto.datafill.DataFillUserTaskDTO;
+import io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs;
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import io.dataease.service.datafill.DataFillDataService;
+import io.dataease.service.datafill.DataFillLogService;
+import io.dataease.service.datafill.DataFillService;
+import io.dataease.service.datafill.DataFillTaskService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@ApiIgnore
+@RequestMapping("dataFilling")
+@RestController
+public class DataFillController {
+
+    @Resource
+    private DataFillService dataFillService;
+    @Resource
+    private DataFillLogService dataFillLogService;
+    @Resource
+    private DataFillTaskService dataFillTaskService;
+    @Resource
+    private DataFillDataService dataFillDataService;
+
+
+    @ApiIgnore
+    @PostMapping("/form/save")
+    public ResultHolder saveForm(@RequestBody DataFillFormWithBLOBs dataFillForm) throws Exception {
+        return dataFillService.saveForm(dataFillForm);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/update")
+    public ResultHolder updateForm(@RequestBody DataFillFormWithBLOBs dataFillForm) throws Exception {
+        return dataFillService.updateForm(dataFillForm);
+    }
+
+    @PostMapping("/manage/form/{id}")
+    public DataFillFormDTO getWithPrivileges(@PathVariable String id) throws Exception {
+        return dataFillService.getWithPrivileges(id);
+    }
+
+    @PostMapping("/form/get/{id}")
+    public DataFillFormWithBLOBs get(@PathVariable String id) throws Exception {
+        return dataFillService.get(id);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/delete/{id}")
+    public void saveForm(@PathVariable String id) throws Exception {
+        dataFillService.deleteForm(id);
+    }
+
+    @ApiOperation("查询树")
+    @PostMapping("/form/tree")
+    public List<DataFillFormDTO> tree(@RequestBody DataFillFormRequest request) {
+        return dataFillService.tree(request);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{id}/tableData")
+    public DataFillFormTableDataResponse tableData(@PathVariable String id, @RequestBody DataFillFormTableDataRequest request) throws Exception {
+        request.setId(id);
+        return dataFillDataService.listData(request);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/fields/{id}")
+    public List<ExtTableField> listFields(@PathVariable String id) throws Exception {
+        return dataFillService.listFields(id);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/delete/{id}")
+    public void deleteRowData(@PathVariable String formId, @PathVariable String id) throws Exception {
+        dataFillDataService.deleteRowData(formId, id);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/rowData/save")
+    public String newRowData(@PathVariable String formId, @RequestBody Map<String, Object> data) throws Exception {
+        return dataFillDataService.updateRowData(formId, null, data, true);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/rowData/save/{id}")
+    public String updateRowData(@PathVariable String formId, @PathVariable String id, @RequestBody Map<String, Object> data) throws Exception {
+        return dataFillDataService.updateRowData(formId, id, data, false);
+    }
+
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/commitLog/{goPage}/{pageSize}")
+    public Pager<List<DataFillCommitLogDTO>> commitLogs(@PathVariable String formId, @PathVariable int goPage, @PathVariable int pageSize, @RequestBody DataFillCommitLogSearchRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        List<DataFillCommitLogDTO> logs = dataFillLogService.commitLogs(formId, request);
+
+        return PageUtils.setPageInfo(page, logs);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/task/{goPage}/{pageSize}")
+    public Pager<List<DataFillTaskDTO>> tasks(@PathVariable String formId, @PathVariable int goPage, @PathVariable int pageSize, @RequestBody DataFillTaskSearchRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        List<DataFillTaskDTO> tasks = dataFillTaskService.tasks(formId, request);
+
+        return PageUtils.setPageInfo(page, tasks);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/task/save")
+    public void saveTask(@PathVariable String formId, @RequestBody DataFillTaskSearchRequest request) throws Exception {
+
+        dataFillTaskService.saveTask(formId, request);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/task/{taskId}/delete")
+    public void deleteTask(@PathVariable Long taskId) {
+
+        dataFillTaskService.deleteTask(taskId);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/task/{taskId}/enable")
+    public void enableTask(@PathVariable Long taskId) throws Exception {
+
+        dataFillTaskService.enableTask(taskId);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/task/{taskId}/disable")
+    public void disableTask(@PathVariable Long taskId) throws Exception {
+
+        dataFillTaskService.disableTask(taskId);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/myTask/{type}/{goPage}/{pageSize}")
+    public Pager<List<DataFillUserTaskDTO>> userTasks(@PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize, @RequestBody DataFillUserTaskSearchRequest request) {
+        Long userId = AuthUtils.getUser().getUserId();
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        List<DataFillUserTaskDTO> tasks = dataFillTaskService.userTasks(userId, type, request);
+
+        return PageUtils.setPageInfo(page, tasks);
+    }
+
+
+    @ApiIgnore
+    @PostMapping("/myTask/fill/{taskId}")
+    public void userFillData(@PathVariable String taskId, @RequestBody Map<String, Object> data) throws Exception {
+        dataFillService.fillFormData(taskId, data);
+    }
+
+}

core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java

@@ -67,7 +67,6 @@ public class DataSetTableController {
 
     @DePermissions(value = {
             @DePermission(type = DePermissionType.DATASET, value = "id", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
-            @DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
             @DePermission(type = DePermissionType.DATASOURCE, value = "dataSourceId", level = ResourceAuthLevel.DATASOURCE_LEVEL_USE)
     }, logical = Logical.AND)
     @ApiOperation("更新")

core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java

@@ -1,27 +1,28 @@
 package io.dataease.controller.dataset;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.google.gson.Gson;
 import io.dataease.auth.annotation.DePermission;
 import io.dataease.auth.annotation.DePermissions;
 import io.dataease.auth.filter.F2CLinkFilter;
 import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
-import io.dataease.commons.exception.DEException;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.request.dataset.MultFieldValuesRequest;
 import io.dataease.controller.response.DatasetTableField4Type;
+import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
 import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.base.domain.DatasetTable;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
 import io.dataease.plugins.common.base.domain.Datasource;
+import io.dataease.plugins.common.exception.DataEaseException;
 import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.query.QueryProvider;
 import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem;
-import io.dataease.provider.ProviderFactory;
+import io.dataease.plugins.datasource.provider.ProviderFactory;
 import io.dataease.service.dataset.DataSetFieldService;
 import io.dataease.service.dataset.DataSetTableFieldsService;
 import io.dataease.service.dataset.DataSetTableService;
@@ -30,6 +31,7 @@ import io.dataease.service.datasource.DatasourceService;
 import io.dataease.service.engine.EngineService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,6 +110,8 @@ public class DataSetTableFieldController {
         DatasetTableField datasetTableField = DatasetTableField.builder().build();
         datasetTableField.setTableId(tableId);
         datasetTableField.setGroupType("d");
+        DatasetTable datasetTable = dataSetTableService.get(tableId);
+        DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
         List<DatasetTableFieldDTO> dimensionList = new ArrayList<>();
         dataSetTableFieldsService.list(datasetTableField).forEach(o -> {
             DatasetTableFieldDTO datasetTableFieldDTO = new DatasetTableFieldDTO();
@@ -118,6 +122,9 @@ public class DataSetTableFieldController {
                 deTypeCascader.add(datasetTableFieldDTO.getDateFormatType());
             }
             datasetTableFieldDTO.setDeTypeCascader(deTypeCascader);
+            if (dataTableInfoDTO.isSetKey() && dataTableInfoDTO.getKeys().contains(datasetTableFieldDTO.getOriginName())){
+                datasetTableFieldDTO.setKey(true);
+            }
             dimensionList.add(datasetTableFieldDTO);
         });
 
@@ -133,6 +140,9 @@ public class DataSetTableFieldController {
                 deTypeCascader.add(datasetTableFieldDTO.getDateFormatType());
             }
             datasetTableFieldDTO.setDeTypeCascader(deTypeCascader);
+            if (dataTableInfoDTO.isSetKey() && dataTableInfoDTO.getKeys().contains(datasetTableFieldDTO.getOriginName())){
+                datasetTableFieldDTO.setKey(true);
+            }
             quotaList.add(datasetTableFieldDTO);
         });
 
@@ -167,7 +177,7 @@ public class DataSetTableFieldController {
             BeanUtils.copyProperties(datasetTable, dataSetTableRequest);
             dataSetTableService.getPreviewData(dataSetTableRequest, 1, 1, Collections.singletonList(datasetTableField), null);
         } catch (Exception e) {
-            DEException.throwException(Translator.get("i18n_calc_field_error"));
+            DataEaseException.throwException(Translator.get("i18n_calc_field_error"));
         }
         return dataSetTableFieldsService.save(datasetTableField);
     }
@@ -187,6 +197,16 @@ public class DataSetTableFieldController {
         return dataSetTableFieldsService.save(datasetTableField);
     }
 
+    @DePermission(type = DePermissionType.DATASET, value = "tableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
+    @ApiOperation("设置主键")
+    @PostMapping("saveKey")
+    public void saveKey(@RequestBody DatasetTableFieldDTO datasetTableField) throws Exception {
+        DatasetTable datasetTable = dataSetTableService.get(datasetTableField.getTableId());
+        if (datasetTable.getMode() == 1) {
+            dataSetTableService.saveKey(datasetTable, datasetTableField);
+        }
+    }
+
     @DePermissions(value = {
             @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE, paramIndex = 1)
     })
@@ -214,8 +234,8 @@ public class DataSetTableFieldController {
     public List<Object> multFieldValues(@RequestBody MultFieldValuesRequest multFieldValuesRequest) throws Exception {
         List<Object> results = new ArrayList<>();
         for (String fieldId : multFieldValuesRequest.getFieldIds()) {
-            List<Object> fieldValues = dataSetFieldService.fieldValues(fieldId, multFieldValuesRequest.getSort(), multFieldValuesRequest.getUserId(), true, false);
-            if (CollectionUtil.isNotEmpty(fieldValues)) {
+            List<Object> fieldValues = dataSetFieldService.fieldValues(fieldId, multFieldValuesRequest.getSort(), multFieldValuesRequest.getUserId(), true, false, multFieldValuesRequest.getKeyword());
+            if (CollectionUtils.isNotEmpty(fieldValues)) {
                 results.addAll(fieldValues);
             }
 
@@ -233,13 +253,13 @@ public class DataSetTableFieldController {
         DecodedJWT jwt = JWT.decode(linkToken);
         Long userId = jwt.getClaim("userId").asLong();
         multFieldValuesRequest.setUserId(userId);
-        return dataSetFieldService.fieldValues(multFieldValuesRequest.getFieldIds(), multFieldValuesRequest.getSort(), multFieldValuesRequest.getUserId(), true, true, false);
+        return dataSetFieldService.fieldValues(multFieldValuesRequest.getFieldIds(), multFieldValuesRequest.getSort(), multFieldValuesRequest.getUserId(), true, true, false, multFieldValuesRequest.getKeyword());
     }
 
     @ApiIgnore
     @PostMapping("mappingFieldValues")
     public List<Object> mappingFieldValues(@RequestBody MultFieldValuesRequest multFieldValuesRequest) throws Exception {
-        return dataSetFieldService.fieldValues(multFieldValuesRequest.getFieldIds(), multFieldValuesRequest.getSort(), multFieldValuesRequest.getUserId(), true, true, false);
+        return dataSetFieldService.fieldValues(multFieldValuesRequest.getFieldIds(), multFieldValuesRequest.getSort(), multFieldValuesRequest.getUserId(), true, true, false, multFieldValuesRequest.getKeyword());
     }
 
     @ApiIgnore
@@ -248,7 +268,7 @@ public class DataSetTableFieldController {
         List<Object> results = new ArrayList<>();
         for (String fieldId : multFieldValuesRequest.getFieldIds()) {
             List<Object> fieldValues = dataSetFieldService.fieldValues(fieldId, multFieldValuesRequest.getUserId(), false, true);
-            if (CollectionUtil.isNotEmpty(fieldValues)) {
+            if (CollectionUtils.isNotEmpty(fieldValues)) {
                 results.addAll(fieldValues);
             }
 

core/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java

@@ -19,10 +19,6 @@ import io.dataease.dto.DatasourceDTO;
 import io.dataease.dto.SysLogDTO;
 import io.dataease.dto.datasource.DBTableDTO;
 import io.dataease.plugins.common.base.domain.Datasource;
-import io.dataease.plugins.common.base.domain.DatasourceExample;
-import io.dataease.plugins.common.dto.datasource.DataSourceType;
-import io.dataease.plugins.datasource.provider.Provider;
-import io.dataease.provider.ProviderFactory;
 import io.dataease.service.datasource.DatasourceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +32,6 @@ import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Api(tags = "数据源：数据源管理")

core/backend/src/main/java/io/dataease/controller/datasource/DriverMgmController.java

@@ -3,13 +3,20 @@ package io.dataease.controller.datasource;
 
 import io.dataease.auth.annotation.DeLog;
 import io.dataease.commons.constants.SysLogConstants;
+import io.dataease.commons.utils.AuthUtils;
 import io.dataease.dto.DriverDTO;
+import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.base.domain.DeDriver;
 import io.dataease.plugins.common.base.domain.DeDriverDetails;
+import io.dataease.plugins.common.dto.datasource.DataSourceType;
+import io.dataease.plugins.common.exception.DataEaseException;
+import io.dataease.plugins.common.util.SpringContextUtil;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.service.datasource.DriverService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,11 +33,13 @@ public class DriverMgmController {
 
     @Resource
     private DriverService driverService;
+    @Resource
+    private DatasourceService datasourceService;
 
     @RequiresPermissions("datasource:read")
     @ApiOperation("驱动列表")
     @PostMapping("/list")
-    public List<DriverDTO> listDeDriver() throws Exception{
+    public List<DriverDTO> listDeDriver() throws Exception {
         return driverService.list();
     }
 
@@ -44,15 +53,24 @@ public class DriverMgmController {
             positionKey = "type",
             value = "id"
     )
-    public void delete(@RequestBody DeDriver deDriver) throws Exception{
+    public void delete(@RequestBody DeDriver deDriver) throws Exception {
+        checkPermission();
         driverService.delete(deDriver);
     }
 
     @RequiresPermissions("datasource:read")
     @ApiOperation("驱动列表")
     @GetMapping("/list/{type}")
-    public List<DriverDTO> listDeDriver(@PathVariable String type) throws Exception{
-        return listDeDriver().stream().filter(driverDTO -> driverDTO.getType().equalsIgnoreCase(type)).collect(Collectors.toList());
+    public List<DriverDTO> listDeDriver(@PathVariable String type) throws Exception {
+        List<DriverDTO> driverDTOS = listDeDriver().stream().filter(driverDTO -> driverDTO.getType().equalsIgnoreCase(type)).collect(Collectors.toList());
+        driverDTOS.forEach(driverDTO1 -> {
+            if (StringUtils.isEmpty(driverDTO1.getSurpportVersions())) {
+                driverDTO1.setNameAlias(driverDTO1.getName());
+            } else {
+                driverDTO1.setNameAlias(driverDTO1.getName() + "(" + driverDTO1.getSurpportVersions() + ")");
+            }
+        });
+        return driverDTOS;
     }
 
     @RequiresPermissions("datasource:read")
@@ -65,34 +83,45 @@ public class DriverMgmController {
             positionKey = "type",
             value = "id"
     )
-    public DeDriver save(@RequestBody DeDriver deDriver) throws Exception{
+    public DeDriver save(@RequestBody DeDriver deDriver) throws Exception {
+        checkPermission();
         return driverService.save(deDriver);
     }
 
+    @RequiresPermissions("datasource:read")
+    @ApiOperation("获取驱动")
+    @GetMapping("/getDriver/{id}")
+    public DeDriver getDriver(@PathVariable String id) throws Exception {
+        return driverService.get(id);
+    }
+
     @RequiresPermissions("datasource:read")
     @ApiOperation("更新驱动")
     @PostMapping("/update")
     @DeLog(
             operatetype = SysLogConstants.OPERATE_TYPE.MODIFY,
             sourcetype = SysLogConstants.SOURCE_TYPE.DRIVER,
-            positionIndex = 0,positionKey = "type",
+            positionIndex = 0, positionKey = "type",
             value = "id"
     )
-    public DeDriver update(@RequestBody DeDriver deDriver) throws Exception{
+    public DeDriver update(@RequestBody DeDriver deDriver) throws Exception {
+        checkPermission();
         return driverService.update(deDriver);
     }
 
     @RequiresPermissions("datasource:read")
     @ApiOperation("驱动文件列表")
     @GetMapping("/listDriverDetails/{id}")
-    public List<DeDriverDetails> listDriverDetails(@PathVariable String id) throws Exception{
+    public List<DeDriverDetails> listDriverDetails(@PathVariable String id) throws Exception {
+        checkPermission();
         return driverService.listDriverDetails(id);
     }
 
     @RequiresPermissions("datasource:read")
     @ApiOperation("删除驱动文件")
     @PostMapping("/deleteDriverFile")
-    public void deleteDriverFile(@RequestBody DeDriverDetails deDriverDetails) throws Exception{
+    public void deleteDriverFile(@RequestBody DeDriverDetails deDriverDetails) throws Exception {
+        checkPermission();
         driverService.deleteDriverFile(deDriverDetails.getId());
     }
 
@@ -104,9 +133,15 @@ public class DriverMgmController {
             @ApiImplicitParam(name = "id", value = "驱动D", required = true, dataType = "String")
     })
     public DeDriverDetails excelUpload(@RequestParam("id") String id, @RequestParam("file") MultipartFile file) throws Exception {
+        checkPermission();
         return driverService.saveJar(file, id);
     }
 
 
+    private void checkPermission() throws Exception {
+        if (!AuthUtils.getUser().getIsAdmin()) {
+            DataEaseException.throwException(Translator.get("I18N_NO_DRIVER_PERMISSION"));
+        }
+    }
 
 }

core/backend/src/main/java/io/dataease/controller/handler/GlobalExceptionHandler.java

@@ -2,7 +2,9 @@ package io.dataease.controller.handler;
 
 import io.dataease.controller.ResultHolder;
 import io.dataease.i18n.Translator;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.servlet.error.ErrorAttributes;
 import org.springframework.boot.web.servlet.error.ErrorController;
@@ -49,7 +51,7 @@ public class GlobalExceptionHandler implements ErrorController {
         response.setStatus(code);
         String errorMessage = StringUtils.EMPTY;
         if (t != null) {
-            if (Logger.isDebugEnabled()) {
+            if (Logger.isDebugEnabled() && (ObjectUtils.isEmpty(t.getCause()) || !(t.getCause() instanceof AuthenticationException))) {
                 Logger.error("Fail to proceed " + errorAttributeMap.get("path"), t);
             }
             errorMessage = t.getMessage();

core/backend/src/main/java/io/dataease/controller/panel/PanelViewController.java

@@ -1,6 +1,7 @@
 package io.dataease.controller.panel;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.dto.panel.PanelComponentDTO;
 import io.dataease.dto.panel.PanelViewTableDTO;
 import io.dataease.service.panel.PanelViewService;
 import io.swagger.annotations.Api;
@@ -29,4 +30,10 @@ public class PanelViewController {
     public List<PanelViewTableDTO> detailList(@PathVariable String panelId) throws Exception {
         return panelViewService.detailList(panelId);
     }
+
+    @ApiOperation("组件信息")
+    @GetMapping("/getComponentInfo/{panelId}")
+    public PanelComponentDTO getComponentInfo(@PathVariable String panelId) throws Exception {
+        return panelViewService.getComponentInfo(panelId);
+    }
 }

core/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java

@@ -8,11 +8,13 @@ import io.dataease.controller.request.panel.PanelViewLogRequest;
 import io.dataease.controller.request.panel.link.*;
 import io.dataease.dto.panel.link.GenerateDto;
 import io.dataease.dto.panel.link.ValidateDto;
+import io.dataease.plugins.common.base.domain.PanelLinkTicket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
 import java.util.Map;
 
 @Api(tags = "仪表板：链接管理")
@@ -45,6 +47,11 @@ public interface LinkApi {
     @PostMapping("/currentGenerate/{resourceId}")
     GenerateDto currentGenerate(String resourceId);
 
+    @DePermission(type = DePermissionType.PANEL)
+    @ApiOperation("当前ticket信息")
+    @PostMapping("/currentTicket/{resourceId}")
+    List<PanelLinkTicket> queryTicket(String resourceId);
+
     @ApiOperation("验证访问")
     @PostMapping("/validate")
     ValidateDto validate(LinkValidateRequest request) throws Exception;
@@ -70,5 +77,15 @@ public interface LinkApi {
     @PostMapping("/viewLog")
     void viewLinkLog(@RequestBody LinkViewLogRequest request);
 
+    @ApiOperation("保存ticket")
+    @PostMapping("/saveTicket")
+    String saveTicket(@RequestBody TicketCreator creator);
 
+    @ApiOperation("删除ticket")
+    @PostMapping("/delTicket")
+    void deleteTicket(@RequestBody TicketDelRequest request);
+
+    @ApiOperation("切换是否必填ticket")
+    @PostMapping("/enableTicket")
+    void switchRequire(@RequestBody TicketSwitchRequest request);
 }

core/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java

@@ -5,16 +5,20 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 import io.dataease.auth.filter.F2CLinkFilter;
 import io.dataease.commons.constants.SysLogConstants;
 import io.dataease.commons.utils.DeLogUtils;
-import io.dataease.plugins.common.base.domain.PanelGroupWithBLOBs;
-import io.dataease.plugins.common.base.domain.PanelLink;
 import io.dataease.controller.panel.api.LinkApi;
 import io.dataease.controller.request.chart.ChartExtRequest;
 import io.dataease.controller.request.panel.link.*;
 import io.dataease.dto.panel.link.GenerateDto;
+import io.dataease.dto.panel.link.TicketDto;
 import io.dataease.dto.panel.link.ValidateDto;
+import io.dataease.plugins.common.base.domain.PanelGroupWithBLOBs;
+import io.dataease.plugins.common.base.domain.PanelLink;
+import io.dataease.plugins.common.base.domain.PanelLinkMapping;
+import io.dataease.plugins.common.base.domain.PanelLinkTicket;
 import io.dataease.service.chart.ChartViewService;
 import io.dataease.service.panel.PanelLinkService;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +29,8 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -62,29 +68,49 @@ public class LinkServer implements LinkApi {
         return panelLinkService.currentGenerate(resourceId);
     }
 
+    @Override
+    public List<PanelLinkTicket> queryTicket(@PathVariable("resourceId") String resourceId) {
+        return panelLinkService.queryTicket(resourceId);
+    }
+
     @Override
     public ValidateDto validate(@RequestBody LinkValidateRequest request) throws Exception {
         String link = request.getLink();
-        link = URLDecoder.decode(link, "UTF-8");
+        link = URLDecoder.decode(link, StandardCharsets.UTF_8);
         String json = panelLinkService.decryptParam(link);
-
+        String[] jsonArray = json.split(",");
+        String uuid = null;
+        int len = jsonArray.length;
+        if (len > 1) {
+            uuid = jsonArray[1];
+        }
         String user = request.getUser();
-        user = URLDecoder.decode(user, "UTF-8");
+        user = URLDecoder.decode(user, StandardCharsets.UTF_8);
         user = panelLinkService.decryptParam(user);
 
         ValidateDto dto = new ValidateDto();
         dto.setUserId(user);
-        String resourceId = json;
+        String resourceId = jsonArray[0];
         PanelLink one = panelLinkService.findOne(resourceId, Long.valueOf(user));
         dto.setResourceId(resourceId);
         if (ObjectUtils.isEmpty(one)) {
             dto.setValid(false);
             return dto;
         }
+        PanelLinkMapping mapping = panelLinkService.getMapping(one);
+        String mappingUuid = mapping.getUuid();
+        if (!StringUtils.equals(uuid, mappingUuid)) {
+            dto.setValid(false);
+            return dto;
+        }
         dto.setValid(one.getValid());
         dto.setEnablePwd(one.getEnablePwd());
         dto.setPassPwd(panelLinkService.validateHeads(one));
         dto.setExpire(panelLinkService.isExpire(one));
+
+        String ticketText = request.getTicket();
+        TicketDto ticketDto = panelLinkService.validateTicket(ticketText, mapping);
+        dto.setTicket(ticketDto);
         return dto;
     }
 
@@ -94,8 +120,8 @@ public class LinkServer implements LinkApi {
     }
 
     @Override
-    public Object resourceDetail(@PathVariable String resourceId,@PathVariable String userId) {
-        return panelLinkService.resourceInfo(resourceId,userId);
+    public Object resourceDetail(@PathVariable String resourceId, @PathVariable String userId) {
+        return panelLinkService.resourceInfo(resourceId, userId);
     }
 
     @Override
@@ -125,8 +151,23 @@ public class LinkServer implements LinkApi {
             operateType = SysLogConstants.OPERATE_TYPE.MB_VIEW;
         }
         if (ObjectUtils.isEmpty(userId)) return;
-        PanelGroupWithBLOBs panelGroupWithBLOBs = panelLinkService.resourceInfo(panelId,String.valueOf(userId));
+        PanelGroupWithBLOBs panelGroupWithBLOBs = panelLinkService.resourceInfo(panelId, String.valueOf(userId));
         String pid = panelGroupWithBLOBs.getPid();
         DeLogUtils.save(operateType, SysLogConstants.SOURCE_TYPE.LINK, panelId, pid, userId, SysLogConstants.SOURCE_TYPE.USER);
     }
+
+    @Override
+    public String saveTicket(TicketCreator creator) {
+        return panelLinkService.saveTicket(creator);
+    }
+
+    @Override
+    public void deleteTicket(TicketDelRequest request) {
+        panelLinkService.deleteTicket(request);
+    }
+
+    @Override
+    public void switchRequire(TicketSwitchRequest request) {
+        panelLinkService.switchRequire(request);
+    }
 }

core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillCommitLogSearchRequest.java

@@ -0,0 +1,18 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+public class DataFillCommitLogSearchRequest extends DataFillCommitLogDTO {
+
+    private static final long serialVersionUID = -1067572649791328116L;
+
+    private List<String> formIds;
+
+}

core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormRequest.java

@@ -0,0 +1,25 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Set;
+
+
+@Data
+@Accessors(chain=true)
+public class DataFillFormRequest extends DataFillForm {
+
+    private static final long serialVersionUID = -6752223673862214909L;
+
+    @ApiModelProperty("排序")
+    private String sort;
+    @ApiModelProperty("用户ID")
+    private String userId;
+    @ApiModelProperty("ID集合")
+    private Set<String> ids;
+    @ApiModelProperty("排除的ID")
+    private String excludedId;
+}

core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormTableDataRequest.java

@@ -0,0 +1,19 @@
+package io.dataease.controller.request.datafill;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain=true)
+public class DataFillFormTableDataRequest extends DataFillFormRequest {
+
+    private static final long serialVersionUID = -314618516232771747L;
+
+    private long currentPage;
+
+    private long pageSize;
+
+    private String primaryKeyValue;
+
+}

core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillTaskSearchRequest.java

@@ -0,0 +1,14 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.dto.datafill.DataFillTaskDTO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class DataFillTaskSearchRequest extends DataFillTaskDTO {
+
+    private static final long serialVersionUID = 5881604308639714955L;
+
+}

core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillUserTaskSearchRequest.java

@@ -0,0 +1,14 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.dto.datafill.DataFillUserTaskDTO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class DataFillUserTaskSearchRequest extends DataFillUserTaskDTO {
+
+    private static final long serialVersionUID = 5881604308639714955L;
+
+}

core/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java

@@ -1,6 +1,6 @@
 package io.dataease.controller.request.dataset;
 
-import io.dataease.dto.dataset.ExcelSheetData;
+import io.dataease.plugins.common.dto.dataset.ExcelSheetData;
 import io.dataease.plugins.common.base.domain.DatasetTable;
 import io.dataease.plugins.common.dto.datasource.TableField;
 import io.swagger.annotations.ApiModelProperty;

core/backend/src/main/java/io/dataease/controller/request/dataset/MultFieldValuesRequest.java

@@ -13,4 +13,6 @@ public class MultFieldValuesRequest {
 
     private DeSortDTO sort;
 
+    private String keyword;
+
 }

core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java

@@ -17,6 +17,7 @@ public class ApiDefinition {
     private List<DatasetTableFieldDTO> fields;
     private ApiDefinitionRequest request;
     private String dataPath;
+    private Integer apiQueryTimeout = 30;
     private String status;
     private List<Map<String,String>> data = new ArrayList<>();
     private List<JSONObject> jsonFields = new ArrayList<>();

core/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java

@@ -42,4 +42,6 @@ public class PanelViewDetailsRequest {
 
     private Long userId;
 
+    private String downloadType;
+
 }

core/backend/src/main/java/io/dataease/controller/request/panel/link/LinkValidateRequest.java

@@ -9,4 +9,5 @@ public class LinkValidateRequest implements Serializable {
 
     private String link;
     private String user;
+    private String ticket;
 }

core/backend/src/main/java/io/dataease/controller/request/panel/link/TicketCreator.java

@@ -0,0 +1,19 @@
+package io.dataease.controller.request.panel.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TicketCreator implements Serializable {
+
+    private String ticket;
+
+    private Long exp;
+
+    private String args;
+
+    private String uuid;
+
+    private boolean generateNew;
+}

core/backend/src/main/java/io/dataease/controller/request/panel/link/TicketDelRequest.java

@@ -0,0 +1,12 @@
+package io.dataease.controller.request.panel.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TicketDelRequest implements Serializable {
+
+    private String ticket;
+
+}

core/backend/src/main/java/io/dataease/controller/request/panel/link/TicketSwitchRequest.java

@@ -0,0 +1,13 @@
+package io.dataease.controller.request.panel.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TicketSwitchRequest implements Serializable {
+
+    private String resourceId;
+
+    private Boolean require = false;
+}

core/backend/src/main/java/io/dataease/controller/response/datafill/DataFillFormTableDataResponse.java

@@ -0,0 +1,28 @@
+package io.dataease.controller.response.datafill;
+
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DataFillFormTableDataResponse implements Serializable {
+
+    private static final long serialVersionUID = -6463885075511811532L;
+
+    private Object data;
+
+    private List<ExtTableField> fields;
+
+    private long total;
+
+    private long currentPage;
+
+    private long pageSize;
+
+    private String key;
+
+}

core/backend/src/main/java/io/dataease/controller/sys/LicenseController.java

@@ -3,7 +3,7 @@ package io.dataease.controller.sys;
 import io.dataease.commons.license.DefaultLicenseService;
 import io.dataease.commons.license.F2CLicenseResponse;
 import io.dataease.controller.ResultHolder;
-import io.dataease.exception.DataEaseException;
+import io.dataease.plugins.common.exception.DataEaseException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

core/backend/src/main/java/io/dataease/controller/sys/SysLogController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -31,6 +32,7 @@ public class SysLogController {
 
     @I18n
     @ApiOperation("查询日志")
+    @RequiresPermissions("log:read")
     @PostMapping("/logGrid/{goPage}/{pageSize}")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "goPage", value = "页码", required = true, dataType = "Integer"),
@@ -52,7 +54,9 @@ public class SysLogController {
 
     @ApiOperation("导出操作日志")
     @PostMapping("/export")
+    @RequiresPermissions("log:export")
     @ApiImplicitParam(name = "request", value = "查询条件", required = true)
+    @SqlInjectValidator(value = {"time"})
     public void export(@RequestBody LogGridRequest request) throws Exception {
         logService.exportExcel(request);
     }

core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java

@@ -58,7 +58,7 @@ public class SysPluginController {
     @RequiresPermissions("plugin:upload")
     public Map<String, Object> update(@PathVariable("pluginId") Long pluginId, @RequestParam("file") MultipartFile file) throws Exception {
         DeFileUtils.validateFile(file);
-        if (pluginService.uninstall(pluginId)) {
+        if (pluginService.uninstallForUpdate(pluginId, true)) {
             return pluginService.localInstall(file);
         }
         return null;

core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java

@@ -12,23 +12,19 @@ import io.dataease.auth.service.AuthUserService;
 import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.commons.constants.SysLogConstants;
-import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
 import io.dataease.controller.response.ExistLdapUser;
-import io.dataease.controller.sys.request.SysUserCreateRequest;
-import io.dataease.controller.sys.request.SysUserPwdRequest;
-import io.dataease.controller.sys.request.SysUserStateRequest;
-import io.dataease.controller.sys.request.UserGridRequest;
+import io.dataease.controller.sys.request.*;
 import io.dataease.controller.sys.response.AuthBindDTO;
 import io.dataease.controller.sys.response.RoleUserItem;
 import io.dataease.controller.sys.response.SysUserGridResponse;
-import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.base.domain.SysRole;
 import io.dataease.plugins.common.base.domain.SysUser;
 import io.dataease.plugins.common.base.domain.SysUserAssist;
+import io.dataease.plugins.common.exception.DataEaseException;
 import io.dataease.plugins.common.request.KeywordRequest;
 import io.dataease.service.sys.SysRoleService;
 import io.dataease.service.sys.SysUserService;
@@ -70,6 +66,16 @@ public class SysUserController {
     @Resource
     private AuthUserService authUserService;
 
+    @ApiIgnore
+    @GetMapping("/transAccount")
+    public Long transAccount(@RequestBody TransAccountRequest request) {
+        String account = request.getAccount();
+        if (StringUtils.isBlank(account)) {
+            DataEaseException.throwException("account can not be null");
+        }
+        return sysUserService.uidByAccount(account);
+    }
+
     @ApiOperation("查询用户")
     @RequiresPermissions("user:read")
     @PostMapping("/userGrid/{goPage}/{pageSize}")
@@ -182,6 +188,7 @@ public class SysUserController {
     @PostMapping("/personInfo")
     public CurrentUserDto personInfo() {
         CurrentUserDto user = AuthUtils.getUser();
+        user.setPassword(null);
         return user;
     }
 
@@ -289,7 +296,7 @@ public class SysUserController {
 
         Boolean valid = StringUtils.equals(WECOM, type) || StringUtils.equals(DINGTALK, type) || StringUtils.equals(LARK, type) || StringUtils.equals(LARKSUITE, type);
         if (!valid) {
-            DEException.throwException("only [wecom, dingtalk, lark, larksuite] is valid");
+            DataEaseException.throwException("only [wecom, dingtalk, lark, larksuite] is valid");
         }
         Long userId = AuthUtils.getUser().getUserId();
         SysUserAssist sysUserAssist = sysUserService.assistInfo(userId);

core/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java

@@ -4,6 +4,7 @@ package io.dataease.controller.sys;
 import io.dataease.commons.constants.ParamConstants;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.controller.ResultHolder;
+import io.dataease.controller.sys.request.OnlineMapKeyRequest;
 import io.dataease.controller.sys.response.BasicInfo;
 import io.dataease.controller.sys.response.MailInfo;
 import io.dataease.dto.SystemParameterDTO;
@@ -170,4 +171,8 @@ public class SystemParameterController {
         return systemParameterService.onlineMapKey();
     }
 
+    @PostMapping("/saveMapKey")
+    public void saveOnlineKey(@RequestBody OnlineMapKeyRequest request) {
+        systemParameterService.saveMapKey(request.getKey());
+    }
 }

core/backend/src/main/java/io/dataease/controller/sys/request/OnlineMapKeyRequest.java

@@ -0,0 +1,10 @@
+package io.dataease.controller.sys.request;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OnlineMapKeyRequest implements Serializable {
+    public String key;
+}

core/backend/src/main/java/io/dataease/controller/sys/request/TransAccountRequest.java

@@ -0,0 +1,11 @@
+package io.dataease.controller.sys.request;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TransAccountRequest implements Serializable {
+
+    private String account;
+}

core/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java

@@ -15,6 +15,8 @@ public class BasicInfo extends LoginLimitInfo implements Serializable {
     private String msgTimeOut;
     @ApiModelProperty("日志保留时间")
     private String logTimeOut;
+    @ApiModelProperty("数据同步日志保留时间")
+    private String dsSyncLogTimeOut;
     @ApiModelProperty("显示首页")
     private String openHomePage;
     @ApiModelProperty("默认登录方式")

core/backend/src/main/java/io/dataease/dto/DriverDTO.java

@@ -6,4 +6,5 @@ import lombok.Data;
 @Data
 public class DriverDTO extends DeDriver {
     private String typeDesc;
+    private String nameAlias;
 }

core/backend/src/main/java/io/dataease/dto/chart/AxisChartDataAntVDTO.java

@@ -20,4 +20,6 @@ public class AxisChartDataAntVDTO {
     private BigDecimal popSize;
     private String group;
     private BigDecimal extValue;
+
+    private Object x;
 }

core/backend/src/main/java/io/dataease/dto/chart/ChartSeniorThresholdDTO.java

@@ -0,0 +1,16 @@
+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+/**
+ * @Author LBOO
+ */
+@Data
+public class ChartSeniorThresholdDTO {
+    private String field;
+    private String term;
+    private ChartSeniorAssistDTO targetField;
+    private ChartSeniorAssistDTO maxField;
+    private ChartSeniorAssistDTO minField;
+
+}

core/backend/src/main/java/io/dataease/dto/datafill/DataFillCommitLogDTO.java

@@ -0,0 +1,18 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillCommitLog;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataFillCommitLogDTO extends DataFillCommitLog {
+
+    private static final long serialVersionUID = 5324275156717345584L;
+
+    private String commitByName;
+
+
+}

core/backend/src/main/java/io/dataease/dto/datafill/DataFillFormDTO.java

@@ -0,0 +1,26 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs;
+import io.dataease.plugins.common.model.ITreeBase;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataFillFormDTO extends DataFillFormWithBLOBs implements ITreeBase<DataFillFormDTO> {
+
+    private static final long serialVersionUID = 1428065978308162738L;
+
+    @ApiModelProperty("标签")
+    private String label;
+    @ApiModelProperty("子节点")
+    private List<DataFillFormDTO> children;
+    @ApiModelProperty("权限")
+    private String privileges;
+
+    private String creatorName;
+    private String datasourceName;
+
+
+}

core/backend/src/main/java/io/dataease/dto/datafill/DataFillTaskDTO.java

@@ -0,0 +1,20 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataFillTaskDTO extends DataFillTaskWithBLOBs {
+
+    private static final long serialVersionUID = 3610753131867651856L;
+
+    private String formName;
+
+    private String creatorName;
+
+
+}

core/backend/src/main/java/io/dataease/dto/datafill/DataFillUserTaskDTO.java

@@ -0,0 +1,20 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillUserTask;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataFillUserTaskDTO extends DataFillUserTask {
+
+    private static final long serialVersionUID = 3610753131867651856L;
+
+    private String taskName;
+    private String formName;
+    private Long creator;
+    private String creatorName;
+
+}

core/backend/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java

@@ -9,4 +9,5 @@ import java.util.List;
 public class DatasetTableFieldDTO extends DatasetTableField {
     private String jsonPath;
     private List<Object> deTypeCascader;
+    private boolean isKey;
 }

core/backend/src/main/java/io/dataease/dto/dataset/ExcelFileData.java

@@ -1,5 +1,6 @@
 package io.dataease.dto.dataset;
 
+import io.dataease.plugins.common.dto.dataset.ExcelSheetData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

core/backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
+import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,26 +16,27 @@ public class MysqlConfiguration extends JdbcConfiguration {
 
     private String driver = "com.mysql.jdbc.Driver";
     private String extraParams = "characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true&zeroDateTimeBehavior=convertToNull";
-    private List<String> illegalParameters = Arrays.asList("autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations");
+    private List<String> illegalParameters = Arrays.asList("autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations", "allowloadlocalinfile", "allowUrlInLocalInfile", "allowLoadLocalInfileInPath");
 
     public String getJdbc() {
         if (StringUtils.isEmpty(extraParams.trim())) {
-            return "jdbc:mysql://HOSTNAME:PORT/DATABASE"
-                    .replace("HOSTNAME", getHost().trim())
-                    .replace("PORT", getPort().toString().trim())
-                    .replace("DATABASE", getDataBase().trim());
+            return "jdbc:mysql://HOSTNAME:PORT/DATABASE".replace("HOSTNAME", getHost().trim()).replace("PORT", getPort().toString().trim()).replace("DATABASE", getDataBase().trim());
         } else {
-            for (String illegalParameter : illegalParameters) {
-                if (getExtraParams().contains(illegalParameter)) {
+            for (String illegalParameter : getIllegalParameters()) {
+                if (getExtraParams().toLowerCase().contains(illegalParameter.toLowerCase()) || URLDecoder.decode(getExtraParams()).contains(illegalParameter.toLowerCase())) {
                     throw new RuntimeException("Illegal parameter: " + illegalParameter);
                 }
             }
 
-            return "jdbc:mysql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
-                    .replace("HOSTNAME", getHost().trim())
-                    .replace("PORT", getPort().toString().trim())
-                    .replace("DATABASE", getDataBase().trim())
-                    .replace("EXTRA_PARAMS", getExtraParams().trim());
+            return "jdbc:mysql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS".replace("HOSTNAME", getHost().trim()).replace("PORT", getPort().toString().trim()).replace("DATABASE", getDataBase().trim()).replace("EXTRA_PARAMS", getExtraParams().trim());
         }
     }
+
+    public List<String> getIllegalParameters(){
+        List<String> newIllegalParameters = new ArrayList<>();
+        newIllegalParameters.addAll(illegalParameters);
+        newIllegalParameters.addAll(Arrays.asList("allowloadlocalinfile", "allowUrlInLocalInfile", "allowLoadLocalInfileInPath"));
+        return newIllegalParameters;
+    }
+
 }

core/backend/src/main/java/io/dataease/dto/panel/PanelComponentDTO.java

@@ -0,0 +1,26 @@
+package io.dataease.dto.panel;
+
+import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
+import io.dataease.plugins.common.base.domain.DatasetTableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Author: wangjiahao
+ * Date: 2021-03-05
+ * Description:
+ */
+@Data
+public class PanelComponentDTO {
+
+    private String bashComponentData;
+
+    private List<PanelViewTableDTO> panelViewTables;
+
+    public PanelComponentDTO(String bashComponentData, List<PanelViewTableDTO> panelViewTables) {
+        this.bashComponentData = bashComponentData;
+        this.panelViewTables = panelViewTables;
+    }
+}

core/backend/src/main/java/io/dataease/dto/panel/PanelViewTableDTO.java

@@ -17,6 +17,9 @@ public class PanelViewTableDTO extends ChartViewWithBLOBs {
     @ApiModelProperty("仪表板ID")
     private String panelId;
 
+    @ApiModelProperty("仪表板数据")
+    private String basePanelData;
+
     private List<DatasetTableField> tableFields;
 
 

core/backend/src/main/java/io/dataease/dto/panel/link/GenerateDto.java

@@ -16,4 +16,8 @@ public class GenerateDto {
     private String pwd;
     @ApiModelProperty("有效期")
     private Long overTime;
+    @ApiModelProperty("ticket必填")
+    private boolean requireTicket;
+
+
 }

core/backend/src/main/java/io/dataease/dto/panel/link/TicketDto.java

@@ -0,0 +1,15 @@
+package io.dataease.dto.panel.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TicketDto implements Serializable {
+
+    private boolean ticketValid;
+
+    private boolean ticketExp;
+
+    private String args;
+}

core/backend/src/main/java/io/dataease/dto/panel/link/ValidateDto.java

@@ -19,4 +19,6 @@ public class ValidateDto {
     private String resourceId;
     @ApiModelProperty("用户ID")
     private String userId;
+
+    private TicketDto ticket;
 }

core/backend/src/main/java/io/dataease/excel/utils/EasyExcelExporter.java

@@ -4,7 +4,8 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import io.dataease.commons.utils.LogUtil;
-import io.dataease.exception.DataEaseException;
+import io.dataease.plugins.common.exception.DataEaseException;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

core/backend/src/main/java/io/dataease/exception/DataEaseException.java

@@ -1,24 +0,0 @@
-package io.dataease.exception;
-
-public class DataEaseException extends RuntimeException {
-
-    private DataEaseException(String message) {
-        super(message);
-    }
-
-    private DataEaseException(Throwable t) {
-        super(t);
-    }
-
-    public static void throwException(String message) {
-        throw new DataEaseException(message);
-    }
-
-    public static DataEaseException getException(String message) {
-        throw new DataEaseException(message);
-    }
-
-    public static void throwException(Throwable t) {
-        throw new DataEaseException(t);
-    }
-}

core/backend/src/main/java/io/dataease/exception/ExcelException.java

@@ -1,18 +0,0 @@
-package io.dataease.exception;
-
-/**
- * @author jianxing.chen
- */
-public class ExcelException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public ExcelException(String message, Exception e) {
-        super(message, e);
-    }
-
-    public ExcelException(String message) {
-        super(message);
-    }
-
-}

core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml

@@ -66,9 +66,11 @@
             )
         </if>
         ) logInfo
-        <if test="applyTime != null and applyTime.length > 1">
-            and (apply_time between #{applyTime.[0]} and #{applyTime.[1]}
-        </if>
+        <where>
+            <if test="applyTime != null and applyTime.length > 1">
+                and (logInfo.apply_time between #{applyTime.[0]} and #{applyTime.[1]})
+            </if>
+        </where>
 
         <choose>
             <when test="orders!=null and orders.size > 0">

core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.java

@@ -11,8 +11,10 @@ import java.util.List;
 public interface ExtAuthMapper {
 
     List<Long> queryUserIdWithRoleIds(@Param("roleIds") List<Long> roleIds);
+    List<String> queryUserNameWithRoleIds(@Param("roleIds") List<Long> roleIds);
 
     List<Long> queryUserIdWithDeptIds(@Param("deptIds") List<Long> deptIds);
+    List<String> queryUserNameWithDeptIds(@Param("deptIds") List<Long> deptIds);
 
     List<SysAuth> queryByResource(@Param("resourceId") String resourceId);
 

core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.xml

@@ -16,6 +16,16 @@
         </foreach>
     </select>
 
+    <select id="queryUserNameWithRoleIds" resultType="java.lang.String" >
+        select su.username
+        from sys_user su
+        left join sys_users_roles sur on sur.user_id = su.user_id
+        where sur.role_id in
+        <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
+            #{roleId}
+        </foreach>
+    </select>
+
 
     <select id="queryUserIdWithDeptIds" resultType="java.lang.Long" >
         select user_id
@@ -26,6 +36,15 @@
         </foreach>
     </select>
 
+    <select id="queryUserNameWithDeptIds" resultType="java.lang.String" >
+        select username
+        from sys_user
+        where dept_id in
+        <foreach collection="deptIds" item="deptId" open='(' separator=',' close=')'>
+            #{deptId}
+        </foreach>
+    </select>
+
 
     <select id="queryByResource" resultMap="io.dataease.plugins.common.base.mapper.SysAuthMapper.BaseResultMap" >
         select a.*

core/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml

@@ -309,7 +309,8 @@
                                 `is_plugin`,
                                 `senior`,
                                 `data_from`,
-                                `view_fields`)
+                                `view_fields`,
+                                `_aggregate`)
         SELECT #{newChartId},
                GET_CHART_VIEW_COPY_NAME(#{oldChartId}, #{panelId}) as `name`,
                #{panelId},
@@ -338,7 +339,8 @@
                `is_plugin`,
                `senior`,
                `data_from`,
-               `view_fields`
+               `view_fields`,
+               `_aggregate`
         FROM chart_view
         WHERE id = #{oldChartId}
     </insert>
@@ -611,7 +613,7 @@
 
     <delete id="deleteNoUseView">
         delete from chart_view
-        where scene_id = #{panelId}
+        where scene_id = #{panelId} and create_time &lt; ( unix_timestamp()- 30 ) * 1000
         <if test="viewIds != null and viewIds.size() > 0">
             and id not in
             <foreach collection="viewIds" item="viewId" open='(' separator=',' close=')'>

core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.java

@@ -0,0 +1,30 @@
+package io.dataease.ext;
+
+import io.dataease.controller.request.datafill.DataFillFormRequest;
+import io.dataease.controller.request.datafill.DataFillTaskSearchRequest;
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import io.dataease.dto.datafill.DataFillFormDTO;
+import io.dataease.dto.datafill.DataFillTaskDTO;
+import io.dataease.dto.datafill.DataFillUserTaskDTO;
+import io.dataease.plugins.common.base.domain.DataFillTask;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface ExtDataFillFormMapper {
+    List<DataFillFormDTO> search(DataFillFormRequest request);
+
+    Map<String, String> searchChildrenIds(String id, String type);
+
+    List<DataFillCommitLogDTO> selectLatestLogByFormDataIds(String formId, List<String> dataIds);
+
+    List<DataFillCommitLogDTO> selectDataFillLogs(String formId, String commitByName);
+
+    List<DataFillTaskDTO> selectDataFillTasks(DataFillTaskSearchRequest request);
+    List<DataFillTask> selectActiveDataFillTasks();
+
+    List<DataFillUserTaskDTO> listTodoUserTask(long userId, Date current, String taskName);
+    List<DataFillUserTaskDTO> listFinishedUserTask(long userId, String taskName);
+    List<DataFillUserTaskDTO> listExpiredUserTask(long userId, Date current, String taskName);
+}

core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.xml

@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.ext.ExtDataFillFormMapper">
+
+    <resultMap id="BaseResultMapDTO" type="io.dataease.dto.datafill.DataFillFormDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillFormMapper.BaseResultMap">
+        <result column="label" property="label"/>
+        <result column="privileges" property="privileges"/>
+    </resultMap>
+
+
+    <select id="search" resultMap="BaseResultMapDTO">
+        select
+        id, `name`, ifnull(pid, 0) as pid, `level`, node_type, `table_name`, datasource, create_index, create_by,
+        create_time, update_by, update_time,
+        `name` as label,
+        authInfo.privileges as `privileges`
+        from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'data_fill') cids) t, data_fill_form
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'data_fill'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on data_fill_form.id = authInfo.auth_source
+        <where>
+            FIND_IN_SET(data_fill_form.id, cids)
+            <if test="id != null">
+                and data_fill_form.id = #{id,jdbcType=VARCHAR}
+            </if>
+            <if test="name != null and name != ''">
+                and data_fill_form.`name` like CONCAT('%', #{name},'%')
+            </if>
+            <if test="pid != null">
+                and data_fill_form.pid = #{pid,jdbcType=VARCHAR}
+            </if>
+            <if test="nodeType != null">
+                and data_fill_form.node_type = #{nodeType,jdbcType=VARCHAR}
+            </if>
+            <if test="level != null">
+                and data_fill_form.`level` = #{level,jdbcType=INTEGER}
+            </if>
+
+            <if test="createBy != null">
+                and data_fill_form.create_by = #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                and data_fill_form.create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                and data_fill_form.update_by = #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                and data_fill_form.update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+
+
+            <if test="excludedId != null">
+                and data_fill_form.id != #{excludedId,jdbcType=VARCHAR}
+            </if>
+
+            <if test="ids != null and ids.size() > 0">
+                and id in
+                <foreach collection="ids" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY CONVERT(`name` using gbk)
+    </select>
+
+    <select id="searchChildrenIds" resultType="java.util.Map">
+        select GET_V_AUTH_MODEL_WITH_CHILDREN(#{id}, #{type}) ids
+    </select>
+
+
+    <resultMap id="BaseResultMapLogDTO" type="io.dataease.dto.datafill.DataFillCommitLogDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillCommitLogMapper.BaseResultMap">
+        <result column="nick_name" property="commitByName"/>
+    </resultMap>
+
+    <select id="selectDataFillLogs" resultMap="BaseResultMapLogDTO">
+        SELECT t1.id,
+             t1.form_id,
+             t1.data_id,
+             t1.operate,
+             t1.commit_by,
+             t1.commit_time,
+             t2.nick_name
+        FROM (SELECT * FROM data_fill_commit_log
+            WHERE form_id = #{formId} ) t1
+        LEFT JOIN (SELECT username, nick_name FROM sys_user) t2 ON t1.commit_by = t2.username
+        <where>
+        <if test="commitByName != null" >
+           AND t2.nick_name LIKE CONCAT('%',#{commitByName},'%')
+        </if>
+        </where>
+        ORDER BY t1.commit_time DESC
+    </select>
+
+    <select id="selectLatestLogByFormDataIds" resultMap="BaseResultMapLogDTO">
+        SELECT t3.id,
+               t3.form_id,
+               t3.data_id,
+               t3.operate,
+               t3.commit_by,
+               t3.commit_time,
+               t4.nick_name
+        FROM (SELECT t1.id,
+                     t1.form_id,
+                     t1.data_id,
+                     t1.operate,
+                     t1.commit_by,
+                     t1.commit_time
+              FROM (SELECT * FROM data_fill_commit_log
+                    WHERE form_id = #{formId}
+                    <if test="dataIds != null and dataIds.size() > 0">
+                        AND data_id in
+                        <foreach collection="dataIds" item="item" separator="," open="(" close=")">
+                            #{item}
+                        </foreach>
+                    </if>
+                    ) t1
+                       INNER JOIN (SELECT MAX(commit_time) AS commit_time, form_id, data_id
+                                   FROM data_fill_commit_log
+                                   GROUP BY form_id, data_id) t2
+                                  ON t1.form_id = t2.form_id AND t1.commit_time = t2.commit_time AND t1.data_id = t2.data_id) t3
+                 LEFT JOIN (SELECT username, nick_name FROM sys_user) t4 ON t3.commit_by = t4.username
+    </select>
+
+    <resultMap id="BaseResultMapTaskDTO" type="io.dataease.dto.datafill.DataFillTaskDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillTaskMapper.ResultMapWithBLOBs">
+        <result column="formName" property="formName"/>
+        <result column="nick_name" property="creatorName"/>
+    </resultMap>
+
+    <select id="selectDataFillTasks" resultMap="BaseResultMapTaskDTO">
+        SELECT t1.id, t1.`name`, t1.form_id, t1.start_time, t1.end_time, t1.rate_type, t1.rate_val, t1.publish_start_time,
+        t1.publish_end_time, t1.publish_range_time_type, t1.publish_range_time, t1.creator, t1.create_time,
+        t1.`status`,
+        t1.reci_users, t1.role_list, t1.org_list,
+        t2.nick_name, t3.`name` AS formName
+        FROM (SELECT * FROM data_fill_task
+        WHERE form_id = #{formId}
+        <if test="id != null">
+            and `id` = #{id,jdbcType=VARCHAR}
+        </if>
+        <if test="name != null" >
+            AND `name` LIKE CONCAT('%',#{name},'%')
+        </if>
+        ) t1
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t2 ON t1.creator = t2.user_id
+        LEFT JOIN (SELECT name, id FROM data_fill_form) t3 ON t1.form_id = t3.id
+        WHERE 1 = 1
+        ORDER BY t1.create_time DESC
+    </select>
+
+    <select id="selectActiveDataFillTasks" resultMap="io.dataease.plugins.common.base.mapper.DataFillTaskMapper.BaseResultMap">
+        SELECT
+            <include refid="io.dataease.plugins.common.base.mapper.DataFillTaskMapper.Base_Column_List" />
+        FROM data_fill_task
+        WHERE status = 1
+        AND ((rate_type = -1 AND publish_start_time &lt;= current_timestamp AND (publish_end_time is null OR
+        publish_end_time &gt;= current_timestamp))
+        OR
+        (rate_type != -1 AND start_time &lt;= current_timestamp AND (end_time is null OR end_time &gt;=
+        current_timestamp))
+        )
+    </select>
+
+    <resultMap id="BaseResultMapUserTaskDTO" type="io.dataease.dto.datafill.DataFillUserTaskDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.BaseResultMap">
+        <result column="taskName" property="taskName"/>
+        <result column="formName" property="formName"/>
+        <result column="creator" property="creator"/>
+        <result column="creatorName" property="creatorName"/>
+    </resultMap>
+
+    <select id="listTodoUserTask" resultMap="BaseResultMapUserTaskDTO">
+        SELECT
+        t1.id, t1.task_id, t1.form_id, t1.value_id, t1.`user`, t1.start_time, t1.end_time, t1.finish_time,
+        t2.`name` AS formName, t3.`name` AS taskName, t3.`creator`, t4.`nick_name` AS creatorName
+        FROM
+        (SELECT
+            <include refid="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.Base_Column_List" />
+        FROM data_fill_user_task
+        WHERE user = #{userId}
+        AND finish_time IS NULL
+        AND start_time &lt;= #{current} AND (end_time IS NULL OR end_time &gt;= #{current})) t1
+        LEFT JOIN (SELECT id, `name` FROM data_fill_form) t2 ON t1.form_id = t2.id
+        LEFT JOIN (SELECT id, `name`, `creator` FROM data_fill_task) t3 ON t1.task_id = t3.id
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t4 ON t3.creator = t4.user_id
+        <where>
+            <if test="taskName != null" >
+                AND t3.`name` LIKE CONCAT('%',#{taskName},'%')
+            </if>
+        </where>
+        ORDER BY t1.end_time, t1.start_time
+    </select>
+
+    <select id="listFinishedUserTask" resultMap="BaseResultMapUserTaskDTO">
+        SELECT
+        t1.id, t1.task_id, t1.form_id, t1.value_id, t1.`user`, t1.start_time, t1.end_time, t1.finish_time,
+        t2.`name` AS formName, t3.`name` AS taskName, t3.`creator`, t4.`nick_name` AS creatorName
+        FROM
+        (SELECT
+            <include refid="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.Base_Column_List" />
+        FROM data_fill_user_task
+        WHERE user = #{userId}
+        AND finish_time IS NOT NULL) t1
+        LEFT JOIN (SELECT id, `name` FROM data_fill_form) t2 ON t1.form_id = t2.id
+        LEFT JOIN (SELECT id, `name`, `creator` FROM data_fill_task) t3 ON t1.task_id = t3.id
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t4 ON t3.creator = t4.user_id
+        <where>
+            <if test="taskName != null" >
+                AND t3.`name` LIKE CONCAT('%',#{taskName},'%')
+            </if>
+        </where>
+        ORDER BY t1.finish_time DESC, t1.end_time DESC, t1.start_time
+    </select>
+
+    <select id="listExpiredUserTask" resultMap="BaseResultMapUserTaskDTO">
+        SELECT
+        t1.id, t1.task_id, t1.form_id, t1.value_id, t1.`user`, t1.start_time, t1.end_time, t1.finish_time,
+        t2.`name` AS formName, t3.`name` AS taskName, t3.`creator`, t4.`nick_name` AS creatorName
+        FROM
+        (SELECT
+        <include refid="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.Base_Column_List" />
+        FROM data_fill_user_task
+        WHERE user = #{userId}
+        AND end_time &lt;= #{current}) t1
+        LEFT JOIN (SELECT id, `name` FROM data_fill_form) t2 ON t1.form_id = t2.id
+        LEFT JOIN (SELECT id, `name`, `creator` FROM data_fill_task) t3 ON t1.task_id = t3.id
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t4 ON t3.creator = t4.user_id
+        <where>
+            <if test="taskName != null" >
+                AND t3.`name` LIKE CONCAT('%',#{taskName},'%')
+            </if>
+        </where>
+        ORDER BY t1.end_time DESC, t1.start_time
+    </select>
+
+</mapper>