From 6ef72febbf29497d2e8feafc93d7a5d4d5e18a3e Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Mon, 11 Dec 2023 10:23:45 +0800
Subject: [PATCH 01/46] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E7=A0=81=E6=A8=A1=E5=BC=8F=E4=B8=A2=E5=A4=B1=20userna?=
 =?UTF-8?q?me=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-auth/src/main/resources/templates/ftl/login.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pigx-auth/src/main/resources/templates/ftl/login.ftl b/pigx-auth/src/main/resources/templates/ftl/login.ftl
index 581643602..cd91c949a 100755
--- a/pigx-auth/src/main/resources/templates/ftl/login.ftl
+++ b/pigx-auth/src/main/resources/templates/ftl/login.ftl
@@ -24,14 +24,14 @@
                 </#if>
 			</div>
 			<div class="mb-4 relative">
-				<input id="username" required
+				<input id="username" required name="username"
 				       class="w-full rounded px-3 border border-gray-500 pt-5 pb-2 focus:outline-none input active:outline-none"
 				       type="text" autofocus>
 				<label for="username"
 				       class="label absolute mb-0 -mt-2 pl-3 leading-tighter text-gray-500 text-base mt-2 cursor-text">账号</label>
 			</div>
 			<div class="relative flex items-center border border-gray-500 focus:ring focus:border-blue-500 rounded">
-				<input id="password" required
+				<input id="password" required name="password"
 				       class="w-full rounded px-3 pt-5 outline-none pb-2 focus:outline-none active:outline-none input active:border-blue-500"
 				       type="password"/>
 				<label for="password"

From d15832c78453e8c021b4b579f5ce2982203d1e46 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 12 Dec 2023 12:30:37 +0800
Subject: [PATCH 02/46] :recycle: Refactoring code. sql server durid

---
 .../pigx/common/data/mybatis/DruidSqlLogFilter.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java
index f1825b556..1dd957acb 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java
@@ -23,12 +23,12 @@ import com.alibaba.druid.DbType;
 import com.alibaba.druid.filter.FilterChain;
 import com.alibaba.druid.filter.FilterEventAdapter;
 import com.alibaba.druid.proxy.jdbc.JdbcParameter;
-import com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl;
 import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
 import com.alibaba.druid.proxy.jdbc.StatementProxy;
 import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor;
 import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
 import com.alibaba.druid.stat.TableStat;
 import com.alibaba.druid.util.StringUtils;
@@ -36,7 +36,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Import;
 
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
@@ -195,7 +194,14 @@ public class DruidSqlLogFilter extends FilterEventAdapter {
 		List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, dbType);
 		for (SQLStatement stmt : stmtList) {
 			// 也可以用更精确的解析器，如MySqlSchemaStatVisitor
-			SchemaStatVisitor visitor = new SchemaStatVisitor();
+			SchemaStatVisitor visitor;
+			// SQL server 数据库特殊处理
+			if (DbType.sqlserver.name().equalsIgnoreCase(dbType)) {
+				visitor = new SQLServerSchemaStatVisitor();
+			}
+			else {
+				visitor = new SchemaStatVisitor();
+			}
 			stmt.accept(visitor);
 			Map<TableStat.Name, TableStat> tables = visitor.getTables();
 			for (TableStat.Name name : tables.keySet()) {

From 5a8e4b72b11013f71db78f61241edbfccde0eac1 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 12 Dec 2023 18:35:01 +0800
Subject: [PATCH 03/46] :sparkles: Introducing new features. support sse

---
 pigx-common/pigx-common-bom/pom.xml           |  5 ++
 pigx-common/pigx-common-sse/pom.xml           | 33 +++++++++
 .../LocalMessageDistributorConfiguration.java | 30 ++++++++
 .../MessageDistributorTypeConstants.java      | 26 +++++++
 .../RedisMessageDistributorConfiguration.java | 69 +++++++++++++++++++
 .../config/SseEmitterAutoConfiguration.java   | 21 ++++++
 .../common/sse/config/SseEmitterEndpoint.java | 45 ++++++++++++
 .../sse/config/SseEmitterMessageSender.java   | 59 ++++++++++++++++
 .../sse/config/SseEmitterProperties.java      | 28 ++++++++
 .../distribute/LocalMessageDistributor.java   | 20 ++++++
 .../pigx/common/sse/distribute/MessageDO.java | 39 +++++++++++
 .../sse/distribute/MessageDistributor.java    | 17 +++++
 .../common/sse/distribute/MessageSender.java  | 34 +++++++++
 .../distribute/RedisMessageDistributor.java   | 35 ++++++++++
 .../RedisSseEmitterMessageListener.java       | 41 +++++++++++
 .../common/sse/holder/SseEmitterHolder.java   | 65 +++++++++++++++++
 ...ot.autoconfigure.AutoConfiguration.imports |  3 +
 pigx-common/pom.xml                           |  1 +
 18 files changed, 571 insertions(+)
 create mode 100755 pigx-common/pigx-common-sse/pom.xml
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/LocalMessageDistributorConfiguration.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/MessageDistributorTypeConstants.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/RedisMessageDistributorConfiguration.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterAutoConfiguration.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterEndpoint.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterProperties.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/LocalMessageDistributor.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDO.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDistributor.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageSender.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisSseEmitterMessageListener.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/holder/SseEmitterHolder.java
 create mode 100644 pigx-common/pigx-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 2d8d2be11..a1a3622be 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -139,6 +139,11 @@
                 <artifactId>pigx-common-xss</artifactId>
                 <version>${pigx.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.pig4cloud</groupId>
+                <artifactId>pigx-common-sse</artifactId>
+                <version>${pigx.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pigx-common-websocket</artifactId>
diff --git a/pigx-common/pigx-common-sse/pom.xml b/pigx-common/pigx-common-sse/pom.xml
new file mode 100755
index 000000000..3cb211e24
--- /dev/null
+++ b/pigx-common/pigx-common-sse/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.pig4cloud</groupId>
+		<artifactId>pigx-common</artifactId>
+		<version>5.3.0</version>
+	</parent>
+
+	<artifactId>pigx-common-sse</artifactId>
+	<packaging>jar</packaging>
+
+	<description>pigx sse 服务端推送</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-redis</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-json</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-security</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/LocalMessageDistributorConfiguration.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/LocalMessageDistributorConfiguration.java
new file mode 100644
index 000000000..0d30ad835
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/LocalMessageDistributorConfiguration.java
@@ -0,0 +1,30 @@
+package com.pig4cloud.pigx.common.sse.config;
+
+import com.pig4cloud.pigx.common.sse.distribute.LocalMessageDistributor;
+import com.pig4cloud.pigx.common.sse.distribute.MessageDistributor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 本地的消息分发器配置
+ *
+ * @author lengleng
+ */
+@ConditionalOnProperty(prefix = SseEmitterProperties.PREFIX, name = "message-distributor",
+		havingValue = MessageDistributorTypeConstants.LOCAL)
+@Configuration(proxyBeanMethods = false)
+public class LocalMessageDistributorConfiguration {
+
+	/**
+	 * 本地基于内存的消息分发，不支持集群
+	 * @return LocalMessageDistributor
+	 */
+	@Bean
+	@ConditionalOnMissingBean(MessageDistributor.class)
+	public LocalMessageDistributor messageDistributor() {
+		return new LocalMessageDistributor();
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/MessageDistributorTypeConstants.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/MessageDistributorTypeConstants.java
new file mode 100644
index 000000000..6ae8cee0b
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/MessageDistributorTypeConstants.java
@@ -0,0 +1,26 @@
+package com.pig4cloud.pigx.common.sse.config;
+
+/**
+ * @author lengleng
+ */
+public final class MessageDistributorTypeConstants {
+
+	private MessageDistributorTypeConstants() {
+	}
+
+	/**
+	 * 本地
+	 */
+	public static final String LOCAL = "local";
+
+	/**
+	 * 基于 Redis PUB/SUB
+	 */
+	public static final String REDIS = "redis";
+
+	/**
+	 * 自定义
+	 */
+	public static final String CUSTOM = "custom";
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/RedisMessageDistributorConfiguration.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/RedisMessageDistributorConfiguration.java
new file mode 100644
index 000000000..72010638d
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/RedisMessageDistributorConfiguration.java
@@ -0,0 +1,69 @@
+package com.pig4cloud.pigx.common.sse.config;
+
+import com.pig4cloud.pigx.common.sse.distribute.MessageDistributor;
+import com.pig4cloud.pigx.common.sse.distribute.RedisMessageDistributor;
+import com.pig4cloud.pigx.common.sse.distribute.RedisSseEmitterMessageListener;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+
+/**
+ * 基于 Redis Pub/Sub 的消息分发器
+ *
+ * @author lengleng
+ */
+@ConditionalOnClass(StringRedisTemplate.class)
+@ConditionalOnProperty(prefix = SseEmitterProperties.PREFIX, name = "message-distributor",
+		havingValue = MessageDistributorTypeConstants.REDIS, matchIfMissing = true)
+@Configuration(proxyBeanMethods = false)
+public class RedisMessageDistributorConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean(MessageDistributor.class)
+	public RedisMessageDistributor messageDistributor(StringRedisTemplate stringRedisTemplate) {
+		return new RedisMessageDistributor(stringRedisTemplate);
+	}
+
+	@Bean
+	@ConditionalOnBean(RedisMessageDistributor.class)
+	@ConditionalOnMissingBean
+	public RedisSseEmitterMessageListener redisWebsocketMessageListener(StringRedisTemplate stringRedisTemplate) {
+		return new RedisSseEmitterMessageListener(stringRedisTemplate);
+	}
+
+	@Bean
+	@ConditionalOnBean(RedisMessageDistributor.class)
+	@ConditionalOnMissingBean
+	public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory connectionFactory) {
+		RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+		container.setConnectionFactory(connectionFactory);
+		return container;
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnMissingBean(MessageDistributor.class)
+	@RequiredArgsConstructor
+	static class RedisMessageListenerRegisterConfiguration {
+
+		private final RedisMessageListenerContainer redisMessageListenerContainer;
+
+		private final RedisSseEmitterMessageListener redisWebsocketMessageListener;
+
+		@PostConstruct
+		public void addMessageListener() {
+			redisMessageListenerContainer.addMessageListener(redisWebsocketMessageListener,
+					new PatternTopic(RedisSseEmitterMessageListener.CHANNEL));
+		}
+
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterAutoConfiguration.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterAutoConfiguration.java
new file mode 100644
index 000000000..c2fa9cdec
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterAutoConfiguration.java
@@ -0,0 +1,21 @@
+package com.pig4cloud.pigx.common.sse.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * websocket自动配置
+ *
+ * @author Yakir
+ */
+@EnableConfigurationProperties(SseEmitterProperties.class)
+public class SseEmitterAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public SseEmitterEndpoint sseEmitterEndpoint() {
+		return new SseEmitterEndpoint();
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterEndpoint.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterEndpoint.java
new file mode 100644
index 000000000..b39693c6c
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterEndpoint.java
@@ -0,0 +1,45 @@
+package com.pig4cloud.pigx.common.sse.config;
+
+import com.pig4cloud.pigx.common.security.util.SecurityUtils;
+import com.pig4cloud.pigx.common.sse.holder.SseEmitterHolder;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.util.Objects;
+
+/**
+ * @author lengleng
+ * @date 2023/12/11
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/sse")
+public class SseEmitterEndpoint {
+
+    @RequestMapping("/info")
+    public SseEmitter info() {
+        SseEmitter sseEmitter = new SseEmitter(0L);
+
+        if (Objects.isNull(SecurityUtils.getUser())) {
+            log.debug("MSG: SseConnectError");
+            return null;
+        }
+        log.info("MSG: SseConnect | EmitterHash: {} | ID: {}", sseEmitter.hashCode(), SecurityUtils.getUser().getId());
+        sseEmitter.onCompletion(() -> {
+            log.info("MSG: SseConnectCompletion | EmitterHash: {} |ID: {}", sseEmitter.hashCode(), SecurityUtils.getUser().getId());
+        });
+        sseEmitter.onTimeout(() -> {
+            log.error("MSG: SseConnectTimeout | EmitterHash: {} |ID: {} ", sseEmitter.hashCode(), SecurityUtils.getUser().getId());
+        });
+        sseEmitter.onError(t -> {
+            log.error("MSG: SseConnectError | EmitterHash: {} |ID: {}", sseEmitter.hashCode(), SecurityUtils.getUser().getId());
+        });
+        SseEmitterHolder.addSseEmitter(SecurityUtils.getUser().getId(), sseEmitter);
+        return sseEmitter;
+    }
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java
new file mode 100644
index 000000000..c3a4b5922
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java
@@ -0,0 +1,59 @@
+package com.pig4cloud.pigx.common.sse.config;
+
+import cn.hutool.core.util.ReflectUtil;
+import com.pig4cloud.pigx.common.sse.holder.SseEmitterHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.util.Collection;
+
+/**
+ * @author lengleng 2021/1/4
+ * @version 1.0
+ */
+@Slf4j
+public class SseEmitterMessageSender {
+
+	public static void broadcast(String message) {
+		Collection<SseEmitter> sseEmitters = SseEmitterHolder.getSseEmitters();
+		for (SseEmitter sseEmitter : sseEmitters) {
+			send(sseEmitter, message);
+		}
+	}
+
+	public static boolean send(Object sseEmitterKey, String message) {
+		SseEmitter sseEmitter = SseEmitterHolder.getSseEmitter(sseEmitterKey);
+		if (sseEmitter == null) {
+			log.info("[send] 当前 sseEmitterKey：{} 对应 sseEmitter 不在本服务中", sseEmitterKey);
+			return false;
+		}
+		else {
+			return send(sseEmitter, message);
+		}
+	}
+
+	public static boolean send(SseEmitter sseEmitter, String message) {
+		if (sseEmitter == null) {
+			log.error("[send] sseEmitter 为 null");
+			return false;
+		}
+
+		Object sendFailed = ReflectUtil.getFieldValue(sseEmitter, "sendFailed");
+		if ((boolean) sendFailed) {
+			log.error("[send] sseEmitter 已经关闭");
+			SseEmitterHolder.removeSseEmitter(sseEmitter);
+			return false;
+		}
+		try {
+			sseEmitter.send(message);
+		}
+		catch (IOException e) {
+			log.error("[send] sseEmitter({}) 发送消息({}) 异常", sseEmitter, message, e);
+			SseEmitterHolder.removeSseEmitter(sseEmitter);
+			return false;
+		}
+		return true;
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterProperties.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterProperties.java
new file mode 100644
index 000000000..238969416
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterProperties.java
@@ -0,0 +1,28 @@
+package com.pig4cloud.pigx.common.sse.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * websocket props
+ *
+ * @author Yakir
+ */
+@Data
+@ConfigurationProperties(SseEmitterProperties.PREFIX)
+public class SseEmitterProperties {
+
+	public static final String PREFIX = "pigx.sse";
+
+	/**
+	 * 路径: 无参: /ws 有参: PathVariable: 单参: /ws/{test} 多参: /ws/{test1}/{test2} query:
+	 * /ws?uid=1&name=test
+	 */
+	private String path = "/sse/info";
+
+	/**
+	 * 消息分发器：local | redis，默认 local, 如果自定义的话，可以配置为其他任意值
+	 */
+	private String messageDistributor = MessageDistributorTypeConstants.LOCAL;
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/LocalMessageDistributor.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/LocalMessageDistributor.java
new file mode 100644
index 000000000..9a7d92867
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/LocalMessageDistributor.java
@@ -0,0 +1,20 @@
+package com.pig4cloud.pigx.common.sse.distribute;
+
+/**
+ * 本地消息分发，直接进行发送
+ *
+ * @author lengleng 2021/1/12
+ * @version 1.0
+ */
+public class LocalMessageDistributor implements MessageDistributor, MessageSender {
+
+	/**
+	 * 消息分发
+	 * @param messageDO 发送的消息
+	 */
+	@Override
+	public void distribute(MessageDO messageDO) {
+		doSend(messageDO);
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDO.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDO.java
new file mode 100644
index 000000000..e1fd87688
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDO.java
@@ -0,0 +1,39 @@
+package com.pig4cloud.pigx.common.sse.distribute;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author lengleng 2021/1/12
+ * @version 1.0
+ */
+@Data
+@Accessors(chain = true)
+public class MessageDO {
+
+	/**
+	 * 是否广播
+	 */
+	private Boolean needBroadcast;
+
+	/**
+	 * sessionKeys
+	 */
+	private List<Object> sessionKeys;
+
+	/**
+	 * 需要发送的消息文本
+	 */
+	private String messageText;
+
+	/**
+	 * 构建需要广播的message
+	 * @author lingting 2021-03-25 17:28
+	 */
+	public static MessageDO broadcastMessage(String text) {
+		return new MessageDO().setMessageText(text).setNeedBroadcast(true);
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDistributor.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDistributor.java
new file mode 100644
index 000000000..a9f4981f5
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageDistributor.java
@@ -0,0 +1,17 @@
+package com.pig4cloud.pigx.common.sse.distribute;
+
+/**
+ * 消息分发器
+ *
+ * @author lengleng 2021/1/12
+ * @version 1.0
+ */
+public interface MessageDistributor {
+
+	/**
+	 * 消息分发
+	 * @param messageDO 发送的消息
+	 */
+	void distribute(MessageDO messageDO);
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageSender.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageSender.java
new file mode 100644
index 000000000..728f6f50e
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/MessageSender.java
@@ -0,0 +1,34 @@
+package com.pig4cloud.pigx.common.sse.distribute;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.pig4cloud.pigx.common.sse.config.SseEmitterMessageSender;
+
+import java.util.List;
+
+/**
+ * @author lengleng 2021/1/12
+ * @version 1.0
+ */
+public interface MessageSender {
+
+	/**
+	 * 发送消息
+	 * @param messageDO 发送的消息
+	 */
+	default void doSend(MessageDO messageDO) {
+		Boolean needBroadcast = messageDO.getNeedBroadcast();
+		String messageText = messageDO.getMessageText();
+		List<Object> sessionKeys = messageDO.getSessionKeys();
+		if (needBroadcast != null && needBroadcast) {
+			// 广播信息
+			SseEmitterMessageSender.broadcast(messageText);
+		}
+		else if (CollectionUtil.isNotEmpty(sessionKeys)) {
+			// 指定用户发送
+			for (Object sessionKey : sessionKeys) {
+				SseEmitterMessageSender.send(sessionKey, messageText);
+			}
+		}
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java
new file mode 100644
index 000000000..4e23f3743
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java
@@ -0,0 +1,35 @@
+package com.pig4cloud.pigx.common.sse.distribute;
+
+import cn.hutool.json.JSONUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 消息分发器
+ *
+ * @author lengleng 2021/1/12
+ * @version 1.0
+ */
+@RequiredArgsConstructor
+public class RedisMessageDistributor implements MessageDistributor {
+
+	private final StringRedisTemplate stringRedisTemplate;
+
+	/**
+	 * 消息分发
+	 * @param messageDO 发送的消息
+	 */
+	@Override
+	public void distribute(MessageDO messageDO) {
+		// 包装 sessionKey 适配分布式多环境
+		List<Object> sessionKeyList = new ArrayList<>(messageDO.getSessionKeys());
+		messageDO.setSessionKeys(sessionKeyList);
+
+		String str = JSONUtil.toJsonStr(messageDO);
+		stringRedisTemplate.convertAndSend(RedisSseEmitterMessageListener.CHANNEL, str);
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisSseEmitterMessageListener.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisSseEmitterMessageListener.java
new file mode 100644
index 000000000..1da768434
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisSseEmitterMessageListener.java
@@ -0,0 +1,41 @@
+package com.pig4cloud.pigx.common.sse.distribute;
+
+import cn.hutool.json.JSONUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializer;
+
+/**
+ * redis订阅 websocket 发送消息，接收到消息时进行推送
+ *
+ * @author lengleng 2021/1/12
+ * @version 1.0
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class RedisSseEmitterMessageListener implements MessageListener, MessageSender {
+
+	public static final String CHANNEL = "sse-send";
+
+	private final StringRedisTemplate stringRedisTemplate;
+
+	@Override
+	public void onMessage(Message message, byte[] bytes) {
+		log.info("redis channel Listener message send {}", message);
+		byte[] channelBytes = message.getChannel();
+		RedisSerializer<String> stringSerializer = stringRedisTemplate.getStringSerializer();
+		String channel = stringSerializer.deserialize(channelBytes);
+
+		// 这里没有使用通配符，所以一定是true
+		if (CHANNEL.equals(channel)) {
+			byte[] bodyBytes = message.getBody();
+			String body = stringSerializer.deserialize(bodyBytes);
+			MessageDO messageDO = JSONUtil.toBean(body, MessageDO.class);
+			doSend(messageDO);
+		}
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/holder/SseEmitterHolder.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/holder/SseEmitterHolder.java
new file mode 100644
index 000000000..67f9c32fc
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/holder/SseEmitterHolder.java
@@ -0,0 +1,65 @@
+package com.pig4cloud.pigx.common.sse.holder;
+
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * SseEmitter 持有者 主要用于保存当前所有在线的会话信息
+ *
+ * @author lengleng 2021/1/4
+ * @version 1.0
+ */
+public final class SseEmitterHolder {
+
+	private SseEmitterHolder() {
+	}
+
+	private static final Map<String, SseEmitter> USER_SSE_EMITTER_MAP = new ConcurrentHashMap<>();
+
+	/**
+	 * 添加一个 sseEmitter
+	 * @param sseEmitterKey sseEmitter 唯一标识
+	 * @param sseEmitter 待添加的 SseEmitter
+	 */
+	public static void addSseEmitter(Object sseEmitterKey, SseEmitter sseEmitter) {
+		USER_SSE_EMITTER_MAP.put(sseEmitterKey.toString(), sseEmitter);
+	}
+
+	/**
+	 * 删除一个 sseEmitter
+	 * @param sseEmitterKey sseEmitter唯一标识
+	 */
+	public static void removeSseEmitter(Object sseEmitterKey) {
+		USER_SSE_EMITTER_MAP.remove(sseEmitterKey.toString());
+	}
+
+	/**
+	 * 获取指定标识的 sseEmitter
+	 * @param sseEmitterKey sseEmitter唯一标识
+	 * @return SseEmitter 该标识对应的 sseEmitter
+	 */
+	public static SseEmitter getSseEmitter(Object sseEmitterKey) {
+		return USER_SSE_EMITTER_MAP.get(sseEmitterKey.toString());
+	}
+
+	/**
+	 * 获取当前所有在线的 sseEmitter
+	 * @return Collection<SseEmitter> sseEmitter集合
+	 */
+	public static Collection<SseEmitter> getSseEmitters() {
+		return USER_SSE_EMITTER_MAP.values();
+	}
+
+	/**
+	 * 获取所有在线的用户标识
+	 * @return Set<Object> sseEmitter唯一标识集合
+	 */
+	public static Set<String> getSseEmitterKeys() {
+		return USER_SSE_EMITTER_MAP.keySet();
+	}
+
+}
diff --git a/pigx-common/pigx-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pigx-common/pigx-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..51b0b7f81
--- /dev/null
+++ b/pigx-common/pigx-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+com.pig4cloud.pigx.common.sse.config.SseEmitterAutoConfiguration
+com.pig4cloud.pigx.common.sse.config.RedisMessageDistributorConfiguration
+com.pig4cloud.pigx.common.sse.config.LocalMessageDistributorConfiguration
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index ec3e296f1..809766cd0 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -52,6 +52,7 @@
 		<module>pigx-common-sentinel</module>
 		<module>pigx-common-sequence</module>
 		<module>pigx-common-swagger</module>
+		<module>pigx-common-sse</module>
 		<module>pigx-common-websocket</module>
 		<module>pigx-common-xss</module>
 	</modules>

From ad37fb25bbc5d9fbf1f730efa6b418482f3a0d11 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 14 Dec 2023 18:01:26 +0800
Subject: [PATCH 04/46] =?UTF-8?q?:wrench:=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 pigx-visual/pigx-codegen/src/main/resources/application-dev.yml

diff --git a/pigx-visual/pigx-codegen/src/main/resources/application-dev.yml b/pigx-visual/pigx-codegen/src/main/resources/application-dev.yml
deleted file mode 100644
index 550751e58..000000000
--- a/pigx-visual/pigx-codegen/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# 数据源
-spring:
-  redis:
-    host: pigx-redis
-    database: 9  #避免和微服务 PIGX 冲突
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      username: root
-      password: root
-      url: jdbc:mysql://pigx-mysql:3306/pigxx_boot_codegen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
-  web:
-    resources:
-      static-locations: classpath:/static/,classpath:/views/
-
-# 租户表维护
-pigx:
-  tenant:
-    column: tenant_id
-    tables:
-      - gen_datasource_conf
-      - gen_form_conf
-      - gen_template
-      - gen_group

From c424c5aa8f505be9819131e23903bab2cabdbb47 Mon Sep 17 00:00:00 2001
From: wangzj <wangzj@yuanian.com>
Date: Sat, 16 Dec 2023 16:42:08 +0800
Subject: [PATCH 05/46] =?UTF-8?q?=E8=A7=A3=E5=86=B3docker=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/Dockerfile                                              | 1 +
 pigx-app-server/pigx-app-server-biz/Dockerfile             | 1 +
 pigx-auth/Dockerfile                                       | 1 +
 pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/Dockerfile | 1 +
 pigx-flow/pigx-flow-task/pigx-flow-task-biz/Dockerfile     | 1 +
 pigx-gateway/Dockerfile                                    | 1 +
 pigx-register/Dockerfile                                   | 3 ++-
 pigx-upms/pigx-upms-biz/Dockerfile                         | 1 +
 pigx-visual/pigx-codegen/Dockerfile                        | 1 +
 pigx-visual/pigx-daemon-elastic-job/Dockerfile             | 1 +
 pigx-visual/pigx-daemon-quartz/Dockerfile                  | 1 +
 pigx-visual/pigx-jimu-platform/Dockerfile                  | 1 +
 pigx-visual/pigx-monitor/Dockerfile                        | 1 +
 pigx-visual/pigx-mp-platform/Dockerfile                    | 1 +
 pigx-visual/pigx-pay-platform/Dockerfile                   | 1 +
 pigx-visual/pigx-report-platform/Dockerfile                | 1 +
 pigx-visual/pigx-xxl-job-admin/Dockerfile                  | 1 +
 17 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/db/Dockerfile b/db/Dockerfile
index 3e29b3107..3801fad51 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -3,6 +3,7 @@ FROM mysql/mysql-server:8.0.33
 MAINTAINER lengleng(wangiegie@gmail.com)
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
diff --git a/pigx-app-server/pigx-app-server-biz/Dockerfile b/pigx-app-server/pigx-app-server-biz/Dockerfile
index eb36b5700..fd840ef00 100644
--- a/pigx-app-server/pigx-app-server-biz/Dockerfile
+++ b/pigx-app-server/pigx-app-server-biz/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms512m -Xmx1024m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-auth/Dockerfile b/pigx-auth/Dockerfile
index c65a91d8a..a799632fc 100644
--- a/pigx-auth/Dockerfile
+++ b/pigx-auth/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/Dockerfile b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/Dockerfile
index cf6af7f84..2bc16452f 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/Dockerfile
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms512m -Xmx1024m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/Dockerfile b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/Dockerfile
index cddef461a..f8ab636ab 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/Dockerfile
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms512m -Xmx1024m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-gateway/Dockerfile b/pigx-gateway/Dockerfile
index 8fa5584be..d9d89a4eb 100644
--- a/pigx-gateway/Dockerfile
+++ b/pigx-gateway/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-register/Dockerfile b/pigx-register/Dockerfile
index a6aff33c8..474b83ed3 100755
--- a/pigx-register/Dockerfile
+++ b/pigx-register/Dockerfile
@@ -10,6 +10,7 @@ COPY ${JAR_FILE} app.jar
 
 EXPOSE 8848
 
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8 JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 CMD sleep 30; java $JAVA_OPTS -jar app.jar
diff --git a/pigx-upms/pigx-upms-biz/Dockerfile b/pigx-upms/pigx-upms-biz/Dockerfile
index 33e9b0566..6f04cb53c 100644
--- a/pigx-upms/pigx-upms-biz/Dockerfile
+++ b/pigx-upms/pigx-upms-biz/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms512m -Xmx1024m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-codegen/Dockerfile b/pigx-visual/pigx-codegen/Dockerfile
index fa10cd524..0b5496475 100644
--- a/pigx-visual/pigx-codegen/Dockerfile
+++ b/pigx-visual/pigx-codegen/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-daemon-elastic-job/Dockerfile b/pigx-visual/pigx-daemon-elastic-job/Dockerfile
index a5711555d..9502ab6ee 100644
--- a/pigx-visual/pigx-daemon-elastic-job/Dockerfile
+++ b/pigx-visual/pigx-daemon-elastic-job/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-daemon-quartz/Dockerfile b/pigx-visual/pigx-daemon-quartz/Dockerfile
index 66a2abfef..c33d5443f 100644
--- a/pigx-visual/pigx-daemon-quartz/Dockerfile
+++ b/pigx-visual/pigx-daemon-quartz/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-jimu-platform/Dockerfile b/pigx-visual/pigx-jimu-platform/Dockerfile
index 3a6260718..a14b9a7e3 100644
--- a/pigx-visual/pigx-jimu-platform/Dockerfile
+++ b/pigx-visual/pigx-jimu-platform/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-monitor/Dockerfile b/pigx-visual/pigx-monitor/Dockerfile
index 3a9a8c2c6..ddce8334f 100644
--- a/pigx-visual/pigx-monitor/Dockerfile
+++ b/pigx-visual/pigx-monitor/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-mp-platform/Dockerfile b/pigx-visual/pigx-mp-platform/Dockerfile
index b3a638daa..a3affee03 100644
--- a/pigx-visual/pigx-mp-platform/Dockerfile
+++ b/pigx-visual/pigx-mp-platform/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-pay-platform/Dockerfile b/pigx-visual/pigx-pay-platform/Dockerfile
index c8611e7a7..2ff46fa50 100644
--- a/pigx-visual/pigx-pay-platform/Dockerfile
+++ b/pigx-visual/pigx-pay-platform/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-report-platform/Dockerfile b/pigx-visual/pigx-report-platform/Dockerfile
index 9e3330996..b49e328aa 100644
--- a/pigx-visual/pigx-report-platform/Dockerfile
+++ b/pigx-visual/pigx-report-platform/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/pigx-visual/pigx-xxl-job-admin/Dockerfile b/pigx-visual/pigx-xxl-job-admin/Dockerfile
index ce52cbda0..a963f014b 100755
--- a/pigx-visual/pigx-xxl-job-admin/Dockerfile
+++ b/pigx-visual/pigx-xxl-job-admin/Dockerfile
@@ -3,6 +3,7 @@ FROM alibabadragonwell/dragonwell:17-anolis
 MAINTAINER wangiegie@gmail.com
 
 ENV TZ=Asia/Shanghai
+ENV LANG C.UTF-8
 ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

From 2b7b6a744cc5279589a24f2db379f615e7ee39be Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 27 Dec 2023 09:11:56 +0800
Subject: [PATCH 06/46] =?UTF-8?q?:fire:=20=E5=88=A0=E9=99=A4flowable=20eng?=
 =?UTF-8?q?ine=20OpenAPI=20=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pig4cloud/pigx/flow/engine/PigxFlowEngineApplication.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/PigxFlowEngineApplication.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/PigxFlowEngineApplication.java
index fef1590f2..a38349109 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/PigxFlowEngineApplication.java
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/PigxFlowEngineApplication.java
@@ -2,7 +2,6 @@ package com.pig4cloud.pigx.flow.engine;
 
 import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
-import com.pig4cloud.pigx.common.swagger.annotation.EnableOpenApi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -12,7 +11,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  * <p>
  * 项目启动类
  */
-@EnableOpenApi("engine")
 @EnablePigxFeignClients
 @EnableDiscoveryClient
 @EnablePigxResourceServer

From 54b93d1c661f41bc41178caa72fd0156a94bca23 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 5 Jan 2024 12:45:07 +0800
Subject: [PATCH 07/46] :arrow_up: spring-boot-admin 3.2.0 fix miss
 external-view style

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

diff --git a/pom.xml b/pom.xml
index ce77bba06..c930fa671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <spring-boot-admin.version>3.1.8</spring-boot-admin.version>
+        <spring-boot-admin.version>3.2.0</spring-boot-admin.version>
         <spring.authorization.version>1.2.0</spring.authorization.version>
         <maven.compiler.version>3.8.1</maven.compiler.version>
         <spring.checkstyle.version>0.0.39</spring.checkstyle.version>

From db60afa59211e816ab0580ddd2e21705447277f6 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 14 Jan 2024 10:44:54 +0800
Subject: [PATCH 08/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20?=
 =?UTF-8?q?=E7=A7=AF=E6=9C=A8token=20=E5=81=A5=E5=A3=AE=E6=80=A7=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pig4cloud/pigx/bi/config/JimuReportTokenService.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java b/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java
index 49c9fb673..6cf6645c7 100644
--- a/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java
+++ b/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java
@@ -12,7 +12,6 @@ import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -56,8 +55,9 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
 	@Override
 	public Boolean verifyToken(String token) {
 		// 分割出 PIGX 的租户信息
-		List<String> splitList = StrUtil.split(token, CharUtil.UNDERLINE);
-		R<Map<String, Object>> result = tokenService.queryToken(splitList.get(1), splitList.get(0) , SecurityConstants.FROM_IN);
+		String tenant = StrUtil.subBefore(token, CharUtil.UNDERLINE, false);
+		String tokenStr = StrUtil.subAfter(token, CharUtil.UNDERLINE, false);
+		R<Map<String, Object>> result = tokenService.queryToken(tokenStr,tenant , SecurityConstants.FROM_IN);
 		if (CommonConstants.SUCCESS.equals(result.getCode())) {
 			return true;
 		}

From d6f5266350a8ca3785e1bcd953ea6c13d234a4ce Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 14 Jan 2024 10:45:12 +0800
Subject: [PATCH 09/46] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=A7=9F=E6=88=B7=E5=90=8E=EF=BC=8C=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java
index 9c8f4173f..062760810 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java
@@ -35,6 +35,7 @@ import com.pig4cloud.pigx.admin.mapper.SysFileMapper;
 import com.pig4cloud.pigx.admin.service.SysFileService;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.common.core.util.R;
+import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
 import com.pig4cloud.pigx.common.file.core.FileProperties;
 import com.pig4cloud.pigx.common.file.core.FileTemplate;
 import jakarta.servlet.http.HttpServletResponse;
@@ -103,6 +104,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
 	 */
 	@Override
 	public void getFile(String fileName, HttpServletResponse response) {
+		TenantContextHolder.setTenantSkip();
 		SysFile sysFile = baseMapper.selectOne(Wrappers.<SysFile>lambdaQuery().eq(SysFile::getFileName, fileName));
 		try (S3Object s3Object = fileTemplate.getObject(sysFile.getBucketName(), sysFile.getDir(), fileName)) {
 			response.setContentType("application/octet-stream; charset=UTF-8");

From 3169e0c1c7fc2bd8cfdfd94570273235dfe44f40 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 14 Jan 2024 10:45:28 +0800
Subject: [PATCH 10/46] :arrow_up: Upgrading dependencies. go-view 0.2.0

---
 pigx-visual/pigx-report-platform/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml
index 475a16c6c..e8fbe403e 100644
--- a/pigx-visual/pigx-report-platform/pom.xml
+++ b/pigx-visual/pigx-report-platform/pom.xml
@@ -15,7 +15,7 @@
 
     <description>基于 GoView 的大屏设计系统</description>
     <properties>
-        <goview.version>0.2.1</goview.version>
+        <goview.version>0.2.2</goview.version>
     </properties>
 
     <dependencies>

From f5026e2206b4b548dd6ca3d5e2439a5550a56ce9 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 16 Jan 2024 21:37:51 +0800
Subject: [PATCH 11/46] Dockerfile 8.0.33

---
 db/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/Dockerfile b/db/Dockerfile
index 3801fad51..41da8e774 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql/mysql-server:8.0.33
+FROM mysql/mysql-server:8.0.32
 
 MAINTAINER lengleng(wangiegie@gmail.com)
 

From 4f1c99d38bf6ec4b1ff2216183673fac17761602 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 17 Jan 2024 16:17:25 +0800
Subject: [PATCH 12/46] :bug: Fixing a bug. summary oss file set error

---
 .../com/pig4cloud/pigx/common/file/local/LocalFileTemplate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/local/LocalFileTemplate.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/local/LocalFileTemplate.java
index fe050c536..14b811c1a 100644
--- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/local/LocalFileTemplate.java
+++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/local/LocalFileTemplate.java
@@ -166,7 +166,7 @@ public class LocalFileTemplate implements FileTemplate {
 		return Arrays.stream(FileUtil.ls(dir)).filter(file -> file.getName().startsWith(prefix)).map(file -> {
 			S3ObjectSummary summary = new S3ObjectSummary();
 			summary.setKey(file.getName());
-			return new S3ObjectSummary();
+			return summary;
 		}).collect(Collectors.toList());
 	}
 

From 1c4de7ef2abe4b69860b9cb850de5fad312917fc Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 23 Jan 2024 10:58:34 +0800
Subject: [PATCH 13/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=20=E7=BB=9F=E4=B8=80flow=20=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E3=80=90del=5Ffla?=
 =?UTF-8?q?g=E3=80=91/=20=E3=80=90bool=E3=80=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/3pigxx_flow.sql                            |  16 +-
 .../pigx/flow/task/entity/Process.java        |   4 +-
 .../pigx/flow/task/vo/FormGroupVo.java        |   2 +-
 .../impl/CombinationGroupServiceImpl.java     |   2 +-
 .../task/service/impl/ProcessServiceImpl.java | 355 +++++++++---------
 5 files changed, 193 insertions(+), 186 deletions(-)

diff --git a/db/3pigxx_flow.sql b/db/3pigxx_flow.sql
index 196c72acf..fb65b00d8 100644
--- a/db/3pigxx_flow.sql
+++ b/db/3pigxx_flow.sql
@@ -9,7 +9,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `process`;
 CREATE TABLE `process` (
   `id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '表单ID',
@@ -40,7 +40,7 @@ CREATE TABLE `process` (
 DROP TABLE IF EXISTS `process_copy`;
 CREATE TABLE `process_copy` (
   `id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `update_time` datetime NOT NULL COMMENT '更新时间',
   `start_time` datetime NOT NULL COMMENT ' 流程发起时间',
@@ -67,7 +67,7 @@ CREATE TABLE `process_copy` (
 DROP TABLE IF EXISTS `process_group`;
 CREATE TABLE `process_group` (
   `id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   `group_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分组名',
@@ -88,7 +88,7 @@ CREATE TABLE `process_instance_record` (
   `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程名字',
   `logo` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '头像',
   `user_id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '流程id',
@@ -112,7 +112,7 @@ CREATE TABLE `process_instance_record` (
 DROP TABLE IF EXISTS `process_node_data`;
 CREATE TABLE `process_node_data` (
   `id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `update_time` datetime NOT NULL COMMENT '更新时间',
   `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程id',
@@ -130,7 +130,7 @@ CREATE TABLE `process_node_data` (
 DROP TABLE IF EXISTS `process_node_record`;
 CREATE TABLE `process_node_record` (
   `id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `update_time` datetime NOT NULL COMMENT '更新时间',
   `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程id',
@@ -155,7 +155,7 @@ CREATE TABLE `process_node_record` (
 DROP TABLE IF EXISTS `process_node_record_assign_user`;
 CREATE TABLE `process_node_record_assign_user` (
   `id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `update_time` datetime NOT NULL COMMENT '更新时间',
   `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程id',
@@ -184,7 +184,7 @@ CREATE TABLE `process_node_record_assign_user` (
 DROP TABLE IF EXISTS `process_starter`;
 CREATE TABLE `process_starter` (
   `id` bigint NOT NULL COMMENT '用户id',
-  `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `update_time` datetime NOT NULL COMMENT '更新时间',
   `type_id` bigint NOT NULL COMMENT '用户id或者部门id',
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java
index be790cbe8..0fd7edb85 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java
@@ -76,13 +76,13 @@ public class Process {
 	 * 0 正常 1=隐藏
 	 */
 	@TableField("is_hidden")
-	private Boolean hidden;
+	private String hidden;
 
 	/**
 	 * 0 正常 1=停用
 	 */
 	@TableField("is_stop")
-	private Boolean stop;
+	private String stop;
 
 	/**
 	 * 流程管理员
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java
index dc3779fd4..0114c0cb6 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java
@@ -46,7 +46,7 @@ public class FormGroupVo {
 
 		private String logo;
 
-		private Boolean stop;
+		private String stop;
 
 		private String remark;
 
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java
index 50e0a9b15..6d6517683 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java
@@ -33,7 +33,7 @@ public class CombinationGroupServiceImpl implements ICombinationGroupService {
 
 	/**
 	 * 查询表单组包含流程
-	 * @param hidden
+	 * @param groupId groupId
 	 * @return 表单组数据
 	 */
 	@Override
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java
index dd487bb7f..6291a31ca 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java
@@ -45,212 +45,219 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> implements IProcessService {
 
-	private final IProcessStarterService processStarterService;
+    private final IProcessStarterService processStarterService;
 
-	private final RemoteFlowEngineService flowEngineService;
+    private final RemoteFlowEngineService flowEngineService;
 
-	private final Sequence flowSequence;
+    private final Sequence flowSequence;
 
-	private final ObjectMapper objectMapper;
+    private final ObjectMapper objectMapper;
 
-	/**
-	 * 获取详细数据
-	 * @param flowId
-	 * @return
-	 */
-	@Override
-	public R<ProcessVO> getDetail(String flowId) {
-		// 获取流程详情
-		ProcessVO processVO = this.getProcessVO(flowId);
-		return R.ok(processVO);
-	}
+    /**
+     * 获取详细数据
+     *
+     * @param flowId
+     * @return
+     */
+    @Override
+    public R<ProcessVO> getDetail(String flowId) {
+        // 获取流程详情
+        ProcessVO processVO = this.getProcessVO(flowId);
+        return R.ok(processVO);
+    }
 
-	/**
-	 * 根据流程ID获取流程详情
-	 * @param flowId 流程ID
-	 * @return 流程详情
-	 */
-	@SneakyThrows
-	private ProcessVO getProcessVO(String flowId) {
+    /**
+     * 根据流程ID获取流程详情
+     *
+     * @param flowId 流程ID
+     * @return 流程详情
+     */
+    @SneakyThrows
+    private ProcessVO getProcessVO(String flowId) {
 
-		Process oaForms = getByFlowId(flowId);
-		String process = oaForms.getProcess();
-		String formItems = oaForms.getFormItems();
-		Node startNode = objectMapper.readValue(process, new TypeReference<>() {
-		});
+        Process oaForms = getByFlowId(flowId);
+        String process = oaForms.getProcess();
+        String formItems = oaForms.getFormItems();
+        Node startNode = objectMapper.readValue(process, new TypeReference<>() {
+        });
 
-		Map<String, String> formPerms = startNode.getFormPerms();
+        Map<String, String> formPerms = startNode.getFormPerms();
 
-		List<FormItemVO> formItemVOList = objectMapper.readValue(formItems, new TypeReference<>() {
-		});
-		for (FormItemVO formItemVO : formItemVOList) {
-			String perm = MapUtil.getStr(formPerms, formItemVO.getId(), ProcessInstanceConstant.FormPermClass.EDIT);
-			formItemVO.setPerm(perm);
+        List<FormItemVO> formItemVOList = objectMapper.readValue(formItems, new TypeReference<>() {
+        });
+        for (FormItemVO formItemVO : formItemVOList) {
+            String perm = MapUtil.getStr(formPerms, formItemVO.getId(), ProcessInstanceConstant.FormPermClass.EDIT);
+            formItemVO.setPerm(perm);
 
-			// 发号器赋值
-			if (StrUtil.equals(formItemVO.getType(), FormTypeEnum.SEQUENCE.getType())) {
-				FormItemVO.Props props = formItemVO.getProps();
-				String prefix = props.getPrefix();
-				String nextNo = flowSequence.nextNo();
-				formItemVO.setPlaceholder(StrUtil.isNotBlank(prefix) ? prefix + nextNo : nextNo);
-				props.setValue(StrUtil.isNotBlank(prefix) ? prefix + nextNo : nextNo);
-				formItemVO.setProps(props);
-			}
+            // 发号器赋值
+            if (StrUtil.equals(formItemVO.getType(), FormTypeEnum.SEQUENCE.getType())) {
+                FormItemVO.Props props = formItemVO.getProps();
+                String prefix = props.getPrefix();
+                String nextNo = flowSequence.nextNo();
+                formItemVO.setPlaceholder(StrUtil.isNotBlank(prefix) ? prefix + nextNo : nextNo);
+                props.setValue(StrUtil.isNotBlank(prefix) ? prefix + nextNo : nextNo);
+                formItemVO.setProps(props);
+            }
 
-			if (StrUtil.equals(formItemVO.getType(), FormTypeEnum.LAYOUT.getType())) {
-				// 明细
-				Object value = formItemVO.getProps().getValue();
-				List<FormItemVO> subList = Convert.toList(FormItemVO.class, value);
-				for (FormItemVO itemVO : subList) {
-					String perm1 = MapUtil.getStr(formPerms, itemVO.getId(),
-							ProcessInstanceConstant.FormPermClass.EDIT);
-					itemVO.setPerm(perm1);
-				}
+            if (StrUtil.equals(formItemVO.getType(), FormTypeEnum.LAYOUT.getType())) {
+                // 明细
+                Object value = formItemVO.getProps().getValue();
+                List<FormItemVO> subList = Convert.toList(FormItemVO.class, value);
+                for (FormItemVO itemVO : subList) {
+                    String perm1 = MapUtil.getStr(formPerms, itemVO.getId(),
+                            ProcessInstanceConstant.FormPermClass.EDIT);
+                    itemVO.setPerm(perm1);
+                }
 
-				formItemVO.getProps().setValue(subList);
-				formItemVO.getProps();
-			}
+                formItemVO.getProps().setValue(subList);
+                formItemVO.getProps();
+            }
 
-		}
-		oaForms.setFormItems(objectMapper.writeValueAsString(formItemVOList));
+        }
+        oaForms.setFormItems(objectMapper.writeValueAsString(formItemVOList));
 
-		List<String> selectUserNodeId = NodeUtil.selectUserNodeId(startNode);
+        List<String> selectUserNodeId = NodeUtil.selectUserNodeId(startNode);
 
-		ProcessVO processVO = BeanUtil.copyProperties(oaForms, ProcessVO.class);
-		processVO.setSelectUserNodeId(selectUserNodeId);
+        ProcessVO processVO = BeanUtil.copyProperties(oaForms, ProcessVO.class);
+        processVO.setSelectUserNodeId(selectUserNodeId);
 
-		return processVO;
-	}
+        return processVO;
+    }
 
-	/**
-	 * 根据流程ID获取流程
-	 * @param flowId 流程ID
-	 * @return 流程
-	 */
-	@Override
-	public Process getByFlowId(String flowId) {
-		return this.lambdaQuery().eq(Process::getFlowId, flowId).one();
-	}
+    /**
+     * 根据流程ID获取流程
+     *
+     * @param flowId 流程ID
+     * @return 流程
+     */
+    @Override
+    public Process getByFlowId(String flowId) {
+        return this.lambdaQuery().eq(Process::getFlowId, flowId).one();
+    }
 
-	/**
-	 * 更新流程
-	 * @param process 流程
-	 */
-	@Override
-	public void updateByFlowId(Process process) {
-		this.lambdaUpdate().eq(Process::getFlowId, process.getFlowId()).update(process);
-	}
+    /**
+     * 更新流程
+     *
+     * @param process 流程
+     */
+    @Override
+    public void updateByFlowId(Process process) {
+        this.lambdaUpdate().eq(Process::getFlowId, process.getFlowId()).update(process);
+    }
 
-	/**
-	 * 隐藏流程
-	 * @param flowId 流程ID
-	 */
-	@Override
-	public void hide(String flowId) {
-		this.lambdaUpdate().set(Process::getHidden, true).eq(Process::getFlowId, flowId).update(new Process());
-	}
+    /**
+     * 隐藏流程
+     *
+     * @param flowId 流程ID
+     */
+    @Override
+    public void hide(String flowId) {
+        this.lambdaUpdate().set(Process::getHidden, true).eq(Process::getFlowId, flowId).update(new Process());
+    }
 
-	/**
-	 * 创建流程
-	 * @param process 流程
-	 * @return 操作结果
-	 */
-	@SneakyThrows
-	@Override
-	public R create(Process process) {
-		Map<String, Object> map = new HashMap<>();
-		map.put("process", process);
-		map.put("userId", SecurityUtils.getUser().getId());
-		R<String> r = flowEngineService.createFlow(map);
-		if (!r.isOk()) {
-			return R.failed(r.getMsg());
-		}
-		String flowId = r.getData();
-		NodeUser nodeUser = objectMapper.readValue(process.getAdminList(), new TypeReference<List<NodeUser>>() {
-		}).get(0);
+    /**
+     * 创建流程
+     *
+     * @param process 流程
+     * @return 操作结果
+     */
+    @SneakyThrows
+    @Override
+    public R create(Process process) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("process", process);
+        map.put("userId", SecurityUtils.getUser().getId());
+        R<String> r = flowEngineService.createFlow(map);
+        if (!r.isOk()) {
+            return R.failed(r.getMsg());
+        }
+        String flowId = r.getData();
+        NodeUser nodeUser = objectMapper.readValue(process.getAdminList(), new TypeReference<List<NodeUser>>() {
+        }).get(0);
 
-		// 更新流程
-		if (StrUtil.isNotBlank(process.getFlowId())) {
+        // 更新流程
+        if (StrUtil.isNotBlank(process.getFlowId())) {
 
-			Process oldProcess = this.getByFlowId(process.getFlowId());
-			this.hide(process.getFlowId());
-			// 修改所有的管理员
-			this.lambdaUpdate()
-				.set(Process::getAdminId, nodeUser.getId())
-				.eq(Process::getUniqueId, oldProcess.getUniqueId())
-				.update(new Process());
+            Process oldProcess = this.getByFlowId(process.getFlowId());
+            this.hide(process.getFlowId());
+            // 修改所有的管理员
+            this.lambdaUpdate()
+                    .set(Process::getAdminId, nodeUser.getId())
+                    .eq(Process::getUniqueId, oldProcess.getUniqueId())
+                    .update(new Process());
 
-		}
+        }
 
-		Node startNode = objectMapper.readValue(process.getProcess(), Node.class);
+        Node startNode = objectMapper.readValue(process.getProcess(), Node.class);
 
-		List<NodeUser> nodeUserList = startNode.getNodeUserList();
+        List<NodeUser> nodeUserList = startNode.getNodeUserList();
 
-		StringBuilder stringBuilder = new StringBuilder();
-		if (CollUtil.isNotEmpty(nodeUserList)) {
-			int index = 0;
+        StringBuilder stringBuilder = new StringBuilder();
+        if (CollUtil.isNotEmpty(nodeUserList)) {
+            int index = 0;
 
-			for (NodeUser user : nodeUserList) {
-				if (index > 0) {
-					stringBuilder.append(",");
-				}
-				stringBuilder.append(user.getName());
-				index++;
-				if (index > 5) {
-					break;
-				}
+            for (NodeUser user : nodeUserList) {
+                if (index > 0) {
+                    stringBuilder.append(",");
+                }
+                stringBuilder.append(user.getName());
+                index++;
+                if (index > 5) {
+                    break;
+                }
 
-			}
-		}
+            }
+        }
 
-		Process p = new Process();
-		p.setFlowId(flowId);
-		p.setName(process.getName());
-		p.setLogo(process.getLogo());
-		p.setSettings(process.getSettings());
-		p.setGroupId(process.getGroupId());
-		p.setFormItems(process.getFormItems());
-		p.setProcess(process.getProcess());
-		p.setRemark(process.getRemark());
-		p.setSort(0);
-		p.setHidden(false);
-		p.setStop(false);
-		p.setAdminId(nodeUser.getId());
-		p.setUniqueId(IdUtil.fastSimpleUUID());
-		p.setAdminList(process.getAdminList());
-		p.setRangeShow(stringBuilder.toString());
+        Process p = new Process();
+        p.setFlowId(flowId);
+        p.setName(process.getName());
+        p.setLogo(process.getLogo());
+        p.setSettings(process.getSettings());
+        p.setGroupId(process.getGroupId());
+        p.setFormItems(process.getFormItems());
+        p.setProcess(process.getProcess());
+        p.setRemark(process.getRemark());
+        p.setSort(0);
+        p.setHidden("0");
+        p.setStop("0");
+        p.setAdminId(nodeUser.getId());
+        p.setUniqueId(IdUtil.fastSimpleUUID());
+        p.setAdminList(process.getAdminList());
+        p.setRangeShow(stringBuilder.toString());
 
-		this.save(p);
+        this.save(p);
 
-		// 保存范围
-		for (NodeUser nodeUserDto : nodeUserList) {
-			ProcessStarter processStarter = new ProcessStarter();
+        // 保存范围
+        for (NodeUser nodeUserDto : nodeUserList) {
+            ProcessStarter processStarter = new ProcessStarter();
 
-			processStarter.setProcessId(p.getId());
-			processStarter.setTypeId(nodeUserDto.getId());
-			processStarter.setType(nodeUserDto.getType());
-			processStarterService.save(processStarter);
-		}
+            processStarter.setProcessId(p.getId());
+            processStarter.setTypeId(nodeUserDto.getId());
+            processStarter.setType(nodeUserDto.getType());
+            processStarterService.save(processStarter);
+        }
 
-		return R.ok();
-	}
+        return R.ok();
+    }
 
-	/**
-	 * 编辑表单
-	 * @param flowId 流程ID
-	 * @param type 类型 stop using delete
-	 * @param groupId 分组ID
-	 * @return 操作结果
-	 */
-	@Override
-	public R update(String flowId, String type, Long groupId) {
-		Process process = new Process();
-		process.setFlowId(flowId);
-		process.setStop("stop".equals(type));
-		process.setHidden("delete".equals(type));
-		process.setGroupId(groupId);
-		this.updateByFlowId(process);
-		return R.ok();
-	}
+    /**
+     * 编辑表单
+     *
+     * @param flowId  流程ID
+     * @param type    类型 stop using delete
+     * @param groupId 分组ID
+     * @return 操作结果
+     */
+    @Override
+    public R update(String flowId, String type, Long groupId) {
+        Process process = new Process();
+        process.setFlowId(flowId);
+        process.setStop("stop".equals(type) ? "1" : "0");
+        process.setHidden("delete".equals(type) ? "1" : "0");
+        process.setGroupId(groupId);
+        this.updateByFlowId(process);
+        return R.ok();
+    }
 
 }

From 4f63af4ebfcdaefac530eeebf6828385905f5ea2 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 23 Jan 2024 11:53:32 +0800
Subject: [PATCH 14/46] =?UTF-8?q?:wrench:=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8Cnacos=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-register/src/main/resources/application.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pigx-register/src/main/resources/application.yml b/pigx-register/src/main/resources/application.yml
index d62e442d6..bd7d47f1e 100644
--- a/pigx-register/src/main/resources/application.yml
+++ b/pigx-register/src/main/resources/application.yml
@@ -10,6 +10,10 @@ db:
   password: ${MYSQL_PWD:root}
   url:
     0: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  pool:
+    config:
+      connectionTimeout: 30000
+      validationTimeout: 10000
 
 nacos:
   core:

From c5b2f82a7ad235e87874bf87407cbda6690636b0 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Mon, 29 Jan 2024 13:05:13 +0800
Subject: [PATCH 15/46] :arrow_up: Upgrading dependencies. springboot 3.2.x

---
 .lombok.config                                |   5 +
 pigx-app-server/pigx-app-server-biz/pom.xml   |   2 +-
 .../AuthorizationServerConfiguration.java     |  11 +-
 .../core/PigxDaoAuthenticationProvider.java   |   1 -
 pigx-common/pigx-common-bom/pom.xml           |  18 +-
 .../data/cache/DefaultRedisCacheWriter.java   | 298 ------------------
 .../data/cache/RedisAutoCacheManager.java     |   8 +-
 .../cache/RedisCacheAutoConfiguration.java    | 117 +++----
 .../GlobalExceptionConfiguration.java         |   5 +-
 pigx-common/pigx-common-sentinel/pom.xml      |  83 ++---
 .../PigxSentinelAutoConfiguration.java        | 104 ++++++
 .../sentinel/SentinelAutoConfiguration.java   |  64 ----
 .../sentinel/feign/PigxSentinelFeign.java     |  38 ++-
 .../ReactiveNoResourceFoundHandler.java       |  54 ++++
 .../handle/WebNoResourceFoundHandler.java     |  54 ++++
 ...ot.autoconfigure.AutoConfiguration.imports |   3 +-
 .../pigx-flow-engine-biz/pom.xml              |   2 +-
 .../pigx-flow-task/pigx-flow-task-biz/pom.xml |   2 +-
 .../gateway/filter/PreviewGatewayFilter.java  |   4 +-
 pigx-register/pom.xml                         |  10 +
 pigx-upms/pigx-upms-biz/pom.xml               |  12 +-
 pigx-visual/pigx-codegen/pom.xml              |   2 +-
 pigx-visual/pigx-daemon-elastic-job/pom.xml   |   2 +-
 pigx-visual/pigx-daemon-quartz/pom.xml        |   9 +-
 .../quartz/config/PigxInitQuartzJob.java      |  42 +--
 pigx-visual/pigx-mp-platform/pom.xml          |   2 +-
 pigx-visual/pigx-pay-platform/pom.xml         |   9 +-
 pigx-visual/pigx-report-platform/pom.xml      |   4 +-
 pigx-visual/pigx-xxl-job-admin/pom.xml        |   2 +-
 pom.xml                                       |  12 +-
 30 files changed, 439 insertions(+), 540 deletions(-)
 create mode 100644 .lombok.config
 delete mode 100644 pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java
 create mode 100755 pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java
 delete mode 100755 pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/SentinelAutoConfiguration.java
 create mode 100644 pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java
 create mode 100644 pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java

diff --git a/.lombok.config b/.lombok.config
new file mode 100644
index 000000000..5e75e2aa0
--- /dev/null
+++ b/.lombok.config
@@ -0,0 +1,5 @@
+# 构造器注入的时候自动复制字段上边的注解
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Value
+lombok.copyableannotations += org.springframework.beans.factory.annotation.Qualifier
+lombok.copyableannotations += org.springframework.context.annotation.Lazy
+
diff --git a/pigx-app-server/pigx-app-server-biz/pom.xml b/pigx-app-server/pigx-app-server-biz/pom.xml
index 03a9bdc9d..5ab43f966 100644
--- a/pigx-app-server/pigx-app-server-biz/pom.xml
+++ b/pigx-app-server/pigx-app-server-biz/pom.xml
@@ -72,7 +72,7 @@
 		<!--选配: mybatis 依赖 -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
 		</dependency>
 		<!--选配： druid 连接池 -->
 		<dependency>
diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java
index 51b56f01e..6f6e05a13 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java
@@ -35,6 +35,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService;
 import org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer;
@@ -71,14 +72,14 @@ public class AuthorizationServerConfiguration {
 			PigxAuthenticationFailureEventHandler failureEventHandler) throws Exception {
 		OAuth2AuthorizationServerConfigurer authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer();
 
-		http.apply(authorizationServerConfigurer.tokenEndpoint((tokenEndpoint) -> {// 个性化认证授权端点
+		http.with(authorizationServerConfigurer.tokenEndpoint((tokenEndpoint) -> {// 个性化认证授权端点
 			tokenEndpoint.accessTokenRequestConverter(accessTokenRequestConverter()) // 注入自定义的授权认证Converter
 				.accessTokenResponseHandler(successEventHandler) // 登录成功处理器
 				.errorResponseHandler(failureEventHandler);// 登录失败处理器
 		}).clientAuthentication(oAuth2ClientAuthenticationConfigurer -> // 个性化客户端认证
 		oAuth2ClientAuthenticationConfigurer.errorResponseHandler(failureEventHandler))// 处理客户端认证异常
 			.authorizationEndpoint(authorizationEndpoint -> authorizationEndpoint// 授权码端点个性化confirm页面
-				.consentPage(SecurityConstants.CUSTOM_CONSENT_PAGE_URI)));
+				.consentPage(SecurityConstants.CUSTOM_CONSENT_PAGE_URI)),Customizer.withDefaults());
 
 		AntPathRequestMatcher[] requestMatchers = new AntPathRequestMatcher[] {
 				AntPathRequestMatcher.antMatcher("/token/**"), AntPathRequestMatcher.antMatcher("/actuator/**"),
@@ -89,10 +90,10 @@ public class AuthorizationServerConfiguration {
 			authorizeRequests.requestMatchers(requestMatchers).permitAll();
 			authorizeRequests.anyRequest().authenticated();
 		})
-			.apply(authorizationServerConfigurer.authorizationService(authorizationService)// redis存储token的实现
+			.with(authorizationServerConfigurer.authorizationService(authorizationService)// redis存储token的实现
 				.authorizationServerSettings(
-						AuthorizationServerSettings.builder().issuer(SecurityConstants.PIGX_LICENSE).build()));
-		http.apply(new FormIdentityLoginConfigurer());
+						AuthorizationServerSettings.builder().issuer(SecurityConstants.PIGX_LICENSE).build()), Customizer.withDefaults());
+		http.with(new FormIdentityLoginConfigurer(), Customizer.withDefaults());
 		DefaultSecurityFilterChain securityFilterChain = http.build();
 
 		// 注入自定义授权模式实现
diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/core/PigxDaoAuthenticationProvider.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/core/PigxDaoAuthenticationProvider.java
index 741037b38..2a63a4b92 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/core/PigxDaoAuthenticationProvider.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/core/PigxDaoAuthenticationProvider.java
@@ -61,7 +61,6 @@ public class PigxDaoAuthenticationProvider extends AbstractUserDetailsAuthentica
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	protected void additionalAuthenticationChecks(UserDetails userDetails,
 			UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
 
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index a1a3622be..14026797a 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -18,11 +18,11 @@
 
     <properties>
         <pigx.version>5.3.0</pigx.version>
-        <mybatis-plus.version>3.5.4</mybatis-plus.version>
-        <mybatis-plus-join.version>1.4.6</mybatis-plus-join.version>
-        <dynamic-ds.version>4.2.0</dynamic-ds.version>
+        <mybatis-plus.version>3.5.5</mybatis-plus.version>
+        <mybatis-plus-join.version>1.4.10</mybatis-plus-join.version>
+        <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <druid.version>1.2.20</druid.version>
-        <hutool.version>5.8.22</hutool.version>
+        <hutool.version>5.8.23</hutool.version>
         <mysql.connector.version>8.0.33</mysql.connector.version>
         <oracle.version>21.3.0.0</oracle.version>
         <sqlserver.version>8.4.1.jre8</sqlserver.version>
@@ -37,7 +37,7 @@
         <javax.version>4.0.1</javax.version>
         <jsoup.version>1.13.1</jsoup.version>
         <aviator.version>5.3.3</aviator.version>
-        <flowable.version>7.0.0.M1</flowable.version>
+        <flowable.version>7.0.0</flowable.version>
         <security.oauth.version>2.5.2.RELEASE</security.oauth.version>
         <fastjson.version>1.2.83</fastjson.version>
         <xxl.job.version>2.3.0</xxl.job.version>
@@ -188,12 +188,6 @@
                 <artifactId>asm</artifactId>
                 <version>${asm.version}</version>
             </dependency>
-            <!--  seata kryo 序列化-->
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-serializer-kryo</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
             <!--mybatis plus extension,包含了mybatis plus core-->
             <dependency>
                 <groupId>com.baomidou</groupId>
@@ -203,7 +197,7 @@
             <!--mybatis-->
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
             <dependency>
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java
deleted file mode 100644
index 7014107d4..000000000
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.data.cache;
-
-import org.springframework.dao.PessimisticLockingFailureException;
-import org.springframework.data.redis.cache.CacheStatistics;
-import org.springframework.data.redis.cache.CacheStatisticsCollector;
-import org.springframework.data.redis.cache.RedisCacheWriter;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisStringCommands.SetOption;
-import org.springframework.data.redis.core.types.Expiration;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * {@link RedisCacheWriter} implementation capable of reading/writing binary data from/to
- * Redis in {@literal standalone} and {@literal cluster} environments. Works upon a given
- * {@link RedisConnectionFactory} to obtain the actual {@link RedisConnection}. <br />
- * {@link DefaultRedisCacheWriter} can be used in
- * {@link RedisCacheWriter#lockingRedisCacheWriter(RedisConnectionFactory) locking} or
- * {@link RedisCacheWriter#nonLockingRedisCacheWriter(RedisConnectionFactory) non-locking}
- * mode. While {@literal non-locking} aims for maximum performance it may result in
- * overlapping, non atomic, command execution for operations spanning multiple Redis
- * interactions like {@code putIfAbsent}. The {@literal locking} counterpart prevents
- * command overlap by setting an explicit lock key and checking against presence of this
- * key which leads to additional requests and potential command wait times.
- *
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 2.0
- */
-class DefaultRedisCacheWriter implements RedisCacheWriter {
-
-	private final RedisConnectionFactory connectionFactory;
-
-	private final Duration sleepTime;
-
-	/**
-	 * @param connectionFactory must not be {@literal null}.
-	 */
-	DefaultRedisCacheWriter(RedisConnectionFactory connectionFactory) {
-		this(connectionFactory, Duration.ZERO);
-	}
-
-	/**
-	 * @param connectionFactory must not be {@literal null}.
-	 * @param sleepTime sleep time between lock request attempts. Must not be
-	 * {@literal null}. Use {@link Duration#ZERO} to disable locking.
-	 */
-	private DefaultRedisCacheWriter(RedisConnectionFactory connectionFactory, Duration sleepTime) {
-
-		Assert.notNull(connectionFactory, "ConnectionFactory must not be null!");
-		Assert.notNull(sleepTime, "SleepTime must not be null!");
-
-		this.connectionFactory = connectionFactory;
-		this.sleepTime = sleepTime;
-	}
-
-	@Override
-	public void put(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
-
-		Assert.notNull(name, "Name must not be null!");
-		Assert.notNull(key, "Key must not be null!");
-		Assert.notNull(value, "Value must not be null!");
-
-		execute(name, connection -> {
-
-			if (shouldExpireWithin(ttl)) {
-				connection.set(key, value, Expiration.from(ttl.toMillis(), TimeUnit.MILLISECONDS), SetOption.upsert());
-			}
-			else {
-				connection.set(key, value);
-			}
-
-			return "OK";
-		});
-	}
-
-	@Override
-	public byte[] get(String name, byte[] key) {
-
-		Assert.notNull(name, "Name must not be null!");
-		Assert.notNull(key, "Key must not be null!");
-
-		return execute(name, connection -> connection.get(key));
-	}
-
-	@Override
-	public byte[] putIfAbsent(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
-
-		Assert.notNull(name, "Name must not be null!");
-		Assert.notNull(key, "Key must not be null!");
-		Assert.notNull(value, "Value must not be null!");
-
-		return execute(name, connection -> {
-
-			if (isLockingCacheWriter()) {
-				doLock(name, connection);
-			}
-
-			try {
-				if (Boolean.TRUE.equals(connection.setNX(key, value))) {
-
-					if (shouldExpireWithin(ttl)) {
-						connection.pExpire(key, ttl.toMillis());
-					}
-					return null;
-				}
-
-				return connection.get(key);
-			}
-			finally {
-
-				if (isLockingCacheWriter()) {
-					doUnlock(name, connection);
-				}
-			}
-		});
-	}
-
-	/**
-	 * 删除，原来是删除指定的键，目前修改为既可以删除指定键的数据，也是可以删除某个前缀开始的所有数据
-	 * @param name
-	 * @param key
-	 */
-	@Override
-	public void remove(String name, byte[] key) {
-
-		Assert.notNull(name, "Name must not be null!");
-		Assert.notNull(key, "Key must not be null!");
-
-		execute(name, connection -> {
-			// 获取某个前缀所拥有的所有的键，某个前缀开头，后面肯定是*
-			Set<byte[]> keys = connection.keys(key);
-			int delNum = 0;
-			Assert.notNull(keys, "keys must not be null!");
-			for (byte[] keyByte : keys) {
-				delNum += connection.del(keyByte);
-			}
-			return delNum;
-		});
-	}
-
-	@Override
-	public void clean(String name, byte[] pattern) {
-
-		Assert.notNull(name, "Name must not be null!");
-		Assert.notNull(pattern, "Pattern must not be null!");
-
-		execute(name, connection -> {
-
-			boolean wasLocked = false;
-
-			try {
-
-				if (isLockingCacheWriter()) {
-					doLock(name, connection);
-					wasLocked = true;
-				}
-
-				byte[][] keys = Optional.ofNullable(connection.keys(pattern))
-					.orElse(Collections.emptySet())
-					.toArray(new byte[0][]);
-
-				if (keys.length > 0) {
-					connection.del(keys);
-				}
-			}
-			finally {
-
-				if (wasLocked && isLockingCacheWriter()) {
-					doUnlock(name, connection);
-				}
-			}
-
-			return "OK";
-		});
-	}
-
-	@Override
-	public void clearStatistics(String s) {
-
-	}
-
-	@Override
-	public RedisCacheWriter withStatisticsCollector(CacheStatisticsCollector cacheStatisticsCollector) {
-		return null;
-	}
-
-	/**
-	 * Explicitly set a write lock on a cache.
-	 * @param name the name of the cache to lock.
-	 */
-	void lock(String name) {
-		execute(name, connection -> doLock(name, connection));
-	}
-
-	/**
-	 * Explicitly remove a write lock from a cache.
-	 * @param name the name of the cache to unlock.
-	 */
-	void unlock(String name) {
-		executeLockFree(connection -> doUnlock(name, connection));
-	}
-
-	private Boolean doLock(String name, RedisConnection connection) {
-		return connection.setNX(createCacheLockKey(name), new byte[0]);
-	}
-
-	private Long doUnlock(String name, RedisConnection connection) {
-		return connection.del(createCacheLockKey(name));
-	}
-
-	boolean doCheckLock(String name, RedisConnection connection) {
-		return connection.exists(createCacheLockKey(name));
-	}
-
-	/**
-	 * @return {@literal true} if {@link RedisCacheWriter} uses locks.
-	 */
-	private boolean isLockingCacheWriter() {
-		return !sleepTime.isZero() && !sleepTime.isNegative();
-	}
-
-	private <T> T execute(String name, Function<RedisConnection, T> callback) {
-
-		try (RedisConnection connection = connectionFactory.getConnection()) {
-			checkAndPotentiallyWaitUntilUnlocked(name, connection);
-			return callback.apply(connection);
-		}
-	}
-
-	private void executeLockFree(Consumer<RedisConnection> callback) {
-		try (RedisConnection connection = connectionFactory.getConnection()) {
-			callback.accept(connection);
-		}
-	}
-
-	private void checkAndPotentiallyWaitUntilUnlocked(String name, RedisConnection connection) {
-
-		if (!isLockingCacheWriter()) {
-			return;
-		}
-
-		try {
-			while (doCheckLock(name, connection)) {
-				Thread.sleep(sleepTime.toMillis());
-			}
-		}
-		catch (InterruptedException ex) {
-
-			// Re-interrupt current thread, to allow other participants to react.
-			Thread.currentThread().interrupt();
-
-			throw new PessimisticLockingFailureException(
-					String.format("Interrupted while waiting to unlock cache %s", name), ex);
-		}
-	}
-
-	private static boolean shouldExpireWithin(@Nullable Duration ttl) {
-		return ttl != null && !ttl.isZero() && !ttl.isNegative();
-	}
-
-	private static byte[] createCacheLockKey(String name) {
-		return (name + "~lock").getBytes(StandardCharsets.UTF_8);
-	}
-
-	@Override
-	public CacheStatistics getCacheStatistics(String s) {
-		return null;
-	}
-
-}
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java
index 17fc7716f..8c0452418 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java
@@ -48,11 +48,13 @@ public class RedisAutoCacheManager extends RedisCacheManager {
 
 	private static final int CACHE_LENGTH = 2;
 
-	RedisAutoCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration,
-			Map<String, RedisCacheConfiguration> initialCacheConfigurations, boolean allowInFlightCacheCreation) {
-		super(cacheWriter, defaultCacheConfiguration, initialCacheConfigurations, allowInFlightCacheCreation);
+	public RedisAutoCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration,
+	                             boolean allowInFlightCacheCreation,
+	                             Map<String, RedisCacheConfiguration> initialCacheConfigurations) {
+		super(cacheWriter, defaultCacheConfiguration, allowInFlightCacheCreation, initialCacheConfigurations);
 	}
 
+
 	@Override
 	protected RedisCache createRedisCache(String name, @Nullable RedisCacheConfiguration cacheConfig) {
 		if (StrUtil.isBlank(name) || !name.contains(SPLIT_FLAG)) {
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java
index beb2eda4a..8bebbb3e7 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java
@@ -24,20 +24,21 @@ import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.ResourceLoader;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
-import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.lang.Nullable;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 扩展redis-cache支持注解cacheName添加超时时间
@@ -45,70 +46,74 @@ import java.util.Map;
  * @author L.cm
  */
 @Configuration
-@AutoConfigureAfter({ RedisAutoConfiguration.class })
-@ConditionalOnBean({ RedisConnectionFactory.class })
+@AutoConfigureAfter({RedisAutoConfiguration.class})
+@ConditionalOnBean({RedisConnectionFactory.class})
 @EnableConfigurationProperties(CacheProperties.class)
 public class RedisCacheAutoConfiguration {
 
-	private final CacheProperties cacheProperties;
+    private final CacheProperties cacheProperties;
 
-	private final CacheManagerCustomizers customizerInvoker;
+    private final CacheManagerCustomizers customizerInvoker;
 
-	@Nullable
-	private final RedisCacheConfiguration redisCacheConfiguration;
+    @Nullable
+    private final RedisCacheConfiguration redisCacheConfiguration;
 
-	RedisCacheAutoConfiguration(CacheProperties cacheProperties, CacheManagerCustomizers customizerInvoker,
-			ObjectProvider<RedisCacheConfiguration> redisCacheConfiguration) {
-		this.cacheProperties = cacheProperties;
-		this.customizerInvoker = customizerInvoker;
-		this.redisCacheConfiguration = redisCacheConfiguration.getIfAvailable();
-	}
+    RedisCacheAutoConfiguration(CacheProperties cacheProperties, CacheManagerCustomizers customizerInvoker,
+                                ObjectProvider<RedisCacheConfiguration> redisCacheConfiguration) {
+        this.cacheProperties = cacheProperties;
+        this.customizerInvoker = customizerInvoker;
+        this.redisCacheConfiguration = redisCacheConfiguration.getIfAvailable();
+    }
 
-	@Bean
-	@Primary
-	public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory, ResourceLoader resourceLoader) {
-		DefaultRedisCacheWriter redisCacheWriter = new DefaultRedisCacheWriter(connectionFactory);
-		RedisCacheConfiguration cacheConfiguration = this.determineConfiguration(resourceLoader.getClassLoader());
-		List<String> cacheNames = this.cacheProperties.getCacheNames();
-		Map<String, RedisCacheConfiguration> initialCaches = new LinkedHashMap<>();
-		if (!cacheNames.isEmpty()) {
-			Map<String, RedisCacheConfiguration> cacheConfigMap = new LinkedHashMap<>(cacheNames.size());
-			cacheNames.forEach(it -> cacheConfigMap.put(it, cacheConfiguration));
-			initialCaches.putAll(cacheConfigMap);
-		}
-		RedisAutoCacheManager cacheManager = new RedisAutoCacheManager(redisCacheWriter, cacheConfiguration,
-				initialCaches, true);
-		cacheManager.setTransactionAware(false);
-		return this.customizerInvoker.customize(cacheManager);
-	}
+    @Primary
+    @Bean("cacheResolver")
+    public CacheManager redisCacheManager(ObjectProvider<RedisConnectionFactory> connectionFactoryObjectProvider) {
+        RedisConnectionFactory connectionFactory = connectionFactoryObjectProvider.getIfAvailable();
+        Objects.requireNonNull(connectionFactory, "Bean RedisConnectionFactory is null.");
+        RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory);
+        RedisCacheConfiguration cacheConfiguration = this.determineConfiguration();
+        List<String> cacheNames = this.cacheProperties.getCacheNames();
+        Map<String, RedisCacheConfiguration> initialCaches = new LinkedHashMap<>();
+        if (!cacheNames.isEmpty()) {
+            Map<String, RedisCacheConfiguration> cacheConfigMap = new LinkedHashMap<>(cacheNames.size());
+            cacheNames.forEach(it -> cacheConfigMap.put(it, cacheConfiguration));
+            initialCaches.putAll(cacheConfigMap);
+        }
+        boolean allowInFlightCacheCreation = true;
+        boolean enableTransactions = false;
+        RedisAutoCacheManager cacheManager = new RedisAutoCacheManager(
+                redisCacheWriter, cacheConfiguration, allowInFlightCacheCreation, initialCaches
+        );
+        cacheManager.setTransactionAware(enableTransactions);
+        return this.customizerInvoker.customize(cacheManager);
+    }
 
-	private RedisCacheConfiguration determineConfiguration(ClassLoader classLoader) {
-		if (this.redisCacheConfiguration != null) {
-			return this.redisCacheConfiguration;
-		}
-		else {
-			CacheProperties.Redis redisProperties = this.cacheProperties.getRedis();
-			RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
-			config = config.serializeValuesWith(RedisSerializationContext.SerializationPair
-				.fromSerializer(new JdkSerializationRedisSerializer(classLoader)));
-			if (redisProperties.getTimeToLive() != null) {
-				config = config.entryTtl(redisProperties.getTimeToLive());
-			}
+    private RedisCacheConfiguration determineConfiguration() {
+        if (this.redisCacheConfiguration != null) {
+            return this.redisCacheConfiguration;
+        } else {
+            CacheProperties.Redis redisProperties = this.cacheProperties.getRedis();
+            RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
+            config = config.serializeValuesWith(RedisSerializationContext.SerializationPair
+                    .fromSerializer(RedisSerializer.java()));
+            if (redisProperties.getTimeToLive() != null) {
+                config = config.entryTtl(redisProperties.getTimeToLive());
+            }
 
-			if (redisProperties.getKeyPrefix() != null) {
-				config = config.prefixCacheNameWith(redisProperties.getKeyPrefix());
-			}
+            if (redisProperties.getKeyPrefix() != null) {
+                config = config.prefixCacheNameWith(redisProperties.getKeyPrefix());
+            }
 
-			if (!redisProperties.isCacheNullValues()) {
-				config = config.disableCachingNullValues();
-			}
+            if (!redisProperties.isCacheNullValues()) {
+                config = config.disableCachingNullValues();
+            }
 
-			if (!redisProperties.isUseKeyPrefix()) {
-				config = config.disableKeyPrefix();
-			}
+            if (!redisProperties.isUseKeyPrefix()) {
+                config = config.disableKeyPrefix();
+            }
 
-			return config;
-		}
-	}
+            return config;
+        }
+    }
 
 }
diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java
index 6b863399f..7537623d6 100644
--- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java
+++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java
@@ -13,14 +13,13 @@ import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.handler.ResponseStatusExceptionHandler;
 import reactor.core.publisher.Mono;
 
 /**
  * @author lengleng
  * @date 2023-07-30
  * <p>
- * 网关异常通用处理器，只作用在webflux 环境下 , 优先级低于 {@link ResponseStatusExceptionHandler} 执行
+ * 网关异常通用处理器，只作用在webflux 环境下 , 优先级低于 ReactiveNoResourceFoundHandler 执行
  */
 @Slf4j
 @Order(-1)
@@ -47,7 +46,7 @@ public class GlobalExceptionConfiguration implements ErrorWebExceptionHandler {
 		return response.writeWith(Mono.fromSupplier(() -> {
 			DataBufferFactory bufferFactory = response.bufferFactory();
 			try {
-				log.error("Error rquest :{} Error Spring Cloud Gateway : {}", exchange.getRequest().getPath(),
+				log.error("Error request :{} Error Spring Cloud Gateway : {}", exchange.getRequest().getPath(),
 						ex.getMessage());
 				return bufferFactory.wrap(objectMapper.writeValueAsBytes(R.failed(ex.getMessage())));
 			}
diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml
index e3f5ef485..3fe5387fb 100755
--- a/pigx-common/pigx-common-sentinel/pom.xml
+++ b/pigx-common/pigx-common-sentinel/pom.xml
@@ -1,40 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>com.pig4cloud</groupId>
-		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
-	</parent>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.pig4cloud</groupId>
+        <artifactId>pigx-common</artifactId>
+        <version>5.3.0</version>
+    </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
-	<artifactId>pigx-common-sentinel</artifactId>
-	<description>sentinel服务降级熔断、限流组件</description>
-	<dependencies>
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-		</dependency>
-		<!--feign 依赖-->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
-		</dependency>
-		<!-- okhttp 扩展 -->
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-okhttp</artifactId>
-		</dependency>
-		<!--oauth server 依赖-->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-core</artifactId>
-		</dependency>
-	</dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>pigx-common-sentinel</artifactId>
+    <description>sentinel服务降级熔断、限流组件</description>
+    <dependencies>
+        <dependency>
+            <groupId>com.pig4cloud</groupId>
+            <artifactId>pigx-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        <!--feign 依赖-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <!-- okhttp 扩展 -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+        </dependency>
+        <!--oauth server 依赖-->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+        </dependency>
+        <!--webmvc 依赖-->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java
new file mode 100755
index 000000000..69218e0a1
--- /dev/null
+++ b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java
@@ -0,0 +1,104 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.common.sentinel;
+
+import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration;
+import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler;
+import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.RequestOriginParser;
+import com.pig4cloud.pigx.common.sentinel.feign.PigxSentinelFeign;
+import com.pig4cloud.pigx.common.sentinel.handle.GlobalBizExceptionHandler;
+import com.pig4cloud.pigx.common.sentinel.handle.PigxUrlBlockHandler;
+import com.pig4cloud.pigx.common.sentinel.handle.ReactiveNoResourceFoundHandler;
+import com.pig4cloud.pigx.common.sentinel.handle.WebNoResourceFoundHandler;
+import com.pig4cloud.pigx.common.sentinel.parser.PigxHeaderRequestOriginParser;
+import feign.Feign;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+
+/**
+ * @author lengleng
+ * @date 2020-02-12
+ * <p>
+ * sentinel 配置
+ */
+@Configuration(proxyBeanMethods = false)
+@AutoConfigureBefore(SentinelFeignAutoConfiguration.class)
+public class PigxSentinelAutoConfiguration {
+
+    @Bean
+    @Scope("prototype")
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(name = "spring.cloud.openfeign.sentinel.enabled")
+    public Feign.Builder feignSentinelBuilder() {
+        return PigxSentinelFeign.builder();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    /**
+     * 创建一个块异常处理器实例
+     * 如果没有定义块异常处理器，则创建一个PigxUrlBlockHandler实例
+     */
+    public BlockExceptionHandler blockExceptionHandler() {
+        return new PigxUrlBlockHandler();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    /**
+     * 创建一个请求源解析器实例
+     * 如果没有定义请求源解析器，则创建一个PigxHeaderRequestOriginParser实例
+     */
+    public RequestOriginParser requestOriginParser() {
+        return new PigxHeaderRequestOriginParser();
+    }
+
+    /**
+     * 创建一个全局业务异常处理器实例
+     * 用于处理全局的业务异常
+     */
+    public GlobalBizExceptionHandler globalBizExceptionHandler() {
+        return new GlobalBizExceptionHandler();
+    }
+
+    /**
+     * 创建一个响应式资源未找到异常处理器实例
+     * 如果存在org.springframework.web.reactive.resource.NoResourceFoundException类，则创建一个ReactiveNoResourceFoundHandler实例
+     */
+    @Bean
+    @ConditionalOnClass(name = {"org.springframework.web.reactive.resource.NoResourceFoundException"})
+    public ReactiveNoResourceFoundHandler reactiveNoResourceFoundHandler() {
+        return new ReactiveNoResourceFoundHandler();
+    }
+
+    /**
+     * 创建一个Web资源未找到异常处理器实例
+     * 如果存在org.springframework.web.servlet.resource.NoResourceFoundException类，则创建一个WebNoResourceFoundHandler实例
+     */
+    @Bean
+    @ConditionalOnClass(name = {"org.springframework.web.servlet.resource.NoResourceFoundException"})
+    public WebNoResourceFoundHandler webNoResourceFoundHandler() {
+        return new WebNoResourceFoundHandler();
+    }
+
+}
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/SentinelAutoConfiguration.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/SentinelAutoConfiguration.java
deleted file mode 100755
index f4b37c5fb..000000000
--- a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/SentinelAutoConfiguration.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.sentinel;
-
-import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration;
-import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler;
-import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.RequestOriginParser;
-import com.pig4cloud.pigx.common.sentinel.feign.PigxSentinelFeign;
-import com.pig4cloud.pigx.common.sentinel.handle.PigxUrlBlockHandler;
-import com.pig4cloud.pigx.common.sentinel.parser.PigxHeaderRequestOriginParser;
-import feign.Feign;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-/**
- * @author lengleng
- * @date 2020-02-12
- * <p>
- * sentinel 配置
- */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore(SentinelFeignAutoConfiguration.class)
-public class SentinelAutoConfiguration {
-
-	@Bean
-	@Scope("prototype")
-	@ConditionalOnMissingBean
-	@ConditionalOnProperty(name = "spring.cloud.openfeign.sentinel.enabled")
-	public Feign.Builder feignSentinelBuilder() {
-		return PigxSentinelFeign.builder();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public BlockExceptionHandler blockExceptionHandler() {
-		return new PigxUrlBlockHandler();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public RequestOriginParser requestOriginParser() {
-		return new PigxHeaderRequestOriginParser();
-	}
-
-}
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/feign/PigxSentinelFeign.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/feign/PigxSentinelFeign.java
index f4e06d82d..dfcfa8eb0 100644
--- a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/feign/PigxSentinelFeign.java
+++ b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/feign/PigxSentinelFeign.java
@@ -12,14 +12,15 @@ import org.springframework.cloud.openfeign.FeignClientFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.Map;
-
 /**
- * 重写 {@link com.alibaba.cloud.sentinel.feign.SentinelFeign} 支持自动降级注入
+ * 支持自动降级注入 重写 {@link com.alibaba.cloud.sentinel.feign.SentinelFeign}
  *
  * @author lengleng
  * @date 2020/6/9
@@ -54,14 +55,15 @@ public final class PigxSentinelFeign {
 		}
 
 		@Override
-		public Feign build() {
+		public Feign internalBuild() {
 			super.invocationHandlerFactory(new InvocationHandlerFactory() {
 				@Override
 				public InvocationHandler create(Target target, Map<Method, MethodHandler> dispatch) {
+
 					// 查找 FeignClient 上的 降级策略
 					FeignClient feignClient = AnnotationUtils.findAnnotation(target.type(), FeignClient.class);
-					Class fallback = feignClient.fallback();
-					Class fallbackFactory = feignClient.fallbackFactory();
+					Class<?> fallback = feignClient.fallback();
+					Class<?> fallbackFactory = feignClient.fallbackFactory();
 
 					String beanName = feignClient.contextId();
 					if (!StringUtils.hasText(beanName)) {
@@ -69,26 +71,26 @@ public final class PigxSentinelFeign {
 					}
 
 					Object fallbackInstance;
-					FallbackFactory fallbackFactoryInstance;
-					// check fallback and fallbackFactory properties
+					FallbackFactory<?> fallbackFactoryInstance;
 					if (void.class != fallback) {
 						fallbackInstance = getFromContext(beanName, "fallback", fallback, target.type());
 						return new PigxSentinelInvocationHandler(target, dispatch,
 								new FallbackFactory.Default(fallbackInstance));
 					}
+
 					if (void.class != fallbackFactory) {
-						fallbackFactoryInstance = (FallbackFactory) getFromContext(beanName, "fallbackFactory",
+						fallbackFactoryInstance = (FallbackFactory<?>) getFromContext(beanName, "fallbackFactory",
 								fallbackFactory, FallbackFactory.class);
 						return new PigxSentinelInvocationHandler(target, dispatch, fallbackFactoryInstance);
 					}
 					return new PigxSentinelInvocationHandler(target, dispatch);
 				}
 
-				private Object getFromContext(String name, String type, Class fallbackType, Class targetType) {
+				private Object getFromContext(String name, String type, Class<?> fallbackType, Class<?> targetType) {
 					Object fallbackInstance = feignClientFactory.getInstance(name, fallbackType);
 					if (fallbackInstance == null) {
 						throw new IllegalStateException(String
-							.format("No %s instance of type %s found for feign client %s", type, fallbackType, name));
+								.format("No %s instance of type %s found for feign client %s", type, fallbackType, name));
 					}
 
 					if (!targetType.isAssignableFrom(fallbackType)) {
@@ -101,13 +103,25 @@ public final class PigxSentinelFeign {
 			});
 
 			super.contract(new SentinelContractHolder(contract));
-			return super.build();
+			return super.internalBuild();
+		}
+
+		private Object getFieldValue(Object instance, String fieldName) {
+			Field field = ReflectionUtils.findField(instance.getClass(), fieldName);
+			field.setAccessible(true);
+			try {
+				return field.get(instance);
+			}
+			catch (IllegalAccessException e) {
+				// ignore
+			}
+			return null;
 		}
 
 		@Override
 		public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			this.applicationContext = applicationContext;
-			feignClientFactory = this.applicationContext.getBean(FeignClientFactory.class);
+			this.feignClientFactory = this.applicationContext.getBean(FeignClientFactory.class);
 		}
 
 	}
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java
new file mode 100644
index 000000000..0fc19f13a
--- /dev/null
+++ b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java
@@ -0,0 +1,54 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.common.sentinel.handle;
+
+import com.pig4cloud.pigx.common.core.util.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.reactive.resource.NoResourceFoundException;
+
+/**
+ * @author lengleng
+ * @date 2020-06-29
+ */
+@Slf4j
+@RestController
+@RestControllerAdvice
+public class ReactiveNoResourceFoundHandler {
+
+    /**
+     * 保持和低版本请求路径不存在的行为一致
+     * <p>
+     * <a href="https://github.com/spring-projects/spring-boot/issues/38733">[Spring Boot
+     * 3.2.0] 404 Not Found behavior #38733</a>
+     *
+     * @param exception
+     * @return R
+     */
+    @ExceptionHandler({NoResourceFoundException.class})
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public R noResourceFoundException(NoResourceFoundException exception) {
+        log.debug("请求路径 404 {}", exception.getMessage());
+        return R.failed(exception.getMessage());
+    }
+
+}
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java
new file mode 100644
index 000000000..8899e4b25
--- /dev/null
+++ b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java
@@ -0,0 +1,54 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.common.sentinel.handle;
+
+import com.pig4cloud.pigx.common.core.util.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+
+/**
+ * @author lengleng
+ * @date 2020-06-29
+ */
+@Slf4j
+@RestController
+@RestControllerAdvice
+public class WebNoResourceFoundHandler {
+
+    /**
+     * 保持和低版本请求路径不存在的行为一致
+     * <p>
+     * <a href="https://github.com/spring-projects/spring-boot/issues/38733">[Spring Boot
+     * 3.2.0] 404 Not Found behavior #38733</a>
+     *
+     * @param exception
+     * @return R
+     */
+    @ExceptionHandler({NoResourceFoundException.class})
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public R noResourceFoundException(NoResourceFoundException exception) {
+        log.debug("请求路径 404 {}", exception.getMessage());
+        return R.failed(exception.getMessage());
+    }
+
+}
diff --git a/pigx-common/pigx-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pigx-common/pigx-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 0585eb055..3c7aac509 100644
--- a/pigx-common/pigx-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/pigx-common/pigx-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-com.pig4cloud.pigx.common.sentinel.SentinelAutoConfiguration
-com.pig4cloud.pigx.common.sentinel.handle.GlobalBizExceptionHandler
+com.pig4cloud.pigx.common.sentinel.PigxSentinelAutoConfiguration
diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml
index cf73355e8..48ebd1da3 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml
@@ -92,7 +92,7 @@
         <!--选配: mybatis 依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <!--选配： druid 连接池 -->
         <dependency>
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml
index b76a81aac..7e97b5f98 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml
@@ -76,7 +76,7 @@
         <!--选配: mybatis 依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <!--选配： druid 连接池 -->
         <dependency>
diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PreviewGatewayFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PreviewGatewayFilter.java
index a829f5ad1..f1d927cbb 100644
--- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PreviewGatewayFilter.java
+++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PreviewGatewayFilter.java
@@ -43,12 +43,12 @@ public class PreviewGatewayFilter extends AbstractGatewayFilterFactory {
 			ServerHttpRequest request = exchange.getRequest();
 
 			// GET，直接向下执行
-			if (StrUtil.equalsIgnoreCase(request.getMethodValue(), HttpMethod.GET.name())
+			if (StrUtil.equalsIgnoreCase(request.getMethod().name(), HttpMethod.GET.name())
 					|| StrUtil.containsIgnoreCase(request.getURI().getPath(), TOKEN)) {
 				return chain.filter(exchange);
 			}
 
-			log.warn("演示环境不能操作-> {},{}", request.getMethodValue(), request.getURI().getPath());
+			log.warn("演示环境不能操作-> {},{}", request.getMethod().name(), request.getURI().getPath());
 			ServerHttpResponse response = exchange.getResponse();
 			response.setStatusCode(HttpStatus.LOCKED);
 			return response.setComplete();
diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml
index 8f5535ad2..a6af08757 100644
--- a/pigx-register/pom.xml
+++ b/pigx-register/pom.xml
@@ -124,6 +124,16 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <loaderImplementation>CLASSIC</loaderImplementation>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>io.fabric8</groupId>
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index 6e988d806..f3f312b78 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -125,7 +125,7 @@
         <!--mybatis-->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <!-- druid 连接池 -->
         <dependency>
@@ -166,6 +166,16 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <loaderImplementation>CLASSIC</loaderImplementation>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index b5da7d902..dfba72846 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -45,7 +45,7 @@
         <!--mybatis-->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml
index bfa9cb84c..81867cb4a 100644
--- a/pigx-visual/pigx-daemon-elastic-job/pom.xml
+++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml
@@ -55,7 +55,7 @@
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.mysql</groupId>
diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml
index b43daf83b..771d20cb5 100644
--- a/pigx-visual/pigx-daemon-quartz/pom.xml
+++ b/pigx-visual/pigx-daemon-quartz/pom.xml
@@ -37,7 +37,7 @@
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
 		</dependency>
 		<!--数据库-->
 		<dependency>
@@ -107,13 +107,6 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxInitQuartzJob.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxInitQuartzJob.java
index e1771c80b..effccb377 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxInitQuartzJob.java
+++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxInitQuartzJob.java
@@ -20,10 +20,10 @@ package com.pig4cloud.pigx.daemon.quartz.config;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
 import com.pig4cloud.pigx.daemon.quartz.util.TaskUtil;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Scheduler;
-import org.springframework.context.annotation.Bean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -33,8 +33,8 @@ import org.springframework.context.annotation.Configuration;
  */
 @Slf4j
 @Configuration
-@AllArgsConstructor
-public class PigxInitQuartzJob {
+@RequiredArgsConstructor
+public class PigxInitQuartzJob implements InitializingBean {
 
 	private final SysJobService sysJobService;
 
@@ -42,22 +42,22 @@ public class PigxInitQuartzJob {
 
 	private final Scheduler scheduler;
 
-	@Bean
-	public void customize() {
-		sysJobService.list().forEach(sysjob -> {
-			if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(sysjob.getJobStatus())) {
-				taskUtil.removeJob(sysjob, scheduler);
-			}
-			else if (PigxQuartzEnum.JOB_STATUS_RUNNING.getType().equals(sysjob.getJobStatus())) {
-				taskUtil.resumeJob(sysjob, scheduler);
-			}
-			else if (PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(sysjob.getJobStatus())) {
-				taskUtil.pauseJob(sysjob, scheduler);
-			}
-			else {
-				taskUtil.removeJob(sysjob, scheduler);
-			}
-		});
-	}
 
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        sysJobService.list().forEach(sysjob -> {
+            if (PigxQuartzEnum.JOB_STATUS_RELEASE.getType().equals(sysjob.getJobStatus())) {
+                taskUtil.removeJob(sysjob, scheduler);
+            }
+            else if (PigxQuartzEnum.JOB_STATUS_RUNNING.getType().equals(sysjob.getJobStatus())) {
+                taskUtil.resumeJob(sysjob, scheduler);
+            }
+            else if (PigxQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(sysjob.getJobStatus())) {
+                taskUtil.pauseJob(sysjob, scheduler);
+            }
+            else {
+                taskUtil.removeJob(sysjob, scheduler);
+            }
+        });
+    }
 }
diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml
index 690913173..66cbe5bb4 100755
--- a/pigx-visual/pigx-mp-platform/pom.xml
+++ b/pigx-visual/pigx-mp-platform/pom.xml
@@ -36,7 +36,7 @@
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
 		</dependency>
 		<!-- mysql8 -->
 		<dependency>
diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml
index 0f4131d2a..78a0f988b 100755
--- a/pigx-visual/pigx-pay-platform/pom.xml
+++ b/pigx-visual/pigx-pay-platform/pom.xml
@@ -31,7 +31,7 @@
         <!--mybatis-->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
@@ -147,6 +147,13 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml
index e8fbe403e..edd5ea2dc 100644
--- a/pigx-visual/pigx-report-platform/pom.xml
+++ b/pigx-visual/pigx-report-platform/pom.xml
@@ -15,7 +15,7 @@
 
     <description>基于 GoView 的大屏设计系统</description>
     <properties>
-        <goview.version>0.2.2</goview.version>
+        <goview.version>1.0.0-SNAPSHOT</goview.version>
     </properties>
 
     <dependencies>
@@ -34,7 +34,7 @@
         <!-- goview 数据可视化-->
         <dependency>
             <groupId>io.springboot.plugin</groupId>
-            <artifactId>goview-spring-boot-starter</artifactId>
+            <artifactId>goview-spring-boot3-starter</artifactId>
             <version>${goview.version}</version>
         </dependency>
 
diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml
index 83be092f5..bdc681170 100644
--- a/pigx-visual/pigx-xxl-job-admin/pom.xml
+++ b/pigx-visual/pigx-xxl-job-admin/pom.xml
@@ -11,7 +11,7 @@
     <description>xxl job admin 控制台内置方便开发</description>
     <packaging>jar</packaging>
     <properties>
-        <mybatis-spring-boot-starter.version>2.3.0</mybatis-spring-boot-starter.version>
+        <mybatis-spring-boot-starter.version>3.0.3</mybatis-spring-boot-starter.version>
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index c930fa671..b2181a21c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,15 +33,15 @@
     </organization>
 
     <properties>
-        <spring-boot.version>3.1.6</spring-boot.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-boot.version>3.2.2</spring-boot.version>
+        <spring-cloud.version>2023.0.0</spring-cloud.version>
         <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <spring-boot-admin.version>3.2.0</spring-boot-admin.version>
-        <spring.authorization.version>1.2.0</spring.authorization.version>
-        <maven.compiler.version>3.8.1</maven.compiler.version>
+        <spring-boot-admin.version>3.2.1</spring-boot-admin.version>
+        <spring.authorization.version>1.2.1</spring.authorization.version>
+        <maven.compiler.version>3.11.0</maven.compiler.version>
         <spring.checkstyle.version>0.0.39</spring.checkstyle.version>
         <git.commit.version>2.2.5</git.commit.version>
         <captcha.version>1.3.0</captcha.version>
@@ -240,7 +240,7 @@
                     <target>${maven.compiler.target}</target>
                     <source>${maven.compiler.source}</source>
                     <encoding>UTF-8</encoding>
-                    <skip>true</skip>
+                    <parameters>true</parameters>
                 </configuration>
             </plugin>
             <!--打包关联最新 git commit 信息插件-->

From 4025c42fcf49f7958a10f67dea58d4333493090a Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Mon, 29 Jan 2024 14:35:24 +0800
Subject: [PATCH 16/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=20sys=5Fschedule=20?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2pigxx.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index d07992d86..df5148fdc 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -1078,7 +1078,7 @@ CREATE TABLE `sys_schedule` (
   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
   `tenant_id` bigint(20) unsigned DEFAULT NULL COMMENT '租户ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='系统日程管理表';
 
 -- ----------------------------
 -- Records of sys_schedule

From 7f46d9791beccf69d661450f0fa0b9140294a48c Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 30 Jan 2024 20:46:22 +0800
Subject: [PATCH 17/46] :arrow_up: Upgrading dependencies. up jimu springboot3

---
 db/6pigxx_config.sql                          |    2 +-
 pigx-visual/pigx-jimu-platform/pom.xml        |   51 +-
 .../jmreport/desreport/authority.ftl          |   43 -
 .../jmreport/desreport/common/resource.ftl    |   14 -
 .../jmreport/desreport/common/tj.ftl          |   17 -
 .../templates/jmreport/desreport/demo.ftl     |  835 ------
 .../templates/jmreport/desreport/error.ftl    |   15 -
 .../templates/jmreport/desreport/index.ftl    | 1360 ----------
 .../templates/jmreport/desreport/list.ftl     |   12 +-
 .../templates/jmreport/desreport/modal.ftl    |  172 --
 .../templates/jmreport/desreport/print.ftl    |   33 -
 .../components/background_setting.ftl         |  131 -
 .../components/bar_series_setting.ftl         |   75 -
 .../template/components/bar_setting.ftl       |   87 -
 .../desreport/template/components/barcode.ftl |  208 --
 .../template/components/cell_linkage.ftl      |  404 ---
 .../components/central_point_setting.ftl      |   60 -
 .../template/components/chart_linkage.ftl     |  375 ---
 .../template/components/data_dictionary.ftl   |  771 ------
 .../components/data_source_setting.ftl        | 2391 -----------------
 .../components/function_interpretation.ftl    | 1103 --------
 .../template/components/funnel_setting.ftl    |   87 -
 .../template/components/gauge_setting.ftl     |  145 -
 .../template/components/grid_setting.ftl      |   66 -
 .../template/components/hyperlinks.ftl        |  567 ----
 .../template/components/javabean_setting.ftl  | 1194 --------
 .../template/components/jurisdiction.ftl      |  187 --
 .../template/components/legend_setting.ftl    |  114 -
 .../template/components/line_setting.ftl      |  108 -
 .../template/components/map_setting.ftl       |  538 ----
 .../template/components/margin_setting.ftl    |   96 -
 .../template/components/match_setting.ftl     |  376 ---
 .../template/components/pictorial_setting.ftl |  146 -
 .../template/components/pie_setting.ftl       |   91 -
 .../components/primary_sub_report.ftl         |  312 ---
 .../template/components/print_setting.ftl     |  349 ---
 .../desreport/template/components/qrcode.ftl  |   88 -
 .../template/components/radar_setting.ftl     |   73 -
 .../template/components/scatter_setting.ftl   |   68 -
 .../template/components/select_input.ftl      |  105 -
 .../components/select_scroll_multiple.ftl     |  496 ----
 .../components/select_scroll_radio.ftl        |  320 ---
 .../template/components/series_setting.ftl    |  149 -
 .../components/sql_function_replace.ftl       |  176 --
 .../template/components/title_setting.ftl     |  103 -
 .../template/components/tooltip_setting.ftl   |   86 -
 .../template/components/tree_select.ftl       |  424 ---
 .../template/components/view_setting.ftl      |  208 --
 .../template/components/xAxis_setting.ftl     |  127 -
 .../template/components/yAxis_setting.ftl     |  161 --
 .../jmreport/desreport/template/index.ftl     |   35 -
 .../jmreport/desreport/template/list.ftl      |    1 -
 .../jmreport/desreport/template/view.ftl      |    2 -
 .../templates/jmreport/desreport/view.ftl     |  308 ---
 pom.xml                                       |    2 +-
 55 files changed, 13 insertions(+), 15454 deletions(-)
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl
 delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl

diff --git a/db/6pigxx_config.sql b/db/6pigxx_config.sql
index 9c12940ad..52136191f 100644
--- a/db/6pigxx_config.sql
+++ b/db/6pigxx_config.sql
@@ -44,7 +44,7 @@ INSERT INTO `config_info` VALUES (9, 'pigx-pay-platform-dev.yml', 'DEFAULT_GROUP
 INSERT INTO `config_info` VALUES (11, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - wx_mp_menu\n      - wx_account\n      - wx_account_tag\n      - wx_account_fans\n      - wx_msg\n      - wx_auto_reply', 'ea4e59c98b8aeb4dd78ec989e7f197a4', '2022-12-16 10:44:25', '2023-01-29 13:12:59', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (12, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n  job:\n    i18n: zh_CN\n    logretentiondays: 30\n    triggerpool:\n      fast.max: 200\n      slow.max: 200\n\n# mybatis\nmybatis:\n  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  mvc:\n    static-path-pattern: /static/**\n  freemarker:\n    suffix: .ftl\n    request-context-attribute: request\n    settings:\n      number_format: 0.##########\n  mail:\n    host: smtp.mxhichina.com\n    port: 465\n    from: xxxx@gitee.wang\n    username: xxxx@gitee.wang\n    password: xxxx\n    properties:\n      mail:\n        smtp:\n          auth: true\n          ssl.enable: true\n          starttls.enable: false\n          required: false\n\nmanagement:\n  health:\n    mail:\n      enabled: false\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS', '6d70dce1f3ee48f261dce29bcfa99cbb', '2022-12-16 10:44:25', '2023-01-04 18:22:48', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (13, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  jpa:\n    database-platform: org.hibernate.dialect.MySQL8Dialect\n\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /\n        - /api/project/getData\n        - /static/**\n        - /api/project/get-file/*\n\n# 文件上传路径\ngv:\n  img-path: /Users/lengleng/Downloads/img/\n', 'ce3fde4b4592cdd61feb2e443b2ddfe5', '2022-12-16 10:44:25', '2023-04-07 12:56:57', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    saasMode: tenant\n    #saasMode: tenant\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '3f53ce5ae7d2832a546929af4a7e57d1', '2022-12-16 10:44:25', '2023-09-22 14:58:36', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '66319da04963c4c7217f807bf1bd5f2d', '2022-12-16 10:44:25', '2024-01-30 20:44:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (15, 'pigx-app-server-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_app}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - app_user\n      - app_role\n      - app_article\n      - app_article_category\n      - app_article_collect\n      - app_page\n      - app_tabbar', '2513bb14ce549a2a4ea1cdfd83bba1f3', '2022-12-19 10:30:07', '2023-06-20 18:15:07', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (16, 'pigx-flow-engine-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:41:32', '2023-07-28 13:43:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 工作引擎', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (17, 'pigx-flow-task-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - process\n      - process_copy\n      - process_group\n      - process_instance_record\n      - process_node_data\n      - process_node_record\n      - process_node_record_assign_user\n      - process_starter', 'bdead04cdd3666d04786f69e5fb32633', '2023-07-28 13:44:25', '2023-07-28 13:50:08', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 业务', '', '', 'yaml', '', '');
diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml
index 838e035bf..0cb92daca 100755
--- a/pigx-visual/pigx-jimu-platform/pom.xml
+++ b/pigx-visual/pigx-jimu-platform/pom.xml
@@ -12,13 +12,7 @@
     <packaging>jar</packaging>
 
     <description>积木报表系统</description>
-    <properties>
-        <druid.version>1.2.20</druid.version>
-        <spring-boot-dependencies.version>2.7.18</spring-boot-dependencies.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>2.7.11</spring-boot-admin.version>
-    </properties>
+
     <dependencies>
         <!--注册中心客户端-->
         <dependency>
@@ -58,14 +52,13 @@
         </dependency>
         <dependency>
             <groupId>org.jeecgframework.jimureport</groupId>
-            <artifactId>jimureport-spring-boot-starter</artifactId>
+            <artifactId>jimureport-spring-boot3-starter</artifactId>
             <version>${jimu.version}</version>
         </dependency>
         <!-- druid 连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
+            <artifactId>druid-spring-boot-3-starter</artifactId>
         </dependency>
         <!--MYSQL 数据驱动-->
         <dependency>
@@ -84,44 +77,6 @@
         </dependency>
     </dependencies>
 
-    <!--依赖版本声明-->
-    <dependencyManagement>
-        <dependencies>
-            <!-- SpringBoot 依赖配置 -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringCloud 微服务 -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringBoot Admin -->
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-server</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-
-            <!--spring cloud alibaba-->
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 
     <build>
         <plugins>
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl
deleted file mode 100644
index 86eb3ee81..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl
+++ /dev/null
@@ -1,43 +0,0 @@
-<#assign CACHE_VERSION = "v=1699715555.10">
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width">
-  <title>没有权限</title>
-  <script>
-    let base = "${base}";
-  </script>
-  <style>
-    .no-authority{
-        width: 100%;
-        height: 100%;
-        text-align: center;
-        justify-content: center;
-        position: absolute;
-        top: 50%;
-    }
-    .no-authority span{
-        font-size: 20px;
-    }
-    .img-position{
-        width: 100%;
-        height: 100%;
-        text-align: center;
-        justify-content: center;
-        position: absolute;
-        top: 17%;
-        margin: 0 auto;
-    }
-  </style>
-<body style="overflow: hidden">
-<div id="app" style="overflow: hidden">
-  <div class="img-position">
-    <img src="${base}/jmreport/desreport_/chartsImg/authority/no-authority.png"/>
-  </div>
-  <div class="no-authority">
-    <span>您没有权限访问该页面</span>
-  </div>
-</div>
-</body>
-</html>
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl
deleted file mode 100644
index 23c2b00b2..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- vue -->
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/cdn/vue/vue.min.js"></script>
-<!-- iview -->
-<link rel="stylesheet" type="text/css" href="${base}${customPrePath}/jmreport/desreport_/cdn/iview/iview.css">
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/cdn/iview/iview.min.js"></script>
-<!-- axios -->
-<script src="${base}${customPrePath}/jmreport/desreport_/cdn/axios/axios.min.js"></script>
-<script src="${base}${customPrePath}/jmreport/desreport_/cdn/axios/qs.min.js"></script>
-<!-- core -->
-<script src="${base}${customPrePath}/jmreport/desreport_/js/core/request.js?${CACHE_VERSION}"></script>
-<script src="${base}${customPrePath}/jmreport/desreport_/js/core/api.js?${CACHE_VERSION}"></script>
-<!-- biz -->
-<script src="${base}${customPrePath}/jmreport/desreport_/js/biz/manager.js?${CACHE_VERSION}"></script>
-
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl
deleted file mode 100644
index 58e8cd72c..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-(function() {
-    //https://blog.csdn.net/aizou6838/article/details/101664336
-    function async_load(){
-        var s = document.createElement('script');
-        s.type = 'text/javascript';
-        s.async = true;
-        s.src = "https://hm.baidu.com/hm.js?5819d05c0869771ff6e6a81cdec5b2e8";
-        var x = document.getElementsByTagName('script')[0];
-        x.parentNode.insertBefore(s, x);
-    }
-    if (window.attachEvent)
-        window.attachEvent('onload', async_load);
-    else
-        window.addEventListener('load', async_load, false);
-})();
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl
deleted file mode 100644
index ca1f05d1c..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl
+++ /dev/null
@@ -1,835 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <title>积木报表设计器</title>
-
-    <!-- Import via CDN -->
-    <link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.css">
-    <script src="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.js"></script>
-    <script src="${base}${customPrePath}/jmreport/desreport_/corelib/locale/zh-cn.js"></script>
-    <style>
-        body {
-            overflow-x: hidden;
-            overflow-y: hidden;
-        }
-    </style>
-
-<body onload="load()">
-<div id="jm-sheet-wrapper"></div>
-<script>
-function load() {
-    const options = {
-        showToolbar: true,     //头部操作按钮
-        showGrid: true,        //excel表格
-        showContextmenu: true, //右键操作按钮
-        rpBar: {
-            show: true,
-            style: {
-                //设置二级菜单栏样式
-                "padding-left": "23px",
-            }
-        },
-        view: {
-            height: () => document.documentElement.clientHeight,
-            width: () => document.documentElement.clientWidth,
-        },
-        row: {
-            len: 50,
-            height: 25,
-            minRowResizerHeight:1 //拖拽行最小高度
-        },
-        col: {
-            len: 26,
-            width: 100,
-            minWidth: 60,
-            height: 0,
-            minColResizerHeight:1//拖拽列最小高度
-        },
-        style: {
-            bgcolor: '#ffffff',
-            align: 'left',
-            valign: 'middle',
-            textwrap: false,
-            strike: false,
-            underline: false,
-            color: '#0a0a0a',
-            font: {
-                name: 'Helvetica',
-                size: 10,
-                bold: false,
-                italic: false,
-            },
-        },
-    };
-    //x.spreadsheet.locale('zh-cn');
-    var xs = x.spreadsheet('#jm-sheet-wrapper', options).loadData(
-        {
-            "name": "sheet1",
-            "freeze": "A1",
-            "styles": [
-                {
-                    "bgcolor": "#f4f5f8",
-                    "textwrap": true,
-                    "color": "#900b09",
-                    "border": {
-                        "top": [
-                            "thin",
-                            "#0366d6"
-                        ],
-                        "bottom": [
-                            "thin",
-                            "#0366d6"
-                        ],
-                        "right": [
-                            "thin",
-                            "#0366d6"
-                        ],
-                        "left": [
-                            "thin",
-                            "#0366d6"
-                        ]
-                    }
-                },
-                {
-                    "format": "rmb"
-                },
-                {
-                    "textwrap": true
-                },
-                {
-                    "bgcolor": "#c45a10"
-                },
-                {
-                    "valign": "middle"
-                },
-                {
-                    "valign": "top"
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#71ae47"
-                },
-                {
-                    "bgcolor": "#71ae47"
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#a7d08c"
-                },
-                {
-                    "bgcolor": "#a7d08c"
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#a7d08c",
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    }
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#ffffff",
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    }
-                },
-                {
-                    "bgcolor": "#ffffff"
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#ffffff",
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    },
-                    "align": "center"
-                },
-                {
-                    "align": "center"
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#ffffff",
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    },
-                    "align": "center",
-                    "font": {
-                        "bold": true
-                    }
-                },
-                {
-                    "align": "center",
-                    "font": {
-                        "bold": true
-                    }
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#ffffff",
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    },
-                    "align": "center",
-                    "font": {
-                        "bold": true,
-                        "size": 26
-                    }
-                },
-                {
-                    "align": "center",
-                    "font": {
-                        "bold": true,
-                        "size": 26
-                    }
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#ffffff",
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    },
-                    "align": "center",
-                    "font": {
-                        "bold": true,
-                        "size": 22
-                    }
-                },
-                {
-                    "align": "center",
-                    "font": {
-                        "bold": true,
-                        "size": 22
-                    }
-                },
-                {
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    }
-                },
-                {
-                    "textwrap": true,
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    }
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#ffffff",
-                    "align": "center",
-                    "font": {
-                        "bold": true,
-                        "size": 22
-                    }
-                },
-                {
-                    "align": "right"
-                },
-                {
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    },
-                    "bgcolor": "#5b9cd6"
-                },
-                {
-                    "border": {
-                        "bottom": [
-                            "thin",
-                            "#000"
-                        ],
-                        "top": [
-                            "thin",
-                            "#000"
-                        ],
-                        "left": [
-                            "thin",
-                            "#000"
-                        ],
-                        "right": [
-                            "thin",
-                            "#000"
-                        ]
-                    },
-                    "bgcolor": "#ffc001"
-                },
-                {
-                    "valign": "middle",
-                    "bgcolor": "#ffffff",
-                    "align": "center",
-                    "font": {
-                        "bold": true,
-                        "size": 18
-                    }
-                },
-                {
-                    "font": {
-                        "size": 18
-                    }
-                },
-                {
-                    "font": {
-                        "size": 22
-                    }
-                }
-            ],
-            "merges": [
-                "JAAAAAABJ6:JAAAAAABJ8",
-                "C2:H2"
-            ],
-            "rows": {
-                "len": 200,
-                "1": {
-                    "cells": {
-                        "2": {
-                            "text": "年度各月份佣金收入",
-                            "style": 27,
-                            "merge": [
-                                0,
-                                5
-                            ]
-                        },
-                        "3": {
-                            "style": 28
-                        },
-                        "4": {
-                            "style": 28
-                        },
-                        "5": {
-                            "style": 28
-                        },
-                        "6": {
-                            "style": 28
-                        },
-                        "7": {
-                            "style": 28
-                        },
-                        "8": {
-                            "style": 12
-                        },
-                        "9": {
-                            "style": 12
-                        }
-                    },
-                    "height": 45
-                },
-                "3": {
-                    "cells": {
-                        "2": {
-                            "text": "查询年度：",
-                            "style": 24
-                        },
-                        "3": {
-                            "text": "2019"
-                        },
-                        "5": {
-                            "text": "查询机构：",
-                            "style": 24
-                        },
-                        "6": {
-                            "text": "总公司"
-                        },
-                        "7": {
-                            "text": "单位：元",
-                            "style": 24
-                        }
-                    }
-                },
-                "5": {
-                    "cells": {
-                        "2": {
-                            "text": "月份",
-                            "style": 26
-                        },
-                        "3": {
-                            "text": "佣金/主营业收入",
-                            "style": 26
-                        },
-                        "4": {
-                            "text": "累计",
-                            "style": 26
-                        },
-                        "5": {
-                            "text": "历史最低水平",
-                            "style": 26
-                        },
-                        "6": {
-                            "text": "历史平均水平",
-                            "style": 26
-                        },
-                        "7": {
-                            "text": "历史最高水平",
-                            "style": 26
-                        }
-                    }
-                },
-                "6": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "1"
-                        },
-                        "3": {
-                            "style": 22,
-                            "text": "\t483834.66"
-                        },
-                        "4": {
-                            "style": 21,
-                            "text": "483834.66"
-                        },
-                        "5": {
-                            "style": 21,
-                            "text": "\t57569.771"
-                        },
-                        "6": {
-                            "style": 21,
-                            "text": "\t216797.62"
-                        },
-                        "7": {
-                            "style": 21,
-                            "text": "\t483834.66"
-                        }
-                    }
-                },
-                "7": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "2"
-                        },
-                        "3": {
-                            "style": 22,
-                            "text": "11666578.65"
-                        },
-                        "4": {
-                            "style": 21,
-                            "text": "12150413.31"
-                        },
-                        "5": {
-                            "style": 21,
-                            "text": "\t22140.00"
-                        },
-                        "6": {
-                            "style": 21,
-                            "text": "4985361.57"
-                        },
-                        "7": {
-                            "style": 21,
-                            "text": "\t11666578.65"
-                        }
-                    }
-                },
-                "8": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "3"
-                        },
-                        "3": {
-                            "style": 21,
-                            "text": "27080982.08"
-                        },
-                        "4": {
-                            "style": 21,
-                            "text": "\t17428381.401"
-                        },
-                        "5": {
-                            "style": 21,
-                            "text": "\t73106.2911"
-                        },
-                        "6": {
-                            "style": 21,
-                            "text": "16192642.30\t"
-                        },
-                        "7": {
-                            "style": 21,
-                            "text": "27080982.08"
-                        }
-                    }
-                },
-                "9": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "4"
-                        },
-                        "3": {
-                            "style": 21,
-                            "text": "0.001"
-                        },
-                        "4": {
-                            "style": 21,
-                            "text": "39231395.3911"
-                        },
-                        "5": {
-                            "style": 21,
-                            "text": "73106.2911"
-                        },
-                        "6": {
-                            "style": 21,
-                            "text": "8513415.34"
-                        },
-                        "7": {
-                            "style": 21,
-                            "text": "\t17428381.40"
-                        }
-                    }
-                },
-                "10": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "5"
-                        },
-                        "3": {
-                            "style": 21,
-                            "text": "0.00"
-                        },
-                        "4": {
-                            "style": 21,
-                            "text": ""
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-                "11": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "6"
-                        },
-                        "3": {
-                            "style": 21,
-                            "text": "0.00"
-                        },
-                        "4": {
-                            "style": 21
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-                "12": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "7"
-                        },
-                        "3": {
-                            "style": 21,
-                            "text": "0.00"
-                        },
-                        "4": {
-                            "style": 21
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-                "13": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "8"
-                        },
-                        "3": {
-                            "style": 21,
-                            "text": "0.00"
-                        },
-                        "4": {
-                            "style": 21
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-                "14": {
-                    "cells": {
-                        "2": {
-                            "style": 21,
-                            "text": "9"
-                        },
-                        "3": {
-                            "style": 21,
-                            "text": "0.00"
-                        },
-                        "4": {
-                            "style": 21
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-                "15": {
-                    "cells": {
-                        "2": {
-                            "style": 21
-                        },
-                        "3": {
-                            "style": 21
-                        },
-                        "4": {
-                            "style": 21
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-                "16": {
-                    "cells": {
-                        "2": {
-                            "style": 21
-                        },
-                        "3": {
-                            "style": 21
-                        },
-                        "4": {
-                            "style": 21
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-                "17": {
-                    "cells": {
-                        "2": {
-                            "style": 21
-                        },
-                        "3": {
-                            "style": 21
-                        },
-                        "4": {
-                            "style": 21
-                        },
-                        "5": {
-                            "style": 21
-                        },
-                        "6": {
-                            "style": 21
-                        },
-                        "7": {
-                            "style": 21
-                        }
-                    }
-                },
-            },
-            "cols": {
-                "2": {
-                    "width": 75
-                },
-                "3": {
-                    "width": 108
-                },
-                "5": {
-                    "width": 109
-                },
-                "6": {
-                    "width": 108
-                },
-                "7": {
-                    "width": 117
-                },
-                "len": 25
-            },
-            "validations": [],
-            "autofilter": {
-                "ref": "E13",
-                "filters": [],
-                "sort": null
-            }
-        }
-    ).change((cdata) => {
-        // console.log(cdata);
-        // console.log(xs.validate());
-        var str = JSON.stringify(cdata)
-        //console.log(str);
-    });
-}
-</script>
-</html>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl
deleted file mode 100644
index 32347c969..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <title>系统错误</title>
-</head>
-
-<body>
-<div style="color: red">
-    ${message}
-    <a href="http://jimureport.com/vip">Upgrade Now</a>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl
deleted file mode 100644
index b23847d50..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl
+++ /dev/null
@@ -1,1360 +0,0 @@
-<#assign CACHE_VERSION = "v=1699715555.10">
-<#assign config_id = "${id!''}">
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <title>积木报表—免费可视化Web报表工具</title>
-
-    <script>
-        let base = "${base}";
-        let baseFull = "${base}"+"${customPrePath}";
-        reportConfigString = '${reportConfig}';
-        /**
-         * 获取url参数
-         */
-        function getRequestUrl() {
-            var url = location.search;
-            var theRequest = new Object();
-            if (url.indexOf("?") != -1) {
-                var str = url.substr(1);
-                strs = str.split("&");
-                for(var i = 0; i < strs.length; i++) {
-                    theRequest[strs[i].split("=")[0]]=decodeURI(strs[i].split("=")[1]);
-                }
-            }
-            return theRequest;
-        }
-
-        let token = getRequestUrl().token;
-        if (token == "" || token == null){
-            token = window.localStorage.getItem('JmReport-Access-Token');
-        }
-        window.localStorage.setItem('JmReport-Access-Token',token);
-
-        //update-begin---author:wangshuai ---date:20220708  for：[JMREP-2661]多租户权限集成------------
-        let tenantId = getRequestUrl().tenantId;
-        if("" == tenantId || null == tenantId){
-            tenantId = window.localStorage.getItem('JmReport-Tenant-Id');
-        }
-        window.localStorage.setItem('JmReport-Tenant-Id',tenantId);
-        //update-end---author:wangshuai ---date:20220708  for：[JMREP-2661]多租户权限集成------------
-    </script>
-    <!--引入公共资源-->
-    <#include "./common/resource.ftl">
-    <link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/report.css?${CACHE_VERSION}">
-    <link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.css?${CACHE_VERSION}">
-    <link rel="shortcut icon" href="${base}${customPrePath}/jmreport/desreport_/corelib/logo.png?${CACHE_VERSION}" type="image/x-ico">
-    <script src="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.js?${CACHE_VERSION}"></script>
-    <script src="${base}${customPrePath}/jmreport/desreport_/corelib/locale/zh-cn.js?${CACHE_VERSION}"></script>
-    <script src="${base}${customPrePath}/jmreport/desreport_/jquery/jquery-3.4.1.min.js"></script>
-    <script src="${base}${customPrePath}/jmreport/desreport_/cdn/html2canvas/html2canvas.min.js"></script>
-    <script src="${base}${customPrePath}/jmreport/desreport_/cdn/html2canvas/canvas2image.js"></script>
-    <script src="${base}${customPrePath}/jmreport/desreport_/js/config/chart_type_list.js?${CACHE_VERSION}"></script>
-    <script src="${base}${customPrePath}/jmreport/desreport_/js/config/map_type_list.js?${CACHE_VERSION}"></script>
-    <!--引入自定义组件-->
-    <#include "./template/index.ftl">
-    <style>
-        .ivu-form-item {
-            margin-bottom: 10px;
-            vertical-align: top;
-            zoom: 1;
-        }
-        .ivu-menu-vertical.ivu-menu-light:after {
-            content: '';
-            display: block;
-            width: 1px;
-            height: 100%;
-            background: #ffffff;
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            right: 0;
-            z-index: 1;
-        }
-        .vertical-center-modal{
-            width: 100%;
-            height: 100%;
-        }
-        .ivu-select-dropdown.ivu-transfer-no-max-height {
-            max-height: none;
-            margin-left: 142px;
-        }
-
-        .ivurow{
-            position: relative;
-            margin-left: 0;
-            margin-right: 0;
-            margin-bottom: 5px;
-            height: auto;
-            zoom: 1;
-            display: -webkit-inline-box;
-        }
-        .ivu-col > div.chart-active{
-            border-color: blue;
-            box-shadow: 0px 0px 8px blue;
-        }
-        .ivu-col > div.chart-selected{
-            border-color: blue !important;
-            box-shadow: 0px 0px 8px blue;
-        }
-
-        .chart-modal-content .ivu-tabs-tabpane{
-            padding: 0 0 0 8px;
-        }
-        #dataTree{
-            margin-left: 25px;
-        }
-        .no-allowed{
-            cursor: not-allowed;
-           /* pointer-events: none;*/
-        }
-
-        .no-allowed:after {
-            position: absolute;
-            width: 200px;
-            height: 150px;
-            top: 0;
-            left: 0;
-            content: "";
-            background: #fff;
-            opacity: 0.65;
-            z-index: 5;
-            filter: alpha(opacity=40);
-        }
-        .colorPicker{
-            width: 200%;
-
-        }
-        .colorPicker .ivu-color-picker-input{
-            width: 20px;
-            height: 20px;
-        }
-        .colorPicker .ivu-color-picker-color{
-            margin-left: -5px;
-            margin-top: -2px;
-        }
-        .iSelect{
-            width: 145px !important;
-        }
-        .datastyle{
-            margin-bottom: 10px;
-        }
-        .blockDiv{
-            margin-left: 31px;margin-top: -10px;font-size: 12px;color: #000;
-        }
-
-        .jm-rp-left-container{
-            position: absolute;
-            top: 0;
-            left: 0;
-        }
-        .jm-rp-right-container{
-            position: absolute;
-            top: 0;
-            right: 0;
-        }
-        .jm-rp-designer{
-            position: absolute;
-            left: 220px;
-            width: calc(100% - 470px)
-        }
-        .jm-rp-designer.left{
-            left: 20px;
-            width: calc(100% - 260px)
-        }
-        .jm-rp-designer.right{
-            left: 220px;
-            width: calc(100% - 240px)
-        }
-        .jm-rp-designer.all{
-            left: 20px;
-            width: calc(100% - 40px)
-        }
-        [v-cloak] {
-            display: none;
-        }
-        .ivu-poptip-popper {
-            min-width: 100px;
-        }
-        .ivu-poptip-body-content-word-wrap {
-            text-align: center;
-        }
-
-        /*加载效果*/
-        .zindex-top{
-            z-index: 999;
-        }
-        .zindex-top .ivu-icon-ios-loading{
-            animation: cycle-spin 1s linear infinite;
-        }
-        @keyframes cycle-spin {
-            from { transform: rotate(0deg);}
-            50%  { transform: rotate(180deg);}
-            to   { transform: rotate(360deg);}
-        }
-        .ivurow>p{
-            padding-top: 3px;
-        }
-        .dataSource .ivu-table:before{
-           background-color:  #ffffff !important;
-        }
-        .match_setting .ivu-table:before{
-           background-color:  #ffffff !important; 
-        }
-        .pictorial-icon-upload{
-            width: 36px;
-            height:36px;
-            line-height: 36px;
-            position: relative;
-        }
-        .pictorial-icon-upload>.cover{
-            display: none;
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            width: 67px;
-            height: 50px;
-            left: 0;
-            right: 0;
-            border-radius:3px;
-            text-align: center;
-            background: rgba(0,0,0,.6);
-        }
-        .pictorial-icon-upload:hover .cover{
-            padding-top: 10px;
-            display: block;
-        }
-        .cover i{
-            color: #fff;
-            font-size: 20px;
-            cursor: pointer;
-        }
-        .ivu-tooltip-inner {
-            font-size: 10px;
-            padding: 2px 8px;
-            min-height: 24px;
-        }
-        .ivu-menu-opened>.ivu-menu-submenu-title{
-            color:#2d8cf0;
-        }
-        .ivu-tree-title-selected{
-            background: none;
-        }
-        #dataTree .ivu-tree-title{
-            padding:0;
-        }
-
-        /*样式调整 输入框小一点 -begin*/
-        .little-input .ivu-input{
-            padding: 3px 7px;
-            height: 28px;
-            border-radius: 3px;
-        }
-        .little-input .ivu-select-selection,
-        .little-input .ivu-select-placeholder,
-        .little-input .ivu-select-selected-value{
-            height: 28px !important;
-            line-height: 28px !important;
-        }
-
-        .little-input .ivu-input-prefix i,
-        .little-input .ivu-input-suffix i{
-            line-height: 28px !important;
-        }
-        /*样式调整 输入框小一点 -begin*/
-
-        .excel-backgroud-st>.ivu-upload{
-            display: block !important;
-        }
-
-        /*删除弹窗样式 -begin*/
-        .modal-body-del {
-            padding: 15px 0 0 15px;
-            font-size: 13px;
-            font-weight:400;
-            border-top: 1px solid #e8e8e8;
-            /*border-bottom: 1px solid #e8e8e8;*/
-        }
-        /*删除弹窗样式-end*/
-        
-        /*自定义表达式样式 -begin*/
-        .expression .fontColor{
-            color:#888;
-            font-size: 14px;
-        }
-        .expression .ivu-modal-body{
-            background: rgb(248,248,248);
-        }  
-        .expression .expressionInput textarea{
-            height: 100px;
-        }  
-        .expression .expressionHeight textarea{
-            height: calc(45vh);
-        }
-        .expression .functionDiv{
-            height: 200px;
-            border: 1px solid #dcdee2;
-            background: #ffffff;
-        }
-        .expression .leftFunction{
-            cursor: pointer;
-        }
-        .expression .leftFunctionSelect{
-            cursor: pointer;
-            background: #dcdee2;
-        }
-        .expression .functionDiv span{
-            margin-left: 10px;
-        }     
-        .expression .childrenDiv{
-            height: 200px;
-            border: 1px solid #dcdee2;
-            background: #ffffff;
-            overflow-y: auto;
-            margin-left: 10px;
-        }
-        .expression .childrenDiv span{
-            margin-left: 10px;
-        }
-        .expression .activeItem{
-            cursor: pointer;
-        }
-        .expression .rightFunctionSelect{
-            cursor: pointer;
-            background: #dcdee2;
-        }
-        .ivu-btn-primary button{
-            color: white !important;
-        }
-        .expression .ivu-input:focus{
-            border-color: #dcdee2 !important;
-            -webkit-box-shadow:none !important;
-            box-shadow: none !important;
-        }
-        .expression .ivu-input:hover{
-            border-color: #dcdee2 !important;
-        }
-        .interpretation{
-            margin-left: 10px;
-        }
-        .interpretation p{
-            font-size: 12px;
-            color:#888;
-            word-wrap: break-word;
-            overflow-wrap: break-word;
-        }
-        /*自定义表达式样式 -end*/
-
-        /*去掉 excel div块的间距 使其贴住浏览器边线*/
-        #tableDiv .ivu-card-body{padding: 0}
-        #tableDiv .layout-content{margin: 0}
-        .jm-noScroll{ overflow: hidden; }
-        #propsDiv .ivu-card-body{padding: 16px 0 16px 8px !important;}
-        /*update-begin--Author:wangshuai  Date:20210226 for：修改设计页面左右两侧的样式-------------------*/
-        .ivu-select-dropdown{
-            z-index: 999;
-        }
-        .dataSourceForm .ivu-form-item-label{
-            font-size: 12px;
-        }
-        .dataSourceForm .ivu-select-single .ivu-select-selection .ivu-select-selected-value{
-            font-size: 12px;
-        }
-        .rightFontSize{
-            font-size: 12px !important; 
-        }
-        .rightFontSize .ivu-input{
-            font-size: 12px;
-        } 
-        .rightFontSize .ivu-table-cell{
-            font-size: 12px;
-        }
-        /*右侧有两个文字的时候input的宽度*/
-        .twoInputWidth{
-            margin-left: 4px;
-            width: 165px !important;
-        }
-        .fourInputWidth{
-            margin-left: 4px;
-            width: 70% !important;
-        }
-        /*向上边距*/
-        .basicSettingTop{
-            margin-top: 15px;
-        }
-        #dataTree .ivu-tree ul{
-           font-size: 13px; 
-        }
-        #dataTree .ivu-btn-icon-only.ivu-btn-small{
-            position: relative;
-            left: 14px;
-        }
-        #dataTree .ivu-tree-title{
-           width: 100%;
-        }     
-        .reportIfo .ivu-menu-submenu-title{
-           width: 224px;
-        }
-        .rightPadding .ivu-card-body {
-            padding: 8px;
-        }   
-        .rightPadding .ivu-form-item-content {
-            display: flex;
-        }
-        .rightPadding  .ivu-menu-vertical .ivu-menu-submenu-title{
-            padding:14px 0;
-        } 
-        .stylePadding  .ivu-menu-vertical .ivu-menu-submenu-title{
-            padding:14px 30px;
-        }
-        .colorHeight .ivu-input-hide-icon .ivu-input-icon-normal+.ivu-input{
-            height: 24px !important;
-        }
-        .basic .ivu-menu-submenu-title{
-            width: 230px;
-        }
-        /*update-end--Author:wangshuai  Date:20210226 for：修改设计页面左右两侧的样式-------------------*/
-        .ivu-table-header table{
-            width: 100% !important;
-        }
-        .icnoAlignment{
-            position:relative;
-            left: 169px;
-        }
-        .icnoLeft{
-            position:relative;
-            left: 0;
-        }
-        .icnoRight{
-            position:relative;
-            left: 169px;    
-        }
-        .title-setting-fontsize .ivu-select-selected-value{
-            font-size: 10px !important;
-        }
-        .twoInputWidth .ivu-icon{
-            cursor: pointer;
-        }
-        .basicSettingTop .ivu-input{
-            padding-right: 32px;
-        }
-       #treeDiv .ivu-card-body{
-          padding: 16px 0 16px 16px !important;
-       }
-       .help-color{
-           color:#000000;
-           font-size: 10px;
-       }
-       .basic .layout-content{
-           margin: 10px 0 10px 10px;
-       }
-       .help-margin{
-           margin-right: 13px;
-       }
-       /*增强弹框样式*/
-       .jmreport-enhance .ivu-collapse-content{
-            padding: 0 5px;
-       }
-       .jmreport-enhance .ivu-collapse-content-box{
-          padding-top: 5px;
-          padding-bottom: 5px;
-       }
-       .jmreport-enhance textarea{
-           resize: none;
-       }
-    </style>
-<body onload="load()" class="jm-noScroll">
-<div id="app" v-cloak>
-    <Spin size="large" fix v-if="createLoading" class="zindex-top">
-        <Icon type="ios-loading" size=24></Icon>
-        <div>Loading</div>
-    </Spin>
-<#include "./modal.ftl">
-    <div class="layout">
-        <div class="jm-rp-left-container">
-            <div id="treeDiv">
-                <span slot="title" @click="toggleLeft" style="float: top;display: flex" class="icnoAlignment">
-                   <span style="color: #000000;font-size: 12px;position: relative;top: 4px;" v-if="dataShow">收起</span> <Icon type="md-arrow-dropleft" size="24"/>
-                </span>
-                <!-- 数据源设置 -->
-                <j-data-source-setting  ref="dataSource" @saveback="saveDbBack" @cancelback="cancelback"></j-data-source-setting>
-                <!-- javabean设置 -->
-                <j-javabean-setting  ref="javabean" @saveback="saveDbBack" @cancelback="cancelback"></j-javabean-setting>
-                <card style="width: 221px;" v-if="dataShow" :style="{'overflowY':'auto', 'height':windowHeight+'px'}">
-                    <template>
-                        <div id="dataDiv">
-                            <template>
-                                <i-menu theme="light" style="margin-left: -25px;z-index: auto;width: auto !important;" :class="menuitemClasses">
-                                        <div style="width:95%;height: 30px;border: none;margin-left: 10px; z-index:999;cursor: pointer;margin-left:27px">
-                                            <span class="rightFontSize">数据集管理
-                                                <Tooltip :transfer="true" content="数据源管理文档" placement="left" class="jimu-tooltip">
-                                                    <a class=" help-color" href="https://help.jeecg.com/jimureport/base/dataSet.html" target="_blank" style="margin-right: 15px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
-                                                </Tooltip>
-                                            </span>
-                                            <Dropdown @on-click="onMenuSelect" placement="bottom-start" :transfer="true">
-                                                <a href="javascript:void(0)">
-                                                    <Icon type="md-add" style="position:relative;left:89px"/>
-                                                </a>
-                                                <Dropdown-menu slot="list">
-                                                    <Dropdown-item name="sqlInfo" class="rightFontSize">SQL数据集</Dropdown-item>
-                                                    <Dropdown-item name="apiInfo" class="rightFontSize">API数据集</Dropdown-item>
-                                                    <Dropdown-item name="javabean" class="rightFontSize">JavaBean数据集</Dropdown-item>
-                                                    <Dropdown-item name="jsonInfo" class="rightFontSize">JSON数据集</Dropdown-item>
-                                                </Dropdown-menu>
-                                            </Dropdown>
-                                        </div>
-                                    <div id="dataTree">
-                                        <template v-for="(item,index) in treeData">
-                                            <Tree :data="item" @on-toggle-expand="onTreeToggleExpand" @on-select-change="changeTree"></Tree>
-                                        </template>
-                                    </div>
-
-                                    <Submenu name="reportIfo" class="reportIfo">
-                                        <template slot="title">
-                                            <span class="rightFontSize">报表信息</span>
-                                        </template>
-                                        <div style="height: 86px;line-height: 8px;margin-left: 25px;">
-                                            <div>
-                                                <i-form :model="designerObj" label-colon :label-width="90"  class="dataSourceForm">
-                                                    <div label="" class="rightFontSize">
-                                                        <span>名称</span>
-                                                        <i-input v-model="designerObj.name" placeholder="请输入名称" @on-blur="excelQueryName" @on-change="changeName" class="rightFontSize" style="margin-left: 4px; width: 132px;"></i-input>
-                                                    </div>
-
-                                                    <div class="dataSourceForm rightFontSize" style="margin-top: 10px">
-                                                        <span>类型</span>
-                                                        <i-select  :transfer="true" :model.sync="designerObj.type" v-model="designerObj.type" style="margin-left: 4px;  width: 132px;" @on-change="selectmenuList">
-                                                            <i-option style="z-index: 9999" class="rightFontSize" v-for="item in menuList" :value="item.value">{{ item.label }}</i-option>
-                                                        </i-select>
-                                                    </div>
-                                                </i-form>
-                                            </div>
-                                        </div>
-                                    </Submenu>
-                                    <j-data-dictionary ref="dataDictionary"></j-data-dictionary>
-                                    <div style="width:100%;height: 45px;border: none;margin-left: 25px;cursor: pointer;margin-top: 10px">
-                                      <span @click="createDictClick" class="rightFontSize">数据字典<i style="position: relative;left:100px;font-size: 14px;" class="ivu-icon ivu-icon-md-create"></i></span>
-                                      <Tooltip :transfer="true" content="数据字典文档" placement="left" class="jimu-tooltip">
-                                          <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/dictionary.html" target="_blank"  style="margin-right: 26px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
-                                      </Tooltip>
-                                    </div>
-                                </i-menu>
-                            </template>
-                        </div>
-                    </template>
-                </card>
-            </div>
-        </div>
-
-        <div :class="centerDivClass">
-            <div id="tableDiv">
-                <Card>
-                    <div class="layout-content" style="overflow: auto">
-                        <div id="jm-sheet-wrapper" style="overflow:auto"></div>
-                    </div>
-                </Card>
-            </div>
-        </div>
-        <div class="jm-rp-right-container">
-            <div id="propsDiv">
-                <span slot="title" @click="toggleRight">
-                    <span style="color: #000000;font-size: 12px;position: relative;top: 4px;float: right;right:200px" v-if="propsContentShow">收起</span><Icon type="md-arrow-dropright" size="24"/>
-                </span>
-                <card style="width: 250px;height: 977px" v-if="propsContentShow" class="rightPadding">
-                    <Tabs size="small" v-model="rightTabName" >
-
-                        <!-- 基本设置  -->
-                        <tab-pane label="基本" name="name1" :class="'little-input'"  class="basic">
-                            <div id="propsContentDiv" class="layout-content jm-setting-container" :style="{height: settingsHeight+'px'}">
-                                <div class="dataSourceForm">
-                                  <div class="rightFontSize">
-                                    <span >坐标</span>
-                                    <i-input class="twoInputWidth" disabled v-model="excel.coordinate"></i-input>
-                                  </div>
-                                  <div class="basicSettingTop">
-                                    <span class="rightFontSize">类型</span>
-<#--                                    <p @click="customExpression">自定义表单式</p>-->
-                                    <i-select class="twoInputWidth" v-model="excel.type" @on-change="onChangeCellDisplay">
-                                        <i-option value="normal" key="1" class="rightFontSize">文本</i-option>
-                                        <i-option value="number" key="0" class="rightFontSize">数值</i-option>
-                                        <i-option value="img" key="2" class="rightFontSize">图片</i-option>
-                                        <i-option value="barcode" key="3" class="rightFontSize">条形码</i-option>
-                                        <i-option value="qrcode" key="4" class="rightFontSize">二维码</i-option>
-                                        <i-option value="richText" key="5" class="rightFontSize">富文本</i-option>
-                                        <#--<i-option value="chart" key="5">图表</i-option>-->
-                                    </i-select>
-                                  </div>
-                                  <div class="basicSettingTop rightFontSize" v-if="excel.type == 'img'">
-                                    <span>尺寸</span>
-                                      <i-select class="twoInputWidth" v-model="excel.imgSize" @on-change="onChangeCellImgSize">
-                                          <i-option value="0" key="0" class="rightFontSize">完全覆盖(cover)</i-option>
-                                          <i-option value="1" key="1" class="rightFontSize">适应内容(contain)</i-option>
-                                          <i-option value="2" key="2" class="rightFontSize">width100%--center</i-option>
-                                          <i-option value="3" key="3" class="rightFontSize">height100%--center</i-option>
-                                          <i-option value="4" key="4" class="rightFontSize">居中显示</i-option>
-                                          <i-option value="5" key="5" class="rightFontSize">拉伸(100% 100%)</i-option>
-                                      </i-select>
-                                  </div>
-
-                                  <div class="basicSettingTop rightFontSize">
-                                    <span>值</span>
-                                    <i-input @on-click="enlargeInputClick" icon="md-contract" style="margin-left: 16px;" v-model="excel.excelValue" @keyup.enter.native="submitValue" @on-blur="submitValue" class="twoInputWidth"></i-input>
-                                  </div>
-
-                                  <div class="basicSettingTop rightFontSize">
-                                    <span >宽度</span>
-                                    <i-input title="输入完值回车生效!" placeholder="输入完值回车生效!" v-model="excel.width" @keyup.enter.native="handleChangeCellWidth" @on-blur="handleChangeCellWidth"  class="twoInputWidth" :disabled="excel.isMergeCell"></i-input>
-                                  </div>
-
-                                  <div class="rightFontSize basicSettingTop">
-                                    <span >高度</span>
-                                    <i-input title="输入完值回车生效!" placeholder="输入完值回车生效!" v-model="excel.height" @on-blur="handleChangeCellHeight" @keyup.enter.native="handleChangeCellHeight" class="twoInputWidth" :disabled="excel.isMergeCell"></i-input>
-                                  </div>
-
-                                  <i-menu theme="light" width="100%" :class="menuitemClasses">
-
-                                      <Submenu name="blankRowSetting">
-                                          <template slot="title">
-                                              <span class="rightFontSize">补充空白行
-                                                <Tooltip :transfer="true" content="补充空白行文档" placement="left" class="jimu-tooltip">
-                                                    <a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/base/completeLines.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                                </Tooltip>
-                                              </span>
-                                          </template>
-                                          <div>
-                                              <div class="rightFontSize" style="padding-left:2px">
-                                                  <Checkbox v-model="excel.completeBlankStatus" @on-change="onChangeCompleteBlankStatus">启用</Checkbox>
-                                              </div>
-                                              <div class="rightFontSize" style="margin-top:12px">
-                                                  <span>数据行倍数：</span>
-                                                  <i-input type="number" v-model="excel.completeBlankRow" @on-change="onChangeCompleteBlankRow" style="width:80px" class="rightFontSize"></i-input>
-                                              </div>
-                                          </div>
-                                      </Submenu>
-
-                                    <div v-if="excel.hasGroup">
-
-
-                                      <Submenu name="groupSetting">
-                                        <template slot="title">
-                                          <span class="rightFontSize">分组设置
-                                             <Tooltip :transfer="true" content="分组设置文档" placement="left" class="jimu-tooltip">
-                                                <a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/datareport/group.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                            </Tooltip>      
-                                          </span>
-                                        </template>
-                                        <div>
-                                            <div class="rightFontSize">
-                                              <span>聚合方式</span>
-                                              <i-select ref="excelPolyWay" :transfer="true"  :model.sync="excel.polyWay" v-model="excel.polyWay" @on-change="selectPolyList" class="fourInputWidth" :disabled="wayDisabled">
-                                                <i-option class="rightFontSize" v-for="item in polyWayList" :value="item.value">{{ item.label }}</i-option>
-                                              </i-select>
-                                            </div>
-                                            <div class="basicSettingTop rightFontSize">
-                                              <span>扩展方向</span>
-                                              <i-select :model.sync="excel.direction" :transfer="true"  v-model="excel.direction" @on-change="selectDirectionList" class="fourInputWidth">
-                                                <i-option class="rightFontSize" v-for="item in directionList" :value="item.value">{{ item.label }}</i-option>
-                                              </i-select>
-                                            </div>
-                                            <div class="basicSettingTop rightFontSize">
-                                                <span>排序方式</span>
-                                                <i-select :transfer="true" :model.sync="excel.sort" :transfer="true"  v-model="excel.sort" @on-change="selectSortList" class="fourInputWidth">
-                                                    <i-option class="rightFontSize" v-for="item in sortType" :value="item.value">{{ item.label }}</i-option>
-                                                </i-select>
-                                            </div>
-                                            <div class="basicSettingTop rightFontSize">
-                                                <span>自定义文本排序</span>
-                                                <i-input v-model="excel.textOrders" :autosize="true" type="textarea" @on-change="selectTextOrders" placeholder="文本以|分割，示例：1月|2月|3月"></i-input>
-                                            </div>
-                                            <div class="basicSettingTop rightFontSize">
-                                              <span>高级配置</span>
-                                              <i-select :transfer="true" :model.sync="excel.advanced" :transfer="true"  v-model="excel.advanced" @on-change="selectAdvancedList" class="fourInputWidth">
-                                                <i-option class="rightFontSize" v-for="item in advancedList" :value="item.value">{{ item.label }}</i-option>
-                                              </i-select>
-                                            </div>
-                                        </div>    
-                                      </Submenu>
-                                         <!--分组小计设置-->
-                                        <Submenu name="subtotalSetting">
-                                            <template slot="title">
-                                                <span class="rightFontSize">小计设置
-                                                    <Tooltip :transfer="true" content="分组小计文档" placement="left" class="jimu-tooltip">
-                                                        <a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/group/verticalSubtotal.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                                    </Tooltip>  
-                                                </span>
-                                            </template>
-
-                                            <div class="rightFontSize"  v-if="excel.funcname=='-1'">
-                                                <span>分组依据</span>
-                                                <i-select ref="excelSubtotal" :transfer="true"  v-model="excel.subtotal" @on-change="selectSubtotal" class="fourInputWidth">
-                                                    <i-option class="rightFontSize" v-for="item in subtotalList" :value="item.value">{{ item.label }}</i-option>
-                                                </i-select>
-                                            </div>
-
-                                            <div  :class="['rightFontSize',{'basicSettingTop':excel.subtotal=='-1'&&excel.funcname=='-1'}]" v-if="excel.subtotal=='-1'" >
-                                                    <span>聚合方式</span>
-                                                    <i-select ref="excelAggregate" :transfer="true"  v-model="excel.funcname"   @on-change="selectAggregate" class="fourInputWidth">
-                                                        <i-option class="rightFontSize" v-for="item in aggregateList" :value="item.value">{{ item.label }}</i-option>
-                                                    </i-select>
-                                            </div>
-                                        </Submenu>
-                                    </div>
-
-
-                                  <Submenu name="hyperlinksSetting">
-                                    <template slot="title">
-                                        <span class="rightFontSize">超链接设置
-                                            <Tooltip :transfer="true" content="超链接文档" placement="left" class="jimu-tooltip">
-                                                <a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/datareport/linkage.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                            </Tooltip>
-                                        </span>
-                                    </template>
-
-                                         <span class="rightFontSize">添加链接</span>
-                                         <Dropdown @on-click="onHyperlinksClick" placement="bottom-start" :transfer="true">
-                                             <a href="javascript:void(0)">
-                                                 <Icon type="md-add" style="margin-left: 20px"/>
-                                             </a>
-                                             <Dropdown-menu slot="list">
-                                                 <Dropdown-item name="2" class="rightFontSize">图表联动</Dropdown-item>
-                                                 <Dropdown-item name="0" class="rightFontSize">报表钻取</Dropdown-item>
-                                                 <Dropdown-item name="1" class="rightFontSize">网络报表</Dropdown-item>
-                                             </Dropdown-menu>
-                                         </Dropdown>
-
-                                    <i-table style="margin-top: 10px" class="rightFontSize" :columns="hyperlinks.columns" :data="hyperlinks.data"></i-table>
-                                    <j-hyperlinks-setting ref="hyperlinksModel"  :excel="linkExcel" @lingcallback="lingCallBack"></j-hyperlinks-setting>
-
-                                      <j-chart-linkage ref="chartLinkage" @ok="chartLinkageConfigSuccess"></j-chart-linkage>
-
-                                      <j-cell-linkage ref="cellLinkage" @ok="cellLinkageConfigSuccess"></j-cell-linkage>
-
-                                  </Submenu>
-                                  <Submenu name="otherSetting">
-                                      <template slot="title">
-                                          <span class="rightFontSize">其他设置
-                                              <Tooltip :transfer="true" content="数据格式化文档" placement="left" class="jimu-tooltip">
-                                                  <a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/base/dataFormat.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                              </Tooltip>  
-                                          </span>
-                                      </template>
-                                    <div class="rightFontSize">
-                                        <span>小数位数</span>
-                                        <i-input class="rightFontSize fourInputWidth" v-model="excel.decimalPlaces" @on-change="onChangeDecimalPlaces"></i-input>
-                                    </div>
-                                    <div class="rightFontSize" style="margin-top: 5px;padding:0 5px">
-                                        <i-button @click="showEnhanceConfig" icon="md-code-working" size="small" long type="primary" ghost>增强配置</i-button>
-                                    </div>
-                                  </Submenu>
-                                  <!--参数设置-->  
-                                  <Submenu name="primarySubreportSetting">
-                                      <template slot="title">
-                                          <span class="rightFontSize">主子报表参数设置
-                                            <Tooltip :transfer="true" content="主子报表文档" placement="left" class="jimu-tooltip">
-                                                <a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/datareport/masterReport.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                            </Tooltip>
-                                          </span>
-                                      </template>
-                                    <i-button class="rightFontSize" @click="primarySubreportClick">新增</i-button>
-                                    <i-table style="margin-top: 10px" class="rightFontSize" :columns="primarySubreport.columns" :data="primarySubreport.data"></i-table>
-                                    <j-primary-sub-report ref="primarySubreportModal" @mainsubreport="mainsubreport"></j-primary-sub-report>
-                                  </Submenu>
-
-                                  <Submenu name="layerOffset" v-if="layerOffsetEnable">
-                                      <template slot="title">
-                                          <span class="rightFontSize">图片偏移量设置</span>
-                                      </template>
-                                      <div class="rightFontSize">
-                                          <span>横向偏移(px)：</span>
-                                          <i-input type="number" style="margin-left: 10px;width:90px !important;" v-model="layerOffsetX" @on-change="handleChangeLayerOffset" class="twoInputWidth"></i-input>
-                                      </div>
-
-                                      <div class="rightFontSize" style="margin-top:12px">
-                                          <span>纵向偏移(px)：</span>
-                                          <i-input type="number" style="margin-left: 10px;width:90px !important;" v-model="layerOffsetY" @on-change="handleChangeLayerOffset" class="twoInputWidth"></i-input>
-                                      </div>
-                                  </Submenu>
-
-                                </i-menu>
-                              </div>
-                            </div>
-                        </tab-pane>
-
-                        <!-- 图表样式设置  -->
-                        <tab-pane v-if="chartsflag && !backgroundSettingShow" label="样式" name="name2" :disabled="selectedChartType==='apiUrlType'" class="stylePadding">
-                            <i-menu theme="light" width="auto" :style="{height: settingsHeight+'px', marginLeft: '-20px'}" :class="menuitemClasses" accordion>
-
-                                <!-- 标题设置 -->
-                                <j-title-setting v-if="titleSettings" @change="onSettingsChange" :settings="titleSettings"></j-title-setting>
-                                <!-- 柱体设置 -->
-                                <j-bar-setting v-if="barSettings" @change="onSeriesChange" :settings="barSettings" :is-multi-chart="isMultiChart"></j-bar-setting>
-                                <!-- 线体设置 -->
-                                <j-line-setting v-if="lineSettings" @change="onSeriesChange" :settings="lineSettings" :is-multi-chart="isMultiChart"></j-line-setting>
-                                <!-- 饼图设置-->
-                                <j-pie-setting v-if="pieSettings" @change="onSeriesChange" :settings="pieSettings"></j-pie-setting>
-                                <!-- 边距设置-->
-                                <j-margin-setting v-if="marginSettings" @change="onSeriesChange" :settings="marginSettings"></j-margin-setting>
-                                <!-- 中心点设置-->
-                                <j-central-point-setting v-if="centralPointSettings" @change="onSeriesChange" :settings="centralPointSettings"></j-central-point-setting>
-                                <!-- 漏斗设置-->
-                                <j-funnel-setting v-if="funnelSettings" @change="onSeriesChange" :settings="funnelSettings"></j-funnel-setting>
-                                <!-- 象形图设置 -->
-                                <j-pictorial-setting v-if="pictorialSettings" @change="onPictorialChange" @upload-success="pictorialIconUploadSuccess" :settings="pictorialSettings"></j-pictorial-setting>
-                                <!-- 地图设置 -->
-                                <j-map-setting  ref="mapModal" v-if="mapGeoSettings" @change="onSettingsChange" :settings="mapGeoSettings"></j-map-setting>
-                                <!-- 散点设置-->
-                                <j-scatter-setting v-if="scatterSettings" @change="onSeriesChange" :settings="scatterSettings"></j-scatter-setting>
-                                <!-- 雷达设置-->
-                                <j-radar-setting v-if="radarSettings" @change="onSettingsChange" :settings="radarSettings"></j-radar-setting>
-                                <!-- 仪表盘设置-->
-                                <j-gauge-setting v-if="gaugeSettings" @change="onSeriesChange" :settings="gaugeSettings"></j-gauge-setting>
-                                <!-- x轴设置-->
-                                <j-xaxis-setting v-if="xAxisSettings" @change="onSettingsChange" :settings="xAxisSettings"></j-xaxis-setting>
-                                <!-- y轴设置(settings支持数组)-->
-                                <j-yaxis-setting v-if="yAxisSettings" @change="onSettingsChange" :settings="yAxisSettings"></j-yaxis-setting>
-                                <!-- 数值设置-->
-                                <j-series-setting v-if="seriesLabelSettings" @change="onSeriesChange" :settings="seriesLabelSettings"></j-series-setting>
-                                <!-- 提示语设置-->
-                                <j-tooltip-setting v-if="tooltipSettings" @change="onSettingsChange" :settings="tooltipSettings"></j-tooltip-setting>
-                                <!-- 坐标轴边距设置-->
-                                <j-grid-setting v-if="gridSettings" @change="onSettingsChange" :settings="gridSettings"></j-grid-setting>
-                                <!-- 图例设置-->
-                                <j-legend-setting v-if="legendSettings" @change="onSettingsChange" :settings="legendSettings"></j-legend-setting>
-                                <!-- 自定义配色-->
-                                <j-match-setting style="border-bottom: inset 1px;" v-if="graphSettings ||gaugeSettings ||funnelSettings || pieSettings || isMultiChart || selectedChartType.indexOf('multi')!=-1 || selectedChartType == 'radar.basic'" :chart-options="chartOptions"  :data-settings="dataSettings" ></j-match-setting>
-                                <!-- 背景设置-->
-                                <j-background-setting  @change="chartBackgroundChange" @upload-success="chartBackgroundUploadSuccess" @remove="removeChartBackground" :settings="chartBackground"></j-background-setting>
-                                <!-- 柱形图系列类型设计-->
-                                <#--<j-bar-series-setting  style="border-bottom: inset 1px;" :chart-options="chartOptions" :data-settings="dataSettings" v-if="selectedChartType == 'bar.multi' || selectedChartType == 'line.multi' "></j-bar-series-setting>-->
-                            </i-menu>
-                        </tab-pane>
-
-                        <!-- 图表数据设置  -->
-                        <tab-pane style="padding:10px 8px;" v-if="chartsflag && selectedChartType !== 'map.simple'" :label="dataLabel" name="name3" :class="'little-input'">
-                            <div class="datastyle rightFontSize dataSourceForm">
-                                <span>数据类型</span>
-                                <i-select class="fourInputWidth" v-model="dataSettings.dataType" :disabled="selectedChartType==='apiUrlType'" @on-change="dataTypeChange">
-                                    <i-option class="rightFontSize" value="sql">SQL数据集</i-option>
-                                    <i-option class="rightFontSize" value="api">Api数据集</i-option>
-                                    <i-option class="rightFontSize" value="json">JSON数据集</i-option>
-                                    <i-option class="rightFontSize" value="javabean">JavaBean数据集</i-option>
-                                </i-select>
-                            </div>
-
-                            <!-- api数据集 -->
-                            <div class="datastyle rightFontSize dataSourceForm" v-if="dataSettings.dataType == 'api'">
-                                <div class="datastyle">
-                                    <span style="margin-left: 7px">Api类型</span>
-                                    <i-select class="fourInputWidth" v-model="dataSettings.apiStatus" :disabled="selectedChartType==='apiUrlType'" @on-change="seriesOnChange">
-                                        <i-option class="rightFontSize" value="0">静态数据</i-option>
-                                        <i-option class="rightFontSize" value="1">动态数据</i-option>
-                                        <i-option class="rightFontSize" value="2">接口请求</i-option>
-                                    </i-select>
-                                </div>
-                                <div class="datastyle" v-if="dataSettings.apiStatus == '0'">
-                                    <span style="display: inline-block;text-align: left;width: calc(100% - 50px);">请自定义数据值:</span>
-                                    <i-button style="width: 44px;" size="small" type="primary" @click="addEchartInfoData">编辑</i-button>
-                                </div>
-                                <div class="datastyle" v-if="dataSettings.apiStatus == '2'">
-                                    <p>接口url:&nbsp;&nbsp;</p>
-                                    <i-input v-model="dataSettings.apiUrl" :autosize="true" type="textarea" placeholder="请输入接口地址..."></i-input>
-                                </div>
-                                <div class="datastyle rightFontSize dataSourceForm" v-if="dataSettings.apiStatus == '1'">
-                                    <div>
-                                        <span>绑定数据集:</span>
-                                        <i-select style="width: 136px" v-model="dataSettings.dataId" @on-change="onSelectApiData">
-                                            <i-option class="rightFontSize" v-for="item in apiDataList" :value="item.dbId">{{ item.title }}</i-option>
-                                        </i-select>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- sql数据集 -->
-                            <div class="datastyle rightFontSize dataSourceForm" v-if="dataSettings.dataType == 'sql'">
-                                <div class="datastyle">
-                                    <span>绑定数据集:</span>
-                                    <i-select style="width: 136px" v-model="dataSettings.dataId" @on-change="onSelectSqlData">
-                                        <i-option class="rightFontSize" v-for="item in sqlDataList" :value="item.dbId">{{ item.title }}</i-option>
-                                    </i-select>
-                                </div>
-                                <div class="datastyle">
-                                    <span>分类属性:</span>
-                                    <i-select class="fourInputWidth" v-model="dataSettings.axisX" @on-change="onAxisXConfigChange">
-                                        <i-option class="rightFontSize" v-for="item in sqlDataFieldList" :value="item.title">{{ item.fieldText }}</i-option>
-                                    </i-select>
-                                </div>
-                                <div class="datastyle">
-                                    <span style="margin-left: 12px">值属性:</span>
-                                    <i-select class="fourInputWidth" :model.sync="dataSettings.axisY" v-model="dataSettings.axisY" @on-change="onAxisYConfigChange">
-                                        <i-option class="rightFontSize" v-for="item in sqlDataFieldList" :value="item.title">{{ item.fieldText }}</i-option>
-                                    </i-select>
-                                </div>
-                                <template v-if="isMultiChart || selectedChartType.indexOf('radar') !==-1 || selectedChartType == 'graph.simple'">
-                                    <div class="datastyle">
-                                        <span>系列属性:</span>
-                                        <i-select class="fourInputWidth" v-model="dataSettings.series">
-                                            <i-option v-for="item in sqlDataFieldList" :value="item.title">{{ item.title }}</i-option>
-                                        </i-select>
-                                    </div>
-                                </template>
-                                <!--分割线-->
-                                <template v-if="selectedChartType == 'graph.simple'">
-                                    <Divider  style="margin: 20px 0 20px 0"></Divider>
-                                    <div class="datastyle">
-                                        <span>绑定节点关系数据集:</span>
-                                        <i-select style="width: 48%" v-model="dataSettings.dataId1" @on-change="onSelectSqlData2">
-                                            <i-option v-for="item in sqlDataList" :value="item.dbId">{{ item.title }}</i-option>
-                                        </i-select>
-                                    </div>
-                                    <div class="datastyle">
-                                        <span>来源属性:</span>
-                                        <i-select class="fourInputWidth" v-model="dataSettings.source">
-                                            <i-option v-for="item in sqlDataFieldList2" :value="item.title">{{ item.title }}</i-option>
-                                        </i-select>
-                                    </div>
-                                    <div class="datastyle">
-                                        <span>目标属性:</span>
-                                        <i-select class="fourInputWidth" :model.sync="dataSettings.target" v-model="dataSettings.target">
-                                            <i-option v-for="item in sqlDataFieldList2" :value="item.title">{{ item.title }}</i-option>
-                                        </i-select>
-                                    </div>
-                                </template>
-                            </div>
-
-                            <!-- json数据集 -->
-                            <div class="datastyle rightFontSize dataSourceForm" v-if="dataSettings.dataType == 'json'">
-                              <div>
-                                <span>绑定数据集:</span>
-                                <i-select style="width: 136px" v-model="dataSettings.dataId" @on-change="onSelectJsonData">
-                                  <i-option class="rightFontSize" v-for="item in jsonDataList" :value="item.dbId">{{ item.title }}</i-option>
-                                </i-select>
-                              </div>
-                            </div>   
-                            
-                            <!-- javaBean数据集 -->
-                            <div class="datastyle rightFontSize dataSourceForm" v-if="dataSettings.dataType == 'javabean'">
-                              <div>
-                                <span>绑定数据集:</span>
-                                <i-select style="width: 136px" v-model="dataSettings.dataId" @on-change="onSelectJavaBeanData">
-                                  <i-option class="rightFontSize" v-for="item in javaBeanDataList" :value="item.dbId">{{ item.title }}</i-option>
-                                </i-select>
-                              </div>
-                            </div>
-                            <!-- 多维度处理  -->
-                            <div class="datastyle" v-if="(dataSettings.dataType == 'sql' || dataSettings.apiStatus == '1' || dataSettings.apiStatus == '0') && (selectedChartType == 'mixed.linebar'||selectedChartType == 'bar.stack')|| selectedChartId=='bar.negative'">
-                                <p>系列类型:</p>
-                                <div style="margin-top: 5px;">
-                                    <Row class="ivurow" style="margin-top: 5px;">
-                                        <i-button type="primary" size="small" @click="seriesModal=true">新增</i-button>
-                                    </Row>
-                                    <i-table stripe :columns="seriesColumns" :data="seriesTypeData"></i-table>
-                                </div>
-                            </div>
-                        <!-- 刷新配置 -->
-                            <template class="rightFontSize" v-if="dataSettings.apiStatus==='1' || dataSettings.dataType == 'sql'">
-                                <div class="datastyle">
-                                    <span style="display: inline-block;text-align: left;width: calc(100% - 50px);" class="rightFontSize">定时刷新:</span>
-                                    <i-switch size="small" v-model="dataSettings.isTiming" @on-change="timerChange"/>
-                                </div>
-                                <div class="datastyle" style="display: flex;align-items: center;" v-if="dataSettings.isTiming">
-                                    <span style="display: inline-block;text-align: left;width: calc(100% - 100px);">刷新间隔:</span>
-                                    <i-input size="small" type="number" v-model="dataSettings.intervalTime" style="width:100px" @on-blur="timerChange"><span slot="append">秒</span></i-input>
-                                </div>
-                            </template>
-                            <i-button @click="runChart" type="primary" style="width: 100%;height: 36px;margin-top: 10%;">运行</i-button>
-                        </tab-pane>
-
-                        <!-- 背景图设置  -->
-                        <tab-pane v-if="backgroundSettingShow" style="visibility: visible" label="背景图设置" name="name4" :class="'little-input'" class="rightFontSize dataSourceForm">
-                           <div :class="backgroundSettings.path?'excel-backgroud-st':''" style="height: 500px;overflow-y: auto;padding:14px 7px;">
-                               <span style="display:inline-block;margin: 5px 0">图片：</span>
-                               <Upload
-                                   ref="upload"
-                                   :headers = "uploadHeaders"
-                                   :show-upload-list="false"
-                                   :default-file-list="backgroundImg"
-                                   :on-success="backgroundImgUploadSuccess"
-                                   :on-exceeded-size="(e)=>handleMaxSize(e,10)"
-                                   :format="['jpg','jpeg','png']"
-                                   :max-size="10240"
-                                   :action=" actionUrlPre + '/jmreport/upload' "
-                                   style="display: inline-block;width:58px;">
-                                   <div style="display: block" class="pictorial-icon-upload" v-if="backgroundSettings.path">
-                                       <img style="width: 196px;max-height: 100px" :src="getBackgroundImg()"/>
-                                       <div class="cover" style="width: 196px">
-                                           <Icon type="ios-create-outline"/>
-                                       </div>
-                                   </div>
-                                   <i-button v-else style="margin-left:25px" type="primary" size="small">上传</i-button>
-                               </Upload>
-
-                               <div style="width:100%">
-                                  <div class="basicSettingTop">
-                                      <span style="padding: 6px 0">图片宽度:</span>
-                                      <i-input class="fourInputWidth" v-model="backgroundSettings.width" @on-blur="backgroundChange"></i-input>
-                                  </div>
-                                   <div class="basicSettingTop">
-                                       <span style="padding: 6px 0">图片高度:</span>
-                                       <i-input class="fourInputWidth" v-model="backgroundSettings.height" @on-blur="backgroundChange"></i-input>
-                                   </div>
-                               </div>
-
-                               <div style="width:100%;" class="basicSettingTop">
-                                   <span style="padding: 6px 0">重复设置:</span>
-                                   <i-select class="fourInputWidth" v-model="backgroundSettings.repeat" style="width:99%" @on-change="backgroundChange">
-                                       <i-option class="rightFontSize" value="no-repeat">无重复</i-option>
-                                       <i-option class="rightFontSize" value="repeat-x">水平重复</i-option>
-                                       <i-option class="rightFontSize" value="repeat-y">垂直重复</i-option>
-                                       <i-option class="rightFontSize" value="repeat">双向重复</i-option>
-                                   </i-select>
-                               </div>
-
-                               <i-button v-if="backgroundSettings.path" style="width: 99%;margin:10px 0" type="primary" @click="removeBackground">取消背景图</i-button>
-
-                               <div style="width:100%;" class="basicSettingTop">
-                                   <span style="padding: 6px 0">表格边框:</span>
-                                   <i-select class="fourInputWidth" v-model="gridLine" style="width:99%" @on-change="gridLineChange">
-                                       <i-option class="rightFontSize" value="true">显示</i-option>
-                                       <i-option class="rightFontSize" value="false">隐藏</i-option>
-                                   </i-select>
-                               </div>
-
-                           </div>
-                        </tab-pane>
-
-                        <!-- 条形码设置  -->
-                        <tab-pane v-if="barcodeSettings" style="visibility: visible" :label="qrCodeLabel" name="name5" :class="'little-input'">
-                            <j-barcode-setting @change="onBarcodeChange" :settings="barcodeSettings"></j-barcode-setting>
-                        </tab-pane>
-
-                        <!-- 二维码设置  -->
-                        <tab-pane v-if="qrcodeSettings" style="visibility: visible" :label="codeLabel" name="name6" :class="'little-input'">
-                            <j-qrcode-setting @change="onBarcodeChange" :settings="qrcodeSettings"></j-qrcode-setting>
-                        </tab-pane>
-                    </Tabs>
-
-                </card>
-            </div>
-        </div>
-    </div>
-    <!-- 打印配置弹框 -->
-    <j-print-setting :show="printSettingShow" :settings="printSettings" :config="configString" @change="onPrintSettingChange"></j-print-setting>
-
-    <j-view-setting :show="viewSettingShow" :settings="viewSettings" @change="onViewSettingChange"></j-view-setting>
-</div>
-
-<script>
-
-    var excel_config_id = "${config_id}";
-    var excel_req_token = '';
-    var excel_req_tenantId = '';
-    var xs = null;
-    var vm = null;
-    let autoSaveFun;
-
-    /**
-     * 获取后台配置的报表配置
-     */
-    function getReportConfigJson() {
-        let str = '${reportConfig}';
-        return JSON.parse(str)
-    }
-
-    function load() {
-        let token = window.localStorage.getItem('JmReport-Access-Token');
-        if (token == "" || token == null){
-            token = getRequestUrl().token;
-        }
-        excel_req_token = token
-        let tenantId = window.localStorage.getItem('JmReport-Tenant-Id');
-        if (tenantId == "" || tenantId == null){
-            tenantId = getRequestUrl().tenantId;
-        }
-        excel_req_tenantId = tenantId;
-        //console.log("index_load--------------",token);
-        let reportConfig = getReportConfigJson();
-        let colLength = 50,rowLength = 100, viewPageSize = [10,20,30], printPaper = []
-        if(reportConfig['pageSize']){
-            viewPageSize = reportConfig['pageSize']
-        }
-        if(reportConfig['col']){
-            colLength = reportConfig['col']
-        }
-        if(reportConfig['row']){
-            rowLength = reportConfig['row']
-        }
-        if(reportConfig['printPaper']){
-            printPaper = reportConfig['printPaper']
-        }
-        let showGridLine = true;
-        if(reportConfig['line']==false){
-            showGridLine = false;
-        }
-        const options = {
-            "domain": 'http://localhost:8080/jeecg-boot',
-            "viewLocalImage":JM_VIEW_IMG_URL,//预览本地图片方法
-            "uploadUrl":"/jmreport/upload", //统一上传地址
-            "uploadExcelUrl":"/jmreport/importExcel?token="+token,//上传excel方法
-            pageSize: viewPageSize, //分页条数
-            printPaper: printPaper,
-            domain:window.location.origin+baseFull,
-            showToolbar: true,     //头部操作按钮
-            showGrid: showGridLine,        //excel表格
-            showContextmenu: true, //右键操作按钮
-            view: {
-                height: () => document.documentElement.clientHeight,
-                width: () => document.documentElement.clientWidth,
-            },
-            row: {
-                len: rowLength,
-                height: 25,
-                minRowResizerHeight:1 //拖拽行最小高度
-            },
-            col: {
-                len: colLength,
-                width: 100,
-                minWidth: 60,
-                height: 0,
-                minColResizerHeight:1//拖拽列最小高度
-            },
-            style: {
-                bgcolor: '#ffffff',
-                align: 'left',
-                valign: 'middle',
-                textwrap: false,
-                strike: false,
-                underline: false,
-                color: '#0a0a0a',
-                font: {
-                    name: 'Microsoft YaHei',
-                    size: 10,
-                    bold: false,
-                    italic: false,
-                },
-            },
-        };
-
-        x.spreadsheet.locale('zh-cn');
-        xs = x.spreadsheet('#jm-sheet-wrapper', options)
-                .onSave(function (data) {
-                    //console.log("data: ", data)
-                    //设置报表打印宽度
-                    const dataRect = xs.data.getDataRect();
-                    let dataRectWidth = 0;
-                    if(dataRect){
-                        dataRectWidth = dataRect.w;
-                    }
-                    //直接读取文本框的值
-                 //   const printElWidth = xs.sheet.toolbar.toolPrintInputEl.input.el.value
-                    data['dataRectWidth'] = dataRectWidth;
-                    data['excel_config_id'] = excel_config_id;
-                  //  data['printElWidth'] = Number(printElWidth) || dataRectWidth;
-                  //  data['printElHeight'] = Number(xs.sheet.toolbar.toolPrintHeightInputEl.input.el.value)
-                    data['toolPrintSizeObj'] = xs.data.toolPrintSizeObj;
-
-                    $jm.excelSave(data, token,function (res) {
-                        xs.tip("保存成功!");
-                        let refresh = res.isRefresh;
-                        if(refresh && refresh==true){
-                          window.location.reload()
-                        }
-                    });
-                })
-                .onAddChart(function(a){
-                    vm.addChartModule();
-                })
-                .onSelectChart(function(data){
-                    vm.clearRightTabpane();
-                    setTimeout(()=>{
-                        vm.selectChart(data);
-                    },200)
-                })
-                .onChartDelete(function(){
-                    vm.chartsflag=false;
-                    vm.rightTabName='name1';
-                })
-                .onSettingEvent(function (e, param) {
-                    if(e==='background'){
-                        vm.handleBackground(param)
-                    }else if(e==='clickcell'){
-                        vm.onClickCell(param)
-                        //是否在弹窗情况下
-                        //TODO 先注释掉获取单元格的方法
-                        // if(vm.commonFunction){
-                        //   let ci = param.ci;
-                        //   let ri = param.ri+1;
-                        //   //对列转换成英文字母
-                        //   let excelStr = vm.excelColIndexToStr(ci);
-                        //   //是否选中函数
-                        //   if(vm.interpretation){
-                        //       vm.functionText = excelStr+ri
-                        //       vm.expression = "="+vm.interpretation+"("+excelStr+ri+")"
-                        //   }
-                        // }
-                        if( vm.excel.direction=='right'){
-                          vm.wayDisabled = true;
-                        }else{
-                          vm.wayDisabled = false;
-                        }
-                    }else if(e==='print-setting'){
-                        vm.onPrintSetting(param)
-                    }else if(e==='view-setting'){
-                        vm.onViewSetting(param)
-                    }else if(e==='export-config'){
-                        vm.exportReportConfig()
-                    }
-                })
-                // 自定义校验
-                .onValidate(function (type, cell) {
-                    if(type === 'editor'){
-                        //此事件 cell对象只回传了这三个属性值
-                        let { flag, text } = vm.validateDbExpression(cell.text)
-                        xs.updateEditor({error: !flag, text: text})
-                    }
-                })
-                .onUploadExcel(function (res) {
-                   if(!res.success) return;
-                   const xsData ={...xs.getData()};
-                    let a = res.result
-                    Object.keys(a).map(k=>{
-                        xsData[k] = a[k]
-                    })
-                   xs.loadData(xsData);
-               })
-                .onCellExpress(function (res) {
-                     vm.customExpressionShow=true
-                     //记录坐标
-                     if(res){
-                       vm.expression=res 
-                       //判断是哪个函数，循环list
-                       let functionList = vm.functionList;
-                       let left = 0;
-                       let right = 0;
-                       let text ="";
-                       for (let i = 0; i <functionList.length; i++) {
-                         let functionElement = functionList[i]['name'].split(",");
-                         for (let j = 0; j <functionElement.length; j++) {
-                            if(text && text.indexOf(functionElement[j])>0){
-                              text = functionElement[j];
-                              left = i;
-                              right = j;
-                            }else{
-                              if(vm.expression.indexOf(functionElement[j])>0){
-                                text = functionElement[j];
-                                left = i;
-                                right = j;
-                              } 
-                            }
-                         }
-                       }
-                       vm.commonFunction=true
-                       vm.newFunctionList= vm.functionList[left].name.split(",")
-                       vm.leftFunctionIndex=left
-                       vm.rightFunctionIndex=right
-                       vm.interpretation= text;
-                       return;
-                     }
-                    vm.commonFunction=true
-                    vm.newFunctionList= vm.functionList[0].name.split(",")
-                    vm.leftFunctionIndex=0
-                    vm.rightFunctionIndex=0
-                    vm.interpretation= "sum"
-                });
-
-
-        // issues/I4V3YW 获取屏幕的可见宽度
-        xs.watchScreenInnerWidth(()=>{
-            //获取表格实际能见宽度
-            let width = document.documentElement.clientWidth - 100;
-            if(vm.propsContentShow){
-                width-=250;
-            }
-            if(vm.dataShow){
-                width-=220;
-            }
-            return width;
-        });
-        $jm.excelGet(excel_config_id,(res)=> {
-            //加入预览地址
-            //update-begin---author:wangshuai ---date:20220215  for：[issues/I4SOSH]做完的积木报表，预览生成的访问地址，默认都加了token=null------------
-            xs.data.settings.viewUrl = window.location.origin+api.view+excel_config_id
-            if(excel_req_token && excel_req_token!="null"){
-              xs.data.settings.viewUrl = xs.data.settings.viewUrl +'?token='+excel_req_token
-            }
-            if(excel_req_tenantId && excel_req_tenantId!=="null"){
-                if(xs.data.settings.viewUrl.indexOf("?") !== -1){
-                    xs.data.settings.viewUrl = xs.data.settings.viewUrl +'&tenantId='+excel_req_tenantId
-                }else{
-                    xs.data.settings.viewUrl = xs.data.settings.viewUrl +'?tenantId='+excel_req_tenantId
-                }
-            }
-            //update-end---author:wangshuai ---date:20220215  for：[issues/I4SOSH]做完的积木报表，预览生成的访问地址，默认都加了token=null------------
-            var str = res.jsonStr;
-            if(!str) return;
-            //页面加载时设置报表宽度
-            try{
-                const jsonStr = JSON.parse(str);
-                //console.log('jsonstr', jsonStr)
-                // 设置增强
-                vm.setEnhanceConfig(res.cssStr, res.jsStr)
-                if(jsonStr.chartList)
-                {
-                    jsonStr.chartList.forEach(function(item){
-                        let config = JSON.parse(item.config);
-                        if (config.geo){
-                            if (loadMap){
-                                loadMap && loadMap(item)
-                            }
-                        }
-                    })
-                }
-                xs.data.settings.printElWidth = jsonStr.printElWidth || 0;
-                xs.data.printElHeight = jsonStr.printElHeight ||  1047; //默认a4纸大小
-                //  xs.sheet.toolbar.toolPrintHeightInputEl.input.el.value =  xs.data.printElHeight;
-                xs.loadData(jsonStr);
-                if(jsonStr.settings){
-                    if(jsonStr.settings.showGrid == false){
-                        vm.gridLine = "false"
-                    }
-                }
-            }catch(error){
-                console.error('jsonStr数据解析报错:', error)
-                vm.$Message.warning('配置有误,请检查数据JSON配置项！');
-            }
-            setTimeout(function(){
-                if (xs.data.chartList && xs.data.chartList.length > 0){
-                    //vm.tabPaneShow();
-                    vm.refreshAllChart(xs.data.chartList);
-                }
-            },300)
-            //启动自动保存
-            startAutoSave(token, excel_config_id);
-        },(res)=>{
-            xs.tip(res.message);
-        });
-        /*xs.sheet.toolbar.toolPrintInputEl.input.el.onchange=(e=>{
-            var clientWidth = document.documentElement.clientWidth;
-            var remainingWidth = clientWidth - e.target.value - 330;
-            if (remainingWidth<300){
-                xs.sheet.horizontalScrollbar.el.el.style.overflowX="scroll";
-            }else {
-                xs.sheet.horizontalScrollbar.el.el.style.overflowX="hidden";
-            }
-        })*/
-    }
-
-</script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/util.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/biz/design.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/cdn/vue/md5.min.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/biz/SignMd5Util.js?${CACHE_VERSION}"></script>
-<script>
-     window.onbeforeunload = function(event){
-	   return '您可能有数据没有保存';
-     };
-</script>
-<#include "./common/tj.ftl">
-</body>
-</html>
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl
index 95cea3b7a..763689f40 100644
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl
+++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl
@@ -131,10 +131,6 @@
 <#include "./template/list.ftl">
 <div id="app" style="padding-left: 30px">
     <div class="layout" style="margin-left: -30px;margin-top: -10px;">
-<#--      <div style="background-color: #1890FF;height: 47px">-->
-<#--        <span class="aui-logo"></span>-->
-<#--        <span class="jimu-header">欢迎进入积木报表工作台 </span>-->
-<#--      </div>-->
         <Layout>
             <Sider breakpoint="md" collapsible :collapsed-width="78" v-model="isCollapsed">
                 <i-menu theme="primary" width="auto" :class="menuitemClasses" active-name="datainfo" :open-names="['sub']" @on-select="onMenuSelect">
@@ -147,6 +143,10 @@
                             <Icon type="md-list"/></Icon>
                             <span>数据报表</span>
                         </Menu-Item>
+<#--                        <Menu-Item name="chartinfo">-->
+<#--                            <Icon type="md-images"></Icon>-->
+<#--                            <span>图形报表</span>-->
+<#--                        </Menu-Item>-->
                         <Menu-Item name="printinfo">
                             <Icon type="md-print"></Icon>
                             <span>打印设计</span>
@@ -589,6 +589,10 @@
                     that.tabpan = name;
                     that.page={page: 1,size: 10,total: 0,};
                 }
+                //查询报表名称加trim
+                if(that.name){
+                    that.name = that.name.trim();
+                }
                 var url = "";
                 that.dataSource=[];
                 if (that.tabpan == "name1"){
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl
deleted file mode 100644
index 624ab1dce..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-    <Modal
-            v-model="deleteParamModel"
-            @on-ok="deleteParamTable"
-            title="确认删除">
-        <p><Icon type="ios-alert"  color="#f90" size="20px"></Icon>是否删除选中数据?</p>
-    </Modal>
-    <Modal
-            v-model="deleteFieldModel"
-            @on-ok="deleteFieldTable"
-            title="确认删除">
-        <p><Icon type="ios-alert"  color="#f90" size="16px"></Icon>是否删除选中配置?</p>
-    </Modal>
-
-    <Modal :loading="false" v-model="visible" title="报表信息" :width="500">
-        <div style="padding-right: 30px">
-            <i-form ref="designerObj" :model="designerObj" :label-width="90" :rules="designerObjRules">
-                <#--<form-item label="编码">
-                    <i-input v-model="designerObj.code" disabled></i-input>
-                </form-item>-->
-
-                <form-item label="名称" prop="name">
-                    <i-input v-model="designerObj.name" placeholder="请输入名称" @on-change="changeName"></i-input>
-                </form-item>
-
-                <form-item label="类型" prop="type">
-                    <i-select :model.sync="designerObj.type" v-model="designerObj.type" style="width:100%" @on-change="selectmenuList">
-                        <i-option v-for="item in menuList" :value="item.value">{{ item.label }}</i-option>
-                    </i-select>
-                </form-item>
-
-            </i-form>
-        </div>
-        <div slot="footer">
-            <i-button @click="closePopup('designerObj')">取消</i-button>
-            <i-button :loading="saveReportLoading" type="primary" @click="saveReport('designerObj')">确定</i-button>
-        </div>
-    </Modal>
-
-    <Modal :loading="loading" v-model="addEchart" title="数据编辑" :width="50" @on-ok="addEchartData">
-        <div>
-            <i-form>
-                <form-item>
-                    <i-input type="textarea" :autosize="{minRows: 15,maxRows: 15}" v-model="apiStaticDataList" ></i-input>
-                </form-item>
-            </i-form>
-        </div>
-    </Modal>
-
-    <Modal :loading="loading" v-model="chartModule" :width="1000" @on-ok="okAddChart" @on-cancel="selectedChartType=''">
-        <p slot="header">
-            <span>添加图表
-               <Tooltip :transfer="true" content="图表文档" placement="top">
-                  <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/chart.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-               </Tooltip>  
-            </span>
-        </p>
-        <Tabs value="bar" class="chart-modal-content" >
-            <tab-pane :label="obj.label" :name="obj.name" v-for="(obj,index) of chartTypeList" :index="index+1">
-                <Row justify="center">
-                    <i-col span="5" offset="1" v-for="(item,index) of obj.typeList" :class="item.allowed ? '':'no-allowed'" style="margin-top: 20px">
-                        <div style="border: solid 1px #dcdee2;width: 180px;height: 130px;" :class="selectedChartId == item.id ? 'chart-selected':''" @click="setSelectCharType(item)" >
-                            <img :src="'${base}'+'${customPrePath}'+item.imgUrl" style="width:95%;height:95%;margin: 0 5px;">
-                            <span style="float: left;width:180px;margin-top: 8px;text-align:center;;font-size: 12px">{{item.name}}</span>
-                        </div>
-                    </i-col>
-                </Row>
-            </tab-pane>
-        </Tabs>
-    </Modal>
-
-    <Modal :loading="loading" v-model="seriesModal" title="系列类型信息" :width="30" @on-ok="addSeriesType" @on-cancel="seriesObj={}">
-        <div style="padding-right: 50px">
-            <i-form :model="seriesObj" label-colon :label-width="90">
-                <form-item label="系列">
-                    <i-select v-model="seriesObj.name" style="width:100%" @on-change="selectmenuList" placeholder="请选择">
-                        <i-option v-for="(item, index) in customColorNameList" :index="index" :value="item">{{ item }}</i-option>
-                    </i-select>
-                </form-item>
-                <form-item  label="图表类型" v-if="selectedChartType !== 'bar.stack' && selectedChartId!='bar.negative'">
-                    <i-select v-model="seriesObj.type" placeholder="请选择图表类型">
-                        <i-option value="bar">柱形图</i-option>
-                        <i-option value="line">折线图</i-option>
-                    </i-select>
-                </form-item>
-                <form-item  label="系列堆叠值" v-if="selectedChartType === 'bar.stack'|| selectedChartId==='bar.negative'">
-                    <i-input v-model="seriesObj.stack" placeholder="请自定义系列堆叠值，相同值的会堆叠在一起"></i-input>
-                </form-item>
-            </i-form>
-        </div>
-    </Modal>
-    <#--自定义表达式弹窗-->
-    <Modal :draggable="funDraggable" :loading="loading" :fullscreen="functionScreen" v-model="customExpressionShow" :width="1000" :autosize="true" @on-ok="expressionSave" @on-cancel="expressionCancel" class="expression">
-        <p slot="header">
-            <span>添加表达式
-               <Tooltip :transfer="true" content="表达式文档" placement="top">
-                   <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/function.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-               </Tooltip>
-               <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-if="functionScreen" :transfer="true" content="缩小" placement="top">
-                   <Icon type="ios-contract" @click="functionScreenClick"/>
-               </Tooltip>
-               <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-else :transfer="true" content="放大" placement="top">
-                     <Icon type="ios-expand" @click="functionScreenClick"/>
-               </Tooltip>
-            </span>
-        </p>
-        <i-form label-colon :label-width="90">
-            <Row justify="left">
-                <i-col>
-                    <span class="fontColor">请在下面的文本框中输入公式，不需要输入开头的等号:</span>
-                </i-col>    
-            </Row>
-            <Row justify="center" style="margin-top: 10px">
-                <i-col>
-                  <i-input type="textarea" v-model="expression" placeholder="请输入表达式" :class="functionScreen==false?'expressionInput':'expressionHeight'"></i-input> 
-                </i-col>
-            </Row>
-            <Row justify="center" style="margin-top: 10px">
-                <i-col span="6" class="functionDiv">
-                    <div :class="leftFunctionIndex == item.id?'leftFunctionSelect':'leftFunction'" v-for="(item,index) in functionType" @click="leftFunctionClick(item.id)">
-                        <span class="fontColor">{{item.name}}</span>
-                    </div>
-                </i-col>
-                <i-col span="1">
-                </i-col>
-                <i-col span="13">
-                    <div class="childrenDiv">
-                        <div v-if="commonFunction" v-for="(item,index) in newFunctionList" @click="rightFunctionClick(item,index)" :class="rightFunctionIndex == index?'rightFunctionSelect':'activeItem'">
-                            <span class="fontColor">{{item}}</span> 
-                        </div>
-                    </div>
-                </i-col>
-                <i-col span="5">
-                   <j-function-interpretation :text="interpretation"></j-function-interpretation>
-                </i-col>
-            </Row>
-        </i-form>
-    </Modal>
-
-    <#-- 增强弹框 -->
-    <Modal draggable :loading="loading" v-model="enhanceModalVisible" title="增强配置" :width="1000" :class="'jmreport-enhance'"
-           @on-ok="saveEnhanceConfig" @on-cancel="cancleEnhanceModal">
-        <Collapse value="1">
-            <Panel name="1">
-                CSS
-                <div slot="content">
-                    <i-input :rows="10" type="textarea" v-model="enhanceCssStr" placeholder="请输入值CSS片段" ></i-input>
-                </div>
-            </Panel>
-
-            <Panel name="2">
-                JS
-                <div slot="content">
-                    <i-input :rows="10" type="textarea" v-model="enhanceJsStr" placeholder="请输入值JS片段" ></i-input>
-                </div>
-            </Panel>
-        </Collapse>
-    </Modal>
-
-  <#--输入框值放大-->
-  <Modal draggable :loading="loading" v-model="enlargeInputModal" title="输入值" :width="1000" @on-ok="enlargeInputOk"
-         @on-cancel="enlargeInputCancel" class="expression">
-    <i-form label-colon :label-width="90">
-      <form-item prop="valueCoordinate" label="单元格">
-        <i-input readonly v-model="valueCoordinate"></i-input>
-      </form-item>
-      <form-item prop="valueExpression" label="值">
-        <i-input type="textarea" v-model="valueExpression" placeholder="请输入值" class="expressionInput"></i-input>
-      </form-item>
-    </i-form>
-  </Modal>
-</template>
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl
deleted file mode 100644
index 5355c0acf..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl
+++ /dev/null
@@ -1,33 +0,0 @@
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>打印页面</title>
-</head>
-<body>
-    <input type="text" id='printInput' placeholder="请输入打印地址" style="width: 650px;">
-    <button onclick="printFn()">打印</button>
-    <iframe id='report' frameborder="0" width="100%" height="100%"></iframe>
-   <script>
-
-        function getRequestUrl() {
-            var url = location.search;
-            var theRequest = new Object();
-            if (url.indexOf("?") != -1) {
-                var str = url.substr(1);
-                strs = str.split("&");
-                for(var i = 0; i < strs.length; i++) {
-                    theRequest[strs[i].split("=")[0]]=decodeURI(strs[i].split("=")[1]);
-                }
-            }
-            return theRequest;
-        }
-
-        function printFn(){
-          const printText = document.getElementById('printInput').value;
-          if(!printText) alert('请输入打印地址');
-          document.getElementById('report').src=printText;
-        }  
-   </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl
deleted file mode 100644
index 5d20c4df9..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl
+++ /dev/null
@@ -1,131 +0,0 @@
-<script type="text/x-template" id="background-setting-template">
-    <Submenu name="background" style="border-bottom: inset 1px;" class="rightFontSize">
-        <template slot="title">
-            <span>背景设置</span>
-            <Tooltip placement="top" content="背景图片会覆盖背景颜色" :transfer="true">
-                <Icon size="16" style="margin-left: 10px;" type="ios-help-circle-outline"/>
-            </Tooltip>
-        </template>
-
-        <div class="blockDiv" style="padding-bottom: 20px">
-            <Row class="ivurow">
-                <p>启用背景&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 117px;" v-model="chartBackground.enabled" @on-change="chartBackgroundChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>背景颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input class="iSelect" v-model="chartBackground.color" size="small" @on-change="chartBackgroundChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="chartBackground.color" :editable="false" alpha  :transfer="true" size="small" @on-change="chartBackgroundChange"/>
-                    </span>
-                </i-input>
-                </Col>
-            </Row>
-            <Row class="ivurow">
-                <p>背景图片&nbsp;&nbsp;</p>
-                <div style="height: 0">
-                    <Upload
-                            :headers = "uploadHeaders"  
-                            :show-upload-list="false"
-                            :default-file-list="chartBackgroundImg"
-                            :on-success="uploadSuccess"
-                            :on-exceeded-size="(e)=>handleMaxSize(e,10)"
-                            :format="['jpg','jpeg','png']"
-                            :max-size="10240"
-                            :action=" actionUrlPre + '/jmreport/upload' "
-                            style="display: inline-block;width:58px;">
-                        <i-button v-if="chartBackground.image" style="margin-left:106px" type="primary" size="small">修改</i-button>
-                        <i-button v-else style="margin-left:106px" type="primary" size="small">上传</i-button>
-                    </Upload>
-                </div>
-            </Row>
-            <Row class="ivurow">
-                <div style="width: 196px" class="pictorial-icon-upload" v-if="chartBackground.image">
-                    <img style="max-width: 196px;max-height: 50px" :src="getChartBackgroundImg()"/>
-                    <div class="cover">
-                        <Icon type="ios-trash-outline" @click="removeChartBackground"/>
-                    </div>
-                </div>
-            </Row>
-        </div>
-    </Submenu>
-</script>
-<script>
-    Vue.component('j-background-setting', {
-        template: '#background-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                chartBackgroundImg: [{'name': 'chartBackgroundImg', 'url': ''}],
-                actionUrlPre:  baseFull,
-                chartBackground: {
-                    color:''
-                },
-                uploadHeaders:{}
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.chartBackground = Object.assign(this.chartBackground, this.settings)
-                }
-                this.uploadHeaders = vm.uploadHeaders
-            },
-            //获取图片预览图
-            getChartBackgroundImg(){
-                let path = this.chartBackground['image']
-                if(path){
-                    if(path.indexOf('http')<0){
-                        path =  baseFull+path
-                    }
-                }
-                return path
-            },
-            //图片上传文件大小
-            handleMaxSize(file, size){
-                // console.log("file===>", file)
-                // console.log("size===>", size)
-                this.$Notice.warning({
-                    title: '超出文件大小限制',
-                    desc: '文件  ' + file.name + ' 太大，请上传' + size + 'M以内图片',
-                    duration: 6
-                });
-            },
-            uploadSuccess(res){
-                this.$emit('upload-success',res,this.chartBackground, (image)=>{
-                    this.chartBackground['image'] = image
-                    this.$forceUpdate(()=>{
-                        this.getChartBackgroundImg();
-                    })
-                })
-            },
-            removeChartBackground(){
-                this.chartBackground['image'] = ''
-                this.$forceUpdate(()=>{
-                    this.getChartBackgroundImg();
-                })
-                this.$emit('remove',this.chartBackground)
-            },
-            chartBackgroundChange(){
-                this.$emit('change', this.chartBackground)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl
deleted file mode 100644
index 0e01319e5..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl
+++ /dev/null
@@ -1,75 +0,0 @@
-<script type="text/x-template" id="bar-series-template">
-  <Submenu name="6" style="border-bottom: inset 1px;" class="rightFontSize dataSourceForm">
-    <template slot="title">
-      <span>类型设置</span>
-    </template>
-    <div class="blockDiv" style="padding-bottom: 10px">
-      <Row class="ivurow" v-for="(item,index) in seriesData">
-        <Tooltip :content="item.name" placement="top">
-          <p class="text-width">
-            {{item.name}}&nbsp;&nbsp;
-          </p>
-        </Tooltip>
-        <i-select size="small" class="iSelect" v-model="item.type" @on-change="onSeriesChange">
-          <i-option class="rightFontSize" value="bar">bar</i-option>
-          <i-option class="rightFontSize" value="line">line</i-option>
-        </i-select>
-      </Row>
-    </div>
-  </Submenu>
-
-</script>
-<script>
-    Vue.component('j-bar-series-setting', {
-        template: '#bar-series-template',
-        props: {
-            chartOptions: {
-                type: Object,
-                default: () => {
-                }
-            },
-            dataSettings: {
-                type: [Object, String],
-                default: () => {
-                }
-            }
-        },
-        data() {
-            return {
-                seriesData: {}
-            }
-        },
-        watch: {
-            chartOptions: {
-                deep: true,
-                immediate: true,
-                handler: function () {
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function () {
-                if (this.chartOptions && this.chartOptions.series) {
-                    this.seriesData = this.chartOptions.series;
-                }
-            },
-            onSeriesChange(value) {
-                this.chartOptions.series = this.seriesData
-                let id = this.dataSettings.id;
-                xs.updateChart(id, this.chartOptions);
-            }
-        }
-    })
-</script>
-
-<style scoped>
-    .text-width {
-        width: 50px;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        position: relative;
-        top: 6px;
-    }
-</style>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl
deleted file mode 100644
index 1553b9851..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl
+++ /dev/null
@@ -1,87 +0,0 @@
-<script type="text/x-template" id="bar-setting-template">
-    <div >
-        <Submenu  name="2" style="border-bottom: inset 1px;">
-            <template slot="title">
-                    <span class="rightFontSize">柱体设置</span>
-            </template>
-            <div class="blockDiv">
-                <Row class="ivurow">
-                    <p>宽度&nbsp;&nbsp;</p>
-                    <slider v-model="barOptions.barWidth" @on-change="onBarChange" style="margin-top: -9px;width: 140px;margin-left: 26px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                    <p>圆角&nbsp;&nbsp;</p>
-                    <slider v-model="barOptions.itemStyle_barBorderRadius" @on-change="onBarChange" style="margin-top: -9px;width: 134px;margin-left: 31px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">最小高度&nbsp;&nbsp;</p>
-                    <slider v-model="barOptions.barMinHeight" @on-change="onBarChange" style="margin-top: -9px;width: 134px;margin-left: 8px;"></slider>
-                </Row>
-                <Row v-if="isMultiChart === false && typeof barOptions.itemStyle_color!== 'undefined' " class="ivurow">
-                    <p>柱体颜色&nbsp;&nbsp;</p>
-                    <i-input class="rightFontSize iSelect"  v-model="barOptions.itemStyle_color" size="small" @on-change="onBarChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="barOptions.itemStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onBarChange"/>
-                    </span>
-                    </i-input>
-                </Row>
-                <Row v-if="isMultiChart === false && typeof barOptions.backgroundStyle_color!== 'undefined' " class="ivurow">
-                    <p>柱体背景&nbsp;&nbsp;</p>
-                    <i-input class="rightFontSize iSelect" v-model="barOptions.backgroundStyle_color" size="small"  @on-change="onBarChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="barOptions.backgroundStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onBarChange"/>
-                    </span>
-                    </i-input>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-bar-setting', {
-        template: '#bar-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            },
-            isMultiChart:{
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                barOptions: {
-                    barWidth: 50,
-                    itemStyle_barBorderRadius: 0,
-                    itemStyle_color: '#c43632',
-                    barMinHeight: 2,
-                    textStyle_color: 'black',
-                    textStyle_fontWeight: 'bolder'
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.barOptions = Object.assign(this.barOptions, this.settings)
-                }
-            },
-            onBarChange (){
-                this.$emit('change',this.barOptions)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl
deleted file mode 100644
index 7a875cee1..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl
+++ /dev/null
@@ -1,208 +0,0 @@
-<style>
-    .jm-form-barcode .ivu-form-item-label{
-        padding-bottom: 2px !important;
-    }
-    .jm-form-horizontal .ivu-form-item-content{
-        margin-left: 100px;
-    }
-    .jm-form-horizontal .ivu-form-item-label{
-        text-align: left;
-        width: 100px;
-        float: left;
-        padding: 10px 12px 10px 0;
-    }
-    .jm-form-barcode .ivu-switch:after{
-        height: 16px;
-    }
-    .jm-form-barcode .ivu-switch{
-        height: 20px;
-        line-height: 20px;
-    }
-    .little-input textarea{
-        height: inherit !important;
-    }
-
-    .jm-form-barcode .ivu-color-picker .ivu-select-dropdown {
-        left: -142px !important;
-    }
-
-    .jm-setting-container{
-        overflow-y: auto;
-        padding-right: 5px;
-        overflow-x:hidden;
-        padding-bottom: 50px;
-    }
-    .pb120{
-        padding-bottom: 120px;
-    }
-    .jm-setting-container::-webkit-scrollbar {
-        width: 6px;
-    }
-    .jm-setting-container::-webkit-scrollbar-thumb {
-        background-color: #d9d9d9;
-    }
-</style>
-<#--JsBarcode("#imgcode", "123", {
-format: "CODE39",//选择要使用的条形码类型
-width:3,//设置条之间的宽度
-height:100,//高度
-displayValue:true,//是否在条形码下方显示文字
-text:"456",//覆盖显示的文本
-fontOptions:"bold italic",//使文字加粗体或变斜体
-font:"fantasy",//设置文本的字体
-textAlign:"left",//设置文本的水平对齐方式
-textPosition:"top",//设置文本的垂直位置
-textMargin:5,//设置条形码和文本之间的间距
-fontSize:15,//设置文本的大小
-background:"#eee",//设置条形码的背景
-lineColor:"#2196f3",//设置条和文本的颜色。
-margin:15//设置条形码周围的空白边距-->
-<script type="text/x-template" id="barcode-setting-template">
-    <div :style="{height: settingsDivHeight+'px'}" class="jm-setting-container pb120" style="padding-top: 10px;padding-left: 7px">
-        <i-form class="jm-form-barcode dataSourceForm rightFontSize"  >
-            <form-item label="条形码内容">
-                <i-input v-model="barcodeContent" id="barcodeContent" type="textarea" :rows="2" @on-blur="onBarcodeChange"></i-input>
-            </form-item>
-
-            <form-item label="条间距">
-                <i-input v-model="width" placeholder="请输入条间距" :min="1" type="number" @on-change="onBarcodeChange"></i-input>
-            </form-item>
-
-            <form-item label="高度">
-                <i-input v-model="height" placeholder="请输入高度" :min="1" type="number" @on-change="onBarcodeChange"></i-input>
-            </form-item>
-
-            <form-item label="条颜色" class="colorHeight">
-                <i-input v-model="lineColor" size="small" style="width: 111px;" @on-change="onBarcodeChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker colorHeight" v-model="lineColor" :editable="false" alpha  :transfer="true" size="small" @on-change="onBarcodeChange"/>
-                    </span>
-                </i-input>
-            </form-item>
-
-            <form-item label="背景色" class="colorHeight">
-                <i-input v-model="background" size="small" style="width: 111px;" @on-change="onBarcodeChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="background" :editable="false" alpha  :transfer="true" size="small" @on-change="onBarcodeChange"/>
-                    </span>
-                </i-input>
-            </form-item>
-
-            <form-item label="是否显示文字" class="jm-form-horizontal">
-                <div>
-                    <i-switch v-model="displayValue" @on-change="onBarcodeChange"/>
-                </div>
-            </form-item>
-
-            <template v-if="displayValue">
-                <form-item label="覆盖文字">
-                    <i-input v-model="text" placeholder="请输入覆盖文字" @on-blur="onBarcodeChange"></i-input>
-                </form-item>
-
-                <form-item label="文字位置">
-                    <i-select v-model="textPosition" placeholder="请选择文字位置" @on-change="onBarcodeChange">
-                        <i-option value="bottom">底部</i-option>
-                        <i-option value="top">上方</i-option>
-                    </i-select>
-                </form-item>
-
-                <form-item label="文字水平对齐">
-                    <i-select v-model="textAlign" placeholder="请选择水平对齐方式" @on-change="onBarcodeChange">
-                        <i-option value="center">居中</i-option>
-                        <i-option value="left">左对齐</i-option>
-                        <i-option value="right">右对齐</i-option>
-                    </i-select>
-                </form-item>
-
-                <form-item label="文字大小">
-                    <i-input v-model="fontSize" placeholder="请输入文字大小" :min="1" type="number" @on-change="onBarcodeChange"></i-input>
-                </form-item>
-
-                <form-item label="文字样式">
-                    <i-select v-model="fontOptions" placeholder="请选择文字样式" @on-change="onBarcodeChange">
-                        <i-option value="bold">加粗</i-option>
-                        <i-option value="italic">斜体</i-option>
-                        <i-option value="bold italic">加粗&斜体</i-option>
-                    </i-select>
-                </form-item>
-            </template>
-        </i-form>
-    </div>
-</script>
-<script>
-    Vue.component('j-barcode-setting', {
-        template: '#barcode-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default:()=>{}
-            }
-        },
-        data(){
-            return {
-                barcodeContent: '',
-                background: '#fff',
-                lineColor: '#000',
-                width:'',
-                height:'',
-                displayValue: false,
-                text: '',
-                textPosition: 'bottom',
-                textAlign: 'center',
-                fontSize: '',
-                fontOptions:'',
-                settingsDivHeight: ''
-            }
-        },
-        created(){
-            this.settingsDivHeight = window.innerHeight - 100
-        },
-        watch:{
-            settings:{
-                deep: true,
-                immediate: true,
-                handler: function(){
-                    this.resetForm()
-                }
-            }
-        },
-        methods:{
-            validateBarcode:(value) => {
-                if(!value){
-                    return false;
-                }
-                if(value.indexOf('$')>=0 || value.indexOf('#')>=0){
-                    return true
-                }
-                let reg = /^[a-zA-Z0-9]+$/
-                let reg2 = /^.{4,18}$/
-                // 长度为4到18个字符
-                if (value !== '' && !reg.test(value)) {
-                    Vue.prototype.$Message.error('条码内容只允许字母、数字')
-                    return  false;
-                }
-                return true;
-            },
-            resetForm: function () {
-                if(this.settings){
-                    Object.keys(this.settings).map(k=>{
-                        this[k] = this.settings[k]
-                    })
-                }
-            },
-            onBarcodeChange(){
-                if(this.validateBarcode(this.barcodeContent)){
-                    let obj = {}
-                    Object.keys(this.settings).map(k=>{
-                        obj[k] = this[k]
-                    })
-                    //清除颜色后恢复默认
-                    obj.background=this.background?obj.background:'#ffffff'
-                    obj.lineColor=this.lineColor?obj.lineColor:'#000000'
-                    this.$emit('change', obj)
-                }
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl
deleted file mode 100644
index 931fcb37e..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl
+++ /dev/null
@@ -1,404 +0,0 @@
-<style>
-    .jimu-table-tip{
-        font-weight: bold;
-        display: inline-block;
-        margin-left: 5px;
-    }
-</style>
-<script type="text/x-template" id="cell-linkage-template">
-    <Modal
-        width="600px"
-        title="图表联动"
-        v-model="chartLinkageShow"
-        :closable = "true"
-        :mask-closable="false">
-        <div slot="footer">
-            <i-button @click="chartLinkageCancel">取消</i-button>
-            <i-button type="primary" @click="chartLinkageOk">确定</i-button>
-        </div>
-        <i-form :label-width="100">
-            <form-item label="链接名称">
-                <i-input placeholder="请填写链接名称" v-model="linkName"></i-input>
-            </form-item>
-
-            <form-item label="链接图表">
-                <i-select v-model="linkChartId" filterable @on-change="chartLinkageChange">
-                    <i-option v-for="(item, index) in existChartList" :key="index" placeholder="请选择链接图表" :value="item.id">{{ item.name }}</i-option>
-                </i-select>
-            </form-item>
-          
-            <form-item label="条件">
-              <i-input placeholder="请填写条件" v-model="requirement"></i-input>
-            </form-item>
-
-            <span>参数设置</span>
-            <div style="margin-top: 10px">
-                <i-button type="primary" @click="addClParam">新增</i-button>
-                <i-button @click="removeClParam" v-if="selectedClParams.length>0">删除</i-button>
-                <i-table
-                        style="margin-top: 10px"
-                        ref="paramTable"
-                        stripe
-                        @on-selection-change="handleClParamSelected"
-                        :columns="clParamColumns"
-                        :data="clParamData">
-                </i-table>
-            </div>
-        </i-form>
-    </Modal>
-</script>
-<script>
-
-    /**
-     * 处理 字段
-     * @param list
-     */
-    function handleLinkageFields(list) {
-        let { x, y, z } = this.currentChart
-        let arr = []
-        arr.push(x)
-        arr.push(y)
-        arr.push(z)
-        let dictInfo = {}
-        for(let item of list){
-            if(item.dictCode && arr.indexOf(item.fieldName)>=0){
-                dictInfo[item.fieldName] = item.dictCode
-            }
-        }
-        this.dictInfo = dictInfo
-    }
-
-    /**
-     * 处理参数
-     * @param list
-     */
-    function handleLinkageParams(list) {
-        let ls = []
-        let index = 0
-        for(let item of list){
-            ls.push({
-                paramName: item.paramName,
-                paramValue: '',
-                index: ++index
-            })
-        }
-        this.clParamData = ls
-    }
-
-    function handleLinkageOldParam(){
-        const { selectedChart, oldConfig } = this
-        if(selectedChart.id == oldConfig.linkChartId){
-            this.clParamData = [...oldConfig.params]
-        }
-    }
-
-    Vue.component('j-cell-linkage', {
-        template: '#cell-linkage-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default:()=>{}
-            }
-        },
-        data(){
-            return {
-                chartLinkageShow: false,
-                linkId: '',
-                reportId: '',
-                linkType: '2',
-                linkName: '',
-                linkChartId: '',
-                requirement:'',
-                currentChart:'',
-                selectedChart: '',
-                existChartList: [],
-
-                dictInfo: '',
-
-                clParamData:[],
-                selectedClParams: [],
-                clParamColumns:[
-                    {
-                        type: 'selection',
-                        width: 35,
-                        align: 'center'
-                    },{
-                        title: '映射参数',
-                        key: 'paramName',
-                        render: (h, params) => {
-                            return h('i-input', {
-                                props: {
-                                    "size":"small",
-                                    type: 'text',
-                                    value: this.clParamData[params.index].paramName,
-                                    placeholder: `请输入参数名`
-                                },
-                                on: {
-                                    'on-blur': (event) => {
-                                        this.clParamData[params.index].paramName = event.target.value;
-                                    }
-                                },
-                            })
-                        }
-                    },{
-                        title: '原始参数',
-                        key: 'paramValue',
-                        renderHeader: (h, params) => {
-                            const sub = ()=>{
-                                let arr = []
-                                let it1 = h('span',params.column.title)
-                                let it2 = h('Tooltip', {
-                                            props:{
-                                                placement: 'top',
-                                                transfer: true
-                                            }
-                                    }, [
-                                    h('span',{class:'jimu-table-tip'}, '?'),
-                                    h('div',{slot:'content', style:{'white-space':'normal'}}, [
-                                        h('p','1.支持下拉框选择数据集字段'),
-                                        h('p','3.支持表达式=A1表示A1单元格的值'),
-                                        h('p','2.支持表达式=A表示当前点击行所在的A列单元格的值')
-                                    ])
-                                ])
-                                arr.push(it1)
-                                arr.push(it2)
-                                return arr
-                            }
-                            return h('div', {}, sub())
-                        },
-                        render: (h, params) => {
-                            let paramSelectOptions = this.getChartParamSelectOptions()
-                            return h('j-select-input', {
-                                    props: {
-                                        options: paramSelectOptions,
-                                        size:'small',
-                                        transfer: true,
-                                        value: this.clParamData[params.index].paramValue,
-                                        clearable: true,
-                                    },
-                                    on: {
-                                        'on-change': (value) => {
-                                            this.clParamData[params.index].paramValue = value;
-                                        }
-                                    },
-                                },
-                                paramSelectOptions.map(item => {
-                                    return h('i-option', {
-                                        props: {
-                                            value: item.value
-                                        }
-                                    }, item.title)
-                                })
-                            );
-                        }
-                    }
-                ]
-
-            }
-        },
-        created(){
-            this.settingsDivHeight = window.innerHeight - 100
-        },
-        watch:{
-            settings:{
-                deep: true,
-                immediate: true,
-                handler: function(){
-                  //  this.resetForm()
-                }
-            }
-        },
-        methods:{
-            // 清空
-            clearChartLinkage(){
-                this.linkId = ''
-                this.reportId = ''
-                this.linkName = ''
-                this.linkChartId = ''
-                this.requirement = ''
-                // 当前单元格数据集对应的 字段集合
-                this.fieldList = []
-                this.currentDbCode = ''
-                this.fieldName = ''
-                // 联动下拉框选中的图表
-                this.selectedChart = ''
-                // 字典信息
-                this.dictInfo = ''
-                // 联动下拉框的集合数据xs.get获取
-                this.existChartList = []
-                // 图表联动参数数据
-                this.clParamData = []
-                // 选中的参数index集合 删除用到
-                this.selectedClParams = []
-                // 编辑页面回显数据 参数记录
-                this.oldConfig = {}
-            },
-            addChartLinkage(existChartList, fieldList, dbCode, fieldName){
-                this.clearChartLinkage()
-                this.reportId = excel_config_id
-                this.linkType = '2'
-                if(existChartList && existChartList.length>0){
-                    this.existChartList = [...existChartList]
-                }
-                this.fieldList = fieldList
-                this.currentDbCode = dbCode
-                this.fieldName = fieldName
-                this.chartLinkageShow = true
-            },
-            editChartLinkage(existChartList, fieldList, dbCode, fieldName, row){
-                // 需要给row赋值
-            /*    apiMethod: null
-                apiUrl: null
-                ejectType: null
-                id: "552823131696795648"
-                linkChartId: "b9Nqn1FauH9p5C1I"
-                linkName: "121212"
-                linkType: "2"
-                parameter: "[{\"paramName\":\"sex\",\"paramValue\":\"sex\",\"index\":1}]"
-                reportId: "552378751072604160"*/
-                this.clearChartLinkage()
-
-                if(existChartList && existChartList.length>0){
-                    this.existChartList = [...existChartList]
-                }
-                this.fieldList = fieldList
-                this.currentDbCode = dbCode
-                this.fieldName = fieldName
-                this.linkId = row.id
-                this.linkChartId = row.linkChartId
-                this.linkName = row.linkName
-                this.linkType = row.linkType
-                this.reportId = row.reportId
-                this.requirement = row.requirement
-                if(row.parameter){
-                    let arr = JSON.parse(row.parameter)
-                    this.clParamData = [...arr]
-                    this.oldConfig = {
-                        linkChartId: row.linkChartId,
-                        params: [...arr]
-                    }
-                }
-
-                this.chartLinkageShow = true
-            },
-
-            // 确定事件
-            chartLinkageOk(){
-                let arr = [...this.clParamData]
-                for(let item of arr){
-                    item.dbCode = this.currentDbCode
-                    item.fieldName = this.fieldName
-                }
-                let obj = {
-                    reportId: this.reportId,
-                    linkName: this.linkName,
-                    linkChartId: this.linkChartId,
-                    linkType: '2',
-                    parameter: JSON.stringify(arr)
-                }
-                if(this.linkId){
-                    obj['id'] = this.linkId
-                }
-                obj['requirement'] = this.requirement
-                $http.post({
-                    url:api.linkSaveAndEdit,
-                    contentType:'json',
-                    data:JSON.stringify(obj),
-                    success:(linkId)=>{
-                        // 返回保存的联动表的ID
-                        this.chartLinkageShow = false
-                        this.$emit('ok',linkId)
-                    }
-                });
-
-            },
-            chartLinkageCancel(){
-                this.chartLinkageShow = false
-            },
-            // 图表下拉框改变事件
-            chartLinkageChange(value){
-                for(let i=0;i<this.existChartList.length;i++){
-                    if(value === this.existChartList[i]['id']){
-                        this.selectedChart = this.existChartList[i]
-                    }
-                }
-                this.getLinkageChartInfo();
-            },
-            // 图表下拉框改变 请求后台获取当前图标的字段 和 联动图标的参数信息
-            getLinkageChartInfo(){
-                let param = {
-                    reportId: this.reportId,
-                    linkageDbCode: this.selectedChart.db,
-                    dbCode: this.currentChart.db
-                }
-                $http.get(
-                    {
-                        url: api.getLinkageChartInfo,
-                        data: param,
-                        success: (result) => {
-                            // console.log(112,result)
-                            // 设置被联动图表的参数接收
-                            handleLinkageParams.call(this, result.paramList)
-                            // 设置当前图表的字段字典信息
-                            handleLinkageFields.call(this, result.fieldList)
-                            // 编辑页面 如果切换下拉选项 再切回来 需要将初始数据显示出来
-                            handleLinkageOldParam.call(this)
-                        }
-                    });
-            },
-            /**
-             * 获取报表参数下拉选项
-             * @param data
-             * @returns {*[]|[{title: string, value: *}, {title: string, value: *}]}
-             */
-            getChartParamSelectOptions() {
-                let arr = []
-                for(let item of this.fieldList){
-                    arr.push({
-                        title: item.fieldText, value: item.title
-                    })
-                }
-                /*arr.push({
-                    title: '自定义', value: '-1'
-                })*/
-                return arr;
-            },
-            // 新增参数
-            addClParam(){
-                let arr = this.clParamData
-                arr.push({
-                    index: arr.length+1,
-                    paramName: '',
-                    paramValue: ''
-                })
-                this.clParamData = [...arr]
-            },
-            // 参数移除事件
-            removeClParam(){
-                let indexArray = this.selectedClParams
-                // 先过滤
-                let arr = this.clParamData.filter(k=>{
-                    return indexArray.indexOf(k.index)<0
-                })
-                // 重排序
-                for(let i=0;i<arr.length;i++){
-                    arr[i]['index'] = i+1
-                }
-                // 赋值
-                this.clParamData = [...arr]
-
-            },
-            // 参数选中改变事件
-            handleClParamSelected(selections){
-                // console.log('selections', selections)
-                let arr = []
-                selections.map(k=>{
-                    arr.push(k.index)
-                })
-                this.selectedClParams = arr
-            }
-
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl
deleted file mode 100644
index d4d358e04..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl
+++ /dev/null
@@ -1,60 +0,0 @@
-<script type="text/x-template" id="central-point-setting-template">
-    <div >
-        <Submenu  name="5" style="border-bottom: inset 1px; " class="rightFontSize">
-            <template slot="title">
-                <span>中心点设置</span>
-            </template>
-            <div class="blockDiv" style="padding-bottom: 10px">
-                <Row class="ivurow">
-                    <p>x轴&nbsp;&nbsp;</p>
-                    <i-input size="small" type="number" v-model="centralPoint.center[0]" @on-change="onMarginChange" style="margin-left: 5px;width: 164px" :value="centralPoint.center[0]"></i-input>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">y轴&nbsp;&nbsp;</p>
-                    <i-input size="small" type="number" v-model="centralPoint.center[1]" @on-change="onMarginChange" style="margin-left: 5px;width: 164px" :value="centralPoint.center[1]"></i-input>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-central-point-setting', {
-        template: '#central-point-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            },
-        },
-        data(){
-            return {
-                centralPoint: {
-
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    // console.log("我进来了")
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                // console.log(this.centralPoint,"我进来了")
-                if (this.settings){
-                    this.centralPoint = Object.assign(this.centralPoint, this.settings)
-                }
-            },
-            onMarginChange (){
-                this.$emit('change',this.centralPoint)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl
deleted file mode 100644
index 1d4a8fdbb..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl
+++ /dev/null
@@ -1,375 +0,0 @@
-<script type="text/x-template" id="chart-linkage-template">
-    <Modal
-        width="600px"
-        title="图表联动"
-        v-model="chartLinkageShow"
-        :closable = "true"
-        :mask-closable="false">
-        <div slot="footer">
-            <i-button @click="chartLinkageCancel">取消</i-button>
-            <i-button type="primary" @click="chartLinkageOk">确定</i-button>
-        </div>
-        <i-form :label-width="100">
-            <form-item label="链接名称">
-                <i-input placeholder="请填写链接名称" v-model="linkName"></i-input>
-            </form-item>
-
-            <form-item label="链接图表">
-                <i-select v-model="linkChartId" filterable @on-change="chartLinkageChange">
-                    <i-option v-for="(item, index) in existChartList" :key="index" placeholder="请选择链接图表" :value="item.id">{{ item.name }}</i-option>
-                </i-select>
-            </form-item>
-
-          <form-item label="条件">
-            <i-input placeholder="请填写条件" v-model="requirement"></i-input>
-          </form-item>
-          
-            <span>参数设置</span>
-            <div style="margin-top: 10px">
-                <i-button type="primary" @click="addClParam">新增</i-button>
-                <i-button @click="removeClParam" v-if="selectedClParams.length>0">删除</i-button>
-                <i-table
-                        style="margin-top: 10px"
-                        ref="paramTable"
-                        @on-selection-change="handleClParamSelected"
-                        stripe
-                        :columns="clParamColumns"
-                        :data="clParamData">
-                </i-table>
-            </div>
-        </i-form>
-    </Modal>
-</script>
-<script>
-
-    /**
-     * 处理 字段
-     * @param list
-     */
-    function handleLinkageFields(list) {
-        let { x, y, z } = this.currentChart
-        let arr = []
-        arr.push(x)
-        arr.push(y)
-        arr.push(z)
-        let dictInfo = {}
-        for(let item of list){
-            if(item.dictCode && arr.indexOf(item.fieldName)>=0){
-                dictInfo[item.fieldName] = item.dictCode
-            }
-        }
-        this.dictInfo = dictInfo
-    }
-
-    /**
-     * 处理参数
-     * @param list
-     */
-    function handleLinkageParams(list) {
-        let ls = []
-        let index = 0
-        for(let item of list){
-            ls.push({
-                paramName: item.paramName,
-                paramValue: '',
-                index: ++index
-            })
-        }
-        this.clParamData = ls
-    }
-
-    function handleLinkageOldParam(){
-        const { selectedChart, oldConfig } = this
-        if(selectedChart.id == oldConfig.linkChartId){
-            this.clParamData = [...oldConfig.params]
-        }
-    }
-
-    Vue.component('j-chart-linkage', {
-        template: '#chart-linkage-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default:()=>{}
-            }
-        },
-        data(){
-            return {
-                chartLinkageShow: false,
-                linkId: '',
-                reportId: '',
-                linkType: '2',
-                linkName: '',
-                linkChartId: '',
-                requirement:'',
-                currentChart:'',
-                selectedChart: '',
-                existChartList: [],
-
-                dictInfo: '',
-
-                clParamData:[],
-                selectedClParams: [],
-                clParamColumns:[
-                    {
-                        type: 'selection',
-                        width: 35,
-                        align: 'center'
-                    },{
-                        title: '映射参数',
-                        key: 'paramName',
-                        render: (h, params) => {
-                            return h('i-input', {
-                                props: {
-                                    "size":"small",
-                                    type: 'text',
-                                    value: this.clParamData[params.index].paramName,
-                                    placeholder: `请输入参数名`
-                                },
-                                on: {
-                                    'on-blur': (event) => {
-                                        this.clParamData[params.index].paramName = event.target.value;
-                                    }
-                                },
-                            })
-                        }
-                    },{
-                        title: '原始参数',
-                        key: 'paramValue',
-                        render: (h, params) => {
-                            let paramSelectOptions = this.getChartParamSelectOptions()
-                            return h('i-select', {
-                                    props: {
-                                        size:'small',
-                                        transfer: true,
-                                        value: this.clParamData[params.index].paramValue,
-                                        clearable: true,
-                                    },
-                                    on: {
-                                        'on-change': (value) => {
-                                            this.clParamData[params.index].paramValue = value;
-                                        }
-                                    },
-                                },
-                                paramSelectOptions.map(item => {
-                                    return h('i-option', {
-                                        props: {
-                                            value: item.value
-                                        }
-                                    }, item.title)
-                                })
-                            );
-                        }
-                    }
-                ]
-
-            }
-        },
-        created(){
-            this.settingsDivHeight = window.innerHeight - 100
-        },
-        watch:{
-            settings:{
-                deep: true,
-                immediate: true,
-                handler: function(){
-                  //  this.resetForm()
-                }
-            }
-        },
-        methods:{
-            // 清空
-            clearChartLinkage(){
-                this.linkId = ''
-                this.reportId = ''
-                this.linkName = ''
-                this.requirement = ''
-                this.linkChartId = ''
-                // 当前图表
-                this.currentChart = ''
-                // 联动下拉框选中的图表
-                this.selectedChart = ''
-                // 字典信息
-                this.dictInfo = ''
-                // 联动下拉框的集合数据xs.get获取
-                this.existChartList = []
-                // 图表联动参数数据
-                this.clParamData = []
-                // 选中的参数index集合 删除用到
-                this.selectedClParams = []
-                // 编辑页面回显数据 参数记录
-                this.oldConfig = {}
-            },
-            addChartLinkage(existChartList, currentChartId){
-                this.clearChartLinkage()
-                this.reportId = excel_config_id
-                this.linkType = '2'
-                this.initChartList(existChartList, currentChartId)
-                this.chartLinkageShow = true
-            },
-            editChartLinkage(existChartList, currentChartId, row){
-                // 需要给row赋值
-            /*    apiMethod: null
-                apiUrl: null
-                ejectType: null
-                id: "552823131696795648"
-                linkChartId: "b9Nqn1FauH9p5C1I"
-                linkName: "121212"
-                linkType: "2"
-                parameter: "[{\"paramName\":\"sex\",\"paramValue\":\"sex\",\"index\":1}]"
-                reportId: "552378751072604160"*/
-                this.clearChartLinkage()
-                this.linkId = row.id
-                this.linkChartId = row.linkChartId
-                this.linkName = row.linkName
-                this.requirement = row.requirement
-                this.linkType = row.linkType
-                this.reportId = row.reportId
-                if(row.parameter){
-                    let arr = JSON.parse(row.parameter)
-                    this.clParamData = [...arr]
-                    this.oldConfig = {
-                        linkChartId: row.linkChartId,
-                        params: [...arr]
-                    }
-                }
-                this.initChartList(existChartList, currentChartId)
-                this.chartLinkageShow = true
-            },
-            initChartList(existChartList, currentChartId){
-                if(existChartList && existChartList.length>0){
-                    let arr1 = existChartList.filter(item=>{
-                        return item.id!=currentChartId
-                    });
-                    let arr2 = existChartList.filter(item=>{
-                        return item.id==currentChartId
-                    });
-                    this.existChartList = [...arr1]
-                    this.currentChart = arr2[0]
-                }
-            },
-            // 确定事件
-            chartLinkageOk(){
-                let obj = {
-                    reportId: this.reportId,
-                    linkName: this.linkName,
-                    requirement: this.requirement,
-                    linkChartId: this.linkChartId,
-                    linkType: '2',
-                    parameter: JSON.stringify(this.clParamData)
-                }
-                if(this.linkId){
-                    obj['id'] = this.linkId
-                }
-                $http.post({
-                    url:api.linkSaveAndEdit,
-                    contentType:'json',
-                    data:JSON.stringify(obj),
-                    success:(linkId)=>{
-                        // 返回保存的联动表的ID
-                        this.chartLinkageShow = false
-                        this.$emit('ok',linkId)
-                    }
-                });
-
-            },
-            chartLinkageCancel(){
-                this.chartLinkageShow = false
-            },
-            // 图表下拉框改变事件
-            chartLinkageChange(value){
-                for(let i=0;i<this.existChartList.length;i++){
-                    if(value === this.existChartList[i]['id']){
-                        this.selectedChart = this.existChartList[i]
-                    }
-                }
-                this.getLinkageChartInfo();
-            },
-            // 图表下拉框改变 请求后台获取当前图标的字段 和 联动图标的参数信息
-            getLinkageChartInfo(){
-                let param = {
-                    reportId: this.reportId,
-                    linkageDbCode: this.selectedChart.db,
-                    dbCode: this.currentChart.db
-                }
-                $http.get(
-                    {
-                        url: api.getLinkageChartInfo,
-                        data: param,
-                        success: (result) => {
-                            // console.log(112,result)
-                            // 设置被联动图表的参数接收
-                            handleLinkageParams.call(this, result.paramList)
-                            // 设置当前图表的字段字典信息
-                            handleLinkageFields.call(this, result.fieldList)
-                            // 编辑页面 如果切换下拉选项 再切回来 需要将初始数据显示出来
-                            handleLinkageOldParam.call(this)
-                        }
-                    });
-            },
-            /**
-             * 获取报表参数下拉选项
-             * @param data
-             * @returns {*[]|[{title: string, value: *}, {title: string, value: *}]}
-             */
-            getChartParamSelectOptions() {
-                let data = this.currentChart
-                if(!data){
-                    //console.log("未选择联动图表!")
-                    return []
-                }
-                if(!data.x || !data.y){
-                    //console.log("图表未正确配置数据源!")
-                    return []
-                }
-                let arr = [{
-                    title: '图表分类属性', value: 'name',
-                },{
-                    title: '图表值属性', value: 'value'
-                }]
-                if(data.z){
-                    arr.push({
-                        title: '图表系列属性', value: 'seriesName'
-                    })
-                }
-                return arr;
-            },
-            // 新增参数
-            addClParam(){
-                let arr = this.clParamData
-                arr.push({
-                    index: arr.length+1,
-                    paramName: '',
-                    paramValue: ''
-                })
-                this.clParamData = [...arr]
-            },
-            // 参数移除事件
-            removeClParam(){
-                let indexArray = this.selectedClParams
-                // 先过滤
-                let arr = this.clParamData.filter(k=>{
-                    return indexArray.indexOf(k.index)<0
-                })
-                // 重排序
-                for(let i=0;i<arr.length;i++){
-                    arr[i]['index'] = i+1
-                }
-                // 赋值
-                this.clParamData = [...arr]
-
-            },
-            // 参数选中改变事件
-            handleClParamSelected(selections){
-                //console.log('selections', selections)
-                let arr = []
-                selections.map(k=>{
-                    arr.push(k.index)
-                })
-                this.selectedClParams = arr
-            }
-
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl
deleted file mode 100644
index 9d4f13d65..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl
+++ /dev/null
@@ -1,771 +0,0 @@
-<script type="text/x-template" id="data-dictionary">
-  <div class="dictClass">
-    <Modal
-            :loading="loading"
-            width="100%"
-            v-model="dictShow"
-            :title="moduleTitle"
-            fullscreen=true
-            :closable="true"
-            :mask-closable="false"
-            :closable="false">
-      <div slot="footer">
-        <i-button @click="close">关闭</i-button>
-      </div>
-        <#--查询-->
-      <div style="margin-top: 10px;display: flex;width: 100%">
-        <i-form style="width: 100%"  ref="queryParam" :model="queryParam" :label-width="80">
-          <row>
-            <i-col span="4">
-              <form-item label="字典名称" prop="dictName">
-                <i-input v-model="queryParam.dictName" placeholder="请填写字典名称"></i-input>
-              </form-item>
-            </i-col>
-            <i-col span="4">
-              <form-item label="字典编号" prop="dictCode">
-                <i-input v-model="queryParam.dictCode" placeholder="请填写字典编号"></i-input>
-              </form-item>
-            </i-col>
-            <i-col span="4" style="margin-left: 20px">
-              <i-button type="primary" @click="loadData(1)">查询</i-button>
-              <i-button @click="resetParam">清空</i-button>
-            </i-col>
-          </row>
-        </i-form>
-      </div>
-        <#--begin字典-->
-      <div style="margin-top: 10px">
-        <i-button type="primary" @click="dictClick">添加</i-button>
-        <i-button icon="ios-loading" type="primary" @click="dictReflesh">刷新缓存</i-button>
-        <i-button v-if="dictDeleteShow==true" type="error" @click="dictDeleteBatch">删除</i-button>
-        <i-button @click="recycleBinClick">回收站</i-button>
-      </div>
-      <div style="margin-top: 10px">
-        <i-table @on-selection-change="dictTableSelect" border stripe :columns="dictData.columns" :data="dictData.data"
-                 style="margin-top: 1%;">
-          <template slot-scope="{ row, index }" slot="action">
-            <i-button type="primary" size="small"  @click="editDict(row)">编辑</i-button>
-            <i-button type="primary" size="small"  @click="dictConfig(row.id)">字典配置</i-button>
-            <Poptip
-                    confirm
-                    placement="left"
-                    title="确定要删除吗?"
-                    :transfer="true"
-                    @on-ok="dictRemove(row)">
-              <i-button type="error" size="small" >删除</i-button>
-            </Poptip>
-
-          </template>
-        </i-table>
-        <div class="page">
-          <Page
-                  :total="dictData.page.total"
-                  show-total
-                  show-elevator
-                  @on-change="handleCurrentChange"
-                  @on-page-size-change="handleSizeChange">
-          </Page>
-        </div>
-      </div>
-        <#--字典编辑和新增 begin-->
-      <Modal
-              width="36%"
-              v-model="createDictShow"
-              :title="dictTitle"
-              :mask-closable="false"
-              :closable="false"
-      >
-        <div slot="footer">
-          <i-button @click="cancelReset('dictModel')">取消</i-button>
-          <i-button :loading="createDictLoading" type="primary" @click="createDictOk('dictModel')">确定</i-button>
-        </div>
-        <i-form ref="dictModel" :model="dictModel" :rules="dictModelRule" :label-width="100" class="dict">
-          <form-item label="字典名称:" prop="dictName">
-            <i-input v-model="dictModel.dictName" placeholder="请填写字典名称"/>
-          </form-item>
-          <form-item label="字典编码:" prop="dictCode">
-            <i-input v-model="dictModel.dictCode" placeholder="请填写字典编码"/>
-          </form-item>
-          <form-item label="描述:" prop="description">
-            <i-input v-model="dictModel.description"/>
-          </form-item>
-        </i-form>
-      </Modal>
-        <#--字典编辑和新增 end-->
-        <#--回收站 begin-->
-      <Modal
-              width="50%"
-              v-model="recycleBinShow"
-              title="回收站"
-              :mask-closable="false"
-              :closable="false"
-      >
-        <div slot="footer">
-          <i-button @click="recycleBinReset">关闭</i-button>
-        </div>
-        <div style="margin-top: 10px" v-if="recycleBinRows.length>0">
-          <i-button type="primary" size="small" style="cursor: pointer" @click="recycleBinBatch('recycle')">批量取回</i-button>
-          <i-button type="error" size="small" style="cursor: pointer" @click="recycleBinBatch('delete')">批量刪除</i-button>
-        </div>
-        <div style="margin-top: 10px">
-          <i-table border stripe :columns="recycleBin.columns" :data="recycleBin.data"
-                   style="margin-top: 1%;" @on-selection-change="recycleBinChange">
-            <template slot-scope="{ row, index }" slot="action">
-              <i-button type="primary" size="small" style="cursor: pointer" @click="recycleBinRetrieve(row.id)">取回</i-button>
-              <Poptip
-                      confirm
-                      placement="left"
-                      title="确定要彻底删除吗"
-                      content="删除之后不可取回"
-                      :transfer="true"
-                      @on-ok="recycleBinDelete(row.id)">
-              <i-button type="error" size="small">彻底删除</i-button>
-              </Poptip>
-            </template>
-          </i-table>
-        </div>
-      </Modal>
-        <#--回收站 end-->
-        <#--end字典-->
-        <#--字典配置页面 begin-->
-      <Drawer :transfer="true" class="dictDrawer" width="500" title="字典列表"  v-model="itemDrawer">
-        <div style="margin-top: 10px">
-          <i-button type="primary" @click="dictItemClick">添加</i-button>
-        </div>
-        <div style="margin-top: 10px">
-          <i-table border stripe
-                   :columns="dictItemList.columns"
-                   :data="dictItemList.data"
-                   :rowClassName="getRowClassname"
-                   style="margin-top: 1%;">
-            <template slot-scope="{ row, index }" slot="action">
-              <i-button type="primary" size="small" @click="editItemDict(row)">编辑</i-button>
-              <Poptip
-                      confirm
-                      placement="left"
-                      title="确定要删除吗?"
-                      :transfer="true"
-                      @on-ok="dictItemRemove(row)">
-                <i-button type="error" size="small">删除</i-button>
-              </Poptip>
-
-            </template>
-          </i-table>
-          <div class="page">
-            <Page
-                    :total="dictItemList.page.total"
-                    show-total
-                    show-elevator
-                    @on-change="handleItemCurrentChange"
-                    @on-page-size-change="handleItemSizeChange">
-            </Page>
-          </div>
-        </div>
-      </Drawer>
-      <#--字典详细新增和编辑 begin-->
-      <Modal
-              width="50%"
-              v-model="createDictItemShow"
-              :title="dictItemTitle"
-              class-name="dictItem"
-              :closable="false"
-              :mask-closable="false"
-      >
-        <div slot="footer">
-          <i-button @click="cancelItemReset('dictItemModel')">取消</i-button>
-          <i-button :loading="createDictItemLoading" type="primary" @click="createItemDictOk('dictItemModel')">确定
-          </i-button>
-        </div>
-        <i-form ref="dictItemModel" :model="dictItemModel" :rules="dictItemModelRule" :label-width="100" class="dict">
-          <form-item label="名称:" prop="itemText">
-            <i-input v-model="dictItemModel.itemText" placeholder="请填写名称"/>
-          </form-item>
-          <form-item label="数据值:" prop="itemValue">
-            <i-input v-model="dictItemModel.itemValue" placeholder="请填写数据值"/>
-          </form-item>
-          <form-item label="描述:" prop="description">
-            <i-input v-model="dictItemModel.description"/>
-          </form-item>
-          <form-item label="排序值:" prop="sortOrder">
-            <input-number :step="1" v-model="dictItemModel.sortOrder" :min="1"/>
-          </form-item>
-          <form-item label="是否启用:" prop="status">
-            <i-switch v-model="dictItemModel.status" :true-value="1" :false-value="0"/>
-          </form-item>
-        </i-form>
-      </Modal>
-        <#--字典详细新增和编辑 end-->
-        <#--字典配置页面 end-->
-    </Modal>
-  </div>
-  </div>
-</script>
-<script>
-  Vue.component('j-data-dictionary', {
-    template: '#data-dictionary',
-    data() {
-      return {
-        moduleTitle: "数据字典",
-        loading: false,
-        dictShow: false,
-        dictData: {
-          data: [],
-          columns: [
-            {
-              type: 'selection',
-              width: 60,
-              align: 'center'
-            },
-            {
-              title: '字典名称',
-              key: 'dictName',
-              align: 'center'
-            },
-            {
-              title: '字典编号',
-              key: 'dictCode',
-              align: 'center'
-            },
-            {
-              title: '描述',
-              key: 'description',
-              align: 'center'
-            },
-            {
-              title: '操作',
-              key: 'action',
-              width: 200,
-              align: 'center',
-              slot: 'action'
-            },
-          ],//字典集合
-          page: { //分页参数
-            page: 1,
-            size: 10,
-            total: 0,
-          },
-        },
-        dictItemList: {
-          data: [],
-          columns: [
-            {
-              title: '名称',
-              key: 'itemText',
-              align: 'center'
-            },
-            {
-              title: '数据值',
-              key: 'itemValue',
-              align: 'center'
-            },
-            {
-              title: '操作',
-              key: 'action',
-              width: 150,
-              align: 'center',
-              slot: 'action'
-            },
-          ],//字典集合
-          page: { //分页参数
-            page: 1,
-            size: 10,
-            total: 0,
-          },
-        },//字典详细集合
-        recycleBin: {
-          data: [],
-          columns: [
-            {
-              type: 'selection',
-              width: 60,
-              align: 'center'
-            },
-            {
-              title: '字典名称',
-              key: 'dictName',
-              align: 'center'
-            },
-            {
-              title: '字典编号',
-              key: 'dictCode',
-              align: 'center'
-            },
-            {
-              title: '描述',
-              key: 'description',
-              align: 'center'
-            },
-            {
-              title: '操作',
-              key: 'action',
-              width: 150,
-              align: 'center',
-              slot: 'action'
-            },
-          ],
-        },//回收站
-        createDictShow: false,
-        dictTitle: "添加字典",
-        dictItemTitle: "新增",
-        dictModel: {
-          id: "",
-          dictName: "",
-          dictCode: "",
-          description: ""
-        }, //新增字典集合
-        dictItemModel: {
-          id: "",
-          itemText: "",
-          itemValue: "",
-          description: "",
-          sortOrder: 1,
-          status: 1,
-        },
-        dictItemModelRule: {
-          itemText: [
-            {required: true, message: '请输入名称', trigger: 'blur'}
-          ],
-          itemValue: [
-            {required: true, message: '请输入数据值', trigger: 'blur'}
-          ],
-        },
-        dictModelRule: {
-          dictName: [
-            {required: true, message: '请输入字典名称', trigger: 'blur'}
-          ],
-          dictCode: [
-            {required: true, message: '请输入字典编码', trigger: 'blur'}
-          ],
-        },//字典验证
-        createDictLoading: false,
-        //批量删除按钮是否显示
-        dictDeleteShow: false,
-        //批量删除选中的数据
-        dictSelectData: [],
-        //抽屉显示事件
-        itemDrawer: false,
-        dictId: "", //字典id
-        createDictItemShow: false, //字典详细是否显示
-        createDictItemLoading: false,
-        recycleBinShow:false, //回收站显示
-        queryParam:{}, //查询条件
-        //回收站选择数据
-        recycleBinRows:[],
-      }
-    },
-    created() {
-      this.loadData()
-    },
-   watch: {
-     dictShow: {
-            deep: true,
-            immediate: true,
-            handler: function (val){
-            if(!val){
-              this.itemDrawer=false
-              this.createDictShow=false
-              this.createDictItemShow=false
-            }
-        }
-      },
-    },
-    methods: {
-      loadData(arg) {
-        //加载数据列表
-        let that = this;
-        let data = {}
-        //update-begin---author:wangshuai ---date:20220720  for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据------------
-        if(arg){
-            data.pageNo = arg
-        }else{
-            data.pageNo = that.dictData.page.page
-        }
-        //update-end---author:wangshuai ---date:20220720  for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据--------------
-        data.pageSize = that.dictData.page.size
-        if(this.queryParam.dictCode){
-          data.dictCode=this.queryParam.dictCode
-        }
-        if(this.queryParam.dictName){
-          data.dictName=this.queryParam.dictName
-        }
-        $http.get({
-          url: api.dictList,
-          data: data,
-          success: (res) => {
-            that.dictData.data = res.records;
-            that.dictData.page.size = res.size;
-            that.dictData.page.total = res.total;
-          }
-        });
-      },
-      resetParam(){
-        this.queryParam={}
-        //update-begin---author:wangshuai ---date:20220720  for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据------------
-        this.loadData(1)
-        //update-end---author:wangshuai ---date:20220720  for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据------------
-      },
-      loadItemData() {
-        //加载数据列表
-        let that = this;
-        $http.get({
-          url: api.dictItemList,
-          data: {
-            pageNo: that.dictItemList.page.page,
-            pageSize: that.dictItemList.page.size,
-            dictId: this.dictId
-          },
-          success: (res) => {
-            that.dictItemList.data = res.records;
-            that.dictItemList.page.size = res.size;
-            that.dictItemList.page.total = res.total;
-          }
-        });
-      },
-      handleSizeChange(val) {
-        this.dictData.page.size = val;
-        this.loadData();
-      },
-      handleCurrentChange(val) {
-        this.dictData.page.page = val;
-        this.loadData();
-      },
-      //字典新增
-      dictClick() {
-        this.moduleTitle = "添加字典"
-        this.createDictShow = true
-      },
-      //字典添加和修改确定操作
-      createDictOk(name) {
-        let that = this
-        this.$refs[name].validate((valid) => {
-          if (valid) {
-            this.createDictLoading = true
-            let url = ""
-            if (that.dictModel.id) {
-              url = api.dictEdit
-            } else {
-              url = api.dictAdd
-            }
-            $http.post({
-              url: url,
-              contentType: 'json',
-              data: JSON.stringify(that.dictModel),
-              success: (res) => {
-                this.createDictShow = false
-                that.dictModel = {};
-                this.loadData()
-              },
-              finally: () => {
-                this.createDictLoading = false
-              }
-            })
-
-          }
-        })
-      },
-      createItemDictOk(name) {
-        let that = this
-        this.$refs[name].validate((valid) => {
-          if (valid) {
-            this.createDictItemLoading = true
-            let url = ""
-            if (that.dictItemModel.id) {
-              url = api.dictItemEdit
-            } else {
-              url = api.dictItemAdd
-            }
-            that.dictItemModel.dictId = this.dictId
-            if (!that.dictItemModel.sortOrder) {
-              that.dictItemModel.sortOrder = 1
-            }
-            if (that.dictItemModel.status ==undefined) {
-              that.dictItemModel.status = 1
-            }
-            //console.log(that.dictItemModel);
-            $http.post({
-              url: url,
-              contentType: 'json',
-              data: JSON.stringify(that.dictItemModel),
-              success: (res) => {
-                this.createDictItemShow = false
-                that.dictItemModel = {};
-                this.loadItemData()
-              },
-              finally: () => {
-                this.createDictItemLoading = false
-              }
-            })
-
-          }
-        })
-      },
-      //表单验证情况清空
-      cancelReset(name) {
-        this.$refs[name].resetFields();
-        this.createDictShow = false
-        this.dictModel = {};
-        this.loadData()
-      },
-      cancelItemReset(name) {
-        this.$refs[name].resetFields();
-        this.createDictItemShow = false
-        this.dictItemModel = {};
-        this.loadItemData()
-      },
-      //字典编辑
-      editDict(row) {
-        this.moduleTitle = "修改字典"
-        this.dictModel = row
-        this.createDictShow = true
-      },
-      //字典删除
-      dictRemove(row) {
-        let id = row.id;
-        $http.del({
-          url: api.dictDelete,
-          data: {"id": id},
-          success: (res) => {
-            this.loadData()
-          }
-        })
-      },
-      //字典详情删除
-      dictItemRemove(row) {
-        let id = row.id;
-        $http.del({
-          url: api.dictItemDelete,
-          data: {"id": id},
-          success: (res) => {
-            this.loadItemData()
-          }
-        })
-      },
-      //复选框选中事件
-      dictTableSelect(selection) {
-        if (selection.length > 0) {
-          this.dictDeleteShow = true
-          this.dictSelectData = selection
-        } else {
-          this.dictDeleteShow = false
-        }
-      },
-      //批量删除点击事件
-      dictDeleteBatch() {
-        let dictSelectData = this.dictSelectData
-        let ids = ""
-        for (const dictSelectDatum of dictSelectData) {
-          let id = dictSelectDatum.id;
-          ids = ids + id + ","
-        }
-        if (ids.length > 1) {
-          ids = ids.substr(0, ids.lastIndexOf(","))
-        }
-        this.$Modal.confirm({
-          title: "批量删除",
-          content: "确定要删除吗",
-          closable: true,
-          onOk: (res) => {
-            $http.del({
-              url: api.dictDeleteBatch,
-              data: {"ids": ids},
-              success: (res) => {
-                this.loadData()
-              }
-            })
-          },
-        });
-      },
-      //字典配置选项
-      dictConfig(id) {
-        this.itemDrawer = true
-        this.dictId = id
-        this.loadItemData()
-      },
-      handleItemSizeChange(val) {
-        this.dictItemList.page.size = val;
-        this.loadItemData()
-      },
-      handleItemCurrentChange(val) {
-        this.dictItemList.page.page = val;
-        this.loadItemData()
-      },
-      //字典详细添加
-      dictItemClick() {
-        this.dictItemModel = {}
-        this.dictItemTitle = "新增"
-        this.dictItemModel.status = 1
-        this.createDictItemShow = true
-      },
-      //字典详情编辑
-      editItemDict(row) {
-        //console.log(row)
-        this.dictItemTitle = "修改"
-        this.dictItemModel = row
-        this.createDictItemShow = true
-      },
-      close() {
-        this.dictShow = false
-        this.recycleBinRows = [];
-        this.resetParam()
-      },
-      getRowClassname(row) {
-        if (row.status == 0) {
-          return "data-rule-invalid"
-        }
-      },
-      //刷新缓存
-      dictReflesh() {
-        let that = this
-        $http.get({
-          url: api.refleshCache,
-          success: (res) => {
-            that.$Message.success(res);
-          }
-        })
-      },
-      //回收站点击按钮事件
-      recycleBinClick(){
-        this.recycleBinShow = true
-        this.loadRecycleBin();
-      },
-      //回收站关闭事件
-      recycleBinReset(){
-        this.recycleBinShow = false
-      },
-      //加载回收站数据
-      loadRecycleBin(){
-        $http.get({
-          url:api.deleteList,
-          success: (res) => {
-           this.recycleBin.data = res
-          }
-        })
-      },
-      //回收站字典取回
-      recycleBinRetrieve(id){
-        $http.post({
-          url: api.back,
-          contentType: 'json',
-          data: {"id": id},
-          success: (res) => {
-            this.loadRecycleBin()
-            this.loadData()
-          }
-        }) 
-      },
-      //回收站字典彻底删除
-      recycleBinDelete(id){
-        $http.del({
-          url:api.thoroughDelete,
-          data: {"id": id},
-          success: (res) => {
-            this.loadRecycleBin()
-          }
-        })
-      },
-      /**
-       * 回收站复选框选中事件
-       * @param selection
-       */
-      recycleBinChange(selection){
-        if (selection.length > 0) {
-          this.recycleBinRows = selection
-        } else {
-          this.recycleBinRows = [];
-        }
-      },
-      /**
-       * 回收站批量操作
-       * @param type
-       */ 
-      recycleBinBatch(type){
-        let recycleBinRows = this.recycleBinRows
-        let ids = ""
-        for (const recycle of recycleBinRows) {
-          let id = recycle.id;
-          ids = ids + id + ","
-        }
-        if (ids.length > 1) {
-          ids = ids.substr(0, ids.lastIndexOf(","))
-        }
-        if(type === 'recycle'){
-          //批量取回
-          this.recycleBinBatchRecycle(ids);
-        }else if(type === 'delete'){
-          //批量删除
-          this.recycleBinBatchDelete(ids);
-        }
-      },
-      /**
-       * 批量取回
-       * @param ids
-       */
-      recycleBinBatchRecycle(ids){
-        $http.post({
-          url: api.batchRevert,
-          data: {"ids": ids},
-          success: (res) => {
-            this.recycleBinRows = [];
-            this.loadRecycleBin();
-            this.loadData();
-          }
-        })
-      },
-      /**
-       * 批量删除
-       * @param ids
-       */
-      recycleBinBatchDelete(ids){
-        this.$Modal.confirm({
-          title: "批量删除",
-          content: "确定要删除吗",
-          closable: true,
-          onOk: (res) => {
-            $http.del({
-              url: api.batchRealDelete,
-              data: {"ids": ids},
-              success: (res) => {
-                this.recycleBinRows = [];
-                this.loadRecycleBin();
-              }
-            })
-          },
-        });
-      }
-    }
-  })
-</script>
-<style>
-    .dict .ivu-form-item {
-        margin-bottom: 24px !important;
-    }
-
-    .ivu-drawer-mask {
-        z-index: 2000 !important;
-    }
-
-    .ivu-drawer-wrap {
-        z-index: 2000 !important;
-    }
-
-    .dictItem {
-        z-index: 2025 !important;
-    }
-
-    .ivu-poptip-popper {
-        z-index: 9999 !important;
-    }
-
-    .data-rule-invalid {
-        background: #f4f4f4;
-        color: #bababa;
-    }
-
-    .ivu-table-stripe .ivu-table-body tr:nth-child(2n) td {
-        background-color: #ffffff;
-    }
-
-    .ivu-btn-small {
-        font-size: 12px;
-    }
-</style>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl
deleted file mode 100644
index 5b0074b12..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl
+++ /dev/null
@@ -1,2391 +0,0 @@
-<style>
-    .nameCla{
-        color:#333;
-    }
-    nameCla:hover{
-        color:#2d8cf0;
-    }
-    .on{
-        color: #2d8cf0;
-    }
-    .demo-spin-icon-load{
-        animation: ani-demo-spin 1s linear infinite;
-    }
-    @keyframes ani-demo-spin {
-        from { transform: rotate(0deg);}
-        50%  { transform: rotate(180deg);}
-        to   { transform: rotate(360deg);}
-    }
-    .ivu-table-body table{
-        width: 100% !important;
-    }
-    .param-style .ivu-table-cell-with-selection{
-        text-overflow: unset;
-    }
-    .pointerIcon .ivu-icon{
-        cursor: pointer;
-    }
-    .ivu-table-cell{
-        text-overflow: unset;
-    }
-    .ivu-message{
-        width:50%;
-        left:27%;
-    }
-</style>
-<script type="text/x-template" id="data-source-setting-template">
-    <div>
-        <!-- 新增数据集 弹框-begin -->
-        <Modal
-                fullscreen=true
-                :loading="loading"
-                width="100%"
-                v-model="sqlModal"
-                :title="moduleTitle"
-                @on-cancel="clearDb"
-                @on-ok="saveDbTip"
-                class="dataSource"
-                >
-            <Row>
-                <i-col span="4" v-if="sqlForm.dbType == 0">
-                  <Icon size="25" v-if="forward=='0'" type="ios-arrow-back" style="float: left;margin-top: -12px;cursor: pointer;" @click="forwardClick('1')"/>
-                  <Icon size="25" v-if="forward=='1'" type="ios-arrow-forward" style="float: left;margin-top: -12px;cursor: pointer;border-right: 1px solid #dcdee2;" @click="forwardClick('0')"/>
-                </i-col>
-            </Row>
-            <Row>
-                <i-col span="4" v-if="sqlForm.dbType == 0 && forward=='0'">
-                    <Card style="height: auto;">
-                        <div style="display: flex">
-                            <i-select size="small" filterable :model.sync="sqlForm.dbSource" v-model="sqlForm.dbSource" @on-change="selectdbSource" clearable style="width:170px" :placeholder="daSourceDesc" @on-clear="handleClear">
-                                <i-option v-for="item in maintainData" :value="item.id">{{ item.name }}</i-option>
-                            </i-select>
-                            <i-button size="small"  @click="sourceManage" v-if="sqlForm.dbType == 0" type="primary">维护</i-button>
-                            <Tooltip :transfer="true" content="数据源维护文档" placement="top" class="jimu-tooltip">
-                              <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/dbsource.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                            </Tooltip>
-                        </div>
-                        <i-input size="small" style="margin-top: 10px" search enter-button v-model="tableName" placeholder="表名查询" @on-search="queryTableName" />
-                        <div style="margin-top: 10px" v-if="tableList&&tableList.length>0">
-                          <Page
-                                :total="tableTotal"
-                                @on-change="handleCurrentChange"
-                                :page-size="tablePageSize"
-                                simple
-                                style="text-align: center;">
-                          </Page>
-                           <#--表名列表-->
-                               <List size="small" border :loading="tableLoading"   style="overflow-y: auto;height: 720px;margin-top: 10px" ref="taList">
-                                   <ListItem v-for="(item,index) in tableList" :id="index">
-                                       <Tooltip :content="item.name" transfer>
-                                           <a href="Javascript:void(0)" @click="tableNameClick(item,index)" :class="{on:currentIndex === index,'nameCla':index===index}">
-                                               {{item.name}}
-                                           </a>
-                                       </Tooltip>
-                                   </ListItem>
-                               </List>
-                        </div>
-                    </Card>
-                </i-col>
-                    <div v-if="sqlForm.dbType == 0 && forward=='1'" style="height: 880px;box-sizing:border-box;width: 26px;float: left;border-right: 1px solid #dcdee2;">
-                    </div>
-                <i-col :span="secondSpan">
-                    <div style="margin-left: 20px">
-                        <i-form ref="sqlForm"
-                                :model="sqlForm"
-                                :rules="sqlFormValidate"
-                                inline :label-width="85">
-                            <Row span="24">
-                                    <form-item prop="dbCode" label="编码:">
-                                        <i-input :disabled ="sqlForm.id!='' && sqlForm.id!=undefined" style="width: 153px" type="text" v-model="sqlForm.dbCode" placeholder="请输入编码">
-                                        </i-input>
-                                    </form-item>
-                                    <form-item prop="dbChName" label="名称">
-                                        <i-input type="text" style="width: 200px" v-model="sqlForm.dbChName" placeholder="请输入名称">
-                                        </i-input>
-                                    </form-item>
-                                    <form-item>
-                                        <Checkbox :checked.sync="sqlForm.isList" v-model="sqlForm.isList" @on-change="isListChange" style="width: 100px">是否集合</Checkbox>
-                                    </form-item>
-                                    <form-item>
-                                        <#--<Checkbox :checked.sync="sqlForm.isPage" v-if="addIsPage == true" disabled v-model="sqlForm.isPage">是否分页</Checkbox>-->
-                                        <Checkbox :checked.sync="sqlForm.isPage" v-if="sqlForm.isList == true && sqlForm.dbType != 3" v-model="sqlForm.isPage" @on-change="checkChange" style="width: 100px;margin-left: -86px">是否分页
-                                          <Tooltip :transfer="true" content="分页文档" placement="top" class="jimu-tooltip">
-                                            <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/paging.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                          </Tooltip>
-                                        </Checkbox>
-                                    </form-item>
-                                    <form-item prop="apiMethod" label="请求方式:" v-if="sqlForm.dbType == 1">
-                                        <i-select  style="width: 153px" v-model="sqlForm.apiMethod" placeholder="请输入请求方式">
-                                            <i-option value="0">get</i-option>
-                                            <i-option value="1">post</i-option>
-                                        </i-select>
-                                    </form-item>
-                            </Row>
-                            <Row span="24" v-if="sqlForm.dbType == 1">
-                              <form-item prop="apiConvert" label="类转换器:">
-                                <i-input style="width:530px" v-model="sqlForm.apiConvert" placeholder="类转换器"></i-input>
-                              </form-item>
-                            </Row>
-                            <Row style="margin-top: 2%;">
-                                <i-col span="24">
-                                    <form-item prop="dbDynSql" label="报表SQL:" v-if="sqlForm.dbType == 0">
-                                        <i-input v-model="sqlForm.dbDynSql"  @on-blur="dbDynSqlBlur"  type="textarea" :rows="4"  placeholder="请输入查询SQL" style="min-height: 100px;max-height: 620px;width:950px">
-                                        </i-input>
-                                    <div style="font-size: 12px;">
-                                      <p style="margin-left: 14px">
-                                        <ul>
-                                          <li>如果id字段为字符串类型则需要加单引号:select * from table where id=${"'$"}${"{id}'"}。</li>
-                                          <li>您可以编写${"'$"}${"{id}'"}做为一个参数,这里id是参数的名称。例如:select * from table where id=${"'$"}${"{id}'"}。</li>
-                                          <li>您可以编写${'#'}${'{sysUserCode}'} 做为一个系统变量,这里sysUserCode是当前登录人。例如:select * from table where create_by=${"'#"}${"{sysUserCode}'"}。</li>
-                                          <li>您可以编写存储过程CALL proc_sys_role(${'$'}${'{'}${'pageNo'}${"}"}, ${'$'}${'{'}${'pageSize'}${"}"}),CALL为开启存储过程。
-                                            <Tooltip content="数据源用法文档" placement="top">
-                                              <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dsUse.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                            </Tooltip>
-                                          </li>  
-                                      </ul>
-                                      </p>
-                                    </div>
-                                    </form-item>
-                                    <form-item prop="apiUrl" label="Api地址:" v-else-if="sqlForm.dbType == 1">
-                                        <i-input v-model="sqlForm.apiUrl" @on-blur="dbApiBlur" type="textarea" :rows="4"  placeholder="请输入Api地址" style="min-height: 100px;max-height: 620px;width:950px">
-                                        </i-input>
-                                      <div style="font-size: 12px;">
-                                        <p style="margin-left: 14px">
-                                          <ul>
-                                            <li>如果id字段为字符串类型则需要加单引号:http://127.0.0.1:8080/jeecg-boot/jimureport/test?id=${"$"}${"{id}"}。</li>
-                                            <li>您可以编写${"#"}${"{sysDateTime}"}做为一个系统变量,这里sysDateTime是当前系统时间。例如:http://127.0.0.1:8080/jeecg-boot/jimureport/test?riqi=${"#"}${"{sysDateTime}"}。</li>
-                                            <li>您可以简写访问路径，如：${"#"}${"{domainURL}"}/jimureport/test/getList
-                                              <Tooltip content="数据源用法文档" placement="top">
-                                                <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dsUse.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                              </Tooltip>
-                                            </li>
-                                          </ul>
-                                        </p>
-                                      </div>
-                                    </form-item>
-                                     <form-item prop="jsonData" label="json数据:" v-else="sqlForm.dbType == 3">
-                                      <i-input v-model="sqlForm.jsonData" type="textarea" :rows="4"  placeholder="请输入JSON数据" style="min-height: 120px;max-height: 620px;width:950px">
-                                      </i-input>
-                                     </form-item>
-                                    <i-button @click="handleSQLAnalyze" v-if="sqlForm.dbType == 0" type="primary">SQL解析</i-button>
-                                    <Tooltip v-if="sqlForm.dbType == 0"  :transfer="true" content="SQL解析文档" placement="top">
-                                        <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/sql.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                    </Tooltip>
-                                    <i-button @click="handleApiAnalyze" v-if="sqlForm.dbType == 1" type="primary">Api解析</i-button>
-                                    <Tooltip v-if="sqlForm.dbType == 1"  :transfer="true" content="Api解析文档" placement="top">
-                                        <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/api.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                    </Tooltip>
-                                    <i-button @click="handleJsonAnalyze" v-if="sqlForm.dbType == 3" type="primary">JSON解析</i-button>
-                                    <Tooltip v-if="sqlForm.dbType == 3"  :transfer="true" content="JSON解析文档" placement="top">
-                                        <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dataSet/json.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                    </Tooltip>
-                                </i-col>
-                            </Row>
-                        </i-form>
-                        <Spin fix v-if="spinShow">
-                            <Icon type="ios-loading" size=18 class="demo-spin-icon-load"></Icon>
-                            <div>Loading</div>
-                        </Spin>
-                        <Tabs v-model="tabValue" style="margin-top: 15px">
-                            <tab-pane label="报表字段明细" name="1">
-                                <i-button type="primary" @click="removeFieldTable" v-if="tab1.selectParamTables.length>0">删除</i-button>
-                                <i-table style="padding-bottom: 10%;" ref="dynamicTable" @on-select="selectField" @on-select-all="selectFieldAll" @on-select-all-cancel="cancelFieldAll" @on-select-cancel="cancelField" stripe :columns="tab1.columns" :data="tab1.data" :height="tableHeight">
-                                  <template slot-scope="{ row, index }" slot="extJsonFiled">
-                                    <i-input size="small" v-model="row.extJson" @on-change="extJsonFiledChange(index,row.extJson)" @on-click="extJsonFiledClick(index,row.extJson)" icon="md-contract" class="pointerIcon" placeholder="请输入参数配置"/>
-                                  </template>
-                                </i-table>
-                            </tab-pane>
-                            <tab-pane label="报表参数" name="2" v-if="sqlForm.dbType != 3">
-                                <i-button type="primary" @click="addParamTable">新增</i-button>
-                                <i-button type="primary" @click="removeParamTable" v-if="tab2.selectParamTables.length>0">删除</i-button>
-
-                                <i-table class="param-style" ref="paramTable" @on-select="selectParam" @on-select-all="selectParamAll" @on-select-all-cancel="cancelParamAll" @on-select-cancel="cancelParam" stripe :columns="tab2.columns" :data="tab2.data" :height="paramTableHeight">
-                                    <template slot="paramName" slot-scope="props">
-                                        <i-form :ref="'formDynamic'+props.idx" :model="props.row">
-                                                <form-item prop="paramName" :rules="{required: true, message: '请输入参数', trigger: 'change'}" style="margin-top: 10px">
-                                                    <i-input v-model="props.row.paramName" size="small" />
-                                                </form-item>
-                                        </i-form>
-                                    </template>
-                                    <template slot="paramTxt" slot-scope="props">
-                                        <i-form :ref="'formTxtDynamic'+props.idx" :model="props.row">
-                                            <form-item prop="paramTxt" style="margin-top: 10px">
-                                                <i-input v-model="props.row.paramTxt" size="small" />
-                                            </form-item>
-                                        </i-form>
-                                    </template>
-                                    <template slot-scope="{ row, index }" slot="extJsonParam">
-                                      <i-input size="small" v-model="row.extJson" @on-change="extJsonParamChange(index,row.extJson)" @on-click="extJsonParamClick(index,row.extJson)" icon="md-contract" class="pointerIcon" placeholder="请输入参数配置"/>
-                                    </template>
-                                </i-table>
-
-                            </tab-pane>
-                            <tab-pane label="数据预览" name="3" v-if="sqlForm.dbType == 0">
-                                <span style="color: red">提示：仅显示10条数据 <span v-if="izTestData==true">因权限控制，列表为测试数据</span> </span>
-                                <i-table ref="viewParamTable"  stripe :columns="tab3.columns" :data="tab3.data" :loading="tab3Loading"></i-table>
-<#--                                <div style="float:right;margin-top:20px;">-->
-<#--                                    <Page :total="tab3.page.total" @on-change="handleCurrentChange"></Page>-->
-<#--                                </div>-->
-                            </tab-pane>
-                        </Tabs>
-                    </div>
-                </i-col>
-            </Row>
-        </Modal>
-        <!-- 新增数据集 弹框-end -->
-
-       <#--数据源维护 弹窗-begin-->
-        <Modal
-                class-name="vertical-center-modal"
-                :fullscreen="dataSourceFull"
-                :loading="loading"
-                v-model="sourceModal"
-                width="800"
-                title="数据源维护"
-                :closable="true"
-                :mask-closable="false">
-            <p slot="header">
-              <span>数据源维护
-                 <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-if="sourceDraggable" :transfer="true" content="缩小" placement="top">
-                     <Icon type="ios-contract" @click="dataSourceClick"/>
-                 </Tooltip>
-                 <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-else :transfer="true" content="放大" placement="top">
-                       <Icon type="ios-expand" @click="dataSourceClick"/>
-                 </Tooltip>
-              </span>
-            </p>
-            <div slot="footer">
-              <i-button @click="saveSourceDb">关闭</i-button>
-            </div>
-            <Row>
-                <i-col span="3">
-                    <i-button @click="addDataSource" type="primary">新增</i-button>
-                </i-col>
-            </Row>
-            <template>
-                <i-table border :columns="sourceTab.columns" :data="sourceTab.data"  style="margin-top: 1%;"></i-table>
-                <Page
-                      style="margin-top: 10px;text-align: center"  
-                      :total="sourceTabPage.total"
-                      show-total
-                      show-elevator
-                      :page-size="sourceTabPage.size"
-                      show-sizer
-                      @on-change="sourceTabCurrentChange"
-                      @on-page-size-change="sourceTabSizeChange"
-                      size="small">
-                </Page>
-            </template>
-        </Modal>
-
-        <Modal :loading="loading" v-model="visibleData" title="数据源" :width="35" @on-cancel="clearDbSou" @on-ok="saveDataSource">
-            <div style="padding-right: 30px">
-                <i-form ref="dataSource" :model="dataSource" :rules="dataFormValidate" label-colon :label-width="100" >
-
-                    <form-item prop="name" label="数据源名称" style="height:50px">
-                        <i-input v-model="dataSource.name" placeholder="请输入数据源名称"></i-input>
-                    </form-item>
-
-                    <form-item prop="dbType" label="数据源类型" style="height:50px">
-                        <i-select :model.sync="dataSource.dbType" v-model="dataSource.dbType" @on-change="selectdbType">
-                            <i-option v-for="item in dataSourceTypeList" :value="item.value">{{ item.label }}</i-option>
-                        </i-select>
-                    </form-item>
-
-                    <form-item prop="dbDriver" label="驱动类" style="height:50px" v-if="isNoSql">
-                        <i-input v-model="dataSource.dbDriver" placeholder="请输入驱动类"></i-input>
-                    </form-item>
-
-                    <form-item prop="dbUrl" label="数据源地址" style="height:50px">
-                        <i-input v-model="dataSource.dbUrl" placeholder="请输入数据源地址"></i-input>
-                    </form-item>
-
-                    <form-item prop="dbUsername" label="用户名" style="height:50px" v-if="isRedis">
-                        <i-input v-model="dataSource.dbUsername" placeholder="请输入用户名"></i-input>
-                    </form-item>
-
-                    <form-item prop="dbPassword" label="密码" style="height:50px;width: 100%;">
-                        <i-input style="width: calc(100% - 60px)" type="password" password v-model="dataSource.dbPassword" placeholder="请输入密码"></i-input>
-                        <i-button size="small" style="width: 50px" @click="dataSourceTest" type="primary">测试</i-button>
-                    </form-item>
-                </i-form>
-            </div>
-        </Modal>
-    <#--数据源维护 弹窗-end-->
-
-    <#--删除确认弹窗-begin-->
-        <Modal
-                v-model="deleteParamModel"
-                @on-ok="deleteParamTable"
-                title="确认删除">
-            <p><Icon type="ios-alert"  color="#f90" size="20px"></Icon>是否删除选中数据?</p>
-        </Modal>
-        <Modal
-                v-model="deleteFieldModel"
-                @on-ok="deleteFieldTable"
-                title="确认删除">
-            <p><Icon type="ios-alert"  color="#f90" size="16px"></Icon>是否删除选中配置?</p>
-        </Modal>
-        <Modal
-              v-model="reportSql"
-              title="报表SQL已修改"
-              @on-ok="reportOk"
-              @on-cancel="reportCancel">
-            <p>报表SQL已修改，是否保存</p>
-       </Modal>
-    <#--删除确认弹窗-end-->
-    <#--输入框参数配置放大-->
-    <Modal draggable :loading="loading" v-model="extJsonShow" title="输入值" :width="1000" @on-ok="extJsonOk"
-           @on-cancel="extJsonCancel">
-      <i-form label-colon :label-width="100">
-        <form-item label="参数配置">
-          <i-input :autosize="{minRows: 10}" type="textarea" v-model="paramConfigData" placeholder="请输入参数配置"></i-input>
-        </form-item>
-      </i-form>
-    </Modal>
-    <j-sql-function-replace ref="sqlFunctionReplace" @functionok="functionOk"></j-sql-function-replace>  
-    </div>
-</script>
-
-<script>
-    const addUrlParam = function(base, key, value){
-        if(base.includes("?")){
-            base = base+"&"+key+"="+value
-        }else{
-            base = base+"?"+key+"="+value
-        }
-        return base;
-    }
-    Vue.component('j-data-source-setting', {
-        template: '#data-source-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: false,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                forward:"1", //图片切换
-                reportSql:false,//控制Modal当SQL报表改变的时候
-                loading:true,
-                tab3Loading:false,
-                spinShow:false,
-                menuitem : "printinfo",
-                selectTableName : "",
-                currentIndex:-1,
-                moduleTitle: "",
-                tableHeight: 0,
-                paramTableHeight: 0,
-                tabValue:"1",
-                deleteParamModel:false,
-                deleteFieldModel:false,
-                dataSourceTypeList:[
-                    {value: 'MYSQL5.5',label: 'MySQL5.5'},
-                    {value: 'MYSQL5.7',label: 'MySQL5.7+'},
-                    {value: 'ORACLE',label: 'Oracle'},
-                    {value: 'SQLSERVER',label: 'SQLServer'},
-                    {value: 'POSTGRESQL',label: 'PostgreSQL'},
-                    {value: 'MARIADB',label: 'MariaDB'},
-                    {value: 'dm',label: '达梦'},
-                    {value: 'kingbase8',label: '人大金仓'},
-                    {value: 'oscar',label: '神通'},
-                    {value: 'DB2',label: 'DB2'},
-                    {value: 'Hsqldb',label: 'Hsqldb'},
-                    {value: 'Derby',label: 'Derby'},
-                    {value: 'H2',label: 'H2'},
-                    {value: 'other',label: '其他数据库'},
-                    {value: 'redis',label: 'Redis'},
-                    {value: 'mongodb',label: 'MongoDb'},
-                    ],
-                designerObj:{
-                    id:"",
-                    name:"",
-                    type:"printinfo"
-                },
-                tab1: {
-                    selectParamTables:[],
-                    data: [],
-                    columns: [
-                        {
-                            type: 'selection',
-                            width: 35,
-                            align: 'center'
-                        },
-                        {
-                            type: 'index',
-                            width: 60,
-                            align: 'center'
-                        },
-                        {
-                            title: '字段名',
-                            key: 'fieldName',
-                            width: '120',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'fieldName','tab1')
-                            }
-                        },
-                        {
-                            title: '排序',
-                            key: 'orderNum',
-                            width: '80',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'orderNum','tab1')
-                            }
-                        },
-                        {
-                            title: '字段文本',
-                            width: '120',
-                            key: 'fieldText',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'fieldText','tab1')
-                            }
-                        },
-                        {
-                            title: '类型',
-                            width: '120',
-                            key: 'widgetType',
-                            render: (h, params) => {
-                                let options = [
-                                    // 下拉选项
-                                    {title: '数值类型', value: 'number'},
-                                    {title: '字符类型', value: 'string'},
-                                    {title: '日期类型', value: 'date'},
-                                    { title: '富文本', value: 'richText' }
-                                ];
-
-                                return h('i-select', {
-                                            props: {
-                                                size:'small',
-                                                clearable:true,
-                                                value: this.tab1.data[params.index].widgetType,
-                                            },
-                                            on: {
-                                                'on-change': (value) => {
-                                                    this.tab1.data[params.index].widgetType = value;
-                                                }
-                                            },
-                                        },
-                                        options.map(item => {
-                                            return h('i-option', {
-                                                props: {
-                                                    value: item.value
-                                                }
-                                            }, item.title)
-                                        })
-                                );
-                            }
-                        },
-                        {
-                            title: '字典code',
-                            width: '120',
-                            key: 'dictCode',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'dictCode','tab1','请输入字典code或地址')
-                            }
-                        },
-                        {
-                            title: '查询',
-                            width: '80',
-                            key: 'searchFlag',
-                            render:(h, params)=> {
-                                return h('Checkbox',{
-                                    props: {
-                                        size:'small',
-                                        value: this.tab1.data[params.index].searchFlag,
-                                        trueValue: 1,
-                                        falseValue: 0
-                                    },
-                                    on: {
-                                        'on-change': (value) => {
-                                            this.tab1.data[params.index].searchFlag = value;
-                                            if(value==0){
-                                                // _this.tab1.data[params.index].searchMode = null;
-                                            }
-                                        }
-                                    }
-                                });
-                            }
-                        },
-                        {
-                            title: '查询模式',
-                            width: '120',
-                            key: 'searchMode',
-                            render: (h, params) => {
-                                let options = [ // 下拉选项
-                                    {title: '输入框', value: 1},
-                                    {title: '下拉单选', value: 4},
-                                    {title: '下拉多选', value: 3, tip:'须设置字典code'},
-                                    {title: '范围查询', value: 2},
-                                    {title: '模糊查询', value: 5},
-                                    {title: '下拉树', value: 6, tip:'须在code栏设置接口地址'},
-                                    {title: '自定义下拉框', value: 7}
-                                ];
-
-                                return h('i-select', {
-                                            props: {
-                                                size:'small',
-                                                clearable: true,
-                                                transfer: true,
-                                                value: this.tab1.data[params.index].searchMode
-                                            },
-                                            on: {
-                                                'on-change': (value) => {
-                                                    // console.log(this.tab1.data)
-                                                    this.tab1.data[params.index].searchMode = value;
-                                                    // this.tab1.data
-                                                }
-                                            },
-                                        },
-                                        options.map(item => {
-                                            let optionObject = {
-                                                props: {
-                                                    value: item.value
-                                                }
-                                            }
-                                            if(item.tip){
-                                                optionObject['attrs'] = {title: item.tip}
-                                            }
-                                            return h('i-option', optionObject, item.title)
-                                        })
-                                );
-                            }
-                        },
-                        {
-                            title: '查询默认值',
-                            width: '120',
-                            key: 'searchValue',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'searchValue','tab1','请输入查询默认值')
-                            }
-                        },
-                        {
-                            title: '查询日期格式',
-                            width: '120',
-                            key: 'searchFormat',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'searchFormat','tab1','请输入查询日期格式')
-                            }},
-                            {
-                            title: '参数配置',
-                            width: '120',
-                            key: 'extJson',
-                            slot: 'extJsonFiled'
-                        }
-                    ]
-                },
-                tab2:{
-                    selectParamTables:[],
-                    data: [],
-                    columns: [
-                        {
-                            type: 'selection',
-                            width: 35,
-                            align: 'center'
-                        },
-                        {
-                            type: 'index',
-                            width: 60,
-                            align: 'center'
-                        },
-                        {
-                            title: '参数',
-                            key: 'paramName',
-                            width: '120',
-                            render: (h, params) => {
-                                this.tab2.data[params.index] = params.row;
-                                return h(
-                                "div", 
-                                this.$refs.paramTable.$scopedSlots.paramName({
-                                    row: params.row,
-                                    idx: params.row._index
-                                })
-                                )
-                            }
-                        },
-                        {
-                            title: '排序',
-                            key: 'orderNum',
-                            width: '80',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'orderNum','tab2')
-                            }
-                        },
-                        {
-                            title: '参数文本',
-                            key: 'paramTxt',
-                            width: '120',
-                            render: (h, params) => {
-                                this.tab2.data[params.index] = params.row;
-                                return h(
-                                        "div",
-                                        this.$refs.paramTable.$scopedSlots.paramTxt({
-                                            row: params.row,
-                                            idx: params.row._index
-                                        })
-                                )
-                            }
-                        },
-                        {
-                            title: '类型',
-                            key: 'widgetType',
-                            width: '120',
-                            render: (h, params) => {
-                                let options = [
-                                    {title: '数值类型', value: 'number'},
-                                    {title: '字符类型', value: 'string'},
-                                    {title: '日期类型', value: 'date'}
-                                ];
-                                return h('i-select', {
-                                        props: {
-                                            size:'small',
-                                            clearable:true,
-                                            transfer: true,
-                                            value: this.tab2.data[params.index].widgetType,
-                                        },
-                                        on: {
-                                            'on-change': (value) => {
-                                                this.tab2.data[params.index].widgetType = value;
-                                            }
-                                        },
-                                    },
-                                    options.map(item => {
-                                        return h('i-option', {
-                                            props: {
-                                                value: item.value
-                                            }
-                                        }, item.title)
-                                    })
-                                );
-                            }
-                        },
-                        {
-                            title: '字典code',
-                            key: 'dictCode',
-                            width: '120',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'dictCode','tab2','请输入字典code或地址')
-                            }
-                        },
-                        {
-                            title: '查询',
-                            key: 'searchFlag',
-                            width: '80',
-                            render:(h, params)=> {
-                                return h('Checkbox',{
-                                    props: {
-                                        size:'small',
-                                        value: this.tab2.data[params.index].searchFlag,
-                                        trueValue: 1,
-                                        falseValue: 0
-                                    },
-                                    on: {
-                                        'on-change': (value) => {
-                                            this.tab2.data[params.index].searchFlag = value;
-                                            if(value==0){
-                                                // _this.tab1.data[params.index].searchMode = null;
-                                            }
-                                        }
-                                    }
-                                });
-                            }
-                        },
-                        {
-                            title: '查询模式',
-                            key: 'searchMode',
-                            width: '120',
-                            render: (h, params) => {
-                                let options = [
-                                    {title: '输入框', value: 1},
-                                    {title: '下拉单选', value: 4},
-                                    {title: '下拉多选', value: 3, tip:'须设置字典code'},
-                                    {title: '下拉树', value: 6, tip:'须在code栏设置接口地址'},
-                                    {title: '自定义下拉框', value: 7}
-                                ];
-
-                                return h('i-select', {
-                                        props: {
-                                            size:'small',
-                                            clearable: true,
-                                            transfer: true,
-                                            value: this.tab2.data[params.index].searchMode
-                                        },
-                                        on: {
-                                            'on-change': (value) => {
-                                                this.tab2.data[params.index].searchMode = value;
-                                            }
-                                        },
-                                    },
-                                    options.map(item => {
-                                        let optionObject = {
-                                            props: {
-                                                value: item.value
-                                            }
-                                        }
-                                        if(item.tip){
-                                            optionObject['attrs'] = {title: item.tip}
-                                        }
-                                        return h('i-option', optionObject, item.title)
-                                    })
-                                );
-                            }
-                        },
-                        {
-                            title: '默认值',
-                            key: 'paramValue',
-                            width: '120',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'paramValue','tab2')
-                            }
-                        },
-                        {
-                            title: '查询日期格式',
-                            key: 'searchFormat',
-                            width: '120',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'searchFormat','tab2','请输入查询日期格式')
-                            }
-                        },
-                        {
-                          title: '参数配置',
-                          width: '120',
-                          key: 'extJson',
-                          slot: 'extJsonParam'
-                        }
-                    ]
-                },
-                tab3:{
-                    columns:[],
-                    page: { //分页参数
-                        page: 1,
-                        size: 10,
-                        total: 0,
-                    },
-                    data:[]
-                },
-                sqlForm: {
-                    dbCode: "",
-                    dbChName: "",
-                    dbDynSql: "",
-                    dbType: "",
-                    apiUrl: "",
-                    apiMethod: "0",
-                    isPage:true,
-                    isList:true,
-                    dbSource:"",
-                    jsonData:"",
-                    apiConvert:""
-                },
-                sqlModal: false,
-                sqlFormValidate:{
-                    dbCode:[
-                        { required: true, message: '编码不能为空', trigger: 'blur' },
-                        { validator: this.validateCodeExist, trigger: 'blur' }
-                    ],
-                    dbChName:[
-                        { required: true, message: '名称不能为空', trigger: 'blur' }
-                    ],
-                    dbDynSql:[
-                        { required: true, message: '报表SQL不能为空', trigger: 'blur' }
-                    ],
-                    apiUrl:[
-                        { required: true, message: '请求地址不能为空', trigger: 'blur' }
-                    ],
-                    jsonData:[
-                        { required: true, message: 'JSON数据不能为空', trigger: 'blur' }
-                    ]
-                },
-                sourceModal: false,
-                sourceTab:{
-                    //selectParamTables:[],
-                    data: [],
-                    columns: [
-                        {
-                            type: 'index',
-                            width: 60,
-                            align: 'center'
-                        },
-                        {
-                            title: '数据源名称',
-                            key: 'name'
-                        },
-                        {
-                            title: '数据库类型',
-                            key: 'dbType',
-                            render: (h, params) => {
-                                switch (params.row.dbType) {
-                                    case "MYSQL5.5":
-                                        return h('span', 'MySQL5.5');
-                                        break;
-                                    case "MYSQL5.7":
-                                        return h('span', 'MySQL5.7');
-                                        break;
-                                    case "ORACLE":
-                                        return h('span', 'Oracle');
-                                        break;
-                                    case "SQLSERVER":
-                                        return h('span', 'SQLServer');
-                                        break;
-                                    case "POSTGRESQL":
-                                        return h('span', 'PostgreSQL');
-                                    case "MARIADB":
-                                        return h('span', 'MariaDb');
-                                    case "kingbase8":
-                                        return h('span', '人大进仓');
-                                    case "dm":
-                                        return h('span', '达梦');
-                                    case "oscar":
-                                        return h('span', '神通');
-                                    case "SQLite":
-                                        return h('span', 'SQLite');
-                                    case "DB2":
-                                        return h('span', 'DB2');
-                                    case "Hsqldb":
-                                        return h('span', 'Hsqldb');
-                                    case "Derby":
-                                        return h('span', 'Derby');
-                                    case "H2":
-                                        return h('span', 'H2');
-                                    case "other":
-                                        return h('span', '其他数据库');
-                                    case "redis":
-                                        return h('span', 'Redis');
-                                    case "mongodb":
-                                        return h('span', 'MongoDb');
-                                }
-                            }
-                        },
-                        {
-                            title: '操作',
-                            key: 'action',
-                            width: 150,
-                            align: 'center',
-                            render: (h, params) => {
-                                return this.renderButton(h, params);
-                            }
-                        }
-                    ]
-                },
-                visibleData: false,
-                dataSource: {
-                    id: "",
-                    code: "",
-                    reportId:"",
-                    name: "",
-                    dbType: "",
-                    dbDriver: "",
-                    dbUrl: "",
-                    dbUsername:"",
-                    dbPassword:""
-                },
-                dataFormValidate:{
-                    name:[
-                        { required: true, message: '数据源名称不能为空', trigger: 'blur' }
-                    ],
-                    dbType:[
-                        { required: true, message: '数据源类型不能为空', trigger: 'blur' }
-                    ],
-                    dbDriver:[
-                        { required: true, message: '驱动类不能为空', trigger: 'blur' }
-                    ],
-                    dbUrl:[
-                        { required: true, message: '数据源地址不能为空', trigger: 'blur' }
-                    ],
-                    // dbUsername:[
-                    //     { required: true, message: '用户名不能为空', trigger: 'blur' }
-                    // ],
-                    dbPassword:[
-                        { required: false, message: '密码不能为空', trigger: 'blur' }
-                    ]
-                },
-                tableList:[],
-                oldDbDynSql:"", //旧的数据集
-                tableName:"",
-                tableTotal:0,//table数量
-                tablePage:1, //table当前页
-                tablePageSize:50,//当前页数
-                tableLoading:false,//table加载
-                dataSourceFull:false, //数据源维护弹窗放大缩小操作
-                sourceDraggable:false, //数据源维护弹窗放大缩小操作按钮
-                sourceTabPage:{
-                   page:1,//当前页数
-                   total:10,//总共条数
-                   size:10 //每页显示条数
-                },
-                maintainData:[], //维护下拉数据
-                paramConfigData:"", //参数配置弹窗数据
-                extJsonShow:false, //参数配置弹窗是否显示
-                tableIndex:-1, //当前table的下标
-                tableType:-1, //判断当前是字段还是参数 0字段 1参数
-                daSourceDesc:"选择数据源", //数据源维护描述的内容
-                //是否为测试数据
-                izTestData: false
-            }
-        },
-        mounted(){
-            //多数据源
-            this.initDataSource();
-            this.maintainDataSource();
-        },
-        computed: {
-            secondSpan: function () {
-                if(this.forward=='1' && this.sqlForm.dbType == "0"){
-                    return 23;
-                }
-                return this.sqlForm.dbType == "0" ? 20 : 24;
-            },
-            isNoSql:function(){
-                if(this.dataSource.dbType == 'redis' || this.dataSource.dbType == 'mongodb'){
-                    return false;
-                }
-                return true;
-            },
-            isRedis:function(){
-                return this.dataSource.dbType == 'redis'?false:true;
-            }
-        },
-        watch: {
-            tab1: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.changeTab3Head()
-                }
-            },
-            tabValue: {
-                deep: true,
-                immediate: true,
-                handler: function (val){
-                    if(val==='3'){
-                        this.spinShow=true;
-                        this.loadTableData(1,this.sqlForm.dbDynSql)
-                    }
-                }
-            },
-            tab2:{
-                deep: true,
-                immediate: true,
-                handler: function (){
-                }
-            }
-        },
-        methods: {
-            handleClear(){
-              this.daSourceDesc="选择数据源"
-            },
-            changeTab3Head(){
-                //获取table3表头
-                let tab3Head=[];
-                this.tab1.data.forEach((item,index)=>{
-                    let temp={title: item.fieldText,key:item.fieldName,tooltip:true,width:150};
-                    if(this.tab1.data.length>15){
-                        if(index<3){
-                            temp.fixed='left';
-                        }
-                    }
-                    tab3Head.push(temp)
-                });
-                this.tab3.columns=tab3Head;
-            },
-            //校验数据集编码
-            validateCodeExist(rule, value, callback){
-                if(this.sqlForm.id){
-                    callback();
-                }
-                let reg=/^(?!_)(?![0-9])[0-9a-zA-Z_]+(?<!_)$/;
-                if(!reg.test(value)){
-                    callback(new Error('编码支持字母和数字，且不能以数字和_开头'));
-                }
-                $jm.dataCodeExist(excel_config_id, value, (result)=> {
-                    if(result === true){
-                        callback('编码已存在!');
-                    }else{
-                        callback();
-                    }
-                })
-            },
-            onMenuSelect(name){
-                this.menuitem = name;
-                if (name === "sqlInfo") {
-                    //sql
-                    this.moduleTitle = "SQL数据集";
-                    this.sqlForm.dbType = "0";
-                }else if(name==="apiInfo"){
-                    //api
-                    this.moduleTitle = "Api数据集";
-                    this.sqlForm.dbType = "1";
-                }else if(name==="jsonInfo"){
-                    //json
-                    this.moduleTitle = "JSON数据集";
-                    this.sqlForm.dbType = "3";
-                }
-                this.sqlForm.isList = true
-                this.sqlForm.dbCode = "";
-                this.sqlForm.dbChName = "";
-                this.sqlForm.dbDynSql = "";
-                this.sqlForm.apiUrl = "";
-                this.sqlForm.dbSource = "";
-                this.tab1.data = [];
-                this.tab2.data = [];
-                //update-begin--Author:wangshuai--Date:20211202--for:数据源新增的时候设置是否显示分页
-                this.setIsPage();
-                //update-end--Author:wangshuai--Date:20211202--for:数据源新增的时候设置是否显示分页
-                this.sqlModal = true;
-            },
-            editById(dbId){
-                this.tabValue="1";
-                $http.get({url:api.loadDbData(dbId),success:(result)=>{
-                        // console.log('result=====',result);
-                        let reportResult = result;
-                        if(!reportResult){
-                            return;
-                        }
-                        //设置数据
-                        this.sqlForm = reportResult.reportDb;
-                        //update-begin--Author:wangshuai--Date:20211109--for:数据源key存在下拉框提示显示数据源id
-                        if(this.sqlForm.dbSource){
-                          this.daSourceDesc=this.sqlForm.dbSource
-                        }
-                        //update-end--Author:wangshuai--Date:20211109--for:数据源key存在下拉框提示显示数据源id
-                        let bol = reportResult.reportDb.isPage;
-                        let isList = reportResult.reportDb.isList;
-                        this.tab1.data=reportResult.fieldList;
-                        if(this.tab1.data){
-                            this.tab1.data.forEach((item,index)=>{
-                                item.tableIndex = index+1;
-                            })
-                        }
-                        this.tab2.data=reportResult.paramList;
-                        if(this.tab2.data){
-                            this.tab2.data.forEach((item,index)=>{
-                                item.tableIndex = index+1;
-                            })
-                        }
-                        if (this.sqlForm.dbType === "0"){
-                            this.moduleTitle = "SQL数据集";
-                            this.oldDbDynSql = this.sqlForm.dbDynSql
-                        }
-                        if(this.sqlForm.dbType === "1") {
-                            this.moduleTitle = "Api数据集";
-                        }
-                        if(this.sqlForm.dbType === "3"){
-                            this.moduleTitle = "JSON数据集";
-                        }
-                        if (bol=='1'){
-                            this.sqlForm.isPage = true;
-                            this.sqlForm.isList = true;
-                        }else {
-                            this.sqlForm.isPage = false;
-                        }
-                        if(isList=='1'){
-                            this.sqlForm.isList = true;
-                        }else{
-                            this.sqlForm.isList = false;
-                            this.sqlForm.isPage = false;
-                        }
-
-                        this.handleDbSourceTable()
-                        this.sqlModal = true;
-                    }});
-            },
-            //设置分页是否显示，目前只支持一个分页显示
-            setIsPage(){
-              $http.get({url:api.queryIsPage(excel_config_id),data:{dbcode:this.sqlForm.dbCode},success:(result)=> {
-                if(result){
-                    this.sqlForm.isPage = false
-                  }else{
-                    this.sqlForm.isPage = true
-                  } 
-                }
-              })
-            },
-            clearDb(){
-                this.getReport();
-                for(let key in this.sqlForm){
-                    this.sqlForm[key] = "";
-                }
-                //update--begin-Author:wangshuai--Date:20211126--for:默认选中分页
-                this.sqlForm.isPage=true;
-                //update--end-Author:wangshuai--Date:20211126--for:默认选中分页
-                this.sqlForm.isList=true;
-                this.sqlForm.apiMethod="0";
-                this.tab1.data = [];
-                this.tab2.data = [];
-                this.tab2.selectParamTables=[];
-                //清除验证
-                this.$refs['sqlForm'].resetFields();
-                this.daSourceDesc="选择数据源";
-            },
-            getReport(){
-                $http.get({url:api.getReport(excel_config_id),success:(result)=>{
-                    // console.log("result====>",result)
-                    if (result){
-                        this.$emit('cancelback',result)
-                        this.designerObj = result;
-                    }
-                }});
-            },
-            handleCurrentChange (val) {
-                this.loadTableData(val,this.sqlForm.dbDynSql);
-            },
-            loadTableData(page,sql){
-                this.izTestData = false;
-                if(page){
-                    this.tab3.page.page = page;
-                }
-                let dbSource = this.sqlForm.dbSource;
-                if(!this.selectTableName){
-                    let dbDynSql=this.sqlForm.dbDynSql;
-                    if(dbDynSql){
-                        let form_number = dbDynSql.toLowerCase().indexOf("from ");
-                        let where_number = dbDynSql.toLowerCase().indexOf(" where");
-                        let tableName = (where_number>-1?dbDynSql.substring(form_number+4,where_number):dbDynSql.substring(form_number+4)).trim();
-                        this.selectTableName=tableName;
-                    }
-                }
-                if(!this.selectTableName){
-                   this.spinShow=false; 
-                   return;
-                }
-                if(this.tabValue==='3' && !this.sqlForm.dbDynSql){
-                    this.spinShow=false;
-                    return;
-                }
-                //update-begin--Author:wangshuai--Date:20211014--for:参数为空不传递
-                let paramArray = [];
-                for (const paramElement of this.tab2.data) {
-                  let paramValue = paramElement.paramValue;
-                  if(paramValue){
-                    paramArray.push(paramElement)
-                  }
-                }
-                //update-begin---author:wangshuai ---date:20220221  for：[issues/I4OXTC]SQL数据集里数据预览报错
-                let data={dbSource:dbSource,sql:sql,tableName:this.selectTableName, pageNo:1,pageSize:10};
-                if(paramArray.length>0){
-                  data.paramArray=JSON.stringify(paramArray)
-                }
-                //update-end---author:wangshuai ---date:20220221  for：[issues/I4OXTC]SQL数据集里数据预览报错
-                //update-end--Author:wangshuai--Date:20211014--for:参数为空不传递
-                this.tab3Loading=true;
-                //update-begin-author:taoyan date:20220324 for: JMREP-2518【安全】动态执行sql的接口，加上签名check，参考jeecgboot
-                let header = SignMd5Util.getHeader(api.loadTableData, data)
-                $http.post({
-                    url:api.loadTableData,
-                    data:data,
-                    timeout:10000,
-                    contentType: 'json',
-                    header: header,
-                //update-end-author:taoyan date:20220324 for: JMREP-2518【安全】动态执行sql的接口，加上签名check，参考jeecgboot
-                    success:(result)=>{
-                        this.tab3Loading=false;
-                        this.spinShow=false;
-                        // console.log("loadTableData====>result",result)
-                        this.tab3.data=result.records;
-                        this.tab3.page.total=result.total;
-                    },
-                    fail:(res)=>{
-                        this.tab3Loading=false;
-                        this.spinShow=false;
-                         //update-begin---author:wangshuai---date:2023-10-31---for:【QQYUN-6534】积木的数据预览，在无权限的时候，是不是生成一些测试数据---
-                        if(res.code === 402 && this.tab1.data && this.tab1.data.length>0){
-                            this.generateTestData();
-                        }
-                        //update-end---author:wangshuai---date:2023-10-31---for:【QQYUN-6534】积木的数据预览，在无权限的时候，是不是生成一些测试数据---                        
-                    },
-                    error:()=>{
-                        this.tab3Loading=false;
-                        this.spinShow=false;
-                    }
-                })
-            },
-            //保存之前先判断报表SQl是否已改变
-            saveDbTip(){
-                //当为数据源SQL并且报表SQl已改变则提示
-                if(this.sqlForm.dbType=='0' && this.oldDbDynSql && this.oldDbDynSql!=this.sqlForm.dbDynSql){
-                    this.reportSql=true
-                }else{
-                    this.saveDb();  
-                }
-            },
-            saveDb(){
-                this.$refs.sqlForm.validate((valid)=>{
-                    if(valid){
-                      this.childrenRules().then(res =>{
-                      if(res){
-                        //保存表单
-                        let reportDb = {};
-                        reportDb.id = this.sqlForm.id;
-                        reportDb.jimuReportId = excel_config_id;
-                        reportDb.dbCode = this.sqlForm.dbCode;
-                        reportDb.dbChName = this.sqlForm.dbChName;
-                        reportDb.dbType = this.sqlForm.dbType;
-                        reportDb.dbSource = this.sqlForm.dbSource;
-                        reportDb.jsonData = this.sqlForm.jsonData;
-                        reportDb.apiConvert = this.sqlForm.apiConvert
-                        if (this.sqlForm.isList==true){
-                            reportDb.isList = '1'
-                        }else{
-                            reportDb.isList = '0'
-                            reportDb.isPage = '0'
-                        }
-                        if (this.sqlForm.isPage==true){
-                            /*if (this.addIsPage){
-                                reportDb.isPage = '0'
-                            } else {
-                                reportDb.isPage = '1'
-                            }*/
-                            reportDb.isPage = '1'
-                            reportDb.isList = '1'
-                        } else {
-                            reportDb.isPage = '0'
-                        }
-                        if (this.sqlForm.dbType == "0"){
-                            reportDb.dbDynSql = this.sqlForm.dbDynSql;
-                        } else {
-                            reportDb.apiUrl = this.sqlForm.apiUrl;
-                            reportDb.apiMethod = this.sqlForm.apiMethod;
-                        }
-                        reportDb.fieldList = this.tab1.data; //解析出表字段
-                        reportDb.paramList = this.tab2.data; //动态表单参数
-                        //saveDb这个请求后台实体中没用的参数不传
-                        let params = "apiUrl,apiMethod,dbChName,dbCode,dbDynSql,dbSource,dbType,fieldList,id,isList,isPage,jimuReportId,paramList,jsonData,apiConvert"
-                        let reportNewDb = {};
-                        for (const key in reportDb) {
-                            if(params.includes(key)){
-                                reportNewDb[key]=reportDb[key]
-                            }
-                        }
-                        $http.post({
-                            url: api.saveDb,
-                            contentType:'json',
-                            data:JSON.stringify(reportNewDb),
-                            success:(res)=>{
-                                this.$emit('saveback',res.id);
-                                for(let key in this.sqlForm){
-                                    this.sqlForm[key] = "";
-                                }
-                                //update--begin-Author:wangshuai--Date:20211126--for:默认选中分页
-                                this.sqlForm.isPage=true;
-                                //update--end-Author:wangshuai--Date:20211126--for:默认选中分页
-                                this.sqlForm.apiMethod="0";
-                                this.tab1.data = [];
-                                this.tab2.data = [];
-                                this.sqlModal = false;
-                                this.oldDbDynSql=""
-                                this.tab2.selectParamTables=[];
-                                //清除验证
-                                this.$refs['sqlForm'].resetFields();
-                            },
-                            finally:()=>{
-                                setTimeout(() => {
-                                    this.loading = false
-                                    this.$nextTick(() => {
-                                        this.loading = true
-                                    })
-                                }, 500)
-                                this.daSourceDesc="选择数据源";
-                            }, 
-                        });
-                        return;
-                    }else{
-                        setTimeout(() => {
-                            this.loading = false
-                            this.$nextTick(() => {
-                                this.loading = true
-                            })
-                        }, 500)
-                        return;
-                    }
-                });
-                }else{
-                    setTimeout(() => {
-                        this.loading = false
-                        this.$nextTick(() => {
-                            this.loading = true
-                        })
-                    }, 500)
-                    return;
-                }
-              });
-            },
-            //参数加验证不为空
-            async childrenRules(){
-                let success = true
-                //为空直接length可能出现问题
-                if(this.tab2.data && this.tab2.data.length>0){
-                  for (let i = 0, len = this.tab2.data.length; i < len; i++) {
-                    this.$refs['formDynamic' + i].validate(valid => {
-                      if (!valid) {
-                        success=false
-                      }
-                    })
-                    this.$refs['formTxtDynamic' + i].validate(valid => {
-                      if (!valid) {
-                        success=false
-                      }
-                    })
-                  }
-                }
-                return success;
-            },
-            isListChange(isList){
-                //update--begin-Author:wangshuai--Date:20211129--for:选择列表的时候如果有分页不选择，如果没有分页就勾选上
-                if(isList){ 
-                  this.setIsPage()
-                }else{
-                  //update-begin--Author:wangshuai--Date:20211203--for:如果不是集合是否分页应该去掉
-                  this.sqlForm.isPage = false
-                  //update-end--Author:wangshuai--Date:20211203--for:如果不是集合是否分页应该去掉
-                }
-                //update--end-Author:wangshuai--Date:20211129--for:选择列表的时候如果有分页不选择，如果没有分页就勾选上
-            },
-            checkChange(ispage){
-                if (ispage){
-                    $http.get({url:api.queryIsPage(excel_config_id),data:{dbcode:this.sqlForm.dbCode},success:(result)=>{
-                            if (result){
-                                this.$Modal.confirm({
-                                    content: '已有数据集分页,是否更改?',
-                                    onOk: () => {
-                                        this.sqlForm.isPage = true;
-                                        this.sqlForm.isList = true;
-                                    },
-                                    onCancel: ()=> {
-                                        this.sqlForm.isPage = false;
-                                    }
-                                });
-                            }
-                        }});
-                }
-            },
-            selectdbSource(val){
-                //this.clearSqlForm()
-                this.sqlForm.dbSource = val;
-                this.tableName = ""
-                /*加载数据源的表信息*/
-                this.handleDbSourceTable(api.loadTable,1)
-            },
-            //根据表明查询所有
-            queryTableName(){
-                let dbSource = this.sqlForm.dbSource;
-                if(dbSource){
-                    this.tablePage = 1
-                    this.handleDbSourceTable(api.queryTableName,2)
-                }else{
-                    this.$Message.warning("请先选择数据源！")
-                }
-            },
-            clearSqlForm(){
-                this.sqlForm.dbDynSql="";
-                this.tab1.data = [];
-                this.tab2.data = [];
-            },
-            //type 1全部 2查询
-            handleDbSourceTable(api,type){
-                let dbSource = this.sqlForm.dbSource;
-                if(!dbSource){
-                    this.tableList=[];
-                    this.tablePage=1
-                    return;
-                }
-                let param={}
-                param.dbSource=dbSource
-                param.pageNo=this.tablePage
-                param.pageSize=50
-                if(type == 2){
-                  param.tableName=this.tableName
-                }
-                this.tableLoading = true
-                $http.post({
-                    url:api,
-                    data:param,
-                    success:(result)=>{
-                        //设置分页
-                        if(result){
-                          this.tableList=result.pageList
-                          this.tableTotal = result.total
-                        }else{
-                          this.tableList=[]
-                          this.tableTotal = 0
-                        }
-                        //存在dbDynSql，就是编辑的状态
-                        let dbDynSql=this.sqlForm.dbDynSql;
-                        if(dbDynSql){
-                            let form_number = dbDynSql.toLowerCase().indexOf("from ");
-                            let where_number = dbDynSql.toLowerCase().indexOf(" where");
-                            let tableName = (where_number>-1?dbDynSql.substring(form_number+4,where_number):dbDynSql.substring(form_number+4)).trim();
-                            this.selectTableName=tableName;
-                            this.currentIndex=this.tableList.findIndex((item) => item.Name === tableName);
-                            /*this.$nextTick(() => {
-                                document.getElementById(this.currentIndex+'').scrollIntoView()
-                            })*/
-                        }
-                       this.tableLoading = false
-                    }
-                })
-            },
-            tableNameClick(item,index){
-               this.currentIndex=index;
-               this.tabValue="1";
-               let sql = "select *  from "+ item.name;
-               this.sqlForm.dbDynSql=sql;
-               this.selectTableName=item.name
-            },
-            sourceManage(){
-                this.sourceModal = true;
-            },
-            //type 0不需要提示 1需要提示
-            handleSQLAnalyze(type) {
-                let dbDynSql = this.sqlForm.dbDynSql;
-                let dbSource = this.sqlForm.dbSource;
-                if(!dbDynSql){
-                    return;
-                }
-                let reqData = {'sql': dbDynSql, 'dbSource': dbSource,'type':type=='1'?'1':'0'}
-                //update-begin--Author:taoyan  Date:202108130  for：第一次点击sql解析 明明设置有默认值 但是没传 非要弹框后再传？
-                //update-begin--Author:wangshuai--Date:20211014--for:参数为空不传递
-                let paramArray = [];
-                for (const paramElement of this.tab2.data) {
-                  let paramValue = paramElement.paramValue;
-                  if(paramValue){
-                    paramArray.push(paramElement)
-                  }
-                }
-                if(paramArray && paramArray.length>0) {
-                  reqData['paramArray'] = JSON.stringify(paramArray);
-                }
-                //update-end--Author:wangshuai--Date:20211014--for:参数为空不传递
-                //update-end--Author:taoyan  Date:202108130  for：第一次点击sql解析 明明设置有默认值 但是没传 非要弹框后再传？
-                //update-begin--Author:liusq  Date:20210812  for：mongodb数据源传递报表参数--------------------
-                if(dbDynSql.indexOf("db.getCollection")== 0){
-                    reqData['paramArray'] = JSON.stringify(this.tab2.data);
-                }
-                //update-end--Author:liusq  Date:20210812  for：mongodb数据源传递报表参数--------------------
-                //update-begin-author:taoyan date:20220324 for: JMREP-2518【安全】动态执行sql的接口，加上签名check，参考jeecgboot
-                let header = SignMd5Util.getHeader(api.queryFieldBySql, reqData)
-                let dataStr = JSON.stringify(reqData);
-                $http.post({
-                    url: api.queryFieldBySql,
-                    contentType: 'json',
-                    data: dataStr,
-                    header: header,
-                //update-end-author:taoyan date:20220324 for: JMREP-2518【安全】动态执行sql的接口，加上签名check，参考jeecgboot
-                    success:(result)=>{
-                      let message = result['message'];
-                        if(message){
-                            //Vue.prototype.$Message.error(message);
-                            //弹窗sql解析报错字段
-                            if(dbDynSql.indexOf("$")!=-1){
-                                if(this.tab2.data.length>0){
-                                    this.$refs.sqlFunctionReplace.sqlFunctionShow = true
-                                    this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql, this.sqlForm.dbSource, this.tab2.data)
-                                }
-                            }else{
-                              Vue.prototype.$Message.error(message);
-                            }
-                        }else{
-                      let resultElement = result['fieldList'];
-                      let that = this;
-                      if(this.tab1.data && resultElement){
-                          if(this.tab1.data.length>0){
-                              this.$Modal.confirm({
-                                  title:'是否要重置字段?',
-                                  content: '已存在的字段不会修改，但是数据为空会删除所有字段！',
-                                  onOk: () => {
-                                      that.setTabFieldData(resultElement);
-                                  },
-                                  onCancel: () => {
-                                      console.info("不重置字段");
-                                  }
-                              });
-                          }else{
-                              that.setTabFieldData(resultElement);
-                          }
-                      }else{
-                        this.tab1.data = resultElement;
-                        this.tab1.data.forEach((item,index)=>{
-                            item.tableIndex = index+1;
-                            item.searchFlag = 0
-                        })
-                      } 
-                      }
-                    },
-                    fail:(res)=>{
-                      //1001注入异常
-                      if(res.code!=1001 && type!=1){
-                          if(this.tab2.data.length>0){
-                              //弹窗sql解析报错字段
-                              this.$refs.sqlFunctionReplace.sqlFunctionShow = true
-                              this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql,this.sqlForm.dbSource,this.tab2.data)
-                          }
-                      }
-                    }
-                })
-            },
-            handleApiAnalyze(){
-                let dbDynApi = this.sqlForm.apiUrl.trim();
-                if(!dbDynApi){
-                    return;
-                }
-
-                /**
-                 * api地址解析规则说明
-                 * 1. 解析地址获取参数map
-                 * 2. 参数判断是否是表达式
-                 * 3、如果是表达式 根据 this.tab2.data的默认值替换表达式
-                 * 4.如果是表达式且没有默认值 就传空
-                 */
-                //update-begin-author:taoyan date:20210506 for:报表参数问题修复
-                let urlParam =  {}
-                let pIndex = dbDynApi.indexOf("?")
-                if(pIndex!=-1){
-                    let str = dbDynApi.substr(pIndex+1);
-                    let arr = str.split("&");
-                    for(let i = 0; i < arr.length; i++) {
-                        let subArr = arr[i].split("=")
-                        urlParam[subArr[0]]=subArr[1]
-                    }
-                    dbDynApi = dbDynApi.substr(0,dbDynApi.indexOf("?"));
-                }
-                if(urlParam){
-                    let paramList = this.tab2.data || [];
-                    Object.keys(urlParam).map(k=>{
-                        let expressValue = urlParam[k]
-                        if(expressValue && expressValue.indexOf('$\{')>=0){
-                            //说明是表达式  表达式看是否有默认值 有的话替掉
-                            let realParamName = expressValue.replace(/'/g, '').replace("$\{","").replace("}","").trim();
-                            let temp = paramList.filter(item=>{
-                                return item.paramName == realParamName
-                            })
-                            if(temp && temp.length>0){
-                                dbDynApi = addUrlParam(dbDynApi, k, temp[0].paramValue)
-                            }else{
-                                dbDynApi = addUrlParam(dbDynApi, k, '')
-                            }
-                        }else{
-                            dbDynApi = addUrlParam(dbDynApi, k, expressValue)
-                        }
-                    })
-                }
-                //update-end-author:taoyan date:20210506 for:报表参数问题修复
-
-                let apiMethod = this.sqlForm.apiMethod;
-                $http.post({
-                    url:api.executeSelectApi,
-                    data:{
-                        api:dbDynApi,
-                        method:apiMethod,
-                        apiConvert:this.sqlForm.apiConvert,
-                        paramArray:JSON.stringify(this.tab2.data)
-                    },
-                    success:(result)=>{
-                      //update-begin--Author:wangshuai--Date:20211109--for:api解析为空提示
-                      if(result && result.length>0){
-                        Vue.prototype.$Message.success("解析成功！");
-                      }else{
-                        Vue.prototype.$Message.warning("执行成功，但是数据为空，无法解析报表字段！！");
-                      }
-                      //update-end--Author:wangshuai--Date:20211109--for:api解析为空提示
-                      let that = this;  
-                      if(this.tab1.data.length>0){
-                          this.$Modal.confirm({
-                              title:'是否要重置字段?',
-                              content: '已存在的字段不会修改，但是数据为空会删除所有字段！',
-                              onOk: () => {
-                                  that.setTabFieldData(result);
-                              },
-                              onCancel: () => {
-                                  console.info("不重置字段");
-                              }
-                          });
-                      }else{
-                          that.setTabFieldData(result);
-                      }
-                    }
-                })
-            },
-            handleJsonAnalyze(){
-              let jsonData = this.sqlForm.jsonData
-              let  parseData = this.isJSON(jsonData)
-              if(parseData){
-                parseData = parseData.data;
-                let parseDatum = parseData[0];
-                let newJsonData = []
-                let orderNum = 0;
-                for (const parseDatumKey in parseDatum) {
-                  newJsonData.push({
-                    'fieldName':parseDatumKey,
-                    'fieldText':parseDatumKey,
-                    'widgetType':'String',
-                    'isShow':true,
-                    'orderNum':orderNum++
-                   })
-                }
-                this.tab1.data = newJsonData;
-              }
-            },
-            //判断是否为json
-            isJSON(str){
-              if (typeof str == 'string') {
-                try {
-                  let obj=JSON.parse(str);
-                  if(typeof obj == 'object' && obj ){
-                    return obj;
-                  }else{
-                    this.$Message.warning("请输入正确的JSON格式")
-                  }
-                } catch(e) {
-                  this.$Message.warning("请输入正确的JSON格式")
-                }
-              }
-            },
-            removeFieldTable(){
-                this.deleteFieldModel = true;
-            },
-            selectFieldAll(){
-                this.tab1.selectParamTables = this.tab1.data.map(item=>
-                {
-                    return {"tableIndex":item.tableIndex,"id":item.id}
-                });
-            },
-            cancelFieldAll(){
-                this.tab1.selectParamTables = [];
-            },
-            selectField(selection,row){
-                this.tab1.selectParamTables=[...this.tab1.selectParamTables,{"tableIndex":row.tableIndex,"id":row.id}];
-            },
-            cancelField(selection,row){
-                this.tab1.selectParamTables = this.tab1.selectParamTables.filter(item=>item.tableIndex!=row.tableIndex);
-            },
-            dbDynSqlBlur(){
-                //update-begin--Author:liusq  Date:20210812  for：mongodb数据源不进行$参数解析--------------------
-                if(this.sqlForm.dbDynSql.indexOf("db.getCollection")== 0){
-                    return false
-                }
-                //update-end--Author:liusq  Date:20210812  for：mongodb数据源不进行$参数解析--------------------
-                //获得原数据Map
-                let dataMap={}
-                if(this.tab2.data && this.tab2.data.length>0){
-                    this.tab2.data.forEach(item=>{
-                        dataMap[item.paramName] = item;
-                    })
-                }
-
-                let dbDynSql = this.sqlForm.dbDynSql;
-
-                //update-begin---author:wangshuai   Date:20211221  for：[JMREP-2505]存储过程没有空格参数会连接到一起------------
-                let reg=/\$\{[^}]*\}/g;
-                //update-end---author:wangshuai   Date:20211221  for：[JMREP-2505]存储过程没有空格参数会连接到一起------------
-                if(!reg.test(dbDynSql)){
-                    return;
-                }
-                //替换“$“{DaoFormat. 为空，使SQL能正常解析
-                dbDynSql = dbDynSql.replaceAll('\$\{DaoFormat.','');
-                let dbDynSqlArr = dbDynSql.match(reg);
-                let paramsArr = [];
-                if(dbDynSqlArr && dbDynSqlArr.length>0){
-                    //update-begin-author:wangshuai date:20210621 for: sql数据源会将下方的新增的参数冲刷掉-Infinity tb JMREP-2110
-                    let indexArr = this.tab2.data.map(item=>item.tableIndex);
-                    if(indexArr && indexArr.length==0){
-                      indexArr=[0]
-                    }
-                    //update-begin-author:wangshuai date:20210621 for: sql数据源会将下方的新增的参数冲刷掉-Infinity tb JMREP-2110
-                    //防止参数重复
-                    let paramExistArray = []
-                    let number = Math.max(...indexArr);
-                    dbDynSqlArr.forEach((item,index)=>{
-                        item = item.replace("$\{","").replace("}","").trim();
-                        if(paramExistArray.indexOf(item)<0 && item){
-                            paramExistArray.push(item)
-                            let paramObj = {};
-                            paramObj.paramName = item;
-                            paramObj.paramTxt = item;
-                            paramObj.orderNum = number+1;
-                            paramObj.tableIndex = paramObj.orderNum;
-                            const oldItem =  dataMap[item];
-                            paramObj.id = (oldItem && oldItem.id) || "";
-                            paramObj.paramValue = (oldItem && oldItem.paramValue) || "";
-                            paramObj.extJson =""
-                            paramsArr.push(paramObj);
-                            number++
-                        }
-                    })
-                }
-                //update-begin-author:wangshuai date:20210621 for: sql数据源会将下方的新增的参数冲刷掉-Infinity tb JMREP-2110
-                let arr = [...paramsArr]
-                for (const arrElement of arr) {
-                  //循环判断是否有重复的数据，没有重复的数据则添加到参数栏中
-                  let paramName = this.tab2.data.some(value => value.paramName == arrElement.paramName);
-                  if(!paramName){
-                    this.tab2.data.push(arrElement)
-                  }
-                }
-                //update-end-author:wangshuai date:20210621 for: sql数据源会将下方的新增的参数冲刷掉-Infinity tb JMREP-2110
-            },
-            //API解析
-            dbApiBlur(){
-                //获得原数据Map
-                let dataMap={}
-                if(this.tab2.data && this.tab2.data.length>0){
-                    this.tab2.data.forEach(item=>{
-                        dataMap[item.paramName] = item;
-                    })
-                }
-                let apiUrl = this.sqlForm.apiUrl;
-                apiUrl=apiUrl.trim();
-                //判断是否包含问号
-                if(apiUrl.indexOf("?")==-1){
-                    return ;
-                }
-                let apiUrlArr = apiUrl.substr(apiUrl.indexOf("?"),apiUrl.length-1);
-                //去除?和&
-                let urlArr=apiUrlArr.split(/[?&]/)
-                let paramsArr = [];
-                let indexArr = this.tab2.data.map(item=>item.tableIndex);
-                if(indexArr && indexArr.length==0){
-                  indexArr=[0]
-                }
-                let number = Math.max(...indexArr);
-                if(urlArr && urlArr.length>0){
-                    urlArr.forEach((item,index)=>{
-                        if(item.indexOf("=")!=-1){
-                           let strings = item.split("=");
-                           if(strings.length>1){
-                            let value =strings[1]
-                            if(value.indexOf("$")!=-1){
-                            value = value.replace(/'/g, '').replace("$\{","").replace("}","").trim();
-                            let b = this.tab2.data.some(item => item.paramName == value);
-                            if(!b){
-                            number++
-                            let paramObj = {};
-                            paramObj.paramName = value;
-                            paramObj.orderNum = number;
-                            paramObj.tableIndex =  number;
-                            const oldItem =  dataMap[item];
-                            paramObj.id = (oldItem && oldItem.id) || "";
-                            paramObj.paramValue = (oldItem && oldItem.paramValue) || "";
-                            paramObj.extJson = "";
-                            paramsArr.push(paramObj);
-                            }
-                            }
-                           }
-                        }
-                    })
-                    //update-begin--Author:wangshuai  Date:20210430  for：api参数如果存在就不替换，否则替换--------------------
-                    let tabData = this.tab2.data;
-                    let paramData = [...paramsArr];
-                    tabData = tabData.concat(paramData);
-                    let newJson=[];
-                    //找到不重复的数据
-                    for (const datum of tabData) {
-                      //建立标记，判断数据是否重复，true为不重复
-                      let flag = true;
-                      for (const results of newJson) {
-                        //循环数据删除this.tab1.data已经存在的数据
-                        if(datum['paramName'] == results['paramName']){
-                          flag = false;
-                        }
-                      }
-                      //判断是否重复
-                      if(flag == true){
-                        //不重复的放入新数组。  新数组的内容会继续进行上边的循环。
-                        newJson.push(datum);
-                      }
-                    }
-                    this.tab2.data = newJson;
-                    //update-end--Author:wangshuai  Date:20210430  for：api参数如果存在就不替换，否则替换--------------------
-                    this.sqlForm.apiUrl = apiUrl
-                }
-            },
-            addParamTable(){
-                let indexArr = this.tab2.data.map(item=>item.tableIndex);
-                let orderNumArr = this.tab2.data.map(item=>item.orderNum);
-                if(indexArr.length==0){
-                    indexArr=[0];
-                }
-                if(orderNumArr.length==0){
-                    orderNumArr=[0];
-                }
-                this.tab2.selectParamTables = [];
-                this.tab2.data=[...this.tab2.data,{
-                    'paramName':"",
-                    'paramTxt':"",
-                    'paramValue':"",
-                    'orderNum':Math.max(...orderNumArr)+1,
-                    'tableIndex':Math.max(...indexArr)+1,
-                    'extJson':""
-                }];
-            },
-            removeParamTable(){
-                this.deleteParamModel = true;
-            },
-            deleteParamTable(){
-              if(this.sqlForm.dbType == 0){
-                let tableIndexArr = this.tab2.selectParamTables.map(item=>item.tableIndex);
-                this.tab2.data = this.tab2.data.filter(item=>!tableIndexArr.includes(item.tableIndex));
-                let selectTableObj = this.tab2.selectParamTables.filter(item=>item.id);
-                let selectIds = selectTableObj.map(item=>item.id);
-                this.tab2.selectParamTables = [];
-                let dbDynSql  = this.sqlForm.dbDynSql;
-                //如果没有where就不截取了·
-                //update-begin--Author:wangshuai -- Date:20210324 ----for：删除多个的时候会出现bug，如果这样子写无论是什么上面的sql语句（如：or）都会拼接and------  
-                // if(dbDynSql.indexOf("where")!=-1){
-                //     dbDynSql = dbDynSql.substring(0,dbDynSql.toLowerCase().indexOf("where"));    
-                // }
-                // let paramArr = []
-                // if(this.tab2.data.length>0){
-                //     // dbDynSql = dbDynSql+" where ";
-                //     this.tab2.data.forEach(item=>{
-                //         if(item.paramName && dbDynSql.contains(item.paramName)){
-                //             //TODO 
-                //             const paramName = `$\{item.paramName}`;
-                //             console.log("paramName:",paramName)
-                //             paramArr.push(`$\{paramName\}='`+"$\{"+paramName+"}'")  
-                //         }
-                //     })
-                // }
-                // dbDynSql = dbDynSql+paramArr.join(" and ");
-                // this.sqlForm.dbDynSql=dbDynSql.trim();
-                //update-end--Author:wangshuai -- Date:20210324 ----for：删除多个的时候会出现bug，如果这样子写无论是什么上面的sql语句（如：or）都会拼接and------  
-                const deleParams={selectIds,id:this.sqlForm.id,dbDynSql}
-                //后台删除,保存时删除
-                if(selectIds.length>0){
-                    $http.post({
-                        url:api.deleteParamByIds,
-                        contentType:'json',
-                        data:JSON.stringify(deleParams),
-                        success:(result)=>{
-                        }
-                    });
-                }
-              }else{
-                  let apiUrl  = this.sqlForm.apiUrl;
-                  let newApiUrl=[]
-                  if(apiUrl.indexOf("?")!=-1){
-                      newApiUrl= apiUrl.substr(apiUrl.indexOf("?"),apiUrl.length-1).split(/[?&]/)
-                  }
-                  let tableIndexArr = this.tab2.selectParamTables.map(item=>item.tableIndex);
-                  let data = this.tab2.data;
-                  let newData=[];
-                  for(let item of data){
-                      if(!tableIndexArr.includes(item.tableIndex)){
-                          newData.push(item) 
-                      }else{
-                          let pageName = item.paramName;
-                          if(pageName && newApiUrl.length>1){
-                              for (let i=0;i<newApiUrl.length;i++) {
-                                  if(newApiUrl[i].includes(pageName)){
-                                      newApiUrl.splice(i,1)
-                                  }
-                              }   
-                          }
-                      }
-                  }
-                  if(newApiUrl.length>1){
-                      let apiUrlArr = apiUrl.substr(0,apiUrl.indexOf("?")+1);
-                      for (const api of newApiUrl) {
-                          if(api){
-                              apiUrlArr=apiUrlArr+api+"&"
-                          }
-                      }
-                      apiUrlArr=apiUrlArr.substr(0,apiUrlArr.length-1)
-                      this.sqlForm.apiUrl=apiUrlArr
-                  }else{
-                    if(apiUrl.indexOf("?")!=-1){
-                      this.sqlForm.apiUrl= apiUrl.substr(0,apiUrl.indexOf("?"))
-                    }
-                  }
-                  this.tab2.data =newData
-              }
-              this.tab2.selectParamTables=[]
-            },
-            removeFieldTable(){
-                this.deleteFieldModel = true;
-            },
-            deleteFieldTable(){
-                let tableIndexArr = this.tab1.selectParamTables.map(item=>item.tableIndex);
-                this.tab1.data = this.tab1.data.filter(item=>!tableIndexArr.includes(item.tableIndex));
-                let selectTableObj = this.tab1.selectParamTables.filter(item=>item.id);
-                let selectIds = selectTableObj.map(item=>item.id);
-                this.tab1.selectParamTables = [];
-                if(selectIds.length>0){
-                    let deleParams="";
-                    for (let str of selectIds){
-                        deleParams=deleParams+str+",";
-                    }
-                    deleParams=deleParams.substr(0,deleParams.lastIndexOf(","))
-                    $http.del({
-                        contentType:'json',
-                        url:api.deleteFieldByIds,
-                        data:deleParams,
-                        success:(result)=>{
-                        }
-                    });
-                }
-            },
-            selectParamAll(){
-                this.tab2.selectParamTables = this.tab2.data.map(item=>
-                {
-                    return {"tableIndex":item.tableIndex,"id":item.id}
-                });
-            },
-            cancelParamAll(){
-                this.tab2.selectParamTables = [];
-            },
-            selectParam(selection,row){
-                this.tab2.selectParamTables=[...this.tab2.selectParamTables,{"tableIndex":row.tableIndex,"id":row.id}];
-            },
-            cancelParam(selection,row){
-                this.tab2.selectParamTables = this.tab2.selectParamTables.filter(item=>item.tableIndex!=row.tableIndex);
-            },
-            saveSourceDb(){
-                this.sourceModal = false;
-                this.dataSourceFull = false;
-                this.sourceDraggable = false
-                this.sourceTabPage.page = 1
-                this.sourceTabPage.total = 10
-                this.sourceTabPage.size = 10
-                this.maintainDataSource();
-            },
-            addDataSource(){
-                Object.keys(this.dataSource).map(k=>{
-                    this.dataSource[k] = ''
-                })
-                this.visibleData = true;
-            },
-            selectdbType(name){
-                if (name === "MYSQL5.7"){
-                    this.dataSource.dbDriver = "com.mysql.cj.jdbc.Driver";
-                    //update-begin---Author:wangshuai---Date:20210909---for:解决mysql数据类型为tyint页面显示true和false---
-                    this.dataSource.dbUrl = "jdbc:mysql://127.0.0.1:3306/jimureport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&tinyInt1isBit=false";
-                    //update-end---Author:wangshuai---Date:20210909---for:解决mysql数据类型为tyint页面显示true和false---
-                }else if (name === "MYSQL5.5"){
-                    this.dataSource.dbDriver = "com.mysql.jdbc.Driver";
-                    //update-begin---Author:wangshuai---Date:20210909---for:解决mysql数据类型为tyint页面显示true和false---
-                    this.dataSource.dbUrl = "jdbc:mysql://127.0.0.1:3306/jimureport?characterEncoding=UTF-8&useUnicode=true&useSSL=false&serverTimezone=GMT%2B8&tinyInt1isBit=false";
-                   //update-end---Author:wangshuai---Date:20210909---for:解决mysql数据类型为tyint页面显示true和false---
-                }else if (name === "ORACLE"){
-                    this.dataSource.dbDriver = "oracle.jdbc.OracleDriver";
-                    this.dataSource.dbUrl = "jdbc:oracle:thin:@127.0.0.1:1521:ORCL";
-                }else if (name === "SQLSERVER"){
-                    this.dataSource.dbDriver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
-                    this.dataSource.dbUrl = "jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jimureport";
-                }else if(name === 'POSTGRESQL'){
-                    this.dataSource.dbDriver = "org.postgresql.Driver";
-                    this.dataSource.dbUrl = "jdbc:postgresql://127.0.0.1:5432/jimureport";
-                }else if(name === 'MARIADB'){
-                    this.dataSource.dbDriver = "org.mariadb.jdbc.Driver";
-                    this.dataSource.dbUrl = "jdbc:mariadb://127.0.0.1:3306/jimureport?characterEncoding=UTF-8&useSSL=false";
-                }else if(name === 'dm'){
-                    this.dataSource.dbDriver = "dm.jdbc.driver.DmDriver";
-                    this.dataSource.dbUrl = "jdbc:dm://127.0.0.1:5236/?jimureport&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8";
-                }else if(name === 'kingbase8'){
-                    this.dataSource.dbDriver = "com.kingbase8.Driver";
-                    this.dataSource.dbUrl = "jdbc:kingbase8://127.0.0.1:54321/jimureport";
-                }else if(name === 'oscar'){
-                    this.dataSource.dbDriver = "com.oscar.Driver";
-                    this.dataSource.dbUrl = "jdbc:oscar://127.0.0.1:2003/jimureport";
-                }else if(name === 'SQLite'){
-                    this.dataSource.dbDriver = "org.sqlite.JDBC";
-                    this.dataSource.dbUrl = "jdbc:sqlite://opt/jimureport.db";
-                }else if(name === 'DB2'){
-                    this.dataSource.dbDriver = "com.ibm.db2.jcc.DB2Driver";
-                    this.dataSource.dbUrl = "jdbc:db2://127.0.0.1:50000/jimureport";
-                }else if(name === 'Hsqldb'){
-                    this.dataSource.dbDriver = "org.hsqldb.jdbc.JDBCDriver";
-                    this.dataSource.dbUrl = "jdbc:hsqldb:hsql://127.0.0.1/jimureport";
-                }else if(name === 'Derby'){
-                    this.dataSource.dbDriver = "org.apache.derby.jdbc.ClientDriver";
-                    this.dataSource.dbUrl = "jdbc:derby://127.0.0.1:1527/jimureport";
-                }else if(name === 'H2'){
-                    this.dataSource.dbDriver = "org.h2.Driver";
-                    this.dataSource.dbUrl = "jdbc:h2:tcp://127.0.0.1:8082/~/jimureport";
-                }else if(name === 'other'){
-                    this.dataSource.dbDriver = "";
-                    this.dataSource.dbUrl = "";
-                }else if(name === 'redis'){
-                    this.dataSource.dbUrl = "127.0.0.1:6379";
-                }else if(name === 'mongodb'){
-                    this.dataSource.dbUrl = "127.0.0.1:27017/test";
-                }
-            },
-            clearDbSou(){
-                this.$refs.dataSource.resetFields();
-                this.maintainDataSource();
-            },
-            saveDataSource(){
-                this.$refs.dataSource.validate((valid)=>{
-                    if(valid){
-                        //保存表单
-                        let dbSource = {};
-                        dbSource.id = this.dataSource.id;
-                        dbSource.reportId = excel_config_id;
-                        dbSource.code = this.dataSource.code;
-                        dbSource.name = this.dataSource.name;
-                        dbSource.dbType = this.dataSource.dbType;
-                        dbSource.dbDriver = this.dataSource.dbDriver;
-                        dbSource.dbUrl = this.dataSource.dbUrl;
-                        dbSource.dbUsername = this.dataSource.dbUsername;
-                        dbSource.dbPassword = this.dataSource.dbPassword;
-                        $http.post({
-                            contentType:'json',
-                            url: api.addDataSource,
-                            data:JSON.stringify(dbSource),
-                            success:(result)=>{
-                                this.initDataSource();
-                                this.maintainDataSource()
-                                this.dataSource = {};
-                                this.visibleData = false;
-                            },
-                            fail:(res)=>{
-                              this.dateSourceLoading();
-                            }
-                        });
-                    }else{
-                        this.dateSourceLoading();
-                        return;
-                    }
-                })
-            },
-            //关闭弹窗loading
-            dateSourceLoading(){
-              setTimeout(() => {
-                this.loading = false
-                this.$nextTick(() => {
-                  this.loading = true
-                })
-              }, 500)
-            },
-            initDataSource(){
-                $http.get({url:api.initDataSource,success:(result)=>{
-                        let reportResult = result;
-                        if(!reportResult){
-                            return;
-                        }
-                        this.maintainData = reportResult
-                    }});
-            },
-            maintainDataSource(){
-                let params = {"pageNo":this.sourceTabPage.page,"pageSize":this.sourceTabPage.size}
-                $http.get({url:api.getDataSourceByPage,data:params,success:(result)=>{
-                    let reportResult = result.records;
-                    if(!reportResult){
-                      return;
-                    }
-                    this.sourceTab.data = reportResult;
-                    this.sourceTab.data.forEach((item,index)=>{
-                      item.tableIndex = index+1;
-                    })
-                    this.sourceTabPage.total = result.total
-                  }}); 
-            },
-            renderButton(h, params) {
-                return h('div',[
-                    h('i-button', {
-                        props: {
-                            type: 'primary',
-                            size: 'small'
-                        },
-                        style:{
-                            'margin-right':'5px'
-                        },
-                        on: {
-                            click: () => {
-                                $http.get({
-                                    url: api.getDataSourceById,
-                                    data:{'id': params.row.id},
-                                    success:(result)=>{
-                                        this.visibleData = true;
-                                        this.dataSource = result;
-                                    }
-                                })
-                            }
-                        }
-                    },'编辑'),
-                    h('i-button', {
-                        props: {
-                            type: 'primary',
-                            size: 'small'
-                        },
-                        on: {
-                            click: () => {
-                                this.$Modal.confirm({
-                                    title:"提示",
-                                    content: '是否确认删除?',
-                                    onOk: () => {
-                                        let dbSource = {};
-                                        dbSource.id = params.row.id;
-                                        $http.post({
-                                            contentType:'json',
-                                            url: api.delDataSource,
-                                            data:JSON.stringify(dbSource),
-                                            success:(result)=>{
-                                                this.$Notice.success({
-                                                    title: '删除成功'
-                                                });
-                                                this.initDataSource();
-                                                this.maintainDataSource()
-                                            }
-                                        });
-                                    }
-                                });
-                            }
-                        }
-                    },'删除')
-                ])
-            },
-            renderInput(h, params, field,tabIndex,placeholder) {
-                return h('i-input', {
-                    props: {
-                        "size":"small",
-                        type: 'text',
-                        value: this[tabIndex].data[params.index][field],
-                        placeholder: placeholder?placeholder:`请输入`+params.column.title
-                    },
-                    on: {
-                        'on-change': (event) => {
-                            if(tabIndex==="tab2"){
-                                let tableIndexArr = this.tab2.selectParamTables.map(item=>item.tableIndex);
-                                this.tab2.data.forEach(item=>{
-                                    if(tableIndexArr.includes(item.tableIndex)){
-                                        item._checked = true;
-                                    }
-                                });
-                            }
-                            this[tabIndex].data[params.index][field] = event.target.value;
-                        }
-                    },
-                })
-            },
-            dataSourceTest(){
-                let dbSource = {};
-                dbSource.dbType = this.dataSource.dbType;
-                dbSource.dbDriver = this.dataSource.dbDriver;
-                dbSource.dbUrl = this.dataSource.dbUrl;
-                dbSource.dbName = this.dataSource.dbName;
-                dbSource.dbUsername = this.dataSource.dbUsername;
-                dbSource.dbPassword = this.dataSource.dbPassword;
-                $http.post({
-                    contentType:'json',
-                    url: api.testConnection,
-                    data:JSON.stringify(dbSource)
-                });
-            },
-            forwardClick(val){
-              this.forward = val
-            },
-            //修改报表SQl确定事件
-            reportOk(){
-                this.reportSql = false
-                this.saveDb();
-            },
-            reportCancel(){
-                this.reportSql = false
-                this.sqlModal = true
-                setTimeout(() => {
-                    this.loading = false
-                    this.$nextTick(() => {
-                        this.loading = true
-                    })
-                }, 500)
-            },
-            //新增报表参数点击下面上面可以追加
-            createParams(){
-                let tabData = this.tab2.data;
-                let apiUrl = this.sqlForm.apiUrl;
-                if(apiUrl.includes("?")){
-                    apiUrl = apiUrl.substr(0,apiUrl.indexOf("?"))
-                }
-                for (let argument of tabData) {
-                    let paramName = argument.paramName;
-                    if(paramName){
-                        let s = paramName+"=$"+"{"+paramName+ "}";
-                        if(s && !apiUrl.includes(s)){
-                            if(apiUrl.includes("?")){
-                                apiUrl=apiUrl+"&"+paramName+"="+"'$"+"{"+paramName+"}'"
-                            }else{
-                                apiUrl=apiUrl+"?"+paramName+"="+"'$"+"{"+paramName+"}'"
-                            }
-                        } 
-                    }
-               }
-               this.sqlForm.apiUrl = apiUrl;
-            },
-            //参数回调替换事件
-            functionOk(resultParam){
-              let tabData = this.tab2.data;
-              // 循环tabData进行判断
-              for (const tab of tabData) {
-                let paramName = tab['paramName'];
-                let paramValue = tab['paramValue'];
-                //循环返回结果集
-                let ts = resultParam.filter(item => item.paramName == paramName);
-                //弹窗返回的默认值是否存在
-                let tElement = ""
-                if(ts.length>0){
-                   tElement = ts[0]['paramValue'];
-                }
-                //默认值为空，或者默认值不相等，则替换
-                if(!paramValue || paramValue !=tElement){
-                  tab['paramValue'] = tElement
-                }
-              }
-              //update-begin-author:wangshuai date:20210621 for: sql解析排序会导致如果那没有数据会为-Infinity tb JMREP-2081
-              //update-end-author:wangshuai date:20210621 for: sql解析排序会导致如果那没有数据会为-Infinity tb JMREP-2081
-              //循环resultParam 把没有的参数push进去
-              //获取排序
-              let orderNumArr = this.tab2.data.map(item=>item.orderNum);
-              if(orderNumArr.length==0){
-                orderNumArr = [0]
-              }
-              let number = Math.max(...orderNumArr);
-              for (const param of resultParam) {
-                let paramName = param['paramName'];
-                let data = tabData.filter(item =>item.paramName == paramName);
-                if(!data || data.length == 0){
-                  number++;
-                  tabData.push({
-                    'paramName':paramName,
-                    'paramTxt':"",
-                    'paramValue':param['paramValue'],
-                    'orderNum':number,
-                    'tableIndex':number
-                  })
-                }
-              }
-                //console.log("tabData:",tabData)
-              this.tab2.data = tabData
-              //1需要报错提示
-              this.handleSQLAnalyze("1");
-            },
-            handleCurrentChange (val) {
-              this.tablePage = val;
-              this.handleDbSourceTable(api.queryTableName,2);
-            },
-            //数据源维护弹窗放大缩小操作
-             dataSourceClick(){
-              this.dataSourceFull = this.dataSourceFull==false?true:false
-              this.sourceDraggable = this.sourceDraggable==false?true:false
-            },
-            //点击分页
-            sourceTabCurrentChange(val){
-              this.sourceTabPage.page = val;
-              this.maintainDataSource();
-            },
-            //点击每页显示条数
-            sourceTabSizeChange(val){
-              this.sourceTabPage.page = 1;
-              this.sourceTabPage.size = val;
-              this.maintainDataSource();
-            },
-            //字段放大按钮点击事件
-            extJsonFiledClick(index,extJson){
-                this.paramConfigData = extJson
-                this.tableIndex = index
-                //0字段 1参数
-                this.tableType = 0
-                this.extJsonShow = true
-            },
-            //字段值改变事件
-            extJsonFiledChange(index,extJson){
-                this.tab1.data[index].extJson = extJson
-            },  
-            //参数放大按钮点击事件
-            extJsonParamChange(index,extJson){
-                this.tab2.data[index].extJson = extJson
-            },   
-            //参数值改变事件
-            extJsonParamClick(index,extJson){
-                this.paramConfigData = extJson
-                this.tableIndex = index
-                //0字段 1参数
-                this.tableType = 1
-                this.extJsonShow = true
-            },
-            //放大取消事件
-            extJsonCancel(){
-                this.tableIndex = -1
-                this.tableType = -1
-                this.extJsonShow=false
-                this.paramConfigData = ""
-            },
-            //放大确定事件
-            extJsonOk(){
-                //console.log(this.paramConfigData)
-               if(this.tableType == 0){
-                 this.tab1.data[this.tableIndex].extJson = this.paramConfigData
-               }else if(this.tableType == 1){
-                 this.tab2.data[this.tableIndex].extJson = this.paramConfigData
-               }
-              this.extJsonCancel(); 
-            },
-            /**
-             * 设置tabs 字段详细的数据
-             * @param result 请求接口返回的数据
-             */
-            setTabFieldData(result){
-                let data = this.tab1.data;
-                //update-begin--Author:wangshuai  Date:20210430  for：sql动态报表配置明细如果字段存在就不替换，否则替换，要不然会引起数据清空--------------------
-                data = data.concat(result)
-                //先去除没有的数据
-                let newJson = [];
-                //找到不重复的数据
-                for (const datum of data) {
-                    //建立标记，判断数据是否重复，true为不重复
-                    let flag = true;
-                    for (const results of newJson) {
-                        //循环数据删除this.tab1.data已经存在的数据
-                        if(datum['fieldName'] == results['fieldName']){
-                            flag = false;
-                        }
-                    }
-                    //判断是否重复
-                    if(flag == true){
-                        //不重复的放入新数组。  新数组的内容会继续进行上边的循环。
-                        newJson.push(datum);
-                    }
-                }
-                //去除没有的数据
-                newJson = newJson.filter(item => result.some(value => value.fieldName == item.fieldName))
-                //循环给当前剔除的数组加上index和排序及查询框
-                let newData=[];
-                let i =0;
-                for (const results of newJson) {
-                    results.tableIndex = i
-                    if(!results){
-                        results.searchFlag = 0
-                    }
-                    results.orderNum = i
-                    newData.push(results);
-                    i++;
-                }
-                this.tab1.data = newData
-                //update-end--Author:wangshuai  Date:20210430  for：sql动态报表配置明细如果字段存在就不替换，否则替换，要不然会引起数据清空--------------------
-            },
-            generateTestData() {
-                let fieldArray = [];
-                for (const item of this.tab1.data) {
-                    fieldArray.push({
-                        fieldName: item.fieldName,
-                        widgetType: item.widgetType,
-                    });
-                }
-                let fieldJson = "";
-                if (fieldArray.length > 0) {
-                    fieldJson = JSON.stringify(fieldArray);
-                }
-                $http.post({
-                    url: api.generateTestData,
-                    contentType:"json",
-                    data: fieldJson,
-                    success: (result) => {
-                        this.izTestData = true;
-                        this.tab3.data = result;
-                        this.tab3.page.total = 10;
-                    }
-                })
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl
deleted file mode 100644
index 83f9540a5..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl
+++ /dev/null
@@ -1,1103 +0,0 @@
-<style>
-  .jimu-icon{
-      cursor: pointer;
-      float: right;
-  }
-  .jimu-tooltip{
-      float: right;
-  }
-</style>
-
-<script type="text/x-template" id="function-interpretation">
-  <div>
-     <#--begin 常用函数-->
-     <div v-if="text=='SUM'" class="interpretation">
-        <p>函数描述： 对可单元格或集合表达式求最大值</p>
-        <p>示例：</p>
-        <p>例1：=SUM(C6),对C6单元格或数据集合求最大值</p>
-        <p>例2：=SUM(A6,C6)，对A6和C6单元格计算最大值</p>
-        <p>例3：=SUM(A6:C6)，对A6到C6单元格计算最大值
-          <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(0)"><Icon size="14" type="ios-help-circle-outline"/></span>
-          </Tooltip>
-        </p>
-     </div>
-    <div v-if="text=='AVERAGE'" class="interpretation">
-      <p>函数描述： 对可单元格或集合表达式求平均值</p>
-      <p>示例：</p>
-      <p>例1：=AVERAGE(C6),对C6单元格或数据集合求平均值</p>
-      <p>例2：=AVERAGE(A6,C6)，对A6和C6单元格计算平均值</p>
-      <p>例3：=AVERAGE(A6:C6)，对A6到C6单元格计算平均值
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(0)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='MAX'" class="interpretation">
-      <p>函数描述： 对可单元格或集合表达式求最大值</p>
-      <p>示例：</p>
-      <p>例1：=MAX(C6),对C6单元格或数据集合求最大值</p>
-      <p>例2：=MAX(A6,C6)，对A6和C6单元格计算最大值</p>
-      <p>例3：=MAX(A6:C6)，对A6到C6单元格计算最大值
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(0)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='MIN'" class="interpretation">
-      <p>函数描述： 对可单元格或集合表达式求最小值</p>
-      <p>示例：</p>
-      <p>例1：=MIN(C6),对C6单元格或数据集合求最小值</p>
-      <p>例2：=MIN(A6,C6)，对A6和C6单元格计算最小值</p>
-      <p>例3：=MIN(A6:C6)，对A6到C6单元格计算最小值
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(0)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='row'" class="interpretation">
-      <p>函数描述： 实现自增序号</p>
-      <p>示例：</p>
-      <p>例1：=row()，单个数据集直接写即可进行自增序号</p>
-      <p>例2：=row(1) =row(2)，多个列表需要行号，需要设置一个数字参数区分计数器
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(0)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 常用函数-->
-
-    <#--begin 条件函数-->
-    <div v-if="text=='case'" class="interpretation">
-      <p>函数描述： 对数据进行判断显示</p>
-      <p>示例：</p>
-      <p>例1：=case(1>2,1,2),最终结果为1</p>
-      <p>例2：=case('1'=='1','男','女')</p>
-      <p>最终结果为男，字符串需要加上单引号或者双引号
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(1)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='if'" class="interpretation">
-      <p>函数描述：对数据进行判断显示</p>
-      <p>示例：</p>
-      <p>=(let sex= '1'; </p>
-      <p>if(sex== '1'){男}</p>
-      <p><span style="color: red">elsif</span>(sex== '2'){女}</p>
-      <p>else{未知}
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(1)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 基本函数-->
-
-    <#--begin 日期函数-->
-    <div v-if="text=='date'" class="interpretation">
-      <p>函数描述：将字符串转换成日期型数据</p>
-      <p>示例：</p>
-      <p>=date('1982-08-09')</p>
-      <p>返回日期：1982-08-09 00:00:00
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='time'" class="interpretation">
-      <p>函数描述：将字符串转换成时间型数据</p>
-      <p>示例：</p>
-      <p>=time('1982-08-09 10:20:30')</p>
-      <p>返回时间：10:20:30
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='now'" class="interpretation">
-      <p>函数描述：获得系统此刻的日期时间</p>
-      <p>示例：</p>
-      <p>=now() 返回：1627294758092
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='year'" class="interpretation">
-      <p>函数描述：从日期型数据中获得年信息</p>
-      <p>示例：</p>
-      <p>=year('1972-11-08 10:20:30') 返回：1972
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='month'" class="interpretation">
-      <p>函数描述：取得指定日期所在的月份</p>
-      <p>示例：</p>
-      <p>=month('1972-11-08 10:20:30')</p>
-      <p>返回：11
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='day'" class="interpretation">
-      <p>函数描述：从日期型数据中获得该日在本月中是几号</p>
-      <p>示例：</p>
-      <p>day(dateTime(12345)) 返回：1
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='age'" class="interpretation">
-      <p>函数描述：计算两个时间间隔的整年数</p>
-      <p>示例：</p>
-      <p>=age("19800227","yyyyMMdd",3)</p>
-      <p>结果为27
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='nowstr'" class="interpretation">
-      <p>函数描述：返回当前时间字符串</p>
-      <p>示例：</p>
-      <p>=nowstr()</p>
-      <p>返回结果 2021-07-28 16:31:30
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(2)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 日期函数-->
-
-    <#--begin 数学函数-->
-    <div v-if="text=='rand'" class="interpretation">
-      <p>函数描述：取得0-1.0之间的一个随机数</p>
-      <p>示例：</p>
-      <p>例1：=rand() 获得[0, 1.0)之间的一个随机数</p>
-      <p>例2：=rand()*100 获得[0, 100)之间的一个随机浮点数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(3)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='round'" class="interpretation">
-      <p>函数描述：对数据在指定位置上进行截取，剩余部分四舍五入</p>
-      <p>示例：</p>
-      <p>例1：=round(3451251.274,0) 返回：3451251.0</p>
-      <p>例2：=round(3451251.274,1) 返回：3451251.3"</p>
-      <p>例3：=round(3451251.274,-1) 返回：3451250.0
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(3)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='abs'" class="interpretation">
-      <p>函数描述：计算参数的绝对值</p>
-      <p>示例：</p>
-      <p>例1：=abs(-3245.54) </p>
-      <p>返回：3245.54</p>
-      <p>例2：=abs(-987) 返回：987
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(3)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='floor'" class="interpretation">
-      <p>函数描述：对数据在指定位置上进行截取，剩余部分只要有值全舍去</p>
-      <p>示例：</p>
-      <p>例1：=floor(3451231.234,0)</p>
-      <p>返回：3451231.0</p>
-      <p>例2：=floor(3451231.234,-1)</p>
-      <p>返回：3451230.0</p>
-      <p>例3：=floor(3451231.234,1)</p>
-      <p>返回：3451231.2
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(3)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='ceil'" class="interpretation">
-      <p>函数描述：对数据在指定位置上进行截取，剩余部分只要有值就进位</p>
-      <p>示例：</p>
-      <p>例1：=ceil(3450001.004,0)</p>
-      <p>返回：3450002.0</p>
-      <p>例2：=ceil(3450001.004,-1)</p>
-      <p>返回：3450010.0</p>
-      <p>例3：=ceil(3450001.004,1)</p>
-      <p>返回：3450001.1
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(3)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='trunc'" class="interpretation">
-      <p>函数描述：对数据取整</p>
-      <p>示例：</p>
-      <p>例1：=trunc(11.11) 返回：11</p>
-      <p>例2：=trunc(-11.99) 返回：-11
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(3)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 数学函数-->
-
-    <#--begin 字符串函数-->
-    <div v-if="text=='char'" class="interpretation">
-      <p>函数描述：根据给定的unicode编码或者ascii码取得其对应的字符</p>
-      <p>示例：</p>
-      <p>例1：=char(22269)返回：'国'</p>
-      <p>例2：=char(101)返回：'e'
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(4)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='cnmoney'" class="interpretation">
-      <p>函数描述：对数据取整</p>
-      <p>示例：</p>
-      <p>例1：=cnmoney(1.232)返回：壹元贰角叁分</p>
-      <p>例2：=cnmoney(1.232,'b')返回：壹佰贰拾叁元贰角整
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(4)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='concat'" class="interpretation">
-      <p>函数描述：对字符传进行拼接</p>
-      <p>示例：</p>
-      <p>=concat('hello ','word',' !')</p>
-      <p>返回：hello word !
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(4)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='lower'" class="interpretation">
-      <p>函数描述：将字符串转换成小写</p>
-      <p>示例：</p>
-      <p>=lower(ABCD) 返回：abcd
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(4)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='upper'" class="interpretation">
-      <p>函数描述：将字符串转换成大写</p>
-      <p>示例：</p>
-      <p>=upper(abcd) 返回ABCD
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(4)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='date_str'" class="interpretation">
-      <p>函数描述：将日期转成需要的字符串</p>
-      <p>示例：</p>
-      <p>=date_str('2021-08-24','yyyy')</p>
-      <p>返回结果 2021
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(4)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 字符串函数-->
-      
-    <#--begin 颜色函数-->
-    <div v-if="text=='color'" class="interpretation">
-      <p>函数描述：设定单元格字体色、背景色</p>
-      <p>示例：</p>
-      <p>例1：=color('张三', '#ffffff', '#171516') 给张三设置字体颜色和背景颜色
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(5)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    
-    <div v-if="text=='rowcolor'" class="interpretation">
-      <p>函数描述：设定行字体色、背景色</p>
-      <p>示例：</p>
-      <p>例1：=rowcolor('张三', '#ffffff', '#171516')</p>
-      <p>给张三设置字体颜色和背景颜色
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(5)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 颜色函数-->
-      
-    <#--begin 系统函数-->
-    <div v-if="text=='assert'" class="interpretation">
-      <p>=assert(predicate, [msg])：函数描述：断言函数，当 predicate 的结果为 false 的时候抛出 AssertFailed 异常， msg 错误信息可选。
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='sysdate'" class="interpretation">
-      <p>返回当前日期对象
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='cmp'" class="interpretation">
-      <p>=cmp(x, y)：比较 x 和 y 大小，返回整数，0 表示相等， 1 表达式 x > y，负数则 x < y
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='print'" class="interpretation">
-      <p>=print([out],obj)：打印对象,如果指定 out 输出流，向 out 打印， 默认输出到标准输出
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='pst'" class="interpretation">
-      <p>=pst([out], e)：打印异常堆栈，out 是可选的输出流，默认是标准错误输出
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='long'" class="interpretation">
-      <p>=long(v)：将值转为 long 类型
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='double'" class="interpretation">
-      <p>=double(v)：将值转为 double 类型
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='boolean'" class="interpretation">
-      <p>=boolean(v)：将值的类型转为 boolean，除了 nil 和 false，其他都值都将转为布尔值 true
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='str'" class="interpretation">
-      <p>=str(v)：将值转为 string 类型，如果是 nil（或者 java null），会转成字符串 'null'
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='bigint'" class="interpretation">
-      <p>=bigint(x)：将值转为 bigint 类型
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='decimal'" class="interpretation">
-      <p>=decimal(x)：将值转为 decimal 类型
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='identity'" class="interpretation">
-      <p>=identity(v)：返回参数 v 自身
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='type'" class="interpretation">
-      <p>=type(x)：返回参数 x 的类型，结果为字符串，如 string, long, double, bigint, decimal, function 等。Java  类则返回完整类名
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='is_a'" class="interpretation">
-      <p>=is_a(x, class)：当 x 是类 class 的一个实例的时候，返回 true，例如 is_a("a", String)，class 是类名
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='is_def'" class="interpretation">
-      <p>=is_def(x)：当 x 是类 class 的一个实例的时候,返回 true,例如 is_a("a", String),class 是类名
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='undef'" class="interpretation">
-      <p>=undef(x)：“遗忘”变量  x，如果变量 x 已经定义，将取消定义
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='range'" class="interpretation">
-      <p>=range(start, end, [step])：创建一个范围，start 到 end 之间的整数范围，不包括 end， step 指定递增或者递减步幅
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='tuple'" class="interpretation">
-      <p>=tuple(x1, x2, ...)：创建一个 Object 数组，元素即为传入的参数列表
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='eval'" class="interpretation">
-      <p>=eval(script, [bindings], [cached])：对一段脚本文本 script 进行求值
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='comparator'" class="interpretation">
-      <p>=comparator(pred)：将一个谓词（返回布尔值）转化为 java.util.Comparator 对象，通常用于 sort 函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='constantly'" class="interpretation">
-      <p>=constantly(x)：用于生成一个函数，它对任意（个数）参数的调用结果 x
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='math.abs'" class="interpretation">
-      <p>=math.abs(d)：求 d 的绝对值
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='math.round'" class="interpretation">
-      <p>=math.round(d)：四舍五入
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='math.floor'" class="interpretation">
-      <p>=math.floor(d)：向下取整
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='math.ceil'" class="interpretation">
-      <p>=math.ceil(d)：向上取整
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='math.sqrt'" class="interpretation">
-      <p>=math.sqrt(d)：求 d 的平方根
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='math.pow'" class="interpretation">
-      <p>=math.sqrt(d1,d2)：求 d1 的 d2 次方
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='math.log'" class="interpretation">
-      <p>=math.log(d)：求 d 的自然对数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='math.log10'" class="interpretation">
-      <p>=math.log10(d)：求 d 以 10 为底的对数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='math.sin'" class="interpretation">
-      <p>=math.sin(d)：正弦函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='math.cos'" class="interpretation">
-      <p>=math.cos(d)：余弦函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='math.tan'" class="interpretation">
-      <p>=math.tan(d)：正切函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='math.atan'" class="interpretation">
-      <p>=math.atan(d)：反正切函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='math.acos'" class="interpretation">
-      <p>=math.acos(d)：反余弦函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='math.asin'" class="interpretation">
-      <p>=math.asin(d)：反正弦函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='date_to_string'" class="interpretation">
-      <p>=date_to_string(date,format)：将 Date 对象转化化特定格式的字符
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='string_to_date'" class="interpretation">
-      <p>=string_to_date(source,format)：将特定格式的字符串转化为 Date 对 象
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='string.contains'" class="interpretation">
-      <p>=string.contains(s1,s2)：判断 s1 是否包含 s2,返回 Boolean
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='string.length'" class="interpretation">
-      <p>=string.length(s)：求字符串长度,返回 Long
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='string.startsWith'" class="interpretation">
-      <p>=string.startsWith(s1,s2)：s1 是否以 s2 开始,返回 Boolean
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='string.endsWith'" class="interpretation">
-      <p>=string.endsWith(s1,s2)：s1 是否以 s2 结尾,返回 Boolean
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='string.substring'" class="interpretation">
-      <p>=string.substring(s,begin[,end])：截取字符串 s,从 begin 到 end,如果忽略 end 的话,将从 begin 到结尾
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='string.indexOf'" class="interpretation">
-      <p>=string.indexOf(s1,s2)：求 s2 在 s1 中 的起始索引位置,如果不存在为-1
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='string.split'" class="interpretation">
-      <p>=string.split(target,regex,[limit])：Java 里的 String.split 方法一致
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='string.join'" class="interpretation">
-      <p>=string.join(seq,seperator)：将集合 seq 里的元素以 seperator 为间隔 连接起来形成字符串
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='string.replace_first'" class="interpretation">
-      <p>=string.replace_first(s,regex,replacement)：String.replaceFirst 方法
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='string.replace_all'" class="interpretation">
-      <p>=string.replace_all(s,regex,replacement)：String.replaceAll 方法
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='repeat'" class="interpretation">
-      <p>=repeat(n, x)：返回一个 List，将元素 x 重复 n 次组合而成
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='repeatedly'" class="interpretation">
-      <p>=repeatedly(n, f)：返回一个 List，将函数 f 重复调用 n 次的结果组合而成
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='seq.array'" class="interpretation">
-      <p>=seq.array(clazz, e1, e2,e3, ...)：创建一个指定 clazz 类型的数组，并添加参数 e1,e2,e3 ...到这个数组并返回。 clazz 可以是类似 java.lang.String 的类型，也可以是原生类型，如 int/long/float 等
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.array_of'" class="interpretation">
-      <p>=seq.array_of(clazz, size1, size2, ...sizes)：创建 clazz 类型的一维或多维数组，维度大小为 sizes 指定。clazz 同 seq.array 定义
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='seq.list'" class="interpretation">
-      <p>=seq.list(p1, p2, p3, ...)：创建 clazz 类型的一维或多维数组，维度大小为 sizes 指定。clazz 同 seq.array 定义
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.set'" class="interpretation">
-      <p>=seq.set(p1, p2, p3, ...)：创建一个 java.util.HashSet 实例，添加参数到这个集合并返回
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.map'" class="interpretation">
-      <p>=seq.map(k1, v1, k2, v2, ...)：创建一个 java.util.HashMap 实例，参数要求偶数个，类似 k1,v1 这样成对作为 key-value 存入 map，返回集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.entry'" class="interpretation">
-      <p>=seq.entry(key, value)：创建 Map.Entry 对象，用于 map, filter 等函数
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.keys'" class="interpretation">
-      <p>=seq.keys(m)：返回 map 的 key 集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='seq.vals'" class="interpretation">
-      <p>=seq.vals(m)：返回 map 的 value 集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='into'" class="interpretation">
-      <p>=into(to_seq, from_seq)：用于 sequence 转换，将 from sequence 的元素使用 seq.add 函数逐一添加到了 to sequence 并返回最终的 to_seq
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='seq.contains_key'" class="interpretation">
-      <p>=seq.contains_key(map, key)：当 map 中存在 key 的时候（可能为 null），返回 true。对于数组和链表，key 可以是 index，当 index 在有效范围[0..len-1]，返回 true，否则返回 false
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='seq.add'" class="interpretation">
-      <p>=seq.add(coll, element)：往集合 coll 添加元素，集合可以是 java.util.Collection，也可以是 java.util.Map
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.put'" class="interpretation">
-      <p>=seq.put(coll, key, value)：用于设置 seq 在 key 位置的值为 value，seq 可以是 map ，数组或者 List。 map 就是键值对， 数组或者 List 的时候， key 为索引位置整数，value 即为想要放入该索引位置的值
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='seq.remove'" class="interpretation">
-      <p>=seq.remove(coll, element)：从集合或者 hash map 中删除元素或者 key
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='seq.get'" class="interpretation">
-      <p>=seq.get(coll, element)：从 list、数组或者 hash-map 获取对应的元素值，对于 list 和数组， element 为元素的索引位置（从 0 开始），对于 hash map 来说， element 为 key
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='map'" class="interpretation">
-      <p>=map(seq,fun)：将函数 fun 作用到集合 seq 每个元素上, 返回新元素组成的集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='filter'" class="interpretation">
-      <p>=filter(seq,predicate)：	将谓词 predicate 作用在集合的每个元素 上,返回谓词为 true 的元素组成的集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='is_empty'" class="interpretation">
-      <p>=is_empty(seq)：当集合为空或者 nil，返回 true
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='distinct'" class="interpretation">
-      <p>=distinct(seq)：返回 seq 去重后的结果集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='is_distinct'" class="interpretation">
-      <p>=is_distinct(seq)：当 seq 没有重复元素的时候，返回 true，否则返回 false
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='include'" class="interpretation">
-      <p>=include(seq,element)：判断 element 是否在集合 seq 中,返回 boolean 值，对于 java.uitl.Set 是 O(1) 时间复杂度，其他为 O(n)
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='sort'" class="interpretation">
-      <p>=sort(seq, [comparator])：排序集合,仅对数组和 List 有效,返回排序后的新集合，comparator 是一个 java.util.Comparator 实例，可选排序方式
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='reverse'" class="interpretation">
-      <p>=reverse(seq)：将集合元素逆序，返回新的集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='reduce'" class="interpretation">
-      <p>=reduce(seq,fun,init)：fun 接收两个参数,第一个是集合元素, 第二个是累积的函数,本函数用于将 fun 作用在结果值（初始值为 init 指定)和集合的每个元素上面，返回新的结果值；函数返回最终的结果值
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='take_while'" class="interpretation">
-      <p>=take_while(seq, pred)：遍历集合 seq，对每个元素调用 pred(x)，返回 true则加入结果集合，最终返回收集的结果集合。也就是说从集合 seq 收集 pred 调用为 true 的元素
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='drop_while'" class="interpretation">
-      <p>=drop_while(seq, pred)：与 take_while 相反，丢弃任何 pred(x) 为 true 的元素并返回最终的结果集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='group_by'" class="interpretation">
-      <p>=group_by(seq, keyfn)：对集合 seq 的元素按照 keyfn(x) 的调用结果做分类，返回最终映射 map
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='zipmap'" class="interpretation">
-      <p>=zipmap(keys, values)：返回一个 HashMap，其中按照 keys 和 values 两个集合的顺序映射键值对
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.every'" class="interpretation">
-      <p>=seq.every(seq, fun)：fun 接收集合的每个元素作为唯一参数，返回 true 或 false。当集合里的每个元素调用 fun 后都返回 true 的时候，整个调用结果为 true，否则为 false
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.not_any'" class="interpretation">
-      <p>=seq.not_any(seq, fun)：fun 接收集合的每个元素作为唯一参数，返回 true 或 false。当集合里的每个元素调用 fun 后都返回 false 的时候，整个调用结果为 true，否则为 false
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='seq.some'" class="interpretation">
-      <p>=seq.some(seq, fun)：fun 接收集合的每个元素作为唯一参数，返回 true 或 false。当集合里的只要有一个元素调用 fun 后返回 true 的时候，整个调用结果立即为该元素，否则为 nil
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>  
-    <div v-if="text=='seq.eq'" class="interpretation">
-      <p>=seq.eq(value)：返回一个谓词,用来判断传入的参数是否跟 value 相等,用于 filter 函数,如filter(seq,seq.eq(3)) 过滤返回等于3 的元素组成的集合
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.neq'" class="interpretation">
-      <p>=seq.neq(value)：与 seq.eq 类似,返回判断不等于的谓词
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.gt'" class="interpretation">
-      <p>=seq.gt(value)：	返回判断大于 value 的谓词
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.ge'" class="interpretation">
-      <p>=seq.ge(value)：返回判断大于等于 value 的谓词
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='seq.lt'" class="interpretation">
-      <p>=seq.lt(value)：返回判断小于 value 的谓词
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div> 
-    <div v-if="text=='seq.le'" class="interpretation">
-      <p>=seq.le(value)：返回判断小于等于 value 的谓词
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.nil'" class="interpretation">
-      <p>=seq.nil()：返回判断是否为 nil 的谓词
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.exists'" class="interpretation">
-      <p>=seq.exists()：返回判断不为 nil 的谓词
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.and'" class="interpretation">
-      <p>=seq.and(p1, p2, p3, ...)：组合多个谓词函数，返回一个新的谓词函数，当今仅当 p1、p2、p3 ...等所有函数都返回 true 的时候，新函数返回 true
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>   
-    <div v-if="text=='seq.or'" class="interpretation">
-      <p>=seq.or(p1, p2, p3, ...)：组合多个谓词函数，返回一个新的谓词函数，当 p1, p2, p3... 其中一个返回 true 的时候，新函数立即返回 true，否则返回 false
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.min'" class="interpretation">
-      <p>=seq.min(coll)：返回集合中的最小元素，要求集合元素可比较（实现 Comprable 接口），比较规则遵循 aviator 规则
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='seq.max'" class="interpretation">
-      <p>=seq.max(coll)：返回集合中的最大元素，要求集合元素可比较（实现 Comprable 接口），比较规则遵循 aviator 规则
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(6)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 系统函数-->
-    
-    <#--begin 判断函数-->
-    <div v-if="text=='seq.min'" class="interpretation">
-      <p>=seq.min(coll)：返回集合中的最小元素，要求集合元素可比较（实现 Comprable 接口），比较规则遵循 aviator 规则
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(7)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='isdate'" class="interpretation">
-      <p>定字符串是否具有转换成时间的合法格式</p>
-      <p>示例：</p>
-      <p>例1：isdate("2006-10-10") 返回：true</p>
-      <p>例2：isdate("2006-10-10 10:20:30") 返回：true</p>
-      <p>例3：isdate("20061010") 返回：false
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(7)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='istime'" class="interpretation">
-      <p>判定字符串是否具有转换成时间的合法格式</p>
-      <p>示例：</p>
-      <p>例1：istime("2006-10-10") 返回 false</p>
-      <p>例2：istime("10:20:30") 返回 true
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(7)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>    
-    <div v-if="text=='isnumber'" class="interpretation">
-      <p>判定字符串是否具有转换成数值的合法格式</p>
-      <p>示例：</p>
-      <p>例1：isnumber("abc") 返回：false</p>
-      <p>例2：isnumber("1234") 返回：true
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(7)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='intval'" class="interpretation">
-      <p>判定当前字符串是否为空</p>
-      <p>示例：</p>
-      <p>例1：intval("") 返回：0</p>
-      <p>例2：intval("1234") 返回：1234
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(7)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='strval'" class="interpretation">
-      <p>判定当前字符串是否为空</p>
-      <p>示例：</p>
-      <p>例1：strval("") 返回：nil</p>
-      <p>例2：strval("1234") 返回：1234
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(7)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--end 判断函数-->
-    
-    <#--#begin 统计函数-->
-    <div v-if="text=='DBMAX'" class="interpretation">
-      <p>函数描述： 对可扩展单元格集合所有数据进行求最大值</p>
-      <p>示例：</p>
-      <p>=DBMAX(db.salary)，对编码为db的数据集中的字段salary进行最大值计算
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(8)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='DBSUM'" class="interpretation">
-      <p>函数描述： 对可扩展单元格集合所有数据进行求和</p>
-      <p>示例：</p>
-      <p>=DBSUM（a.name）,a.name 这个单元格所有数据求和
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(8)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='DBMIN'" class="interpretation">
-      <p>函数描述： 对可扩展单元格集合所有数据进行求最小值</p>
-      <p>示例：</p>
-      <p>=DBMIN(db.salary)，对编码为db的数据集中的字段salary进行最小值计算
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(8)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <div v-if="text=='DBAVERAGE'" class="interpretation">
-      <p>函数描述： 对可扩展单元格集合所有数据进行求平均值</p>
-      <p>示例：</p>
-      <p>=DBAVERAGE(db.salary)，对编码为db的数据集中的字段salary进行平均值计算
-        <Tooltip  content="文档" placement="left" class="jimu-tooltip">
-          <span class="jimu-table-tip jimu-icon" @click="questionMarkClick(8)"><Icon size="14" type="ios-help-circle-outline"/></span>
-        </Tooltip>
-      </p>
-    </div>
-    <#--#end 统计函数-->
-  </div>
-</script>
-<script>
-  Vue.component('j-function-interpretation', {
-    template: '#function-interpretation',
-    props: {
-      text: {
-        type: String,
-        required: true,
-        default:""
-      },
-    },
-    data(){
-      return {
-        url:["https://help.jeecg.com/jimureport/function/cell.html",
-             "https://help.jeecg.com/jimureport/function/condition.html",
-             "https://help.jeecg.com/jimureport/function/date.html",
-             "https://help.jeecg.com/jimureport/function/math.html",
-             "https://help.jeecg.com/jimureport/function/characterString.html",
-             "https://help.jeecg.com/jimureport/function/colour.html",
-             "https://help.jeecg.com/jimureport/function/library.html",
-             "https://help.jeecg.com/jimureport/function/determine.html",
-             "https://help.jeecg.com/jimureport/function/tongji.html"]
-      }
-    },
-    methods: {
-      questionMarkClick(val){
-       window.open(this.url[val],"_blank") 
-      }
-    }
-  })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl
deleted file mode 100644
index 0a5c6ca0f..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl
+++ /dev/null
@@ -1,87 +0,0 @@
-<script type="text/x-template" id="funnel-setting-template">
-    <Submenu  name="6" style="border-bottom: inset 1px;" class="rightFontSize dataSourceForm">
-        <template slot="title">
-            <span>漏斗设置</span>
-        </template>
-        <div class="blockDiv" style="padding-bottom: 10px">
-            <Row class="ivurow">
-                <p>图形间距&nbsp;&nbsp;</p>
-                <slider v-model="funnelOptions.gap" @on-change="onFunnelChange" style="margin-top: -9px;width: 139px;margin-left: 5px;"></slider>
-            </Row>
-            <Row class="ivurow">
-                <p>数据排序&nbsp;&nbsp;</p>
-                <i-select size="small" class="iSelect" v-model="funnelOptions.sort" @on-change="onFunnelChange">
-                    <i-option class="rightFontSize" value="ascending">升序</i-option>
-                    <i-option class="rightFontSize" value="descending">降序</i-option>
-                    <i-option class="rightFontSize" value="none">无序</i-option>
-                </i-select>
-            </Row>
-
-            <Row class="ivurow">
-                <p>宽度(%)&nbsp;&nbsp;&nbsp;</p>
-                <slider :tip-format="util.percentFormat" :value="util.getNumberFromPercent(funnelOptions.width)" @on-change="(value)=>onPercentChange(value, 'funnelOptions.width','onFunnelChange')" style="margin-top: -9px;width: 139px;margin-left: 5px;"></slider>
-            </Row>
-        </div>
-    </Submenu>
-
-</script>
-<script>
-    Vue.component('j-funnel-setting', {
-        template: '#funnel-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            },
-            isMultiChart: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                funnelOptions: {
-                    gap:2,
-                    sort: "descending",
-                    width: "80%"
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.funnelOptions = Object.assign(this.funnelOptions, this.settings)
-                }
-            },
-            //slider 百分数改变事件
-            onPercentChange(value, key, eventName,suffix=''){
-                let arr = key.split('.')
-                if(arr.length>1){
-                    let temp = this
-                    for(let i=0;i<arr.length-1;i++){
-                        temp = temp[arr[i]]
-                    }
-                    temp[arr[arr.length-1]] = value+'%'+suffix
-                }else{
-                    this[key] = value+'%'+suffix
-                }
-                //this[eventName]();
-                this.$emit('change', this.funnelOptions)
-            },
-            onFunnelChange(){
-                this.$emit('change', this.funnelOptions)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl
deleted file mode 100644
index 5c4f8d6c7..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl
+++ /dev/null
@@ -1,145 +0,0 @@
-<script type="text/x-template" id="gauge-setting-template">
-<div>
-    <Submenu name="20" style="border-bottom: inset 1px;" class="rightFontSize">
-        <template slot="title">
-            <span>仪表盘数据设置</span>
-        </template>
-        <div class="blockDiv" style="padding-bottom: 10px">
-            <Row class="ivurow">
-                <p>标题显示&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 115px;" v-model="gaugeOption.title_show" @on-change="onGaugeChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>标题字体大小&nbsp;&nbsp;</p>
-                <i-input size="small" type="number" v-model="gaugeOption.title_textStyle_fontSize" @on-blur="onGaugeChange" style="width: 119px;"></i-input>
-            </Row>
-            <Row class="ivurow" v-if="typeof gaugeOption.title_textStyle_color !== 'undefined'">
-                <p>标题颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input v-model="gaugeOption.title_textStyle_color" size="small" style="width:143px;" @on-change="onGaugeChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="gaugeOption.title_textStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onGaugeChange"/>
-                    </span>
-                </i-input>
-                </Col>
-            </Row>
-            <Row class="ivurow">
-                <p>指针显示&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 116px;" v-model="gaugeOption.pointer_show" @on-change="onGaugeChange"/>
-            </Row>
-            <Row class="ivurow" v-if="typeof gaugeOption.itemStyle_color !== 'undefined'">
-                <p>指针颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input v-model="gaugeOption.itemStyle_color" size="small" style="width:143px;" @on-change="onGaugeChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="gaugeOption.itemStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onGaugeChange"/>
-                    </span>
-                </i-input>
-                </Col>
-            </Row>
-            <Row class="ivurow">
-                <p>指针字体大小&nbsp;&nbsp;</p>
-                <i-input size="small" type="number" v-model="gaugeOption.detail_textStyle_fontSize" @on-blur="onGaugeChange" style="width: 119px;"></i-input>
-            </Row>
-            <Row class="ivurow" v-if="typeof gaugeOption.detail_textStyle_color !== 'undefined'">
-                <p>指针字体颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input v-model="gaugeOption.detail_textStyle_color" size="small" style="width: 119px;" @on-change="onGaugeChange">
-                           <span slot="append">
-                             <color-picker class="colorPicker" v-model="gaugeOption.detail_textStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onGaugeChange"/>
-                           </span>
-                </i-input>
-                </Col>
-            </Row>
-        </div>
-    </Submenu>
-    <Submenu name="21" style="border-bottom: inset 1px;" class="rightFontSize">
-        <template slot="title">
-            <span>仪表盘刻度设置</span>
-        </template>
-        <div class="blockDiv" style="padding-bottom: 10px">
-            <Row class="ivurow">
-                <p>刻度值显示&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 104px;" v-model="gaugeOption.axisLabel_show" @on-change="onGaugeChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>刻度值字体大小&nbsp;&nbsp;</p>
-                <i-input size="small" type="number" v-model="gaugeOption.axisLabel_textStyle_fontSize" @on-blur="onGaugeChange" style="width: 108px"></i-input>
-            </Row>
-            <Row class="ivurow">
-                <p>仪表盘半径(%)&nbsp;&nbsp;</p>
-                <slider :tip-format="util.percentFormat" :value="util.getNumberFromPercent(gaugeOption.radius)" @on-change="(value)=>onPercentChange(value, 'gaugeOption.radius','onGaugeChange')" style="margin-top: -9px;width: 109px;margin-left: 5px;"></slider>
-            </Row>
-            <Row class="ivurow">
-                <p>轴线宽度&nbsp;&nbsp;</p>
-                <slider max="50" step="5" v-model="gaugeOption.axisLine_lineStyle_width" @on-change="onGaugeChange" style="margin-top: -9px;width: 139px;margin-left: 5px;"></slider>
-            </Row>
-
-            <Row class="ivurow">
-                <p>分割线长度&nbsp;&nbsp;</p>
-                <slider max="50" step="2" v-model="gaugeOption.splitLine_length" @on-change="onGaugeChange" style="margin-top: -9px;width: 128px;margin-left: 5px;"></slider>
-            </Row>
-            <Row class="ivurow">
-                <p>刻度线长度&nbsp;&nbsp;</p>
-                <slider max="50" step="2" v-model="gaugeOption.axisTick_length" @on-change="onGaugeChange" style="margin-top: -9px;width: 128px;margin-left: 5px;"></slider>
-            </Row>
-        </div>
-    </Submenu>
-</div>
-</script>
-<script>
-    Vue.component('j-gauge-setting', {
-        template: '#gauge-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                gaugeOption: {
-                    title_textStyle_color:'',
-                    detail_textStyle_color:'',
-                    itemStyle_color:''
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.gaugeOption = Object.assign(this.gaugeOption, this.settings)
-                }
-            },
-            //slider 百分数改变事件
-            onPercentChange(value, key, eventName,suffix=''){
-                let arr = key.split('.')
-                if(arr.length>1){
-                    let temp = this
-                    for(let i=0;i<arr.length-1;i++){
-                        temp = temp[arr[i]]
-                    }
-                    temp[arr[arr.length-1]] = value+'%'+suffix
-                }else{
-                    this[key] = value+'%'+suffix
-                }
-                //this[eventName]();
-                this.$emit('change', this.gaugeOption)
-            },
-            onGaugeChange(){
-                this.$emit('change',  this.gaugeOption)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl
deleted file mode 100644
index 341e0b347..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl
+++ /dev/null
@@ -1,66 +0,0 @@
-<script type="text/x-template" id="grid-setting-template">
-    <div>
-        <Submenu  name="18" style="border-bottom: inset 1px;" class="rightFontSize">
-            <template slot="title">
-                <span>坐标轴边距</span>
-            </template>
-            <div class="blockDiv">
-                <Row class="ivurow">
-                    <p>左边距&nbsp;&nbsp;</p>
-                    <slider v-model="gridOptions.left" @on-change="onGridChange" style="margin-top: -9px;width: 145px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                    <p>顶边距&nbsp;&nbsp;</p>
-                    <slider v-model="gridOptions.top" @on-change="onGridChange" style="margin-top: -9px;width: 145px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                    <p>右边距&nbsp;&nbsp;</p>
-                    <slider v-model="gridOptions.right" @on-change="onGridChange" style="margin-top: -9px;width: 145px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">底边距&nbsp;&nbsp;</p>
-                    <slider v-model="gridOptions.bottom" @on-change="onGridChange" style="margin-top: -9px;width: 145px;margin-left: 5px;"></slider>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-grid-setting', {
-        template: '#grid-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                gridOptions: {
-                  
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.gridOptions = Object.assign(this.gridOptions, this.settings)
-                }
-            },
-            onGridChange (){
-                this.$emit('change','grid',this.gridOptions)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl
deleted file mode 100644
index 4a13bb17e..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl
+++ /dev/null
@@ -1,567 +0,0 @@
-<style>
-    .jimu-table-tip{
-        font-weight: bold;
-        display: inline-block;
-        margin-left: 5px;
-    }
-</style>
-
-<script type="text/x-template" id="hyperlinks-setting-template">
-  <Modal
-          :title="title"
-          v-model="hyperlinksShow"
-          width="600px"
-          :closable = "false"
-          :mask-closable="false"
-       >
-    <div slot="footer">
-      <i-button @click="hyperlinksCancel('linkData')">取消</i-button>
-      <i-button  type="primary" @click="hyperlinksOk('linkData')">确定
-      </i-button>
-    </div>
-      <i-form ref="linkData" :model="linkData" :label-width="100" :rules="linkDataRule">
-        <form-item label="链接名称" prop="linkName">
-            <i-input placeholder="请填写链接名称" v-model="linkData.linkName"></i-input>
-        </form-item>
-
-        <form-item label="链接报表" prop="reportId" v-if="linkData.linkType==='0'">
-          <i-select clearable v-model="linkData.reportId" filterable @on-change="networkClick">
-            <i-option v-for="item in reportData" placeholder="请选择链接报表" :value="item.id" :key="item.id">{{ item.name }}</i-option>
-          </i-select>
-        </form-item>
-
-        <form-item label="链接图表" prop="charId" v-if="linkData.linkType==='2'">
-          <i-select v-model="linkData.charId" filterable @on-change="charsClick">
-            <i-option v-for="item in chartData" placeholder="请选择链接图表" :value="item.id" :key="item.id">{{ item.name }}</i-option>
-          </i-select>
-        </form-item>
-
-        <form-item label="网络连接" prop="apiUrl" v-if="linkData.linkType=='1'">
-          <i-input placeholder="请填写网络连接" v-model="linkData.apiUrl"></i-input>
-        </form-item>
-
-
-        <form-item label="弹出方式" prop="ejectType" v-if="linkData.linkType=='0' || linkData.linkType=='1'">
-          <i-select clearable :transfer="true" v-model="linkData.ejectType">
-             <i-option value="0">新窗口</i-option>
-             <i-option value="1">当前窗口</i-option>
-          </i-select>
-        </form-item>
-          
-        <form-item label="条件" prop="requirement">
-          <i-input placeholder="请填写条件" v-model="linkData.requirement"></i-input>
-        </form-item>
-        
-        <span>参数设置</span>
-
-
-        <div style="margin-top: 10px">
-          <i-button type="primary" @click="addParamTable">新增</i-button>
-          <i-button type="primary" @click="removeParamTable" v-if="selectParamTables.length>0">删除</i-button>
-          <i-table
-            style="margin-top: 10px"
-            ref="paramTable"
-            @on-select="selectParam"
-            @on-select-all="selectParamAll"
-            @on-select-all-cancel="cancelParamAll"
-            @on-select-cancel="cancelParam"
-            stripe
-            :columns="hyperlinksData.columns"
-            :data="hyperlinksData.data"
-            :height="paramTableHeight">
-          </i-table>
-        </div>
-      </i-form>
-  </Modal>
-</script>
-<script>
-  Vue.component('j-hyperlinks-setting', {
-    template: '#hyperlinks-setting-template',
-    props: {
-      excel: {
-        type: String,
-        required: true,
-        default:""
-      }
-    },
-    data(){
-      return {
-        title:"",
-        hyperlinksShow:false,
-        fieldList:[],
-        hyperlinksData:{
-          columns: [
-            {
-              type: 'selection',
-              width: 35,
-              align: 'center'
-            },
-            {
-              title: '映射参数',
-              key: 'paramName',
-              align: 'center',
-              render: (h, params) => {
-                return this.renderInput(h, params, 'paramName','hyperlinksData')
-              }
-            },
-            {
-              title: '原始参数',
-              key: 'paramValue',
-              renderHeader: (h, params) => {
-                //update-begin--Author:wangshuai  Date:20211213 for：判断是够选中图表----
-                let selectChart = this.ifSelectChart();
-                //update-end--Author:wangshuai  Date:20211213 for：判断是够选中图表----
-                const sub = ()=>{
-                  let arr = []
-                  let it1 = h('span',params.column.title)
-                  let it2 = h('Tooltip', {
-                    props:{
-                      placement: 'top',
-                      transfer: true
-                    }
-                  }, [
-                    h('span',{class:'jimu-table-tip'}, '?'),
-                    h('div',{slot:'content', style:{'white-space':'normal'}}, [
-                      h('p','1.支持下拉框选择数据集字段'),
-                      h('p','2.支持表达式=A1表示A1单元格的值'),
-                      h('p','3.支持表达式=A表示当前点击行所在的A列单元格的值')
-                    ])
-                  ])
-                  arr.push(it1)
-                  //update-begin--Author:wangshuai  Date:20211213 for：【JMREP-2470】如果当前点击的不是图表那么就显示问号提示----
-                  if(!selectChart){
-                    arr.push(it2)
-                  }
-                  //update-end--Author:wangshuai  Date:20211213 for：【JMREP-2470】如果当前点击的不是图表那么就显示问号提示----
-                  return arr
-                }
-                return h('div', {}, sub())
-              },
-              render: (h, params) => {
-                let paramSelectOptions = this.getChartParamSelectOptions()
-                //update-begin--Author:wangshuai--Date:20211012--for:图表钻取的时候不显示自定义表达式
-                let assembly = this.randerSelectInput(params,paramSelectOptions);
-                let props = assembly.get("props")
-                let select = assembly.get("select")
-                assembly.clear()
-                return h(select, {
-                      props: props,
-                //update-end--Author:wangshuai--Date:20211012--for:图表钻取的时候不显示自定义表达式
-                      on: {
-                        'on-change': (value) => {
-                          this.hyperlinksData.data[params.index].paramValue = value;
-                        }
-                      },
-                    },
-                    paramSelectOptions.map(item => {
-                      return h('i-option', {
-                        props: {
-                          value: item.value
-                        }
-                      }, item.title)
-                    })
-                );
-              }
-            },
-          ],
-          data:[],
-        },
-        selectParamTables:[],
-        paramTableHeight: 0,
-        linkData:{
-          id:"",
-          reportId:"",//积木设计器id
-          parameter:"",//参数JSON串
-          ejectType:"",//弹出方式（0 当前页面 1 新窗口）
-          linkName:"",
-          apiMethod:"",
-          linkType:"",
-          apiUrl:"",
-          charId:"",
-          requirement:"",
-        },
-        reportData:[],//积木报表下拉框的数据
-        linkDataRule: {
-          reportId: [
-            { required: true, message: '请选择链接目标', trigger: 'change' }
-          ],
-          ejectType: [
-            { required: true, message: '请选择弹出方式', trigger: 'change' },
-          ],
-          linkName: [
-            { required: true, message: '请填写链接名称', trigger: 'change' },
-          ],
-          charId: [
-            { required: true, message: '请选择链接图表', trigger: 'change' },
-          ],
-          apiUrl: [
-            { required: true, message: '请填写网络连接', trigger: 'change' },
-            { validator: this.validateHttpExist, trigger: 'change' }
-          ],
-        },
-        chartData:[],// 图表下拉框数据
-        paramData:[], //参数数据用于父页面传递参数便于监听
-        currentDbCode:"",
-        fieldName:"",
-        currentChart:"" //存放当前点击图表的数据
-      }
-    },
-    watch: {
-      'paramData': function(val) {
-        //先清空数据
-        this.hyperlinksData.data=[];
-        for (const valElement of val) {
-          if(valElement.paramName != 'charId'){
-            //为参数table添加数据
-            this.hyperlinksData.data.push(valElement)
-          }
-        }
-      }
-    },
-    created(){
-    },
-    methods:{
-      addParamTable(){
-        let indexArr = this.hyperlinksData.data.map(item=>item.tableIndex);
-        if(indexArr.length==0){
-          indexArr=[0];
-        }
-        this.selectParamTables = [];
-        this.hyperlinksData.data=[...this.hyperlinksData.data,{
-          'paramName':"",
-          'paramValue':"",
-          'paramCell':"",
-          'tableIndex':Math.max(...indexArr)+1
-        }];
-      },
-      removeParamTable(){
-        // this.deleteParamModel = true;
-        let tableIndexArr = this.selectParamTables.map(item=>item.tableIndex);
-        this.hyperlinksData.data = this.hyperlinksData.data.filter(item=>!tableIndexArr.includes(item.tableIndex));
-        this.selectParamTables = [];
-      },
-      selectParamAll(){
-        this.selectParamTables = this.hyperlinksData.data.map(item=>
-        {
-          return {"tableIndex":item.tableIndex,"id":item.id}
-        });
-      },
-      cancelParamAll(){
-        this.selectParamTables = [];
-      },
-      selectParam(selection,row){
-        this.selectParamTables=[...this.selectParamTables,{"tableIndex":row.tableIndex,"id":row.id}];
-      },
-      cancelParam(selection,row){
-        this.selectParamTables = this.selectParamTables.filter(item=>item.tableIndex!=row.tableIndex);
-      },
-      getReportByUser(fieldList,dbCode,fieldName,existChartList,chartId){
-        this.linkData.reportId = ""
-        this.linkData.ejectType = ""
-        this.fieldList = fieldList
-        this.currentDbCode = dbCode
-        this.fieldName = fieldName
-        $http.get({
-          url: api.getReportByUser,
-          data:{reportId:excel_config_id},
-          success:(result)=>{
-            this.reportData = result
-          }
-        })
-        if(vm.chartsflag){
-          this.initChartList(existChartList,chartId)
-        }
-      },
-      //初始化图表
-      initChartList(existChartList, currentChartId){
-        if(existChartList && existChartList.length>0){
-          let arr2 = existChartList.filter(item=>{
-            return item.id==currentChartId
-          });
-          if(arr2.length>0){
-            this.currentChart = arr2[0]
-            this.currentDbCode =  arr2[0].db
-          }
-        }
-      },
-      getReportChars(){
-        let param={}
-        param.reportId = excel_config_id;
-        if(vm.chartsflag){
-          param.charId = vm.dataSettings.id
-        }
-        $http.get({
-          url: api.getReportChars,
-          data:param,
-          success:(result)=>{
-            this.chartData=[]
-            this.chartData = result
-          }
-        })
-        let parameter = this.linkData.parameter;
-        if(parameter){
-        let parse = JSON.parse(parameter);
-        let parameters = [];
-        for (let i = 0; i < parse.length; i++) {
-          let paramName = parse[i].paramName;
-          if(paramName =="charId"){
-            this.linkData.charId = parse[i].paramValue
-          }else{
-            let params={}
-            params.paramName= parse[i].paramName;
-            params.paramValue= parse[i].paramValue;
-            params.paramCell= parse[i].paramCell;
-            parameters.push(params)
-          }
-        }
-        this.linkData.parameter = parameters;
-        this.hyperlinksData.data = parameters;
-       }
-      },
-      //网络报表点击事件
-      networkClick(value){
-        let id = api.checkParam(value);
-        $http.get({
-          url: id,
-          success:(result)=>{
-            let linksData = [];
-            let i=0;
-            for (const data of result) {
-              let newData={}
-              newData.paramName = data.paramName
-              newData.paramValue = data.paramValue
-              newData.tableIndex = i
-              linksData.push(newData);
-              i++;
-            }
-           this.hyperlinksData.data = linksData
-          },
-          fail:()=>{
-            this.hyperlinksData.data=[];
-          }
-        })
-      },
-      hyperlinksOk(name){
-        this.$refs[name].validate((valid) => {
-          if (valid) {
-            let data = this.linkData;
-            let linksData = this.hyperlinksData.data;
-            for(let item of linksData){
-              item.dbCode = this.currentDbCode
-              item.fieldName = this.fieldName
-            }
-            data.parameter=JSON.stringify(linksData);
-            if(!data.reportId){
-                data.reportId = excel_config_id
-            }
-            $http.post({
-              url:api.linkSaveAndEdit,
-              contentType:'json',
-              data:JSON.stringify(data),
-              success:(result)=>{
-                if(!vm.chartsflag){
-                let split = this.excel.split(",");
-                let linkIds = xs.cellProp(split[0],split[1], "linkIds")
-                if(linkIds){
-                  result=linkIds+","+result
-                }
-                xs.cellProp(split[0],split[1], {linkIds: result})
-                xs.cellProp(split[0],split[1], {display: "link"})
-                this.$emit('lingcallback',result)
-                }else{
-                  let dataIds = vm.dataSettings['linkIds'];
-                  let linkIds = "";
-                  if(dataIds){
-                    linkIds = dataIds+","+result;
-                  }else{
-                    linkIds = result;
-                  }
-                  let dataSettings = vm.dataSettings;
-                  dataSettings['linkIds'] = linkIds
-                  //更新ExtData
-                  xs.updateChartExtData(vm.selectedChartId,dataSettings);
-                  this.$emit('lingcallback',linkIds)
-                }
-                this.close(name);
-              }
-            });
-          }
-        })
-
-      },
-      hyperlinksCancel(name){
-        if(this.linkData){
-          this.$emit('lingcallback',this.linkData.id)
-        }
-        this.close(name);
-      },
-      //清除数据
-      close(name){
-        this.linkData.id="";
-        this.linkData.reportId="";
-        this.linkData.parameter="";
-        this.linkData.ejectType="";
-        this.linkData.linkName="";
-        this.linkData.apiMethod="";
-        this.linkData.linkType="";
-        this.linkData.apiUrl="";
-        this.linkData.charId = "";
-        this.reportData=[];
-        this.hyperlinksData.data=[];
-        this.selectParamTables=[];
-        this.chartData=[];
-        this.paramData=[]
-        this.fieldList=[]
-        this.dbCode=""
-        this.fieldName=""
-        this.hyperlinksShow=false
-        this.currentChart=""
-        this.$refs[name].resetFields();
-      },
-      renderInput(h, params, field,tabIndex,placeholder) {
-        let key = params.column.key;
-        let paramName = params.row.paramName;
-        if(this.linkData.linkType==='2' && paramName==='charId'){
-          return h('i-input', {
-            props: {
-              "size":"small",
-              type: 'text',
-              readonly:true,
-              value: this[tabIndex].data[params.index][field]
-            }
-          })
-        }else{
-        return h('i-input', {
-          props: {
-            "size":"small",
-            type: 'text',
-            value: this[tabIndex].data[params.index][field],
-            placeholder: placeholder?placeholder:`请输入`+params.column.title
-          },
-          on: {
-            'on-blur': (event) => {
-              if(tabIndex==="hyperlinksData"){
-                let tableIndexArr = this.selectParamTables.map(item=>item.tableIndex);
-                this.hyperlinksData.data.forEach(item=>{
-                  if(tableIndexArr.includes(item.tableIndex)){
-                    item._checked = true;
-                  }
-                });
-              }
-              this[tabIndex].data[params.index][field] = event.target.value;
-            }
-          },
-        })
-        }
-      },
-      charsClick(val) {
-        this.linkData.charId=val
-        let id = api.checkParam(excel_config_id);
-        let that = this
-        $http.get({
-          url: id,
-          success: (result) => {
-            that.hyperlinksData.data = []
-            let i=2
-            let dataStr="";
-            for (const data of result) {
-              let newData = {}
-              if(dataStr.indexOf(data.paramName) == -1){
-                newData.paramName = data.paramName
-                newData.paramValue = data.paramValue
-                newData.tableIndex = i
-                that.hyperlinksData.data.push(newData);
-                dataStr = dataStr +data.paramName+",";
-                i++;
-              }
-            }
-          }
-        })
-      },
-      validateHttpExist(rule, value, callback){
-        if(value){
-          if(value.includes("http")){
-            callback();
-          }else{
-            callback(new Error('请输入http或https'));
-          }
-        }
-      },
-      /**
-       * 获取报表参数下拉选项
-       * @param data
-       * @returns {*[]|[{title: string, value: *}, {title: string, value: *}]}
-       */
-      getChartParamSelectOptions() {
-        //判断是选择图表还是单元格
-        if(!vm.chartsflag){
-          let arr = []
-          for(let item of this.fieldList){
-            arr.push({
-              title: item.fieldText, value: item.title
-            })
-          }
-          return arr;
-        }else{
-          let data = this.currentChart
-          if(!data){
-            return []
-          }
-          if(!data.x || !data.y){
-            return []
-          }
-          let arr = [{
-            title: '图表分类属性', value: 'name',
-          },{
-            title: '图表值属性', value: 'value'
-          }]
-          if(data.z){
-            arr.push({
-              title: '图表系列属性', value: 'seriesName'
-            })
-          }
-          return arr;
-        }
-      },
-      
-      //渲染select_input组件中的props
-      randerSelectInput(params,paramSelectOptions) {
-        //判断是选择图表还是单元格
-        let assembly = new Map();
-        let props = {};
-        if (!vm.chartsflag) {
-          props = {
-            options: paramSelectOptions,
-            size: 'small',
-            transfer: true,
-            value: this.hyperlinksData.data[params.index].paramValue,
-            clearable: true
-          }
-          assembly.set("select","j-select-input")
-        }else{
-          props = {
-            size:'small',
-            transfer: true,
-            value: this.hyperlinksData.data[params.index].paramValue,
-            clearable: true,
-          }
-          assembly.set("select","i-select")
-        }
-        assembly.set("props",props)
-        return assembly;
-      },
-      //判断是否选中图表
-      ifSelectChart(){
-        if(vm && vm.chartsflag){
-          return true;
-        }
-        return false;
-      }
-    },
-  })
-</script>
-<style>
-  .ivu-form-item-error-tip{
-      position:relative;
-  }
-</style>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl
deleted file mode 100644
index 83f44c0d3..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl
+++ /dev/null
@@ -1,1194 +0,0 @@
-<style>
-    .pointerIcon .ivu-icon{
-        cursor: pointer;
-    }
-</style>
-
-<script type="text/x-template" id="javabean-setting-template">
-<div>
-    <Modal title="javabean数据集配置"
-           fullscreen=true
-           :loading="loading"
-           :value="visible"
-           width="100%"
-           @on-cancel="closeJavabean"
-           @on-ok="saveData">
-        <div>
-            <i-form ref="javabeanForm" :model="formData" :rules="formDataValidate" inline :label-width="85">
-                <Row span="24">
-                    <i-col span="5">
-                        <form-item prop="dbCode" label="编码：">
-                            <i-input v-model="formData.dbCode" :disabled ="dbCodeDisabled()" style="width: 153px" type="text" placeholder="请输入编码">
-                            </i-input>
-                        </form-item>
-                    </i-col>
-                    <i-col span="5" style="margin-left: 20px;">
-                        <form-item prop="dbChName" label="名称：">
-                            <i-input v-model="formData.dbChName" type="text" style="width: 200px" placeholder="请输入名称">
-                            </i-input>
-                        </form-item>
-                    </i-col>
-                    <i-col span="3">
-                        <form-item prop="isList">
-                            <Checkbox v-model="formData.isList" style="width: 100px;margin-left: 10%">是否集合</Checkbox>
-                        </form-item>
-                    </i-col>
-                    <i-col span="3">
-                        <form-item prop="isPage" style="display: flex">
-                            <Checkbox v-if="formData.isList == true" v-model="formData.isPage" @on-change="checkChange" style="width: 100px">是否分页
-                              <Tooltip :transfer="true" content="分页文档" placement="top" class="jimu-tooltip">
-                                <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/paging.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                              </Tooltip>
-                            </Checkbox>
-                        </form-item>
-                    </i-col>
-                </Row>
-                <Row style="margin-top:10px;">
-                    <i-col span="5">
-                        <form-item prop="javaType" label="类型：">
-                            <RadioGroup v-model="formData.javaType">
-                                <Radio label="spring-key"></Radio>
-                                <Radio label="java-class"></Radio>
-                            </RadioGroup>
-                        </form-item>
-                    </i-col>
-                    <i-col span="10" style="margin-left: 20px;">
-                        <form-item prop="javaValue" label="值：">
-                            <i-input v-model="formData.javaValue" type="text" style="width: 400px" placeholder="请填入对应的值"/>
-                        </form-item>
-                        <i-button @click="handelAnalyze" type="primary">解 析</i-button>
-                        <Tooltip :transfer="true" content="javabean解析文档" placement="top">
-                            <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dataSet/java.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                        </Tooltip>
-                    </i-col>
-                </Row>
-            </i-form>
-            <Spin fix v-if="spinShow">
-                <Icon type="ios-loading" size=18 class="demo-spin-icon-load"></Icon>
-                <div>Loading</div>
-            </Spin>
-            <Tabs v-model="tabValue" style="margin-top: 15px">
-                <tab-pane label="报表字段明细" name="1">
-                    <i-button type="primary" @click="removeFieldTable" v-if="tab1.selectParamTables.length>0">删除</i-button>
-                    <i-table ref="dynamicTable"
-                             style="padding-bottom: 10%;"
-                             stripe
-                             @on-select="selectField"
-                             @on-select-all="selectFieldAll"
-                             @on-select-all-cancel="cancelFieldAll"
-                             @on-select-cancel="cancelField"
-                             :columns="tab1.columns"
-                             :data="tab1.data"
-                             :height="tableHeight">
-                      
-                        <template slot-scope="{ row, index }" slot="extJsonFiled">
-                          <i-input size="small" v-model="row.extJson" @on-change="extJsonFiledChange(index,row.extJson)" @on-click="extJsonFiledClick(index,row.extJson)" icon="md-contract" class="pointerIcon" placeholder="请输入参数配置"/>
-                        </template>
-                    </i-table>
-                </tab-pane>
-
-                <tab-pane label="报表参数" name="2">
-                    <i-button type="primary" @click="addParamTable">新增</i-button>
-                    <i-button type="primary" @click="removeParamTable" v-if="tab2.selectParamTables.length>0">删除</i-button>
-                    <i-table ref="paramTable"
-                             @on-select="selectParam"
-                             @on-select-all="selectParamAll"
-                             stripe
-                             :columns="tab2.columns"
-                             :data="tab2.data"
-                             :height="paramTableHeight">
-                        <template slot="paramName" slot-scope="props">
-                            <i-form :ref="'formDynamic'+props.idx" :model="props.row">
-                                <form-item prop="paramName" :rules="{required: true, message: '请输入参数', trigger: 'change'}" style="margin-top: 10px">
-                                    <i-input v-model="props.row.paramName" size="small" />
-                                </form-item>
-                            </i-form>
-                        </template>
-                        <template slot="paramTxt" slot-scope="props">
-                            <i-form :ref="'formTxtDynamic'+props.idx" :model="props.row">
-                                <form-item prop="paramTxt" :rules="{required: true, message: '请输入参数文本', trigger: 'change'}" style="margin-top: 10px">
-                                    <i-input v-model="props.row.paramTxt" size="small" />
-                                </form-item>
-                            </i-form>
-                        </template>
-                      
-                        <template slot-scope="{ row, index }" slot="extJsonParam">
-                          <i-input size="small" v-model="row.extJson" @on-change="extJsonParamChange(index,row.extJson)" @on-click="extJsonParamClick(index,row.extJson)" icon="md-contract" class="pointerIcon" placeholder="请输入参数配置"/>
-                        </template>
-                    </i-table>
-                </tab-pane>
-            </Tabs>
-        </div>
-    </Modal>
-    <Modal v-model="deleteParamModel" @on-ok="deleteParamTable" title="确认删除">
-        <p><Icon type="ios-alert"  color="#f90" size="20px"></Icon>是否删除选中数据?</p>
-    </Modal>
-    <Modal v-model="deleteFieldModel" @on-ok="deleteFieldTable" title="确认删除">
-        <p><Icon type="ios-alert"  color="#f90" size="16px"></Icon>是否删除选中配置?</p>
-    </Modal>
-    <#--输入框参数配置放大-->
-    <Modal draggable :loading="loading" v-model="extJsonShow" title="输入值" :width="1000" @on-ok="extJsonOk"
-           @on-cancel="extJsonCancel">
-      <i-form label-colon :label-width="100">
-        <form-item label="参数配置">
-          <i-input :autosize="{minRows: 10}" type="textarea" v-model="paramConfigData" placeholder="请输入参数配置"></i-input>
-        </form-item>
-      </i-form>
-    </Modal>
-</div>
-</script>
-
-<script>
-    const formDataInitValue = {
-        id:'',
-        jimuReportId: '',
-        dbCode: '',
-        dbChName: '',
-        //0sql, 1api ,2 javabean
-        dbType: "2",
-        // spring-key java-class
-        javaType: 'spring-key',
-        javaValue: '',
-        isPage:true,
-        isList:true,
-    }
-    Vue.component('j-javabean-setting', {
-        template: '#javabean-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: false,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                visible: false,
-                loading: true,
-                formData:{},
-                tabValue: '1',
-                spinShow:false,
-                tableHeight: 0,
-                paramTableHeight: 0,
-                deleteParamModel:false,
-                deleteFieldModel:false,
-                tab1: {
-                    selectParamTables:[],
-                    data: [],
-                    columns: [
-                        {
-                            type: 'selection',
-                            width: 35,
-                            align: 'center'
-                        },
-                        {
-                            type: 'index',
-                            width: 60,
-                            align: 'center'
-                        },
-                        {
-                            title: '字段名',
-                            key: 'fieldName',
-                            /*width: '220',*/
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'fieldName','tab1')
-                            }
-                        },
-                        {
-                            title: '排序',
-                            key: 'orderNum',
-                            /*width: '80',*/
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'orderNum','tab1')
-                            }
-                        },
-                        {
-                            title: '字段文本',
-                            /*width: '220',*/
-                            key: 'fieldText',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'fieldText','tab1')
-                            }
-                        },
-                        {
-                            title: '类型',
-                            /*width: '140',*/
-                            key: 'widgetType',
-                            render: (h, params) => {
-                                let options = [
-                                    // 下拉选项
-                                    {title: '数值类型', value: 'number'},
-                                    {title: '字符类型', value: 'string'},
-                                    {title: '日期类型', value: 'date'},
-                                    { title: '富文本', value: 'richText' },
-                                ];
-
-                                return h('i-select', {
-                                            props: {
-                                                size:'small',
-                                                value: this.tab1.data[params.index].widgetType,
-                                            },
-                                            on: {
-                                                'on-change': (value) => {
-                                                    this.tab1.data[params.index].widgetType = value;
-                                                }
-                                            },
-                                        },
-                                        options.map(item => {
-                                            return h('i-option', {
-                                                props: {
-                                                    value: item.value
-                                                }
-                                            }, item.title)
-                                        })
-                                );
-                            }
-                        },
-                        {
-                            title: '字典code',
-                            /*width: '220',*/
-                            key: 'dictCode',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'dictCode','tab1','请输入字典code或地址')
-                            }
-                        },
-                        {
-                            title: '查询',
-                            width: '80',
-                            key: 'searchFlag',
-                            render:(h, params)=> {
-                                return h('Checkbox',{
-                                    props: {
-                                        size:'small',
-                                        value: this.tab1.data[params.index].searchFlag,
-                                        trueValue: 1,
-                                        falseValue: 0
-                                    },
-                                    on: {
-                                        'on-change': (value) => {
-                                            this.tab1.data[params.index].searchFlag = value;
-                                            if(value==0){
-                                                // _this.tab1.data[params.index].searchMode = null;
-                                            }
-                                        }
-                                    }
-                                });
-                            }
-                        },
-                        {
-                            title: '查询模式',
-                            /*width: '140',*/
-                            key: 'searchMode',
-                            render: (h, params) => {
-                                let options = [ // 下拉选项
-                                  {title: '输入框', value: 1},
-                                  {title: '下拉单选', value: 4},
-                                  {title: '下拉多选', value: 3, tip:'须设置字典code'},
-                                  {title: '范围查询', value: 2},
-                                  {title: '模糊查询', value: 5},
-                                  {title: '下拉树', value: 6, tip:'须在code栏设置接口地址'},
-                                  {title: '自定义下拉框', value: 7}
-                                ];
-
-                                return h('i-select', {
-                                            props: {
-                                                size:'small',
-                                                value: this.tab1.data[params.index].searchMode
-                                            },
-                                            on: {
-                                                'on-change': (value) => {
-                                                    // console.log(this.tab1.data)
-                                                    this.tab1.data[params.index].searchMode = value;
-                                                    // this.tab1.data
-                                                }
-                                            },
-                                        },
-                                        options.map(item => {
-                                            let optionObject = {
-                                                props: {
-                                                    value: item.value
-                                                }
-                                            }
-                                            if(item.tip){
-                                                optionObject['attrs'] = {title: item.tip}
-                                            }
-                                            return h('i-option', optionObject, item.title)
-                                        })
-                                );
-                            }
-                        },
-                      {
-                        title: '查询默认值',
-                        /*width: '220',*/
-                        key: 'searchValue',
-                        render: (h, params) => {
-                          return this.renderInput(h, params, 'searchValue','tab1','请输入查询默认值')
-                        }
-                      },
-                      {
-                        title: '查询日期格式',
-                        /*width: '220',*/
-                        key: 'searchFormat',
-                        render: (h, params) => {
-                          return this.renderInput(h, params, 'searchFormat','tab1','请输入查询日期格式')
-                        }},
-                      {
-                        title: '参数配置',
-                        /*width: '220',*/
-                        key: 'extJson',
-                        slot: 'extJsonFiled'
-                      }
-                    ]
-                },
-                tab2:{
-                    selectParamTables:[],
-                    data: [],
-                    columns: [
-                        {
-                            type: 'selection',
-                            width: 35,
-                            align: 'center'
-                        },
-                        {
-                            type: 'index',
-                            width: 60,
-                            align: 'center'
-                        },
-                        {
-                            title: '参数',
-                            key: 'paramName',
-                          
-                            render: (h, params) => {
-                                this.tab2.data[params.index] = params.row;
-                                return h(
-                                "div", 
-                                this.$refs.paramTable.$scopedSlots.paramName({
-                                    row: params.row,
-                                    idx: params.row._index
-                                })
-                                )
-                            }
-                        },
-                        {
-                            title: '参数文本',
-                            key: 'paramTxt',
-                            render: (h, params) => {
-                                this.tab2.data[params.index] = params.row;
-                                return h(
-                                        "div",
-                                        this.$refs.paramTable.$scopedSlots.paramTxt({
-                                            row: params.row,
-                                            idx: params.row._index
-                                        })
-                                )
-                            }
-                        },
-                        {
-                            title: '排序',
-                            key: 'orderNum',
-                            render: (h, params) => {
-                                return this.renderInput(h, params, 'orderNum','tab2')
-                            }
-                        },
-                      {
-                        title: '类型',
-                        key: 'widgetType',
-                        render: (h, params) => {
-                          let options = [
-                            {title: '数值类型', value: 'number'},
-                            {title: '字符类型', value: 'string'},
-                            {title: '日期类型', value: 'date'}
-                          ];
-                          return h('i-select', {
-                                props: {
-                                  size:'small',
-                                  clearable:true,
-                                  transfer: true,
-                                  value: this.tab2.data[params.index].widgetType,
-                                },
-                                on: {
-                                  'on-change': (value) => {
-                                    this.tab2.data[params.index].widgetType = value;
-                                  }
-                                },
-                              },
-                              options.map(item => {
-                                return h('i-option', {
-                                  props: {
-                                    value: item.value
-                                  }
-                                }, item.title)
-                              })
-                          );
-                        }
-                      },
-                      {
-                        title: '字典code',
-                        key: 'dictCode',
-                        render: (h, params) => {
-                          return this.renderInput(h, params, 'dictCode','tab2','请输入字典code或地址')
-                        }
-                      },
-                      {
-                        title: '查询',
-                        key: 'searchFlag',
-                        render:(h, params)=> {
-                          return h('Checkbox',{
-                            props: {
-                              size:'small',
-                              value: this.tab2.data[params.index].searchFlag,
-                              trueValue: 1,
-                              falseValue: 0
-                            },
-                            on: {
-                              'on-change': (value) => {
-                                this.tab2.data[params.index].searchFlag = value;
-                                if(value==0){
-                                  // _this.tab1.data[params.index].searchMode = null;
-                                }
-                              }
-                            }
-                          });
-                        }
-                      },
-                      {
-                        title: '查询模式',
-                        key: 'searchMode',
-                        render: (h, params) => {
-                          let options = [
-                            {title: '输入框', value: 1},
-                            {title: '下拉单选', value: 4},
-                            {title: '下拉多选', value: 3, tip:'须设置字典code'},
-                            {title: '下拉树', value: 6, tip:'须在code栏设置接口地址'},
-                            {title: '自定义下拉框', value: 7}
-                          ];
-
-                          return h('i-select', {
-                                props: {
-                                  size:'small',
-                                  clearable: true,
-                                  transfer: true,
-                                  value: this.tab2.data[params.index].searchMode
-                                },
-                                on: {
-                                  'on-change': (value) => {
-                                    this.tab2.data[params.index].searchMode = value;
-                                  }
-                                },
-                              },
-                              options.map(item => {
-                                let optionObject = {
-                                  props: {
-                                    value: item.value
-                                  }
-                                }
-                                if(item.tip){
-                                  optionObject['attrs'] = {title: item.tip}
-                                }
-                                return h('i-option', optionObject, item.title)
-                              })
-                          );
-                        }
-                      },
-                      {
-                        title: '默认值',
-                        key: 'paramValue',
-                        render: (h, params) => {
-                          return this.renderInput(h, params, 'paramValue','tab2')
-                        }
-                      },
-                      {
-                        title: '查询日期格式',
-                        key: 'searchFormat',
-                        render: (h, params) => {
-                          return this.renderInput(h, params, 'searchFormat','tab2','请输入查询日期格式')
-                        }
-                      },
-                      {
-                        title: '参数配置',
-                        /*width: '220',*/
-                        key: 'extJson',
-                        slot: 'extJsonParam'
-                      }
-                    ]
-                },
-
-                formDataValidate:{
-                    dbCode:[
-                        { required: true, message: '编码不能为空', trigger: 'blur' },
-                        { validator: this.validateCodeExist, trigger: 'blur' }
-                    ],
-                    dbChName:[
-                        { required: true, message: '名称不能为空', trigger: 'blur' }
-                    ],
-                    javaValue:[
-                        { required: true, message: '请输入spring-key或者java-class', trigger: 'blur' }
-                    ]
-                },
-                paramConfigData:"", //参数配置弹窗数据
-                extJsonShow:false, //参数配置弹窗是否显示
-                tableIndex:-1, //当前table的下标
-                tableType:-1 //判断当前是字段还是参数 0字段 1参数
-            }
-        },
-
-        watch: {
-            tabValue: {
-                deep: true,
-                immediate: true,
-                handler: function (val){
-                    if(val==='3'){
-                        this.spinShow=true;
-                        this.loadTableData(1,this.sqlForm.dbDynSql)
-                    }
-                }
-            }
-        },
-        methods: {
-            javabeanShow(){
-                this.visible = true;
-                this.$refs.javabeanForm.resetFields()
-                this.formData = {...formDataInitValue}
-                this.formData.jimuReportId = excel_config_id
-                //update-begin--Author:wangshuai--Date:20211202--for:javaBean数据源新增的时候设置是否显示分页
-                this.setIsPage();
-                //update-end--Author:wangshuai--Date:20211202--for:javaBean数据源新增的时候设置是否显示分页
-            },
-            //设置分页是否显示，目前只支持一个分页显示
-            setIsPage(){
-              $http.get({url:api.queryIsPage(excel_config_id),data:{dbcode:this.formData.dbCode},success:(result)=> {
-                  if(result){
-                    this.formData.isPage = false
-                  }else{
-                    this.formData.isPage = true
-                  }
-                }
-              })
-            },
-            closeJavabean(){
-                this.visible = false;
-            },
-            clearData(){
-                this.formData = {...formDataInitValue}
-                this.tab1.data = [];
-                this.tab2.data = [];
-                this.tab2.selectParamTables=[];
-            },
-            saveData(){
-                this.$refs.javabeanForm.validate((valid)=>{
-                    if(valid){
-                        this.childrenRules().then(res =>{
-                            if(res){
-                                //保存表单
-                                let data = {...this.formData}
-                                if (data.isList==true){
-                                    data.isList = '1'
-                                }else{
-                                    data.isList = '0'
-                                    data.isPage = '0'
-                                }
-                                if (data.isPage==true){
-                                    data.isPage = '1'
-                                    data.isList = '1'
-                                } else {
-                                    data.isPage = '0'
-                                }
-                                data.fieldList = this.tab1.data; //解析出表字段
-                                data.paramList = this.tab2.data; //动态表单参数
-                                // console.log(123, data)
-                                $http.post({
-                                    url: api.saveDb,
-                                    contentType:'json',
-                                    data:JSON.stringify(data),
-                                    success:(res)=>{
-                                        this.$emit('saveback',res.id);
-                                        this.visible = false
-                                        this.clearData();
-                                    },
-                                    finally:()=>{
-                                        setTimeout(() => {
-                                            this.loading = false
-                                            this.$nextTick(() => {
-                                                this.loading = true
-                                            })
-                                        }, 500)
-                                    },
-                                });
-                                return;
-                            }else{
-                                setTimeout(() => {
-                                    this.loading = false
-                                    this.$nextTick(() => {
-                                        this.loading = true
-                                    })
-                                }, 500)
-                                return;
-                            }
-                        });
-                    }else{
-                        setTimeout(() => {
-                            this.loading = false
-                            this.$nextTick(() => {
-                                this.loading = true
-                            })
-                        }, 500)
-                        return;
-                    }
-                });
-            },
-
-            editById(dbId){
-                this.tabValue="1";
-                this.clearData();
-                $http.get({url:api.loadDbData(dbId),
-                    success:(result)=>{
-                        // console.log('result=====',result);
-                        if(!result){
-                            return;
-                        }
-                        //设置数据
-                        let obj = {}
-                        Object.keys(this.formData).map(k=>{
-                            obj[k] = result.reportDb[k]
-                        })
-                        if (obj.isPage=='1'){
-                            obj.isPage = true;
-                            obj.isList = true;
-                        }else {
-                            obj.isPage = false;
-                        }
-                        if(obj.isList=='1'){
-                            obj.isList = true;
-                        }else{
-                            obj.isList = false;
-                            obj.isPage = false;
-                        }
-                        this.formData = obj;
-                        this.tab1.data=result.fieldList;
-                        if(this.tab1.data){
-                            this.tab1.data.forEach((item,index)=>{
-                                item.tableIndex = index+1;
-                            })
-                        }
-                        this.tab2.data=result.paramList;
-                        if(this.tab2.data){
-                            this.tab2.data.forEach((item,index)=>{
-                                item.tableIndex = index+1;
-                            })
-                        }
-                        this.visible = true;
-                    }
-                });
-            },
-
-            dbCodeDisabled(){
-              if(!this.formData.id){
-                  return false
-              }else{
-                  return true
-              }
-            },
-            handelAnalyze(){
-                let { javaType, javaValue, isPage } = this.formData
-                let param = {}
-                this.tab2.data.map(item=>{
-                    if(item.paramValue){
-                        param[item.paramName] = item.paramValue
-                    }
-                })
-                let dataStr = JSON.stringify({
-                    'javaType': javaType,
-                    'javaValue': javaValue,
-                    'isPage': isPage,
-                    'param': param
-                });
-                $http.post({
-                    url: api.queryFieldByBean,
-                    contentType: 'json',
-                    data: dataStr,
-                    success:(result)=>{
-                        if(this.tab1.data && this.tab1.data.length>0){
-                            this.$Modal.confirm({
-                                title:'是否要重置字段?',
-                                content: '数据为空会删除所有字段！',
-                                onOk: () => {
-                                    this.setTabFieldData(result);
-                                },
-                                onCancel: () => {
-                                    console.info("不重置字段")
-                                }
-                            });
-                        }else{
-                            this.setTabFieldData(result);
-                        }
-                    }
-                })
-            },
-            removeField(){
-
-            },
-            checkChange(ispage){
-                if (ispage){
-                    $http.get({url:api.queryIsPage(excel_config_id),data:{dbcode:this.formData.dbCode},success:(result)=>{
-                            if (result){
-                                this.$Modal.confirm({
-                                    content: '已有数据集分页,是否更改?',
-                                    onOk: () => {
-                                        this.formData.isPage = true;
-                                        this.formData.isList = true;
-                                    },
-                                    onCancel: ()=> {
-                                        this.formData.isPage = false;
-                                    }
-                                });
-                            }
-                        }});
-                }
-            },
-            //校验数据集编码
-            validateCodeExist(rule, value, callback){
-                if(this.formData.id){
-                    callback();
-                }
-                //update-begin-Author:wangshuai--Date:20211206--for:添加JAVABean 数据集时，编码检验出错，无法添加，和SQL数据集验证保持一致 gitee #I4KT5R
-                let reg=/^(?!_)(?![0-9])[0-9a-zA-Z_]+(?<!_)$/;
-                if(!reg.test(value)){
-                    callback(new Error('编码支持字母和数字，且不能以数字和_开头'));
-                }
-                //update-end-Author:wangshuai--Date:20211206--for:添加JAVABean 数据集时，编码检验出错，无法添加，和SQL数据集验证保持一致 gitee #I4KT5R
-                $jm.dataCodeExist(excel_config_id, value, (result)=> {
-                    if(result === true){
-                        callback('编码已存在!');
-                    }else{
-                        callback();
-                    }
-                })
-            },
-
-
-
-            getReport(){
-                $http.get({url:api.getReport(excel_config_id),success:(result)=>{
-                    // console.log("result====>",result)
-                    if (result){
-                        this.$emit('cancelback',result)
-                        this.designerObj = result;
-                    }
-                }});
-            },
-            handleCurrentChange (val) {
-                this.loadTableData(val,this.sqlForm.dbDynSql);
-            },
-            loadTableData(page,sql){
-                if(page){
-                    this.tab3.page.page = page;
-                }
-                let dbSource = this.sqlForm.dbSource;
-                if(!this.selectTableName){
-                    let dbDynSql=this.sqlForm.dbDynSql;
-                    if(dbDynSql){
-                        let form_number = dbDynSql.toLowerCase().indexOf("from ");
-                        let where_number = dbDynSql.toLowerCase().indexOf(" where");
-                        let tableName = (where_number>-1?dbDynSql.substring(form_number+4,where_number):dbDynSql.substring(form_number+4)).trim();
-                        this.selectTableName=tableName;
-                    }
-                }
-                if(!this.selectTableName){
-                   this.spinShow=false; 
-                   return;
-                }
-                if(this.tabValue==='3' && !this.sqlForm.dbDynSql){
-                    this.spinShow=false;
-                    return;
-                }
-                this.tab3Loading=true;
-                $http.post({
-                    url:api.loadTableData,
-                    data:{
-                        dbSource:dbSource,
-                        sql:sql,
-                        tableName:this.selectTableName,
-                        pageNo:1,
-                        pageSize:10
-                    },
-                    timeout:10000,
-                    success:(result)=>{
-                        this.tab3Loading=false;
-                        this.spinShow=false;
-                        // console.log("loadTableData====>result",result)
-                        this.tab3.data=result.records;
-                        this.tab3.page.total=result.total;
-                    },
-                    fail:(res)=>{
-                        this.tab3Loading=false;
-                        this.spinShow=false;
-                    },
-                    error:()=>{
-                        this.tab3Loading=false;
-                        this.spinShow=false;
-                    }
-                })
-            },
-            //保存之前先判断报表SQl是否已改变
-            saveDbTip(){
-                //当为数据源SQL并且报表SQl已改变则提示
-                if(this.sqlForm.dbType=='0' && this.oldDbDynSql && this.oldDbDynSql!=this.sqlForm.dbDynSql){
-                    this.reportSql=true
-                }else{
-                    this.saveDb();  
-                }
-            },
-            saveDb(){
-                this.$refs.sqlForm.validate((valid)=>{
-                    if(valid){
-                      this.childrenRules().then(res =>{
-                      if(res){
-                        //保存表单
-                        let reportDb = {};
-                        reportDb.id = this.sqlForm.id;
-                        reportDb.jimuReportId = excel_config_id;
-                        reportDb.dbCode = this.sqlForm.dbCode;
-                        reportDb.dbChName = this.sqlForm.dbChName;
-                        reportDb.dbType = this.sqlForm.dbType;
-                        reportDb.dbSource = this.sqlForm.dbSource;
-                        if (this.sqlForm.isList==true){
-                            reportDb.isList = '1'
-                        }else{
-                            reportDb.isList = '0'
-                            reportDb.isPage = '0'
-                        }
-                        if (this.sqlForm.isPage==true){
-                            /*if (this.addIsPage){
-                                reportDb.isPage = '0'
-                            } else {
-                                reportDb.isPage = '1'
-                            }*/
-                            reportDb.isPage = '1'
-                            reportDb.isList = '1'
-                        } else {
-                            reportDb.isPage = '0'
-                        }
-                        if (this.sqlForm.dbType == "0"){
-                            reportDb.dbDynSql = this.sqlForm.dbDynSql;
-                        } else {
-                            reportDb.apiUrl = this.sqlForm.apiUrl;
-                            reportDb.apiMethod = this.sqlForm.apiMethod;
-                        }
-                        reportDb.fieldList = this.tab1.data; //解析出表字段
-                        reportDb.paramList = this.tab2.data; //动态表单参数
-                        //saveDb这个请求后台实体中没用的参数不传
-                        let params = "apiUrl,apiMethod,dbChName,dbCode,dbDynSql,dbSource,dbType,fieldList,id,isList,isPage,jimuReportId,paramList"
-                        let reportNewDb = {};
-                        for (const key in reportDb) {
-                            if(params.includes(key)){
-                                reportNewDb[key]=reportDb[key]
-                            }
-                        }
-                        $http.post({
-                            url: api.saveDb,
-                            contentType:'json',
-                            data:JSON.stringify(reportNewDb),
-                            success:(res)=>{
-                                this.$emit('saveback',res.id);
-                                for(let key in this.sqlForm){
-                                    this.sqlForm[key] = "";
-                                }
-                                //update--begin-Author:wangshuai--Date:20211126--for:默认选中分页
-                                this.sqlForm.isPage=true;
-                                //update--end-Author:wangshuai--Date:20211126--for:默认选中分页
-                                this.sqlForm.apiMethod="0";
-                                this.tab1.data = [];
-                                this.tab2.data = [];
-                                this.sqlModal = false;
-                                this.oldDbDynSql=""
-                                this.tab2.selectParamTables=[];
-                                //清除验证
-                                this.$refs['sqlForm'].resetFields();
-                            },
-                            finally:()=>{
-                                setTimeout(() => {
-                                    this.loading = false
-                                    this.$nextTick(() => {
-                                        this.loading = true
-                                    })
-                                }, 500)
-                            }, 
-                        });
-                        return;
-                    }else{
-                        setTimeout(() => {
-                            this.loading = false
-                            this.$nextTick(() => {
-                                this.loading = true
-                            })
-                        }, 500)
-                        return;
-                    }
-                });
-                }else{
-                    setTimeout(() => {
-                        this.loading = false
-                        this.$nextTick(() => {
-                            this.loading = true
-                        })
-                    }, 500)
-                    return;
-                }
-              });
-            },
-            //参数加验证不为空
-            async childrenRules(){
-                let success = true
-                for (let i = 0, len = this.tab2.data.length; i < len; i++) {
-                    this.$refs['formDynamic' + i].validate(valid => {
-                        if (!valid) {
-                            success=false
-                        }
-                    })   
-                    this.$refs['formTxtDynamic' + i].validate(valid => {
-                        if (!valid) {
-                            success=false
-                        }
-                    })
-                }
-                return success;
-            },
-            isListChange(isList){
-              //update--begin-Author:wangshuai--Date:20211129--for:选择列表的时候如果有分页不选择，如果没有分页就勾选上
-              if(isList){
-                this.setIsPage();
-              }else{
-                //update-begin--Author:wangshuai--Date:20211203--for:如果不是集合是否分页应该去掉
-                this.formData.isPage = false
-                //update-end--Author:wangshuai--Date:20211203--for:如果不是集合是否分页应该去掉
-              }
-              //update--end-Author:wangshuai--Date:20211129--for:选择列表的时候如果有分页不选择，如果没有分页就勾选上
-            },
-            selectFieldAll(){
-                this.tab1.selectParamTables = this.tab1.data.map(item=>
-                {
-                    return {"tableIndex":item.tableIndex,"id":item.id}
-                });
-            },
-            selectField(selection,row){
-                this.tab1.selectParamTables=[...this.tab1.selectParamTables,{"tableIndex":row.tableIndex,"id":row.id}];
-            },
-            /**
-             * 取消选中全部
-             */ 
-            cancelFieldAll(){
-                this.tab1.selectParamTables = [];
-            },
-            /**
-             * 取消选中的其中一个复选框
-             */ 
-            cancelField(selection,row){
-                this.tab1.selectParamTables = this.tab1.selectParamTables.filter(item=>item.tableIndex!=row.tableIndex);
-            },
-            removeFieldTable(){
-                this.deleteFieldModel = true;
-            },
-            deleteFieldTable(){
-                let tableIndexArr = this.tab1.selectParamTables.map(item=>item.tableIndex);
-                let arr = this.tab1.data.filter(item=>!tableIndexArr.includes(item.tableIndex));
-                this.tab1.data = [...arr]
-                //删除之后清除复选框的key
-                this.tab1.selectParamTables = [];
-            },
-
-            selectParamAll(){
-                this.tab2.selectParamTables = this.tab2.data.map(item=>
-                {
-                    return {"tableIndex":item.tableIndex,"id":item.id}
-                });
-            },
-            selectParam(selection,row){
-                this.tab2.selectParamTables=[...this.tab2.selectParamTables,{"tableIndex":row.tableIndex,"id":row.id}];
-            },
-            removeParamTable(){
-                this.deleteParamModel = true;
-            },
-            deleteParamTable(){
-                let tableIndexArr = this.tab2.selectParamTables.map(item=>item.tableIndex);
-                let arr = this.tab2.data.filter(item=>!tableIndexArr.includes(item.tableIndex));
-                this.tab2.data = [...arr]
-            },
-            addParamTable(){
-                let indexArr = this.tab2.data.map(item=>item.tableIndex);
-                let orderNumArr = this.tab2.data.map(item=>item.orderNum);
-                if(indexArr.length==0){
-                    indexArr=[0];
-                }
-                if(orderNumArr.length==0){
-                    orderNumArr=[0];
-                }
-                this.tab2.selectParamTables = [];
-                this.tab2.data=[...this.tab2.data,{
-                    'paramName':"",
-                    'paramTxt':"",
-                    'paramValue':"",
-                    'orderNum':Math.max(...orderNumArr)+1,
-                    'tableIndex':Math.max(...indexArr)+1,
-                    'extJson':""
-                }];
-            },
-            renderButton(h, params) {
-                return h('div',[
-                    h('i-button', {
-                        props: {
-                            type: 'primary',
-                            size: 'small'
-                        },
-                        style:{
-                            'margin-right':'5px'
-                        },
-                        on: {
-                            click: () => {
-                                this.sourceTab.data.forEach((item)=>{
-                                    if (item.id === params.row.id){
-                                        this.dataSource = item;
-                                    }
-                                })
-                                this.visibleData = true;
-                            }
-                        }
-                    },'编辑'),
-                    h('i-button', {
-                        props: {
-                            type: 'primary',
-                            size: 'small'
-                        },
-                        on: {
-                            click: () => {
-                                this.$Modal.confirm({
-                                    title:"提示",
-                                    content: '是否确认删除?',
-                                    onOk: () => {
-                                        let dbSource = {};
-                                        dbSource.id = params.row.id;
-                                        $http.post({
-                                            contentType:'json',
-                                            url: api.delDataSource,
-                                            data:JSON.stringify(dbSource),
-                                            success:(result)=>{
-                                                this.$Notice.success({
-                                                    title: '删除成功'
-                                                });
-                                            }
-                                        });
-                                    }
-                                });
-                            }
-                        }
-                    },'删除')
-                ])
-            },
-            renderInput(h, params, field,tabIndex,placeholder) {
-                return h('i-input', {
-                    props: {
-                        "size":"small",
-                        type: 'text',
-                        value: this[tabIndex].data[params.index][field],
-                        placeholder: placeholder?placeholder:`请输入`+params.column.title
-                    },
-                    on: {
-                        'on-change': (event) => {
-                            if(tabIndex==="tab2"){
-                                let tableIndexArr = this.tab2.selectParamTables.map(item=>item.tableIndex);
-                                this.tab2.data.forEach(item=>{
-                                    if(tableIndexArr.includes(item.tableIndex)){
-                                        item._checked = true;
-                                    }
-                                });
-                            }
-                            this[tabIndex].data[params.index][field] = event.target.value;
-                        }
-                    },
-                })
-            },
-          //字段放大按钮点击事件
-          extJsonFiledClick(index,extJson){
-            this.paramConfigData = extJson
-            this.tableIndex = index
-            //0字段 1参数
-            this.tableType = 0
-            this.extJsonShow = true
-          },
-          //字段值改变事件
-          extJsonFiledChange(index,extJson){
-            this.tab1.data[index].extJson = extJson
-          },
-          //参数放大按钮点击事件
-          extJsonParamChange(index,extJson){
-            this.tab2.data[index].extJson = extJson
-          },
-          //参数值改变事件
-          extJsonParamClick(index,extJson){
-            this.paramConfigData = extJson
-            this.tableIndex = index
-            //0字段 1参数
-            this.tableType = 1
-            this.extJsonShow = true
-          },
-          //放大取消事件
-          extJsonCancel(){
-            this.tableIndex = -1
-            this.tableType = -1
-            this.extJsonShow=false
-            this.paramConfigData = ""
-          },
-          //放大确定事件
-          extJsonOk(){
-            // console.log(this.paramConfigData)
-            if(this.tableType == 0){
-              this.tab1.data[this.tableIndex].extJson = this.paramConfigData
-            }else if(this.tableType == 1){
-              this.tab2.data[this.tableIndex].extJson = this.paramConfigData
-            }
-            this.extJsonCancel();
-          },
-          /**
-           * 设置tabs 字段详细的数据
-           * @param result 请求接口返回的数据
-           */
-          setTabFieldData(result){
-              let data = this.tab1.data;
-              data = data.concat(result)
-              //先去除没有的数据
-              let newJson = [];
-              //找到不重复的数据
-              for (const datum of data) {
-                  //建立标记，判断数据是否重复，true为不重复
-                  let flag = true;
-                  for (const results of newJson) {
-                      //循环数据删除this.tab1.data已经存在的数据
-                      if(datum['fieldName'] == results['fieldName']){
-                          flag = false;
-                      }
-                  }
-                  //判断是否重复
-                  if(flag == true){
-                      //不重复的放入新数组。  新数组的内容会继续进行上边的循环。
-                      newJson.push(datum);
-                  }
-              }
-              //去除没有的数据
-              newJson = newJson.filter(item => result.some(value => value.fieldName == item.fieldName))
-              //循环给当前剔除的数组加上index和排序及查询框
-              let newData=[];
-              let i =0;
-              for (const results of newJson) {
-                  results.tableIndex = i
-                  if(!results){
-                      results.searchFlag = 0
-                  }
-                  results.orderNum = i
-                  newData.push(results);
-                  i++;
-              }
-              this.tab1.data = newData
-          }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl
deleted file mode 100644
index 1ffd0a65d..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl
+++ /dev/null
@@ -1,187 +0,0 @@
-<script type="text/x-template" id="jurisdiction">
-  <div>
-  <Modal
-          :loading="loading"
-          v-model="shareModal"
-          :title="moduleTitle"
-          @on-cancel="handleShareCancel"
-          @on-ok="handleShareOk"
-          ok-text="创建连接"
-  >
-    <i-form>
-      <form-item label="过期时间:">
-        <RadioGroup v-model="jurisdictionData.termOfValidity">
-          <Radio v-for="item in termValidity" :label="item.value" :key="item.value">
-            <span>{{item.label}}</span>
-          </Radio>
-        </RadioGroup>
-      </form-item> 
-      <form-item label="是否开启密码:">
-        <RadioGroup v-model="jurisdictionData.previewLockStatus">
-          <Radio v-for="item in lockOption" :label="item.value" :key="item.value">
-            <span>{{item.label}}</span>
-          </Radio>
-        </RadioGroup>
-      </form-item>
-    </i-form>
-  </Modal>
-  <Modal
-          :loading="loading"
-          v-model="shareUrlModal"
-          title="分享链接"
-          @on-cancel="handleShareUrlCancel"
-  >
-    <p slot="footer">
-      <Button type="primary"  @click="handleShareUrlOk">取消分享</Button>
-    </p>
-    <i-form>
-      <form-item label="预览链接:" style="display: flex">
-         <i-input v-model="jurisdictionData.previewUrl" readonly style="width: 400px"/>
-      </form-item>
-      <form-item label="预览密码" style="display: flex" v-if="jurisdictionData.previewLockStatus=='1'">
-        <i-input v-model="jurisdictionData.previewLock" readonly  style="width: 100px"/>
-        <Button type="primary" style="position: relative;left: 242px;" @click="copyClick">复制</Button>
-      </form-item>
-      <div v-else style="margin-top: 20px;height: 40px">
-          <Button type="primary" style="float: right;margin-right: 16px" @click="copyClick">复制</Button>
-      </div>
-      </template>
-    </i-form>
-  </Modal>
-  </div>
-</script>
-<script>
-  Vue.component('j-jurisdiction', {
-    template: '#jurisdiction',
-    data() {
-      return {
-        id: "",
-        loading: false,
-        moduleTitle: "创建分享链接",
-        shareModal: false,
-        shareUrlModal:false,
-        jurisdictionData: {
-          "id": "",
-          "reportId": "",
-          "previewUrl": "",
-          "previewLock": "",
-          "status": "",
-          "termOfValidity": "1",
-          "previewLockStatus": "0"
-        },
-        termValidity: [
-          {
-            label: '永久有效',
-            value: '1'
-          },
-          {
-            label: '7天',
-            value: '2'
-          },
-          {
-            label: '1天',
-            value: '3'
-          }
-        ],//过期时间
-        lockOption: [
-          {
-            label: '否',
-            value: '0'
-          },
-          {
-            label: '是',
-            value: '1'
-          }
-        ],//是否开启密码
-      }
-    },
-    created() {
-    },
-    methods: {
-      //创建分享连接关闭事件
-      handleShareCancel() {
-        this.shareModal = false
-        this.close();
-      },
-      close(){
-        this.jurisdictionData.id="";
-        this.jurisdictionData.reportId="";
-        this.jurisdictionData.previewUrl="";
-        this.jurisdictionData.previewLock="";
-        this.jurisdictionData.status="";
-        this.jurisdictionData.termOfValidity="1";
-        this.jurisdictionData.previewLockStatus="0"
-      },
-      //创建分享连接确定事件
-      handleShareOk() {
-        this.jurisdictionData.status="0"
-        $http.post({
-          contentType:'json',
-          url: api.addAndEdit,
-          data: this.jurisdictionData,
-          success: (res) => {
-            if (res) {
-              let protocol = window.location.protocol;
-              let host = window.location.host;
-              //update-begin---author:wangshuai ---date:20220215  for：[issues/I4RQSO]配置了customPrePath值，但分享链接中没有/test
-              let url = protocol+"//"+host+baseFull;
-              //update-end---author:wangshuai ---date:20220215  for：[issues/I4RQSO]配置了customPrePath值，但分享链接中没有/test
-              res.previewUrl = url+res.previewUrl;
-              this.jurisdictionData = res
-              this.shareModal = false
-              this.shareUrlModal=true
-            }
-          },
-          error:()=>{
-            this.shareModal = true
-            this.$Message.warning("创建连接失败！")
-          }
-        })
-      },
-      //取消分享
-      handleShareUrlOk(){
-        let jurisdictionData={}
-        jurisdictionData.id= this.jurisdictionData.id
-        jurisdictionData.status= '1'
-        jurisdictionData.reportId= this.jurisdictionData.reportId
-        // console.log("我进来了")
-        $http.post({
-          contentType:'json',
-          url: api.addAndEdit,
-          data: jurisdictionData,
-          success: (res) => {
-            if (res) {
-              this.$Message.success("取消分享成功！")
-              localStorage.removeItem(this.jurisdictionData.reportId);
-              this.shareUrlModal=false
-              this.close()
-            }
-          }
-        }) 
-      },
-      handleShareUrlCancel(){
-        this.close()
-      },
-      //复制预览地址和密码
-      copyClick(){
-        let previewUrl = this.jurisdictionData.previewUrl;
-        let previewLock = this.jurisdictionData.previewLock;
-        let textarea = document.createElement('textarea');
-        //update-begin---author:wangshuai ---date:20220315  for：[issues/I4WWKE]分享链接的预览密码能否忽略------------
-        textarea.value = "预览地址:  "+previewUrl+" \n"
-        //兼容老数据，如果是否分享密码为空的话，也得需要加上预览密码
-        //previewLockStatus 密码锁状态(0不存在密码锁，1存在密码锁)
-        if("0" != this.jurisdictionData.previewLockStatus){
-          textarea.value =  textarea.value + "预览密码:  "+previewLock+"\n"
-        }
-        textarea.value =  textarea.value + "复制预览地址在浏览器打开";
-        //update-end---author:wangshuai ---date:20220315  for：[issues/I4WWKE]分享链接的预览密码能否忽略------------
-        document.body.appendChild(textarea);
-        textarea.select(); // 选择对象;
-        document.execCommand("Copy"); // 执行浏览器复制命令
-        document.body.removeChild(textarea)
-        this.$Message.success('复制成功');
-      }
-    }
-  })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl
deleted file mode 100644
index 24f7f1106..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl
+++ /dev/null
@@ -1,114 +0,0 @@
-<script type="text/x-template" id="legend-setting-template">
-    <div>
-        <Submenu  name="legend" style="border-bottom: inset 1px;" class="rightFontSize dataSourceForm">
-            <template slot="title">
-                <span>图例设置</span>
-            </template>
-            <div class="blockDiv">
-                <Row class="ivurow">
-                    <p>显示&nbsp;&nbsp;</p>
-                    <i-switch size="small" style="margin-left: 141px;" v-model="legendOptions.show" @on-change="onLegendChange"/>
-                </Row>
-                <Row class="ivurow">
-                    <p>字体大小&nbsp;&nbsp;</p>
-                    <i-input size="small" type="number" v-model="legendOptions.textStyle_fontSize" @on-blur="onLegendChange" class="iSelect"></i-input>
-                </Row>
-                <Row class="ivurow" v-if="typeof legendOptions.textStyle_color !== 'undefined'">
-                    <p>字体颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="legendOptions.textStyle_color" size="small" class="iSelect" @on-change="onLegendChange">
-                           <span slot="append">
-                             <color-picker class="colorPicker" v-model="legendOptions.textStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onLegendChange"/>
-                           </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <#--<Row class="ivurow">
-                    <p>图例宽度&nbsp;&nbsp;</p>
-                    <i-input size="small" type="number" v-model="echartInfo.legendItemWidth" @on-blur="styleChanges" style="width: 111px;margin-bottom: 10px;"></i-input>
-                </Row>-->
-                <Row class="ivurow">
-                    <p>纵向位置&nbsp;&nbsp;</p>
-                    <i-select size="small" class="iSelect" v-model="legendOptions.top" @on-change="onLegendChange">
-                        <i-option class="rightFontSize" value="top">顶部</i-option>
-                        <i-option class="rightFontSize" value="bottom">底部</i-option>
-                    </i-select>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">横向位置&nbsp;&nbsp;</p>
-                    <i-select size="small" class="iSelect" v-model="legendOptions.left" @on-change="onLegendChange" style="width: 125%">
-                        <i-option class="rightFontSize" value="left">左对齐</i-option>
-                        <i-option class="rightFontSize" value="center">居中</i-option>
-                        <i-option class="rightFontSize" value="right">右对齐</i-option>
-                    </i-select>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">布局朝向&nbsp;&nbsp;</p>
-                    <i-select size="small" v-model="legendOptions.orient" @on-change="onLegendChange" class="iSelect">
-                        <i-option class="rightFontSize" value="horizontal">横排</i-option>
-                        <i-option class="rightFontSize" value="vertical">竖排</i-option>
-                    </i-select>
-                </Row>
-
-                <Row class="ivurow">
-                    <p>上边距&nbsp;&nbsp;</p>
-                    <slider :disabled="legendOptions.top!=='top'" v-model="paddingTop" @on-change="onLegendTopChange" :tip-format="formatTop" style="margin-top: -9px;width: 148px;margin-left: 5px;"></slider>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-legend-setting', {
-        template: '#legend-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                legendOptions: {
-                    textStyle_color:'',
-                    top:"top",
-                    left:"left",
-                    orient:"horizontal",
-                    textStyle_fontSize:""
-                },
-                paddingTop:'' //边距单独提出来
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.legendOptions = Object.assign(this.legendOptions, this.settings)
-                    //update-begin---author:wangshuai ---date:20220628  for：[issues/I58YJG]图表中图例设置-纵向位置如果设置为底部，在挪动上边距的话那个图例就会跑到顶部去------------
-                    this.paddingTop = this.legendOptions.padding[0]
-                    //update-end---author:wangshuai ---date:20220628  for：[issues/I58YJG]图表中图例设置-纵向位置如果设置为底部，在挪动上边距的话那个图例就会跑到顶部去--------------
-                }
-            },
-            onLegendChange (){
-                this.$emit('change','legend',this.legendOptions)
-            },
-            onLegendTopChange(){
-                this.legendOptions.padding[0] = this.paddingTop;
-                this.onLegendChange()
-            },
-            formatTop(val){
-                return val
-            },
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl
deleted file mode 100644
index 0001c2340..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl
+++ /dev/null
@@ -1,108 +0,0 @@
-<script type="text/x-template" id="line-setting-template">
-    <Submenu  name="3" style="border-bottom: inset 1px;" class="rightFontSize">
-        <template slot="title">
-            折线设置
-        </template>
-        <div class="blockDiv">
-            <Row class="ivurow">
-                <p>平滑曲线&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 116px;" v-model="lineOptions.smooth" @on-change="onLineChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>标记点&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 128px;" v-model="lineOptions.showSymbol" @on-change="onLineChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>点大小&nbsp;&nbsp;</p>
-                <slider v-model="lineOptions.symbolSize" @on-change="onLineChange" style="margin-top: -9px;width: 144px;margin-left: 12px;"></slider>
-            </Row>
-            <Row class="ivurow">
-                <p>阶梯线图&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 116px;" v-model="lineOptions.step" @on-change="onLineChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p style="margin-bottom: 10px;">线条宽度&nbsp;&nbsp;</p>
-                <slider max="5" v-model="lineOptions.lineStyle_width" @on-change="onLineChange" style="margin-top: -9px;width: 134px;margin-left: 9px;"></slider>
-            </Row>
-            <Row v-if=" isMultiChart === false && typeof lineOptions.itemStyle_color!== 'undefined' " class="ivurow">
-                <p style="margin-bottom: 10px;">线条颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input v-model="lineOptions.itemStyle_color" size="small" class="iSelect" @on-change="onLineChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="lineOptions.itemStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onLineChange"/>
-                    </span>
-                </i-input>
-                </Col>
-            </Row>
-            <Row class="ivurow" v-if="isMultiChart === false">
-                <p>面积折线&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 116px;" v-model="lineOptions.isArea" @on-change="onLineChange"/>
-            </Row>
-            <Row v-if="lineOptions.isArea" class="ivurow">
-                <p style="margin-bottom: 10px;">面积颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input v-model="lineOptions.areaStyle_color" size="small" class="iSelect" @on-change="onLineChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="lineOptions.areaStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onLineChange"/>
-                    </span>
-                </i-input>
-                </Col>
-            </Row>
-            <Row v-if="lineOptions.isArea" class="ivurow" style="z-index:9999">
-                <p style="margin-bottom: 10px;">面积透明度&nbsp;&nbsp;</p>
-                <slider max="1" step="0.1" v-model="lineOptions.areaStyle_opacity" @on-change="onLineChange" style="margin-top: -9px;width: 114px;margin-left: 12px;"></slider>
-            </Row>
-        </div>
-    </Submenu>
-</script>
-<script>
-    Vue.component('j-line-setting', {
-        template: '#line-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            },
-            isMultiChart: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                lineOptions: {
-                    smooth: false,
-                    showSymbol: true,
-                    symbolSize: 5,
-                    step: false,
-                    lineStyle_width: 2,
-                    itemStyle_color: '#c43632',
-                    isArea:false,
-                    areaStyle_color:'rgba(220,38,38,0)',
-                    areaStyle_opacity:1
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.lineOptions = Object.assign(this.lineOptions, this.settings)
-                }
-            },
-            onLineChange(){
-                this.$emit('change', this.lineOptions)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl
deleted file mode 100644
index a2f1f5aa6..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl
+++ /dev/null
@@ -1,538 +0,0 @@
-<style>
-    /*地图相关样式 -begin*/
-    .page{
-        float:right;
-        margin-top:20px;
-    }
-    .vertical-center-modal-big{
-        margin: 2% 4%;
-    }
-    .ivu-modal-confirm-head-icon {
-        font-size: 28px;
-    }
-    .ivu-cascader-transfer .ivu-cascader-menu-item{
-        font-size: 12px !important;
-    }
-    /*地图相关样式 -end*/
-</style>
-<script type="text/x-template" id="map-setting-template">
-    <div>
-        <Submenu name="10" style="border-bottom: inset 1px;" class="rightFontSize dataSourceForm">
-            <template slot="title">
-                <span>地图设置</span>
-            </template>
-            <div class="blockDiv">
-              <Row class="ivurow">
-                <p>地图级别&nbsp;&nbsp;</p>
-                <div class="iSelect">
-                  <i-select clearable transfer="true" size="small" @on-change="mapLevelChange" v-model="mapOption.mapLevel">
-                    <i-option class="rightFontSize" v-for="(map,index) in mapLevelData" :value="map.value" :index="index">
-                      {{ map.label}}
-                    </i-option>
-                  </i-select>
-                </div>
-              </Row>
-              <Row class="ivurow" v-if="mapOption.mapType=='1' || mapOption.mapType=='2' || mapOption.mapType=='3'">
-                <p v-if="mapOption.mapType=='1'">选择省份&nbsp;&nbsp;</p>
-	              <p v-if="mapOption.mapType=='2'">选择城市&nbsp;&nbsp;</p>
-	              <p v-if="mapOption.mapType=='3'">选择区域&nbsp;&nbsp;</p>
-                <div class="iSelect">
-                  <Cascader v-if="mapOption.mapType=='1' " clearable transfer="true" :data="provinceData" size="small" @on-change="(value, selectedData) => provinceChange(value, selectedData)" v-model="mapOption.mapCode"></Cascader>
-                  <Cascader v-if="mapOption.mapType=='2' " clearable transfer="true" :data="cityData" size="small" @on-change="(value, selectedData) => provinceChange(value, selectedData)" v-model="mapOption.mapCode"></Cascader>
-                  <Cascader v-if="mapOption.mapType=='3' " clearable transfer="true" :data="areaData" size="small" @on-change="(value, selectedData) => provinceChange(value, selectedData)" v-model="mapOption.mapCode"></Cascader>
-                </div>
-              </Row>
-                <Row class="ivurow">
-                    <p>比例&nbsp;&nbsp;</p>
-                    <slider v-model="mapOption.zoom" step="0.1"  max="2" @on-change="onGeoChange" style="margin-top: -9px;width: 158px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                  <p>名称显示&nbsp;&nbsp;</p>
-                  <i-switch size="small" style="margin-left: 116px;" v-model="mapOption.label_show" @on-change="onGeoChange"/>
-                </Row>
-                <Row class="ivurow" v-if="mapOption.label_show">
-                    <p>字体大小&nbsp;&nbsp;</p>
-                    <i-input size="small" type="number" v-model="mapOption.label_fontSize" @on-blur="onGeoChange" style="width: 141px"></i-input>
-                </Row>
-                <Row class="ivurow" v-if="typeof mapOption.label_color !== 'undefined' && mapOption.label_show">
-                    <p>字体颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="mapOption.label_color" size="small" style="width: 141px" @on-change="onGeoChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="mapOption.label_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onGeoChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow" v-if="typeof mapOption.emphasis_label_color !== 'undefined'">
-                    <p>字体高亮颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="mapOption.emphasis_label_color" size="small" style="width: 117px;" @on-change="onGeoChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="mapOption.emphasis_label_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onGeoChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow">
-                    <p>区域线&nbsp;&nbsp;</p>
-                    <slider v-model="mapOption.itemStyle_borderWidth" step="0.1" max="5" @on-change="onGeoChange" style="margin-top: -9px;width: 147px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow" v-if="typeof mapOption.itemStyle_areaColor !== 'undefined'">
-                    <p>区域颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="mapOption.itemStyle_areaColor" size="small" style="width: 141px" @on-change="onGeoChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="mapOption.itemStyle_areaColor" :editable="false" alpha  :transfer="true" size="small" @on-change="onGeoChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow" v-if="typeof mapOption.emphasis_itemStyle_areaColor !== 'undefined'">
-                    <p>区域高亮颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="mapOption.emphasis_itemStyle_areaColor" size="small" style="width: 117px;" @on-change="onGeoChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="mapOption.emphasis_itemStyle_areaColor" :editable="false" alpha  :transfer="true" size="small" @on-change="onGeoChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow" v-if="typeof mapOption.itemStyle_borderColor !== 'undefined'">
-                    <p>边框颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="mapOption.itemStyle_borderColor" size="small" style="width: 141px" @on-change="onGeoChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="mapOption.itemStyle_borderColor" :editable="false" alpha  :transfer="true" size="small" @on-change="onGeoChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-            </div>
-        </Submenu>
-        <#--地图弹窗-->
-        <div>
-            <Modal
-                    class-name="vertical-center-modal-big"
-                    fullscreen=true
-                    :loading="loading"
-                    v-model="mapListModal"
-                    title="地图维护"
-                    @on-cancel="callMapDb">
-                <i-form inline :label-width="85">
-                    <Row >
-                        <i-col span="6">
-                            <form-item label="名称:">
-                                <i-input  style="width: 253px" type="text" v-model="queryParams.label" placeholder="请输入名称">
-                                </i-input>
-                            </form-item>
-                        </i-col>
-                        <i-col span="6">
-                            <form-item label="编码:">
-                                <i-input type="text" style="width: 300px" v-model="queryParams.name" placeholder="请输入编码">
-                                </i-input>
-                            </form-item>
-                        </i-col>
-                        <i-col span="2" style="margin-left: 60px">
-                            <i-button @click="loadData(1)"  type="primary" icon="ios-search">查询</i-button>
-                        </i-col>
-                        <i-col span="2">
-                            <i-button @click="clearQuery"  type="primary" icon="ios-refresh">重置</i-button>
-                        </i-col>
-                    </Row>
-                </i-form>
-                <Row style="margin-top:25px">
-                    <i-col span="3">
-                        <i-button @click="addMapData" type="primary">新增</i-button>
-                    </i-col>
-                </Row>
-                <template>
-                    <i-table border stripe :columns="mapTab.columns" :data="mapTab.data"  style="margin-top: 1%;"></i-table>
-                    <div class="page">
-                        <Page :total="page.total"
-                              show-total
-                              show-elevator
-                              @on-change="handleCurrentChange"
-                              @on-page-size-change="handleSizeChange">
-                        </Page>
-                    </div>
-                </template>
-                <template slot="footer">
-                    <i-button type="primary" @click="callMapDb">关闭</i-button>
-                </template>
-            </Modal>
-
-            <Modal :loading="loading" v-model="mapDataModal" title="数据源" :width="35" @on-cancel="clearMapDb" @on-ok="saveMapDb">
-                <div style="padding-right: 30px">
-                    <i-form ref="mapSource" :model="mapSource" :rules="dataFormValidate" label-colon :label-width="100" >
-
-                        <form-item prop="label" label="地图名称" style="height:50px">
-                            <i-input v-model="mapSource.label" placeholder="请输入地图名称"></i-input>
-                        </form-item>
-
-                        <form-item prop="name" label="地图编码" style="height:50px">
-                            <i-input v-model="mapSource.name" placeholder="请输入地图编码"></i-input>
-                        </form-item>
-
-                        <form-item prop="data" label="地图数据">
-                            <i-input type="textarea" :autosize="{minRows: 15,maxRows:15}"  v-model="mapSource.data"  placeholder="请输入地图数据"></i-input>
-                            <a href="http://datav.aliyun.com/tools/atlas" target="_blank">地图数据json下载</a>
-                        </form-item>
-
-                    </i-form>
-                </div>
-            </Modal>
-        </div>
-    </div>
-</script>
-
-<script>
-    Vue.component('j-map-setting', {
-        template: '#map-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                mapOption: {
-                    map:100000,//map code编码
-                    mapCode:[100000],
-                    mapName:"中国人民共和国",
-                    mapLevel:"",//地图等级
-                    mapType:"0", //地图显示
-                    zoom:0.5,
-                    label_color:'#000',
-                    label_fontSize:12,
-                    itemStyle_borderWidth :0.5,
-                    itemStyle_areaColor :'#fff',
-                    itemStyle_borderColor:'#000',
-                    emphasis_label_color:'#fff',
-                    emphasis_itemStyle_areaColor:'red',
-                    label_show:false //地图是否显示
-                },
-                mapListModal:false,
-                mapList:[],
-                allMapList:[],
-                loading:true,
-                mapDataModal: false,
-                page: { //分页参数
-                    page: 1,
-                    size: 10,
-                    total: 0,
-                },
-                queryParams:{
-                    label:"",
-                    name:"",
-                },
-                mapSource:{
-                    id:"",
-                    label:"",
-                    name:"",
-                    data:""
-                },
-                dataFormValidate:{
-                    label:[
-                        { required: true, message: '地图名称不能为空', trigger: 'blur' }
-                    ],
-                    name:[
-                        { required: true, message: '地图编码不能为空', trigger: 'blur' }
-                    ],
-                    data:[
-                        { required: true, message: '地图数据不能为空', trigger: 'blur' }
-                    ]
-                },
-                mapTab:{
-                    data: [],
-                    columns: [
-                        {
-                            type: 'index',
-                            title: '序号',
-                            width: 80,
-                            align: 'center'
-                        },
-                        {
-                            title: '地图名称',
-                            key: 'label'
-                        },
-                        {
-                            title: '地图编码',
-                            key: 'name'
-                        },
-                        {
-                            title: '操作',
-                            key: 'action',
-                            width: 150,
-                            align: 'center',
-                            render: (h, params) => {
-                                return this.renderButton(h, params);
-                            }
-                        }
-                    ]
-                },
-              provinceData:[],//省的json结合
-              cityData:[],//城市的json结合
-              areaData:[],//地区的json结合
-              mapLevelData: [{
-                "label": "全国",
-                "value": "0"
-              }, {
-                "label": "省级",
-                "value": "1"
-              }, {
-                "label": "市级",
-                "value": "2"
-              }, {
-                "label": "区级",
-                "value": "3"
-              }],//地图级别集合
-              mapUrl:"/jmreport/desreport_/regionaljson/", //请求路径
-              mapData:[], //地图的集合
-              initShow:false
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        mounted : function() {
-            this.loadAllData()
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.mapOption = Object.assign(this.mapOption, this.settings)
-                }
-            },
-            onGeoChange(){
-                this.$emit('change','geo',this.mapOption)
-            },
-            //地图数据集维护Modal
-            mapManage(flag){
-                this.clearQuery();
-                this.mapListModal=flag;
-            },
-            loadData(){
-                //加载数据列表
-                let that=this;
-                $http.get({
-                    url: api.mapList,
-                    data:{
-                        label:that.queryParams.label,
-                        name:that.queryParams.name,
-                        current:that.page.page,
-                        size:that.page.size,
-                        token:this.token
-                    },
-                    success:(result)=>{
-                        // console.log('result',result)
-                        let records=result.records;
-                        that.page.total = result.total
-                        that.$nextTick(()=>{
-                            that.mapTab.data=JSON.parse(JSON.stringify(records));
-                        });
-                        that.mapList = records && records.length>0?records:mapTypeList;
-                    }
-                });
-            },
-            loadAllData(){
-                this.loadMapData("province.json",1)
-                this.loadMapData("province.city.json",2)
-                this.loadMapData("province.city.area.json",3)
-            },
-            //地图级别点击事件
-            mapLevelChange(val){
-                this.mapOption.mapType= val
-                this.mapOption.mapCode=[]
-                //如果是0代表全国
-                if(val == 0){
-                  let value =[100000]
-                  let selectedData =[{label:"中华人民共和国",value:100000}] 
-                  this.provinceChange(value,selectedData)
-                }
-            },
-            //省市区点击事件
-            provinceChange(value, selectedData){
-              this.mapOption.mapCode = value;
-              this.mapOption.map = selectedData[selectedData.length-1].value;
-              let label = selectedData[selectedData.length-1].label;
-              let name = selectedData[selectedData.length-1].value;
-              this.mapOption.mapName = label;
-              $http.post({
-                contentType:'json',
-                url: api.queryMapByCode,
-                data:JSON.stringify({name:name,label:label,mapType:this.mapOption.mapType}),
-                success:(result)=>{
-                  xs.registerMap(result.name,result.data);
-                  this.$emit('change','geo',this.mapOption)
-                }
-              })
-              
-            },
-            handleSizeChange(val){
-                this.page.size = val;
-                this.loadData();
-            },
-            handleCurrentChange (val) {
-                this.page.page = val;
-                this.loadData();
-            },
-            saveMapDb() {
-                //保存地图数据
-                this.$refs.mapSource.validate((valid)=>{
-                    if(valid){
-                        //保存地图表单数据
-                        $http.post({
-                            contentType:'json',
-                            url: api.addMapData,
-                            data:JSON.stringify(this.mapSource),
-                            success:(res)=>{
-                                this.$Notice.success({
-                                    title: '保存成功'
-                                });
-                                this.clearMapDb()
-                                this.loadData();
-                            }
-                        });
-                        return;
-                    }else{
-                        setTimeout(() => {
-                            this.loading = false
-                            this.$nextTick(() => {
-                                this.loading = true
-                            })
-                        }, 500)
-                        return;
-                    }
-                });
-            },
-            clearMapDb(){
-                this.mapSource.id=""
-                this.mapSource.label=""
-                this.mapSource.name=""
-                this.mapSource.data=""
-                this.loadData();
-                this.$refs["mapSource"].resetFields();
-                this.mapDataModal = false;
-            },
-            callMapDb() {
-                this.loadAllData();
-                this.mapManage(false)
-            },
-            addMapData() {
-                //新增地图
-                this.mapDataModal=true;
-            },
-            clearQuery(){
-                //清除地图查询数据
-                for(let key in this.queryParams){
-                    this.queryParams[key] = "";
-                }
-                this.page.page=1;
-                this.page.size=10;
-                this.loadData();
-            },
-            //渲染删除编辑button
-            renderButton(h, params) {
-                return h('div',[
-                    h('i-button', {
-                        props: {
-                            type: 'primary',
-                            size: 'small'
-                        },
-                        style:{
-                            'margin-right':'5px'
-                        },
-                        on: {
-                            click: () => {
-                                this.mapTab.data.forEach((item)=>{
-                                    if (item.id === params.row.id){
-                                        this.mapSource = item;
-                                    }
-                                })
-                                this.mapDataModal = true;
-                            }
-                        }
-                    },'编辑'),
-                    h('i-button', {
-                        props: {
-                            type: 'primary',
-                            size: 'small'
-                        },
-                        on: {
-                            click: () => {
-                                this.$Modal.confirm({
-                                    title:"提示",
-                                    content: '是否确认删除?',
-                                    onOk: () => {
-                                        let mapSource = {};
-                                        mapSource.id = params.row.id;
-                                        $http.post({
-                                            contentType:'json',
-                                            url: api.delMapSource,
-                                            data:JSON.stringify(mapSource),
-                                            success:(result)=>{
-                                                this.$Notice.success({
-                                                    title: '删除成功'
-                                                });
-                                                this.loadData();
-                                            }
-                                        });
-                                    }
-                                });
-                            }
-                        }
-                    },'删除')
-                ])
-            },
-          //type 1 省的json 2省市的json 3省市区的json
-          loadMapData(url,type) {
-            $http.get({
-              //update-begin---author:wangshuai ---date:20220412  for：[issues/890]微服务下customPrePath不起作用------------
-              url:"${base}"+"${customPrePath}"+this.mapUrl+url,
-              //update-end---author:wangshuai ---date:20220412  for：[issues/890]微服务下customPrePath不起作用--------------
-              fail:(res)=>{
-                if(type == 1){
-                  this.provinceData = res.data
-                }
-                if(type == 2){
-                  this.cityData = res.data
-                }
-                if(type == 3){
-                  this.areaData = res.data
-                }
-              }
-            })
-          },
-        }
-    })
-
-    //初始化地图数据
-    function loadMap(item){
-        let config = JSON.parse(item.config);
-        this.initShow = true
-        let map = config.geo.map;
-        if(map=="china"){
-          map=100000;
-        }
-        $http.post({
-            contentType:'json',
-            url: api.queryMapByCode,
-            data:JSON.stringify({name:map,label:config.geo.mapName}),
-            success:(result)=>{
-                let data=JSON.parse(result.data);
-                xs.registerMap(result.name,data);
-                xs.updateChart(item.layer_id ,config);
-            }
-        });
-    }
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl
deleted file mode 100644
index 11142d550..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl
+++ /dev/null
@@ -1,96 +0,0 @@
-<script type="text/x-template" id="margin-setting-template">
-    <div >
-        <Submenu  name="5" style="border-bottom: inset 1px;" class="rightFontSize">
-            <template slot="title">
-                <span>边距设置</span>
-            </template>
-            <div class="blockDiv" style="padding-bottom: 10px">
-                <Row class="ivurow">
-                    <p>左边距(%)</p>
-                    <slider :tip-format="percentFormat" :value="getNumberFromPercent(marginOptions.left)" @on-change="(value)=>onPercentChange(value, 'marginOptions.left','onPieChange')" style="margin-top: -9px;width: 135px;margin-left: 5px;"></slider>
-                </Row>
-
-                <Row class="ivurow" v-if="marginOptions.right">
-                    <p>右边距(%)</p>
-                    <slider :tip-format="percentFormat" :value="getNumberFromPercent(marginOptions.right)" @on-change="(value)=>onPercentChange(value, 'marginOptions.right','onPieChange')" style="margin-top: -9px;width: 135px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                    <p>顶边距&nbsp;&nbsp;</p>
-                    <slider v-model="marginOptions.top" @on-change="onMarginChange" style="margin-top: -9px;width: 148px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">底边距&nbsp;&nbsp;</p>
-                    <slider v-model="marginOptions.bottom" @on-change="onMarginChange" style="margin-top: -9px;width: 148px;margin-left: 5px;"></slider>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-margin-setting', {
-        template: '#margin-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            },
-            isMultiChart:{
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                marginOptions: {
-
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            percentFormat (val) {
-                return val + '%';
-            },
-            //通过百分数转化 获取实际数字
-            getNumberFromPercent(p,suffix=''){
-                if(!p){
-                    return 0;
-                }
-                return Number((p+'').replace('%','').replace(suffix,''))
-            },
-            initData: function (){
-                if (this.settings){
-                    this.marginOptions = Object.assign(this.marginOptions, this.settings)
-                }
-            },
-            //slider 百分数改变事件
-            onPercentChange(value, key, eventName,suffix=''){
-                let arr = key.split('.')
-                if(arr.length>1){
-                    let temp = this
-                    for(let i=0;i<arr.length-1;i++){
-                        temp = temp[arr[i]]
-                    }
-                    temp[arr[arr.length-1]] = value+'%'+suffix
-                }else{
-                    this[key] = value+'%'+suffix
-                }
-                //this[eventName]();
-                this.$emit('change',this.marginOptions)
-            },
-            onMarginChange (){
-                this.$emit('change',this.marginOptions)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl
deleted file mode 100644
index 834020346..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl
+++ /dev/null
@@ -1,376 +0,0 @@
-<script type="text/x-template" id="match-setting-template">
-    <div class="match_setting rightFontSize" >
-        <Submenu name="19">
-            <template slot="title">
-                <span>自定义配色</span>
-                <Tooltip placement="top" content="【边缘颜色】选用相对更深色" :transfer="true" v-if="selectedChartType.indexOf('scatter.bubble')!==-1">
-                    <Icon size="16" style="margin-left: 10px;" type="ios-help-circle-outline"/>
-                </Tooltip>
-            </template>
-            <div style="margin-left: 25px;margin-top: -15px;">
-                <Row class="ivurow" style="margin-bottom: 5px;">
-                    <i-button type="primary" size="small" @click="colorMatchModalOpen">新增</i-button>
-                </Row>
-                <i-table class="rightFontSize" :columns="columns2" :data="colorMatchData"></i-table>
-            </div>
-        </Submenu>
-        <Modal :loading="loading" v-model="colorMatchModal" title="自定义配色" :width="30" @on-ok="addColorMatch" @on-cancel="onCancel">
-            <div style="padding-right: 50px" class="dataSourceForm">
-                <i-form :model="colorMatch" label-colon :label-width="90">
-                    <form-item :label="colorLabel">
-                        <row>
-                            <i-col span="12">
-                                <i-input v-model="colorMatch.color" size="small" style="width: 111px;" >
-                                    <span slot="append">
-                                        <color-picker class="colorPicker" v-model="colorMatch.color" :editable="false"  :transfer="true" size="small" />
-                                    </span>
-                                </i-input>
-                            </i-col>
-                        </row>
-                    </form-item>
-                    <form-item label="边缘颜色" v-if="selectedChartType.indexOf('scatter.bubble') !== -1">
-                        <row>
-                            <i-col span="12">
-                                <i-input v-model="colorMatch.edgeColor" size="small" style="width: 111px;" >
-                                    <span slot="append">
-                                        <color-picker class="colorPicker" v-model="colorMatch.edgeColor" :editable="false"  :transfer="true" size="small" />
-                                    </span>
-                                </i-input>
-                            </i-col>
-                        </row>
-                    </form-item>
-                    <form-item label="边框颜色" v-if="selectedChartType.indexOf('radar')>-1">
-                        <row>
-                            <i-col span="12">
-                                <i-input v-model="colorMatch.lineColor" size="small" style="width: 111px;" >
-                                    <span slot="append">
-                                        <color-picker class="colorPicker" v-model="colorMatch.lineColor" :editable="false"  :transfer="true" size="small" />
-                                    </span>
-                                </i-input>
-                            </i-col>
-                        </row>
-                    </form-item>
-                </i-form>
-            </div>
-        </Modal>
-    </div>
-</script>
-<script>
-    Vue.component('j-match-setting', {
-        template: '#match-setting-template',
-        props: {
-            chartOptions: {
-                type: Object,
-                default: () => {
-                }
-            },
-            dataSettings: {
-                type: [Object, String],
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                colorMatchData: [],
-                colorMatch: {name:'',color:'',edgeColor:"",opacity:1,lineColor:''},
-                seriesList: [],
-                selectedChartType: '',
-                colorMatchModal: false,
-                loading: true,
-                columns2: [
-                    {
-                        title: '系列颜色',
-                        key: 'color',
-                        align: 'left',
-                        width: 110,
-                        render: (h, params) => {
-                            return this.renderColorButton(h, params, 'color', 1);
-                        }
-                    },
-                    {
-                        title: '操作',
-                        key: 'action',
-                        align: 'right',
-                        width: 80,
-                        render: (h, params) => {
-                            return this.renderColorButton(h, params, 'action', 1);
-                        }
-                    }
-                ],
-                colorMatchModal: false
-
-            }
-        },
-        watch: {
-            chartOptions: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        computed: {
-            colorLabel: function (){
-                return this.selectedChartType.indexOf('scatter.bubble') !== -1 ? '中心颜色' : '颜色'
-            }
-        },
-        methods: {
-            //渲染button
-            renderColorButton(h, params, key, type){
-                // console.log('params', params)
-                if (key == 'action'){
-                    return h('div', {style: {display: 'flex'}}, [
-                        h('i-button', {
-                            props: Object.assign({}, {
-                                type: 'default',
-                                size: 'small',
-                                type: "text"
-                            }, {
-                                icon: 'md-create',
-                            }),
-                            on: {
-                                "click": () => {
-                                    if (type == 1){
-                                        this.colorMatch = params.row;
-                                        this.colorMatchModal = true;
-                                    } else {
-                                        this.seriesObj = params.row;
-                                        this.seriesModal = true;
-                                    }
-                                }
-                            }
-                        }),
-                        h('i-button', {
-                            props: Object.assign({}, {
-                                size: 'small',
-                                type: "text"
-                            }, {
-                                icon: 'md-close',
-                            }),
-                            on: {
-                                click: () => {
-                                    this.$Modal.confirm({
-                                        title: '提示',
-                                        content: '是否确认删除?',
-                                        onOk: () => {
-                                            if (type == 1){
-                                                this.colorMatchData.splice(params.index, 1);
-                                                this.onColorChange()
-                                            } else {
-                                                this.seriesTypeData.splice(params.index, 1);
-                                                this.runChart();
-                                            }
-                                        }
-                                    });
-                                }
-                            }
-                        })
-                    ])
-                } else {
-                    //行数据显示渲染和编辑操作
-                    return h('div', {
-                            style: {
-                                display: 'flex',
-                                width: '100px',
-                                alignItems: 'center'
-                            }
-                        },
-                        [
-                            (type === 1) ? h('div', {style: {'background': params.row.color, 'width': '15px', 'height': '15px'}}) : h('div', {style: {}}, params.row.type),
-                            h('div', [
-                                h('div', {style: {display: 'inherit', width: type === 1 ? '75px' : '60px', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap'}}, '\xa0' + params.row.name)
-                            ])
-                        ])
-                }
-            },
-            colorMatchModalOpen(){
-                this.colorMatchModal = true
-            },
-            initData: function (){
-                if (this.chartOptions){
-                    // console.info("########", JSON.stringify(this.dataSettings))
-                    this.selectedChartType = this.dataSettings.chartType;
-                    let colorArr = [];
-                    let seriesList = []
-                    let arr = this.chartOptions.series
-                    arr.forEach(object => {
-                        let type = object.type
-                        if (type == 'bar' || type == 'line'){
-                            if (object.itemStyle && object.itemStyle.color){
-                                colorArr.push({name: object.name, color: object.itemStyle.color})
-                            }
-                            seriesList.push(object.name)
-                        } else if(type=='graph'){
-                            //关系图自定义的数据
-                            object.categories.forEach(categoryObj=>{
-                                if(categoryObj.itemStyle && categoryObj.itemStyle.color){
-                                    let isExis = colorArr.filter(item=>item.name===categoryObj.name);
-                                    if(isExis.length===0){
-                                        colorArr.push({name:categoryObj.name,color:categoryObj.itemStyle.color})
-                                    }
-                                }
-                            })
-                            seriesList=object.categories.map(item=>{return item.name}).filter(function(item, index, self){ return  self.indexOf(item) == index; });
-                        }else if (type == 'scatter'){
-                            if (object.itemStyle && object.itemStyle.color && object.itemStyle.color.colorStops){
-                                let colorStops = object.itemStyle.color.colorStops;
-                                colorArr.push({name: object.name, color: colorStops[0].color, edgeColor: colorStops[1].color})
-                            }
-                            seriesList.push(object.name)
-                        } else if (type == 'radar'){
-                            object.data.forEach(item => {
-                                if (item.areaStyle && item.areaStyle.color && item.areaStyle.color != ''){
-                                    colorArr.push({name:item.name,color:item.areaStyle.color,opacity:item.areaStyle.opacity,lineColor:item.lineStyle.color})
-                                }
-                                seriesList.push(item.name)
-                            });
-
-                        } else if (type == 'pie' || type == 'funnel'){
-                            object.data.map(item => {
-                                if (item.itemStyle && item.itemStyle.color){
-                                    colorArr.push({name: item.name, color: item.itemStyle.color})
-                                }
-                                seriesList.push(item.name)
-                            })
-                        } else if (type == 'gauge'){
-                            let arr = object.axisLine.lineStyle.color;
-                            for (let j = 0, len = arr.length; j < len; j++) {
-                                if ((arr[0] && arr[0][1] == '#91c7ae') && (arr[1] && arr[1][1] == '#63869E')){
-                                    break;
-                                }
-                                colorArr.push({color: arr[j][1], name: ""})
-                            }
-                        }
-                    })
-                    // console.info("自定义颜色", colorArr)
-                    //已设置的颜色配置
-                    this.colorMatchData = colorArr
-                    //系列下拉框数据
-                    this.seriesList = seriesList
-                }
-            },
-            addColorMatch(){
-                let obj={...this.colorMatch};
-                if(obj._index>=0){
-                    this.colorMatchData.splice(obj._index,1,obj);
-                }else{
-                    this.colorMatchData.push(obj)
-                }
-                //运行到图表
-                this.onColorChange();
-                this.colorMatchModal=false;
-                this.colorMatch={name:'',color:'',edgeColor:"",opacity:1,lineColor:''};
-            },
-            onColorChange(){
-                // console.log('this.colorMatchData==>',JSON.stringify(this.colorMatchData));
-                // console.log('this.seriesTypeData==>',JSON.stringify(this.seriesTypeData));
-                if(!this.colorMatchData){
-                    return;
-                }
-                let arr = []
-                if(this.selectedChartType.indexOf('pie')>=0 || this.selectedChartType.indexOf('funnel')>=0|| this.selectedChartType.indexOf('radar')>=0){
-                    arr = this.chartOptions['series'][0]['data']
-                }else if(this.selectedChartType.indexOf('graph')>=0){
-                    //处理关系图的自定义配色
-                    arr = this.chartOptions['series'][0]['categories']
-                }else{
-                    arr = this.chartOptions['series']
-                }
-                // console.log('this.arr==>',JSON.stringify(arr));
-                let seriesArray = []
-                let i = 0;
-                for(let item of arr){
-                    //删除背景色
-                    delete item['areaStyle']
-                    delete item['lineStyle']
-                    if(this.selectedChartType.indexOf('gauge')>=0){
-                        break;
-                    }
-                    if(this.selectedChartType.indexOf('radar')>=0) {
-                        let color = ''
-                        let lineColor = ''
-                        let opacity = 1
-                        if(i<=this.colorMatchData.length) {
-                          let colorMatchDatum = this.colorMatchData[i];
-                          if (colorMatchDatum) {
-                            color = colorMatchDatum['color']
-                            lineColor = colorMatchDatum['lineColor']
-                            opacity = colorMatchDatum['opacity']
-                            //设置雷达图背景色和透明度
-                            if(color)
-                            {
-                              item['areaStyle'] = {color: color, opacity: opacity}
-                            } else {
-                              item['areaStyle'] = {color: "", opacity: 0}
-                            }
-                            //设置雷达图边框颜色
-                            if(lineColor)
-                            {
-                              item['lineStyle'] = {color: lineColor}
-                            } else {
-                              item['lineStyle'] = {color: ""}
-                            }
-                          }
-                          i++;
-                        }
-
-                    }else if(this.selectedChartType.indexOf('scatter')>=0){
-                      if(i<=this.colorMatchData.length) {
-                        let colorMatchDatum = this.colorMatchData[i];
-                         if(colorMatchDatum){
-                            let color =colorMatchDatum['color']//0%处的颜色 中心
-                            let edgeColor = colorMatchDatum['edgeColor']//100%处的颜色 边缘
-                            let tempColorStyle={type:'radial',r: 0.5,colorStops: [{offset: 0, color:color}, {offset: 1, color: edgeColor}]}
-                            if (!item['itemStyle']) {
-                                item['itemStyle'] = {color:tempColorStyle};
-                            }else{
-                                item['itemStyle']['color'] = tempColorStyle;
-                            }
-                         }
-                         i++;
-                        }
-
-                    }else{
-                        if (!item['itemStyle']) {
-                            item['itemStyle'] = {color: ''}
-                        }
-                        let color = ''
-                        if (i<=this.colorMatchData.length){
-                          let colorMatchDatum = this.colorMatchData[i];
-                          if(colorMatchDatum){
-                            color = this.colorMatchData[i]['color']
-                            item['itemStyle']['color'] = color
-                          }else{
-                            item['itemStyle']['color'] = ""
-                          }
-                          i++;
-                        }
-                    }
-
-                    if(this.selectedChartType.indexOf('mixed')>=0){
-                        seriesArray.push(JSON.parse(JSON.stringify(item)))
-                    }
-                }
-                if(this.selectedChartType.indexOf('mixed')>=0){
-                    this.chartOptions['series'] = seriesArray
-                }
-                //TODO 仪表盘目前只支持设置三色0.2/0.8/1，后期优化修改
-                if(this.selectedChartType.indexOf('gauge')>=0){
-                    let c1=this.colorMatchData[0]?this.colorMatchData[0].color:"#91c7ae";
-                    let c2=this.colorMatchData[1]?this.colorMatchData[1].color:"#63869E";
-                    let c3=this.colorMatchData[2]?this.colorMatchData[2].color:"#C23531";
-                    let arr= [[0.2, c1], [0.8, c2], [1, c3]];
-                    this.chartOptions['series'][0]['axisLine']['lineStyle'].color =arr
-                }
-                // console.info("this.chartOptions",JSON.stringify(this.chartOptions))
-                let id = this.dataSettings.id;
-                xs.updateChart(id , this.chartOptions);
-            },
-            onCancel(){
-                this.colorMatch={color:'',edgeColor:'',lineColor:''}
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl
deleted file mode 100644
index 3dafc426a..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl
+++ /dev/null
@@ -1,146 +0,0 @@
-<script type="text/x-template" id="pictorial-setting-template">
-    <Submenu  name="8" style="border-bottom: inset 1px;" class="rightFontSize">
-        <template slot="title">
-            <span>象形图设置</span>
-        </template>
-        <div class="blockDiv" style="padding-bottom: 10px">
-            <Row class="ivurow" >
-               <span title="建议上传至服务器本地,若上传至云服务器,可能导出/打印等功能不可用" style="display: inline-block;line-height:0px;height: 20px;width: 53px;vertical-align:middle">图标</span>
-                <Upload
-                        :headers = "uploadHeaders"
-                        ref="upload"
-                        :show-upload-list="false"
-                        :default-file-list="pictorialIcon"
-                        :on-exceeded-size="(e)=>handleMaxSize(e,2)"
-                        :on-success="uploadSuccess"
-                        :format="['jpg','jpeg','png']"
-                        :max-size="2048"
-                        :data="localUpload"
-                        :action=" actionUrlPre + '/jmreport/upload' "
-                        style="display: inline-block;width:58px;">
-                    <div class="pictorial-icon-upload">
-                        <img style="width: 36px;height:36px" ref="symbol" :src="getPathBySymbol()"/>
-                        <div class="cover">
-                            <Icon type="ios-create-outline"/>
-                        </div>
-                    </div>
-                </Upload>
-            </Row>
-            <Row class="ivurow" >
-                <p>图标大小&nbsp;&nbsp;</p>
-                <i-input size="small" v-model="pictorialOptions.symbolSize" @on-blur="onPictorialChange" class="iSelect"></i-input>
-            </Row>
-            <Row class="ivurow">
-                <p>图标间距&nbsp;&nbsp;</p>
-                <i-input  type="number" size="small" :value="util.getNumberFromPercent(pictorialOptions.symbolMargin,'!')" @on-blur="(e)=>onPercentChange(e.target.value, 'pictorialOptions.symbolMargin','onPictorialChange','!')" class="iSelect"> <span slot="append">%</span></i-input>
-            </Row>
-
-            <Row class="ivurow" >
-                <p>最大值&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-                <i-input size="small" v-model="pictorialOptions.symbolBoundingData" @on-blur="onPictorialChange" class="iSelect"></i-input>
-            </Row>
-
-            <Row class="ivurow">
-                <p>是否补全&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 119px;" v-model="pictorialOptions.double" @on-change="onPictorialChange"/>
-            </Row>
-            <Row class="ivurow" v-if="pictorialOptions.double">
-                <p>透明度&nbsp;&nbsp;</p>
-                <slider max="1" step="0.1" v-model="pictorialOptions.secondOpacity" @on-change="onPictorialChange" style="margin-top: -9px;width: 110px;margin-left: 5px;" ></slider>
-            </Row>
-        </div>
-    </Submenu>
-</script>
-<script>
-    Vue.component('j-pictorial-setting', {
-        template: '#pictorial-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            },
-            isMultiChart: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                //象形图 图标配置
-                pictorialIcon:[{'name': 'pictorialIcon','url': '' }],
-                actionUrlPre: baseFull,
-                pictorialOptions: {
-
-                },
-                localUpload:{
-                    bizType: 'local'
-                },
-               uploadHeaders:{}
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.pictorialOptions = Object.assign(this.pictorialOptions, this.settings)
-                }
-                this.uploadHeaders = vm.uploadHeaders
-            },
-            getPathBySymbol(){
-                let symbol = this.pictorialOptions['symbol']
-                if(!symbol){
-                    let path =  baseFull+'/jmreport/desreport_/chartsImg/pictorialIcon/spirits.png'
-                    return path;
-                }else{
-                    return symbol.replace('image://','')
-                }
-            },
-            //图片上传文件大小
-            handleMaxSize (file,size) {
-                // console.log("file===>",file)
-                // console.log("size===>",size)
-                this.$Notice.warning({
-                    title: '超出文件大小限制',
-                    desc: '文件  ' + file.name + ' 太大，请上传'+size+'M以内图片',
-                    duration: 6
-                });
-            },
-            //slider 百分数改变事件
-            onPercentChange(value, key, eventName,suffix=''){
-                let arr = key.split('.')
-                if(arr.length>1){
-                    let temp = this
-                    for(let i=0;i<arr.length-1;i++){
-                        temp = temp[arr[i]]
-                    }
-                    temp[arr[arr.length-1]] = value+'%'+suffix
-                }else{
-                    this[key] = value+'%'+suffix
-                }
-                //this[eventName]();
-                this.onPictorialChange();
-            },
-            uploadSuccess(res){
-                this.$emit('upload-success',res, (symbol)=>{
-                    this.pictorialOptions['symbol'] = symbol
-                    this.$forceUpdate(()=>{
-                        this.getPathBySymbol();
-                    })
-                })
-            },
-            onPictorialChange(){
-                this.$emit('change', this.pictorialOptions)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl
deleted file mode 100644
index 4e8edb52d..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl
+++ /dev/null
@@ -1,91 +0,0 @@
-<script type="text/x-template" id="pie-setting-template">
-        <Submenu  name="4" style="border-bottom: inset 1px;" class="rightFontSize">
-            <template slot="title">
-                <span>饼图设置</span>
-            </template>
-            <div class="blockDiv" style="padding-bottom: 10px">
-                <Row class="ivurow">
-                    <p>环形饼图&nbsp;&nbsp;</p>
-                    <i-switch size="small" style="margin-left: 117px;" v-model="pieOption.isRadius" @on-change="pieTypeChange"/>
-                </Row>
-                <Row class="ivurow">
-                    <p>南丁格尔玫瑰&nbsp;&nbsp;</p>
-                    <i-switch size="small" style="margin-left: 93px;" v-model="pieOption.isRose" @on-change="pieTypeChange('1')"/>
-                </Row>
-                <template v-if="pieOption.isRadius">
-                    <Row class="ivurow" >
-                        <p>饼块半径&nbsp;&nbsp;</p>
-                        <i-input size="small" v-model="pieOption.radius[1]" @on-blur="onPieChange" class="iSelect"></i-input>
-                    </Row>
-                    <Row class="ivurow">
-                        <p>内环半径&nbsp;&nbsp;</p>
-                        <i-input size="small" v-model="pieOption.radius[0]" @on-blur="onPieChange" class="iSelect"></i-input>
-                    </Row>
-                </template>
-                <Row class="ivurow" v-else>
-                    <p>饼块半径&nbsp;&nbsp;</p>
-                    <i-input size="small" v-model="pieOption.radius" @on-blur="onPieChange" class="iSelect"></i-input>
-                </Row>
-
-                <Row class="ivurow">
-                    <span>最小角度&nbsp;&nbsp;</span>
-                    <i-input size="small" type="number" v-model="pieOption.minAngle" @on-blur="onPieChange" class="iSelect"></i-input>
-                </Row>
-            </div>
-        </Submenu>
-</script>
-<script>
-    Vue.component('j-pie-setting', {
-        template: '#pie-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                pieOption: {
-                    "isRadius":false,
-                    "isRose":true,
-                    "radius": "55%",
-                    "roseType": "radius",
-                    "minAngle":  0
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            formatTop(val){
-                return val + 'px';
-            },
-            initData: function (){
-                if (this.settings){
-                    this.pieOption = Object.assign(this.pieOption, this.settings)
-                }
-            },
-            pieTypeChange(type){
-                if(type==='1'){
-                    this.pieOption.roseType=this.pieOption.isRose?'radius':'';
-                }else{
-                    this.pieOption.radius=this.pieOption.isRadius?typeJudge(this.pieOption.radius,'Array')?this.pieOption.radius :["45%",this.pieOption.radius]:typeJudge(this.pieOption.radius,'Array')?this.pieOption.radius[1] : this.pieOption.radius;
-                }
-                this.onPieChange();
-
-            },
-            onPieChange(){
-                this.$emit('change',this.pieOption)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl
deleted file mode 100644
index c31b9e1d4..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl
+++ /dev/null
@@ -1,312 +0,0 @@
-<script type="text/x-template" id="primary-sub-report-template">
-  <Modal
-          :title="title"
-          v-model="subReportShow"
-          width="600px"
-          :closable="false"
-  >
-    <div slot="footer">
-      <i-button @click="hyperlinksCancel('linkData')">取消</i-button>
-      <i-button type="primary" @click="hyperlinksOk('linkData')">确定</i-button>
-    </div>
-    <i-form ref="linkData" :model="linkData" :label-width="100" :rules="linkDataRule">
-      <form-item label="名称" prop="linkName">
-        <i-input placeholder="请填写名称" v-model="linkData.linkName"></i-input>
-      </form-item>
-      <form-item label="主表数据源" prop="mainReport">
-        <i-select :transfer="true" clearable v-model="linkData.mainReport" @on-change="mainReportChange">
-          <i-option v-for="item in mainReportData" :value="item.dbCode">{{item.dbChName}}</i-option>
-        </i-select>
-      </form-item>
-      <form-item label="子表数据源" prop="subReport">
-        <i-select :transfer="true" clearable v-model="linkData.subReport" @on-change="subReportChange">
-          <i-option v-for="item in subReportData" :value="item.dbCode">{{item.dbChName}}</i-option>
-        </i-select>
-      </form-item>
-      <span>参数传递</span>
-      <div style="margin-top: 10px">
-        <i-button type="primary" @click="addParamTable">新增</i-button>
-        <i-button type="primary" @click="removeParamTable" v-if="selectParamTables.length>0">删除</i-button>
-        <i-table style="margin-top: 10px" ref="paramTable" @on-select="selectParam" @on-select-all="selectParamAll"
-                 @on-select-all-cancel="cancelParamAll" @on-select-cancel="cancelParam" stripe
-                 :columns="hyperlinksData.columns" :data="hyperlinksData.data" :height="paramTableHeight"></i-table>
-      </div>
-    </i-form>
-  </Modal>
-</script>
-<script>
-  Vue.component('j-primary-sub-report', {
-    template: '#primary-sub-report-template',
-    props: {
-      excel: {
-        type: String,
-        required: true,
-        default: ""
-      }
-    },
-    data() {
-      return {
-        title: "",
-        subReportShow: false,
-        hyperlinksData: {
-          columns: [
-            {
-              type: 'selection',
-              width: 35,
-              align: 'center'
-            },
-            {
-              title: '子表参数',
-              key: 'subParam',
-              align: 'center',
-              render: (h, params) => {
-                if (this.subReportFiled) {
-                  return h('i-select', {
-                    props: {
-                      value: params.row.subParam,
-                      size: 'small',
-                      transfer: true,
-                      filterable: true,
-                      clearable:true
-                    },
-                    on: {
-                      'on-change': e => {
-                        // 改变下拉框赋值
-                        this.hyperlinksData.data[params.index].subParam = e
-                      }
-                    }
-                  }, this.subReportFiled.map((item) => {
-                    if (item) {
-                      if(!item.paramTxt){
-                         item.paramTxt = item.paramName
-                      }
-                      return h('i-option', {
-                        // 下拉框的值
-                        props: {
-                          value: item.paramName,
-                          label: item.paramTxt
-                        }
-                      })
-                    }
-                  }))
-                }
-              }
-            },
-            {
-              title: '主表字段',
-              key: 'mainField',
-              align: 'center',
-              render: (h, params) => {
-                if (this.mianReportFiled) {
-                  return h('i-select', {
-                    props: {
-                      value: params.row.mainField, // 获取选择的下拉框的值
-                      size: 'small',
-                      transfer: true,
-                      filterable: true,
-                      clearable:true
-                    },
-                    on: {
-                      'on-change': e => {
-                        // 改变下拉框赋值
-                        this.hyperlinksData.data[params.index].mainField = e
-                      }
-                    }
-                  }, this.mianReportFiled.map((item) => {
-                    return h('i-option', {
-                      // 下拉框的值
-                      props: {
-                        value: item.title,
-                        label: item.fieldText
-                      }
-                    })
-                  }))
-                }
-              }
-            },
-          ],
-          data: [],
-        },
-        selectParamTables: [],
-        paramTableHeight: 0,
-        linkData: {
-          id: "",
-          reportId: "",//积木设计器id
-          parameter: "",//参数JSON串
-          linkName: "",
-          mainReport: "",
-          subReport: ""
-        },
-        linkDataRule: {
-          linkName: [
-            {required: true, message: '请填写参数名称', trigger: 'change'},
-          ],
-          mainReport: [
-            {required: true, message: '请选择主表数据源', trigger: 'change'},
-          ],
-          subReport: [
-            {required: true, message: '请选择子表数据源', trigger: 'change'},
-          ]
-        },
-        mainReportData: [], //主报表数据集合
-        subReportData: [], //子报表数据集合
-        dbFiled: [], //字段的集合
-        dbParam: [], //参数的集合
-        mainReportFiled: [],//主报表的字段集合
-        subReportFiled: [],//子报表的字段集合
-        paramData:[]//父向子传递参数
-      }
-    },
-    watch: {
-      'paramData': function (val) {
-        //先清空数据
-        this.hyperlinksData.data = [];
-        for (const valElement of val) {
-            //为参数table添加数据
-            this.hyperlinksData.data.push(valElement)
-        }
-      }
-    },
-    methods: {
-      addParamTable() {
-        let indexArr = this.hyperlinksData.data.map(item => item.tableIndex);
-        if (indexArr.length == 0) {
-          indexArr = [0];
-        }
-        this.selectParamTables = [];
-        this.hyperlinksData.data = [...this.hyperlinksData.data, {
-          'mainField': "",
-          'subParam': "",
-          'tableIndex': Math.max(...indexArr) + 1
-        }];
-      },
-      removeParamTable() {
-        // this.deleteParamModel = true;
-        let tableIndexArr = this.selectParamTables.map(item => item.tableIndex);
-        this.hyperlinksData.data = this.hyperlinksData.data.filter(item => !tableIndexArr.includes(item.tableIndex));
-        this.selectParamTables = [];
-      },
-      selectParamAll() {
-        this.selectParamTables = this.hyperlinksData.data.map(item => {
-          return {"tableIndex": item.tableIndex, "id": item.id}
-        });
-      },
-      cancelParamAll() {
-        this.selectParamTables = [];
-      },
-      selectParam(selection, row) {
-        this.selectParamTables = [...this.selectParamTables, {"tableIndex": row.tableIndex, "id": row.id}];
-      },
-      cancelParam(selection, row) {
-        this.selectParamTables = this.selectParamTables.filter(item => item.tableIndex != row.tableIndex);
-      },
-      getReportByUser() {
-        $http.get({
-          url: api.getReportByUser,
-          data: {reportId: excel_config_id},
-          success: (result) => {
-            this.reportData = result
-          }
-        })
-      },
-      //网络报表点击事件
-      hyperlinksOk(name) {
-        this.$refs[name].validate((valid) => {
-          if (valid) {
-            let mainReport = this.linkData.mainReport
-            let subReport = this.linkData.subReport
-            let linkData = this.linkData
-            linkData.parameter = JSON.stringify({
-              "main": mainReport,
-              "sub": subReport,
-              "subReport": this.hyperlinksData.data
-            })
-            linkData.linkType = "4"
-            linkData.reportId = excel_config_id
-            $http.post({
-              url: api.linkSaveAndEdit,
-              contentType: 'json',
-              data: JSON.stringify(linkData),
-              success: (result) => {
-                this.close(name);
-              }
-            });
-          }
-        })
-
-      },
-      hyperlinksCancel(name) {
-        this.close(name);
-      },
-      close(name) {
-        this.subReportShow = false
-        this.mainReportData=[]
-        this.subReportData=[]
-        this.dbFiled=[]
-        this.dbParam=[]
-        this.mainReportFiled=[]
-        this.subReportFiled=[]
-        this.paramData=[]
-        this.title=""
-        this.selectParamTables=[]
-        this.linkData={}
-        this.$refs[name].resetFields();
-        this.$emit('mainsubreport')
-      },
-      //获取数据源的数据，用于主子表选择
-      getListReportDb(treeData,data) {
-        $http.get({
-          url: api.getListReportDb,
-          data: {"reportId": excel_config_id},
-          success: (res) => {
-            if (res) {
-              this.dbParam = res.reportDbParam
-              if(data){
-                //为主表数据源赋值
-                this.mainReportChange(data.main)
-                //为子表数据源赋值
-                this.subReportChange(data.sub)
-                this.linkData.mainReport = data.main
-                this.linkData.subReport = data.sub
-                //参数赋值
-                this.paramData = data.subReport
-              }
-            }
-          }
-        })
-        let map = new Map();
-        //获取treeData,并为字段，主表数据源，子表数据源赋值
-        for (const treeDatum of treeData) {
-          let tree = treeDatum[0]["children"];
-          let code = treeDatum[0]["code"];
-          let title = treeDatum[0]["title"];
-          if(!title){
-            title = code
-          }
-          map.set(code,tree);
-          this.dbFiled.push({"code":code,"list":tree});
-          this.mainReportData.push({"dbCode":code,"dbChName":title})
-          this.subReportData.push({"dbCode":code,"dbChName":title})
-        }
-      },
-      //主报表值改变事件
-      mainReportChange(val) {
-        let dbFiled = this.dbFiled;
-        //判断当前主表数据源的code,并为参数中主表字段赋值
-        dbFiled=dbFiled.filter(item=>item.code == val)
-        if(dbFiled){
-          this.mianReportFiled = dbFiled[0]?dbFiled[0].list:[];
-        }
-      },
-      //子报表值改变事件
-      subReportChange(val) {
-        this.subReportFiled = this.dbParam[val]
-      }
-    },
-  })
-</script>
-<style>
-    .ivu-form-item-error-tip {
-        position: relative;
-    }
-</style>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl
deleted file mode 100644
index f765642ed..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl
+++ /dev/null
@@ -1,349 +0,0 @@
-<script type="text/x-template" id="print-setting-template">
-    <div>
-        <Modal :loading="true" v-model="show" :width="500" @on-ok="onPrintSettingSave" @on-cancel="onPrintSettingCancel" class="print-setting expression">
-            <p slot="header">
-            <span>打印设置
-               <Tooltip :transfer="true" content="打印文档" placement="top">
-                  <a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/print.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-               </Tooltip>
-            </span>
-            </p>
-            <i-form label-colon :label-width="90">
-                <Row>
-                    <i-col span="6">
-                        <span>打印纸张：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <i-select v-model="paper" @on-change="onPaperChange">
-                            <i-option v-for="(item, index) in paperList" :index="index" :value="item.paper">
-                                {{ getPaperText(item) }}
-                            </i-option>
-                        </i-select>
-                    </i-col>
-                </Row>
-
-                <Row style="margin-top: 8px">
-                    <i-col span="6">
-                        <span>打印布局：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <RadioGroup v-model="layout" @on-change="onLayoutChange">
-                            <Radio label="portrait" border>
-                                <span>纵向</span>
-                            </Radio>
-                            <Radio label="landscape" border>
-                                <span>横向</span>
-                            </Radio>
-                        </RadioGroup>
-                    </i-col>
-                </Row>
-
-                <Row style="margin-top: 8px">
-                    <i-col span="6">
-                        <span>打印边距(mm)：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <i-input type="number" v-model="marginX" style="width: 40%" @on-change="onPaperMarginXChange"></i-input>
-                        -
-                        <i-input type="number" v-model="marginY" style="width: 40%" @on-change="onPaperMarginYChange"></i-input>
-                    </i-col>
-                </Row>
-
-
-                <Row style="margin-top: 8px">
-                    <i-col span="6">
-                        <span>像素宽高(px)：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <i-input v-model="pxWidth" readonly style="width: 40%"></i-input>
-                        -
-                        <i-input v-model="pxHeight" readonly style="width: 40%"></i-input>
-                    </i-col>
-                </Row>
-
-                <Row style="margin-top: 8px">
-                    <i-col span="6">
-                        <span>打印清晰度：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <slider :min="1" :max="10" v-model="definition"></slider>
-                    </i-col>
-                </Row>
-
-                <Row style="margin-top: 8px">
-                    <i-col span="6">
-                        <span>回调接口：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <i-input v-model="printCallBackUrl" style="width: 100%"></i-input>
-                    </i-col>
-                </Row>
-
-                <Row style="margin-top: 8px">
-                    <i-col span="6">
-                        <span>显示页码：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <i-switch v-model="paginationShow"></i-switch>
-                    </i-col>
-                </Row>
-
-                <Row style="margin-top: 8px" v-if="paginationShow">
-                    <i-col span="6">
-                        <span>页码位置：</span>
-                    </i-col>
-                    <i-col span="18">
-                        <RadioGroup v-model="paginationLocation">
-                            <Radio label="left" border>
-                                <span>左</span>
-                            </Radio>
-                            <Radio label="middle" border>
-                                <span>中</span>
-                            </Radio>
-                            <Radio label="right" border>
-                                <span>右</span>
-                            </Radio>
-                        </RadioGroup>
-                    </i-col>
-                </Row>
-
-            </i-form>
-        </Modal>
-    </div>
-</script>
-<script>
-    const papers = [
-        {paper: 'A4', width: 210, height: 297},
-        {paper: 'A3', width: 297, height: 420},
-        {paper: 'Letter', width: 216, height: 279},
-        {paper: 'Legal', width: 216, height: 355},
-        {paper: 'Executive', width: 184, height: 266}
-    ]
-    Vue.component('j-print-setting', {
-        template: '#print-setting-template',
-        props: {
-            show:{
-                type: Boolean,
-                required: false,
-                default: false
-            },
-            config: {
-                type: String,
-                required: false,
-                default:()=>{}
-            },
-            settings: {
-                type: Object,
-                required: true,
-                default:()=>{}
-            }
-        },
-        data(){
-            return {
-                paperList: [],
-                //纸张标识
-                paper: '',
-                // 纸张宽高
-                width: '',
-                height: '',
-                //清晰度
-                definition: '',
-                //是否套打
-                isBackend: '',
-                dpi:'',
-                pxWidth: '',
-                pxHeight: '',
-                marginX: 10,
-                marginY: 10,
-                layout: 'portrait',
-                paginationShow: true,
-                paginationLocation: 'middle',
-            }
-        },
-        created(){
-            this.initPaperList()
-            this.getWindowDpi()
-        },
-        watch:{
-            config:{
-                immediate: true,
-                handler: function(){
-                    this.initPaperList()
-                }
-            },
-            settings:{
-                deep: true,
-                immediate: true,
-                handler: function(){
-                    this.resetForm(this.settings)
-                }
-            }
-        },
-        methods:{
-            onPrintSettingSave(){
-               // console.log('this.getEmitParam()', this.getEmitParam())
-                this.$emit('change', this.getEmitParam())
-            },
-            onPrintSettingCancel(){
-                this.$emit('change', false)
-            },
-            // 获取回传的参数
-            getEmitParam(){
-              return {
-                  paper: this.paper,
-                  width: this.width,
-                  height: this.height,
-                  definition: this.definition,
-                  isBackend: this.isBackend,
-                  marginX: this.marginX || 0,
-                  marginY: this.marginY || 0,
-                  layout: this.layout,
-                  printCallBackUrl: this.printCallBackUrl,
-                  paginationShow: this.paginationShow,
-                  paginationLocation: this.paginationLocation,
-              }
-            },
-            // 纸张大小改变事件
-            onPaperChange(value){
-                let arr = this.paperList.filter(item=>{
-                    return item.paper === value
-                })
-                this.resetForm(arr[0])
-            },
-            onPaperMarginYChange(event){
-                let temp = parseInt(event.target.value || 0)
-                if(temp<0){
-                    temp = 0
-                }
-                this.marginY = temp
-                if(this.layout == 'portrait'){
-                    this.pxHeight = this.getPxHeight(this.height)+'px'
-                }else{
-                    this.pxWidth = this.getPxHeight(this.height)+'px'
-                }
-            },
-            onPaperMarginXChange(event){
-                let temp = parseInt(event.target.value || 0)
-                if(temp<0){
-                    temp = 0
-                }
-                this.marginX = temp
-                if(this.layout == 'portrait'){
-                    this.pxWidth = this.getPxWidth(this.width)+'px'
-                }else{
-                    this.pxHeight = this.getPxWidth(this.width)+'px'
-                }
-            },
-            getPaperText(item){
-              return item.paper+'：'+item.width+'mm x '+item.height+'mm'
-            },
-            initPaperList(){
-                let printPaper = []
-                if(this.config){
-                    let config2 = JSON.parse(this.config)
-                    if(config2 && config2['printPaper']){
-                        printPaper = config2['printPaper']
-                    }
-                }
-                let arr = []
-                for(let item of papers){
-                    arr.push(item)
-                }
-                for(let item of printPaper){
-                    arr.push({
-                        paper: item.title, width: item['size'][0], height: item['size'][1]
-                    })
-                }
-                this.paperList = [...arr]
-            },
-            resetForm: function (param) {
-                if(param){
-                    this.paper = param.paper
-                    this.width = param.width
-                    this.height = param.height
-                    if(param.marginX || param.marginX==0){
-                        this.marginX = param.marginX
-                    }
-                    if(param.marginY || param.marginY==0){
-                        this.marginY = param.marginY
-                    }
-                    if(param.layout){
-                        this.layout = param.layout
-                    }
-                    this.resetPrintPx();
-                    if(param.definition){
-                        this.definition = param.definition
-                    }
-                    if(param.isBackend===true || param.isBackend===false){
-                        this.isBackend = param.isBackend
-                    }
-                    this.printCallBackUrl = param.printCallBackUrl || ''
-                    this.paginationShow = param.paginationShow || false
-                    if(param.paginationLocation){
-                        this.paginationLocation = param.paginationLocation
-                    }
-                }
-            },
-            // 重置宽高px的值
-            resetPrintPx(){
-                let pxWidth = this.getPxWidth(this.width)+'px'
-                let pxHeight = this.getPxHeight(this.height)+'px'
-                if(this.layout == 'portrait'){
-                    this.pxWidth = pxWidth
-                    this.pxHeight = pxHeight
-                }else{
-                    this.pxWidth = pxHeight
-                    this.pxHeight = pxWidth
-                }
-            },
-            //获取窗口dpi
-            getWindowDpi(){
-                //25.41 1英寸=25.41mm 96是window默认dpi,mac:72
-                let arrDPI = new Array();
-                if ( window.screen.deviceXDPI != undefined ) {
-                    arrDPI[0] = window.screen.deviceXDPI;
-                    arrDPI[1] = window.screen.deviceYDPI;
-                }
-                else {
-                    let tmpNode = document.createElement( "DIV" );
-                    tmpNode.style.cssText = "width:1in;height:1in;position:absolute;left:0px;top:0px;z-index:99;visibility:hidden";
-                    document.body.appendChild( tmpNode );
-                    arrDPI[0] = parseInt( tmpNode.offsetWidth );
-                    arrDPI[1] = parseInt( tmpNode.offsetHeight );
-                    tmpNode.parentNode.removeChild( tmpNode );
-                }
-                this.dpi = [...arrDPI]
-            },
-            //获取像素宽
-            getPxWidth(width){
-                let margin = this.marginX
-                if(this.isBackend==true){
-                    margin = 0
-                }
-                return Math.ceil((width - margin*2)/25.41 * this.dpi[0]);
-            },
-            //获取像素高
-            getPxHeight(height){
-                let margin = this.marginY
-                if(this.isBackend==true){
-                    margin = 0
-                }
-                return Math.ceil((height-margin*2)/25.41 * this.dpi[1]);
-            },
-            // 布局改变
-            onLayoutChange(value){
-                this.layout = value
-                this.resetPrintPx();
-            }
-
-
-        }
-    })
-</script>
-<style>
-    .print-setting .ivu-col-span-6>span{
-        display: inline-block;
-        height: 32px;
-        line-height: 32px;
-    }
-</style>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl
deleted file mode 100644
index e13a7a911..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl
+++ /dev/null
@@ -1,88 +0,0 @@
-<#--width: 150,
-height: 150, // 高度
-text: this.qrcode // 二维码内容
-// render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
-// background: '#f0f'
-// foreground: '#ff0'-->
-<script type="text/x-template" id="qrcode-setting-template">
-    <div style="height:auto;overflow: hidden;padding-bottom: 300px;padding-top: 10px;padding-left: 7px">
-        <i-form class="jm-form-barcode dataSourceForm rightFontSize">
-            <form-item label="二维码内容">
-                <i-input v-model="text" type="textarea" :rows="2" @on-blur="onCodeChange" style="width: 99%"></i-input>
-            </form-item>
-
-            <form-item label="宽度">
-                <i-input v-model="width" placeholder="请输入宽度" :min="1" type="number" @on-blur="onCodeChange" style="width: 99%"></i-input>
-            </form-item>
-
-            <form-item label="高度">
-                <i-input v-model="height" placeholder="请输入高度" :min="1" type="number" @on-blur="onCodeChange" style="width: 99%"></i-input>
-            </form-item>
-
-            <form-item label="前景色" class="colorHeight">
-                <i-input v-model="colorDark" size="small" style="width: 111px;" @on-change="onCodeChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker colorHeight" v-model="colorDark" :editable="false"  :transfer="true" size="small" @on-change="onCodeChange"/>
-                    </span>
-                </i-input>
-            </form-item>
-
-            <form-item label="背景色" class="colorHeight">
-                <i-input v-model="colorLight" size="small" style="width: 111px;" @on-change="onCodeChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="colorLight" :editable="false"  :transfer="true" size="small" @on-change="onCodeChange"/>
-                    </span>
-                </i-input>
-            </form-item>
-        </i-form>
-    </div>
-</script>
-<script>
-    Vue.component('j-qrcode-setting', {
-        template: '#qrcode-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default:()=>{}
-            }
-        },
-        data(){
-            return {
-                text: '',
-                width:'',
-                height:'',
-                colorLight: '#fff',
-                colorDark: '#000'
-            }
-        },
-        watch:{
-            settings:{
-                deep: true,
-                immediate: true,
-                handler: function(){
-                    this.resetForm()
-                }
-            }
-        },
-        methods:{
-            resetForm: function () {
-                if(this.settings){
-                    Object.keys(this.settings).map(k=>{
-                        this[k] = this.settings[k]
-                    })
-                }
-            },
-            onCodeChange(){
-                let obj = {}
-                Object.keys(this.settings).map(k=>{
-                    obj[k] = this[k]
-                })
-                //清除颜色后恢复默认
-                obj.colorLight=this.colorLight?obj.colorLight:'#ffffff'
-                obj.colorDark=this.colorDark?this.colorDark:'#000000'
-                this.$emit('change', obj)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl
deleted file mode 100644
index 0483373e9..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl
+++ /dev/null
@@ -1,73 +0,0 @@
-<script type="text/x-template" id="radar-setting-template">
-    <Submenu  name="10" style="border-bottom: inset 1px;" class="rightFontSize">
-        <template slot="title">
-            <span>雷达图设置</span>
-        </template>
-        <div class="blockDiv" >
-            <Row class="ivurow" v-for="(item,index) in radarOption[0].indicator" :key="index">
-                <Tooltip :content="item.name" placement="bottom">
-                    <p>{{item.name.substr(0,2)}}..最大值&nbsp;&nbsp;</p>
-                </Tooltip>
-                <i-input size="small" type="number" v-model="item.max" @on-blur="onRadarChange" style="width: 126px;"></i-input>
-            </Row>
-            <Row class="ivurow">
-                <p>字体大小&nbsp;&nbsp;</p>
-                <i-input size="small" type="number" v-model="radarOption[0].name_textStyle_fontSize" @on-blur="onRadarChange" class="iSelect"></i-input>
-            </Row>
-            <Row class="ivurow" v-if="typeof radarOption[0].name_textStyle_color!== 'undefined'">
-                <p>字体颜色&nbsp;&nbsp;</p>
-                <i-input v-model="radarOption[0].name_textStyle_color" size="small" class="iSelect" @on-change="onRadarChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="radarOption[0].name_textStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onRadarChange"/>
-                    </span>
-                </i-input>
-            </Row>
-
-            <Row class="ivurow" v-if="typeof radarOption[0].axisLine_lineStyle_color!== 'undefined'">
-                <p>轴线颜色&nbsp;&nbsp;</p>
-                <i-input v-model="radarOption[0].axisLine_lineStyle_color" size="small" class="iSelect" @on-change="onRadarChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="radarOption[0].axisLine_lineStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onRadarChange"/>
-                    </span>
-                </i-input>
-            </Row>
-        </div>
-    </Submenu>
-</script>
-<script>
-    Vue.component('j-radar-setting', {
-        template: '#radar-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                radarOption: []
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.radarOption = Object.assign(this.radarOption, this.settings)
-                }
-            },
-            onRadarChange(){
-                this.$emit('change','radar',this.radarOption)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl
deleted file mode 100644
index 46536e5d3..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl
+++ /dev/null
@@ -1,68 +0,0 @@
-<script type="text/x-template" id="scatter-setting-template">
-    <div >
-        <Submenu  name="9" style="border-bottom: inset 1px;" class="rightFontSize">
-            <template slot="title">
-                <span>散点设置</span>
-            </template>
-            <div class="blockDiv" style="padding-bottom: 10px">
-                <Row class="ivurow">
-                    <p>大小&nbsp;&nbsp;</p>
-                    <slider v-model="scatterOption.symbolSize" @on-change="onScatterChange" style="margin-top: -9px;width: 160px;margin-left: 5px;"></slider>
-                </Row>
-                <Row class="ivurow" v-if="typeof scatterOption.itemStyle_color !== 'undefined'">
-                    <p>颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="scatterOption.itemStyle_color" size="small" style="width: 165px;" @on-change="onScatterChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="scatterOption.itemStyle_color" :editable="false" alpha  :transfer="true" size="small" @on-change="onScatterChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow" style="z-index:9999">
-                    <p style="margin-bottom: 10px;">透明度&nbsp;&nbsp;</p>
-                    <slider max="1" step="0.1" v-model="scatterOption.itemStyle_opacity" @on-change="onScatterChange" style="margin-top: -9px;width: 148px;margin-left: 5px;" ></slider>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-scatter-setting', {
-        template: '#scatter-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                scatterOption: {
-                    itemStyle_color:"#C23531"
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.scatterOption = Object.assign(this.scatterOption, this.settings)
-                }
-            },
-            onScatterChange(){
-                this.$emit('change',this.scatterOption)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl
deleted file mode 100644
index f383833af..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl
+++ /dev/null
@@ -1,105 +0,0 @@
-<!-- 下拉输入框 支持下拉框、输入框切换 -->
-<style>
-    .jimu-cust-component .ivu-input-group{
-        top: 0;
-    }
-</style>
-<script type="text/x-template" id="select-input-template">
-<div class="jimu-cust-component">
-    <i-select v-if="selectFlag" filterable size="small" :value="selectedValue" :transfer="true" :clearable="true" @on-change="selectChange">
-        <i-option v-for="(item, index) in selectOptions" :value="item.value" :key="index">{{ item.title }}</i-option>
-    </i-select>
-    <i-input v-else size="small" v-model="inputValue" @on-change="inputChange" placeholder="请输入自定义表达式">
-        <i-button size="small" slot="append" icon="arrow-return-left" @click="backSelect">返回下拉框</i-button>
-    </i-input>
-</div>
-</script>
-<script>
-    Vue.component('j-select-input', {
-        template: '#select-input-template',
-        props: {
-            options: {
-                type: Object,
-                required: false,
-                default:()=>{}
-            },
-            value:{
-                type: String,
-                required: false,
-                default: ''
-            }
-        },
-        data(){
-            return {
-                selectFlag: true,
-                selectedValue: '',
-                inputValue: '',
-                selectOptions: []
-            }
-        },
-        watch:{
-            options:{
-                deep: true,
-                immediate: true,
-                handler: function(){
-                    this.resetOptions()
-                }
-            },
-            value:{
-                immediate: true,
-                handler: function(){
-                    if(!this.value){
-                        this.selectFlag = true
-                        this.selectedValue = ''
-                        this.inputValue = ''
-                    }else{
-                        if(this.value.startsWith('=')){
-                            this.selectFlag = false
-                            this.selectedValue = ''
-                            this.inputValue = this.value
-                        }else{
-                            this.selectFlag = true
-                            this.selectedValue = this.value
-                            this.inputValue = ''
-                        }
-                    }
-                }
-            }
-        },
-        methods:{
-            // 清空
-            resetOptions(){
-                let arr = []
-                for(let item of this.options){
-                    arr.push({
-                        title: item.title,
-                        value: item.value
-                    })
-                }
-                arr.push({
-                    title: '自定义表达式',
-                    value: '-1'
-                })
-                this.selectOptions = [...arr]
-            },
-            inputChange(e){
-                this.$emit('on-change', e.target.value)
-            },
-            selectChange(value){
-                if(value == -1){
-                    this.selectFlag = false
-                    this.selectedValue = ''
-                    this.inputValue = ''
-                }else{
-                    this.selectedValue = value
-                    this.$emit('on-change', this.selectedValue)
-                }
-            },
-            backSelect(){
-                this.selectFlag = true
-            }
-
-
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl
deleted file mode 100644
index 526ef6dd3..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl
+++ /dev/null
@@ -1,496 +0,0 @@
-<#--多选组件，用于远程搜索查询
-item:传递的参数，包含字典code，查询key
-value:view组件传递的值 v-model
-index:下标-->
-<script type="text/x-template" id="select-scroll-multiple-template">
-    <div :id="'click'+index">
-        <div class="ivu-select ivu-select-multiple ivu-select-small" style="width: 100%">
-            <div class="ivu-select-selection" @click="handleClick">
-                <span class="select-dict-text" v-if="dictText!=''">{{dictText}}</span>
-                <span v-else  class="ivu-select-input" style="color: rgb(197,201,203)">{{'请选择'+dataList.title}}</span>
-            </div>
-          <i class="ivu-icon ivu-icon-md-close ivu-select-arrow" @click="handleIconClick"></i>
-        </div>
-        <div class="scroll-class" v-if="scrollShow">
-            <Scroll :class="noData == true?'no-loading':''" :height="dictHeight" :on-reach-bottom="handleReachBottom"
-                    :distance-to-edge="1">
-              <input v-model="searchText" type="text" placeholder="请输入查询条件" class="ivu-select-input bottom-border" />
-              <ul v-for="(item,index) in dictList" :key="index" @mousedown="scrollListClick(item,index)"
-                    class="scroll-list-class">
-                    <li :class="item.active == true?'select-item-selected':''"><span>{{ item.text }}</span></li>
-                </ul>
-                <ul class="no-more-data" v-if="noData">
-                    <li style="font-size: 12px;text-align: center;margin-top:5px">暂无更多数据</li>
-                </ul>
-            </Scroll>
-        </div>
-    </div>
-</script>
-<script>
-  Vue.component('j-select-scroll-multiple', {
-    template: '#select-scroll-multiple-template',
-    props: {
-      item: {
-        type: Object,
-        default: () => []
-      },
-      value: {
-        type: String,
-        default: () => ""
-      },
-      index: {
-        type: Number
-      }
-    },
-    data() {
-      return {
-        // 表格高度
-        dictHeight: 200,
-        // 数据总数
-        tableCount: 0,
-        //下拉框数据
-        dataList: {},
-        dictList: [],
-        //字典文本
-        dictText: "",
-        // 是否加载中
-        tableLoading: false,
-        //滚动组件是否显示
-        scrollShow: false,
-        userpage: 1,
-        noData: false,
-        //初始字典text
-        initText:"",
-        //是否初始值
-        initValue:true,
-        //复制一份字典集合
-        copyDictList:[],
-        //搜索的文本
-        searchText:"",
-        //字典值
-        dictValue:""
-      }
-    },
-    create() {
-
-    },
-    watch: {
-      item: {
-        deep: true,
-        immediate: true,
-        handler: function () {
-          this.dictData();
-        }
-      },
-      value: {
-        immediate: true,
-        handler: function () {
-          this.setDictText();
-        }
-      },
-      searchText(){
-        this.handleOnChange();
-      }
-    },
-    mounted() {
-      //页面初始化监听click事件
-      document.addEventListener("click", e => {
-        this.closeScroll(e);
-      });
-    },
-    beforeDestroy() {
-      //页面销毁移除监听事件
-      document.removeEventListener("click", this.closeScroll);
-    },
-    methods: {
-      /**
-       * 关闭滚动弹窗
-       */
-      closeScroll(e) {
-        let self = this;
-        let click = document.getElementById("click"+this.index);
-        if (click && !click.contains(e.target)) {
-          if (self.scrollShow == true){
-             self.scrollShow = false;
-          }
-        }
-      },
-      /**
-       * 获取字典数据
-       */
-      dictData() {
-        if (this.item) {
-          this.dataList = JSON.parse(this.item)
-          if (this.dataList) {
-            this.dictList = this.dataList.dictList
-            this.copyDictList = this.dataList.dictList
-            //目前只有不勾选复选框并且不是select的时候才会分页，api和普通的字典不用去后台查数据
-            if(this.dataList.dictCode && this.dataList.dictCode.indexOf("select") ==-1 || this.dataList.dictList.length<7) {
-              this.noData = true
-            }
-          }
-          this.dictHeight = this.dictList.length>6?200:this.dictList.length*32+82
-        }
-      },
-      /**
-       *为字典值赋值
-       */
-      setDictText() {
-        if (this.value.length == 0) {
-          this.dictText = "";
-          this.searchText = ""
-          //重置选中事件
-          this.restActive();
-        }else{
-          this.loopData(this.dictList);
-        }
-      },
-      /**
-       *赋值字典集合及是否选中
-       * @param dictList 字典集合
-       */
-      loopData(dictList){
-        //初始化的时候才赋默认值
-        let dictText = this.dictText
-        let values = this.value
-        for (let i = 0; i <dictList.length ; i++) {
-          let value = dictList[i].value;
-          if(values.indexOf(value)!=-1){
-            //字典文本不为空，得判断时候包含此文本
-            if(dictText && dictText.indexOf(dictText) != 0){
-               dictText = dictText +  dictList[i].text +","
-            }
-            //字典文本是空，直接相等即可
-            if(!dictText){
-              dictText = dictList[i].text;
-            }
-            dictList[i].active = true
-          }
-        }
-        if(dictText && dictText.charAt(dictText.length-1) == ","){
-          dictText = dictText.substring(0,dictText.length-1)
-        }
-        this.dictText = dictText
-        this.dictList = dictList
-      },
-      /**
-       * 重置选中状态
-       */
-      restActive(){
-        let dictList = this.dictList
-        for (let i = 0; i <dictList.length ; i++) {
-          if(dictList[i].active){
-            dictList[i].active = false
-          }
-        }
-      },
-      /**
-       * 列表点击事件
-       * @param val 字典对象（value,text）
-       * @param index 当前循环的到第几个
-       */
-      scrollListClick(val,index) {
-        if(this.dictText){
-          let dictTextArray = this.dictText.split(",");
-          let dictValueArray = this.value
-          //是否是已删除的
-          let remove = false
-          for (let i = 0; i < dictTextArray.length; i++) {
-            if(dictTextArray[i]==val.text){
-              dictTextArray.splice(i,1)
-              dictValueArray.splice(i,1)
-              remove =true
-            }
-          }
-          if(!remove){
-            dictTextArray.push(val.text)
-            dictValueArray.push(val.value)
-          }
-          if(dictTextArray.length>0){
-            this.dictText = dictTextArray.toString()
-            this.value = dictValueArray
-          }else{
-            this.dictText = ""
-            this.value = []
-          }
-        }else{
-          this.dictText = val.text
-          let valueArray = [];
-          valueArray.push(val.value)
-          this.value =valueArray
-        }
-        this.scollShow = true;
-        let active = this.dictList[index].active;
-        this.dictList[index].active = !active;
-        //返回值
-        this.returnDictValue(val.value);
-      },
-      /**
-       *输入框点击事件
-       */
-      handleClick() {
-        this.scrollShow = !this.scrollShow;
-      },
-      /**
-       *滚动条无限加载
-       */
-      handleReachBottom() {
-        if (!this.noData) {
-          return new Promise(resolve => {
-            if (this.noData) {
-              resolve();
-            }
-            this.userpage = this.userpage + 1;
-            setTimeout(() => {
-              if(!this.dataList.dictCode || this.dataList.dictCode.indexOf("select") !=-1) {
-                 this.getDictData(0);
-              }else{
-                //前台进行搜索
-                if(this.dictText){
-                  this.searchDictByText();
-                }else{
-                  this.dictList = this.copyDictList
-                }
-              }
-              resolve();
-            }, 500);
-          });
-        }
-      },
-      /**
-       *值发生改变请求后台
-       */
-      handleOnChange() {
-        this.userpage = 1;
-        this.scrollShow = true
-        //字典为空或者包含select语句才会后台搜索，否则直接在前台搜索
-        if(!this.dataList.dictCode || this.dataList.dictCode.indexOf("select") !=-1) {
-          //后台进行搜索
-          this.getDictData(1);
-        }else{
-          //前台进行搜索
-          //update-begin---author:wangshuai ---date:20221117  for：[issues/1316]查询栏 下拉多选搜索无效------------
-          if(this.searchText){
-          //update-end---author:wangshuai ---date:20221117  for：[issues/1316]查询栏 下拉多选搜索无效--------------
-            this.searchDictByText();
-          }else{
-            this.dictList = this.copyDictList
-          }
-          this.dictHeight = this.dictList.length>6?200:this.dictList.length*32+82
-        }
-      },
-      /**
-       * 查询字典数据
-       * @param type 字典值需要拼接还是直接替换 0拼接 1 替换
-       */
-      getDictData(type) {
-        let paramSearch = this.dataList.paramSearch
-        let dbKey = this.dataList.dbCode + "__" + this.dataList.name
-        let params = getRequestUrlParam();
-        let dataStr = {
-          "reportId": configId,
-          "text": this.searchText,
-          "key": dbKey,
-          "paramSearch": paramSearch,
-          "params": params,
-          "pageNo": this.userpage
-        }
-        $http.get({
-          url: api.dictCodeSearch,
-          data: dataStr,
-          success: (res) => {
-            if (res && res.length > 0) {
-              let dictList = this.dictList;
-              //滚动条无限加载中直接push
-              if (type == 0) {
-                for (let i = 0; i < res.length; i++) {
-                  dictList.push(res[i])
-                }
-              } else {
-                //查询直接赋值给字典数组
-                dictList = res
-              }
-              //循环数据赋是否已点击
-              this.loopData(dictList);
-              //判断长度，是否有数据
-              if(res.length<7){
-                this.noData = true
-              }else{
-                this.noData = false
-              }
-            } else {
-              if (type == 1) {
-                this.dictList = []
-              }
-              this.noData = true
-            }
-            //为下拉框设置高度
-            this.dictHeight = this.dictList.length>6?200:this.dictList.length*32+82
-          }
-        })
-      },
-      /**
-       *前台搜索
-       */
-      searchDictByText(){
-        let dictList = this.dictList
-        let searchText = this.searchText
-        let newDictList = [];
-        if(!this.searchText){
-          this.dictList = this.copyDictList;
-        }else{
-          for (let i = 0; i <dictList.length; i++) {
-            let value = dictList[i].value;
-            let text = dictList[i].text;
-            if(value.indexOf(searchText) >= 0 || value === searchText){
-              newDictList.push(dictList[i])
-            }else if(text.indexOf(searchText) >= 0 || text ===searchText){
-              newDictList.push(dictList[i])
-            }
-          }
-          if(newDictList.length>0){
-            this.dictList = newDictList;
-          }
-        }
-        this.dictHeight = this.dictList.length>6?150:this.dictList.length*32+82
-      },
-      /**
-       *返回父组件的值
-       */
-      returnDictValue() {
-        let val = {};
-        val.value = this.value
-        val.key = this.dataList.key;
-        this.$emit('dictmultipleok', val)
-      },
-      /**
-       * 图标点击事件
-       */
-      handleIconClick(){
-        this.dictText = ""
-        this.value = []
-        let val = {};
-        val.value = []
-        val.key = this.dataList.key;
-        this.$emit('dictmultipleok', val)
-        this.scollShow = false
-      }
-    }
-  })
-</script>
-
-<style scoped>
-  ::-webkit-scrollbar {
-      width: 6px;
-      height: 16px;
-      background-color: #F5F5F5;
-  }
-  /*定义滚动条轨道 内阴影+圆角*/
-  ::-webkit-scrollbar-track {
-      border-radius: 3px;
-      background-color: #f5f7f9;
-  }
-  /*定义滑块 内阴影+圆角*/
-  ::-webkit-scrollbar-thumb {
-      border-radius: 3px;
-      background-color: #ccc;
-  }
-  .scroll-class {
-      position: absolute;
-      background: white;
-      z-index: 9999;
-      overflow: hidden;
-      border: 1px solid #dddee1;
-      border-radius: 4px;
-      top: 35px;
-      -webkit-box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
-      box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
-  }
-  .scroll-list-class {
-      cursor: pointer;
-      z-index: 9999;
-      list-style-type: none;
-  }
-  .scroll-list-class li span {
-      margin-left: 15px;
-      font-size: 14px;
-  }
-  .scroll-list-class :hover {
-      background: #f3f3f3;
-  }
-  .no-more-data {
-      border-top: 1px solid #f0f0f0;
-  }
-  .no-loading .ivu-spin-text {
-      display: none;
-  }
-  .no-loading .ivu-scroll-content-loading {
-      opacity: 1;
-  }
-  .ivu-scroll-loader {
-      margin-top: -5px;
-  }
-  .select-item-selected{
-      color:rgba(45,140,240,.9);
-      position:relative;
-  }
-  .select-item-selected :after{
-      display: inline-block;
-      font-family: Ionicons, serif;
-      speak: none;
-      font-style: normal;
-      font-weight: 400;
-      font-variant: normal;
-      text-transform: none;
-      text-rendering: optimizeLegibility;
-      line-height: 1;
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-      vertical-align: -0.125em;
-      text-align: center;
-      font-size: 24px;
-      content: "\F171";
-      color: rgba(45,140,240,.9);
-      position: absolute;
-      top: 2px;
-      right: 8px;
-  }
-  .select-dict-text{
-      display:inline;
-      float: left;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      -o-text-overflow: ellipsis;
-      white-space:nowrap;
-      margin-left: 5px;
-      max-width:80%;
-      position:relative;
-  }
-  .bottom-border{
-      border-bottom:1px solid #f0f0f0;
-  }
-  .ivu-select-input{
-      display: inline;
-      height: 32px;
-      line-height: 32px;
-      width: 190px;
-      font-size: 14px;
-      outline: 0;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-      color: #515a6e;
-      position: relative;
-      cursor: pointer;
-      padding-left: 16px;
-  }
-  .ivu-select-multiple .ivu-select-selection{
-      padding: 0 0 0 4px;
-      float: left;
-  }
-  .icon-position{
-      position: relative;
-      right: 25px;
-      top: 6px;
-      cursor: pointer;
-  }
-</style>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl
deleted file mode 100644
index f27488770..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl
+++ /dev/null
@@ -1,320 +0,0 @@
-<#--单选组件，用于远程搜索查询
-item:传递的参数，包含字典code，查询key
-value:view组件传递的值 v-model-->
-<script type="text/x-template" id="select-scroll-radio-template">
-    <div>
-	    <div style="display: flex">
-		    <input ref="clickInput" class="ivu-input ivu-input-default" v-model="dictText"
-		           :placeholder="'请选择'+dataList.title" @blur="clickBlur"
-		           @click="handleClick" style="cursor: pointer"/>
-		    <i class="ivu-icon ivu-icon-md-close ivu-select-arrow" @click="handleIconClick" v-if="dictText"></i>
-	    </div>
-        <div class="scoll-class" v-if="scollShow">
-            <Scroll :class="noData == true?'no-loading':''" :height="dictHeight" :on-reach-bottom="handleReachBottom"
-                    :distance-to-edge="1">
-                <ul v-for="(item,index) in dictList" :key="index" @mousedown="scollListClick(item)"
-                    class="scoll-list-class">
-                    <li><span>{{ item.text }}</span></li>
-                </ul>
-                <ul class="no-more-data" v-if="noData">
-                    <li style="font-size: 12px;text-align: center;margin-top:5px">暂无更多数据</li>
-                </ul>
-            </Scroll>
-        </div>
-    </div>
-</script>
-<script>
-  Vue.component('j-select-scroll-radio', {
-    template: '#select-scroll-radio-template',
-    props: {
-      item: {
-        type: Object,
-        default: () => []
-      },
-      value: {
-        type: String,
-        default: () => ""
-      }
-    },
-    data() {
-      return {
-        // 表格高度
-        dictHeight: 200,
-        // 数据总数
-        tableCount: 0,
-        dataList: {},
-        dictList: [],
-        //字典文本
-        dictText: "",
-        // 是否加载中
-        tableLoading: false,
-        //滚动组件是否显示
-        scollShow: false,
-        userpage: 1,
-        noData: false,
-        //初始字典text
-        initText: "",
-        //是否初始值
-        initValue: true,
-        //复制一份字典集合
-        copyDictList: []
-      }
-    },
-    create() {
-
-    },
-    watch: {
-      item: {
-        deep: true,
-        immediate: true,
-        handler: function () {
-          this.dictData();
-        }
-      },
-      value: {
-        deep: true,
-        immediate: true,
-        handler: function () {
-          this.setDictText();
-        }
-      },
-      dictText:{
-        immediate: true,
-        handler: function () {
-            this.handleOnChange()
-        }
-      }
-    },
-    methods: {
-      /**
-       * 获取字典数据
-       */
-      dictData() {
-        if (this.item) {
-          this.dataList = JSON.parse(this.item)
-          if (this.dataList) {
-            this.dictList = this.dataList.dictList
-            this.copyDictList = this.dataList.dictList
-            //目前只有不勾选复选框并且不是select的时候才会分页，api和普通的字典不用去后台查数据
-            if (this.dataList.dictCode && this.dataList.dictCode.indexOf("select") == -1 || this.dataList.dictList.length < 7) {
-              this.noData = true
-            }
-          }
-
-        }
-      },
-      /**
-       *为字典值赋值
-       */
-      setDictText() {
-        if (!this.value) {
-          this.dictText = "";
-          this.searchLocalOrApi();
-        } else {
-          //赋值默认值
-          let dict = this.dictList.filter(item => item.value == this.value)
-          if (dict && dict.length > 0) {
-            this.dictText = dict[0].text
-            this.initText = dict[0].text
-          }
-          //update-begin---author:wangshuai ---date:20220315  for：下拉单选样式出现混乱--------
-          this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 32 + 50
-          //update-end---author:wangshuai ---date:20220315  for：下拉单选样式出现混乱--------
-        }
-      },
-      //无限加载中的事件
-      scollListClick(val) {
-        this.scollShow = false;
-        this.dictText = val.text;
-        this.value = val.value
-        val.key = this.dataList.key;
-        this.$emit('dictok', val)
-        this.searchLocalOrApi();
-      },
-      handleClick() {
-        this.scollShow = !this.scollShow;
-      },
-      clickBlur() {
-        this.scollShow = false;
-      },
-      //滚动条无限加载
-      handleReachBottom() {
-        if (!this.noData) {
-          return new Promise(resolve => {
-            if (this.noData) {
-              resolve();
-            }
-            this.userpage = this.userpage + 1;
-            setTimeout(() => {
-              this.getDictData(0);
-              resolve();
-            }, 500);
-          });
-        }
-      },
-      handleOnChange() {
-        let val = {}
-        val.key = this.dataList.key
-        //update-begin---author:wangshuai ---date:20220315  for：[JMREP-2552]下拉单选重置就出不来了--------
-        if(!this.dictText){
-            val.value = ""
-        }else{
-            val.value = this.value
-        }
-        //update-end---author:wangshuai ---date:20220315  for：[JMREP-2552]下拉单选重置就出不来了--------
-        this.$emit('dictok', val)
-        this.searchLocalOrApi();
-      },
-      searchLocalOrApi() {
-        this.userpage = 1;
-        //字典为空或者包含select语句才会后台搜索，否则直接在前台搜索
-        if (!this.dataList.dictCode || this.dataList.dictCode.indexOf("select") != -1) {
-          //后台进行搜索
-          this.getDictData(1);
-        } else {
-          //前台进行搜索
-          if (this.dictText) {
-            this.searchDictByText();
-          } else {
-            this.dictList = this.copyDictList
-            //update-begin---author:wangshuai ---date:20220315  for：下拉单选样式出现混乱--------
-            this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 32 + 50
-            //update-end---author:wangshuai ---date:20220315  for：下拉单选样式出现混乱--------
-          }
-        }
-      },
-      /**
-       * 查询字典数据
-       * @param type 字典值需要拼接还是直接替换 0拼接 1 替换
-       */
-      getDictData(type) {
-        let paramSearch = this.dataList.paramSearch
-        let dbKey = this.dataList.dbCode + "__" + this.dataList.name
-        let params = getRequestUrlParam();
-        let dataStr = {
-          "reportId": configId,
-          "text": this.dictText,
-          "key": dbKey,
-          "paramSearch": paramSearch,
-          params: params,
-          pageNo: this.userpage
-        }
-        $http.get({
-          url: api.dictCodeSearch,
-          data: dataStr,
-          success: (res) => {
-            if (res && res.length > 0) {
-              if (type == 0) {
-                for (let i = 0; i < res.length; i++) {
-                  this.dictList.push(res[i])
-                }
-              } else {
-                this.dictList = res
-              }
-              if (res.length < 7) {
-                this.noData = true
-              } else {
-                this.noData = false
-              }
-            } else {
-              //如果是输入框搜索数据为空的情况下直接清空
-              if (type == 1) {
-                this.dictList = []
-              }
-              this.noData = true
-            }
-            this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 32 + 50
-          }
-        })
-      },
-      searchDictByText() {
-        let dictList = this.dictList
-        let dictText = this.dictText
-        let newDictList = [];
-        for (let i = 0; i < dictList.length; i++) {
-          let value = dictList[i].value;
-          let text = dictList[i].text;
-          if (value.indexOf(dictText) >= 0 || value === dictText) {
-            newDictList.push(dictList[i])
-          }else if(text.indexOf(dictText) >= 0 || text === dictText){
-            newDictList.push(dictList[i])
-          }
-        }
-        this.dictList = newDictList;
-        //update-begin---author:wangshuai ---date:20220315  for：下拉单选样式出现混乱--------
-        this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 32 + 50
-        //update-end---author:wangshuai ---date:20220315  for：下拉单选样式出现混乱--------
-      },
-      /**
-       * 点击叉数据清空
-       */
-      handleIconClick(){
-        this.dictText=""
-	      this.handleOnChange()
-      }  
-    }
-  })
-</script>
-
-<style scoped>
-    ::-webkit-scrollbar {
-        width: 6px;
-        height: 16px;
-        background-color: #F5F5F5;
-    }
-
-    /*定义滚动条轨道 内阴影+圆角*/
-    ::-webkit-scrollbar-track {
-        border-radius: 3px;
-        background-color: #f5f7f9;
-    }
-
-    /*定义滑块 内阴影+圆角*/
-    ::-webkit-scrollbar-thumb {
-        border-radius: 3px;
-        background-color: #ccc;
-    }
-
-    .scoll-class {
-        position: absolute;
-        background: white;
-        z-index: 9999;
-        width: 100%;
-        overflow: hidden;
-        border: 1px solid #dddee1;
-        border-radius: 4px;
-        top: 35px;
-        -webkit-box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
-        box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
-    }
-
-    .scoll-list-class {
-        cursor: pointer;
-        z-index: 9999;
-    }
-
-    .scoll-list-class li span {
-        margin-left: 15px;
-        font-size: 14px;
-    }
-
-    .scoll-list-class :hover {
-        background: #f3f3f3;
-    }
-
-    .no-more-data {
-        border-top: 1px solid #f0f0f0;
-    }
-
-    .no-loading .ivu-spin-text {
-        display: none;
-    }
-
-    .no-loading .ivu-scroll-content-loading {
-        opacity: 1;
-    }
-
-    .ivu-scroll-loader {
-        margin-top: -5px;
-    }
-</style>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl
deleted file mode 100644
index 17ad9b81d..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl
+++ /dev/null
@@ -1,149 +0,0 @@
-<script type="text/x-template" id="series-setting-template">
-    <Submenu  name="15" style="border-bottom: inset 1px;" class="dataSourceForm">
-        <template slot="title">
-            <span class="rightFontSize">数值设置</span>
-        </template>
-        <div class="blockDiv" style="padding-bottom: 10px">
-            <Row class="ivurow">
-                <p>显示&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 141px;" v-model="seriesOption.show" @on-change="onSeriesLabelChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>字体大小&nbsp;&nbsp;</p>
-                <i-input class="rightFontSize iSelect" size="small" type="number" v-model="seriesOption.textStyle_fontSize" @on-blur="onSeriesLabelChange"></i-input>
-            </Row>
-            <Row class="ivurow" v-if="typeof seriesOption.textStyle_color !== 'undefined'">
-                <p>字体颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input class="rightFontSize iSelect" v-model="seriesOption.textStyle_color" size="small"  @on-change="onSeriesLabelChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="seriesOption.textStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onSeriesLabelChange"/>
-                    </span>
-                </i-input>
-                </Col>
-            </Row>
-            <Row class="ivurow rightFontSize">
-                <p>字体粗细&nbsp;&nbsp;</p>
-                <i-select size="small" class="iSelect" v-model="seriesOption.textStyle_fontWeight" @on-change="onSeriesLabelChange" style="width: 115%">
-                    <i-option class="rightFontSize" value="normal">正常</i-option>
-                    <i-option class="rightFontSize" value="bold">粗体</i-option>
-                    <i-option class="rightFontSize" value="bolder">特粗</i-option>
-                    <i-option class="rightFontSize" value="lighter">细体</i-option>
-                </i-select>
-            </Row>
-            <Row class="ivurow rightFontSize">
-                <p style="margin-bottom: 10px;">字体位置&nbsp;&nbsp;</p>
-                <i-select size="small" class="iSelect" v-model="seriesOption.position" @on-change="onSeriesLabelChange">
-                    <i-option class="rightFontSize" v-for="(item,index) in seriesOption.labelPositionArray" :value="item.value" :index="index">
-                        {{ item.text }}
-                    </i-option>
-                </i-select>
-            </Row>
-		        <Row class="ivurow rightFontSize">
-				        <p style="margin-bottom: 10px;">数值旋转&nbsp;&nbsp;</p>
-				        <input-number :max="90" :min="-90" size="small" v-model="seriesOption.rotate"  @on-change="onSeriesLabelChange"/>
-				        </i-select>
-		        </Row>
-		        <Row class="ivurow rightFontSize">
-			        <p style="margin-bottom: 10px;">是否显示数值&nbsp;&nbsp;</p>
-			        <i-switch size="small" style="margin-left: 6px;" v-model="izShowNumber" @on-change="onSeriesFormatterChange"/>
-			        </i-select>
-		        </Row>
-        </div>
-    </Submenu>
-</script>
-<script>
-    Vue.component('j-series-setting', {
-        template: '#series-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                seriesOption: {
-                    textStyle_color:'',
-                    textStyle_fontSize:'',
-                    textStyle_fontWeight:'',
-                    position:'',
-                    formatter:'',
-                    rotate:0,
-		                type:''
-                },
-                labelPositions:[],
-                izShowNumber:false
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.seriesOption = Object.assign(this.seriesOption, this.settings)
-                    
-		                //update-begin---author:wangshuai ---date:20220626  for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 ------------
-                    //显示名称，没有显示数值
-		                let type = this.seriesOption.type;
-		                if(type === 'pie' || type === 'funnel' || type === 'scatter' || type === 'graph'){
-		                    //update-begin---author:wangshuai ---date:20220407  for：[issues/I50IKB]饼图 如何直接在图上显示各分类对应的数值------------
-                        if(this.seriesOption.formatter && "{b}"!==this.seriesOption.formatter){
-                            this.izShowNumber = true;
-                        }else{
-                            this.izShowNumber = false;
-                        }
-                        //update-end---author:wangshuai ---date:20220407  for：[issues/I50IKB]饼图 如何直接在图上显示各分类对应的数值------------
-		                }else{
-		                    //只显示数值，如formatter值不为' ',则显示数值，否则不显示
-		                    if(this.seriesOption.formatter === " "){
-                            this.izShowNumber = false
-		                    }else{
-                            this.seriesOption.formatter="{c}"
-                            this.izShowNumber = true
-		                    }
-		                }
-                    //update-end---author:wangshuai ---date:20220626  for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 --------------
-                }
-            },
-            onSeriesLabelChange(){
-                let {labelPositionArray,...otherOptions}=this.seriesOption;
-                this.$emit('change', otherOptions,'label')
-            },
-            /**
-             * 图表设置格式化
-             */
-            onSeriesFormatterChange(){
-                //update-begin---author:wangshuai ---date:20220626  for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 ------------
-                let type = this.seriesOption.type;
-                if(type === 'pie' || type === 'funnel' || type === 'scatter' || type === 'graph'){
-                    //如果是选中数值状态
-                    if(this.izShowNumber){
-                        this.seriesOption.formatter="{b}:{c}"
-                    }else{
-                        this.seriesOption.formatter="{b}"
-                    } 
-                }else{
-                    //如果是选中数值状态，并且初始值为数值
-                    if(this.izShowNumber){
-                        this.seriesOption.formatter="{c}"
-                    }else{
-                        this.seriesOption.formatter=" "
-                    }
-                }
-                //update-end---author:wangshuai ---date:20220626  for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 ------------
-                let {labelPositionArray,...otherOptions}=this.seriesOption;
-                this.$emit('change', otherOptions,'label')
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl
deleted file mode 100644
index e14e86045..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl
+++ /dev/null
@@ -1,176 +0,0 @@
-
-<script type="text/x-template" id="sql-function-replace-template">
-  <div>
-    <!-- 新增数据集 弹框-begin -->
-    <Modal width="800px" :loading="loading" v-model="sqlFunctionShow" :title="moduleTitle">
-      <div slot="footer">
-        <Button type="text" size="small" @click="clearSqlFunction">取消</Button>
-        <Button type="primary" size="small" @click="saveSqlFunction">确定</Button>
-      </div>
-      <Table ref="paramTable" :columns="functionColumns" :data="functionData">
-        <template slot="paramValue" slot-scope="props">
-          <i-form :ref="'formDynamic'+props.idx" :model="props.row">
-            <form-item prop="paramValue" style="margin-top: 10px">
-              <i-input v-model="props.row.paramValue" size="small" />
-            </form-item>
-          </i-form>
-        </template>
-      </Table>
-    </Modal>
-    <!-- 新增数据集 弹框-end -->
-  </div>
-</script>
-
-<script>
-  Vue.component('j-sql-function-replace', {
-    template: '#sql-function-replace-template',
-    data(){
-      return {
-        moduleTitle:"函数参数替换",
-        sqlFunctionShow:false,
-        functionColumns: [
-          {
-            type: 'index',
-            width: 60,
-            align: 'center'
-          },
-          {
-            title: '参数',
-            key: 'paramName',
-            width: '200',
-            render: (h, params) => {
-              return this.renderInput(h, params, 'paramName','functionData')
-            }
-          },
-          {
-            title: '默认值',
-            key: 'paramValue',
-            width: '200',
-            render: (h, params) => {
-              this.functionData[params.index] = params.row;
-              return h(
-                  "div",
-                  this.$refs.paramTable.$scopedSlots.paramValue({
-                    row: params.row,
-                    idx: params.row._index
-                  })
-              )
-            }
-          }
-        ],//函数列
-        functionData:[], //函数数据
-        loading:false,
-        dbDynSql:"",
-        dbKey:""
-      }
-    },
-    methods: {
-      renderInput(h, params, field,tabIndex,placeholder) {
-        return h('i-input', {
-          props: {
-            "size":"small",
-            type: 'text',
-            readonly:true,
-            value: this.functionData[params.index][field],
-            placeholder: placeholder?placeholder:`请输入`+params.column.title
-          },
-          on: {
-            'on-change': (event) => {
-              this.functionData[params.index][field] = event.target.value;
-            }
-          },
-        })
-      },
-      //初始化参数解析
-      initDataSource(dbDynSql,dbKey,paramData){
-        //update-begin---author:wangshuai---date:2023-10-10---for:【QQYUN-6755】参数替换 解析时，弹框参数不对---
-        //替换“$“{DaoFormat. 为空，使SQL能正常解析
-        //update-begin---author:wangshuai   Date:20211221  for：[JMREP-2505]存储过程没有空格参数会连接到一起------------
-        if(dbDynSql){
-          dbDynSql = dbDynSql.replaceAll('\$\{DaoFormat.','');
-        }
-        this.dbDynSql = dbDynSql;
-        //update-end---author:wangshuai---date:2023-10-10---for:【QQYUN-6755】参数替换 解析时，弹框参数不对---
-        this.dbKey = dbKey
-        //update-begin---author:wangshuai   Date:20211221  for：[JMREP-2505]存储过程没有空格参数会连接到一起------------
-        let reg=/\$\{[^}]*\}/g;
-        //update-end---author:wangshuai   Date:20211221  for：[JMREP-2505]存储过程没有空格参数会连接到一起------------
-        let dbDynSqlArr = dbDynSql.match(reg);
-        let paramsArr = [];
-        if(dbDynSqlArr && dbDynSqlArr.length>0){
-          let maxOrderNum = 1;
-          //防止参数重复
-          let paramExistArray = []
-          dbDynSqlArr.forEach((item,index)=>{
-            let paramName = item.replace("$\{","").replace("}","").trim();
-            if(paramExistArray.indexOf(item)<0 && item){
-              paramExistArray.push(item)
-              let paramObj = {};
-              let paramFilter = paramData.filter(item=> item.paramName==paramName);
-              paramObj.paramName = paramName;
-              paramObj.tableIndex = index;
-              if(!paramFilter[0]){
-                paramObj.paramValue = ""
-              }else{
-                let paramValue = paramFilter[0].paramValue;
-                if(paramValue){
-                  paramObj.paramValue = paramValue
-                }
-              }
-              paramsArr.push(paramObj);
-            }
-          })
-        }
-        this.functionData = paramsArr;
-      },
-      //修改报表SQl确定事件
-      saveSqlFunction(){
-        let dbDynSql = this.dbDynSql;
-        let functionData = this.functionData;
-        let model = true
-        let that = this
-        for (const data of functionData) {
-            let paramName = data.paramName;
-            let paramValue = data.paramValue;
-            if(dbDynSql.indexOf("isNotEmpty")<0 && dbDynSql.indexOf("${'<#if'}")<0){
-              if(!paramValue){
-                that.sqlFunctionShow=true
-                that.$Message.warning("请输入"+paramName+"对应的值")
-                model = true;
-                break;
-              }else{
-                model = false;
-              }
-            }else{
-              model = false;
-              break;
-            }
-        }
-        if(model == false){
-          this.$emit("functionok", this.functionData)
-          this.clearSqlFunction()
-        }else{
-          this.sqlFunctionShow=true
-        }
-      },
-      clearSqlFunction(){
-        this.sqlFunctionShow=false
-        this.dbDynSql=""
-        this.dbKey= ""
-        this.functionData=[]
-      },
-      //默认值加验证不为空
-      async childrenRules(){
-        let success = true
-        for (let i = 0, len = this.functionData.length; i < len; i++) {
-          this.$refs['formDynamic' + i].validate(valid => {
-            if (!valid) {
-              success=false
-            }
-          })
-        }
-        return success;
-      },
-    }
-  })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl
deleted file mode 100644
index 66ddcfcb4..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl
+++ /dev/null
@@ -1,103 +0,0 @@
-<script type="text/x-template" id="title-setting-template">
-    <div class="title-setting-fontsize">
-        <Submenu name="1" style="border-bottom: inset 1px;">
-            <template slot="title" ><span class="rightFontSize">标题设置</span></template>
-            <div class="blockDiv">
-                <Row class="ivurow">
-                    <p>显示&nbsp;&nbsp;</p>
-                    <i-switch size="small" style="margin-left: 142px;" v-model="titleOption.show" @on-change="onTitleChange"/>
-                </Row>
-
-                <Row class="ivurow">
-                    <p>标题文字&nbsp;&nbsp;</p>
-                    <i-input class="rightFontSize iSelect" size="small" v-model="titleOption.text" @on-blur="onTitleChange"></i-input>
-                </Row>
-                <Row class="ivurow" v-if="typeof titleOption.textStyle_color !== 'undefined'">
-                    <p>字体颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input v-model="titleOption.textStyle_color" size="small" class="rightFontSize iSelect" @on-change="onTitleChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="titleOption.textStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onTitleChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow">
-                    <p>字体加粗&nbsp;&nbsp;</p>
-                    <#--:model.sync="echartInfo.titleFontWeight"-->
-                    <i-select size="small" class="rightFontSize iSelect" v-model="titleOption.textStyle_fontWeight" @on-change="onTitleChange">
-                        <i-option value="normal" class="rightFontSize">正常</i-option>
-                        <i-option value="bold" class="rightFontSize">粗体</i-option>
-                        <i-option value="bolder" class="rightFontSize">特粗</i-option>
-                        <i-option value="lighter" class="rightFontSize">细体</i-option>
-                    </i-select>
-                </Row>
-                <Row class="ivurow">
-                    <p>字体大小&nbsp;&nbsp;</p>
-                    <i-input size="small" type="number" v-model="titleOption.textStyle_fontSize" @on-change="onTitleChange"
-                             class="iSelect rightFontSize"></i-input>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">标题位置&nbsp;&nbsp;</p>
-                    <i-select size="small" class="iSelect rightFontSize" v-model="titleOption.left" @on-change="onTitleChange" style="width: 132%;">
-                        <i-option value="left" class="rightFontSize">左对齐</i-option>
-                        <i-option value="center" class="rightFontSize">居中</i-option>
-                        <i-option value="right" class="rightFontSize">右对齐</i-option>
-                    </i-select>
-                </Row>
-                <Row class="ivurow">
-                    <p>顶边距&nbsp;&nbsp;</p>
-                    <slider v-model="titleOption.top" @on-change="onTitleChange" :tip-format="formatTop" style="margin-top: -9px;width: 150px;margin-left: 5px;"></slider>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-title-setting', {
-        template: '#title-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                titleOption: {
-                    show: true,
-                    top: 5,
-                    text: '',
-                    textStyle_color: '',
-                    textStyle_fontWeight: '',
-                    textStyle_fontSize: '',
-                    left: ''
-                }
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            formatTop(val){
-                return val + 'px';
-            },
-            initData: function (){
-                if (this.settings){
-                    this.titleOption = Object.assign(this.titleOption, this.settings)
-                }
-            },
-            onTitleChange(){
-                this.$emit('change', 'title', this.titleOption)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl
deleted file mode 100644
index 6e104eb91..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl
+++ /dev/null
@@ -1,86 +0,0 @@
-<script type="text/x-template" id="tooltip-setting-template">
-    <div>
-        <Submenu  name="16" style="border-bottom: inset 1px;" class="rightFontSize">
-            <template slot="title">
-                <span>提示语设置</span>
-            </template>
-            <div class="blockDiv">
-                <Row class="ivurow">
-                    <p>显示&nbsp;&nbsp;</p>
-                    <i-switch size="small" style="margin-left: 141px;" v-model="tooltipOption.show" @on-change="onTooltipChange"/>
-                </Row>
-                <Row class="ivurow">
-                    <p>字体大小&nbsp;&nbsp;</p>
-                    <i-input class="iSelect" size="small" type="number" v-model="tooltipOption.textStyle_fontSize" @on-blur="onTooltipChange"></i-input>
-                </Row>
-                <Row class="ivurow" v-if="typeof tooltipOption.textStyle_color !== 'undefined'">
-                    <p style="margin-bottom: 10px;">字体颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input class="iSelect" v-model="tooltipOption.textStyle_color" size="small" @on-change="onTooltipChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="tooltipOption.textStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onTooltipChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow" v-if="selectedChartType =='pie.simple' || selectedChartType =='pie.doughnut' || selectedChartType =='pie.rose'">
-                  <span>百分比&nbsp;&nbsp;</span>
-                  <Checkbox size="small" v-model="tooltipOption.percentage" true-value="1" false-value="0"	 style="margin-left: 14px" @on-change="percentageChange"></Checkbox>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-tooltip-setting', {
-        template: '#tooltip-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                tooltipOption: {
-                    textStyle_color: '',
-                    percentage:0
-                },
-                selectedChartType:"pie.simple"
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            }
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.selectedChartType = vm.selectedChartType
-                    this.tooltipOption = Object.assign(this.tooltipOption, this.settings)
-                }
-            },
-            onTooltipChange(){
-                this.$emit('change', 'tooltip', this.tooltipOption)
-            },
-            //是否为百分比显示
-            percentageChange(val){
-              let tooltip = this.tooltipOption;
-              let formatter = tooltip.formatter;
-              if(val == 1){
-                tooltip.formatter = formatter+ ' ({d}%)';
-              }else{
-                tooltip.formatter = formatter.substr(0,formatter.indexOf(" ({d}%)"))
-              }
-              this.$emit('change', 'tooltip', tooltip)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl
deleted file mode 100644
index 45f1892ea..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl
+++ /dev/null
@@ -1,424 +0,0 @@
-<style>
-    .jmreport-comp .ivu-select-placeholder {
-        display: block;
-        height: 30px;
-        line-height: 30px;
-        color: #c5c8ce;
-        font-size: 14px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        padding-left: 8px;
-        padding-right: 22px;
-    }
-
-    .jmreport-comp .ivu-select-selected-value {
-        display: block;
-        height: 30px;
-        line-height: 30px;
-        font-size: 14px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        padding-left: 8px;
-        padding-right: 24px;
-    }
-</style>
-<script type="text/x-template" id="tree-select-template">
-    <div class="ivu-select ivu-select-default jmreport-comp">
-        <div tabindex="0" class="ivu-select-selection ivu-form-item-content" >
-            <div @mouseover="mouseover" @mouseleave="mouseleave">
-                <div @click="treeSelectContentShow" style="line-height: 23px;">
-                    <div v-for="(item,index) in multipleShowVal" v-if="index<2" :key="item" class="ivu-tag ivu-tag-checked">
-                        <span class="ivu-tag-text ">{{item}}</span>
-                        <i class="ivu-icon ivu-icon-ios-close" @click.stop="removeVal(index)"></i>
-                    </div>
-                    <span v-if="multipleShowVal && multipleShowVal.length>2">
-                        +{{ multipleShowVal.length - 2 }}
-                    </span>
-
-                    <span v-if="multipleShowVal.length === 0" class="ivu-select-placeholder">请选择</span>
-                    <span class="" style="display: none;"></span>
-                </div>
-                <i :class="'ivu-icon ivu-icon-' +iconVal+ ' ivu-select-arrow'" @click="clickIcon"></i>
-            </div>
-
-            <div v-show="showTree" @mouseover="mouseover1" @mouseleave="mouseleave1" class="ivu-select-dropdown" style="max-height: 200px;overflow-y:auto;z-index:9999;min-width:100%;width: auto">
-                <#--<div style="width: 95%;margin-left: 10px;" v-show="showQuery">
-                    <i-input v-model="queryTreeVal" placeholder="请输入筛选条件"  @on-change="selectTreeChange" />
-                </div>-->
-                <div style="margin-left: 10px;">
-                    <Tree
-                        show-checkbox
-                        check-strictly
-                        :load-data="loadData"
-                        :data="queryData"
-                        :multiple="multiple"
-                        ref="tree"
-                        @on-check-change="treeCheckChange"
-                        @on-select-change="selectChange">
-                    </Tree>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</script>
-<script>
-    Vue.component('j-tree-select', {
-        template: '#tree-select-template',
-        props: {
-            treeData: {
-                type: Array
-            },
-            value:  {
-                type: String
-            },
-            url: {
-                type: String
-            },
-            loadtreeurl: { 
-                type: String
-		        }
-        },
-        data(){
-            return {
-                filterable: true,
-                multiple: true,
-                clearable: true,
-                showQuery: true,
-                disabled: true,
-                iconVal: 'ios-arrow-down',
-                showTree: false,
-                multipleShowVal: [],
-                multipleHideVal: [],
-                showData:[],
-                queryTreeVal: '',
-                queryData: [],
-                inputOver: false,
-                treeOver: false,
-                initValues:[] //初始化value值
-
-            }
-        },
-        watch:{
-            value:{
-                immediate: true,
-                handler: function(){
-                    this.initTreeSelected()
-                }
-            }
-        },
-        mounted(){
-            this.loadRoot();
-        },
-        methods:{
-            combineTreeData(ls, callback, node){
-                let arr = []
-                if(ls && ls.length> 0){
-                    for(let item of ls){
-                        arr.push({
-                            title: item.title,
-                            id: item.id,
-                            value: item.value,
-                            loading: false,
-                            children: []
-                        })
-                    }
-                }
-                
-                //update-begin---author:wangshuai ---date:20220627  for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题------------
-                //如果没有配置通过value值获取树集合，那么就不走孩子选中时间
-		            if(this.loadtreeurl){
-                    this.checkChildTreeData(arr,this.initValues)
-                }
-                //update-end---author:wangshuai ---date:20220627  for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题--------------
-		            
-                if(callback){
-                    callback(arr)
-                }else{
-                    this.queryData = [...arr]
-                }
-                if(arr.length==0){
-                    delete node.children
-                    delete node.loading
-                }
-               // console.log('this.queryData ', this.queryData)
-            },
-            // 加载子节点
-            loadData(item, callback){
-                // console.log("====")
-                // console.log("loadData")
-                // console.log("====")
-                let params = {
-                    params: {pid: item.id}
-                }
-                $http.metaGet(this.url, params).then((res) => {
-                    this.combineTreeData(res.data, callback, item)
-                }).catch(function (error){
-                    console.error('加载树错误', error)
-                });
-            },
-            // 加载数据
-            loadRoot(){
-                // console.log("====")
-                // console.log("loadRoot")
-                // console.log("====")
-                $http.metaGet(this.url).then((res) => {
-                    this.combineTreeData(res.data)
-                }).catch(function (error){
-                  console.error('加载树错误', error)
-                });
-            },
-            initTreeSelected(){
-                // 如果有默认值  需要设置该方法
-                // console.log('initTreeSelected', this.value)
-                if(!this.value){
-                    let arr = this.queryData;
-                    this.clearTreeSelect(arr)
-                    this.multipleShowVal = []
-                    this.multipleHideVal = []
-                    // 勾选状态去不掉
-                    this.queryData = JSON.parse(JSON.stringify(arr))
-                }else{
-                    //update-begin---author:wangshuai ---date:20220627  for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题------------
-                    //如果没有配置通过值获取数集合，那么就不走请求接口，兼容老数据
-		                if(this.loadtreeurl){
-                        this.getTreeName(this.value);
-                    }
-                    //update-end---author:wangshuai ---date:20220627  for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题------------
-                }
-            },
-            clearTreeSelect(arr){
-                for (let i = 0; i < arr.length; i++) {
-                    arr[i].selected = false
-                    arr[i].checked = false
-                    if (arr[i].children) {
-                        this.clearTreeSelect(arr[i].children)
-                    }
-                }
-            },
-            mouseover () {
-                this.inputOver = true;
-            },
-            mouseleave () {
-                this.inputOver = false;
-                setTimeout(()=>{
-                    if(this.treeOver===false){
-                        this.showTree = false
-                    }
-                }, 200)
-            },
-            mouseover1 () {
-                this.treeOver = true;
-            },
-            mouseleave1 () {
-                this.treeOver = false;
-                setTimeout(()=>{
-                    if(this.inputOver===false){
-                        this.showTree = false
-                    }
-                }, 200)
-            },
-            treeSelectContentShow(){
-                if (this.showTree) {
-                    this.showTree = false
-                } else {
-                    this.showTree = true
-                }
-                if (this.iconVal !== 'ios-close-circle') {
-                    if (this.iconVal === 'ios-arrow-down') {
-                        this.iconVal = 'ios-arrow-up'
-                    } else if (this.iconVal === 'ios-arrow-up') {
-                        this.iconVal = 'ios-arrow-down'
-                    }
-                }
-            },
-            removeVal (index) {
-                let arr = this.queryData;
-                let removeValue = this.multipleHideVal[index]
-                for (let i = 0; i < arr.length; i++) {
-                    if (arr[i].value === removeValue) {
-                        arr[i].selected = false
-                        arr[i].checked = false
-                    } else if (arr[i].children) {
-                        this.removeChildTreeData(arr[i].children, removeValue)
-                    }
-                }
-                this.multipleShowVal.splice(index, 1)
-                this.multipleHideVal.splice(index, 1)
-
-                // update-begin-author:taoyan date:20211028 for:下拉树控件在多选的时候，如果选错了，察掉后不会及时生效，必须要重置才行。
-                //https://gitee.com/jeecg/JimuReport/issues/I4FKR0
-                let emitString = this.multipleHideVal.join(',')
-                this.$emit('input', emitString)
-                this.$emit('on-change', emitString)
-                // update-end-author:taoyan date:20211028 for:下拉树控件在多选的时候，如果选错了，察掉后不会及时生效，必须要重置才行。
-
-            },
-            removeChildTreeData(children, removeValue) {
-                for (let i = 0; i < children.length; i++) {
-                    if (children[i].value === removeValue) {
-                        children[i].selected = false
-                        children[i].checked = false
-                        return
-                    } else if (children[i].children && children[i].children.length > 0) {
-                        this.removeChildTreeData(children[i].children, removeValue)
-                    }
-                }
-            },
-            clickIcon () {
-                if (this.iconVal === 'ios-close-circle') {
-                    this.clearVal()
-                } else {
-                    this.treeSelectContentShow()
-                }
-            },
-            clearVal () {
-                // console.log('clearVal')
-            /*    if (this.clearable && !this.multiple && this.iconVal === 'ios-close-circle') {
-                    this.pickTree(this.hideValue)
-                    this.queryVal = ''
-                    this.hideValue = ''
-                    if (this.showTree) {
-                        this.iconVal = 'ios-arrow-up'
-                    } else {
-                        this.iconVal = 'ios-arrow-down'
-                    }
-                    this.$emit('input', '')
-                }*/
-            },
-
-            selectTreeChange () {
-                this.queryData = JSON.parse(JSON.stringify(this.showData))
-                if (this.queryTreeVal !== '') {
-                    let removeData = []
-                    for (let i = 0; i < this.queryData.length; i++) {
-                        let check = this.recursionTreeData(this.queryTreeVal, this.queryData[i])
-                        if (!check) {
-                            removeData.push(i)
-                        }
-                    }
-                    this.queryData = this.queryData.filter((o, index) => {
-                        return !removeData.includes(index)
-                    })
-                }
-            },
-
-            recursionTreeData (query, data) {
-                let isCheck = false
-                let removeData = []
-                // 只验证最底层的节点是否有符合要求的值
-                if (data.children !== undefined) {
-                    for (let i = 0; i < data.children.length; i++) {
-                        if (!isCheck) {
-                            isCheck = this.recursionTreeData(query, data.children[i])
-                            if (!isCheck) {
-                                removeData.push(i)
-                            }
-                        } else {
-                            if (!this.recursionTreeData(query, data.children[i])) {
-                                removeData.push(i)
-                            }
-                        }
-                    }
-                } else {
-                    // 验证当前节点是否有符合要求的值
-                    if (data.title.indexOf(query) !== -1) {
-                        return true
-                    } else {
-                        return false
-                    }
-                }
-                data.children = data.children.filter((o, index) => {
-                    return !removeData.includes(index)
-                })
-                // 如果子节点中有一个符合要求，则父节点就直接返回true，不做删除，若子节点没有一个符合要求，则再次验证当前的节点
-                if (isCheck) {
-                    return isCheck
-                }
-                // 表示当前的节点有值在里面
-                if (data.title.indexOf(query) !== -1) {
-                    return true
-                } else {
-                    return false
-                }
-            },
-            selectChange (obj) {
-                //console.log('selectChange', obj)
-            },
-            treeCheckChange(arr){
-                //console.log('treeCheckChange', arr)
-                this.multipleShowVal = []
-                this.multipleHideVal = []
-                for (let i = 0; i < arr.length; i++) {
-                    this.multipleShowVal.push(arr[i].title)
-                    this.multipleHideVal.push(arr[i].value)
-                }
-                let emitString = this.multipleHideVal.join(',')
-                this.$emit('input', emitString)
-                this.$emit('on-change', emitString)
-            },
-		        
-            /**
-             * 获取树名称
-             * @param value
-             */
-            getTreeName(value){
-                let params = {
-                    params: {value: value}
-                }
-                $http.metaGet(this.loadtreeurl, params).then((res) => {
-                    if(res.data && res.data.length> 0){
-                        let initValues = [];
-                        for (let i = 0; i <  res.data.length; i++) {
-                            if(res.data[i].value){
-                                if(this.multipleShowVal.indexOf(res.data[i].title) === -1){
-                                    this.multipleShowVal.push(res.data[i].title) 
-                                }
-                                initValues.push(res.data[i].value)
-                            }
-                        }
-                        //如果有值默认选中
-		                    this.setChecked(initValues);
-                        this.initValues = initValues
-                    }
-                }).catch(function (error){
-                    console.log('获取树名称失败', error)
-                });
-            },
-		        
-            /**
-             * 设置选中值
-             * @param children
-             * @param removeValue
-             */
-            setChecked(values){
-                let arr = this.queryData;
-                for (let i = 0; i < arr.length; i++) {
-                    if (values.indexOf(arr[i].value)!==-1 && !values.checked) {
-                        Vue.set(arr[i],"checked",true)
-                    } else {
-                        Vue.set(arr[i],"checked",false)
-                    }
-                }
-            },
-		        
-            /**
-             * 子级设置选中值
-             * @param children
-             * @param checkedValue
-             */
-            checkChildTreeData(children, checkedValue) {
-                for (let i = 0; i < children.length; i++) {
-                    if (checkedValue.indexOf(children[i].value)!==-1  && !checkedValue.checked) {
-                        Vue.set(children[i],"checked",true)
-                    }else{
-                        Vue.set(children[i],"checked",false)
-                    }
-                }
-            }
-
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl
deleted file mode 100644
index c5bce2f6d..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl
+++ /dev/null
@@ -1,208 +0,0 @@
-<style>
-    .view-toolbar-container .ivu-icon{
-        width:22px;
-        height:22px;
-        background: #fff;
-        margin-left: 5px;
-    }
-
-    .view-toolbar-container .ivu-icon:hover{
-        background: #eee;
-    }
-    .view-toolbar-list .ivu-col{
-        border:1px solid #ddd;
-        padding:2px;
-    }
-
-    .view-toolbar-list .ivu-col:active{
-        background: #eee;
-    }
-    .view-toolbar-container .transform-icon, .view-toolbar-list .transform-icon{
-        transform: rotate(180deg);
-        padding-top: 1px;
-    }
-
-</style>
-<script type="text/x-template" id="view-setting-template">
-    <div style="">
-        <Modal :loading="true" v-model="show" title="预览页工具条设置" :width="650" @on-ok="onViewSettingSave" @on-cancel="onViewSettingCancel" class="expression">
-            <div style="height: 30px">
-                <Checkbox v-model="showViewToolbar">显示工具栏：</Checkbox>
-                <div style="height: 30px;float: right;margin-right: 5px">
-                    <Button @click="resetViewToolbar" size="small">恢复默认</Button>
-                </div>
-            </div>
-            <div style="padding: 9px;margin-top:2px;background: rgb(228 229 230);border-bottom: 1px solid #e0e2e4;height: 40px;text-align: left;">
-                <div v-if="showViewToolbar" style="height: 22px;line-height: 22px;display: inline-block" class="view-toolbar-container">
-                    <Icon
-                      v-for="(item,index) in btnList"
-                      v-if="isSelected(item.index)"
-                      :key="index"
-                      :type="item.icon"
-                      :size="viewSettingFont"
-                      :title="item.title"
-                      :class="item.transform?'transform-icon':''"/>
-<#--                    <Icon type="ios-skip-backward" :size="viewSettingFont"/>
-                    <Icon type="ios-play" class="transform-icon" :size="viewSettingFont"/>
-                    <Icon type="ios-paper" :size="viewSettingFont"/>
-                    <Icon type="md-podium" :size="viewSettingFont"/>
-                    <Icon type="ios-play" :size="viewSettingFont"/>
-                    <Icon type="ios-skip-forward" :size="viewSettingFont"/>
-                    <Icon type="ios-print" :size="viewSettingFont"/>
-                    <Icon type="ios-cloud-download" :size="viewSettingFont"/>-->
-                </div>
-                <div style="height: 22px;line-height: 22px;float: right;margin-right: 5px">
-                    <Button @click="clearViewToolbar" size="small" style="">清空</Button>
-                </div>
-            </div>
-
-            <div style="cursor: pointer;background: #fff;margin-top:5px;padding: 2px" class="view-toolbar-list">
-                <Row>
-                    <Col span="8" v-for="(item,index) in btnList" :key="index">
-                        <div style="height: 30px;line-height: 30px" @click="handleClickToolbarBtn(item)">
-                            <Icon :type="item.icon" :size="viewSettingFont" :class="item.transform?'transform-icon':''"/>
-                            {{ item.title }}
-                            <span v-if="isSelected(item.index)" style="float: right;font-size: 20px">·</span>
-                        </div>
-                    </Col>
-                    <#--<Col span="8">
-                        <div style="height: 30px;line-height: 30px">
-                           &nbsp;
-                        </div>
-                    </Col>-->
-                </Row>
-            </div>
-
-            <div style="margin-top: 10px">
-                <Row>
-                    <Col span="4">
-                        <span style="display:inline-block;height: 30px;line-height: 30px;">每页展示条数：</span>
-                    </Col>
-                    <Col span="4">
-                        <i-input type="number" v-model="pageSize" @on-change="handleViewPageSizeChange"></i-input>
-                    </Col>
-                </Row>
-            </div>
-        </Modal>
-    </div>
-</script>
-<script>
-
-    Vue.component('j-view-setting', {
-        template: '#view-setting-template',
-        props: {
-            show:{
-                type: Boolean,
-                required: false,
-                default: false
-            },
-            settings:{
-                type: Object,
-                required: false,
-                default: ()=>{}
-            }
-        },
-        data(){
-            return {
-                enableViewSetting: true,
-                viewSettingFont: 20,
-                btnList:[
-                    { icon: 'ios-skip-backward', title: '首页', index: 1 },
-                    { icon: 'ios-play', title: '上一页', transform:true, index: 2 },
-                    { icon: 'ios-paper', title: '当前页/总页数', index: 3 },
-                    { icon: 'md-podium', title: '分页显示数', index: 4 },
-                    { icon: 'ios-play', title: '下一页', index: 5 },
-                    { icon: 'ios-skip-forward', title: '末页', index: 6 },
-                    { icon: 'ios-print', title: '打印', index: 7 },
-                    { icon: 'ios-cloud-download', title: '导出', index: 8, code:'' },
-                    { icon: 'md-switch', title: '清晰度设置', index: 9, code:'' }
-                ],
-                selectList:[],
-                selectedIndexList:[1, 2, 3, 4, 5, 6, 7, 8, 9],
-                showViewToolbar:true,
-                pageSize: ''
-            }
-        },
-        watch:{
-            settings:{
-                deep: true,
-                immediate: true,
-                handler: function(){
-                    this.resetForm()
-                }
-            }
-        },
-        methods:{
-            onViewSettingSave(){
-                let btnList = this.selectedIndexList
-                if(btnList.length==0){
-                    btnList.push(999)
-                }
-                let param = {
-                    show: this.showViewToolbar,
-                    btnList: btnList,
-                    pageSize: this.pageSize
-                }
-                this.$emit('change', param)
-            },
-            resetForm(){
-                if(this.settings){
-                    const { show, btnList, pageSize } = this.settings;
-                    if(show===false){
-                        this.showViewToolbar = false;
-                    }else{
-                        this.showViewToolbar = true;
-                    }
-                    if(btnList){
-                        if(btnList.length==0){
-                            this.selectedIndexList = [1,2,3,4,5,6,7,8,9]
-                        }else{
-                            this.selectedIndexList = [...btnList];
-                        }
-                    }
-                    if(pageSize){
-                        this.pageSize = pageSize;
-                    }
-                }
-            },
-            onViewSettingCancel(){
-                this.$emit('change', false)
-            },
-            handleClickToolbarBtn(item){
-                // console.log('handleClickToolbarBtn', item)
-                let index = item.index;
-                let position = this.selectedIndexList.indexOf(index)
-                if(position>=0){
-                    this.selectedIndexList.splice(position, 1)
-                }else{
-                    this.selectedIndexList.push(index)
-                }
-            },
-            isSelected(index){
-                if(this.selectedIndexList.indexOf(index)>=0){
-                    return true
-                }else{
-                    return false
-                }
-            },
-            resetViewToolbar(){
-                this.showViewToolbar = true
-                this.selectedIndexList = [1,2,3,4,5,6,7,8,9]
-            },
-            clearViewToolbar(){
-                this.selectedIndexList = []
-            },
-            hideViewToolbar(){
-                this.showViewToolbar = false
-            },
-            handleViewPageSizeChange(e){
-                if(!e.target.value){
-                    this.pageSize = ''
-                }else if(e.target.value<1){
-                    this.pageSize = 10
-                }
-            }
-
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl
deleted file mode 100644
index d56cfb166..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl
+++ /dev/null
@@ -1,127 +0,0 @@
-<script type="text/x-template" id="xAxis-setting-template">
-    <Submenu  name="11" style="border-bottom: inset 1px;">
-        <template slot="title">
-            <span class="rightFontSize">X轴设置</span>
-        </template>
-        <div class="blockDiv" style="padding-bottom: 10px">
-            <Row class="ivurow">
-                <p>显示&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 141px;" v-model="xAxisOption.show" @on-change="onXAxisChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>X轴名称&nbsp;&nbsp;</p>
-                <i-input class="rightFontSize iSelect" style="margin-left: 4px" size="small" v-model="xAxisOption.name" @on-blur="onXAxisChange"></i-input>
-            </Row>
-            <Row class="ivurow" v-if="isCharHasXMin">
-                <p>最小值&nbsp;&nbsp;</p>
-                <i-input size="small" class="rightFontSize iSelect" style="margin-left: 12px;" v-model="xAxisOption.min" @on-blur="onXAxisChange"/>
-            </Row>
-            <Row class="ivurow">
-                <p>分隔线&nbsp;&nbsp;</p>
-                <i-switch size="small" style="margin-left: 128px;" v-model="xAxisOption.splitLine_show" @on-change="onXAxisChange"/>
-            </Row>
-            <Row class="ivurow" v-if="typeof xAxisOption.splitLine_show !== 'undefined' && xAxisOption.splitLine_show == true">
-                <p>颜色设置&nbsp;&nbsp;</p>
-                <Col>
-                <i-input class="rightFontSize iSelect" v-model="xAxisOption.splitLine_lineStyle_color" size="small" @on-change="onXAxisChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="xAxisOption.splitLine_lineStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onXAxisChange"/>
-                    </span>
-                </i-input>
-
-                </Col>
-            </Row>
-            <Row class="ivurow" style="z-index: 2021">
-                <p>文字角度&nbsp;&nbsp;</p>
-                <slider v-model="xAxisOption.axisLabel_rotate" @on-change="onXAxisChange" style="margin-top: -9px;width: 140px;margin-left: 5px;"></slider>
-            </Row>
-            <Row class="ivurow">
-                <p>字体大小&nbsp;&nbsp;</p>
-                <i-input class="rightFontSize iSelect" size="small" type="number" v-model="xAxisOption.axisLabel_textStyle_fontSize" @on-blur="onXAxisChange"></i-input>
-            </Row>
-            <Row class="ivurow" v-if="typeof xAxisOption.axisLabel_textStyle_color !== 'undefined'">
-                <p>字体颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input class="rightFontSize iSelect" v-model="xAxisOption.axisLabel_textStyle_color" size="small" @on-change="onXAxisChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="xAxisOption.axisLabel_textStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onXAxisChange"/>
-                    </span>
-                </i-input>
-                </Col>
-            </Row>
-
-            <Row class="ivurow" v-if="typeof xAxisOption.axisLine_lineStyle_color !== 'undefined'">
-                <p>轴线颜色&nbsp;&nbsp;</p>
-                <Col>
-                <i-input class="rightFontSize iSelect" v-model="xAxisOption.axisLine_lineStyle_color" size="small" @on-change="onXAxisChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="xAxisOption.axisLine_lineStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onXAxisChange"/>
-                    </span>
-                </i-input>
-
-                </Col>
-            </Row>
-        </div>
-    </Submenu>
-</script>
-<script>
-    Vue.component('j-xaxis-setting', {
-        template: '#xAxis-setting-template',
-        props: {
-            settings: {
-                type: Object,
-                required: true,
-                default: () => {
-                }
-            }
-        },
-        data(){
-            return {
-                xAxisOption: {
-                    splitLine_lineStyle_color:'',
-                    axisLabel_textStyle_color:'',
-                    axisLine_lineStyle_color:'',
-                    splitLine_show:false
-                },
-                isCharHasXMin:true //是否显示x轴最小值
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            },
-            //update-begin--Author:wangshuai  Date:20211215 for：监听图表选中类型----
-            'vm.selectedChartType':{
-              immediate: true,
-              handler() {
-                //判断选中的图表是否为象形图，象形图不用设置最小值
-                if(vm.selectedChartType == 'pictorial.spirits'){
-                  this.isCharHasXMin=false;
-                }else{
-                  this.isCharHasXMin=true;
-                }
-              }
-            }
-            //update-end--Author:wangshuai  Date:20211215 for：监听图表选中类型----
-        },
-        methods: {
-            initData: function (){
-                if (this.settings){
-                    this.xAxisOption = Object.assign(this.xAxisOption, this.settings)
-                }
-            },
-            onXAxisChange(){
-                //update-begin--Author:wangshuai  Date:20211213 for：[issues/I4LZ63]折线图Y设置最小值;当存在最小值并且为空的时候那么就清空，保证数据初始化----
-                if(this.xAxisOption.hasOwnProperty("min") && !this.xAxisOption.min){
-                  delete this.xAxisOption.min
-                }
-                //update-end--Author:wangshuai  Date:20211213 for：[issues/I4LZ63]折线图Y设置最小值;当存在最小值并且为空的时候那么就清空，保证数据初始化----
-                this.$emit('change','xAxis', this.xAxisOption)
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl
deleted file mode 100644
index 2a5f5c286..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl
+++ /dev/null
@@ -1,161 +0,0 @@
-<script type="text/x-template" id="yAxis-setting-template">
-    <div>
-        <Submenu :name="'yAxis'+index" style="border-bottom: inset 1px;" v-for="(item,index) in yAxisOptions">
-            <template slot="title">
-                <span class="rightFontSize">{{getTitle(index)}}Y轴设置</span>
-            </template>
-            <div class="blockDiv" style="padding-bottom: 10px">
-                <Row class="ivurow">
-                    <p>显示&nbsp;&nbsp;</p>
-                    <i-switch size="small" style="margin-left: 141px;" v-model="item.show" @on-change="onYAxisChange"/>
-                </Row>
-                <Row class="ivurow">
-                    <p>Y轴名称&nbsp;&nbsp;</p>
-                    <i-input class="rightFontSize iSelect" size="small" v-model="item.name" @on-blur="onYAxisChange" style="margin-left: 4px"></i-input>
-                </Row>
-                <Row class="ivurow" v-if="isCharHasYMin">
-                    <p>最小值&nbsp;&nbsp;</p>
-                    <i-input size="small" class="rightFontSize iSelect" style="margin-left: 12px;" v-model="item.min" @on-blur="onYAxisChange"/>
-                </Row>
-                <Row class="ivurow">
-                    <p>分隔线&nbsp;&nbsp;</p>
-                    <i-switch size="small" style="margin-left: 128px;" v-model="item.splitLine_show" @on-change="onYAxisChange"/>
-                </Row>
-                <Row class="ivurow" v-if="typeof item.splitLine_show !== 'undefined' && item.splitLine_show == true">
-                    <p>颜色设置&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input class="rightFontSize iSelect" v-model="item.splitLine_lineStyle_color" size="small" @on-change="onYAxisChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="item.splitLine_lineStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onYAxisChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow">
-                    <p style="margin-bottom: 10px;">字体大小&nbsp;&nbsp;</p>
-                    <i-input class="rightFontSize iSelect" size="small" type="number" v-model="item.axisLabel_textStyle_fontSize" @on-blur="onYAxisChange"></i-input>
-                </Row>
-                <Row class="ivurow" v-if="typeof item.axisLabel_textStyle_color !== 'undefined'">
-                    <p>字体颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input class="rightFontSize iSelect" v-model="item.axisLabel_textStyle_color" size="small" @on-change="onYAxisChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="item.axisLabel_textStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onYAxisChange"/>
-                    </span>
-                    </i-input>
-                    </Col>
-                </Row>
-                <Row class="ivurow" v-if="typeof item.axisLine_lineStyle_color !== 'undefined'">
-                    <p>轴线颜色&nbsp;&nbsp;</p>
-                    <Col>
-                    <i-input class="rightFontSize iSelect" v-model="item.axisLine_lineStyle_color" size="small" @on-change="onYAxisChange">
-                    <span slot="append">
-                        <color-picker class="colorPicker" v-model="item.axisLine_lineStyle_color" :editable="false"  :transfer="true" size="small" @on-change="onYAxisChange"/>
-                    </span>
-                    </i-input>
-
-                    </Col>
-                </Row>
-            </div>
-        </Submenu>
-    </div>
-</script>
-<script>
-    Vue.component('j-yaxis-setting', {
-        template: '#yAxis-setting-template',
-        props: {
-            settings: {
-                type: [Object, Array],
-                required: true,
-                default: null
-            },
-            dataIndex: 0
-        },
-        data(){
-            return {
-                yAxisOption: {
-                  splitLine_show:false
-                },
-                yAxisOptions: [],
-                isCharHasYMin: true //是否显示y轴最小值
-            }
-        },
-        watch: {
-            settings: {
-                deep: true,
-                immediate: true,
-                handler: function (){
-                    this.initData()
-                }
-            },
-            //update-begin--Author:wangshuai  Date:20211215 for：监听图表选中类型----
-            'vm.selectedChartType':{
-              immediate: true,
-              handler() {
-                //判断选中的图表是否为象形图，象形图不用设置最小值
-                if(vm.selectedChartType == 'pictorial.spirits'){
-                  this.isCharHasYMin=false;
-                }else{
-                  this.isCharHasYMin=true;
-                }
-              }
-            }
-            //update-end--Author:wangshuai  Date:20211215 for：监听图表选中类型----
-        },
-        methods: {
-            getTitle: function(index) {
-                if (this.settings instanceof Array){
-                    if (index == 0){
-                        return '左'
-                    }
-                    if (index == 1){
-                        return '右'
-                    }
-                }else{
-                    return ''
-                }
-            },
-            initData: function (){
-                if (this.settings){
-                    if (this.settings instanceof Array){
-                        this.yAxisOptions = this.settings;
-                        this.yAxisOption = Object.assign(this.yAxisOption, this.settings[this.dataIndex])
-                    } else {
-                        this.yAxisOptions=[];
-                        this.yAxisOptions.push(this.settings);
-                        this.yAxisOption = Object.assign(this.yAxisOption, this.settings)
-                    }
-
-                }
-            },
-            onYAxisChange(){
-                if (this.settings instanceof Array){
-                    //update-begin--Author:wangshuai  Date:20211213 for：[issues/I4LZ63]折线图Y设置最小值;当存在最小值并且为空的时候那么就清空，保证数据初始化----
-                    this.initYAxisOptionsMin(this.yAxisOptions,true)
-                    //update-end--Author:wangshuai  Date:20211213 for：[issues/I4LZ63]折线图Y设置最小值;当存在最小值并且为空的时候那么就清空，保证数据初始化----
-                    this.$emit('change', 'yAxis', this.yAxisOptions)
-                } else {
-                    //update-begin--Author:wangshuai  Date:20211213 for：[issues/I4LZ63]折线图Y设置最小值;当存在最小值并且为空的时候那么就清空，保证数据初始化----
-                    this.initYAxisOptionsMin(this.yAxisOptions[0],false)
-                    //update-end--Author:wangshuai  Date:20211213 for：[issues/I4LZ63]折线图Y设置最小值;当存在最小值并且为空的时候那么就清空，保证数据初始化----
-                    this.$emit('change', 'yAxis', this.yAxisOptions[0])
-                }
-            },
-           /**
-            * 初始化最小值
-            * @param yAxisOptions y轴数组对象
-            * @param isArray 是否为数组 true是 false不是
-            */
-            initYAxisOptionsMin(yAxisOptions,isArray){
-              if(!yAxisOptions.min){
-                delete yAxisOptions.min
-                if(isArray){
-                  this.yAxisOptions = yAxisOptions
-                }else{
-                  this.yAxisOptions[0] = yAxisOptions 
-                }
-              }
-            }
-        }
-    })
-</script>
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl
deleted file mode 100644
index b6011f7f4..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl
+++ /dev/null
@@ -1,35 +0,0 @@
-<#include "components/select_input.ftl">
-<#include "components/barcode.ftl">
-<#include "components/qrcode.ftl">
-<#include "components/title_setting.ftl">
-<#include "components/bar_setting.ftl">
-<#include "components/line_setting.ftl">
-<#include "components/pie_setting.ftl">
-<#include "components/margin_setting.ftl">
-<#include "components/funnel_setting.ftl">
-<#include "components/pictorial_setting.ftl">
-<#include "components/scatter_setting.ftl">
-<#include "components/map_setting.ftl">
-<#include "components/radar_setting.ftl">
-<#include "components/gauge_setting.ftl">
-<#include "components/xAxis_setting.ftl">
-<#include "components/yAxis_setting.ftl">
-<#include "components/series_setting.ftl">
-<#include "components/tooltip_setting.ftl">
-<#include "components/grid_setting.ftl">
-<#include "components/legend_setting.ftl">
-<#include "components/background_setting.ftl">
-<#include "components/match_setting.ftl">
-<#include "components/data_source_setting.ftl">
-<#include "components/javabean_setting.ftl">
-<#include "components/central_point_setting.ftl">
-<#include "components/function_interpretation.ftl">
-<#include "components/data_dictionary.ftl">
-<#include "components/hyperlinks.ftl">
-<#include "components/print_setting.ftl">
-<#include "components/view_setting.ftl">
-<#include "components/chart_linkage.ftl">
-<#include "components/cell_linkage.ftl">
-<#include "components/primary_sub_report.ftl">
-<#include "components/sql_function_replace.ftl">
-<#include "components/bar_series_setting.ftl">
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl
deleted file mode 100644
index 3475babdf..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#include "components/jurisdiction.ftl">
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl
deleted file mode 100644
index 360943bba..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-<#include "components/select_scroll_radio.ftl">
-<#include "components/select_scroll_multiple.ftl">
\ No newline at end of file
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl
deleted file mode 100644
index 14a7b5f6b..000000000
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl
+++ /dev/null
@@ -1,308 +0,0 @@
-<#assign CACHE_VERSION = "v=1699715555.10">
-<#assign config_id = "${id!''}">
-<#assign shareView = "${shareView}">
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width">
-<title></title>
-<script>
-/**
-* 获取url参数
-*/
-function getLocalRequestUrl() {
-    var url = location.search;
-    var theRequest = new Object();
-    if (url.indexOf("?") != -1) {
-        var str = url.substr(1);
-        strs = str.split("&");
-        for(var i = 0; i < strs.length; i++) {
-            theRequest[strs[i].split("=")[0]]=decodeURI(strs[i].split("=")[1]);
-        }
-    }
-    return theRequest;
-}
-</script>
-<script>
-    let configId= '${config_id}';
-    var reportMode = "${mode!''}"
-    let base = '${base}';
-    let customPrePath = '${customPrePath}';
-    let baseFull = "${base}"+"${customPrePath}";
-    let shareView = "${shareView}";
-    let token = getLocalRequestUrl().token;
-    if(token && token!=null && token!=""){
-        window.localStorage.setItem('JmReport-Access-Token',token);
-    }
-    if (token == "" || token == null){
-        token = window.localStorage.getItem('JmReport-Access-Token');
-    }
-    /**
-     * 获取后台配置的报表配置
-     */
-    function getReportConfigJson() {
-        let str = '${reportConfig}';
-        return JSON.parse(str)
-    }
-</script>
-<#include "./common/resource.ftl">
-<#include "./template/components/tree_select.ftl">
-<#include "./template/view.ftl">
-<!-- Import via CDN -->
-<link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.css?${CACHE_VERSION}">
-<script src="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.js?${CACHE_VERSION}"></script>
-<script src="${base}${customPrePath}/jmreport/desreport_/corelib/locale/zh-cn.js?${CACHE_VERSION}"></script>
-<script src="${base}${customPrePath}/jmreport/desreport_/jquery/jquery-3.4.1.min.js"></script>
-<link rel="shortcut icon" href="${base}${customPrePath}/jmreport/desreport_/corelib/logo.png?${CACHE_VERSION}" type="image/x-ico">
-<script>
-    // $http.get({
-    //     url : api.show,
-    //     data:{"id":configId},
-    //     success : function(result) {
-    //         document.title = result.name;
-    //     }
-    // });
-</script>
-<style>
-  #jm-sheet-wrapper * {
-    color: #000000;
-    -webkit-tap-highlight-color: #000000!important;
-   }
-    body{
-        overflow-y:hidden !important;
-    }
-
-
-    /*--查询区域的样式设置 --*/
-  .ty-bar-container{
-      padding-left: 12px;
-  }
-
-  .jm-query-collapse .ivu-collapse-header .ivu-icon{
-      font-size: 20px;
-      font-weight: 700;
-      margin-right: 5px !important;
-  }
-
-  .jm-query-form .ivu-input{
-      padding: 3px 7px;
-      height: 28px;
-      border-radius: 3px;
-      width: 100% !important;
-  }
-
-  .jm-query-form .jmreport-query-datetime .ivu-input{
-      width: 160px;
-  }
-
-  .jm-query-form .ivu-select-selection{
-      width: 200px;
-  }
-
-  /*--多选 --*/
-  .jm-query-form .ivu-select-multiple .ivu-select-selection{
-      width: 200px;
-  }
-  
-  /*多选输入框鼠标位置显示问题*/
-  /*.jm-query-form .ivu-select-multiple .ivu-tag{*/
-  /*    height: 20px;*/
-  /*    line-height: 20px;*/
-  /*    margin: 3px 4px 3px 0;*/
-  /*    vertical-align: baseline;*/
-  /*    max-width: 62% !important;*/
-  /*}*/
-  
-  .jm-query-form .ivu-select-multiple .ivu-tag i{
-      top: 3px;
-  }
-
-  .jm-query-form  .ivu-btn{height:30px !important;}
-  .jm-query-form  .ivu-btn>.ivu-icon{
-      font-size:16px;
-  }
-
-
-  .jm-query-form .ivu-select-selection,
-  .jm-query-form .ivu-select-placeholder,
-  .jm-query-form .ivu-select-selected-value{
-      height: 28px !important;
-      line-height: 24px !important;
-  }
-
-  .jm-query-form .ivu-input-prefix i,
-  .jm-query-form .ivu-input-suffix i{
-      line-height: 28px !important;
-  }
-  /*--查询区域的样式设置 --*/
-
-  .jm-search-btns .ivu-form-item-content{
-      margin-left: 30px !important;
-  }
-  .jm-query-form .ivu-select-dropdown{
-      z-index: 99999;
-  }
-  [v-cloak]{
-      display: none;
-  }
-  .jm-select-box{
-      width: 200px
-  }  
-  
-  .jm-select-box .ivu-select-input{
-      height: 28px
-  }
-</style>
-<body onload="view.load('${config_id}')" style="overflow: hidden">
-<div id="app" style="overflow: hidden" v-cloak>
-    <!-- 查询条件 -begin -->
-    <div v-if="configQueryList && configQueryList.length>0">
-        <Collapse class="jm-query-collapse" @on-change="onQueryAreaSwitch" v-model="queryPanel">
-            <Panel name="1">
-                <span style="color: #000000;" title="点击展开显示查询信息">查 询 栏</span>
-                <div slot="content">
-                    <i-form ref="queryForm" :model="queryInfo" inline :label-width="100" class="jm-query-form" @keydown.native.enter.prevent="doReportQuery">
-                        <Row>
-                            <i-col :span="6" v-for="(item, index) in configQueryList" :key="index">
-                                <form-item style="margin-bottom: 12px !important;" :label="getQueryItemLabel(item)" :index="index">
-
-                                    <!-- 日期选择器 yyyy-MM-dd HH:mm:ss -->
-                                    <template v-if="item.type=='date'">
-                                        <Row v-if="item.mode==2" :class="'jmreport-query-'+item.realType">
-                                            <i-col span="11">
-                                                <date-picker :ref="item.key+'_begin'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_begin')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_begin']" :placeholder="'请选择起始值'"></date-picker>
-                                            </i-col>
-                                            <i-col span="2" style="text-align: center">&nbsp;~</i-col>
-                                            <i-col span="11">
-                                                <date-picker :ref="item.key+'_end'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_end')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_end']" :placeholder="'请选择结束值'"></date-picker>
-                                            </i-col>
-                                        </Row>
-                                        <date-picker v-else :ref="item.key" :type="item.realType" class="jm-select-box" :transfer="true" :format="item.format" :class="'jmreport-query-'+item.type" v-model="queryInfo['onlyshow_'+item.key]" @on-change="(str)=>handleQueryDateChange(str, item.key)" :placeholder="'请选择'+item.title"></date-picker>
-                                    </template>
-
-                                    <!-- 时间选择器 HH:mm:ss -->
-                                    <template v-else-if="item.type=='time'">
-                                        <Row v-if="item.mode==2" :class="'jmreport-query-'+item.realType">
-                                            <i-col span="11">
-                                                <time-picker :ref="item.key+'_begin'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_begin')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_begin']" :placeholder="'请选择起始值'"></time-picker>
-                                            </i-col>
-                                            <i-col span="2" style="text-align: center">&nbsp;~</i-col>
-                                            <i-col span="11">
-                                                <time-picker :ref="item.key+'_end'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_end')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_end']" :placeholder="'请选择结束值'"></time-picker>
-                                            </i-col>
-                                        </Row>
-                                        <time-picker :ref="item.key" :time-picker-options="{disabledHours:true}" v-else :type="item.realType" class="jm-select-box" :transfer="true" :format="item.format" :class="'jmreport-query-'+item.type" v-model="queryInfo['onlyshow_'+item.key]" @on-change="(str)=>handleQueryDateChange(str, item.key)" :placeholder="'请选择'+item.title"></time-picker>
-                                    </template>
-
-                                    <!-- 下拉树 -->
-                                    <template v-else-if="item.mode==6">
-                                        <j-tree-select :ref="item.key" :url="item.loadTree" :loadtreeurl="item.loadTreeByValue" v-model="queryInfo[item.key]"></j-tree-select>
-                                    </template>
-
-                                    <!-- 自定义下拉框 -->
-                                    <template v-else-if="item.mode==7">
-                                        <i-select :ref="item.key" class="jm-select-box" clearable :transfer="true" v-model="queryInfo[item.key]" :placeholder="'请选择'+item.title">
-                                            <i-option v-for="(dict, dIndex) in item.dictList" :key="dIndex" :index="index" :value="dict.value">{{ dict.text }}</i-option>
-                                        </i-select>
-                                    </template>
-
-                                    <template v-else>
-                                        <template v-if="item.dictList && item.dictList.length>0 && (item.mode==4 ||item.mode==3)">
-                                            <!-- 多选 -->
-                                            <j-select-scroll-multiple v-if="item.mode==3"  v-model="queryInfo['onlyshow_'+item.key]" :item="JSON.stringify(item)"  @dictmultipleok="handleDictMultipleOk" :index="index"></j-select-scroll-multiple>
-
-                                            <!-- 单选 -->
-                                            <j-select-scroll-radio v-if="item.mode==4"  v-model="queryInfo[item.key]" :item="JSON.stringify(item)"  @dictok="handleDictOk"></j-select-scroll-radio>
-                                        </template>
-
-                                        <!-- 数值查询 -->
-                                        <template v-else-if="item.type=='number'">
-                                            <Row v-if="item.mode==2">
-                                                <i-col span="11">
-                                                    <input-number :ref="item.key+'_begin'"  v-model="queryInfo[item.key+'_begin']" :placeholder="'请输入起始值'" clearable style="width: 100%"></input-number>
-                                                </i-col>
-                                                <i-col span="2" style="text-align: center">&nbsp;~</i-col>
-                                                <i-col span="11">
-                                                    <input-number :ref="item.key+'_end'" v-model="queryInfo[item.key+'_end']" :placeholder="'请输入结束值'" clearable style="width: 100%"></input-number>
-                                                </i-col>
-                                            </Row>
-                                            <input-number v-else :ref="item.key" class="jm-select-box" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable style="width: 100%"></input-number>
-                                        </template>
-
-                                        <!-- 默认输入框 模糊查询参数加* -->
-                                        <template v-else>
-                                            <i-input v-if="item.mode==5" :ref="item.key" @on-change="(e)=>handleLikeQueryChange(e, item.key)" class="jm-select-box" v-model="queryInfo['onlyshow_'+item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
-                                            <i-input v-else :ref="item.key" class="jm-select-box" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
-                                        </template>
-                                    </template>
-                                </form-item>
-                            </i-col>
-                            <i-col :span="6">
-                                <form-item class="jm-search-btns">
-                                    <i-button type="primary" icon="ios-search-outline" @click="doReportQuery">查询</i-button>
-                                    <i-button style="margin-left: 8px" icon="ios-redo-outline" @click="resetReportQuery">重置</i-button>
-                                </form-item>
-                            </i-col>
-                        </Row>
-
-                    </i-form>
-                </div>
-            </Panel>
-        </Collapse>
-    </div>
-    <!-- 查询条件 -end -->
-   <#-- <div>
-      <a v-if="returnPreviousPage" onclick="returnPreviousPageClick()">返回上一页</a>
-    </div>-->
-    <div id="jm-sheet-wrapper" style="width:100%;height: 100%"></div>
-
-    <!-- 报表参数弹框 -->
-    <Modal
-        :closable="false"
-        :mask-closable="false"
-        :loading="loading"
-        v-model="visible"
-        title="请填写报表参数"
-        :width="500">
-        <div slot="footer">
-            <i-button type="primary" @click="onSave" style="color:#fff !important;">确定</i-button>
-        </div>
-        <div style="padding-right: 30px">
-            <i-form :model="reportParamObj" label-colon :label-width="90">
-                <form-item :label="item.paramTxt" v-for="(item, index) in reportParamList">
-                    <i-input style="width: 90%" :key="index" v-model="reportParamObj[item.paramName]" :placeholder="'请输入'+ item.paramTxt "></i-input>
-                </form-item>
-            </i-form>
-        </div>
-    </Modal>
-    <Modal
-        :closable="false"
-        :mask-closable="false"
-        :loading="lockLoading"
-        v-model="lockVisible"
-        title="请填写密码"
-        :width="500">
-        <div slot="footer">
-            <i-button type="primary" @click="lockClick('${config_id}')">确定</i-button>
-        </div>
-        <div style="padding-right: 30px">
-            <i-form label-colon :label-width="90" @keydown.native.enter.prevent="lockClick('${config_id}')">
-                <form-item label="密码">
-                    <i-input v-model="lock" placeholder="请输入密码"></i-input>
-                </form-item>
-            </i-form>
-        </div>
-    </Modal>
-</div>
-<#--预览js-->
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/util.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/biz/row.express.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/biz/row.cycle.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/cdn/vue/xss-0.3.3.min.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/biz/view.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/cdn/vue/md5.min.js?${CACHE_VERSION}"></script>
-<script type="text/javascript" src="${base}${customPrePath}/jmreport/desreport_/js/biz/SignMd5Util.js?${CACHE_VERSION}"></script>
-<#include "./common/tj.ftl">
-</body>
-</html>
diff --git a/pom.xml b/pom.xml
index b2181a21c..79a160b1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <jasypt.version>3.0.5</jasypt.version>
         <ttl.version>2.12.6</ttl.version>
         <jaxb.version>2.3.5</jaxb.version>
-        <jimu.version>1.6.5</jimu.version>
+        <jimu.version>1.6.6-beta2</jimu.version>
         <aws.version>1.11.543</aws.version>
         <xxl.job.version>2.4.0</xxl.job.version>
         <activiti.version>5.22.0</activiti.version>

From 64d4dd64843b99b16fae8399f5b9597d0ac515c5 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sat, 3 Feb 2024 10:40:31 +0800
Subject: [PATCH 18/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20redis?=
 =?UTF-8?q?=20=E8=BF=87=E6=9C=9FAPI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/admin/controller/SysSystemInfoController.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemInfoController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemInfoController.java
index 3a7ea8554..bfe181b78 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemInfoController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemInfoController.java
@@ -32,7 +32,7 @@ public class SysSystemInfoController {
 	public R cache() {
 		Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
 		Properties commandStats = (Properties) redisTemplate
-			.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+			.execute((RedisCallback<Object>) connection -> connection.serverCommands().info("commandstats"));
 		Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
 
 		if (commandStats == null) {

From fa08b161f6fac018b97072c8682bb3cb319e194a Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 4 Feb 2024 16:42:22 +0800
Subject: [PATCH 19/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=8F=91=E5=8F=B7=E5=99=A8=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20retryTimes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java
index 17be26438..c352414a0 100755
--- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java
+++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java
@@ -1,10 +1,12 @@
 package com.pig4cloud.pigx.common.sequence.range.impl.db;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.pig4cloud.pigx.common.sequence.exception.SeqException;
 import com.pig4cloud.pigx.common.sequence.range.SeqRange;
 import com.pig4cloud.pigx.common.sequence.range.SeqRangeMgr;
 
 import javax.sql.DataSource;
+import java.util.concurrent.TimeUnit;
 
 /**
  * DB区间管理器
@@ -60,7 +62,9 @@ public class DbSeqRangeMgr implements SeqRangeMgr {
 			if (BaseDbHelper.updateRange(getDataSource(), getRealTableName(), newValue, oldValue, name)) {
 				return new SeqRange(oldValue + 1, newValue);
 			}
-			// else 失败重试
+
+			// else 1秒后 失败重试
+			ThreadUtil.sleep(1, TimeUnit.SECONDS);
 		}
 
 		throw new SeqException("Retried too many times, retryTimes = " + getRetryTimes());

From bf0cf113493f7d9e5491849a020cba9047e36574 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 4 Feb 2024 17:58:50 +0800
Subject: [PATCH 20/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=85=A8=E5=B1=80=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-gateway/pom.xml       |  5 ++
 .../GlobalExceptionConfiguration.java         | 75 ++++++++++++-------
 .../PigxSentinelAutoConfiguration.java        | 25 +------
 .../handle/GlobalBizExceptionHandler.java     | 18 ++++-
 .../ReactiveNoResourceFoundHandler.java       | 54 -------------
 .../handle/WebNoResourceFoundHandler.java     | 54 -------------
 6 files changed, 75 insertions(+), 156 deletions(-)
 delete mode 100644 pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java
 delete mode 100644 pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java

diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml
index f5da10422..15e6784a0 100644
--- a/pigx-common/pigx-common-gateway/pom.xml
+++ b/pigx-common/pigx-common-gateway/pom.xml
@@ -59,5 +59,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java
index 7537623d6..773d23c43 100644
--- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java
+++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java
@@ -9,11 +9,16 @@ import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
+import org.springframework.web.reactive.resource.NoResourceFoundException;
 
 /**
  * @author lengleng
@@ -27,34 +32,54 @@ import reactor.core.publisher.Mono;
 @RequiredArgsConstructor
 public class GlobalExceptionConfiguration implements ErrorWebExceptionHandler {
 
-	private final ObjectMapper objectMapper;
+    private final ObjectMapper objectMapper;
 
-	@Override
-	public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
-		ServerHttpResponse response = exchange.getResponse();
+    @Override
+    public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
+        ServerHttpResponse response = exchange.getResponse();
 
-		if (response.isCommitted()) {
-			return Mono.error(ex);
-		}
+        if (response.isCommitted()) {
+            return Mono.error(ex);
+        }
 
-		// header set
-		response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
-		if (ex instanceof ResponseStatusException) {
-			response.setStatusCode(((ResponseStatusException) ex).getStatusCode());
-		}
+        // header set
+        response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
+        if (ex instanceof ResponseStatusException) {
+            response.setStatusCode(((ResponseStatusException) ex).getStatusCode());
+        }
 
-		return response.writeWith(Mono.fromSupplier(() -> {
-			DataBufferFactory bufferFactory = response.bufferFactory();
-			try {
-				log.error("Error request :{} Error Spring Cloud Gateway : {}", exchange.getRequest().getPath(),
-						ex.getMessage());
-				return bufferFactory.wrap(objectMapper.writeValueAsBytes(R.failed(ex.getMessage())));
-			}
-			catch (JsonProcessingException e) {
-				log.warn("Error writing response", ex);
-				return bufferFactory.wrap(new byte[0]);
-			}
-		}));
-	}
+        return response.writeWith(Mono.fromSupplier(() -> {
+            DataBufferFactory bufferFactory = response.bufferFactory();
+            try {
+                log.error("Error request :{} Error Spring Cloud Gateway : {}", exchange.getRequest().getPath(),
+                        ex.getMessage());
+                return bufferFactory.wrap(objectMapper.writeValueAsBytes(R.failed(ex.getMessage())));
+            } catch (JsonProcessingException e) {
+                log.warn("Error writing response", ex);
+                return bufferFactory.wrap(new byte[0]);
+            }
+        }));
+    }
+
+}
+
+
+/**
+ * 保持和低版本请求路径不存在的行为一致
+ * <p>
+ * <a href="https://github.com/spring-projects/spring-boot/issues/38733">[Spring Boot
+ * 3.2.0] 404 Not Found behavior #38733</a>
+ */
+@Slf4j
+@RestControllerAdvice
+class ReactiveNoResourceFoundHandler {
+
+
+    @ExceptionHandler({NoResourceFoundException.class})
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public R noResourceFoundException(NoResourceFoundException exception) {
+        log.debug("请求路径 404 {}", exception.getMessage());
+        return R.failed(exception.getMessage());
+    }
 
 }
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java
index 69218e0a1..6bf549674 100755
--- a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java
+++ b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/PigxSentinelAutoConfiguration.java
@@ -23,14 +23,12 @@ import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.RequestOriginPars
 import com.pig4cloud.pigx.common.sentinel.feign.PigxSentinelFeign;
 import com.pig4cloud.pigx.common.sentinel.handle.GlobalBizExceptionHandler;
 import com.pig4cloud.pigx.common.sentinel.handle.PigxUrlBlockHandler;
-import com.pig4cloud.pigx.common.sentinel.handle.ReactiveNoResourceFoundHandler;
-import com.pig4cloud.pigx.common.sentinel.handle.WebNoResourceFoundHandler;
 import com.pig4cloud.pigx.common.sentinel.parser.PigxHeaderRequestOriginParser;
 import feign.Feign;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
@@ -77,28 +75,11 @@ public class PigxSentinelAutoConfiguration {
      * 创建一个全局业务异常处理器实例
      * 用于处理全局的业务异常
      */
+    @Bean
+    @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
     public GlobalBizExceptionHandler globalBizExceptionHandler() {
         return new GlobalBizExceptionHandler();
     }
 
-    /**
-     * 创建一个响应式资源未找到异常处理器实例
-     * 如果存在org.springframework.web.reactive.resource.NoResourceFoundException类，则创建一个ReactiveNoResourceFoundHandler实例
-     */
-    @Bean
-    @ConditionalOnClass(name = {"org.springframework.web.reactive.resource.NoResourceFoundException"})
-    public ReactiveNoResourceFoundHandler reactiveNoResourceFoundHandler() {
-        return new ReactiveNoResourceFoundHandler();
-    }
-
-    /**
-     * 创建一个Web资源未找到异常处理器实例
-     * 如果存在org.springframework.web.servlet.resource.NoResourceFoundException类，则创建一个WebNoResourceFoundHandler实例
-     */
-    @Bean
-    @ConditionalOnClass(name = {"org.springframework.web.servlet.resource.NoResourceFoundException"})
-    public WebNoResourceFoundHandler webNoResourceFoundHandler() {
-        return new WebNoResourceFoundHandler();
-    }
 
 }
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/GlobalBizExceptionHandler.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/GlobalBizExceptionHandler.java
index c2d053987..9c2485eeb 100644
--- a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/GlobalBizExceptionHandler.java
+++ b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/GlobalBizExceptionHandler.java
@@ -28,6 +28,7 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 import java.util.List;
 
@@ -36,7 +37,6 @@ import java.util.List;
  * @date 2020-06-29
  */
 @Slf4j
-@RestController
 @RestControllerAdvice
 public class GlobalBizExceptionHandler {
 
@@ -109,4 +109,20 @@ public class GlobalBizExceptionHandler {
 		return R.failed(HttpStatus.NOT_FOUND.getReasonPhrase());
 	}
 
+	/**
+	 * 保持和低版本请求路径不存在的行为一致
+	 * <p>
+	 * <a href="https://github.com/spring-projects/spring-boot/issues/38733">[Spring Boot
+	 * 3.2.0] 404 Not Found behavior #38733</a>
+	 *
+	 * @param exception
+	 * @return R
+	 */
+	@ExceptionHandler({NoResourceFoundException.class})
+	@ResponseStatus(HttpStatus.NOT_FOUND)
+	public R noResourceFoundException(NoResourceFoundException exception) {
+		log.debug("请求路径 404 {}", exception.getMessage());
+		return R.failed(exception.getMessage());
+	}
+
 }
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java
deleted file mode 100644
index 0fc19f13a..000000000
--- a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/ReactiveNoResourceFoundHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.sentinel.handle;
-
-import com.pig4cloud.pigx.common.core.util.R;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.reactive.resource.NoResourceFoundException;
-
-/**
- * @author lengleng
- * @date 2020-06-29
- */
-@Slf4j
-@RestController
-@RestControllerAdvice
-public class ReactiveNoResourceFoundHandler {
-
-    /**
-     * 保持和低版本请求路径不存在的行为一致
-     * <p>
-     * <a href="https://github.com/spring-projects/spring-boot/issues/38733">[Spring Boot
-     * 3.2.0] 404 Not Found behavior #38733</a>
-     *
-     * @param exception
-     * @return R
-     */
-    @ExceptionHandler({NoResourceFoundException.class})
-    @ResponseStatus(HttpStatus.NOT_FOUND)
-    public R noResourceFoundException(NoResourceFoundException exception) {
-        log.debug("请求路径 404 {}", exception.getMessage());
-        return R.failed(exception.getMessage());
-    }
-
-}
diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java
deleted file mode 100644
index 8899e4b25..000000000
--- a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/WebNoResourceFoundHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.sentinel.handle;
-
-import com.pig4cloud.pigx.common.core.util.R;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.resource.NoResourceFoundException;
-
-/**
- * @author lengleng
- * @date 2020-06-29
- */
-@Slf4j
-@RestController
-@RestControllerAdvice
-public class WebNoResourceFoundHandler {
-
-    /**
-     * 保持和低版本请求路径不存在的行为一致
-     * <p>
-     * <a href="https://github.com/spring-projects/spring-boot/issues/38733">[Spring Boot
-     * 3.2.0] 404 Not Found behavior #38733</a>
-     *
-     * @param exception
-     * @return R
-     */
-    @ExceptionHandler({NoResourceFoundException.class})
-    @ResponseStatus(HttpStatus.NOT_FOUND)
-    public R noResourceFoundException(NoResourceFoundException exception) {
-        log.debug("请求路径 404 {}", exception.getMessage());
-        return R.failed(exception.getMessage());
-    }
-
-}

From e030653d409c8da8489144c2920b897520c79095 Mon Sep 17 00:00:00 2001
From: luolin <766488893@qq.com>
Date: Sun, 4 Feb 2024 17:10:21 +0800
Subject: [PATCH 21/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D=E5=90=AB=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pig4cloud/pigx/common/security/util/SecurityUtils.java  | 2 +-
 .../com/pig4cloud/pigx/admin/controller/SysMenuController.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java
index abe04b869..e3fdde258 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java
@@ -70,7 +70,7 @@ public class SecurityUtils {
 	 * 获取用户角色信息
 	 * @return 角色集合
 	 */
-	public List<Long> getRoles() {
+	public List<Long> getRoleIds() {
 		Authentication authentication = getAuthentication();
 		Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
 
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java
index 5b94aa0bb..8475838c6 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java
@@ -59,7 +59,7 @@ public class SysMenuController {
 	public R getUserMenu(String type, Long parentId) {
 		// 获取符合条件的菜单
 		Set<SysMenu> all = new HashSet<>();
-		SecurityUtils.getRoles().forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId)));
+		SecurityUtils.getRoleIds().forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId)));
 		return R.ok(sysMenuService.filterMenu(all, type, parentId));
 	}
 

From d7f9cb21fbb3d19f7e136c8ef4547f3bdc7caa33 Mon Sep 17 00:00:00 2001
From: luolin <766488893@qq.com>
Date: Sun, 4 Feb 2024 17:43:55 +0800
Subject: [PATCH 22/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A7=92=E8=89=B2=E4=B8=8E=E8=8F=9C=E5=8D=95VO?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/admin/api/vo/RoleMenuVO.java         | 41 +++++++++++++
 .../pig4cloud/pigx/admin/api/vo/RoleVO.java   | 61 +++++++++++++++++--
 .../admin/controller/SysRoleController.java   |  4 +-
 .../pigx/admin/service/SysRoleService.java    |  4 +-
 .../service/impl/SysRoleServiceImpl.java      |  4 +-
 5 files changed, 104 insertions(+), 10 deletions(-)
 create mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleMenuVO.java

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleMenuVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleMenuVO.java
new file mode 100644
index 000000000..a08e1556d
--- /dev/null
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleMenuVO.java
@@ -0,0 +1,41 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.admin.api.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author lengleng
+ * @date 2020/2/10
+ */
+@Data
+@Schema(description = "前端角色展示对象")
+public class RoleMenuVO {
+
+	/**
+	 * 角色id
+	 */
+	private Long roleId;
+
+	/**
+	 * 菜单列表
+	 */
+	private String menuIds;
+
+}
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java
index ed698bf9d..a3f606f3e 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java
@@ -20,22 +20,75 @@ package com.pig4cloud.pigx.admin.api.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
+ * <p>
+ * 角色表
+ * </p>
+ *
  * @author lengleng
  * @date 2020/2/10
  */
 @Data
 @Schema(description = "前端角色展示对象")
-public class RoleVO {
+public class RoleVO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 角色id
+	 * 角色ID
 	 */
+	@Schema(description = "角色ID")
 	private Long roleId;
 
 	/**
-	 * 菜单列表
+	 * 角色名称
 	 */
-	private String menuIds;
+	@Schema(description = "角色名称")
+	private String roleName;
+
+	/**
+	 * 角色标识
+	 */
+	@Schema(description = "角色标识")
+	private String roleCode;
+
+	/**
+	 * 角色描述
+	 */
+	@Schema(description = "角色描述")
+	private String roleDesc;
+
+	/**
+	 * 数据权限类型
+	 */
+	@Schema(description = "数据权限类型")
+	private Integer dsType;
+
+	/**
+	 * 数据权限作用范围
+	 */
+	@Schema(description = "数据权限作用范围")
+	private String dsScope;
+
+	/**
+	 * 创建时间
+	 */
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 修改时间
+	 */
+	@Schema(description = "修改时间")
+	private LocalDateTime updateTime;
+
+	/**
+	 * 租户ID
+	 */
+	@Schema(description = "用户所属租户id")
+	private Long tenantId;
 
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java
index e8eac74ae..2ec9d9abb 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java
@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
 import com.pig4cloud.pigx.admin.api.vo.RoleExcelVO;
-import com.pig4cloud.pigx.admin.api.vo.RoleVO;
+import com.pig4cloud.pigx.admin.api.vo.RoleMenuVO;
 import com.pig4cloud.pigx.admin.service.SysRoleService;
 import com.pig4cloud.pigx.common.core.constant.CacheConstants;
 import com.pig4cloud.pigx.common.core.util.R;
@@ -146,7 +146,7 @@ public class SysRoleController {
 	@SysLog("更新角色菜单")
 	@PutMapping("/menu")
 	@PreAuthorize("@pms.hasPermission('sys_role_perm')")
-	public R saveRoleMenus(@RequestBody RoleVO roleVo) {
+	public R saveRoleMenus(@RequestBody RoleMenuVO roleVo) {
 		return R.ok(sysRoleService.updateRoleMenus(roleVo));
 	}
 
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java
index 51f54e67a..ea0502f82 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java
@@ -22,7 +22,7 @@ package com.pig4cloud.pigx.admin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
 import com.pig4cloud.pigx.admin.api.vo.RoleExcelVO;
-import com.pig4cloud.pigx.admin.api.vo.RoleVO;
+import com.pig4cloud.pigx.admin.api.vo.RoleMenuVO;
 import com.pig4cloud.pigx.common.core.util.R;
 import org.springframework.validation.BindingResult;
 
@@ -65,7 +65,7 @@ public interface SysRoleService extends IService<SysRole> {
 	 * @param roleVo 角色&菜单列表
 	 * @return
 	 */
-	Boolean updateRoleMenus(RoleVO roleVo);
+	Boolean updateRoleMenus(RoleMenuVO roleVo);
 
 	/**
 	 * 导入角色
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java
index 28569db15..9d653167e 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java
@@ -27,7 +27,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
 import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu;
 import com.pig4cloud.pigx.admin.api.vo.RoleExcelVO;
-import com.pig4cloud.pigx.admin.api.vo.RoleVO;
+import com.pig4cloud.pigx.admin.api.vo.RoleMenuVO;
 import com.pig4cloud.pigx.admin.mapper.SysRoleMapper;
 import com.pig4cloud.pigx.admin.service.SysRoleMenuService;
 import com.pig4cloud.pigx.admin.service.SysRoleService;
@@ -102,7 +102,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 	 * @return
 	 */
 	@Override
-	public Boolean updateRoleMenus(RoleVO roleVo) {
+	public Boolean updateRoleMenus(RoleMenuVO roleVo) {
 		return roleMenuService.saveRoleMenus(roleVo.getRoleId(), roleVo.getMenuIds());
 	}
 

From ac9165910524b4217e5e9857053ddd18efd61156 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Mon, 19 Feb 2024 13:02:16 +0800
Subject: [PATCH 23/46] =?UTF-8?q?:lock:=20Fixing=20security=20issues.=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E9=81=BF=E5=85=8DCVE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-bom/pom.xml                    | 10 +++++-----
 .../com/pig4cloud/pigx/common/xss/utils/XssUtil.java   |  2 +-
 pigx-register/pom.xml                                  |  8 ++++++++
 pom.xml                                                |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 14026797a..ea3c9e3bb 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -23,7 +23,7 @@
         <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <druid.version>1.2.20</druid.version>
         <hutool.version>5.8.23</hutool.version>
-        <mysql.connector.version>8.0.33</mysql.connector.version>
+        <mysql.connector.version>8.3.0</mysql.connector.version>
         <oracle.version>21.3.0.0</oracle.version>
         <sqlserver.version>8.4.1.jre8</sqlserver.version>
         <dm.version>8.1.2.192</dm.version>
@@ -31,12 +31,12 @@
         <knife4j.version>3.0.3</knife4j.version>
         <springdoc.version>2.1.0</springdoc.version>
         <swagger.core.version>2.2.14</swagger.core.version>
-        <mp.weixin.version>4.4.0</mp.weixin.version>
-        <ijpay.version>2.9.6-17</ijpay.version>
+        <mp.weixin.version>4.6.0</mp.weixin.version>
+        <ijpay.version>2.9.10-17</ijpay.version>
         <groovy.version>3.0.3</groovy.version>
         <javax.version>4.0.1</javax.version>
-        <jsoup.version>1.13.1</jsoup.version>
-        <aviator.version>5.3.3</aviator.version>
+        <jsoup.version>1.15.3</jsoup.version>
+        <aviator.version>5.4.1</aviator.version>
         <flowable.version>7.0.0</flowable.version>
         <security.oauth.version>2.5.2.RELEASE</security.oauth.version>
         <fastjson.version>1.2.83</fastjson.version>
diff --git a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/utils/XssUtil.java b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/utils/XssUtil.java
index 56fd550ac..249c9ced8 100644
--- a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/utils/XssUtil.java
+++ b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/utils/XssUtil.java
@@ -61,7 +61,7 @@ public class XssUtil {
 	 *
 	 * @author michael
 	 */
-	public static class HtmlWhitelist extends org.jsoup.safety.Whitelist {
+	public static class HtmlWhitelist extends org.jsoup.safety.Safelist {
 
 		public HtmlWhitelist() {
 			addTags("a", "b", "blockquote", "br", "caption", "cite", "code", "col", "colgroup", "dd", "div", "span",
diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml
index a6af08757..1c8ed8729 100644
--- a/pigx-register/pom.xml
+++ b/pigx-register/pom.xml
@@ -29,6 +29,7 @@
     <properties>
         <nacos.version>2.2.4-OEM</nacos.version>
         <rocksdb.version>7.10.2</rocksdb.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
         <spring-boot-dependencies.version>2.7.18</spring-boot-dependencies.version>
         <spring-cloud.version>2021.0.8</spring-cloud.version>
         <spring-boot-admin.version>2.7.11</spring-boot-admin.version>
@@ -116,6 +117,13 @@
                 <groupId>org.rocksdb</groupId>
                 <version>${rocksdb.version}</version>
             </dependency>
+
+            <!--   避免漏扫缺陷 -->
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/pom.xml b/pom.xml
index 79a160b1e..35fc76197 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <ttl.version>2.12.6</ttl.version>
         <jaxb.version>2.3.5</jaxb.version>
         <jimu.version>1.6.6-beta2</jimu.version>
-        <aws.version>1.11.543</aws.version>
+        <aws.version>1.12.261</aws.version>
         <xxl.job.version>2.4.0</xxl.job.version>
         <activiti.version>5.22.0</activiti.version>
         <docker.registry>172.17.0.111</docker.registry>

From 96278499dc0571a51b1cdfafd48a6c4938cda43c Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 1 Dec 2023 08:54:01 +0800
Subject: [PATCH 24/46] =?UTF-8?q?:sparkles:=20Introducing=20new=20features?=
 =?UTF-8?q?.=20@TenantTable=20=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/AppArticleCategoryEntity.java  |   2 +
 .../api/entity/AppArticleCollectEntity.java   |   2 +
 .../pigx/app/api/entity/AppArticleEntity.java |   2 +
 .../pigx/app/api/entity/AppPageEntity.java    |   2 +
 .../pigx/app/api/entity/AppRole.java          |   2 +
 .../pigx/app/api/entity/AppTabbarEntity.java  |   2 +
 .../pigx/app/api/entity/AppUser.java          |   2 +
 .../pigx/common/core/util/TenantTable.java    |  15 +++
 .../common/data/tenant/PigxTenantHandler.java | 101 ++++++++++--------
 .../pigx/flow/task/entity/Process.java        |   2 +
 .../pigx/flow/task/entity/ProcessCopy.java    |   2 +
 .../pigx/flow/task/entity/ProcessGroup.java   |   2 +
 .../task/entity/ProcessInstanceRecord.java    |   2 +
 .../flow/task/entity/ProcessNodeData.java     |   2 +
 .../flow/task/entity/ProcessNodeRecord.java   |   2 +
 .../entity/ProcessNodeRecordAssignUser.java   |   2 +
 .../pigx/flow/task/entity/ProcessStarter.java |   2 +
 .../pigx/admin/api/entity/SysAuditLog.java    |   2 +
 .../pigx/admin/api/entity/SysDept.java        |   2 +
 .../pigx/admin/api/entity/SysDict.java        |   2 +
 .../pigx/admin/api/entity/SysDictItem.java    |   2 +
 .../pigx/admin/api/entity/SysFile.java        |   2 +
 .../pigx/admin/api/entity/SysFileGroup.java   |   2 +
 .../pigx/admin/api/entity/SysLog.java         |   2 +
 .../pigx/admin/api/entity/SysMenu.java        |   2 +
 .../admin/api/entity/SysMessageEntity.java    |   2 +
 .../api/entity/SysMessageRelationEntity.java  |   2 +
 .../api/entity/SysOauthClientDetails.java     |   2 +
 .../pigx/admin/api/entity/SysPost.java        |   2 +
 .../pigx/admin/api/entity/SysPublicParam.java |   2 +
 .../pigx/admin/api/entity/SysRole.java        |   2 +
 .../admin/api/entity/SysScheduleEntity.java   |   2 +
 .../admin/api/entity/SysSocialDetails.java    |   2 +
 .../pigx/admin/api/entity/SysUser.java        |   2 +
 .../codegen/entity/GenDatasourceConf.java     |   2 +
 .../pigx/codegen/entity/GenFormConf.java      |   2 +
 .../codegen/entity/GenTemplateEntity.java     |   2 +
 .../pigx/daemon/quartz/entity/SysJob.java     |   8 +-
 .../pigx/daemon/quartz/entity/SysJobLog.java  |   8 +-
 .../pig4cloud/pigx/mp/entity/WxAccount.java   |   2 +
 .../pigx/mp/entity/WxAccountFans.java         |   2 +
 .../pigx/mp/entity/WxAccountTag.java          |   2 +
 .../pig4cloud/pigx/mp/entity/WxAutoReply.java |   2 +
 .../pig4cloud/pigx/mp/entity/WxMpMenu.java    |   2 +
 .../com/pig4cloud/pigx/mp/entity/WxMsg.java   |   2 +
 .../pig4cloud/pigx/pay/entity/PayChannel.java |   2 +
 .../pigx/pay/entity/PayGoodsOrder.java        |   2 +
 .../pigx/pay/entity/PayNotifyRecord.java      |   2 +
 .../pigx/pay/entity/PayRefundOrder.java       |   2 +
 .../pigx/pay/entity/PayTradeOrder.java        |   2 +
 50 files changed, 173 insertions(+), 51 deletions(-)
 create mode 100644 pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantTable.java

diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCategoryEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCategoryEntity.java
index d07072b30..23df14c6a 100644
--- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCategoryEntity.java
+++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCategoryEntity.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-07 16:28:03
  */
 @Data
+@TenantTable
 @TableName("app_article_category")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "文章分类表")
diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java
index fe1a28b02..fcbf5b63b 100644
--- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java
+++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-16 14:33:41
  */
 @Data
+@TenantTable
 @TableName("app_article_collect")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "文章收藏表")
diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleEntity.java
index 22cd08ead..6acc8d1e6 100644
--- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleEntity.java
+++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleEntity.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,6 +17,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-07 16:32:35
  */
 @Data
+@TenantTable
 @FieldNameConstants
 @TableName("app_article")
 @EqualsAndHashCode(callSuper = true)
diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java
index 74ed0c885..6859d75d3 100644
--- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java
+++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,6 +15,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-08 11:19:23
  */
 @Data
+@TenantTable
 @TableName("app_page")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "页面")
diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java
index ed34378bc..ec63649a6 100644
--- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java
+++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,7 @@ import java.time.LocalDateTime;
  * @date 2022-12-07 09:52:03
  */
 @Data
+@TenantTable
 @TableName("app_role")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "app角色表")
diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java
index 66dc8fc06..70a5bb8db 100644
--- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java
+++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonRawValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-08 11:18:46
  */
 @Data
+@TenantTable
 @TableName("app_tabbar")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "导航栏")
diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java
index 12f5d5e63..e19428144 100644
--- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java
+++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java
@@ -20,6 +20,7 @@ package com.pig4cloud.pigx.app.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,6 +34,7 @@ import java.time.LocalDateTime;
  * @date 2022-12-07 09:52:03
  */
 @Data
+@TenantTable
 @TableName("app_user")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "app用户表")
diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantTable.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantTable.java
new file mode 100644
index 000000000..5b722ec65
--- /dev/null
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantTable.java
@@ -0,0 +1,15 @@
+package com.pig4cloud.pigx.common.core.util;
+
+import java.lang.annotation.*;
+
+/**
+ * @author lengleng
+ * @since v5.3
+ * <p>
+ * table 实体增加此组件自动声明为租户表
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+public @interface TenantTable {
+}
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java
index a58f7d37a..b843d1391 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java
@@ -17,12 +17,18 @@
 
 package com.pig4cloud.pigx.common.data.tenant;
 
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.NullValue;
+import org.springframework.core.annotation.AnnotationUtils;
+
+import java.util.Objects;
 
 /**
  * @author lengleng
@@ -34,54 +40,63 @@ import net.sf.jsqlparser.expression.NullValue;
 @RequiredArgsConstructor
 public class PigxTenantHandler implements TenantLineHandler {
 
-	private final PigxTenantConfigProperties properties;
+    private final PigxTenantConfigProperties properties;
 
-	/**
-	 * 获取租户 ID 值表达式，只支持单个 ID 值
-	 * <p>
-	 * @return 租户 ID 值表达式
-	 */
-	@Override
-	public Expression getTenantId() {
-		Long tenantId = TenantContextHolder.getTenantId();
-		log.debug("当前租户为 >> {}", tenantId);
+    /**
+     * 获取租户 ID 值表达式，只支持单个 ID 值
+     * <p>
+     *
+     * @return 租户 ID 值表达式
+     */
+    @Override
+    public Expression getTenantId() {
+        Long tenantId = TenantContextHolder.getTenantId();
+        log.debug("当前租户为 >> {}", tenantId);
 
-		if (tenantId == null) {
-			return new NullValue();
-		}
-		return new LongValue(tenantId);
-	}
+        if (tenantId == null) {
+            return new NullValue();
+        }
+        return new LongValue(tenantId);
+    }
 
-	/**
-	 * 获取租户字段名
-	 * @return 租户字段名
-	 */
-	@Override
-	public String getTenantIdColumn() {
-		return properties.getColumn();
-	}
+    /**
+     * 获取租户字段名
+     *
+     * @return 租户字段名
+     */
+    @Override
+    public String getTenantIdColumn() {
+        return properties.getColumn();
+    }
 
-	/**
-	 * 根据表名判断是否忽略拼接多租户条件
-	 * <p>
-	 * 默认都要进行解析并拼接多租户条件
-	 * @param tableName 表名
-	 * @return 是否忽略, true:表示忽略，false:需要解析并拼接多租户条件
-	 */
-	@Override
-	public boolean ignoreTable(String tableName) {
-		// 判断是否跳过当前查询的租户过滤
-		if (TenantContextHolder.getTenantSkip()) {
-			return Boolean.TRUE;
-		}
+    /**
+     * 根据表名判断是否忽略拼接多租户条件
+     * <p>
+     * 默认都要进行解析并拼接多租户条件
+     *
+     * @param tableName 表名
+     * @return 是否忽略, true:表示忽略，false:需要解析并拼接多租户条件
+     */
+    @Override
+    public boolean ignoreTable(String tableName) {
+        // 判断是否跳过当前查询的租户过滤
+        if (TenantContextHolder.getTenantSkip()) {
+            return Boolean.TRUE;
+        }
 
-		Long tenantId = TenantContextHolder.getTenantId();
-		// 租户中ID 为空，查询全部，不进行过滤
-		if (tenantId == null) {
-			return Boolean.TRUE;
-		}
+        Long tenantId = TenantContextHolder.getTenantId();
+        // 租户中ID 为空，查询全部，不进行过滤
+        if (tenantId == null) {
+            return Boolean.TRUE;
+        }
 
-		return !properties.getTables().contains(tableName);
-	}
+        //  判断实体类是否标记为多租户隔离
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(tableName);
+        TenantTable annotation = null;
+        if (Objects.nonNull(tableInfo)) {
+            annotation = AnnotationUtils.findAnnotation(tableInfo.getEntityType(), TenantTable.class);
+        }
+        return !properties.getTables().contains(tableName) && annotation == null;
+    }
 
 }
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java
index 0fd7edb85..9473e03b5 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process")
 public class Process {
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessCopy.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessCopy.java
index 6ef5a54e2..748be68c7 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessCopy.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessCopy.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_copy")
 public class ProcessCopy {
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessGroup.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessGroup.java
index df004a0fb..43459ec49 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessGroup.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessGroup.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_group")
 public class ProcessGroup {
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessInstanceRecord.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessInstanceRecord.java
index 3295fe7da..23b9fa788 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessInstanceRecord.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessInstanceRecord.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -18,6 +19,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_instance_record")
 public class ProcessInstanceRecord {
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeData.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeData.java
index c7aa4f1fb..a3ea81612 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeData.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeData.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_node_data")
 public class ProcessNodeData {
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecord.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecord.java
index c5f57b365..eb8718f5b 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecord.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecord.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -18,6 +19,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_node_record")
 public class ProcessNodeRecord {
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecordAssignUser.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecordAssignUser.java
index 9424137a0..30704c3ab 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecordAssignUser.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecordAssignUser.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_node_record_assign_user")
 public class ProcessNodeRecordAssignUser {
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessStarter.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessStarter.java
index c29cdaf16..83774e976 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessStarter.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessStarter.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_starter")
 public class ProcessStarter {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java
index 82d451329..aaa1a82b7 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2023-02-28 20:12:23
  */
 @Data
+@TenantTable
 @TableName("sys_audit_log")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "审计记录表")
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java
index 65472fba9..b0d2405b5 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java
@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2018-01-22
  */
 @Data
+@TenantTable
 @Schema(description = "部门")
 @EqualsAndHashCode(callSuper = true)
 public class SysDept extends Model<SysDept> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java
index a2af1f189..6d6294af7 100755
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java
@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,6 +32,7 @@ import java.time.LocalDateTime;
  * @date 2019/03/19
  */
 @Data
+@TenantTable
 @Schema(description = "字典类型")
 @EqualsAndHashCode(callSuper = true)
 public class SysDict extends Model<SysDict> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java
index ae3273041..e4ea3ccb0 100755
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019/03/19
  */
 @Data
+@TenantTable
 @Schema(description = "字典项")
 @EqualsAndHashCode(callSuper = true)
 public class SysDictItem extends Model<SysDictItem> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java
index 66a1a3c4e..94faffb94 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-06-18 17:18:42
  */
 @Data
+@TenantTable
 @Schema(description = "文件")
 @EqualsAndHashCode(callSuper = true)
 public class SysFile extends Model<SysFile> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java
index 2a490ce25..544049d04 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023/7/25
  */
 @Data
+@TenantTable
 @Schema(description = "文件")
 @EqualsAndHashCode(callSuper = true)
 public class SysFileGroup extends Model<SysFile> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java
index 257951f6b..0cc003d4d 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java
@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
 import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -40,6 +41,7 @@ import java.time.LocalDateTime;
  * @since 2017-11-20
  */
 @Data
+@TenantTable
 @Schema(description = "日志")
 public class SysLog implements Serializable {
 
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java
index e59229ef2..47460e3ef 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java
@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-11-08
  */
 @Data
+@TenantTable
 @Schema(description = "菜单")
 @EqualsAndHashCode(callSuper = true)
 public class SysMenu extends Model<SysMenu> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageEntity.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageEntity.java
index 552e1b1b7..0a5b3b2d8 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageEntity.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageEntity.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-10-25 13:37:25
  */
 @Data
+@TenantTable
 @TableName("sys_message")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "站内信息")
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageRelationEntity.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageRelationEntity.java
index 711512947..c32c2d25c 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageRelationEntity.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageRelationEntity.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-10-25 18:07:23
  */
 @Data
+@TenantTable
 @TableName("sys_message_relation")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "系统消息推送记录")
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java
index 4a1c0dd4b..7acc2c1ba 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java
@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,6 +38,7 @@ import java.time.LocalDateTime;
  * @since 2018-05-15
  */
 @Data
+@TenantTable
 @Schema(description = "客户端信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysOauthClientDetails extends Model<SysOauthClientDetails> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java
index ab38395ef..37f08fdbb 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,7 @@ import java.time.LocalDateTime;
  * @date 2022-03-26 12:50:43
  */
 @Data
+@TenantTable
 @TableName("sys_post")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "岗位信息表")
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java
index 5c978830a..d62886027 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-04-29
  */
 @Data
+@TenantTable
 @Schema(description = "公共参数")
 @EqualsAndHashCode(callSuper = true)
 public class SysPublicParam extends Model<SysPublicParam> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java
index cb0b16b39..ad25fb83f 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java
@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-10-29
  */
 @Data
+@TenantTable
 @Schema(description = "角色")
 @EqualsAndHashCode(callSuper = true)
 public class SysRole extends Model<SysRole> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java
index dc62458e4..4abb96cbe 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,7 @@ import java.time.LocalTime;
  * @date 2023-03-06 14:26:23
  */
 @Data
+@TenantTable
 @TableName("sys_schedule")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "日程")
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java
index 9d5ac8ccb..0c2d9d791 100755
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java
@@ -20,6 +20,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import com.pig4cloud.pigx.common.core.util.ValidGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -35,6 +36,7 @@ import java.time.LocalDateTime;
  * @date 2018-08-16 21:30:41
  */
 @Data
+@TenantTable
 @Schema(description = "第三方账号信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysSocialDetails extends Model<SysSocialDetails> {
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java
index edc0bdd9b..f12f4ada1 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java
@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.javers.core.metamodel.annotation.DiffInclude;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-10-29
  */
 @Data
+@TenantTable
 @Schema(description = "用户")
 public class SysUser implements Serializable {
 
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java
index 682675bb1..b5395c47c 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java
@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.codegen.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +31,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-31 16:00:20
  */
 @Data
+@TenantTable
 @TableName("gen_datasource_conf")
 @EqualsAndHashCode(callSuper = true)
 public class GenDatasourceConf extends Model<GenDatasourceConf> {
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java
index 11c2e1a74..d142892cb 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.codegen.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-08-12 15:55:35
  */
 @Data
+@TenantTable
 @TableName("gen_form_conf")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "生成记录")
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java
index a73178f77..f979a8b04 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.codegen.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2023-02-21 17:15:44
  */
 @Data
+@TenantTable
 @TableName("gen_template")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "模板")
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java
index 8fa4004ed..ffbb979a7 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java
+++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java
@@ -22,11 +22,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -37,9 +35,11 @@ import java.time.LocalDateTime;
  */
 @Data
 @Builder
+@TenantTable
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "定时任务")
+@EqualsAndHashCode(callSuper = true)
 public class SysJob extends Model<SysJob> {
 
 	private static final long serialVersionUID = 1L;
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java
index b6d08866f..f5a04134b 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java
+++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java
@@ -22,11 +22,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -38,9 +36,11 @@ import java.time.LocalDateTime;
  */
 @Data
 @Builder
+@TenantTable
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "定时任务日志")
+@EqualsAndHashCode(callSuper = true)
 public class SysJobLog extends Model<SysJobLog> {
 
 	private static final long serialVersionUID = 1L;
diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java
index 7314bd101..8114bbb10 100644
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java
@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
 import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-26 22:07:53
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxAccount extends Model<WxAccount> {
 
diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java
index 558d373b3..d6b4025ae 100644
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java
@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +31,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-26 22:08:08
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxAccountFans extends Model<WxAccountFans> {
 
diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java
index b90769a82..5fc51a818 100644
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2021/12/31
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxAccountTag extends Model<WxAccount> {
 
diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java
index 65b6c88a7..921d03a9f 100644
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2019-04-18 15:40:39
  */
 @Data
+@TenantTable
 @TableName("wx_auto_reply")
 @EqualsAndHashCode(callSuper = true)
 public class WxAutoReply extends Model<WxAutoReply> {
diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java
index 566cc0da1..d1eea5e10 100644
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java
@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +31,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-27 20:45:18
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxMpMenu extends Model<WxMpMenu> {
 
diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java
index 91bf91f01..6af10d25b 100644
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 16:12:10
  */
 @Data
+@TenantTable
 @TableName("wx_msg")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "微信消息")
diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java
index b290c429d..ecc4b1f76 100755
--- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java
+++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:57:58
  */
 @Data
+@TenantTable
 @TableName("pay_channel")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "渠道")
diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java
index 54b841a35..2bba72966 100755
--- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java
+++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:58:27
  */
 @Data
+@TenantTable
 @TableName("pay_goods_order")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "商品订单表")
diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java
index f23a47931..9b2fd25c9 100755
--- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java
+++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:57:23
  */
 @Data
+@TenantTable
 @TableName("pay_notify_record")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "异步通知记录")
diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java
index 3c59fe679..f58913085 100755
--- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java
+++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:58:11
  */
 @Data
+@TenantTable
 @TableName("pay_refund_order")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "退款订单表")
diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java
index 196809808..f8d9aafbb 100755
--- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java
+++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:58:18
  */
 @Data
+@TenantTable
 @TableName("pay_trade_order")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "支付订单表")

From 48fcea997811a4e97fe60df8576a075aa23a9452 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sat, 17 Feb 2024 17:06:28 +0800
Subject: [PATCH 25/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=92=89=E9=92=89=E4=BC=81=E4=B8=9A=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=94=AF=E6=8C=81=E5=90=8E=E7=AB=AF=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E9=85=8D=E7=BD=AE=E5=BA=94=E7=94=A8=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=20#5478?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/api/entity/SysSocialDetails.java    |  4 +-
 .../SysSocialDetailsController.java           | 10 +++
 .../service/SysSocialDetailsService.java      |  3 +
 .../impl/SysSocialDetailsServiceImpl.java     | 86 ++++++++++++-------
 4 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java
index 0c2d9d791..156705905 100755
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java
@@ -27,6 +27,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.experimental.FieldNameConstants;
+
 import java.time.LocalDateTime;
 
 /**
@@ -36,7 +38,7 @@ import java.time.LocalDateTime;
  * @date 2018-08-16 21:30:41
  */
 @Data
-@TenantTable
+@FieldNameConstants
 @Schema(description = "第三方账号信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysSocialDetails extends Model<SysSocialDetails> {
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java
index 2e9a279a7..acd685242 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java
@@ -65,6 +65,16 @@ public class SysSocialDetailsController {
 		return R.ok(sysSocialDetailsService.page(page, Wrappers.query(sysSocialDetails)));
 	}
 
+	/**
+	 * 获取当前租户的三方登录列表
+	 * @return R List
+	 */
+	@Inner(value = false)
+	@GetMapping("/getLoginAppList")
+	public R getLoginAppList(){
+		return R.ok(sysSocialDetailsService.selectList());
+	}
+
 	/**
 	 * 信息
 	 * @param type 类型
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java
index 2541e569f..1994e3255 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java
@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.pigx.admin.api.dto.UserInfo;
 import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails;
 
+import java.util.List;
+
 /**
  * 系统社交登录账号表
  *
@@ -44,4 +46,5 @@ public interface SysSocialDetailsService extends IService<SysSocialDetails> {
 	 */
 	UserInfo getUserInfo(String inStr);
 
+    List<SysSocialDetails> selectList();
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java
index d50b54b09..05824c006 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java
@@ -18,6 +18,7 @@
 package com.pig4cloud.pigx.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.dto.UserInfo;
 import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails;
@@ -30,10 +31,13 @@ import com.pig4cloud.pigx.common.core.constant.CacheConstants;
 import com.pig4cloud.pigx.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author lengleng
@@ -43,44 +47,60 @@ import java.util.Map;
 @AllArgsConstructor
 @Service("sysSocialDetailsService")
 public class SysSocialDetailsServiceImpl extends ServiceImpl<SysSocialDetailsMapper, SysSocialDetails>
-		implements SysSocialDetailsService {
+        implements SysSocialDetailsService {
 
-	private final Map<String, LoginHandler> loginHandlerMap;
+    private final Map<String, LoginHandler> loginHandlerMap;
 
-	private final CacheManager cacheManager;
+    private final CacheManager cacheManager;
 
-	private final SysUserMapper sysUserMapper;
+    private final SysUserMapper sysUserMapper;
 
-	/**
-	 * 绑定社交账号
-	 * @param type type
-	 * @param code code
-	 * @return
-	 */
-	@Override
-	public Boolean bindSocial(String type, String code) {
-		LoginHandler loginHandler = loginHandlerMap.get(type);
-		// 绑定逻辑
-		String identify = loginHandler.identify(code);
-		SysUser sysUser = sysUserMapper.selectById(SecurityUtils.getUser().getId());
-		loginHandler.bind(sysUser, identify);
+    /**
+     * 绑定社交账号
+     *
+     * @param type type
+     * @param code code
+     * @return
+     */
+    @Override
+    public Boolean bindSocial(String type, String code) {
+        LoginHandler loginHandler = loginHandlerMap.get(type);
+        // 绑定逻辑
+        String identify = loginHandler.identify(code);
+        SysUser sysUser = sysUserMapper.selectById(SecurityUtils.getUser().getId());
+        loginHandler.bind(sysUser, identify);
 
-		// 更新緩存
-		cacheManager.getCache(CacheConstants.USER_DETAILS).evict(sysUser.getUsername());
-		return Boolean.TRUE;
-	}
+        // 更新緩存
+        cacheManager.getCache(CacheConstants.USER_DETAILS).evict(sysUser.getUsername());
+        return Boolean.TRUE;
+    }
 
-	/**
-	 * 根据入参查询用户信息
-	 * @param inStr TYPE@code
-	 * @return
-	 */
-	@Override
-	public UserInfo getUserInfo(String inStr) {
-		String[] inStrs = inStr.split(StringPool.AT);
-		String type = inStrs[0];
-		String loginStr = inStr.substring(type.length() + 1);
-		return loginHandlerMap.get(type).handle(loginStr);
-	}
+    /**
+     * 根据入参查询用户信息
+     *
+     * @param inStr TYPE@code
+     * @return
+     */
+    @Override
+    public UserInfo getUserInfo(String inStr) {
+        String[] inStrs = inStr.split(StringPool.AT);
+        String type = inStrs[0];
+        String loginStr = inStr.substring(type.length() + 1);
+        return loginHandlerMap.get(type).handle(loginStr);
+    }
 
+    /**
+     * 查询当前租户下的三方应用信息 ，脱敏 appSecret
+     *
+     * @return List<SysSocialDetails>
+     */
+    @Override
+    public List<SysSocialDetails> selectList() {
+        List<SysSocialDetails> sysSocialDetailsList = baseMapper.selectList(Wrappers.query());
+        return sysSocialDetailsList.stream().map(sysSocialDetails -> {
+            SysSocialDetails newSysSocialDetails = new SysSocialDetails();
+            BeanUtils.copyProperties(sysSocialDetails, newSysSocialDetails, SysSocialDetails.Fields.appSecret);
+            return newSysSocialDetails;
+        }).collect(Collectors.toList());
+    }
 }

From bd762afa2da029e49b252af51e2806070da8e39d Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sat, 17 Feb 2024 14:47:47 +0800
Subject: [PATCH 26/46] =?UTF-8?q?:sparkles:=20Introducing=20new=20features?=
 =?UTF-8?q?.=20=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/admin/api/entity/SysAreaEntity.java  | 128 +++++++++++++++++
 .../admin/controller/SysAreaController.java   | 135 ++++++++++++++++++
 .../pigx/admin/mapper/SysAreaMapper.java      |  11 ++
 .../pigx/admin/service/SysAreaService.java    |  28 ++++
 .../service/impl/SysAreaServiceImpl.java      |  74 ++++++++++
 .../main/resources/mapper/SysAreaMapper.xml   |  24 ++++
 6 files changed, 400 insertions(+)
 create mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAreaEntity.java
 create mode 100644 pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java
 create mode 100644 pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysAreaMapper.java
 create mode 100644 pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysAreaService.java
 create mode 100644 pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java
 create mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysAreaMapper.xml

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAreaEntity.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAreaEntity.java
new file mode 100644
index 000000000..e61b3baf9
--- /dev/null
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAreaEntity.java
@@ -0,0 +1,128 @@
+package com.pig4cloud.pigx.admin.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.FieldNameConstants;
+
+import java.time.LocalDateTime;
+
+/**
+ * 行政区划表
+ *
+ * @author lbw
+ * @date 2024-02-16 21:59:02
+ */
+@Data
+@FieldNameConstants
+@TableName("sys_area")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "行政区划表")
+public class SysAreaEntity extends Model<SysAreaEntity> {
+
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键ID")
+    private Long id;
+
+    /**
+     * 父ID
+     */
+    @Schema(description = "父ID")
+    private Long pid;
+
+    /**
+     * 地区名称
+     */
+    @Schema(description = "地区名称")
+    private String name;
+
+    /**
+     * 地区字母
+     */
+    @Schema(description = "地区字母")
+    private String letter;
+
+    /**
+     * 高德地区code
+     */
+    @Schema(description = "地区code")
+    private Long adcode;
+
+    /**
+     * 经纬度
+     */
+    @Schema(description = "经纬度")
+    private String location;
+
+    /**
+     * 排序值
+     */
+    @Schema(description = "排序值")
+    private Long areaSort;
+
+    /**
+     * 0:未生效，1:生效
+     */
+    @Schema(description = "0:未生效，1:生效")
+    private String areaStatus;
+
+    /**
+     * 0:国家,1:省,2:城市,3:区县
+     */
+    @Schema(description = "0:国家,1:省,2:城市,3:区县")
+    private String areaType;
+
+    /**
+     * 0:非热门，1:热门
+     */
+    @Schema(description = "0:非热门，1:热门")
+    private String hot;
+
+    /**
+     * 城市编码
+     */
+    @Schema(description = "城市编码")
+    private String cityCode;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "更新时间")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标记
+     */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
+    private String delFlag;
+}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java
new file mode 100644
index 000000000..7c6bdcbb3
--- /dev/null
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java
@@ -0,0 +1,135 @@
+package com.pig4cloud.pigx.admin.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pig4cloud.pigx.admin.api.entity.SysAreaEntity;
+import com.pig4cloud.pigx.admin.service.SysAreaService;
+import com.pig4cloud.pigx.common.core.util.R;
+import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
+import com.pig4cloud.pigx.common.log.annotation.SysLog;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 行政区划
+ *
+ * @author lbw
+ * @date 2024-02-16 22:40:06
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/sysArea")
+@Tag(description = "sysArea", name = "行政区划管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class SysAreaController {
+
+    private final SysAreaService sysAreaService;
+
+    /**
+     * 分页查询
+     *
+     * @param page    分页对象
+     * @param sysArea 行政区划
+     * @return
+     */
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("/page")
+    @PreAuthorize("@pms.hasPermission('sys_sysArea_view')")
+    public R getSysAreaPage(@ParameterObject Page page, @ParameterObject SysAreaEntity sysArea) {
+        return R.ok(sysAreaService.selectPage(page, sysArea));
+    }
+
+    /**
+     * 前端联动组件需要数据
+     *
+     * @param sysArea 查询条件
+     * @return tree
+     */
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("/tree")
+    @PreAuthorize("@pms.hasPermission('sys_sysArea_view')")
+    public R getSysAreaTree(@ParameterObject SysAreaEntity sysArea) {
+        return R.ok(sysAreaService.selectTree(sysArea));
+    }
+
+
+    /**
+     * 通过id查询行政区划
+     *
+     * @param sysArea 查询条件
+     * @return R
+     */
+    @Operation(summary = "通过id查询", description = "通过id查询")
+    @GetMapping("/details")
+    @PreAuthorize("@pms.hasPermission('sys_sysArea_view')")
+    public R getDetails(@ParameterObject SysAreaEntity sysArea) {
+        return R.ok(sysAreaService.getOne(Wrappers.query(sysArea)));
+    }
+
+    /**
+     * 新增行政区划
+     *
+     * @param sysArea 行政区划
+     * @return R
+     */
+    @Operation(summary = "新增行政区划", description = "新增行政区划")
+    @SysLog("新增行政区划")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('sys_sysArea_add')")
+    public R save(@RequestBody SysAreaEntity sysArea) {
+        return R.ok(sysAreaService.save(sysArea));
+    }
+
+    /**
+     * 修改行政区划
+     *
+     * @param sysArea 行政区划
+     * @return R
+     */
+    @Operation(summary = "修改行政区划", description = "修改行政区划")
+    @SysLog("修改行政区划")
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('sys_sysArea_edit')")
+    public R updateById(@RequestBody SysAreaEntity sysArea) {
+        return R.ok(sysAreaService.updateById(sysArea));
+    }
+
+    /**
+     * 通过id删除行政区划
+     *
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除行政区划", description = "通过id删除行政区划")
+    @SysLog("通过id删除行政区划")
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('sys_sysArea_del')")
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(sysAreaService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     *
+     * @param sysArea 查询条件
+     * @param ids     导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('sys_sysArea_export')")
+    public List<SysAreaEntity> export(SysAreaEntity sysArea, Long[] ids) {
+        return sysAreaService.list(Wrappers.lambdaQuery(sysArea).in(ArrayUtil.isNotEmpty(ids), SysAreaEntity::getId, ids));
+    }
+}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysAreaMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysAreaMapper.java
new file mode 100644
index 000000000..10a703556
--- /dev/null
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysAreaMapper.java
@@ -0,0 +1,11 @@
+package com.pig4cloud.pigx.admin.mapper;
+
+import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
+import com.pig4cloud.pigx.admin.api.entity.SysAreaEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysAreaMapper extends PigxBaseMapper<SysAreaEntity> {
+
+
+}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysAreaService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysAreaService.java
new file mode 100644
index 000000000..f99400c38
--- /dev/null
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysAreaService.java
@@ -0,0 +1,28 @@
+package com.pig4cloud.pigx.admin.service;
+
+import cn.hutool.core.lang.tree.Tree;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pig4cloud.pigx.admin.api.entity.SysAreaEntity;
+
+import java.util.List;
+
+public interface SysAreaService extends IService<SysAreaEntity> {
+
+    /**
+     * 查询行政区划树
+     *
+     * @param sysArea 查询条件
+     * @return 树
+     */
+    List<Tree<Long>> selectTree(SysAreaEntity sysArea);
+
+    /**
+     * 分页查询
+     *
+     * @param page    分页对象
+     * @param sysArea 行政区划
+     * @return Page
+     */
+    Page selectPage(Page page, SysAreaEntity sysArea);
+}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java
new file mode 100644
index 000000000..5bd23c028
--- /dev/null
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java
@@ -0,0 +1,74 @@
+package com.pig4cloud.pigx.admin.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pig4cloud.pigx.admin.api.entity.SysAreaEntity;
+import com.pig4cloud.pigx.admin.mapper.SysAreaMapper;
+import com.pig4cloud.pigx.admin.service.SysAreaService;
+import com.pig4cloud.pigx.common.core.constant.enums.YesNoEnum;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * 行政区划
+ *
+ * @author lbw
+ * @date 2024-02-16 22:40:06
+ */
+@Service
+public class SysAreaServiceImpl extends ServiceImpl<SysAreaMapper, SysAreaEntity> implements SysAreaService {
+    /**
+     * 查询行政区划树
+     *
+     * @param sysArea 查询条件
+     * @return 树
+     */
+    @Override
+    public List<Tree<Long>> selectTree(SysAreaEntity sysArea) {
+        List<SysAreaEntity> entityList = baseMapper.selectList(Wrappers.lambdaQuery(sysArea)
+                        .eq(SysAreaEntity::getAreaStatus, YesNoEnum.YES.getCode())
+                .orderByDesc(SysAreaEntity::getAreaSort));
+
+        List<TreeNode<Long>> nodeList = CollUtil.newArrayList();
+        for (SysAreaEntity sysAreaEntity : entityList) {
+            TreeNode<Long> treeNode = new TreeNode<>(sysAreaEntity.getAdcode(), sysAreaEntity.getPid()
+                    , sysAreaEntity.getName(), -Optional.ofNullable(sysAreaEntity.getAreaSort()).orElse(0L));
+
+            HashMap<String, Object> extraMap = MapUtil.of(SysAreaEntity.Fields.adcode, sysAreaEntity.getAdcode());
+            extraMap.put(SysAreaEntity.Fields.hot, sysAreaEntity.getHot());
+            treeNode.setExtra(extraMap);
+            nodeList.add(treeNode);
+        }
+
+        return TreeUtil.build(nodeList, Optional.ofNullable(sysArea.getPid()).orElse(1L));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param page    分页对象
+     * @param sysArea 行政区划
+     * @return Page
+     */
+    @Override
+    public Page selectPage(Page page, SysAreaEntity sysArea) {
+        LambdaQueryWrapper<SysAreaEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.like(StrUtil.isNotBlank(sysArea.getName()), SysAreaEntity::getName, sysArea.getName());
+        wrapper.eq(Objects.nonNull(sysArea.getAdcode()), SysAreaEntity::getPid, sysArea.getAdcode());
+        wrapper.orderByAsc(SysAreaEntity::getAreaType);
+        wrapper.orderByDesc(SysAreaEntity::getAreaSort);
+        return baseMapper.selectPage(page, wrapper);
+    }
+}
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysAreaMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysAreaMapper.xml
new file mode 100644
index 000000000..3a39091bb
--- /dev/null
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysAreaMapper.xml
@@ -0,0 +1,24 @@
+<?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="com.pig4cloud.pigx.admin.mapper.SysAreaMapper">
+
+  <resultMap id="sysAreaMap" type="com.pig4cloud.pigx.admin.api.entity.SysAreaEntity">
+        <id property="id" column="id"/>
+        <result property="pid" column="pid"/>
+        <result property="name" column="name"/>
+        <result property="letter" column="letter"/>
+        <result property="adcode" column="adcode"/>
+        <result property="location" column="location"/>
+        <result property="areaSort" column="area_sort"/>
+        <result property="areaStatus" column="area_status"/>
+        <result property="areaType" column="area_type"/>
+        <result property="hot" column="hot"/>
+        <result property="cityCode" column="city_code"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+  </resultMap>
+</mapper>

From 473f193fb617d6206b125a950a2c67f51ae6213a Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 20 Feb 2024 13:29:47 +0800
Subject: [PATCH 27/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=20H5=20=E6=B3=A8=E5=86=8C=20create=5Fby=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE=E4=B8=BANULL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2pigxx.sql       | 5 +----
 db/999pigxx_app.sql | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index df5148fdc..7805a4abc 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -690,10 +690,7 @@ INSERT INTO `sys_oauth_client_details` VALUES (4, 'mp', NULL, 'mp', 'server', 'p
 INSERT INTO `sys_oauth_client_details` VALUES (5, 'pig', NULL, 'pig', 'server', 'password,refresh_token,authorization_code,client_credentials,mobile', 'http://localhost:4040/sso1/login,http://localhost:4041/sso1/login,http://localhost:8080/renren-admin/sys/oauth2-sso,http://localhost:8090/sys/oauth2-sso', NULL, 43200, 2592001, '{\"enc_flag\":\"1\",\"captcha_flag\":\"1\",\"online_quantity\":\"1\"}', 'false', '0', '', 'admin', NULL, '2023-03-08 11:32:41', 1);
 INSERT INTO `sys_oauth_client_details` VALUES (6, 'test', NULL, 'test', 'server', 'password,refresh_token', NULL, NULL, 43200, 2592001, '{ \"enc_flag\":\"1\",\"captcha_flag\":\"0\"}', 'true', '0', ' ', ' ', NULL, NULL, 1);
 INSERT INTO `sys_oauth_client_details` VALUES (7, 'social', NULL, 'social', 'server', 'password,refresh_token,mobile', NULL, NULL, 43200, 2592001, '{ \"enc_flag\":\"0\",\"captcha_flag\":\"0\"}', 'true', '0', ' ', ' ', NULL, NULL, 1);
-INSERT INTO `sys_oauth_client_details` VALUES (1619615858091982850, 'mini', NULL, 'mini', 'server', 'password,mobile', NULL, NULL, 160000000, 160000000, '{\"captcha_flag\":\"0\",\"enc_flag\":\"1\",\"online_quantity\":\"1\"}', 'true', '0', 'admin', 'admin', '2023-01-29 16:38:06', '2023-01-29 17:21:56', 1);
-INSERT INTO `sys_oauth_client_details` VALUES (1632018490988806145, 'xzxzccxz', NULL, 'xczcxzxzcxzcxz', 'server', 'password,authorization_code,client_credentials,refresh_token,mobile,implicit', 'https://1237.0.0.1/XX', NULL, 3600, 2592001, '{\"captcha_flag\":\"0\",\"enc_flag\":\"0\",\"online_quantity\":\"1\"}', 'true', '1', 'admin', 'admin', '2023-03-04 22:01:44', '2023-03-09 09:58:12', 1);
-INSERT INTO `sys_oauth_client_details` VALUES (1635201365770797057, 'sddsa', NULL, 'sadsad', 'serverxxx', 'password,authorization_code,client_credentials,refresh_token', 'sadds', NULL, 43200, 2592001, '{\"captcha_flag\":\"1\",\"enc_flag\":\"1\",\"online_quantity\":\"1\"}', 'true', '1', 'admin', 'admin', '2023-03-13 16:49:21', '2023-03-13 16:49:31', 1);
-INSERT INTO `sys_oauth_client_details` VALUES (1636620644923621377, 'nov', NULL, 'nov', 'server', 'client_credentials', NULL, NULL, 43200, 2592001, '{\"captcha_flag\":\"0\",\"enc_flag\":\"1\",\"online_quantity\":\"1\"}', 'true', '0', 'admin', 'admin', '2023-03-17 14:49:03', '2023-03-17 14:49:46', 1);
+INSERT INTO `sys_oauth_client_details` VALUES (8, 'mini', NULL, 'mini', 'server', 'password,mobile', NULL, NULL, 160000000, 160000000, '{\"captcha_flag\":\"0\",\"enc_flag\":\"0\",\"online_quantity\":\"1\"}', 'true', '0', 'admin', 'admin', '2023-01-29 16:38:06', '2023-01-29 17:21:56', 1);
 COMMIT;
 
 -- ----------------------------
diff --git a/db/999pigxx_app.sql b/db/999pigxx_app.sql
index 78f03c371..be5ca51a8 100644
--- a/db/999pigxx_app.sql
+++ b/db/999pigxx_app.sql
@@ -203,7 +203,7 @@ CREATE TABLE `app_user` (
   `nickname` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段:昵称',
   `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段:姓名',
   `email` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段:邮箱',
-  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT ' ' COMMENT '创建人',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT ' ' COMMENT '修改人',
   `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',

From e159602711513421243eeba9695b41aec0931a68 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 20 Feb 2024 13:30:02 +0800
Subject: [PATCH 28/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20quartz?=
 =?UTF-8?q?=20=E5=8F=AA=E4=BF=9D=E5=AD=98=E5=8F=91=E5=B8=83=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/daemon/quartz/event/SysJobLogListener.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogListener.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogListener.java
index 2ba7b47c0..3ab512f78 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogListener.java
+++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogListener.java
@@ -26,6 +26,8 @@ import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * @author frwcloud 异步监听定时任务日志事件
  */
@@ -41,7 +43,10 @@ public class SysJobLogListener {
 	@EventListener(SysJobLogEvent.class)
 	public void saveSysJobLog(SysJobLogEvent event) {
 		SysJobLog sysJobLog = event.getSysJobLog();
-		sysJobLogService.save(sysJobLog);
+		// 只保存发布状态的任务日志
+		if (Objects.nonNull(sysJobLog.getJobId())){
+			sysJobLogService.save(sysJobLog);
+		}
 		log.info("执行定时任务日志");
 	}
 

From 12cc50109cacfbdc0fc013e6c2314e433bf6bbb1 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 27 Dec 2023 15:13:00 +0800
Subject: [PATCH 29/46] =?UTF-8?q?bug=20fix=20=E9=BB=98=E8=AE=A4=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E4=BA=BA=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/listeners/FlowProcessEventListener.java    |  4 ++--
 .../pigx/flow/engine/node/MultiInstanceHandler.java   | 11 ++++-------
 .../pigx/flow/task/utils/NodeFormatUtil.java          |  4 ++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java
index d3a91fbc5..84ae9760c 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java
@@ -184,7 +184,7 @@ public class FlowProcessEventListener implements FlowableEventListener {
 			processNodeRecordAssignUserParamDto
 				.setLocalData(objectMapper.writeValueAsString(taskService.getVariablesLocal(task.getId())));
 			processNodeRecordAssignUserParamDto.setNodeId(taskDefinitionKey);
-			processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(assignee));
+			processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(task.getAssignee()));
 			processNodeRecordAssignUserParamDto.setTaskId(task.getId());
 			processNodeRecordAssignUserParamDto.setNodeName(task.getName());
 			processNodeRecordAssignUserParamDto.setTaskType("COMPLETE");
@@ -219,7 +219,7 @@ public class FlowProcessEventListener implements FlowableEventListener {
 			processNodeRecordAssignUserParamDto.setProcessInstanceId(processInstanceId);
 			// processNodeRecordAssignUserParamDto.setData();
 			processNodeRecordAssignUserParamDto.setNodeId(taskDefinitionKey);
-			processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(assignee));
+			processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(task.getAssignee()));
 			processNodeRecordAssignUserParamDto.setTaskId(task.getId());
 			processNodeRecordAssignUserParamDto.setNodeName(task.getName());
 			processNodeRecordAssignUserParamDto
diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java
index 49d90ee9e..7b864c614 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java
@@ -20,7 +20,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -79,12 +78,10 @@ public class MultiInstanceHandler {
 			}
 		}
 
-		Optional.of(assignList).orElseGet(() -> {
-			List<Long> defaultList = new ArrayList<>();
-			defaultList.add(ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN);
-			return defaultList;
-		});
-
+		// 标记为空
+		if (CollUtil.isEmpty(assignList)) {
+			assignList.add(ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN);
+		}
 		return assignList;
 	}
 
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java
index 1b6375e28..ce7a8866b 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java
@@ -252,6 +252,10 @@ public class NodeFormatUtil {
 	 * @return
 	 */
 	private static UserVo buildUser(long userId) {
+		if (ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN == userId){
+			return UserVo.builder().id(userId).build();
+		}
+
 		RemoteUserService userService = SpringUtil.getBean(RemoteUserService.class);
 		SysUser user = userService.getUserById(userId).getData();
 		if (user == null) {

From d2585f2890e580b909427375744ba5c1af0be2c1 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 17 Dec 2023 20:15:01 +0800
Subject: [PATCH 30/46] =?UTF-8?q?:sparkles:=20Introducing=20new=20features?=
 =?UTF-8?q?.=20=E5=8A=A8=E6=80=81=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B8=A6=E5=8F=82=E7=BB=84=E4=BB=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/admin/api/entity/SysMenu.java        | 183 +++++++++---------
 .../service/impl/SysMenuServiceImpl.java      |   1 +
 .../main/resources/mapper/SysMenuMapper.xml   |   2 +
 3 files changed, 98 insertions(+), 88 deletions(-)

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java
index 47460e3ef..090e2e6d6 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java
@@ -28,6 +28,7 @@ import lombok.EqualsAndHashCode;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
 import java.time.LocalDateTime;
 
 /**
@@ -44,109 +45,115 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class SysMenu extends Model<SysMenu> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 菜单ID
-	 */
-	@TableId(value = "menu_id", type = IdType.ASSIGN_ID)
-	@Schema(description = "菜单id")
-	private Long menuId;
+    /**
+     * 菜单ID
+     */
+    @TableId(value = "menu_id", type = IdType.ASSIGN_ID)
+    @Schema(description = "菜单id")
+    private Long menuId;
 
-	/**
-	 * 菜单名称
-	 */
-	@NotBlank(message = "菜单名称不能为空")
-	@Schema(description = "菜单名称")
-	private String name;
+    /**
+     * 菜单名称
+     */
+    @NotBlank(message = "菜单名称不能为空")
+    @Schema(description = "菜单名称")
+    private String name;
 
-	/**
-	 * 菜单权限标识
-	 */
-	@Schema(description = "菜单权限标识")
-	private String permission;
+    /**
+     * 菜单权限标识
+     */
+    @Schema(description = "菜单权限标识")
+    private String permission;
 
-	/**
-	 * 父菜单ID
-	 */
-	@NotNull(message = "菜单父ID不能为空")
-	@Schema(description = "菜单父id")
-	private Long parentId;
+    /**
+     * 父菜单ID
+     */
+    @NotNull(message = "菜单父ID不能为空")
+    @Schema(description = "菜单父id")
+    private Long parentId;
 
-	/**
-	 * 图标
-	 */
-	@Schema(description = "菜单图标")
-	private String icon;
+    /**
+     * 图标
+     */
+    @Schema(description = "菜单图标")
+    private String icon;
 
-	/**
-	 * 前端路由标识路径，默认和 comment 保持一致 过期
-	 */
-	@Schema(description = "前端路由标识路径")
-	private String path;
+    /**
+     * 前端路由标识路径，默认和 comment 保持一致 过期
+     */
+    @Schema(description = "前端路由标识路径")
+    private String path;
 
-	/**
-	 * 菜单显示隐藏控制
-	 */
-	@Schema(description = "菜单是否显示")
-	private String visible;
+    /**
+     * 前端组件
+     */
+    @Schema(description = "前端组件")
+    private String component;
 
-	/**
-	 * 排序值
-	 */
-	@Schema(description = "排序值")
-	private Integer sortOrder;
+    /**
+     * 菜单显示隐藏控制
+     */
+    @Schema(description = "菜单是否显示")
+    private String visible;
 
-	/**
-	 * 菜单类型 （0菜单 1按钮）
-	 */
-	@NotNull(message = "菜单类型不能为空")
-	@Schema(description = "菜单类型,0:菜单 1:按钮")
-	private String menuType;
+    /**
+     * 排序值
+     */
+    @Schema(description = "排序值")
+    private Integer sortOrder;
 
-	/**
-	 * 路由缓冲
-	 */
-	@Schema(description = "路由缓冲")
-	private String keepAlive;
+    /**
+     * 菜单类型 （0菜单 1按钮）
+     */
+    @NotNull(message = "菜单类型不能为空")
+    @Schema(description = "菜单类型,0:菜单 1:按钮")
+    private String menuType;
 
-	@Schema(description = "菜单是否内嵌")
-	private String embedded;
+    /**
+     * 路由缓冲
+     */
+    @Schema(description = "路由缓冲")
+    private String keepAlive;
 
-	/**
-	 * 创建人
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	@Schema(description = "创建人")
-	private String createBy;
+    @Schema(description = "菜单是否内嵌")
+    private String embedded;
 
-	/**
-	 * 修改人
-	 */
-	@TableField(fill = FieldFill.UPDATE)
-	@Schema(description = "修改人")
-	private String updateBy;
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
+    private String createBy;
 
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	@Schema(description = "创建时间")
-	private LocalDateTime createTime;
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "修改人")
+    private String updateBy;
 
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.UPDATE)
-	@Schema(description = "更新时间")
-	private LocalDateTime updateTime;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
 
-	/**
-	 * 0--正常 1--删除
-	 */
-	@TableLogic
-	@TableField(fill = FieldFill.INSERT)
-	@Schema(description = "删除标记,1:已删除,0:正常")
-	private String delFlag;
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 0--正常 1--删除
+     */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记,1:已删除,0:正常")
+    private String delFlag;
 
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java
index 586c48adc..ac1ac0da3 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java
@@ -160,6 +160,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 			// 扩展属性
 			Map<String, Object> extra = new HashMap<>();
 			extra.put("path", menu.getPath());
+			extra.put("componentPath", menu.getComponent());
 			extra.put("menuType", menu.getMenuType());
 			extra.put("permission", menu.getPermission());
 			extra.put("sortOrder", menu.getSortOrder());
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml
index 2853e68d0..9d5633dbf 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml
@@ -26,6 +26,7 @@
 		<result column="name" property="name"/>
 		<result column="permission" property="permission"/>
 		<result column="path" property="path"/>
+		<result column="component" property="component"/>
 		<result column="parent_id" property="parentId"/>
 		<result column="icon" property="icon"/>
 		<result column="sort_order" property="sortOrder"/>
@@ -45,6 +46,7 @@
 			   sys_menu.name,
 			   sys_menu.permission,
 			   sys_menu.path,
+			   sys_menu.component,
 			   sys_menu.parent_id,
 			   sys_menu.icon,
 			   sys_menu.sort_order,

From 26d4bad0ff18f11829a8a1c33e053d32cb09d6cf Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 20 Feb 2024 13:42:30 +0800
Subject: [PATCH 31/46] =?UTF-8?q?:sparkles:=20Introducing=20new=20features?=
 =?UTF-8?q?.=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=88=9B=E5=BB=BA=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-visual/pigx-codegen/pom.xml              |  17 +++
 .../controller/GenCreateTableController.java  | 141 ++++++++++++++++++
 .../pigx/codegen/entity/GenCreateTable.java   | 104 +++++++++++++
 .../codegen/entity/GenTemplateEntity.java     | 116 +++++++-------
 .../codegen/mapper/GenCreateTableMapper.java  |  32 ++++
 .../service/GenCreateTableService.java        |  38 +++++
 .../service/impl/CreateTableServiceImpl.java  |  66 ++++++++
 .../service/impl/GeneratorServiceImpl.java    |   3 +-
 .../util/table/CreateTableHandler.java        |  71 +++++++++
 .../util/table/enums/TableModelEnum.java      |  40 +++++
 .../codegen/util/table/model/TableInfo.java   |  44 ++++++
 .../codegen/util/vo/GenCreateTableVO.java     |  95 ++++++++++++
 12 files changed, 707 insertions(+), 60 deletions(-)
 create mode 100755 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java
 create mode 100755 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenCreateTable.java
 create mode 100755 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenCreateTableMapper.java
 create mode 100755 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenCreateTableService.java
 create mode 100755 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/CreateTableServiceImpl.java
 create mode 100644 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/CreateTableHandler.java
 create mode 100644 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/enums/TableModelEnum.java
 create mode 100644 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/model/TableInfo.java
 create mode 100755 pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/vo/GenCreateTableVO.java

diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index dfba72846..9992960ea 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -18,6 +18,7 @@
         <magic.version>2.0.2</magic.version>
         <screw.version>0.0.3</screw.version>
         <db2.version>11.5.0.0</db2.version>
+        <anyline.version>8.7.1-jdk17-20232101</anyline.version>
         <configuration.version>1.10</configuration.version>
     </properties>
 
@@ -87,6 +88,22 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-3-starter</artifactId>
         </dependency>
+        <!--anyline-->
+        <dependency>
+            <groupId>org.anyline</groupId>
+            <artifactId>anyline-data-jdbc-mysql</artifactId>
+            <version>${anyline.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.anyline</groupId>
+            <artifactId>anyline-data-jdbc-postgresql</artifactId>
+            <version>${anyline.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.anyline</groupId>
+            <artifactId>anyline-data-jdbc-dm</artifactId>
+            <version>${anyline.version}</version>
+        </dependency>
         <!--common-->
         <dependency>
             <groupId>com.pig4cloud</groupId>
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java
new file mode 100755
index 000000000..1a06d9cef
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java
@@ -0,0 +1,141 @@
+package com.pig4cloud.pigx.codegen.controller;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pig4cloud.pigx.codegen.entity.GenCreateTable;
+import com.pig4cloud.pigx.codegen.service.GenCreateTableService;
+import com.pig4cloud.pigx.codegen.util.vo.GenCreateTableVO;
+import com.pig4cloud.pigx.common.core.util.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 自动创建表管理
+ *
+ * @author luolin
+ * @date 2022-09-23 21:56:11
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/create-table")
+@Tag(description = "create-table", name = "自动创建表管理管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class GenCreateTableController {
+
+	private final GenCreateTableService createTableService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param createTable 自动创建表管理
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page")
+	public R getPage(Page page, @ModelAttribute GenCreateTable createTable,
+			@RequestParam(required = false) String[] queryTime) {
+		QueryWrapper<GenCreateTable> query = Wrappers.query(createTable);
+		return R.ok(createTableService.page(page, query));
+	}
+
+	/**
+	 * 通过id查询自动创建表管理
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/{id}")
+	public R getById(@PathVariable("id") Long id) {
+		return R.ok(createTableService.getById(id));
+	}
+
+	/**
+	 * 新增自动创建表管理
+	 * @param createTableVO 自动创建表管理
+	 * @return R
+	 */
+	@Operation(summary = "新增自动创建表管理", description = "新增自动创建表管理")
+	@PostMapping
+	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	public R save(@RequestBody GenCreateTableVO createTableVO) {
+		// 切换目标数据源
+		DynamicDataSourceContextHolder.push(createTableVO.getDsName());
+		createTableService.createTable(createTableVO);
+		GenCreateTable createTable = new GenCreateTable();
+		BeanUtil.copyProperties(createTableVO, createTable);
+		DynamicDataSourceContextHolder.clear();
+		return R.ok(createTableService.saveOrUpdate(createTable));
+	}
+
+	/**
+	 * 修改自动创建表管理
+	 * @param createTable 自动创建表管理
+	 * @return R
+	 */
+	@Operation(summary = "修改自动创建表管理", description = "修改自动创建表管理")
+	@PutMapping
+	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	public R updateById(@RequestBody GenCreateTable createTable) {
+		return R.ok(createTableService.updateById(createTable));
+	}
+
+	/**
+	 * 通过id删除自动创建表管理
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id删除自动创建表管理", description = "通过id删除自动创建表管理")
+	@DeleteMapping("/{id}")
+	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	public R removeById(@PathVariable Long id) {
+		return R.ok(createTableService.removeById(id));
+	}
+
+	/**
+	 * 查询租户所有自动创建表管理
+	 * @return R
+	 */
+	@GetMapping("/list")
+	public R list() {
+		return R.ok(createTableService.list());
+	}
+
+	/**
+	 * 通过ids删除
+	 * @param ids ids
+	 * @return R
+	 */
+	@Operation(summary = "通过ids删除", description = "通过ids删除")
+	@DeleteMapping
+	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	public R removeById(@RequestBody List<Long> ids) {
+		return R.ok(createTableService.removeByIds(ids));
+	}
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenCreateTable.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenCreateTable.java
new file mode 100755
index 000000000..32c52a0ea
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenCreateTable.java
@@ -0,0 +1,104 @@
+package com.pig4cloud.pigx.codegen.entity;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 自动创建表管理
+ *
+ * @author luolin
+ * @date 2022-09-23 21:56:11
+ */
+@Data
+@TenantTable
+@TableName("gen_create_table")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "自动创建表管理")
+public class GenCreateTable extends Model<GenCreateTable> {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键ID
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键ID")
+	private Long id;
+
+	/**
+	 * 表名称
+	 */
+	@Schema(description = "表名称")
+	private String tableName;
+
+	/**
+	 * 表注释
+	 */
+	@Schema(description = "表注释")
+	private String comments;
+
+	/**
+	 * 字段信息
+	 */
+	@Schema(description = "字段信息")
+	private String columnInfo;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 修改人
+	 */
+	@TableField(fill = FieldFill.UPDATE)
+	@Schema(description = "修改人")
+	private String updateBy;
+
+	/**
+	 * 创建时间
+	 */
+	@Schema(description = "创建时间")
+	@TableField(fill = FieldFill.INSERT)
+	private LocalDateTime createTime;
+
+	/**
+	 * 修改时间
+	 */
+	@Schema(description = "修改时间")
+	@TableField(fill = FieldFill.UPDATE)
+	private LocalDateTime updateTime;
+
+	/**
+	 * 删除标识（0-正常,1-删除）
+	 */
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "删除标记,1:已删除,0:正常")
+	private String delFlag;
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java
index f979a8b04..557f9181b 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java
@@ -39,73 +39,73 @@ import java.time.LocalDateTime;
 @Schema(description = "模板")
 public class GenTemplateEntity extends Model<GenTemplateEntity> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 主键
-	 */
-	@TableId(type = IdType.ASSIGN_ID)
-	@Schema(description = "主键")
-	private Long id;
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private Long id;
 
-	/**
-	 * 模板名称
-	 */
-	@Schema(description = "模板名称")
-	private String templateName;
+    /**
+     * 模板名称
+     */
+    @Schema(description = "模板名称")
+    private String templateName;
 
-	/**
-	 * 模板路径
-	 */
-	@Schema(description = "模板路径")
-	private String generatorPath;
+    /**
+     * 模板路径
+     */
+    @Schema(description = "模板路径")
+    private String generatorPath;
 
-	/**
-	 * 模板描述
-	 */
-	@Schema(description = "模板描述")
-	private String templateDesc;
+    /**
+     * 模板描述
+     */
+    @Schema(description = "模板描述")
+    private String templateDesc;
 
-	/**
-	 * 模板代码
-	 */
-	@Schema(description = "模板代码")
-	private String templateCode;
+    /**
+     * 模板代码
+     */
+    @Schema(description = "模板代码")
+    private String templateCode;
 
-	/**
-	 * 创建人
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	@Schema(description = "创建人")
-	private String createBy;
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
+    private String createBy;
 
-	/**
-	 * 修改人
-	 */
-	@TableField(fill = FieldFill.UPDATE)
-	@Schema(description = "修改人")
-	private String updateBy;
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "修改人")
+    private String updateBy;
 
-	/**
-	 * 创建时间
-	 */
-	@Schema(description = "创建时间")
-	@TableField(fill = FieldFill.INSERT)
-	private LocalDateTime createTime;
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
 
-	/**
-	 * 修改时间
-	 */
-	@Schema(description = "修改时间")
-	@TableField(fill = FieldFill.UPDATE)
-	private LocalDateTime updateTime;
+    /**
+     * 修改时间
+     */
+    @Schema(description = "修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
 
-	/**
-	 * 删除标识（0-正常,1-删除）
-	 */
-	@TableLogic
-	@TableField(fill = FieldFill.INSERT)
-	@Schema(description = "删除标记,1:已删除,0:正常")
-	private String delFlag;
+    /**
+     * 删除标识（0-正常,1-删除）
+     */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记,1:已删除,0:正常")
+    private String delFlag;
 
 }
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenCreateTableMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenCreateTableMapper.java
new file mode 100755
index 000000000..0a8be2ef6
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenCreateTableMapper.java
@@ -0,0 +1,32 @@
+package com.pig4cloud.pigx.codegen.mapper;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import com.pig4cloud.pigx.codegen.entity.GenCreateTable;
+import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 自动创建表管理
+ *
+ * @author luolin
+ * @date 2022-09-23 21:56:11
+ */
+@Mapper
+public interface GenCreateTableMapper extends PigxBaseMapper<GenCreateTable> {
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenCreateTableService.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenCreateTableService.java
new file mode 100755
index 000000000..3d99bc211
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenCreateTableService.java
@@ -0,0 +1,38 @@
+package com.pig4cloud.pigx.codegen.service;
+
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pig4cloud.pigx.codegen.entity.GenCreateTable;
+import com.pig4cloud.pigx.codegen.util.vo.GenCreateTableVO;
+
+/**
+ * 自动创建表管理
+ *
+ * @author luolin
+ * @date 2022-09-23 21:56:11
+ */
+public interface GenCreateTableService extends IService<GenCreateTable> {
+
+	/**
+	 * 自动创建表
+	 * @param createTableVO 表信息
+	 */
+	Boolean createTable(GenCreateTableVO createTableVO);
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/CreateTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/CreateTableServiceImpl.java
new file mode 100755
index 000000000..3dade7a79
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/CreateTableServiceImpl.java
@@ -0,0 +1,66 @@
+package com.pig4cloud.pigx.codegen.service.impl;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pig4cloud.pigx.codegen.entity.GenCreateTable;
+import com.pig4cloud.pigx.codegen.mapper.GenCreateTableMapper;
+import com.pig4cloud.pigx.codegen.service.GenCreateTableService;
+import com.pig4cloud.pigx.codegen.util.table.CreateTableHandler;
+import com.pig4cloud.pigx.codegen.util.table.model.TableInfo;
+import com.pig4cloud.pigx.codegen.util.vo.GenCreateTableVO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.anyline.metadata.Column;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.LinkedHashMap;
+
+/**
+ * 自动创建表管理
+ *
+ * @author luolin
+ * @date 2022-09-23 21:56:11
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@Transactional(rollbackFor = Exception.class)
+public class CreateTableServiceImpl extends ServiceImpl<GenCreateTableMapper, GenCreateTable>
+		implements GenCreateTableService {
+
+	private final CreateTableHandler createTableHandler;
+
+	@Override
+	public Boolean createTable(GenCreateTableVO createTableVO) {
+		String columnsInfo = createTableVO.getColumnsInfo();
+		TableInfo tableInfo = new TableInfo();
+		tableInfo.setName(createTableVO.getTableName());
+		LinkedHashMap<String, Column> columns = new LinkedHashMap<>();
+		LinkedHashMap<String, JSONObject> linkedHashMap = JSONUtil.toBean(columnsInfo, LinkedHashMap.class);
+		linkedHashMap.forEach((key, val) -> {
+			columns.put(key, JSONUtil.toBean(val, Column.class));
+		});
+		tableInfo.setColumns(columns);
+		tableInfo.setComment(createTableVO.getComments());
+		return createTableHandler.createTable(tableInfo);
+	}
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
index 38cfb6d2e..5937e93ee 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
@@ -309,8 +309,7 @@ public class GeneratorServiceImpl implements GeneratorService {
 		// 按字段类型分组，使用 Map 存储不同类型的字段列表
 		Map<Boolean, List<GenTableColumnEntity>> typeMap = table.getFieldList()
 			.stream()
-			.collect(Collectors
-				.partitioningBy(columnEntity -> BooleanUtil.toBoolean(columnEntity.getPrimaryPk().toString())));
+			.collect(Collectors.partitioningBy(columnEntity -> BooleanUtil.toBoolean(columnEntity.getPrimaryPk())));
 
 		// 从分组后的 Map 中获取不同类型的字段列表
 		List<GenTableColumnEntity> primaryList = typeMap.get(true);
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/CreateTableHandler.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/CreateTableHandler.java
new file mode 100644
index 000000000..143dbd8ad
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/CreateTableHandler.java
@@ -0,0 +1,71 @@
+package com.pig4cloud.pigx.codegen.util.table;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import com.pig4cloud.pigx.codegen.util.table.enums.TableModelEnum;
+import com.pig4cloud.pigx.codegen.util.table.model.TableInfo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.anyline.metadata.Table;
+import org.anyline.proxy.ServiceProxy;
+import org.anyline.service.AnylineService;
+import org.springframework.stereotype.Component;
+
+/**
+ * 创建表核心逻辑类
+ *
+ * @author luolin
+ * @date 2022-09-18 21:56:11
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CreateTableHandler {
+
+	/**
+	 * 运行表单主键ID
+	 */
+	private final static String RUN_FORM_COLUMN_NAME = "run_form_id";
+
+	/**
+	 * 自动创建表
+	 * @param tableInfo 表信息
+	 */
+	public Boolean createTable(TableInfo tableInfo) {
+		if (tableInfo.getColumns() == null || tableInfo.getColumns().isEmpty()) {
+			throw new RuntimeException("自动创建表[" + tableInfo.getName() + "]中至少需要一个字段");
+		}
+		if (!TableModelEnum.CREATE.name().toLowerCase().equals(tableInfo.getModel())) {
+			throw new RuntimeException("自动创建表[" + tableInfo.getModel() + "]模式的处理未找到,请检查");
+		}
+		try {
+			AnylineService service = ServiceProxy.service();
+			// 如果已存在，删除重键
+			Table table = service.metadata().table(tableInfo.getName(), false);
+			if (null != table)
+				service.ddl().drop(table);
+			// 执行建表SQL
+			service.ddl().create(tableInfo);
+			log.info("自动创建表处理完成!");
+		}
+		catch (Exception e) {
+			throw new RuntimeException("自动创建表异常", e);
+		}
+		return Boolean.TRUE;
+	}
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/enums/TableModelEnum.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/enums/TableModelEnum.java
new file mode 100644
index 000000000..0d32dbfb5
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/enums/TableModelEnum.java
@@ -0,0 +1,40 @@
+package com.pig4cloud.pigx.codegen.util.table.enums;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+/**
+ * 表生成模式
+ *
+ * @author luolin
+ * @date 2022-09-18 21:56:11
+ */
+public enum TableModelEnum {
+
+	/**
+	 * 创建模式: 将删除所有已存在的表,重新创建,会清除所有数据
+	 */
+	CREATE,
+	/**
+	 * 更新模式: 保留已存在的表以及字段,不针对字段或其结构进行修改,不影响数据
+	 */
+	UPDATE,
+	/**
+	 * 默认模式: 不做任何操作
+	 */
+	NONE;
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/model/TableInfo.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/model/TableInfo.java
new file mode 100644
index 000000000..a0cc56cb6
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/table/model/TableInfo.java
@@ -0,0 +1,44 @@
+package com.pig4cloud.pigx.codegen.util.table.model;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import com.pig4cloud.pigx.codegen.util.table.enums.TableModelEnum;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.anyline.metadata.Table;
+
+/**
+ * 表信息
+ *
+ * @author luolin
+ * @date 2022-09-18 21:56:11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TableInfo extends Table<TableInfo> {
+
+	/**
+	 * 建表模式
+	 */
+	private String model = TableModelEnum.CREATE.name().toLowerCase();
+
+	/**
+	 * 表CRUD模式
+	 */
+	private String crudModel;
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/vo/GenCreateTableVO.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/vo/GenCreateTableVO.java
new file mode 100755
index 000000000..4d513234b
--- /dev/null
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/vo/GenCreateTableVO.java
@@ -0,0 +1,95 @@
+package com.pig4cloud.pigx.codegen.util.vo;
+/*
+ *      Copyright (c) 2018-2025, luolin All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: luolin (766488893@qq.com)
+ */
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 自动创建表管理
+ *
+ * @author luolin
+ * @date 2022-09-23 21:56:11
+ */
+@Data
+@Schema(description = "自动创建表管理")
+public class GenCreateTableVO {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键ID
+	 */
+	@Schema(description = "主键ID")
+	private Long id;
+
+	/**
+	 * 表名称
+	 */
+	@NotBlank(message = "表名称不能为空")
+	@Schema(description = "表名称")
+	private String tableName;
+
+	/**
+	 * 表注释
+	 */
+	@NotBlank(message = "表注释不能为空")
+	@Schema(description = "表注释")
+	private String comments;
+
+	/**
+	 * 数据源名称
+	 */
+	@NotBlank(message = "数据源名称不能为空")
+	@Schema(description = "数据源名称")
+	private String dsName;
+
+	/**
+	 * 主键策略
+	 */
+	@NotBlank(message = "主键策略不能为空")
+	@Schema(description = "主键策略")
+	private String pkPolicy;
+
+	/**
+	 * 创建人
+	 */
+	@Schema(description = "创建人")
+	private Long createUser;
+
+	/**
+	 * 创建时间
+	 */
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 表字段信息
+	 */
+	@Schema(description = "表字段信息")
+	private String columnsInfo;
+
+	/**
+	 * 字段信息
+	 */
+	@Schema(description = "字段信息")
+	private String columnInfo;
+
+}

From 02e2d34cc1a700f0e2788eabb563cc1ea1ff719f Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 20 Feb 2024 15:29:17 +0800
Subject: [PATCH 32/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96,=E5=A2=9E=E5=8A=A0=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2pigxx.sql         | 497 ++++++++++++++++++++++++------------------
 db/8pigxx_codegen.sql |  25 ++-
 2 files changed, 306 insertions(+), 216 deletions(-)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index 7805a4abc..d7754ee48 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -3,6 +3,61 @@ USE pigxx;
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
+DROP TABLE IF EXISTS `sys_area`;
+CREATE TABLE `sys_area` (
+  `id` bigint unsigned NOT NULL COMMENT '主键ID',
+  `pid` bigint unsigned NOT NULL DEFAULT '0' COMMENT '父ID',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '地区名称',
+  `letter` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '地区字母',
+  `adcode` bigint NOT NULL COMMENT '高德地区code',
+  `location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '经纬度',
+  `area_sort` bigint DEFAULT NULL COMMENT '排序值',
+  `area_status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '0:未生效，1:生效',
+  `area_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '0:国家,1:省,2:城市,3:区县',
+  `hot` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '0:非热门，1:热门',
+  `city_code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '城市编码',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='行政区划表';
+
+BEGIN;
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (1, 0, '全国', '', 100000, '', NULL, '1', '0', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', 'admin', '2024-02-17 12:45:08', '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (2, 100000, '北京市', '', 110000, '', NULL, '1', '1', '1', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', 'admin', '2024-02-17 12:45:12', '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (3, 100000, '天津市', '', 120000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (4, 100000, '河北省', '', 130000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (5, 100000, '山西省', '', 140000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (6, 100000, '内蒙古自治区', '', 150000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (7, 100000, '辽宁省', '', 210000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (8, 100000, '吉林省', '', 220000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', 'admin', '2024-02-16 23:16:23', '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (9, 100000, '黑龙江省', '', 230000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (10, 100000, '上海市', '', 310000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (11, 100000, '江苏省', '', 320000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (12, 100000, '浙江省', '', 330000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (13, 100000, '安徽省', '', 340000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (14, 100000, '福建省', '', 350000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (15, 100000, '江西省', '', 360000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (16, 100000, '山东省', '', 370000, '', 100, '1', '1', '1', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', 'admin', '2024-02-17 13:13:25', '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (17, 100000, '河南省', '', 410000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (18, 100000, '湖北省', '', 420000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (19, 100000, '湖南省', '', 430000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (20, 100000, '广东省', '', 440000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (21, 100000, '广西壮族自治区', '', 450000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (22, 100000, '海南省', '', 460000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (23, 100000, '重庆市', '', 500000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (24, 100000, '四川省', '', 510000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (25, 100000, '贵州省', '', 520000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (26, 100000, '云南省', '', 530000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (27, 100000, '西藏自治区', '', 540000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (28, 100000, '陕西省', '', 610000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (29, 100000, '甘肃省', '', 620000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (30, 100000, '青海省', '', 630000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+INSERT INTO `sys_area` (`id`, `pid`, `name`, `letter`, `adcode`, `location`, `area_sort`, `area_status`, `area_type`, `hot`, `city_code`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`) VALUES (31, 100000, '宁夏回族自治区', '', 640000, '', NULL, '1', '1', '0', '', '2023-11-09 03:50:52', '2023-11-09 03:50:52', NULL, NULL, '0');
+COMMIT;
+
 -- ----------------------------
 -- Table structure for sys_audit_log
 -- ----------------------------
@@ -418,6 +473,7 @@ CREATE TABLE `sys_menu` (
   `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '菜单名称',
   `permission` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '权限标识',
   `path` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '路由路径',
+  `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '组件',
   `parent_id` bigint(20) DEFAULT NULL COMMENT '父菜单ID',
   `icon` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '菜单图标',
   `visible` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '1' COMMENT '是否可见，0隐藏，1显示',
@@ -438,219 +494,227 @@ CREATE TABLE `sys_menu` (
 -- Records of sys_menu
 -- ----------------------------
 BEGIN;
-INSERT INTO `sys_menu` VALUES (1000, '权限管理', NULL, '/system', 2000, 'iconfont icon-icon-', '1', 0, '0', '0', '0', '', '2018-09-28 08:29:53', 'admin', '2023-11-01 16:39:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1100, '用户管理', NULL, '/admin/system/user/index', 1000, 'ele-User', '1', 1, '0', '0', '0', '', '2017-11-02 22:24:37', 'admin', '2023-11-01 16:40:44', '0', 1);
-INSERT INTO `sys_menu` VALUES (1101, '用户新增', 'sys_user_add', NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:52:09', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1102, '用户修改', 'sys_user_edit', NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:52:48', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1103, '用户删除', 'sys_user_del', NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:54:01', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1104, '导入导出', 'sys_user_export', NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:54:01', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1200, '菜单管理', NULL, '/admin/system/menu/index', 1000, 'iconfont icon-caidan', '1', 2, '0', '0', '0', '', '2017-11-08 09:57:27', 'admin', '2023-11-01 16:40:39', '0', 1);
-INSERT INTO `sys_menu` VALUES (1201, '菜单新增', 'sys_menu_add', NULL, 1200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:15:53', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1202, '菜单修改', 'sys_menu_edit', NULL, 1200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:16:23', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1203, '菜单删除', 'sys_menu_del', NULL, 1200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:16:43', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1300, '角色管理', NULL, '/admin/system/role/index', 1000, 'iconfont icon-gerenzhongxin', '1', 3, '0', NULL, '0', '', '2017-11-08 10:13:37', 'admin', '2023-11-01 16:40:35', '0', 1);
-INSERT INTO `sys_menu` VALUES (1301, '角色新增', 'sys_role_add', NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:14:18', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1302, '角色修改', 'sys_role_edit', NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:14:41', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1303, '角色删除', 'sys_role_del', NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:14:59', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1304, '分配权限', 'sys_role_perm', NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2018-04-20 07:22:55', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1305, '角色导入导出', 'sys_role_export', NULL, 1300, NULL, '1', 4, '0', NULL, '1', ' ', '2022-03-26 15:54:34', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (1400, '部门管理', NULL, '/admin/system/dept/index', 1000, 'iconfont icon-zidingyibuju', '1', 4, '0', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-11-01 16:40:30', '0', 1);
-INSERT INTO `sys_menu` VALUES (1401, '部门新增', 'sys_dept_add', NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:56:16', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1402, '部门修改', 'sys_dept_edit', NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:56:59', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1403, '部门删除', 'sys_dept_del', NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:57:28', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1404, '开放互联', 'sys_connect_sync', NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:57:28', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1500, '租户管理', NULL, '/admin/system/tenant/index', 1000, 'iconfont icon-shuxingtu', '1', 9, '0', '0', '0', '', '2018-01-20 13:17:19', 'admin', '2023-11-01 16:40:26', '0', 1);
-INSERT INTO `sys_menu` VALUES (1501, '租户新增', 'sys_systenant_add', NULL, 1500, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:56:52', '0', 1);
-INSERT INTO `sys_menu` VALUES (1502, '租户修改', 'sys_systenant_edit', NULL, 1500, '1', '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:56:53', '0', 1);
-INSERT INTO `sys_menu` VALUES (1503, '租户删除', 'sys_systenant_del', NULL, 1500, '1', '1', 2, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:56:54', '0', 1);
-INSERT INTO `sys_menu` VALUES (1504, '租户套餐', 'sys_systenant_tenantmenu', NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-12 09:01:41', ' ', '2023-01-11 05:52:51', '0', 1);
-INSERT INTO `sys_menu` VALUES (1505, '租户套餐删除', 'sys_systenantmenu_del', NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-09 14:04:19', 'admin', '2023-01-11 05:52:51', '0', 1);
-INSERT INTO `sys_menu` VALUES (1506, '租户套餐编辑', 'sys_systenantmenu_edit', NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-09 14:04:19', 'admin', '2023-01-11 05:52:51', '0', 1);
-INSERT INTO `sys_menu` VALUES (1507, '租户套餐新增', 'sys_systenantmenu_add', NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:00', '0', 1);
-INSERT INTO `sys_menu` VALUES (1508, '租户套餐导出', 'sys_systenant_export', NULL, 1500, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-06 16:28:24', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (1600, '岗位管理', NULL, '/admin/system/post/index', 1000, 'iconfont icon--chaifenhang', '1', 5, '1', '0', '0', '', '2022-03-26 13:04:14', 'admin', '2023-11-01 17:02:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (1601, '岗位信息查看', 'sys_post_view', NULL, 1600, NULL, '1', 0, '0', NULL, '1', ' ', '2022-03-26 13:05:34', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (1602, '岗位信息新增', 'sys_post_add', NULL, 1600, NULL, '1', 1, '0', NULL, '1', ' ', '2022-03-26 13:06:00', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (1603, '岗位信息修改', 'sys_post_edit', NULL, 1600, NULL, '1', 2, '0', NULL, '1', ' ', '2022-03-26 13:06:31', ' ', '2022-03-26 13:06:38', '0', 1);
-INSERT INTO `sys_menu` VALUES (1604, '岗位信息删除', 'sys_post_del', NULL, 1600, NULL, '1', 3, '0', NULL, '1', ' ', '2022-03-26 13:06:31', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (1605, '岗位导入导出', 'sys_post_export', NULL, 1600, NULL, '1', 4, '0', NULL, '1', ' ', '2022-03-26 13:06:31', ' ', '2022-03-26 06:32:02', '0', 1);
-INSERT INTO `sys_menu` VALUES (2000, '系统管理', NULL, '/admin', -1, 'iconfont icon-quanjushezhi_o', '1', 1, '0', NULL, '0', '', '2017-11-07 20:56:00', 'admin', '2023-11-01 16:25:58', '0', 1);
-INSERT INTO `sys_menu` VALUES (2001, '日志管理', NULL, '/admin/logs', 2000, 'ele-Cloudy', '1', 1, '0', '0', '0', 'admin', '2023-03-02 12:26:42', 'admin', '2023-11-01 16:22:08', '0', 1);
-INSERT INTO `sys_menu` VALUES (2100, '操作日志', NULL, '/admin/log/index', 2001, 'iconfont icon-jinridaiban', '1', 2, '0', '0', '0', '', '2017-11-20 14:06:22', 'admin', '2023-03-02 12:28:57', '0', 1);
-INSERT INTO `sys_menu` VALUES (2101, '日志删除', 'sys_log_del', NULL, 2100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-20 20:37:37', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2102, '导入导出', 'sys_log_export', NULL, 2100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:54:01', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2103, '审计日志', NULL, '/admin/audit/index', 2001, 'iconfont icon-biaodan', '1', 1, '0', '0', '0', '', NULL, 'admin', '2023-03-02 12:28:47', '0', 1);
-INSERT INTO `sys_menu` VALUES (2104, '审计记录表删除', 'sys_audit_del', NULL, 2103, '1', '1', 3, '0', NULL, '1', '', NULL, 'admin', '2023-02-28 20:23:43', '0', 1);
-INSERT INTO `sys_menu` VALUES (2105, '导入导出', 'sys_audit_export', NULL, 2103, '1', '1', 3, '0', NULL, '1', '', NULL, 'admin', '2023-02-28 20:23:51', '0', 1);
-INSERT INTO `sys_menu` VALUES (2200, '字典管理', NULL, '/admin/dict/index', 2000, 'iconfont icon-zhongduancanshuchaxun', '1', 6, '0', NULL, '0', '', '2017-11-29 11:30:52', 'admin', '2023-02-16 15:24:29', '0', 1);
-INSERT INTO `sys_menu` VALUES (2201, '字典删除', 'sys_dict_del', NULL, 2200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-29 11:30:11', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2202, '字典新增', 'sys_dict_add', NULL, 2200, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-11 22:34:55', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2203, '字典修改', 'sys_dict_edit', NULL, 2200, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-11 22:36:03', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2210, '参数管理', NULL, '/admin/param/index', 2000, 'iconfont icon-wenducanshu-05', '1', 7, '1', NULL, '0', '', '2019-04-29 22:16:50', 'admin', '2023-02-16 15:24:51', '0', 1);
-INSERT INTO `sys_menu` VALUES (2211, '参数新增', 'sys_syspublicparam_add', NULL, 2210, NULL, '1', 1, '0', NULL, '1', ' ', '2019-04-29 22:17:36', ' ', '2020-03-24 08:57:11', '0', 1);
-INSERT INTO `sys_menu` VALUES (2212, '参数删除', 'sys_syspublicparam_del', NULL, 2210, NULL, '1', 1, '0', NULL, '1', ' ', '2019-04-29 22:17:55', ' ', '2020-03-24 08:57:12', '0', 1);
-INSERT INTO `sys_menu` VALUES (2213, '参数编辑', 'sys_syspublicparam_edit', NULL, 2210, NULL, '1', 1, '0', NULL, '1', ' ', '2019-04-29 22:18:14', ' ', '2020-03-24 08:57:13', '0', 1);
-INSERT INTO `sys_menu` VALUES (2300, '代码生成', NULL, '/gen/table/index', 9000, 'iconfont icon-zhongduancanshu', '1', 1, '0', '0', '0', '', '2018-01-20 13:17:19', 'admin', '2023-02-20 13:54:35', '0', 1);
-INSERT INTO `sys_menu` VALUES (2400, '终端管理', NULL, '/admin/client/index', 2000, 'iconfont icon-gongju', '1', 9, '1', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-02-16 15:25:28', '0', 1);
-INSERT INTO `sys_menu` VALUES (2401, '客户端新增', 'sys_client_add', NULL, 2400, '1', '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2402, '客户端修改', 'sys_client_edit', NULL, 2400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:37:06', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2403, '客户端删除', 'sys_client_del', NULL, 2400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:39:16', ' ', '2021-05-25 03:12:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (2500, '密钥管理', NULL, '/admin/social/index', 2000, 'iconfont icon-quanxian', '1', 10, '0', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-02-16 15:26:16', '0', 1);
-INSERT INTO `sys_menu` VALUES (2501, '密钥新增', 'sys_social_details_add', NULL, 2500, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:19', '0', 1);
-INSERT INTO `sys_menu` VALUES (2502, '密钥修改', 'sys_social_details_edit', NULL, 2500, '1', '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:19', '0', 1);
-INSERT INTO `sys_menu` VALUES (2503, '密钥删除', 'sys_social_details_del', NULL, 2500, '1', '1', 2, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:23', '0', 1);
-INSERT INTO `sys_menu` VALUES (2600, '令牌管理', NULL, '/admin/token/index', 2000, 'ele-Key', '1', 11, '0', NULL, '0', '', '2018-09-04 05:58:41', 'admin', '2023-02-16 15:28:28', '0', 1);
-INSERT INTO `sys_menu` VALUES (2601, '令牌删除', 'sys_token_del', NULL, 2600, NULL, '1', 1, '0', NULL, '1', ' ', '2018-09-04 05:59:50', ' ', '2020-03-24 08:57:24', '0', 1);
-INSERT INTO `sys_menu` VALUES (2800, 'Quartz管理', NULL, '/tools/job-manage/index', 9910, 'ele-AlarmClock', '1', 4, '0', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-11-27 14:52:53', '0', 1);
-INSERT INTO `sys_menu` VALUES (2810, '任务新增', 'job_sys_job_add', NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:26', '0', 1);
-INSERT INTO `sys_menu` VALUES (2820, '任务修改', 'job_sys_job_edit', NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:27', '0', 1);
-INSERT INTO `sys_menu` VALUES (2830, '任务删除', 'job_sys_job_del', NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:28', '0', 1);
-INSERT INTO `sys_menu` VALUES (2840, '任务暂停', 'job_sys_job_shutdown_job', NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:28', '0', 1);
-INSERT INTO `sys_menu` VALUES (2850, '任务开始', 'job_sys_job_start_job', NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:29', '0', 1);
-INSERT INTO `sys_menu` VALUES (2860, '任务刷新', 'job_sys_job_refresh_job', NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:30', '0', 1);
-INSERT INTO `sys_menu` VALUES (2870, '执行任务', 'job_sys_job_run_job', NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2019-08-08 15:35:18', ' ', '2020-03-24 08:57:31', '0', 1);
-INSERT INTO `sys_menu` VALUES (2871, '导出', 'job_sys_job_export', NULL, 2800, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-06 15:26:13', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (2900, '国际化管理', NULL, '/admin/i18n/index', 2000, 'iconfont icon-zhongyingzhuanhuan', '1', 8, '0', NULL, '0', '', NULL, 'admin', '2023-02-16 15:25:18', '0', 1);
-INSERT INTO `sys_menu` VALUES (2901, '系统表-国际化查看', 'sys_i18n_view', NULL, 2900, '1', '1', 0, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (2902, '系统表-国际化新增', 'sys_i18n_add', NULL, 2900, '1', '1', 1, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (2903, '系统表-国际化修改', 'sys_i18n_edit', NULL, 2900, '1', '1', 2, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (2904, '系统表-国际化删除', 'sys_i18n_del', NULL, 2900, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (2905, '导入导出', 'sys_i18n_export', NULL, 2900, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (2906, '文件管理', NULL, '/admin/file/index', 2000, 'ele-Files', '1', 6, '0', NULL, '0', '', '2019-06-25 12:44:46', 'admin', '2023-02-16 15:24:42', '0', 1);
-INSERT INTO `sys_menu` VALUES (2907, '删除文件', 'sys_file_del', NULL, 2906, NULL, '1', 1, '0', NULL, '1', ' ', '2019-06-25 13:41:41', ' ', '2020-03-24 08:58:42', '0', 1);
-INSERT INTO `sys_menu` VALUES (3000, '公众号平台', NULL, '/mp', 9900, 'iconfont icon-putong', '1', 3, '0', '0', '0', 'admin', '2023-02-24 10:40:44', 'admin', '2023-11-27 14:52:28', '0', 1);
-INSERT INTO `sys_menu` VALUES (3001, '账号管理', NULL, '/biz/mp/wx-account/index', 3000, 'iconfont icon-putong', '1', 0, '0', '0', '0', 'admin', '2023-02-24 10:43:03', ' ', '2023-11-01 17:28:07', '0', 1);
-INSERT INTO `sys_menu` VALUES (3002, '菜单设置', NULL, '/biz/mp/wx-menu/index', 3000, 'iconfont icon--chaifenlie', '1', 1, '0', '0', '0', 'admin', '2023-02-24 11:16:32', 'admin', '2023-11-01 17:28:11', '0', 1);
-INSERT INTO `sys_menu` VALUES (3003, '删除', 'mp_wxaccount_del', NULL, 3001, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 13:12:53', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3004, '新增', 'mp_wxaccount_add', NULL, 3001, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 13:13:04', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3005, '编辑', 'mp_wxaccount_edit', NULL, 3001, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 13:13:15', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3006, '粉丝管理', NULL, '/biz/mp/wx-account-fans/index', 3000, 'iconfont icon-tongzhi3', '1', 2, '0', '0', '0', 'admin', '2023-02-24 13:28:24', 'admin', '2023-11-01 17:28:15', '0', 1);
-INSERT INTO `sys_menu` VALUES (3007, '同步粉丝', 'mp_wxaccountfans_sync', NULL, 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 14:03:03', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3008, '消息管理', NULL, '/biz/mp/wx-fans-msg/index', 3000, 'iconfont icon-tongzhi3', '1', 6, '0', '0', '0', 'admin', '2023-02-24 15:24:35', 'admin', '2023-11-01 17:28:21', '0', 1);
-INSERT INTO `sys_menu` VALUES (3009, '修改微信消息', 'mp_wxmsg_edit', NULL, 3008, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-24 15:41:55', 'admin', '2023-11-01 17:28:28', '0', 1);
-INSERT INTO `sys_menu` VALUES (3010, '标签管理', NULL, '/biz/mp/wx-account-tag/index', 3000, 'iconfont icon-zidingyibuju', '1', 3, '0', '0', '0', 'admin', '2023-03-03 09:49:07', 'admin', '2023-11-01 17:28:32', '0', 1);
-INSERT INTO `sys_menu` VALUES (3011, '新增标签', 'mp_wx_account_tag_add', NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:26', 'admin', '2023-03-11 16:29:44', '0', 1);
-INSERT INTO `sys_menu` VALUES (3012, '编辑标签', 'mp_wx_account_tag_edit', NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:35', 'admin', '2023-03-11 16:29:50', '0', 1);
-INSERT INTO `sys_menu` VALUES (3013, '标签删除', 'mp_wx_account_tag_del', NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:45', 'admin', '2023-03-11 16:29:53', '0', 1);
-INSERT INTO `sys_menu` VALUES (3014, '同步标签', 'mp_wx_account_tag_sync', NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:55', 'admin', '2023-03-11 16:29:56', '0', 1);
-INSERT INTO `sys_menu` VALUES (3015, '素材管理', NULL, '/biz/mp/wx-material/index', 3000, 'iconfont icon-tongzhi3', '1', 5, '0', '0', '0', 'admin', '2023-02-27 14:13:47', 'admin', '2023-11-01 17:28:35', '0', 1);
-INSERT INTO `sys_menu` VALUES (3016, '素材维护', 'mp_wxmaterial_add', NULL, 3015, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 14:14:07', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3017, '素材删除', 'mp_wxmaterial_del', NULL, 3015, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 14:14:18', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3018, '自动回复', NULL, '/biz/mp/wx-auto-reply/index', 3000, 'iconfont icon-putong', '1', 4, '0', '0', '0', 'admin', '2023-03-01 10:56:10', 'admin', '2023-11-01 17:28:40', '0', 1);
-INSERT INTO `sys_menu` VALUES (3019, '新增回复', 'mp_wxautoreply_add', NULL, 3018, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 10:56:28', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3020, '编辑回复', 'mp_wxautoreply_edit', NULL, 3018, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 10:56:42', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3021, '删除回复', 'mp_wxautoreply_del', NULL, 3018, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 10:56:53', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3022, '运营数据', NULL, '/biz/mp/wx-statistics/index', 3000, 'iconfont icon-shuxing', '1', 8, '0', '0', '0', 'admin', '2023-03-01 11:15:58', 'admin', '2023-11-01 17:28:54', '0', 1);
-INSERT INTO `sys_menu` VALUES (3023, '新增消息', 'mp_wxmsg_add', NULL, 3008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 17:12:02', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3024, '新增粉丝', 'mp_wxaccountfans_add', 'mp_wxaccountfans_add', 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-02 10:57:41', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3025, '粉丝编辑', 'mp_wxaccountfans_edit', 'mp_wxaccountfans_add', 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-02 10:57:52', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3026, '粉丝删除', 'mp_wxaccountfans_del', 'mp_wxaccountfans_add', 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-02 10:58:02', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3027, '新增菜单', 'mp_wxmenu_add', NULL, 3002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 20:54:34', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3028, '发布菜单', 'mp_wxmenu_push', NULL, 3002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 20:54:48', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (3029, '删除菜单', 'mp_wxmenu_del', NULL, 3002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 20:54:57', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (4000, '系统监控', NULL, '/daemon', -1, 'iconfont icon-shuju', '1', 3, '0', '0', '0', 'admin', '2023-02-06 20:20:47', 'admin', '2023-11-01 17:12:31', '1', 1);
-INSERT INTO `sys_menu` VALUES (4001, '文档扩展', NULL, 'http://pigx-gateway:9999/doc.html', 9910, 'iconfont icon-biaodan', '1', 2, '0', '1', '0', '', '2018-06-26 10:50:32', 'admin', '2023-11-27 14:52:54', '0', 1);
-INSERT INTO `sys_menu` VALUES (4002, '缓存监控', NULL, '/tools/data/cache', 9910, 'iconfont icon-shuju', '1', 1, '0', '0', '0', 'admin', '2023-05-29 15:12:59', 'admin', '2023-11-27 14:52:56', '0', 1);
-INSERT INTO `sys_menu` VALUES (4010, '站内信管理', '', '/tools/message/index', 9910, 'iconfont icon-zhongduancanshuchaxun', '1', 7, '0', NULL, '0', '', NULL, 'admin', '2023-11-27 14:52:57', '0', 1);
-INSERT INTO `sys_menu` VALUES (4011, '站内信息查看', 'sys_message_view', NULL, 4010, '1', '1', 0, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:51:54', '0', 1);
-INSERT INTO `sys_menu` VALUES (4012, '站内信息新增', 'sys_message_add', NULL, 4010, '1', '1', 1, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:52:00', '0', 1);
-INSERT INTO `sys_menu` VALUES (4013, '站内信息修改', 'sys_message_edit', NULL, 4010, '1', '1', 2, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:52:04', '0', 1);
-INSERT INTO `sys_menu` VALUES (4014, '站内信息删除', 'sys_message_del', NULL, 4010, '1', '1', 3, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:52:09', '0', 1);
-INSERT INTO `sys_menu` VALUES (5000, '支付系统', NULL, '/pay', 9900, 'iconfont icon-neiqianshujuchucun', '1', 1, '0', '0', '0', 'admin', '2023-02-27 10:57:14', 'admin', '2023-11-27 14:52:11', '0', 1);
-INSERT INTO `sys_menu` VALUES (5001, '收银台', NULL, '/biz/pay/cd/index', 5000, 'iconfont icon-diqiu1', '1', 0, '0', '0', '0', 'admin', '2023-02-27 10:58:13', 'admin', '2023-11-01 17:28:57', '0', 1);
-INSERT INTO `sys_menu` VALUES (5002, '支付渠道', NULL, '/biz/pay/channel/index', 5000, 'iconfont icon-crew_feature', '1', 1, '0', '0', '0', 'admin', '2023-02-27 19:36:55', 'admin', '2023-11-01 17:29:01', '0', 1);
-INSERT INTO `sys_menu` VALUES (5003, '查询', 'pay_channel_view', NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:41:44', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5004, '新增', 'pay_channel_add', NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:05', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5005, '编辑', 'pay_channel_edit', NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:23', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5006, '删除', 'pay_channel_del', NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:40', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5007, '导出', 'pay_channel_export', NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:57', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5008, '商品订单', NULL, '/biz/pay/order/index', 5000, 'iconfont icon-fuwenbenkuang', '1', 2, '0', '0', '0', 'admin', '2023-02-28 09:56:22', ' ', '2023-11-01 17:29:05', '0', 1);
-INSERT INTO `sys_menu` VALUES (5009, '新增', 'pay_order_add', NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:58:25', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5010, '删除', 'pay_order_del', NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:58:40', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5011, '修改', 'pay_order_edit', NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:59:11', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5012, '查找', 'pay_order_view', NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:59:37', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5013, '导出', 'pay_order_export', NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:59:54', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5014, '通知记录', NULL, '/biz/pay/record/index', 5000, 'iconfont icon-fuwenbenkuang', '1', 5, '0', '0', '0', 'admin', '2023-02-28 11:01:37', 'admin', '2023-11-01 17:29:08', '0', 1);
-INSERT INTO `sys_menu` VALUES (5015, '新增', 'pay_record_add', NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:04:40', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5016, '修改', 'pay_record_edit', NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:05:00', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5017, '删除', 'pay_record_del', NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:05:15', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5018, '导出', 'pay_record_export', NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:05:41', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5019, '查询', 'pay_record_view', NULL, 5014, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 11:12:53', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5020, '退款订单', NULL, '/biz/pay/refund/index', 5000, 'iconfont icon-fuwenbenkuang', '1', 4, '0', '0', '0', 'admin', '2023-02-28 13:59:04', 'admin', '2023-11-01 17:29:11', '0', 1);
-INSERT INTO `sys_menu` VALUES (5021, '查询', 'pay_refund_view', NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 13:59:31', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5022, '新增', 'pay_refund_add', NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 13:59:48', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5023, '修改', 'pay_refund_edit', NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:00:05', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5024, '删除', 'pay_refund_del', NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:00:23', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5025, '导出', 'pay_refund_export', NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:00:35', 'admin', '2023-02-28 14:04:15', '0', 1);
-INSERT INTO `sys_menu` VALUES (5026, '支付订单', NULL, '/biz/pay/trade/index', 5000, 'iconfont icon-biaodan', '1', 3, '0', '0', '0', 'admin', '2023-02-28 14:44:59', 'admin', '2023-11-01 17:29:16', '0', 1);
-INSERT INTO `sys_menu` VALUES (5027, '查询', 'pay_trade_view', NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:45:50', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5028, '新增', 'pay_trade_add', NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:08', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5029, '修改', 'pay_trade_edit', NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:22', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5030, '删除', 'pay_trade_del', NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:36', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (5031, '导出', 'pay_trade_export', NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:49', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (6000, '协同办公', NULL, '/flow', -1, 'ele-Present', '1', 4, '0', '0', '0', 'admin', '2023-03-02 16:36:49', 'admin', '2023-11-01 17:09:28', '0', 1);
-INSERT INTO `sys_menu` VALUES (6001, '流程管理', NULL, '/flow/group/index', 6000, 'iconfont icon-gongju', '1', 3, '0', '0', '0', 'admin', '2023-03-02 16:37:55', 'admin', '2023-11-01 17:10:20', '0', 1);
-INSERT INTO `sys_menu` VALUES (6002, '创建流程', NULL, '/flow/create/all', 6000, 'fa fa-arrow-circle-right', '0', 2, '0', NULL, '0', '', '2023-07-27 13:14:56', 'admin', '2023-07-27 13:32:32', '0', 1);
-INSERT INTO `sys_menu` VALUES (6003, '发起流程', NULL, '/flow/list/index', 6000, 'fa fa-play', '1', 1, '0', '0', '0', 'admin', '2023-03-02 18:18:10', 'admin', '2023-07-27 13:29:00', '0', 1);
-INSERT INTO `sys_menu` VALUES (6004, '任务管理', NULL, '/task', 6000, 'fa fa-th', '1', 0, '0', '0', '0', 'admin', '2023-03-02 22:13:29', 'admin', '2023-11-01 17:10:13', '0', 1);
-INSERT INTO `sys_menu` VALUES (6005, '代办任务', NULL, '/flow/task/pending', 6004, 'fa fa-flag-checkered', '1', 0, '0', '0', '0', 'admin', '2023-03-02 22:59:35', 'admin', '2023-11-01 17:36:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (6006, '我的已办', NULL, '/flow/task/completed', 6004, 'fa fa-hand-o-right', '1', 3, '0', '0', '0', 'admin', '2023-03-02 23:23:13', 'admin', '2023-11-01 17:36:57', '0', 1);
-INSERT INTO `sys_menu` VALUES (6007, '我的发起', NULL, '/flow/task/started', 6004, 'fa fa-plane', '1', 1, '0', NULL, '0', '', '2023-07-27 13:14:51', 'admin', '2023-11-01 17:36:59', '0', 1);
-INSERT INTO `sys_menu` VALUES (6008, '抄送给我', NULL, '/flow/task/cc', 6004, 'fa fa-arrow-circle-right', '1', 2, '0', NULL, '0', '', '2023-07-27 13:14:56', 'admin', '2023-11-01 17:37:01', '0', 1);
-INSERT INTO `sys_menu` VALUES (7000, 'APP管理', NULL, '/app', 9900, 'ele-Cellphone', '1', 2, '0', '0', '0', 'admin', NULL, 'admin', '2023-11-27 14:52:31', '0', 1);
-INSERT INTO `sys_menu` VALUES (7100, '客户管理', NULL, '/biz/app/appuser/index', 7000, 'ele-UserFilled', '1', 1, '1', NULL, '0', 'admin', NULL, 'admin', '2023-11-01 17:29:36', '0', 1);
-INSERT INTO `sys_menu` VALUES (7101, '新增用户', 'app_appuser_add', NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
-INSERT INTO `sys_menu` VALUES (7102, '编辑用户', 'app_appuser_edit', NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
-INSERT INTO `sys_menu` VALUES (7103, '删除用户', 'app_appuser_del', NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
-INSERT INTO `sys_menu` VALUES (7104, '导出用户', 'app_appuser_export', NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
-INSERT INTO `sys_menu` VALUES (7200, 'APP角色', NULL, '/biz/app/approle/index', 7000, 'ele-Stamp', '1', 2, '0', '0', '0', 'admin', NULL, 'admin', '2023-11-01 17:29:39', '0', 1);
-INSERT INTO `sys_menu` VALUES (7201, '删除角色', 'app_approle_del', NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
-INSERT INTO `sys_menu` VALUES (7202, '编辑角色', 'app_approle_edit', NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
-INSERT INTO `sys_menu` VALUES (7203, '新增角色', 'app_approle_add', NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
-INSERT INTO `sys_menu` VALUES (7204, '导出角色', 'app_approle_export', NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
-INSERT INTO `sys_menu` VALUES (7300, 'APP秘钥', NULL, '/biz/app/appsocial/index', 7000, 'iconfont icon-quanxian', '1', 3, '0', '0', '0', 'admin', NULL, 'admin', '2023-11-01 17:29:42', '0', 1);
-INSERT INTO `sys_menu` VALUES (7301, '删除秘钥', 'app_social_details_del', NULL, 7300, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:02', '0', 1);
-INSERT INTO `sys_menu` VALUES (7302, '修改秘钥', 'app_social_details_edit', NULL, 7300, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:02', '0', 1);
-INSERT INTO `sys_menu` VALUES (7303, '保存秘钥', 'app_social_details_add', NULL, 7300, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:02', '0', 1);
-INSERT INTO `sys_menu` VALUES (7400, '文章资讯', '', '/biz/app/appArticle/index', 7000, 'ele-CollectionTag', '1', 4, '0', NULL, '0', '', NULL, 'admin', '2023-11-01 17:29:46', '0', 1);
-INSERT INTO `sys_menu` VALUES (7401, '文章资讯表查看', 'app_appArticle_view', NULL, 7400, '1', '1', 0, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7402, '文章资讯表新增', 'app_appArticle_add', NULL, 7400, '1', '1', 1, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7403, '文章资讯表修改', 'app_appArticle_edit', NULL, 7400, '1', '1', 2, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7404, '文章资讯表删除', 'app_appArticle_del', NULL, 7400, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7405, '导入导出', 'app_appArticle_export', NULL, 7400, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7500, '文章分类', '', '/biz/app/appArticleCategory/index', 7000, 'iconfont icon-caidan', '1', 5, '0', NULL, '0', '', NULL, 'admin', '2023-11-01 17:29:49', '0', 1);
-INSERT INTO `sys_menu` VALUES (7501, '文章分类表查看', 'app_appArticleCategory_view', NULL, 7500, '1', '1', 0, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7502, '文章分类表新增', 'app_appArticleCategory_add', NULL, 7500, '1', '1', 1, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7503, '文章分类表修改', 'app_appArticleCategory_edit', NULL, 7500, '1', '1', 2, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7504, '文章分类表删除', 'app_appArticleCategory_del', NULL, 7500, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7505, '导入导出', 'app_appArticleCategory_export', NULL, 7500, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (7600, '文章发布', NULL, '/biz/app/appArticle/form', 7000, 'iconfont icon-shuaxin', '0', 4, '0', '0', '0', 'admin', '2023-06-07 17:05:32', 'admin', '2023-11-01 17:29:52', '0', 1);
-INSERT INTO `sys_menu` VALUES (7700, '界面设置', '', '/biz/app/page/index', 7000, 'iconfont icon-diannao1', '1', 8, '0', NULL, '0', '', NULL, 'admin', '2023-11-01 17:29:55', '0', 1);
-INSERT INTO `sys_menu` VALUES (7701, '底部导航', NULL, '/biz/app/tabbar/index', 7000, 'iconfont icon-neiqianshujuchucun', '1', 9, '0', '0', '0', 'admin', '2023-06-14 14:36:08', 'admin', '2023-11-01 17:29:59', '0', 1);
-INSERT INTO `sys_menu` VALUES (9000, '开发平台', NULL, '/gen', -1, 'iconfont icon-shuxingtu', '1', 9, '0', '0', '0', '', '2019-08-12 09:35:16', 'admin', '2023-02-23 20:02:24', '0', 1);
-INSERT INTO `sys_menu` VALUES (9005, '数据源管理', NULL, '/gen/datasource/index', 9000, 'ele-Coin', '1', 0, '0', NULL, '0', '', '2019-08-12 09:42:11', 'admin', '2023-02-16 15:31:37', '0', 1);
-INSERT INTO `sys_menu` VALUES (9006, '表单设计', NULL, '/gen/design/index', 9000, 'iconfont icon-AIshiyanshi', '0', 2, '0', '0', '0', '', '2019-08-16 10:08:56', 'admin', '2023-02-23 14:06:50', '0', 1);
-INSERT INTO `sys_menu` VALUES (9007, '生成页面', NULL, '/gen/gener/index', 9000, 'iconfont icon-tongzhi4', '0', 1, '0', '0', '0', 'admin', '2023-02-20 09:58:23', 'admin', '2023-02-20 14:41:43', '0', 1);
-INSERT INTO `sys_menu` VALUES (9050, '元数据管理', NULL, '/gen/metadata', 9000, 'iconfont icon--chaifenhang', '1', 9, '0', '0', '0', '', '2018-07-27 01:13:21', 'admin', '2023-02-23 19:55:10', '0', 1);
-INSERT INTO `sys_menu` VALUES (9051, '模板管理', NULL, '/gen/template/index', 9050, 'iconfont icon--chaifenhang', '1', 5, '0', '0', '0', 'admin', '2023-02-21 11:22:54', 'admin', '2023-02-23 19:56:03', '0', 1);
-INSERT INTO `sys_menu` VALUES (9052, '查询', 'codegen_template_view', NULL, 9051, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 12:33:03', 'admin', '2023-02-21 13:50:54', '0', 1);
-INSERT INTO `sys_menu` VALUES (9053, '增加', 'codegen_template_add', NULL, 9051, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-21 13:34:10', 'admin', '2023-02-21 13:39:49', '0', 1);
-INSERT INTO `sys_menu` VALUES (9054, '新增', 'codegen_template_add', NULL, 9051, NULL, '0', 1, '0', '0', '1', 'admin', '2023-02-21 13:51:32', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9055, '导出', 'codegen_template_export', NULL, 9051, NULL, '0', 2, '0', '0', '1', 'admin', '2023-02-21 13:51:58', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9056, '删除', 'codegen_template_del', NULL, 9051, NULL, '0', 3, '0', '0', '1', 'admin', '2023-02-21 13:52:16', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9057, '编辑', 'codegen_template_edit', NULL, 9051, NULL, '0', 4, '0', '0', '1', 'admin', '2023-02-21 13:52:58', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9059, '模板分组', NULL, '/gen/group/index', 9050, 'iconfont icon-shuxingtu', '1', 6, '0', '0', '0', 'admin', '2023-02-21 15:06:50', 'admin', '2023-02-23 19:55:25', '0', 1);
-INSERT INTO `sys_menu` VALUES (9060, '查询', 'codegen_group_view', NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:08:07', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9061, '新增', 'codegen_group_add', NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:08:28', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9062, '修改', 'codegen_group_edit', NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:08:43', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9063, '删除', 'codegen_group_del', NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:09:02', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9064, '导出', 'codegen_group_export', NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:09:22', ' ', NULL, '0', 1);
-INSERT INTO `sys_menu` VALUES (9065, '字段管理', NULL, '/gen/field-type/index', 9050, 'iconfont icon-fuwenben', '1', 0, '0', '0', '0', 'admin', '2023-02-23 20:05:09', 'admin', '2023-02-23 20:05:45', '0', 1);
-INSERT INTO `sys_menu` VALUES (9900, '业务平台', NULL, '/biz', -1, 'iconfont icon-caidan', '1', 2, '0', '0', '0', 'admin', '2023-11-01 17:07:23', 'admin', '2023-11-27 14:51:31', '0', 1);
-INSERT INTO `sys_menu` VALUES (9910, '基础工具', NULL, '/tools', -1, 'iconfont icon-gongju', '1', 3, '0', '0', '0', 'admin', '2023-11-01 17:12:02', ' ', '2023-11-27 14:53:13', '0', 1);
-INSERT INTO `sys_menu` VALUES (9911, '路由管理', NULL, '/tools/route/index', 9910, 'iconfont icon-crew_feature', '1', 3, '0', '0', '0', 'admin', '2023-11-01 17:13:09', 'admin', '2023-11-27 14:53:33', '0', 1);
-INSERT INTO `sys_menu` VALUES (9912, '大屏看板', NULL, '/tools/data/report', 9910, 'iconfont icon-shuju', '1', 5, '0', '0', '0', 'admin', '2023-11-01 17:19:38', 'admin', '2023-11-27 14:53:38', '0', 1);
-INSERT INTO `sys_menu` VALUES (9913, '数据报表', NULL, '/tools/data/jimu', 9910, 'iconfont icon-ico_shuju', '1', 6, '0', '0', '0', 'admin', '2023-11-01 17:20:06', 'admin', '2023-11-27 14:53:43', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1000, '权限管理', NULL, '/system', NULL, 2000, 'iconfont icon-icon-', '1', 0, '0', '0', '0', '', '2018-09-28 08:29:53', 'admin', '2023-11-01 16:39:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1100, '用户管理', NULL, '/admin/system/user/index', NULL, 1000, 'ele-User', '1', 1, '0', '0', '0', '', '2017-11-02 22:24:37', 'admin', '2023-11-01 16:40:44', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1101, '用户新增', 'sys_user_add', NULL, NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:52:09', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1102, '用户修改', 'sys_user_edit', NULL, NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:52:48', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1103, '用户删除', 'sys_user_del', NULL, NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:54:01', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1104, '导入导出', 'sys_user_export', NULL, NULL, 1100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:54:01', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1200, '菜单管理', NULL, '/admin/system/menu/index', NULL, 1000, 'iconfont icon-caidan', '1', 2, '0', '0', '0', '', '2017-11-08 09:57:27', 'admin', '2023-11-01 16:40:39', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1201, '菜单新增', 'sys_menu_add', NULL, NULL, 1200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:15:53', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1202, '菜单修改', 'sys_menu_edit', NULL, NULL, 1200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:16:23', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1203, '菜单删除', 'sys_menu_del', NULL, NULL, 1200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:16:43', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1300, '角色管理', NULL, '/admin/system/role/index', NULL, 1000, 'iconfont icon-gerenzhongxin', '1', 3, '0', NULL, '0', '', '2017-11-08 10:13:37', 'admin', '2023-11-01 16:40:35', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1301, '角色新增', 'sys_role_add', NULL, NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:14:18', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1302, '角色修改', 'sys_role_edit', NULL, NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:14:41', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1303, '角色删除', 'sys_role_del', NULL, NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 10:14:59', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1304, '分配权限', 'sys_role_perm', NULL, NULL, 1300, NULL, '1', 1, '0', NULL, '1', ' ', '2018-04-20 07:22:55', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1305, '角色导入导出', 'sys_role_export', NULL, NULL, 1300, NULL, '1', 4, '0', NULL, '1', ' ', '2022-03-26 15:54:34', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1400, '部门管理', NULL, '/admin/system/dept/index', NULL, 1000, 'iconfont icon-zidingyibuju', '1', 4, '0', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-11-01 16:40:30', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1401, '部门新增', 'sys_dept_add', NULL, NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:56:16', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1402, '部门修改', 'sys_dept_edit', NULL, NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:56:59', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1403, '部门删除', 'sys_dept_del', NULL, NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:57:28', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1404, '开放互联', 'sys_connect_sync', NULL, NULL, 1400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-01-20 14:57:28', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1500, '租户管理', NULL, '/admin/system/tenant/index', NULL, 1000, 'iconfont icon-shuxingtu', '1', 9, '0', '0', '0', '', '2018-01-20 13:17:19', 'admin', '2023-11-01 16:40:26', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1501, '租户新增', 'sys_systenant_add', NULL, NULL, 1500, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:56:52', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1502, '租户修改', 'sys_systenant_edit', NULL, NULL, 1500, '1', '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:56:53', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1503, '租户删除', 'sys_systenant_del', NULL, NULL, 1500, '1', '1', 2, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:56:54', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1504, '租户套餐', 'sys_systenant_tenantmenu', NULL, NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-12 09:01:41', ' ', '2023-01-11 05:52:51', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1505, '租户套餐删除', 'sys_systenantmenu_del', NULL, NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-09 14:04:19', 'admin', '2023-01-11 05:52:51', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1506, '租户套餐编辑', 'sys_systenantmenu_edit', NULL, NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-09 14:04:19', 'admin', '2023-01-11 05:52:51', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1507, '租户套餐新增', 'sys_systenantmenu_add', NULL, NULL, 1500, '1', '1', 1, '0', NULL, '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:00', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1508, '租户套餐导出', 'sys_systenant_export', NULL, NULL, 1500, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-06 16:28:24', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1600, '岗位管理', NULL, '/admin/system/post/index', NULL, 1000, 'iconfont icon--chaifenhang', '1', 5, '1', '0', '0', '', '2022-03-26 13:04:14', 'admin', '2023-11-01 17:02:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1601, '岗位信息查看', 'sys_post_view', NULL, NULL, 1600, NULL, '1', 0, '0', NULL, '1', ' ', '2022-03-26 13:05:34', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1602, '岗位信息新增', 'sys_post_add', NULL, NULL, 1600, NULL, '1', 1, '0', NULL, '1', ' ', '2022-03-26 13:06:00', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1603, '岗位信息修改', 'sys_post_edit', NULL, NULL, 1600, NULL, '1', 2, '0', NULL, '1', ' ', '2022-03-26 13:06:31', ' ', '2022-03-26 13:06:38', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1604, '岗位信息删除', 'sys_post_del', NULL, NULL, 1600, NULL, '1', 3, '0', NULL, '1', ' ', '2022-03-26 13:06:31', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (1605, '岗位导入导出', 'sys_post_export', NULL, NULL, 1600, NULL, '1', 4, '0', NULL, '1', ' ', '2022-03-26 13:06:31', ' ', '2022-03-26 06:32:02', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2000, '系统管理', NULL, '/admin', NULL, -1, 'iconfont icon-quanjushezhi_o', '1', 1, '0', NULL, '0', '', '2017-11-07 20:56:00', 'admin', '2023-11-01 16:25:58', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2001, '日志管理', NULL, '/admin/logs', NULL, 2000, 'ele-Cloudy', '1', 1, '0', '0', '0', 'admin', '2023-03-02 12:26:42', 'admin', '2023-11-01 16:22:08', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2100, '操作日志', NULL, '/admin/log/index', NULL, 2001, 'iconfont icon-jinridaiban', '1', 2, '0', '0', '0', '', '2017-11-20 14:06:22', 'admin', '2023-03-02 12:28:57', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2101, '日志删除', 'sys_log_del', NULL, NULL, 2100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-20 20:37:37', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2102, '导入导出', 'sys_log_export', NULL, NULL, 2100, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-08 09:54:01', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2103, '审计日志', NULL, '/admin/audit/index', NULL, 2001, 'iconfont icon-biaodan', '1', 1, '0', '0', '0', '', NULL, 'admin', '2023-03-02 12:28:47', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2104, '审计记录表删除', 'sys_audit_del', NULL, NULL, 2103, '1', '1', 3, '0', NULL, '1', '', NULL, 'admin', '2023-02-28 20:23:43', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2105, '导入导出', 'sys_audit_export', NULL, NULL, 2103, '1', '1', 3, '0', NULL, '1', '', NULL, 'admin', '2023-02-28 20:23:51', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2200, '字典管理', NULL, '/admin/dict/index', NULL, 2000, 'iconfont icon-zhongduancanshuchaxun', '1', 6, '0', NULL, '0', '', '2017-11-29 11:30:52', 'admin', '2023-02-16 15:24:29', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2201, '字典删除', 'sys_dict_del', NULL, NULL, 2200, NULL, '1', 1, '0', NULL, '1', ' ', '2017-11-29 11:30:11', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2202, '字典新增', 'sys_dict_add', NULL, NULL, 2200, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-11 22:34:55', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2203, '字典修改', 'sys_dict_edit', NULL, NULL, 2200, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-11 22:36:03', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2210, '参数管理', NULL, '/admin/param/index', NULL, 2000, 'iconfont icon-wenducanshu-05', '1', 7, '1', NULL, '0', '', '2019-04-29 22:16:50', 'admin', '2023-02-16 15:24:51', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2211, '参数新增', 'sys_syspublicparam_add', NULL, NULL, 2210, NULL, '1', 1, '0', NULL, '1', ' ', '2019-04-29 22:17:36', ' ', '2020-03-24 08:57:11', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2212, '参数删除', 'sys_syspublicparam_del', NULL, NULL, 2210, NULL, '1', 1, '0', NULL, '1', ' ', '2019-04-29 22:17:55', ' ', '2020-03-24 08:57:12', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2213, '参数编辑', 'sys_syspublicparam_edit', NULL, NULL, 2210, NULL, '1', 1, '0', NULL, '1', ' ', '2019-04-29 22:18:14', ' ', '2020-03-24 08:57:13', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2300, '代码生成', NULL, '/gen/table/index', NULL, 9000, 'iconfont icon-zhongduancanshu', '1', 2, '0', '0', '0', '', '2018-01-20 13:17:19', 'admin', '2023-02-20 13:54:35', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2400, '终端管理', NULL, '/admin/client/index', NULL, 2000, 'iconfont icon-gongju', '1', 9, '1', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-02-16 15:25:28', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2401, '客户端新增', 'sys_client_add', NULL, NULL, 2400, '1', '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2402, '客户端修改', 'sys_client_edit', NULL, NULL, 2400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:37:06', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2403, '客户端删除', 'sys_client_del', NULL, NULL, 2400, NULL, '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:39:16', ' ', '2021-05-25 03:12:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2500, '密钥管理', NULL, '/admin/social/index', NULL, 2000, 'iconfont icon-quanxian', '1', 10, '0', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-02-16 15:26:16', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2501, '密钥新增', 'sys_social_details_add', NULL, NULL, 2500, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:19', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2502, '密钥修改', 'sys_social_details_edit', NULL, NULL, 2500, '1', '1', 1, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:19', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2503, '密钥删除', 'sys_social_details_del', NULL, NULL, 2500, '1', '1', 2, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:23', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2600, '令牌管理', NULL, '/admin/token/index', NULL, 2000, 'ele-Key', '1', 11, '0', NULL, '0', '', '2018-09-04 05:58:41', 'admin', '2023-02-16 15:28:28', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2601, '令牌删除', 'sys_token_del', NULL, NULL, 2600, NULL, '1', 1, '0', NULL, '1', ' ', '2018-09-04 05:59:50', ' ', '2020-03-24 08:57:24', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2800, 'Quartz管理', NULL, '/tools/job-manage/index', NULL, 9910, 'ele-AlarmClock', '1', 4, '0', NULL, '0', '', '2018-01-20 13:17:19', 'admin', '2023-11-27 14:52:53', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2810, '任务新增', 'job_sys_job_add', NULL, NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:26', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2820, '任务修改', 'job_sys_job_edit', NULL, NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:27', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2830, '任务删除', 'job_sys_job_del', NULL, NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:28', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2840, '任务暂停', 'job_sys_job_shutdown_job', NULL, NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:28', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2850, '任务开始', 'job_sys_job_start_job', NULL, NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:29', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2860, '任务刷新', 'job_sys_job_refresh_job', NULL, NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:57:30', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2870, '执行任务', 'job_sys_job_run_job', NULL, NULL, 2800, '1', '1', 0, '0', NULL, '1', ' ', '2019-08-08 15:35:18', ' ', '2020-03-24 08:57:31', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2871, '导出', 'job_sys_job_export', NULL, NULL, 2800, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-06 15:26:13', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2900, '国际化管理', NULL, '/admin/i18n/index', NULL, 2000, 'iconfont icon-zhongyingzhuanhuan', '1', 8, '0', NULL, '0', '', NULL, 'admin', '2023-02-16 15:25:18', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2901, '系统表-国际化查看', 'sys_i18n_view', NULL, NULL, 2900, '1', '1', 0, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2902, '系统表-国际化新增', 'sys_i18n_add', NULL, NULL, 2900, '1', '1', 1, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2903, '系统表-国际化修改', 'sys_i18n_edit', NULL, NULL, 2900, '1', '1', 2, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2904, '系统表-国际化删除', 'sys_i18n_del', NULL, NULL, 2900, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2905, '导入导出', 'sys_i18n_export', NULL, NULL, 2900, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2906, '文件管理', NULL, '/admin/file/index', NULL, 2000, 'ele-Files', '1', 6, '0', NULL, '0', '', '2019-06-25 12:44:46', 'admin', '2023-02-16 15:24:42', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2907, '删除文件', 'sys_file_del', NULL, NULL, 2906, NULL, '1', 1, '0', NULL, '1', ' ', '2019-06-25 13:41:41', ' ', '2020-03-24 08:58:42', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2910, '行政区划', '', '/admin/sysArea/index', NULL, 2000, 'iconfont icon-neiqianshujuchucun', '1', 99, '0', NULL, '0', '', NULL, 'admin', '2024-02-16 22:11:03', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2911, '行政区划表查看', 'sys_sysArea_view', NULL, NULL, 2910, '1', '1', 0, '0', NULL, '1', ' ', NULL, ' ', '2024-02-17 14:31:09', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2912, '行政区划表新增', 'sys_sysArea_add', NULL, NULL, 2910, '1', '1', 1, '0', NULL, '1', ' ', NULL, ' ', '2024-02-17 14:31:16', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2913, '行政区划表删除', 'sys_sysArea_del', NULL, NULL, 2910, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', '2024-02-17 14:31:21', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2914, '导入导出', 'sys_sysArea_export', NULL, NULL, 2910, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', '2024-02-17 14:31:26', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (2915, '行政区划表修改', 'sys_sysArea_edit', NULL, NULL, 2910, '1', '1', 2, '0', NULL, '1', ' ', NULL, ' ', '2024-02-17 14:31:31', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3000, '公众号平台', NULL, '/mp', NULL, 9900, 'iconfont icon-putong', '1', 3, '0', '0', '0', 'admin', '2023-02-24 10:40:44', 'admin', '2023-11-27 14:52:28', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3001, '账号管理', NULL, '/biz/mp/wx-account/index', NULL, 3000, 'iconfont icon-putong', '1', 0, '0', '0', '0', 'admin', '2023-02-24 10:43:03', ' ', '2023-11-01 17:28:07', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3002, '菜单设置', NULL, '/biz/mp/wx-menu/index', NULL, 3000, 'iconfont icon--chaifenlie', '1', 1, '0', '0', '0', 'admin', '2023-02-24 11:16:32', 'admin', '2023-11-01 17:28:11', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3003, '删除', 'mp_wxaccount_del', NULL, NULL, 3001, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 13:12:53', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3004, '新增', 'mp_wxaccount_add', NULL, NULL, 3001, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 13:13:04', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3005, '编辑', 'mp_wxaccount_edit', NULL, NULL, 3001, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 13:13:15', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3006, '粉丝管理', NULL, '/biz/mp/wx-account-fans/index', NULL, 3000, 'iconfont icon-tongzhi3', '1', 2, '0', '0', '0', 'admin', '2023-02-24 13:28:24', 'admin', '2023-11-01 17:28:15', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3007, '同步粉丝', 'mp_wxaccountfans_sync', NULL, NULL, 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-24 14:03:03', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3008, '消息管理', NULL, '/biz/mp/wx-fans-msg/index', NULL, 3000, 'iconfont icon-tongzhi3', '1', 6, '0', '0', '0', 'admin', '2023-02-24 15:24:35', 'admin', '2023-11-01 17:28:21', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3009, '修改微信消息', 'mp_wxmsg_edit', NULL, NULL, 3008, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-24 15:41:55', 'admin', '2023-11-01 17:28:28', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3010, '标签管理', NULL, '/biz/mp/wx-account-tag/index', NULL, 3000, 'iconfont icon-zidingyibuju', '1', 3, '0', '0', '0', 'admin', '2023-03-03 09:49:07', 'admin', '2023-11-01 17:28:32', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3011, '新增标签', 'mp_wx_account_tag_add', NULL, NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:26', 'admin', '2023-03-11 16:29:44', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3012, '编辑标签', 'mp_wx_account_tag_edit', NULL, NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:35', 'admin', '2023-03-11 16:29:50', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3013, '标签删除', 'mp_wx_account_tag_del', NULL, NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:45', 'admin', '2023-03-11 16:29:53', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3014, '同步标签', 'mp_wx_account_tag_sync', NULL, NULL, 3010, NULL, '1', 0, '0', '0', '1', 'admin', '2023-03-03 09:49:55', 'admin', '2023-03-11 16:29:56', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3015, '素材管理', NULL, '/biz/mp/wx-material/index', NULL, 3000, 'iconfont icon-tongzhi3', '1', 5, '0', '0', '0', 'admin', '2023-02-27 14:13:47', 'admin', '2023-11-01 17:28:35', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3016, '素材维护', 'mp_wxmaterial_add', NULL, NULL, 3015, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 14:14:07', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3017, '素材删除', 'mp_wxmaterial_del', NULL, NULL, 3015, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 14:14:18', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3018, '自动回复', NULL, '/biz/mp/wx-auto-reply/index', NULL, 3000, 'iconfont icon-putong', '1', 4, '0', '0', '0', 'admin', '2023-03-01 10:56:10', 'admin', '2023-11-01 17:28:40', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3019, '新增回复', 'mp_wxautoreply_add', NULL, NULL, 3018, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 10:56:28', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3020, '编辑回复', 'mp_wxautoreply_edit', NULL, NULL, 3018, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 10:56:42', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3021, '删除回复', 'mp_wxautoreply_del', NULL, NULL, 3018, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 10:56:53', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3022, '运营数据', NULL, '/biz/mp/wx-statistics/index', NULL, 3000, 'iconfont icon-shuxing', '1', 8, '0', '0', '0', 'admin', '2023-03-01 11:15:58', 'admin', '2023-11-01 17:28:54', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3023, '新增消息', 'mp_wxmsg_add', NULL, NULL, 3008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-01 17:12:02', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3024, '新增粉丝', 'mp_wxaccountfans_add', 'mp_wxaccountfans_add', NULL, 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-02 10:57:41', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3025, '粉丝编辑', 'mp_wxaccountfans_edit', 'mp_wxaccountfans_add', NULL, 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-02 10:57:52', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3026, '粉丝删除', 'mp_wxaccountfans_del', 'mp_wxaccountfans_add', NULL, 3006, NULL, '0', 0, '0', '0', '1', 'admin', '2023-03-02 10:58:02', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3027, '新增菜单', 'mp_wxmenu_add', NULL, NULL, 3002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 20:54:34', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3028, '发布菜单', 'mp_wxmenu_push', NULL, NULL, 3002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 20:54:48', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (3029, '删除菜单', 'mp_wxmenu_del', NULL, NULL, 3002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 20:54:57', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4000, '系统监控', NULL, '/daemon', NULL, -1, 'iconfont icon-shuju', '1', 3, '0', '0', '0', 'admin', '2023-02-06 20:20:47', 'admin', '2023-11-01 17:12:31', '1', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4001, '文档扩展', NULL, 'http://pigx-gateway:9999/admin/doc.html', NULL, 9910, 'iconfont icon-biaodan', '1', 2, '0', '1', '0', '', '2018-06-26 10:50:32', 'admin', '2023-11-27 14:52:54', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4002, '缓存监控', NULL, '/tools/data/cache', NULL, 9910, 'iconfont icon-shuju', '1', 1, '0', '0', '0', 'admin', '2023-05-29 15:12:59', 'admin', '2023-11-27 14:52:56', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4010, '站内信管理', '', '/tools/message/index', NULL, 9910, 'iconfont icon-zhongduancanshuchaxun', '1', 7, '0', NULL, '0', '', NULL, 'admin', '2023-11-27 14:52:57', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4011, '站内信息查看', 'sys_message_view', NULL, NULL, 4010, '1', '1', 0, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:51:54', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4012, '站内信息新增', 'sys_message_add', NULL, NULL, 4010, '1', '1', 1, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:52:00', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4013, '站内信息修改', 'sys_message_edit', NULL, NULL, 4010, '1', '1', 2, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:52:04', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (4014, '站内信息删除', 'sys_message_del', NULL, NULL, 4010, '1', '1', 3, '0', NULL, '1', '', NULL, 'admin', '2023-10-25 14:52:09', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5000, '支付系统', NULL, '/pay', NULL, 9900, 'iconfont icon-neiqianshujuchucun', '1', 1, '0', '0', '0', 'admin', '2023-02-27 10:57:14', 'admin', '2023-11-27 14:52:11', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5001, '收银台', NULL, '/biz/pay/cd/index', NULL, 5000, 'iconfont icon-diqiu1', '1', 0, '0', '0', '0', 'admin', '2023-02-27 10:58:13', 'admin', '2023-11-01 17:28:57', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5002, '支付渠道', NULL, '/biz/pay/channel/index', NULL, 5000, 'iconfont icon-crew_feature', '1', 1, '0', '0', '0', 'admin', '2023-02-27 19:36:55', 'admin', '2023-11-01 17:29:01', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5003, '查询', 'pay_channel_view', NULL, NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:41:44', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5004, '新增', 'pay_channel_add', NULL, NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:05', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5005, '编辑', 'pay_channel_edit', NULL, NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:23', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5006, '删除', 'pay_channel_del', NULL, NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:40', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5007, '导出', 'pay_channel_export', NULL, NULL, 5002, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-27 19:42:57', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5008, '商品订单', NULL, '/biz/pay/order/index', NULL, 5000, 'iconfont icon-fuwenbenkuang', '1', 2, '0', '0', '0', 'admin', '2023-02-28 09:56:22', ' ', '2023-11-01 17:29:05', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5009, '新增', 'pay_order_add', NULL, NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:58:25', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5010, '删除', 'pay_order_del', NULL, NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:58:40', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5011, '修改', 'pay_order_edit', NULL, NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:59:11', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5012, '查找', 'pay_order_view', NULL, NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:59:37', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5013, '导出', 'pay_order_export', NULL, NULL, 5008, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 09:59:54', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5014, '通知记录', NULL, '/biz/pay/record/index', NULL, 5000, 'iconfont icon-fuwenbenkuang', '1', 5, '0', '0', '0', 'admin', '2023-02-28 11:01:37', 'admin', '2023-11-01 17:29:08', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5015, '新增', 'pay_record_add', NULL, NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:04:40', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5016, '修改', 'pay_record_edit', NULL, NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:05:00', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5017, '删除', 'pay_record_del', NULL, NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:05:15', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5018, '导出', 'pay_record_export', NULL, NULL, 5014, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-28 11:05:41', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5019, '查询', 'pay_record_view', NULL, NULL, 5014, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 11:12:53', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5020, '退款订单', NULL, '/biz/pay/refund/index', NULL, 5000, 'iconfont icon-fuwenbenkuang', '1', 4, '0', '0', '0', 'admin', '2023-02-28 13:59:04', 'admin', '2023-11-01 17:29:11', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5021, '查询', 'pay_refund_view', NULL, NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 13:59:31', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5022, '新增', 'pay_refund_add', NULL, NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 13:59:48', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5023, '修改', 'pay_refund_edit', NULL, NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:00:05', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5024, '删除', 'pay_refund_del', NULL, NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:00:23', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5025, '导出', 'pay_refund_export', NULL, NULL, 5020, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:00:35', 'admin', '2023-02-28 14:04:15', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5026, '支付订单', NULL, '/biz/pay/trade/index', NULL, 5000, 'iconfont icon-biaodan', '1', 3, '0', '0', '0', 'admin', '2023-02-28 14:44:59', 'admin', '2023-11-01 17:29:16', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5027, '查询', 'pay_trade_view', NULL, NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:45:50', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5028, '新增', 'pay_trade_add', NULL, NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:08', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5029, '修改', 'pay_trade_edit', NULL, NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:22', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5030, '删除', 'pay_trade_del', NULL, NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:36', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (5031, '导出', 'pay_trade_export', NULL, NULL, 5026, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-28 14:46:49', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6000, '协同办公', NULL, '/flow', NULL, -1, 'ele-Present', '1', 4, '0', '0', '0', 'admin', '2023-03-02 16:36:49', 'admin', '2023-11-01 17:09:28', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6001, '流程管理', NULL, '/flow/group/index', NULL, 6000, 'iconfont icon-gongju', '1', 3, '0', '0', '0', 'admin', '2023-03-02 16:37:55', 'admin', '2023-11-01 17:10:20', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6002, '创建流程', NULL, '/flow/create/all', NULL, 6000, 'fa fa-arrow-circle-right', '0', 2, '0', NULL, '0', '', '2023-07-27 13:14:56', 'admin', '2023-07-27 13:32:32', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6003, '发起流程', NULL, '/flow/list/index', NULL, 6000, 'fa fa-play', '1', 1, '0', '0', '0', 'admin', '2023-03-02 18:18:10', 'admin', '2023-07-27 13:29:00', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6004, '任务管理', NULL, '/task', NULL, 6000, 'fa fa-th', '1', 0, '0', '0', '0', 'admin', '2023-03-02 22:13:29', 'admin', '2023-11-01 17:10:13', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6005, '代办任务', NULL, '/flow/task/pending', NULL, 6004, 'fa fa-flag-checkered', '1', 0, '0', '0', '0', 'admin', '2023-03-02 22:59:35', 'admin', '2023-11-01 17:36:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6006, '我的已办', NULL, '/flow/task/completed', NULL, 6004, 'fa fa-hand-o-right', '1', 3, '0', '0', '0', 'admin', '2023-03-02 23:23:13', 'admin', '2023-11-01 17:36:57', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6007, '我的发起', NULL, '/flow/task/started', NULL, 6004, 'fa fa-plane', '1', 1, '0', NULL, '0', '', '2023-07-27 13:14:51', 'admin', '2023-11-01 17:36:59', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (6008, '抄送给我', NULL, '/flow/task/cc', NULL, 6004, 'fa fa-arrow-circle-right', '1', 2, '0', NULL, '0', '', '2023-07-27 13:14:56', 'admin', '2023-11-01 17:37:01', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7000, 'APP管理', NULL, '/app', NULL, 9900, 'ele-Cellphone', '1', 2, '0', '0', '0', 'admin', NULL, 'admin', '2023-11-27 14:52:31', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7100, '客户管理', NULL, '/biz/app/appuser/index', NULL, 7000, 'ele-UserFilled', '1', 1, '1', NULL, '0', 'admin', NULL, 'admin', '2023-11-01 17:29:36', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7101, '新增用户', 'app_appuser_add', NULL, NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7102, '编辑用户', 'app_appuser_edit', NULL, NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7103, '删除用户', 'app_appuser_del', NULL, NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7104, '导出用户', 'app_appuser_export', NULL, NULL, 7100, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:00', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7200, 'APP角色', NULL, '/biz/app/approle/index', NULL, 7000, 'ele-Stamp', '1', 2, '0', '0', '0', 'admin', NULL, 'admin', '2023-11-01 17:29:39', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7201, '删除角色', 'app_approle_del', NULL, NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7202, '编辑角色', 'app_approle_edit', NULL, NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7203, '新增角色', 'app_approle_add', NULL, NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7204, '导出角色', 'app_approle_export', NULL, NULL, 7200, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:01', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7300, 'APP秘钥', NULL, '/biz/app/appsocial/index', NULL, 7000, 'iconfont icon-quanxian', '1', 3, '0', '0', '0', 'admin', NULL, 'admin', '2023-11-01 17:29:42', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7301, '删除秘钥', 'app_social_details_del', NULL, NULL, 7300, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:02', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7302, '修改秘钥', 'app_social_details_edit', NULL, NULL, 7300, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:02', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7303, '保存秘钥', 'app_social_details_add', NULL, NULL, 7300, NULL, '1', 1, '0', NULL, '1', 'admin', NULL, 'admin', '2023-01-29 07:01:02', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7400, '文章资讯', '', '/biz/app/appArticle/index', NULL, 7000, 'ele-CollectionTag', '1', 4, '0', NULL, '0', '', NULL, 'admin', '2023-11-01 17:29:46', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7401, '文章资讯表查看', 'app_appArticle_view', NULL, NULL, 7400, '1', '1', 0, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7402, '文章资讯表新增', 'app_appArticle_add', NULL, NULL, 7400, '1', '1', 1, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7403, '文章资讯表修改', 'app_appArticle_edit', NULL, NULL, 7400, '1', '1', 2, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7404, '文章资讯表删除', 'app_appArticle_del', NULL, NULL, 7400, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7405, '导入导出', 'app_appArticle_export', NULL, NULL, 7400, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7500, '文章分类', '', '/biz/app/appArticleCategory/index', NULL, 7000, 'iconfont icon-caidan', '1', 5, '0', NULL, '0', '', NULL, 'admin', '2023-11-01 17:29:49', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7501, '文章分类表查看', 'app_appArticleCategory_view', NULL, NULL, 7500, '1', '1', 0, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7502, '文章分类表新增', 'app_appArticleCategory_add', NULL, NULL, 7500, '1', '1', 1, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7503, '文章分类表修改', 'app_appArticleCategory_edit', NULL, NULL, 7500, '1', '1', 2, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7504, '文章分类表删除', 'app_appArticleCategory_del', NULL, NULL, 7500, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7505, '导入导出', 'app_appArticleCategory_export', NULL, NULL, 7500, '1', '1', 3, '0', NULL, '1', ' ', NULL, ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7600, '文章发布', NULL, '/biz/app/appArticle/form', NULL, 7000, 'iconfont icon-shuaxin', '0', 4, '0', '0', '0', 'admin', '2023-06-07 17:05:32', 'admin', '2023-11-01 17:29:52', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7700, '界面设置', '', '/biz/app/page/index', NULL, 7000, 'iconfont icon-diannao1', '1', 8, '0', NULL, '0', '', NULL, 'admin', '2023-11-01 17:29:55', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (7701, '底部导航', NULL, '/biz/app/tabbar/index', NULL, 7000, 'iconfont icon-neiqianshujuchucun', '1', 9, '0', '0', '0', 'admin', '2023-06-14 14:36:08', 'admin', '2023-11-01 17:29:59', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9000, '开发平台', NULL, '/gen', NULL, -1, 'iconfont icon-shuxingtu', '1', 9, '0', '0', '0', '', '2019-08-12 09:35:16', 'admin', '2023-02-23 20:02:24', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9005, '数据源管理', NULL, '/gen/datasource/index', NULL, 9000, 'ele-Coin', '1', 0, '0', NULL, '0', '', '2019-08-12 09:42:11', 'admin', '2023-02-16 15:31:37', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9006, '表单设计', NULL, '/gen/design/index', NULL, 9000, 'iconfont icon-AIshiyanshi', '0', 2, '0', '0', '0', '', '2019-08-16 10:08:56', 'admin', '2023-02-23 14:06:50', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9007, '生成页面', NULL, '/gen/gener/index', NULL, 9000, 'iconfont icon-tongzhi4', '0', 1, '0', '0', '0', 'admin', '2023-02-20 09:58:23', 'admin', '2023-02-20 14:41:43', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9050, '元数据管理', NULL, '/gen/metadata', NULL, 9000, 'iconfont icon--chaifenhang', '1', 9, '0', '0', '0', '', '2018-07-27 01:13:21', 'admin', '2023-02-23 19:55:10', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9051, '模板管理', NULL, '/gen/template/index', NULL, 9050, 'iconfont icon--chaifenhang', '1', 5, '0', '0', '0', 'admin', '2023-02-21 11:22:54', 'admin', '2023-02-23 19:56:03', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9052, '查询', 'codegen_template_view', NULL, NULL, 9051, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 12:33:03', 'admin', '2023-02-21 13:50:54', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9053, '增加', 'codegen_template_add', NULL, NULL, 9051, NULL, '1', 0, '0', '0', '1', 'admin', '2023-02-21 13:34:10', 'admin', '2023-02-21 13:39:49', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9054, '新增', 'codegen_template_add', NULL, NULL, 9051, NULL, '0', 1, '0', '0', '1', 'admin', '2023-02-21 13:51:32', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9055, '导出', 'codegen_template_export', NULL, NULL, 9051, NULL, '0', 2, '0', '0', '1', 'admin', '2023-02-21 13:51:58', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9056, '删除', 'codegen_template_del', NULL, NULL, 9051, NULL, '0', 3, '0', '0', '1', 'admin', '2023-02-21 13:52:16', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9057, '编辑', 'codegen_template_edit', NULL, NULL, 9051, NULL, '0', 4, '0', '0', '1', 'admin', '2023-02-21 13:52:58', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9059, '模板分组', NULL, '/gen/group/index', NULL, 9050, 'iconfont icon-shuxingtu', '1', 6, '0', '0', '0', 'admin', '2023-02-21 15:06:50', 'admin', '2023-02-23 19:55:25', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9060, '查询', 'codegen_group_view', NULL, NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:08:07', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9061, '新增', 'codegen_group_add', NULL, NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:08:28', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9062, '修改', 'codegen_group_edit', NULL, NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:08:43', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9063, '删除', 'codegen_group_del', NULL, NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:09:02', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9064, '导出', 'codegen_group_export', NULL, NULL, 9059, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:09:22', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9070, '数据表管理', NULL, '/gen/create-table/index', NULL, 9000, 'iconfont icon-bolangneng', '1', 1, '0', '0', '0', 'admin', '2024-02-19 11:41:12', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9071, '新增', 'codegen_table_add', NULL, NULL, 9070, NULL, '0', 0, '0', '0', '1', 'admin', '2023-02-21 15:08:28', ' ', NULL, '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9065, '字段管理', NULL, '/gen/field-type/index', NULL, 9050, 'iconfont icon-fuwenben', '1', 0, '0', '0', '0', 'admin', '2023-02-23 20:05:09', 'admin', '2023-02-23 20:05:45', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9900, '业务平台', NULL, '/biz', NULL, -1, 'iconfont icon-caidan', '1', 2, '0', '0', '0', 'admin', '2023-11-01 17:07:23', 'admin', '2023-11-27 14:51:31', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9910, '基础工具', NULL, '/tools', NULL, -1, 'iconfont icon-gongju', '1', 3, '0', '0', '0', 'admin', '2023-11-01 17:12:02', ' ', '2023-11-27 14:53:13', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9911, '路由管理', NULL, '/tools/route/index', NULL, 9910, 'iconfont icon-crew_feature', '1', 3, '0', '0', '0', 'admin', '2023-11-01 17:13:09', 'admin', '2023-11-27 14:53:33', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9912, '大屏看板', NULL, '/tools/data/report', NULL, 9910, 'iconfont icon-shuju', '1', 5, '0', '0', '0', 'admin', '2023-11-01 17:19:38', 'admin', '2023-11-27 14:53:38', '0', 1);
+INSERT INTO `sys_menu` (`menu_id`, `name`, `permission`, `path`, `component`, `parent_id`, `icon`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `tenant_id`) VALUES (9913, '数据报表', NULL, '/tools/data/jimu', NULL, 9910, 'iconfont icon-ico_shuju', '1', 6, '0', '0', '0', 'admin', '2023-11-01 17:20:06', 'admin', '2023-11-27 14:53:43', '0', 1);
 COMMIT;
 
 -- ----------------------------
@@ -879,6 +943,12 @@ INSERT INTO `sys_role_menu` VALUES (1, 2904);
 INSERT INTO `sys_role_menu` VALUES (1, 2905);
 INSERT INTO `sys_role_menu` VALUES (1, 2906);
 INSERT INTO `sys_role_menu` VALUES (1, 2907);
+INSERT INTO `sys_role_menu` VALUES (1, 2910);
+INSERT INTO `sys_role_menu` VALUES (1, 2911);
+INSERT INTO `sys_role_menu` VALUES (1, 2912);
+INSERT INTO `sys_role_menu` VALUES (1, 2913);
+INSERT INTO `sys_role_menu` VALUES (1, 2914);
+INSERT INTO `sys_role_menu` VALUES (1, 2915);
 INSERT INTO `sys_role_menu` VALUES (1, 3000);
 INSERT INTO `sys_role_menu` VALUES (1, 3001);
 INSERT INTO `sys_role_menu` VALUES (1, 3002);
@@ -1007,6 +1077,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 9062);
 INSERT INTO `sys_role_menu` VALUES (1, 9063);
 INSERT INTO `sys_role_menu` VALUES (1, 9064);
 INSERT INTO `sys_role_menu` VALUES (1, 9065);
+INSERT INTO `sys_role_menu` VALUES (1, 9070);
 INSERT INTO `sys_role_menu` VALUES (1, 9900);
 INSERT INTO `sys_role_menu` VALUES (1, 9910);
 INSERT INTO `sys_role_menu` VALUES (1, 9911);
diff --git a/db/8pigxx_codegen.sql b/db/8pigxx_codegen.sql
index 6e5df567c..5222c8d6c 100644
--- a/db/8pigxx_codegen.sql
+++ b/db/8pigxx_codegen.sql
@@ -151,7 +151,7 @@ CREATE TABLE `gen_table` (
   `package_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目包名',
   `version` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目版本号',
   `i18n` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '是否生成带有i18n 0 不带有 1带有',
-  `style` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '代码风格',
+  `style` bigint NOT NULL COMMENT '代码风格',
   `child_table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '子表名称',
   `main_field` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '主表关联键',
   `child_field` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '子表关联键',
@@ -245,12 +245,12 @@ INSERT INTO `gen_template` VALUES (8, 'Mapper.xml', '${backendPath}/src/main/res
 INSERT INTO `gen_template` VALUES (9, '权限菜单', '${backendPath}/menu/${functionName}_menu.sql', 'menu.sql', '-- 该脚本不要直接执行， 注意维护菜单的父节点ID 默认 父节点-1 , 默认租户 1\n#set($menuId=${dateTool.getSystemTime()})\n\n-- 菜单SQL\ninsert into sys_menu ( menu_id,parent_id, path, permission, menu_type, icon, del_flag, create_time, sort_order, update_time, name, tenant_id)\nvalues (${menuId}, \'-1\', \'/${moduleName}/${functionName}/index\', \'\', \'0\', \'icon-bangzhushouji\', \'0\', null , \'8\', null , \'${tableComment}管理\', 1);\n\n-- 菜单对应按钮SQL\ninsert into sys_menu ( menu_id,parent_id, permission, menu_type, path, icon, del_flag, create_time, sort_order, update_time, name, tenant_id)\nvalues (${math.add($menuId,1)},${menuId}, \'${moduleName}_${functionName}_view\', \'1\', null, \'1\',  \'0\', null, \'0\', null, \'${tableComment}查看\', 1);\n\ninsert into sys_menu ( menu_id,parent_id, permission, menu_type, path, icon, del_flag, create_time, sort_order, update_time, name, tenant_id)\nvalues (${math.add($menuId,2)},${menuId}, \'${moduleName}_${functionName}_add\', \'1\', null, \'1\',  \'0\', null, \'1\', null, \'${tableComment}新增\', 1);\n\ninsert into sys_menu (menu_id, parent_id, permission, menu_type, path, icon,  del_flag, create_time, sort_order, update_time, name, tenant_id)\nvalues (${math.add($menuId,3)},${menuId}, \'${moduleName}_${functionName}_edit\', \'1\', null, \'1\',  \'0\', null, \'2\', null, \'${tableComment}修改\', 1);\n\ninsert into sys_menu (menu_id, parent_id, permission, menu_type, path, icon, del_flag, create_time, sort_order, update_time, name, tenant_id)\nvalues (${math.add($menuId,4)},${menuId}, \'${moduleName}_${functionName}_del\', \'1\', null, \'1\',  \'0\', null, \'3\', null, \'${tableComment}删除\', 1);\n\ninsert into sys_menu ( menu_id,parent_id, permission, menu_type, path, icon, del_flag, create_time, sort_order, update_time, name, tenant_id)\nvalues (${math.add($menuId,5)},${menuId}, \'${moduleName}_${functionName}_export\', \'1\', null, \'1\',  \'0\', null, \'3\', null, \'导入导出\', 1);', '2023-02-23 01:19:08', '2023-08-27 23:16:31', '0', 1, ' ', ' ');
 INSERT INTO `gen_template` VALUES (10, 'api.ts', '${frontendPath}/src/api/${moduleName}/${functionName}.ts', 'api.ts', 'import request from \"/@/utils/request\"\n\nexport function fetchList(query?: Object) {\n  return request({\n    url: \'/${moduleName}/${functionName}/page\',\n    method: \'get\',\n    params: query\n  })\n}\n\nexport function addObj(obj?: Object) {\n  return request({\n    url: \'/${moduleName}/${functionName}\',\n    method: \'post\',\n    data: obj\n  })\n}\n\nexport function getObj(id?: string) {\n  return request({\n    url: \'/${moduleName}/${functionName}/\' + id,\n    method: \'get\'\n  })\n}\n\nexport function delObjs(ids?: Object) {\n  return request({\n    url: \'/${moduleName}/${functionName}\',\n    method: \'delete\',\n    data: ids\n  })\n}\n\nexport function putObj(obj?: Object) {\n  return request({\n    url: \'/${moduleName}/${functionName}\',\n    method: \'put\',\n    data: obj\n  })\n}\n\n#if($ChildClassName)\nexport function delChildObj(ids?: Object) {\n  return request({\n    url: \'/${moduleName}/${functionName}/child\',\n    method: \'delete\',\n    data: ids\n  })\n}\n#end', '2023-02-23 01:19:23', '2023-06-04 10:34:17', '0', 1, ' ', ' ');
 INSERT INTO `gen_template` VALUES (11, '表格', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', '表格不含i18n', '<template>\n  <div class=\"layout-padding\">\n    <div class=\"layout-padding-auto layout-padding-view\">\n#if($queryList)\n      <el-row v-show=\"showSearch\">\n        <el-form :model=\"state.queryForm\" ref=\"queryRef\" :inline=\"true\" @keyup.enter=\"getDataList\">\n#foreach($field in $queryList)\n#if($field.queryFormType == \'select\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-select v-model=\"state.queryForm.${field.attrName}\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\">\n       #if($field.fieldDict)\n              <el-option :label=\"item.label\" :value=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\"></el-option>\n         #else\n              <el-option label=\"请选择\">0</el-option>\n         #end\n            </el-select>\n      </el-form-item>\n#elseif($field.queryFormType == \'date\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n      <el-date-picker type=\"date\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"state.queryForm.${field.attrName}\"></el-date-picker>\n      </el-form-item>\n#elseif($field.queryFormType == \'datetime\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\" >\n            <el-date-picker type=\"datetime\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"state.queryForm.${field.attrName}\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#else\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\" >\n        <el-input placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"state.queryForm.${field.attrName}\" />\n      </el-form-item>\n#end\n#end\n          <el-form-item>\n            <el-button icon=\"search\" type=\"primary\" @click=\"getDataList\">\n              查询\n            </el-button>\n            <el-button icon=\"Refresh\" @click=\"resetQuery\">重置</el-button>\n          </el-form-item>\n        </el-form>\n      </el-row>\n#end\n      <el-row>\n        <div class=\"mb8\" style=\"width: 100%\">\n          <el-button icon=\"folder-add\" type=\"primary\" class=\"ml10\" @click=\"formDialogRef.openDialog()\"\n            v-auth=\"\'${moduleName}_${functionName}_add\'\">\n            新 增\n          </el-button>\n          <el-button plain :disabled=\"multiple\" icon=\"Delete\" type=\"primary\"\n            v-auth=\"\'${moduleName}_${functionName}_del\'\" @click=\"handleDelete(selectObjs)\">\n            删除\n          </el-button>\n          <right-toolbar v-model:showSearch=\"showSearch\" :export=\"\'${moduleName}_${functionName}_export\'\"\n                @exportExcel=\"exportExcel\" class=\"ml10 mr20\" style=\"float: right;\"\n            @queryTable=\"getDataList\"></right-toolbar>\n        </div>\n      </el-row>\n      <el-table :data=\"state.dataList\" v-loading=\"state.loading\" border \n        :cell-style=\"tableStyle.cellStyle\" :header-cell-style=\"tableStyle.headerCellStyle\"\n				@selection-change=\"selectionChangHandle\"\n        @sort-change=\"sortChangeHandle\">\n        <el-table-column type=\"selection\" width=\"40\" align=\"center\" />\n        <el-table-column type=\"index\" label=\"#\" width=\"40\" />\n      #foreach($field in $gridList)\n        #if($field.fieldDict)\n          <el-table-column prop=\"${field.attrName}\" label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" show-overflow-tooltip>\n      <template #default=\"scope\">\n                <dict-tag :options=\"$field.fieldDict\" :value=\"scope.row.${field.attrName}\"></dict-tag>\n            </template>\n          </el-table-column>\n        #else\n          <el-table-column prop=\"${field.attrName}\" label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" #if(${field.gridSort} == \'1\')sortable=\"custom\"#end show-overflow-tooltip/>\n        #end\n     #end\n        <el-table-column label=\"操作\" width=\"150\">\n          <template #default=\"scope\">\n            <el-button icon=\"edit-pen\" text type=\"primary\" v-auth=\"\'${moduleName}_${functionName}_edit\'\"\n              @click=\"formDialogRef.openDialog(scope.row.${pk.attrName})\">编辑</el-button>\n            <el-button icon=\"delete\" text type=\"primary\" v-auth=\"\'${moduleName}_${functionName}_del\'\" @click=\"handleDelete([scope.row.${pk.attrName}])\">删除</el-button>\n          </template>\n        </el-table-column>\n      </el-table>\n      <pagination @size-change=\"sizeChangeHandle\" @current-change=\"currentChangeHandle\" v-bind=\"state.pagination\" />\n    </div>\n\n    <!-- 编辑、新增  -->\n    <form-dialog ref=\"formDialogRef\" @refresh=\"getDataList(false)\" />\n\n  </div>\n</template>\n\n<script setup lang=\"ts\" name=\"system${ClassName}\">\nimport { BasicTableProps, useTable } from \"/@/hooks/table\";\nimport { fetchList, delObjs } from \"/@/api/${moduleName}/${functionName}\";\nimport { useMessage, useMessageBox } from \"/@/hooks/message\";\nimport { useDict } from \'/@/hooks/dict\';\n\n// 引入组件\nconst FormDialog = defineAsyncComponent(() => import(\'./form.vue\'));\n// 定义查询字典\n#set($fieldDict=[])\n#foreach($field in $queryList)\n  #if($field.fieldDict)\n    #set($void=$fieldDict.add($field.fieldDict))\n  #end\n#end\n\n#foreach($field in $gridList)\n  #if($field.fieldDict)\n    #set($void=$fieldDict.add($field.fieldDict))\n  #end\n#end\n#if($fieldDict)\nconst { $dict.format($fieldDict) } = useDict($dict.quotation($fieldDict))\n#end\n// 定义变量内容\nconst formDialogRef = ref()\n// 搜索变量\nconst queryRef = ref()\nconst showSearch = ref(true)\n// 多选变量\nconst selectObjs = ref([]) as any\nconst multiple = ref(true)\n\nconst state: BasicTableProps = reactive<BasicTableProps>({\n  queryForm: {},\n  pageList: fetchList\n})\n\n//  table hook\nconst {\n  getDataList,\n  currentChangeHandle,\n  sizeChangeHandle,\n  sortChangeHandle,\n  downBlobFile,\n	tableStyle\n} = useTable(state)\n\n// 清空搜索条件\nconst resetQuery = () => {\n  // 清空搜索条件\n  queryRef.value?.resetFields()\n  // 清空多选\n  selectObjs.value = []\n  getDataList()\n}\n\n// 导出excel\nconst exportExcel = () => {\n  downBlobFile(\'/${moduleName}/${functionName}/export\', Object.assign(state.queryForm, { ids: selectObjs }), \'${functionName}.xlsx\')\n}\n\n// 多选事件\nconst selectionChangHandle = (objs: { $pk.attrName: string }[]) => {\n  selectObjs.value = objs.map(({ $pk.attrName }) => $pk.attrName);\n  multiple.value = !objs.length;\n};\n\n// 删除操作\nconst handleDelete = async (ids: string[]) => {\n  try {\n    await useMessageBox().confirm(\'此操作将永久删除\');\n  } catch {\n    return;\n  }\n\n  try {\n    await delObjs(ids);\n    getDataList();\n    useMessage().success(\'删除成功\');\n  } catch (err: any) {\n    useMessage().error(err.msg);\n  }\n};\n</script>', '2023-02-23 01:19:35', '2023-08-29 14:27:53', '0', 1, '', 'admin');
-INSERT INTO `gen_template` VALUES (12, '表单', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', '表单不含i18n', '<template>\n    <el-dialog :title=\"form.${pk.attrName} ? \'编辑\' : \'新增\'\" v-model=\"visible\"\n      :close-on-click-modal=\"false\" draggable>\n      <el-form ref=\"dataFormRef\" :model=\"form\" :rules=\"dataRules\" formDialogRef label-width=\"90px\" v-loading=\"loading\">\n       <el-row :gutter=\"24\">\n#foreach($field in $formList)\n#if($field.attrName != ${pk.attrName})\n#if($formLayout == 1)\n    <el-col :span=\"24\" class=\"mb20\">\n#elseif($formLayout == 2)\n    <el-col :span=\"12\" class=\"mb20\">\n#end\n#if($field.formType == \'text\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'textarea\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input type=\"textarea\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'select\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n          <el-select v-model=\"form.${field.attrName}\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\">\n     #if($field.fieldDict)\n            <el-option :value=\"item.value\" :label=\"item.label\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\"></el-option>\n       #end\n     #if(!$field.fieldDict)\n            <el-option label=\"请选择\">0</el-option>\n       #end\n          </el-select>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'radio\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-radio-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n             <el-radio :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" border :key=\"index\">{{ item.label }}\n            </el-radio>\n       #else\n           <el-radio label=\"${field.fieldComment}\" border>${field.fieldComment}</el-radio>\n       #end\n            </el-radio-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'checkbox\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-checkbox-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n						<el-checkbox :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\">{{ item.label }}</el-checkbox>\n       #end\n     #if(!$field.fieldDict)\n                <el-checkbox label=\"启用\" name=\"type\"></el-checkbox>\n                <el-checkbox label=\"禁用\" name=\"type\"></el-checkbox>\n       #end\n            </el-checkbox-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'date\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n      <el-date-picker type=\"date\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'datetime\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-date-picker type=\"datetime\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateTimeStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n\n#elseif($field.formType == \'number\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input-number :min=\"1\" :max=\"1000\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></el-input-number>\n      </el-form-item>\n    </el-col>\n#elseif($field.formType == \'upload-file\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-file v-model:imageUrl=\"form.${field.attrName}\"></upload-file>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'upload-img\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-img v-model=\"form.${field.attrName}\"></upload-img>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'editor\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <editor v-if=\"visible\" v-model:get-html=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></editor>\n  </el-form-item>\n  </el-col>\n#end\n\n#if(!$field.formType)\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${column.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n    </el-col>\n#end\n#end\n#end\n			</el-row>\n      </el-form>\n      <template #footer>\n        <span class=\"dialog-footer\">\n          <el-button @click=\"visible = false\">取消</el-button>\n          <el-button type=\"primary\" @click=\"onSubmit\" :disabled=\"loading\">确认</el-button>\n        </span>\n      </template>\n    </el-dialog>\n</template>\n\n<script setup lang=\"ts\" name=\"${ClassName}Dialog\">\nimport { useDict } from \'/@/hooks/dict\';\nimport { useMessage } from \"/@/hooks/message\";\nimport { getObj, addObj, putObj } from \'/@/api/${moduleName}/${functionName}\'\nimport { rule } from \'/@/utils/validate\';\nconst emit = defineEmits([\'refresh\']);\n\n// 定义变量内容\nconst dataFormRef = ref();\nconst visible = ref(false)\nconst loading = ref(false)\n// 定义字典\n#set($fieldDict=[])\n#foreach($field in $gridList)\n	#if($field.fieldDict)\n		#set($void=$fieldDict.add($field.fieldDict))\n	#end\n#end\n#if($fieldDict)\nconst { $dict.format($fieldDict) } = useDict($dict.quotation($fieldDict))\n#end\n\n// 提交表单数据\nconst form = reactive({\n#if(!$formList.contains(${pk.attrName}))\n		${pk.attrName}:\'\',\n#end\n#foreach($field in $formList)\n#if($field.formType == \'number\')\n		${field.attrName}: 0,\n#elseif($field.formType == \'checkbox\')\n    ${field.attrName}: [],\n#else\n	  ${field.attrName}: \'\',\n#end\n#end\n});\n\n// 定义校验规则\nconst dataRules = ref({\n#foreach($field in $formList)\n#if($field.formRequired && $field.formValidator)\n    ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}, { validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#elseif($field.formRequired)\n        ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}],\n#elseif($field.formValidator)\n        ${field.attrName}: [{ validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#end\n#end\n})\n\n// 打开弹窗\nconst openDialog = (id: string) => {\n  visible.value = true\n  form.${pk.attrName} = \'\'\n\n  // 重置表单数据\n	nextTick(() => {\n		dataFormRef.value?.resetFields();\n	});\n\n  // 获取${className}信息\n  if (id) {\n    form.${pk.attrName} = id\n    get${className}Data(id)\n  }\n};\n\n// 提交\nconst onSubmit = async () => {\n	const valid = await dataFormRef.value.validate().catch(() => {});\n	if (!valid) return false;\n\n	try {\n    loading.value = true;\n		form.${pk.attrName} ? await putObj(form) : await addObj(form);\n		useMessage().success(form.${pk.attrName} ? \'修改成功\' : \'添加成功\');\n		visible.value = false;\n		emit(\'refresh\');\n	} catch (err: any) {\n		useMessage().error(err.msg);\n	} finally {\n    loading.value = false;\n  }\n};\n\n\n// 初始化表单数据\nconst get${className}Data = (id: string) => {\n  // 获取数据\n  loading.value = true\n  getObj(id).then((res: any) => {\n    Object.assign(form, res.data)\n  }).finally(() => {\n    loading.value = false\n  })\n};\n\n// 暴露变量\ndefineExpose({\n  openDialog\n});\n</script>', '2023-02-23 01:19:48', '2023-09-12 21:59:33', '0', 1, '', 'admin');
+INSERT INTO `gen_template` VALUES (12, '表单', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', '表单不含i18n', '<template>\n    <el-dialog :title=\"form.${pk.attrName} ? \'编辑\' : \'新增\'\" v-model=\"visible\"\n      :close-on-click-modal=\"false\" draggable>\n      <el-form ref=\"dataFormRef\" :model=\"form\" :rules=\"dataRules\" formDialogRef label-width=\"90px\" v-loading=\"loading\">\n       <el-row :gutter=\"24\">\n#foreach($field in $formList)\n#if($field.attrName != ${pk.attrName})\n#if($formLayout == 1)\n    <el-col :span=\"24\" class=\"mb20\">\n#elseif($formLayout == 2)\n    <el-col :span=\"12\" class=\"mb20\">\n#end\n#if($field.formType == \'text\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'textarea\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input type=\"textarea\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'select\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n          <el-select v-model=\"form.${field.attrName}\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\">\n     #if($field.fieldDict)\n            <el-option :value=\"item.value\" :label=\"item.label\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\"></el-option>\n       #end\n     #if(!$field.fieldDict)\n            <el-option label=\"请选择\">0</el-option>\n       #end\n          </el-select>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'radio\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-radio-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n             <el-radio :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" border :key=\"index\">{{ item.label }}\n            </el-radio>\n       #else\n           <el-radio label=\"${field.fieldComment}\" border>${field.fieldComment}</el-radio>\n       #end\n            </el-radio-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'checkbox\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-checkbox-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n						<el-checkbox :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\">{{ item.label }}</el-checkbox>\n       #end\n     #if(!$field.fieldDict)\n                <el-checkbox label=\"启用\" name=\"type\"></el-checkbox>\n                <el-checkbox label=\"禁用\" name=\"type\"></el-checkbox>\n       #end\n            </el-checkbox-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'date\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n      <el-date-picker type=\"date\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'datetime\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-date-picker type=\"datetime\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateTimeStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n\n#elseif($field.formType == \'number\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input-number :min=\"1\" :max=\"1000\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></el-input-number>\n      </el-form-item>\n    </el-col>\n#elseif($field.formType == \'upload-file\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-file v-model:imageUrl=\"form.${field.attrName}\"></upload-file>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'upload-img\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-img v-model=\"form.${field.attrName}\"></upload-img>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'editor\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <editor v-if=\"visible\" v-model:get-html=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></editor>\n  </el-form-item>\n  </el-col>\n#end\n\n#if(!$field.formType)\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${column.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n    </el-col>\n#end\n#end\n#end\n			</el-row>\n      </el-form>\n      <template #footer>\n        <span class=\"dialog-footer\">\n          <el-button @click=\"visible = false\">取消</el-button>\n          <el-button type=\"primary\" @click=\"onSubmit\" :disabled=\"loading\">确认</el-button>\n        </span>\n      </template>\n    </el-dialog>\n</template>\n\n<script setup lang=\"ts\" name=\"${ClassName}Dialog\">\nimport { useDict } from \'/@/hooks/dict\';\nimport { useMessage } from \"/@/hooks/message\";\nimport { getObj, addObj, putObj } from \'/@/api/${moduleName}/${functionName}\'\nimport { rule } from \'/@/utils/validate\';\nconst emit = defineEmits([\'refresh\']);\n\n// 定义变量内容\nconst dataFormRef = ref();\nconst visible = ref(false)\nconst loading = ref(false)\n// 定义字典\n#set($fieldDict=[])\n#foreach($field in $gridList)\n	#if($field.fieldDict)\n		#set($void=$fieldDict.add($field.fieldDict))\n	#end\n#end\n#if($fieldDict)\nconst { $dict.format($fieldDict) } = useDict($dict.quotation($fieldDict))\n#end\n\n// 提交表单数据\nconst form = reactive({\n#if(!$formList.contains(${pk.attrName}))\n		${pk.attrName}:\'\',\n#end\n#foreach($field in $formList)\n#if($field.formType == \'number\')\n		${field.attrName}: 0,\n#elseif($field.formType == \'checkbox\')\n    ${field.attrName}: [],\n#else\n	  ${field.attrName}: \'\',\n#end\n#end\n});\n\n// 定义校验规则\nconst dataRules = ref({\n#foreach($field in $formList)\n#if($field.formRequired == \'1\' && $field.formValidator)\n    ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}, { validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#elseif($field.formRequired == \'1\')\n        ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}],\n#elseif($field.formValidator)\n        ${field.attrName}: [{ validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#end\n#end\n})\n\n// 打开弹窗\nconst openDialog = (id: string) => {\n  visible.value = true\n  form.${pk.attrName} = \'\'\n\n  // 重置表单数据\n	nextTick(() => {\n		dataFormRef.value?.resetFields();\n	});\n\n  // 获取${className}信息\n  if (id) {\n    form.${pk.attrName} = id\n    get${className}Data(id)\n  }\n};\n\n// 提交\nconst onSubmit = async () => {\n	const valid = await dataFormRef.value.validate().catch(() => {});\n	if (!valid) return false;\n\n	try {\n    loading.value = true;\n		form.${pk.attrName} ? await putObj(form) : await addObj(form);\n		useMessage().success(form.${pk.attrName} ? \'修改成功\' : \'添加成功\');\n		visible.value = false;\n		emit(\'refresh\');\n	} catch (err: any) {\n		useMessage().error(err.msg);\n	} finally {\n    loading.value = false;\n  }\n};\n\n\n// 初始化表单数据\nconst get${className}Data = (id: string) => {\n  // 获取数据\n  loading.value = true\n  getObj(id).then((res: any) => {\n    Object.assign(form, res.data)\n  }).finally(() => {\n    loading.value = false\n  })\n};\n\n// 暴露变量\ndefineExpose({\n  openDialog\n});\n</script>', '2023-02-23 01:19:48', '2023-12-07 13:20:22', '0', 1, '', 'admin');
 INSERT INTO `gen_template` VALUES (13, 'i18n英文模板', '${frontendPath}/src/views/${moduleName}/${functionName}/i18n/en.ts', 'i18n英文模板', 'export default {\n   ${functionName}: {\n        index: \'#\',\n        import${className}Tip: \'import ${ClassName}\',\n#foreach($field in $fieldList)\n        ${field.attrName}: \'${field.attrName}\',\n#end\n#foreach($field in $fieldList)\n        input$str.pascalCase(${field.attrName})Tip: \'input ${field.attrName}\',\n#end\n    }\n}', '2023-02-23 01:20:25', '2023-06-04 10:49:25', '0', 1, '', 'admin');
 INSERT INTO `gen_template` VALUES (14, 'i18n中文模板', '${frontendPath}/src/views/${moduleName}/${functionName}/i18n/zh-cn.ts', 'i18n中文模板', 'export default {\n   ${functionName}: {\n        index: \'#\',\n        import${className}Tip: \'导入${tableComment}\',\n#foreach($field in $fieldList)\n        ${field.attrName}: \'#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\',\n#end\n#foreach($field in $fieldList)\n        input$str.pascalCase(${field.attrName})Tip: \'请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\',\n#end\n    }\n}', '2023-02-23 01:20:40', '2023-06-04 10:49:28', '0', 1, '', 'admin');
 INSERT INTO `gen_template` VALUES (15, '子实体', '${backendPath}/src/main/java/${packagePath}/${moduleName}/entity/${ChildClassName}Entity.java', '子表实体对象', 'package ${package}.${moduleName}.entity;\n\nimport com.baomidou.mybatisplus.annotation.*;\nimport com.baomidou.mybatisplus.extension.activerecord.Model;\nimport io.swagger.v3.oas.annotations.media.Schema;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\n#foreach($import in $importList)\nimport $import;\n#end\n\n/**\n * ${tableComment}\n *\n * @author ${author}\n * @date ${datetime}\n */\n@Data\n@TableName(\"${childTableName}\")\n@EqualsAndHashCode(callSuper = true)\n@Schema(description = \"${childTableName}\")\npublic class ${ChildClassName}Entity extends Model<${ChildClassName}Entity> {\n\n#foreach ($field in $childFieldList)\n#if(${field.fieldComment})#set($comment=${field.fieldComment})#else #set($comment=${field.attrName})#end\n	/**\n	* $comment\n	*/\n#if($field.primaryPk == \'1\')\n	@TableId(type = IdType.ASSIGN_ID)\n#end\n#if($field.autoFill == \'INSERT\')\n	@TableField(fill = FieldFill.INSERT)\n#elseif($field.autoFill == \'INSERT_UPDATE\')\n	@TableField(fill = FieldFill.INSERT_UPDATE)\n#elseif($field.autoFill == \'UPDATE\')\n	@TableField(fill = FieldFill.UPDATE)\n#end\n#if($field.fieldName == \'del_flag\')\n  @TableLogic\n	@TableField(fill = FieldFill.INSERT)\n#end\n	@Schema(description=\"$comment\"#if($field.hidden),hidden=$field.hidden#end)\n#if($field.formType == \'checkbox\')\n   private ${field.attrType}[] $field.attrName;\n#else\n   private $field.attrType $field.attrName;\n#end \n#end\n}\n', '2023-06-01 11:07:14', '2023-09-12 16:32:33', '0', 1, ' ', ' ');
 INSERT INTO `gen_template` VALUES (16, '主子Contoller', '${backendPath}/src/main/java/${packagePath}/${moduleName}/controller/${ClassName}Controller.java', '子表Controller对象', 'package ${package}.${moduleName}.controller;\n\n#if($queryList)\nimport cn.hutool.core.util.StrUtil;\n#end\nimport cn.hutool.core.util.ArrayUtil;\nimport com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;\nimport com.baomidou.mybatisplus.core.toolkit.Wrappers;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport com.pig4cloud.pigx.common.core.util.R;\nimport com.pig4cloud.pigx.common.log.annotation.SysLog;\nimport ${package}.${moduleName}.entity.${ClassName}Entity;\nimport ${package}.${moduleName}.entity.${ChildClassName}Entity;\nimport ${package}.${moduleName}.service.${ClassName}Service;\nimport org.springframework.security.access.prepost.PreAuthorize;\nimport com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;\nimport io.swagger.v3.oas.annotations.security.SecurityRequirement;\n#if($isSpringBoot3)\nimport org.springdoc.core.annotations.ParameterObject;\n#else\nimport org.springdoc.api.annotations.ParameterObject;\n#end\nimport org.springframework.http.HttpHeaders;\nimport io.swagger.v3.oas.annotations.tags.Tag;\nimport io.swagger.v3.oas.annotations.Operation;\nimport lombok.RequiredArgsConstructor;\nimport org.springframework.web.bind.annotation.*;\n\nimport java.util.List;\nimport java.util.Objects;\n\n/**\n * ${tableComment}\n *\n * @author ${author}\n * @date ${datetime}\n */\n@RestController\n@RequiredArgsConstructor\n@RequestMapping(\"/${functionName}\" )\n@Tag(description = \"${functionName}\" , name = \"${tableComment}管理\" )\n@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)\npublic class ${ClassName}Controller {\n\n    private final  ${ClassName}Service ${className}Service;\n\n    /**\n     * 分页查询\n     * @param page 分页对象\n     * @param ${className} ${tableComment}\n     * @return\n     */\n    @Operation(summary = \"分页查询\" , description = \"分页查询\" )\n    @GetMapping(\"/page\" )\n    @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_view\')\" )\n    public R get${ClassName}Page(@ParameterObject Page page, @ParameterObject ${ClassName}Entity ${className}) {\n        LambdaQueryWrapper<${ClassName}Entity> wrapper = Wrappers.lambdaQuery();\n#foreach ($field in $queryList)\n#set($getAttrName=$str.getProperty($field.attrName))\n#set($var=\"${className}.$getAttrName()\")\n#if($field.attrType == \'String\')\n#set($expression=\"StrUtil.isNotBlank\")\n#else\n#set($expression=\"Objects.nonNull\")\n#end\n#if($field.queryType == \'=\')\n		wrapper.eq($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'like\' )\n		wrapper.like($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'!-\' )\n		wrapper.ne($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'>\' )\n		wrapper.gt($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'<\' )\n		wrapper.lt($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'>=\' )\n		wrapper.ge($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'<=\' )\n		wrapper.le($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'left like\' )\n		wrapper.likeLeft($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'right like\' )\n		wrapper.likeRight($expression($var),${ClassName}Entity::$getAttrName,$var);\n#end\n#end\n        return R.ok(${className}Service.page(page, wrapper));\n    }\n\n    /**\n     * 通过id查询${tableComment}\n     * @param ${pk.attrName} id\n     * @return R\n     */\n    @Operation(summary = \"通过id查询\" , description = \"通过id查询\" )\n    @GetMapping(\"/{${pk.attrName}}\" )\n    @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_view\')\" )\n    public R getById(@PathVariable(\"${pk.attrName}\" ) ${pk.attrType} ${pk.attrName}) {\n        return R.ok(${className}Service.getByIdDeep(${pk.attrName}));\n    }\n\n    /**\n     * 新增${tableComment}\n     * @param ${className} ${tableComment}\n     * @return R\n     */\n    @Operation(summary = \"新增${tableComment}\" , description = \"新增${tableComment}\" )\n    @SysLog(\"新增${tableComment}\" )\n    @PostMapping\n    @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_add\')\" )\n    public R save(@RequestBody ${ClassName}Entity ${className}) {\n        return R.ok(${className}Service.saveDeep(${className}));\n    }\n\n    /**\n     * 修改${tableComment}\n     * @param ${className} ${tableComment}\n     * @return R\n     */\n    @Operation(summary = \"修改${tableComment}\" , description = \"修改${tableComment}\" )\n    @SysLog(\"修改${tableComment}\" )\n    @PutMapping\n    @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_edit\')\" )\n    public R updateById(@RequestBody ${ClassName}Entity ${className}) {\n        return R.ok(${className}Service.updateDeep(${className}));\n    }\n\n    /**\n     * 通过id删除${tableComment}\n     * @param ids ${pk.attrName}列表\n     * @return R\n     */\n    @Operation(summary = \"通过id删除${tableComment}\" , description = \"通过id删除${tableComment}\" )\n    @SysLog(\"通过id删除${tableComment}\" )\n    @DeleteMapping\n    @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_del\')\" )\n    public R removeById(@RequestBody ${pk.attrType}[] ids) {\n        return R.ok(${className}Service.removeDeep(ids));\n    }\n\n    /**\n     * 通过id删除${tableComment}子表数据\n     * @param ids ${pk.attrName}列表\n     * @return R\n     */\n    @Operation(summary = \"通过id删除${tableComment}子表数据\" , description = \"通过id删除${tableComment}子表数据\" )\n    @SysLog(\"通过id删除${tableComment}子表数据\" )\n    @DeleteMapping(\"/child\")\n    @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_del\')\" )\n    public R removeChild(@RequestBody ${pk.attrType}[] ids) {\n        return R.ok(${className}Service.removeChild(ids));\n    }\n\n    /**\n     * 导出excel 表格\n     * @param ${className} 查询条件\n   	 * @param ids 导出指定ID\n     * @return excel 文件流\n     */\n    @ResponseExcel\n    @GetMapping(\"/export\")\n    @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_export\')\" )\n    public List<${ClassName}Entity> export(${ClassName}Entity ${className},${pk.attrType}[] ids) {\n        return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));\n    }\n}', '2023-06-01 11:25:28', '2023-10-29 12:17:52', '0', 1, '', 'admin');
-INSERT INTO `gen_template` VALUES (17, '主子表单', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', '子表表单', '<template>\n  <el-drawer :title=\"form.${pk.attrName} ? (detail ? \'详情\' : \'编辑\') : \'添加\'\" v-model=\"visible\" size=\"50%\">\n      <el-form ref=\"dataFormRef\" :model=\"form\" :rules=\"dataRules\" label-width=\"90px\" :disabled=\"detail\" v-loading=\"loading\">\n        <el-row :gutter=\"24\">\n#foreach($field in $formList)\n#if($field.attrName != ${pk.attrName})\n#if($formLayout == 1)\n    <el-col :span=\"24\" class=\"mb20\">\n#elseif($formLayout == 2)\n    <el-col :span=\"12\" class=\"mb20\">\n#end\n#if($field.formType == \'text\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'textarea\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input type=\"textarea\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'select\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n          <el-select v-model=\"form.${field.attrName}\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\">\n     #if($field.fieldDict)\n            <el-option :value=\"item.value\" :label=\"item.label\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\"></el-option>\n       #end\n     #if(!$field.fieldDict)\n            <el-option label=\"请选择\">0</el-option>\n       #end\n          </el-select>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'radio\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-radio-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n             <el-radio :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" border :key=\"index\">{{ item.label }}\n            </el-radio>\n       #else\n           <el-radio label=\"${field.fieldComment}\" border>${field.fieldComment}</el-radio>\n       #end\n            </el-radio-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'checkbox\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-checkbox-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n                <el-checkbox :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\">{{ item.label }}</el-checkbox>\n       #end\n     #if(!$field.fieldDict)\n                <el-checkbox label=\"启用\" name=\"type\"></el-checkbox>\n                <el-checkbox label=\"禁用\" name=\"type\"></el-checkbox>\n       #end\n            </el-checkbox-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'date\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n      <el-date-picker type=\"date\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'datetime\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-date-picker type=\"datetime\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateTimeStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'number\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input-number :min=\"1\" :max=\"1000\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></el-input-number>\n      </el-form-item>\n    </el-col>\n#elseif($field.formType == \'upload-file\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-file  v-model=\"form.${field.attrName}\"></upload-file>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'upload-img\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-img v-model:imageUrl=\"form.${field.attrName}\"></upload-img>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'editor\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <editor v-model:get-html=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></editor>\n  </el-form-item>\n  </el-col>\n#end\n#if(!$field.formType)\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${column.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n    </el-col>\n#end\n#end\n#end\n    </el-row>\n  <el-row :gutter=\"24\">\n    <sc-form-table\n      v-model=\"form.${childClassName}List\"\n      :addTemplate=\"childTemp\"\n      @delete=\"deleteChild\"\n      placeholder=\"暂无数据\"\n    >\n#set($ignoreColumnList = [\"create_by\",\"create_time\",\"update_by\",\"update_time\",\"del_flag\",\"tenant_id\"])\n#foreach($field in $childFieldList)\n#if($field.primaryPk == \'1\')\n#elseif($ignoreColumnList.contains(${field.fieldName}))\n#elseif($field.attrName == $childField)\n#else  \n      <el-table-column label=\"${field.fieldComment}\" prop=\"${field.attrName}\">\n        <template #default=\"{ row, $index }\">\n          <el-form-item :prop=\"`${childClassName}List.${$index}.${field.attrName}`\" :rules=\"[{ required: true, trigger: \'blur\' }]\">\n            <el-input v-model=\"row.${field.attrName}\" style=\"width: 100%\" />\n          </el-form-item>\n        </template>\n      </el-table-column>\n#end\n#end\n    </sc-form-table>\n  </el-row>\n      </el-form>\n      <template #footer>\n        <span class=\"dialog-footer\">\n          <el-button @click=\"visible = false\">取消</el-button>\n          <el-button type=\"primary\" @click=\"onSubmit\" :disabled=\"loading\">确认</el-button>\n        </span>\n      </template>\n    </el-drawer>\n</template>\n\n<script setup lang=\"ts\" name=\"${ClassName}Dialog\">\nimport { useDict } from \'/@/hooks/dict\';\nimport { rule } from \'/@/utils/validate\';\nimport { useMessage } from \"/@/hooks/message\";\nimport { getObj, addObj, putObj, delChildObj } from \'/@/api/${moduleName}/${functionName}\'\nconst scFormTable = defineAsyncComponent(() => import(\'/@/components/FormTable/index.vue\'));\nconst emit = defineEmits([\'refresh\']);\n\n// 定义变量内容\nconst dataFormRef = ref();\nconst visible = ref(false);\nconst loading = ref(false);\nconst detail = ref(false);\n\n// 定义字典\n#set($fieldDict=[])\n#foreach($field in $gridList)\n	#if($field.fieldDict)\n		#set($void=$fieldDict.add($field.fieldDict))\n	#end\n#end\n#if($fieldDict)\nconst { $dict.format($fieldDict) } = useDict($dict.quotation($fieldDict))\n#end\n\n// 提交表单数据\nconst form = reactive({\n#if(!$formList.contains(${pk.attrName}))\n		${pk.attrName}:\'\',\n#end\n#foreach($field in $formList)\n#if($field.formType == \'number\')\n		${field.attrName}: 0,\n#elseif($field.formType == \'checkbox\')\n    ${field.attrName}: [],\n#else\n	  ${field.attrName}: \'\',\n#end\n#end\n	  ${childClassName}List:[],\n});\n\nconst childTemp = reactive({\n  #foreach($field in $childFieldList)\n    ${field.attrName}: \'\',\n  #end\n})\n\n// 定义校验规则\nconst dataRules = ref({\n#foreach($field in $formList)\n#if($field.formRequired && $field.formValidator)\n    ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}, { validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#elseif($field.formRequired)\n        ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}],\n#elseif($field.formValidator)\n        ${field.attrName}: [{ validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#end\n#end\n})\n\n// 打开弹窗\nconst openDialog = (id: string, isDetail: boolean) => {\n  visible.value = true\n  detail.value = isDetail\n  form.${pk.attrName} = \'\'\n\n  // 重置表单数据\n  nextTick(() => {\n    dataFormRef.value?.resetFields();\n    form.${childClassName}List = [];\n  });\n\n  // 获取${className}信息\n  if (id) {\n    form.${pk.attrName} = id\n    get${ClassName}Data(id)\n  }\n};\n\n// 提交\nconst onSubmit = async () => {\n  const valid = await dataFormRef.value.validate().catch(() => {});\n  if (!valid) return false;\n\n  try {\n    loading.value = true;\n    form.${pk.attrName} ? await putObj(form) : await addObj(form);\n    useMessage().success(form.${pk.attrName} ? \'修改成功\' : \'添加成功\');\n    visible.value = false;\n    emit(\'refresh\');\n  } catch (err: any) {\n    useMessage().error(err.msg);\n  } finally {\n    loading.value = false;\n  }\n};\n#foreach ($field in $childFieldList)\n#if($field.primaryPk == \'1\')\n#set($childPkName=$field.attrName)\n#end\n#end\n// 删除子表数据\nconst deleteChild = async (obj: { $childPkName: string }) => {\n  if (obj.$childPkName) {\n    try {\n      await delChildObj([obj.$childPkName]);\n      useMessage().success(\'删除成功\');\n    } catch (err: any) {\n      useMessage().error(err.msg);\n    }\n  }\n};\n\n// 初始化表单数据\nconst get${ClassName}Data = (id: string) => {\n  // 获取数据\n  getObj(id).then((res: any) => {\n    Object.assign(form, res.data)\n  })\n};\n\n// 暴露变量\ndefineExpose({\n  openDialog\n});\n</script>', '2023-06-01 15:42:46', '2023-09-12 21:58:41', '0', 1, '', 'admin');
+INSERT INTO `gen_template` VALUES (17, '主子表单', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', '子表表单', '<template>\n  <el-drawer :title=\"form.${pk.attrName} ? (detail ? \'详情\' : \'编辑\') : \'添加\'\" v-model=\"visible\" size=\"50%\">\n      <el-form ref=\"dataFormRef\" :model=\"form\" :rules=\"dataRules\" label-width=\"90px\" :disabled=\"detail\" v-loading=\"loading\">\n        <el-row :gutter=\"24\">\n#foreach($field in $formList)\n#if($field.attrName != ${pk.attrName})\n#if($formLayout == 1)\n    <el-col :span=\"24\" class=\"mb20\">\n#elseif($formLayout == 2)\n    <el-col :span=\"12\" class=\"mb20\">\n#end\n#if($field.formType == \'text\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'textarea\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input type=\"textarea\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'select\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n          <el-select v-model=\"form.${field.attrName}\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\">\n     #if($field.fieldDict)\n            <el-option :value=\"item.value\" :label=\"item.label\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\"></el-option>\n       #end\n     #if(!$field.fieldDict)\n            <el-option label=\"请选择\">0</el-option>\n       #end\n          </el-select>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'radio\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-radio-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n             <el-radio :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" border :key=\"index\">{{ item.label }}\n            </el-radio>\n       #else\n           <el-radio label=\"${field.fieldComment}\" border>${field.fieldComment}</el-radio>\n       #end\n            </el-radio-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'checkbox\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-checkbox-group v-model=\"form.${field.attrName}\">\n     #if($field.fieldDict)\n                <el-checkbox :label=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\">{{ item.label }}</el-checkbox>\n       #end\n     #if(!$field.fieldDict)\n                <el-checkbox label=\"启用\" name=\"type\"></el-checkbox>\n                <el-checkbox label=\"禁用\" name=\"type\"></el-checkbox>\n       #end\n            </el-checkbox-group>\n        </el-form-item>\n      </el-col>\n#elseif($field.formType == \'date\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n      <el-date-picker type=\"date\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'datetime\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-date-picker type=\"datetime\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"form.${field.attrName}\" :value-format=\"dateTimeStr\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#elseif($field.formType == \'number\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n        <el-input-number :min=\"1\" :max=\"1000\" v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></el-input-number>\n      </el-form-item>\n    </el-col>\n#elseif($field.formType == \'upload-file\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-file  v-model=\"form.${field.attrName}\"></upload-file>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'upload-img\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <upload-img v-model:imageUrl=\"form.${field.attrName}\"></upload-img>\n  </el-form-item>\n  </el-col>\n#elseif($field.formType == \'editor\')\n  <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n    <editor v-model:get-html=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"></editor>\n  </el-form-item>\n  </el-col>\n#end\n#if(!$field.formType)\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${column.attrName}\">\n        <el-input v-model=\"form.${field.attrName}\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\"/>\n      </el-form-item>\n    </el-col>\n#end\n#end\n#end\n    </el-row>\n  <el-row :gutter=\"24\">\n    <sc-form-table\n      v-model=\"form.${childClassName}List\"\n      :addTemplate=\"childTemp\"\n      @delete=\"deleteChild\"\n      placeholder=\"暂无数据\"\n    >\n#set($ignoreColumnList = [\"create_by\",\"create_time\",\"update_by\",\"update_time\",\"del_flag\",\"tenant_id\"])\n#foreach($field in $childFieldList)\n#if($field.primaryPk == \'1\')\n#elseif($ignoreColumnList.contains(${field.fieldName}))\n#elseif($field.attrName == $childField)\n#else  \n      <el-table-column label=\"${field.fieldComment}\" prop=\"${field.attrName}\">\n        <template #default=\"{ row, $index }\">\n          <el-form-item :prop=\"`${childClassName}List.${$index}.${field.attrName}`\" :rules=\"[{ required: true, trigger: \'blur\' }]\">\n            <el-input v-model=\"row.${field.attrName}\" style=\"width: 100%\" />\n          </el-form-item>\n        </template>\n      </el-table-column>\n#end\n#end\n    </sc-form-table>\n  </el-row>\n      </el-form>\n      <template #footer>\n        <span class=\"dialog-footer\">\n          <el-button @click=\"visible = false\">取消</el-button>\n          <el-button type=\"primary\" @click=\"onSubmit\" :disabled=\"loading\">确认</el-button>\n        </span>\n      </template>\n    </el-drawer>\n</template>\n\n<script setup lang=\"ts\" name=\"${ClassName}Dialog\">\nimport { useDict } from \'/@/hooks/dict\';\nimport { rule } from \'/@/utils/validate\';\nimport { useMessage } from \"/@/hooks/message\";\nimport { getObj, addObj, putObj, delChildObj } from \'/@/api/${moduleName}/${functionName}\'\nconst scFormTable = defineAsyncComponent(() => import(\'/@/components/FormTable/index.vue\'));\nconst emit = defineEmits([\'refresh\']);\n\n// 定义变量内容\nconst dataFormRef = ref();\nconst visible = ref(false);\nconst loading = ref(false);\nconst detail = ref(false);\n\n// 定义字典\n#set($fieldDict=[])\n#foreach($field in $gridList)\n	#if($field.fieldDict)\n		#set($void=$fieldDict.add($field.fieldDict))\n	#end\n#end\n#if($fieldDict)\nconst { $dict.format($fieldDict) } = useDict($dict.quotation($fieldDict))\n#end\n\n// 提交表单数据\nconst form = reactive({\n#if(!$formList.contains(${pk.attrName}))\n		${pk.attrName}:\'\',\n#end\n#foreach($field in $formList)\n#if($field.formType == \'number\')\n		${field.attrName}: 0,\n#elseif($field.formType == \'checkbox\')\n    ${field.attrName}: [],\n#else\n	  ${field.attrName}: \'\',\n#end\n#end\n	  ${childClassName}List:[],\n});\n\nconst childTemp = reactive({\n  #foreach($field in $childFieldList)\n    ${field.attrName}: \'\',\n  #end\n})\n\n// 定义校验规则\nconst dataRules = ref({\n#foreach($field in $formList)\n#if($field.formRequired == \'1\' && $field.formValidator)\n    ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}, { validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#elseif($field.formRequired == \'1\')\n        ${field.attrName}: [{required: true, message: \'${field.fieldComment}不能为空\', trigger: \'blur\'}],\n#elseif($field.formValidator)\n        ${field.attrName}: [{ validator: rule.${field.formValidator}, trigger: \'blur\' }],\n#end\n#end\n})\n\n// 打开弹窗\nconst openDialog = (id: string, isDetail: boolean) => {\n  visible.value = true\n  detail.value = isDetail\n  form.${pk.attrName} = \'\'\n\n  // 重置表单数据\n  nextTick(() => {\n    dataFormRef.value?.resetFields();\n    form.${childClassName}List = [];\n  });\n\n  // 获取${className}信息\n  if (id) {\n    form.${pk.attrName} = id\n    get${ClassName}Data(id)\n  }\n};\n\n// 提交\nconst onSubmit = async () => {\n  const valid = await dataFormRef.value.validate().catch(() => {});\n  if (!valid) return false;\n\n  try {\n    loading.value = true;\n    form.${pk.attrName} ? await putObj(form) : await addObj(form);\n    useMessage().success(form.${pk.attrName} ? \'修改成功\' : \'添加成功\');\n    visible.value = false;\n    emit(\'refresh\');\n  } catch (err: any) {\n    useMessage().error(err.msg);\n  } finally {\n    loading.value = false;\n  }\n};\n#foreach ($field in $childFieldList)\n#if($field.primaryPk == \'1\')\n#set($childPkName=$field.attrName)\n#end\n#end\n// 删除子表数据\nconst deleteChild = async (obj: { $childPkName: string }) => {\n  if (obj.$childPkName) {\n    try {\n      await delChildObj([obj.$childPkName]);\n      useMessage().success(\'删除成功\');\n    } catch (err: any) {\n      useMessage().error(err.msg);\n    }\n  }\n};\n\n// 初始化表单数据\nconst get${ClassName}Data = (id: string) => {\n  // 获取数据\n  getObj(id).then((res: any) => {\n    Object.assign(form, res.data)\n  })\n};\n\n// 暴露变量\ndefineExpose({\n  openDialog\n});\n</script>', '2023-06-01 15:42:46', '2023-12-07 13:22:29', '0', 1, '', 'admin');
 INSERT INTO `gen_template` VALUES (18, '主子表格', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', '子表单表格', '<template>\n  <div class=\"layout-padding\">\n    <div class=\"layout-padding-auto layout-padding-view\">\n#if($queryList)\n      <el-row v-show=\"showSearch\">\n        <el-form :model=\"state.queryForm\" ref=\"queryRef\" :inline=\"true\" @keyup.enter=\"getDataList\">\n#foreach($field in $queryList)\n#if($field.queryFormType == \'select\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n            <el-select v-model=\"state.queryForm.${field.attrName}\" placeholder=\"请选择#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\">\n       #if($field.fieldDict)\n              <el-option :label=\"item.label\" :value=\"item.value\" v-for=\"(item, index) in ${field.fieldDict}\" :key=\"index\"></el-option>\n         #else\n              <el-option label=\"请选择\">0</el-option>\n         #end\n            </el-select>\n      </el-form-item>\n#elseif($field.queryFormType == \'date\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\">\n      <el-date-picker type=\"date\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"state.queryForm.${field.attrName}\"></el-date-picker>\n      </el-form-item>\n#elseif($field.queryFormType == \'datetime\')\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\" >\n            <el-date-picker type=\"datetime\" placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"state.queryForm.${field.attrName}\"></el-date-picker>\n      </el-form-item>\n      </el-col>\n#else\n      <el-form-item label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" prop=\"${field.attrName}\" >\n        <el-input placeholder=\"请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" v-model=\"state.queryForm.${field.attrName}\"\n          style=\"max-width: 180px\" />\n      </el-form-item>\n#end\n#end\n          <el-form-item>\n            <el-button icon=\"search\" type=\"primary\" @click=\"getDataList\">\n              查询\n            </el-button>\n            <el-button icon=\"Refresh\" @click=\"resetQuery\">重置</el-button>\n          </el-form-item>\n        </el-form>\n      </el-row>\n#end\n      <el-row>\n        <div class=\"mb8\" style=\"width: 100%\">\n          <el-button icon=\"folder-add\" type=\"primary\" class=\"ml10\" @click=\"formDialogRef.openDialog()\"\n            v-auth=\"\'${moduleName}_${functionName}_add\'\">\n            新 增\n          </el-button>\n          <el-button plain :disabled=\"multiple\" icon=\"Delete\" type=\"primary\"\n            v-auth=\"\'${moduleName}_${functionName}_del\'\" @click=\"handleDelete(selectObjs)\">\n            删除\n          </el-button>\n          <right-toolbar v-model:showSearch=\"showSearch\" :export=\"\'${moduleName}_${functionName}_export\'\"\n                @exportExcel=\"exportExcel\" class=\"ml10 mr20\" style=\"float: right;\"\n            @queryTable=\"getDataList\"></right-toolbar>\n        </div>\n      </el-row>\n      <el-table :data=\"state.dataList\" v-loading=\"state.loading\" border \n        :cell-style=\"tableStyle.cellStyle\" :header-cell-style=\"tableStyle.headerCellStyle\"\n        @selection-change=\"selectionChangeHandle\" @sort-change=\"sortChangeHandle\">\n        <el-table-column type=\"selection\" width=\"40\" align=\"center\" />\n        <el-table-column type=\"index\" label=\"#\" width=\"40\" />\n      #foreach($field in $gridList)\n        #if($field.fieldDict)\n          <el-table-column prop=\"${field.attrName}\" label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" show-overflow-tooltip>\n      <template #default=\"scope\">\n                <dict-tag :options=\"$field.fieldDict\" :value=\"scope.row.${field.attrName}\"></dict-tag>\n            </template>\n          </el-table-column>\n        #else\n          <el-table-column prop=\"${field.attrName}\" label=\"#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\" #if(${field.gridSort} == \'1\')sortable=\"custom\"#end show-overflow-tooltip/>\n        #end\n     #end\n        <el-table-column label=\"操作\" width=\"200\">\n          <template #default=\"scope\">\n          #if($ChildClassName)\n            <el-button text type=\"primary\" icon=\"view\" v-auth=\"\'sys_role_edit\'\" @click=\"formDialogRef.openDialog(scope.row.${pk.attrName}, true)\">\n              详情\n            </el-button>\n          #end\n            <el-button icon=\"edit-pen\" text type=\"primary\" v-auth=\"\'${moduleName}_${functionName}_edit\'\"\n              @click=\"formDialogRef.openDialog(scope.row.${pk.attrName})\">编辑</el-button>\n            <el-button icon=\"delete\" text type=\"primary\" v-auth=\"\'${moduleName}_${functionName}_del\'\" @click=\"handleDelete([scope.row.${pk.attrName}])\">\n              删除\n            </el-button>\n          </template>\n        </el-table-column>\n      </el-table>\n      <pagination @size-change=\"sizeChangeHandle\" @current-change=\"currentChangeHandle\" v-bind=\"state.pagination\" />\n    </div>\n\n    <!-- 编辑、新增  -->\n    <form-dialog ref=\"formDialogRef\" @refresh=\"getDataList(false)\" />\n  </div>\n</template>\n\n<script setup lang=\"ts\" name=\"system${ClassName}\">\nimport { BasicTableProps, useTable } from \"/@/hooks/table\";\nimport { fetchList, delObjs } from \"/@/api/${moduleName}/${functionName}\";\nimport { useMessage, useMessageBox } from \"/@/hooks/message\";\nimport { useDict } from \'/@/hooks/dict\';\n// 引入组件\nconst FormDialog = defineAsyncComponent(() => import(\'./form.vue\'));\n\n// 定义查询字典\n#set($fieldDict=[])\n#foreach($field in $queryList)\n  #if($field.fieldDict)\n    #set($void=$fieldDict.add($field.fieldDict))\n  #end\n#end\n\n#foreach($field in $gridList)\n  #if($field.fieldDict)\n    #set($void=$fieldDict.add($field.fieldDict))\n  #end\n#end\n#if($fieldDict)\nconst { $dict.format($fieldDict) } = useDict($dict.quotation($fieldDict))\n#end\n// 定义变量内容\nconst formDialogRef = ref()\n// 搜索变量\nconst queryRef = ref()\nconst showSearch = ref(true)\n// 多选变量\nconst selectObjs = ref([]) as any\nconst multiple = ref(true)\n\nconst state: BasicTableProps = reactive<BasicTableProps>({\n  queryForm: {},\n  pageList: fetchList\n})\n\n//  table hook\nconst {\n  getDataList,\n  currentChangeHandle,\n  sizeChangeHandle,\n  sortChangeHandle,\n  downBlobFile,\n  tableStyle\n} = useTable(state)\n\n// 清空搜索条件\nconst resetQuery = () => {\n  // 清空搜索条件\n  queryRef.value?.resetFields()\n  // 清空多选\n  selectObjs.value = []\n  getDataList()\n}\n\n// 导出excel\nconst exportExcel = () => {\n  downBlobFile(\'/${moduleName}/${functionName}/export\', Object.assign(state.queryForm, { ids: selectObjs }), \'${functionName}.xlsx\')\n}\n\n// 多选事件\nconst selectionChangeHandle = (objs: { $pk.attrName: string }[]) => {\n  selectObjs.value = objs.map(({ $pk.attrName }) => $pk.attrName);\n  multiple.value = !objs.length;\n};\n\n// 删除操作\nconst handleDelete = async (ids: string[]) => {\n  try {\n    await useMessageBox().confirm(\'此操作将永久删除\');\n  } catch {\n    return;\n  }\n\n  try {\n    await delObjs(ids);\n    getDataList();\n    useMessage().success(\'删除成功\');\n  } catch (err: any) {\n    useMessage().error(err.msg);\n  }\n};\n</script>', '2023-06-01 15:43:31', '2023-08-29 10:53:23', '0', 1, ' ', ' ');
 INSERT INTO `gen_template` VALUES (19, '子Mapper', '${backendPath}/src/main/java/${packagePath}/${moduleName}/mapper/${ChildClassName}Mapper.java', '子Mapper', 'package ${package}.${moduleName}.mapper;\n\nimport com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;\n#if($ChildClassName)\nimport ${package}.${moduleName}.entity.${ChildClassName}Entity;\n#else\nimport ${package}.${moduleName}.entity.${ClassName}Entity;\n#end\nimport org.apache.ibatis.annotations.Mapper;\n\n@Mapper\n#if($ChildClassName)\npublic interface ${ChildClassName}Mapper extends PigxBaseMapper<${ChildClassName}Entity> {\n#else\npublic interface ${ClassName}Mapper extends PigxBaseMapper<${ClassName}Entity> {\n#end\n\n}', '2023-02-23 01:18:18', '2023-08-07 09:54:36', '0', 1, ' ', ' ');
 COMMIT;
@@ -293,4 +293,23 @@ INSERT INTO `gen_template_group` VALUES (2, 18);
 INSERT INTO `gen_template_group` VALUES (2, 19);
 COMMIT;
 
+-- ----------------------------
+-- Table structure for gen_create_table
+-- ----------------------------
+DROP TABLE IF EXISTS `gen_create_table`;
+CREATE TABLE `gen_create_table` (
+  `id` bigint NOT NULL COMMENT '主键ID',
+  `table_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '表名称',
+  `ds_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据源',
+  `comments` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '表注释',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL,
+  `column_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '字段信息',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '删除标记',
+  `tenant_id` bigint DEFAULT NULL COMMENT '租户ID',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='自动创建表管理';
+
 SET FOREIGN_KEY_CHECKS = 1;

From c65f8ddd7a6cebc1d4d6a1dcae4c5924a9db5528 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 22 Feb 2024 13:33:27 +0800
Subject: [PATCH 33/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/3pigxx_flow.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/3pigxx_flow.sql b/db/3pigxx_flow.sql
index fb65b00d8..fdd2d83a2 100644
--- a/db/3pigxx_flow.sql
+++ b/db/3pigxx_flow.sql
@@ -31,7 +31,7 @@ CREATE TABLE `process` (
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `idx_form_id` (`flow_id`) USING BTREE,
   KEY `idx_id` (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=182 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=182 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='流程定义数据';
 
 
 -- ----------------------------
@@ -75,7 +75,7 @@ CREATE TABLE `process_group` (
   `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '所属租户id',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `idx_id` (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='流程分组';
 
 
 

From f3b4a32dd981a07a660b7da0ae15be02f04b4298 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 22 Feb 2024 15:00:00 +0800
Subject: [PATCH 34/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/task/service/impl/CombinationGroupServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java
index 6d6517683..70623f37f 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java
@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pig4cloud.pigx.common.core.constant.enums.YesNoEnum;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.security.service.PigxUser;
 import com.pig4cloud.pigx.common.security.util.SecurityUtils;
@@ -70,8 +71,8 @@ public class CombinationGroupServiceImpl implements ICombinationGroupService {
 
 			List<Process> processList = processService.lambdaQuery()
 				.eq(Process::getGroupId, group.getId())
-				.eq(Process::getHidden, false)
-				.eq(Process::getStop, false)
+				.eq(Process::getHidden, YesNoEnum.NO.getCode())
+				.eq(Process::getStop, YesNoEnum.NO.getCode())
 				.orderByAsc(Process::getSort)
 				.list();
 

From 37bebcd06650bb29f60aa599601d0f8a116d81b6 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 22 Feb 2024 19:23:18 +0800
Subject: [PATCH 35/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20sql?=
 =?UTF-8?q?=E6=B3=A8=E5=85=A5=E6=A3=80=E6=B5=8B=E4=BD=BF=E7=94=A8mybatis-p?=
 =?UTF-8?q?lus=20=E6=8F=90=E4=BE=9B=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/resolver/SqlFilterArgumentResolver.java  | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java
index 60d762972..3c37d3463 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java
@@ -20,6 +20,7 @@ package com.pig4cloud.pigx.common.data.resolver;
 import cn.hutool.core.comparator.CompareUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.sql.SqlInjectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.exception.CheckedException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -34,7 +35,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -96,25 +96,16 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver
 		List<OrderItem> orderItemList = new ArrayList<>();
 		Optional.ofNullable(ascs)
 			.ifPresent(s -> orderItemList.addAll(Arrays.stream(s.split(StrUtil.COMMA))
-				.filter(sqlInjectPredicate())
+				.filter(SqlInjectionUtils::check)
 				.map(OrderItem::asc)
 				.collect(Collectors.toList())));
 		Optional.ofNullable(descs)
 			.ifPresent(s -> orderItemList.addAll(Arrays.stream(s.split(StrUtil.COMMA))
-				.filter(sqlInjectPredicate())
+				.filter(SqlInjectionUtils::check)
 				.map(OrderItem::desc)
 				.collect(Collectors.toList())));
 		page.addOrder(orderItemList);
 
 		return page;
 	}
-
-	/**
-	 * 判断用户输入里面有没有关键字
-	 * @return Predicate
-	 */
-	private Predicate<String> sqlInjectPredicate() {
-		return sql -> Arrays.stream(KEYWORDS).noneMatch(keyword -> StrUtil.containsIgnoreCase(sql, keyword));
-	}
-
 }

From 2d0b08bf3fbad766023da6a552f815081ad27c1d Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 22 Feb 2024 21:19:07 +0800
Subject: [PATCH 36/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=20=E6=9B=B4=E6=96=B0nacos=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=A7=9F=E6=88=B7=E9=85=8D=E7=BD=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E8=87=AA=E5=8A=A8=E5=8F=91=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2pigxx.sql | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index d7754ee48..1e0e1d824 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -1110,21 +1110,22 @@ CREATE TABLE `sys_route_conf` (
 -- Records of sys_route_conf
 -- ----------------------------
 BEGIN;
-INSERT INTO `sys_route_conf` VALUES (1, '工作流管理模块', 'pigx-oa-platform', '[{\"args\": {\"_genkey_0\": \"/act/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-oa-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:56', '0');
-INSERT INTO `sys_route_conf` VALUES (2, '认证中心', 'pigx-auth', '[{\"args\": {\"_genkey_0\": \"/auth/**\"}, \"name\": \"Path\"}]', '[{\"args\": {}, \"name\": \"ValidateCodeGatewayFilter\"}, {\"args\": {}, \"name\": \"PasswordDecoderFilter\"}]', 'lb://pigx-auth', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:57', '0');
-INSERT INTO `sys_route_conf` VALUES (3, '代码生成模块', 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:58', '0');
-INSERT INTO `sys_route_conf` VALUES (4, 'elastic-job定时任务模块', 'pigx-daemon-elastic-job', '[{\"args\": {\"_genkey_0\": \"/daemon/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-elastic-job', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:59', '0');
-INSERT INTO `sys_route_conf` VALUES (5, 'quartz定时任务模块', 'pigx-daemon-quartz', '[{\"args\": {\"_genkey_0\": \"/job/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-quartz', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:02', '0');
-INSERT INTO `sys_route_conf` VALUES (6, '分布式事务模块', 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:04', '0');
-INSERT INTO `sys_route_conf` VALUES (7, '通用权限模块', 'pigx-upms-biz', '[{\"args\": {\"_genkey_0\": \"/admin/**\"}, \"name\": \"Path\"}]', '[{\"args\": {\"key-resolver\": \"#{@remoteAddrKeyResolver}\", \"redis-rate-limiter.burstCapacity\": \"1000\", \"redis-rate-limiter.replenishRate\": \"1000\"}, \"name\": \"RequestRateLimiter\"}]', 'lb://pigx-upms-biz', 0, '{\"response-timeout\": \"30000\"}', ' ', ' ', '2019-10-16 16:44:41', '2021-12-14 13:24:55', '0');
-INSERT INTO `sys_route_conf` VALUES (8, '工作流长链接支持', 'pigx-oa-platform-ws', '[{\"args\": {\"_genkey_0\": \"/act/ws/**\"}, \"name\": \"Path\"}]', '[]', 'lb:ws://pigx-oa-platform', 100, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:09', '0');
-INSERT INTO `sys_route_conf` VALUES (9, '微信公众号管理', 'pigx-mp-platform', '[{\"args\": {\"_genkey_0\": \"/mp/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-mp-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:12', '0');
-INSERT INTO `sys_route_conf` VALUES (10, '支付管理', 'pigx-pay-platform', '[{\"args\": {\"_genkey_0\": \"/pay/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-pay-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:13', '0');
-INSERT INTO `sys_route_conf` VALUES (11, '监控管理', 'pigx-monitor', '[{\"args\": {\"_genkey_0\": \"/monitor/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-monitor', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0');
-INSERT INTO `sys_route_conf` VALUES (12, '积木报表', 'pigx-jimu-platform\n', '[{\"args\": {\"_genkey_0\": \"/jimu/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-jimu-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0');
-INSERT INTO `sys_route_conf` VALUES (13, '大屏设计', 'pigx-report-platform', '[{\"args\": {\"_genkey_0\": \"/gv/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-report-platform', 0, '{}', ' ', ' ', '2022-08-27 02:38:43', '2023-04-05 07:52:27', '0');
-INSERT INTO `sys_route_conf` VALUES (14, 'APP服务', 'pigx-app-server', '[{\"args\": {\"_genkey_0\": \"/app/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-app-server-biz', 0, '{}', 'admin', ' ', '2022-12-07 10:53:44', NULL, '0');
-INSERT INTO `sys_route_conf` VALUES (15, '工作流引擎', 'pigx-flow-task-biz', '[{\"args\": {\"_genkey_0\": \"/task/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-flow-task-biz', 0, '{}', ' ', ' ', '2023-07-28 16:50:26', NULL, '0');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', '# 配置文件加密根密码\njasypt:\n  encryptor:\n    password: pigx\n    algorithm: PBEWithMD5AndDES\n    iv-generator-classname: org.jasypt.iv.NoIvGenerator\n\n\nspring:\n  data:\n    redis:\n      host: pigx-redis\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n  cloud:\n    sentinel:\n      eager: true\n      transport:\n        dashboard: pigx-sentinel:5020\n    openfeign:\n      sentinel:\n        enabled: true\n      okhttp:\n        enabled: true\n      httpclient:\n        enabled: false\n        connection-timeout: 20000\n      compression:\n        request:\n          enabled: true\n        response:\n          enabled: true\n\n# 端点对外暴露\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'          \n  endpoint:\n    restart:\n      enabled: true\n    health:\n      show-details: ALWAYS\n\n#开启灰度\ngray:\n  rule:\n    enabled: true\n\n# mybatis-plus 配置\nmybatis-plus:\n  tenant-enable: ture\n  mapper-locations: classpath:/mapper/*Mapper.xml\n  global-config:\n    capitalMode: true\n    banner: false\n    db-config:\n      id-type: auto\n      select-strategy: not_empty\n      insert-strategy: not_empty\n      update-strategy: not_null\n  type-handlers-package:  com.pig4cloud.pigx.common.data.handler\n  configuration:\n    jdbc-type-for-null: \'null\'\n    call-setters-on-nulls: true\n    shrink-whitespaces-in-sql: true\nmybatis-plus-join:\n  banner: false #关闭连表查询组件banner', '90942d7d4856ccba068fe5847643737d', '2022-12-16 10:44:25', '2023-08-14 11:44:19', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (2, 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/', '74f53b71c7799aa754da75662378b93c', '2022-12-16 10:44:25', '2022-12-16 10:44:25', NULL, '0:0:0:0:0:0:0:1', '', '', NULL, NULL, NULL, 'yaml', NULL, '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (3, 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_codegen}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n', 'ed6de06e34e2634c28a24e8a1db99b06', '2022-12-16 10:44:25', '2024-02-22 15:08:09', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true', '09996f46e0b80d7b2aa320ef4cb31c82', '2022-12-16 10:44:25', '2023-04-07 14:14:50', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (5, 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'gateway:\n  encode-key: \'pigxpigxpigxpigx\'\n\n# 验证码相关配置参考： http://t.cn/A647jEdu\naj:\n  captcha:\n    cache-type: redis\n    water-mark: pig4cloud\n\n# 固定路由转发配置 无修改\nspring:\n  cloud:\n    gateway:\n      routes:\n        - id: openapi\n          uri: lb://pigx-gateway\n          predicates:\n            - Path=/v3/api-docs/**\n          filters:\n            - RewritePath=/v3/api-docs/(?<path>.*), /$\\{path}/$\\{path}/v3/api-docs\n\n# gateway 刷新端点\nmanagement:\n  endpoint:\n    gateway:\n      enabled: true\n', 'd138f5bafa91ab76dca8c4c1a01c1de2', '2022-12-16 10:44:25', '2023-07-28 16:49:29', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (6, 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n  # 安全配置\n  security:\n    user:\n      name: ENC(rZHA4LW5hHmhLAAzJoFNag==)     # pigx\n      password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n  autoconfigure:\n    exclude: com.pig4cloud.pigx.common.core.config.JacksonConfiguration\n  boot:\n    admin:\n      ui:\n        title: \'pigx 服务状态监控\'\n        brand: \'pigx 服务状态监控\'\n        external-views:\n          - label: \"SQL监控\"\n            url: /druid/sql.html\n            order: 2000\n            iframe: true\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS  #显示详细信息\n\n\n# druid 监控的服务\nmonitor:\n  applications:\n    - pigx-upms-biz\n', '2bb39e4dee3f90d4186d1e42aa666d2a', '2022-12-16 10:44:25', '2023-04-07 14:12:09', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (7, 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /druid/**\n\n# 数据源\nspring:\n  autoconfigure:\n    exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n      stat-view-servlet:\n        enabled: true\n        allow: \"\"\n        url-pattern: /druid/*\n        #login-username: admin\n        #login-password: admin\n      filter:\n        stat:\n          enabled: true\n          log-slow-sql: true\n          slow-sql-millis: 10000\n          merge-sql: false\n        wall:\n          config:\n            multi-statement-allow: true\n\n# 本地文件系统\nfile:\n  local:\n    enable: true\n    basePath: /Users/lengleng/Downloads/files', '28f2305c1cfb413dcc45a3d432ef7098', '2022-12-16 10:44:25', '2024-02-22 15:08:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (8, 'pigx-daemon-quartz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n  quartz:\n    #相关属性配置\n    properties:\n      org:\n        quartz:\n          scheduler:\n            instanceName: clusteredScheduler\n            instanceId: AUTO\n          jobStore:\n            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n            tablePrefix: QRTZ_\n            isClustered: true\n            clusterCheckinInterval: 10000\n            useProperties: false\n          threadPool:\n            class: org.quartz.simpl.SimpleThreadPool\n            threadCount: 50\n            threadPriority: 5\n            threadsInheritContextClassLoaderOfInitializingThread: true\n    #数据库方式\n    job-store-type: jdbc\n    #初始化表结构\n    #jdbc:\n    #initialize-schema: never\n\n', '5f7a45c377318ce767433a1e210e8584', '2022-12-16 10:44:25', '2023-04-07 14:13:08', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (9, 'pigx-pay-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_pay}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/\n# 租户表维护\npigx:\n  pay:\n    test: lengleng\n    aliPayConfig:\n      expire-time: 30\n      return-url: http://pig4cloud.com\n      notify-url: http://payx.yunjihuitong.com/pay/notify/ali/callbak\n    wxPayConfig:\n      notify-url: https://admin.pig4cloud.com/pay/notify/wx/callbak\n    mergePayConfig:\n      return-url: http://pig4cloud.com\n      notify-url: http://wechat.pigx.top/pay/notify/merge/callbak\n  xsequence:    #发号器相关配置\n    db:\n      retry-times: 3\n      table-name: pay_sequence', 'f4e5734a99f3c1f059071deac081b33d', '2022-12-16 10:44:25', '2024-02-22 15:09:08', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (11, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/', 'd5936e0c352fb1fbe1d05f054f14c98a', '2022-12-16 10:44:25', '2024-02-22 15:09:20', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (12, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n  job:\n    i18n: zh_CN\n    logretentiondays: 30\n    triggerpool:\n      fast.max: 200\n      slow.max: 200\n\n# mybatis\nmybatis:\n  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  mvc:\n    static-path-pattern: /static/**\n  freemarker:\n    suffix: .ftl\n    request-context-attribute: request\n    settings:\n      number_format: 0.##########\n  mail:\n    host: smtp.mxhichina.com\n    port: 465\n    from: xxxx@gitee.wang\n    username: xxxx@gitee.wang\n    password: xxxx\n    properties:\n      mail:\n        smtp:\n          auth: true\n          ssl.enable: true\n          starttls.enable: false\n          required: false\n\nmanagement:\n  health:\n    mail:\n      enabled: false\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS', '6d70dce1f3ee48f261dce29bcfa99cbb', '2022-12-16 10:44:25', '2023-01-04 18:22:48', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (13, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  jpa:\n    database-platform: org.hibernate.dialect.MySQL8Dialect\n\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /\n        - /api/project/getData\n        - /static/**\n        - /api/project/get-file/*\n\n# 文件上传路径\ngv:\n  img-path: /Users/lengleng/Downloads/img/\n', 'ce3fde4b4592cdd61feb2e443b2ddfe5', '2022-12-16 10:44:25', '2023-04-07 12:56:57', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '66319da04963c4c7217f807bf1bd5f2d', '2022-12-16 10:44:25', '2024-01-30 20:44:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (15, 'pigx-app-server-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_app}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true', 'e4668a1854e92a5a666e83479ef7d26a', '2022-12-19 10:30:07', '2024-02-22 15:09:50', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (16, 'pigx-flow-engine-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:41:32', '2023-07-28 13:43:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 工作引擎', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (17, 'pigx-flow-task-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:44:25', '2024-02-22 15:09:34', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 业务', '', '', 'yaml', '', '');
 COMMIT;
 
 -- ----------------------------

From 3352865429b38ae764f9766e3e8400a1979cfd81 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 22 Feb 2024 21:21:10 +0800
Subject: [PATCH 37/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=20=E6=9B=B4=E6=96=B0nacos=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=A7=9F=E6=88=B7=E9=85=8D=E7=BD=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E8=87=AA=E5=8A=A8=E5=8F=91=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2pigxx.sql        | 31 +++++++++++++++----------------
 db/6pigxx_config.sql | 33 +++++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index 1e0e1d824..d7754ee48 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -1110,22 +1110,21 @@ CREATE TABLE `sys_route_conf` (
 -- Records of sys_route_conf
 -- ----------------------------
 BEGIN;
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', '# 配置文件加密根密码\njasypt:\n  encryptor:\n    password: pigx\n    algorithm: PBEWithMD5AndDES\n    iv-generator-classname: org.jasypt.iv.NoIvGenerator\n\n\nspring:\n  data:\n    redis:\n      host: pigx-redis\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n  cloud:\n    sentinel:\n      eager: true\n      transport:\n        dashboard: pigx-sentinel:5020\n    openfeign:\n      sentinel:\n        enabled: true\n      okhttp:\n        enabled: true\n      httpclient:\n        enabled: false\n        connection-timeout: 20000\n      compression:\n        request:\n          enabled: true\n        response:\n          enabled: true\n\n# 端点对外暴露\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'          \n  endpoint:\n    restart:\n      enabled: true\n    health:\n      show-details: ALWAYS\n\n#开启灰度\ngray:\n  rule:\n    enabled: true\n\n# mybatis-plus 配置\nmybatis-plus:\n  tenant-enable: ture\n  mapper-locations: classpath:/mapper/*Mapper.xml\n  global-config:\n    capitalMode: true\n    banner: false\n    db-config:\n      id-type: auto\n      select-strategy: not_empty\n      insert-strategy: not_empty\n      update-strategy: not_null\n  type-handlers-package:  com.pig4cloud.pigx.common.data.handler\n  configuration:\n    jdbc-type-for-null: \'null\'\n    call-setters-on-nulls: true\n    shrink-whitespaces-in-sql: true\nmybatis-plus-join:\n  banner: false #关闭连表查询组件banner', '90942d7d4856ccba068fe5847643737d', '2022-12-16 10:44:25', '2023-08-14 11:44:19', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (2, 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/', '74f53b71c7799aa754da75662378b93c', '2022-12-16 10:44:25', '2022-12-16 10:44:25', NULL, '0:0:0:0:0:0:0:1', '', '', NULL, NULL, NULL, 'yaml', NULL, '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (3, 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_codegen}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n', 'ed6de06e34e2634c28a24e8a1db99b06', '2022-12-16 10:44:25', '2024-02-22 15:08:09', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true', '09996f46e0b80d7b2aa320ef4cb31c82', '2022-12-16 10:44:25', '2023-04-07 14:14:50', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (5, 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'gateway:\n  encode-key: \'pigxpigxpigxpigx\'\n\n# 验证码相关配置参考： http://t.cn/A647jEdu\naj:\n  captcha:\n    cache-type: redis\n    water-mark: pig4cloud\n\n# 固定路由转发配置 无修改\nspring:\n  cloud:\n    gateway:\n      routes:\n        - id: openapi\n          uri: lb://pigx-gateway\n          predicates:\n            - Path=/v3/api-docs/**\n          filters:\n            - RewritePath=/v3/api-docs/(?<path>.*), /$\\{path}/$\\{path}/v3/api-docs\n\n# gateway 刷新端点\nmanagement:\n  endpoint:\n    gateway:\n      enabled: true\n', 'd138f5bafa91ab76dca8c4c1a01c1de2', '2022-12-16 10:44:25', '2023-07-28 16:49:29', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (6, 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n  # 安全配置\n  security:\n    user:\n      name: ENC(rZHA4LW5hHmhLAAzJoFNag==)     # pigx\n      password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n  autoconfigure:\n    exclude: com.pig4cloud.pigx.common.core.config.JacksonConfiguration\n  boot:\n    admin:\n      ui:\n        title: \'pigx 服务状态监控\'\n        brand: \'pigx 服务状态监控\'\n        external-views:\n          - label: \"SQL监控\"\n            url: /druid/sql.html\n            order: 2000\n            iframe: true\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS  #显示详细信息\n\n\n# druid 监控的服务\nmonitor:\n  applications:\n    - pigx-upms-biz\n', '2bb39e4dee3f90d4186d1e42aa666d2a', '2022-12-16 10:44:25', '2023-04-07 14:12:09', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (7, 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /druid/**\n\n# 数据源\nspring:\n  autoconfigure:\n    exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n      stat-view-servlet:\n        enabled: true\n        allow: \"\"\n        url-pattern: /druid/*\n        #login-username: admin\n        #login-password: admin\n      filter:\n        stat:\n          enabled: true\n          log-slow-sql: true\n          slow-sql-millis: 10000\n          merge-sql: false\n        wall:\n          config:\n            multi-statement-allow: true\n\n# 本地文件系统\nfile:\n  local:\n    enable: true\n    basePath: /Users/lengleng/Downloads/files', '28f2305c1cfb413dcc45a3d432ef7098', '2022-12-16 10:44:25', '2024-02-22 15:08:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (8, 'pigx-daemon-quartz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n  quartz:\n    #相关属性配置\n    properties:\n      org:\n        quartz:\n          scheduler:\n            instanceName: clusteredScheduler\n            instanceId: AUTO\n          jobStore:\n            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n            tablePrefix: QRTZ_\n            isClustered: true\n            clusterCheckinInterval: 10000\n            useProperties: false\n          threadPool:\n            class: org.quartz.simpl.SimpleThreadPool\n            threadCount: 50\n            threadPriority: 5\n            threadsInheritContextClassLoaderOfInitializingThread: true\n    #数据库方式\n    job-store-type: jdbc\n    #初始化表结构\n    #jdbc:\n    #initialize-schema: never\n\n', '5f7a45c377318ce767433a1e210e8584', '2022-12-16 10:44:25', '2023-04-07 14:13:08', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (9, 'pigx-pay-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_pay}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/\n# 租户表维护\npigx:\n  pay:\n    test: lengleng\n    aliPayConfig:\n      expire-time: 30\n      return-url: http://pig4cloud.com\n      notify-url: http://payx.yunjihuitong.com/pay/notify/ali/callbak\n    wxPayConfig:\n      notify-url: https://admin.pig4cloud.com/pay/notify/wx/callbak\n    mergePayConfig:\n      return-url: http://pig4cloud.com\n      notify-url: http://wechat.pigx.top/pay/notify/merge/callbak\n  xsequence:    #发号器相关配置\n    db:\n      retry-times: 3\n      table-name: pay_sequence', 'f4e5734a99f3c1f059071deac081b33d', '2022-12-16 10:44:25', '2024-02-22 15:09:08', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (11, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/', 'd5936e0c352fb1fbe1d05f054f14c98a', '2022-12-16 10:44:25', '2024-02-22 15:09:20', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (12, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n  job:\n    i18n: zh_CN\n    logretentiondays: 30\n    triggerpool:\n      fast.max: 200\n      slow.max: 200\n\n# mybatis\nmybatis:\n  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  mvc:\n    static-path-pattern: /static/**\n  freemarker:\n    suffix: .ftl\n    request-context-attribute: request\n    settings:\n      number_format: 0.##########\n  mail:\n    host: smtp.mxhichina.com\n    port: 465\n    from: xxxx@gitee.wang\n    username: xxxx@gitee.wang\n    password: xxxx\n    properties:\n      mail:\n        smtp:\n          auth: true\n          ssl.enable: true\n          starttls.enable: false\n          required: false\n\nmanagement:\n  health:\n    mail:\n      enabled: false\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS', '6d70dce1f3ee48f261dce29bcfa99cbb', '2022-12-16 10:44:25', '2023-01-04 18:22:48', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (13, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  jpa:\n    database-platform: org.hibernate.dialect.MySQL8Dialect\n\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /\n        - /api/project/getData\n        - /static/**\n        - /api/project/get-file/*\n\n# 文件上传路径\ngv:\n  img-path: /Users/lengleng/Downloads/img/\n', 'ce3fde4b4592cdd61feb2e443b2ddfe5', '2022-12-16 10:44:25', '2023-04-07 12:56:57', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '66319da04963c4c7217f807bf1bd5f2d', '2022-12-16 10:44:25', '2024-01-30 20:44:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (15, 'pigx-app-server-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_app}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true', 'e4668a1854e92a5a666e83479ef7d26a', '2022-12-19 10:30:07', '2024-02-22 15:09:50', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (16, 'pigx-flow-engine-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:41:32', '2023-07-28 13:43:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 工作引擎', '', '', 'yaml', '', '');
-INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (17, 'pigx-flow-task-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:44:25', '2024-02-22 15:09:34', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 业务', '', '', 'yaml', '', '');
+INSERT INTO `sys_route_conf` VALUES (1, '工作流管理模块', 'pigx-oa-platform', '[{\"args\": {\"_genkey_0\": \"/act/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-oa-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:56', '0');
+INSERT INTO `sys_route_conf` VALUES (2, '认证中心', 'pigx-auth', '[{\"args\": {\"_genkey_0\": \"/auth/**\"}, \"name\": \"Path\"}]', '[{\"args\": {}, \"name\": \"ValidateCodeGatewayFilter\"}, {\"args\": {}, \"name\": \"PasswordDecoderFilter\"}]', 'lb://pigx-auth', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:57', '0');
+INSERT INTO `sys_route_conf` VALUES (3, '代码生成模块', 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:58', '0');
+INSERT INTO `sys_route_conf` VALUES (4, 'elastic-job定时任务模块', 'pigx-daemon-elastic-job', '[{\"args\": {\"_genkey_0\": \"/daemon/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-elastic-job', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:36:59', '0');
+INSERT INTO `sys_route_conf` VALUES (5, 'quartz定时任务模块', 'pigx-daemon-quartz', '[{\"args\": {\"_genkey_0\": \"/job/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-quartz', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:02', '0');
+INSERT INTO `sys_route_conf` VALUES (6, '分布式事务模块', 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:04', '0');
+INSERT INTO `sys_route_conf` VALUES (7, '通用权限模块', 'pigx-upms-biz', '[{\"args\": {\"_genkey_0\": \"/admin/**\"}, \"name\": \"Path\"}]', '[{\"args\": {\"key-resolver\": \"#{@remoteAddrKeyResolver}\", \"redis-rate-limiter.burstCapacity\": \"1000\", \"redis-rate-limiter.replenishRate\": \"1000\"}, \"name\": \"RequestRateLimiter\"}]', 'lb://pigx-upms-biz', 0, '{\"response-timeout\": \"30000\"}', ' ', ' ', '2019-10-16 16:44:41', '2021-12-14 13:24:55', '0');
+INSERT INTO `sys_route_conf` VALUES (8, '工作流长链接支持', 'pigx-oa-platform-ws', '[{\"args\": {\"_genkey_0\": \"/act/ws/**\"}, \"name\": \"Path\"}]', '[]', 'lb:ws://pigx-oa-platform', 100, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:09', '0');
+INSERT INTO `sys_route_conf` VALUES (9, '微信公众号管理', 'pigx-mp-platform', '[{\"args\": {\"_genkey_0\": \"/mp/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-mp-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:12', '0');
+INSERT INTO `sys_route_conf` VALUES (10, '支付管理', 'pigx-pay-platform', '[{\"args\": {\"_genkey_0\": \"/pay/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-pay-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:13', '0');
+INSERT INTO `sys_route_conf` VALUES (11, '监控管理', 'pigx-monitor', '[{\"args\": {\"_genkey_0\": \"/monitor/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-monitor', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0');
+INSERT INTO `sys_route_conf` VALUES (12, '积木报表', 'pigx-jimu-platform\n', '[{\"args\": {\"_genkey_0\": \"/jimu/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-jimu-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0');
+INSERT INTO `sys_route_conf` VALUES (13, '大屏设计', 'pigx-report-platform', '[{\"args\": {\"_genkey_0\": \"/gv/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-report-platform', 0, '{}', ' ', ' ', '2022-08-27 02:38:43', '2023-04-05 07:52:27', '0');
+INSERT INTO `sys_route_conf` VALUES (14, 'APP服务', 'pigx-app-server', '[{\"args\": {\"_genkey_0\": \"/app/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-app-server-biz', 0, '{}', 'admin', ' ', '2022-12-07 10:53:44', NULL, '0');
+INSERT INTO `sys_route_conf` VALUES (15, '工作流引擎', 'pigx-flow-task-biz', '[{\"args\": {\"_genkey_0\": \"/task/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-flow-task-biz', 0, '{}', ' ', ' ', '2023-07-28 16:50:26', NULL, '0');
 COMMIT;
 
 -- ----------------------------
diff --git a/db/6pigxx_config.sql b/db/6pigxx_config.sql
index 52136191f..a3b5fcec4 100644
--- a/db/6pigxx_config.sql
+++ b/db/6pigxx_config.sql
@@ -32,23 +32,24 @@ CREATE TABLE `config_info`  (
 -- Records of config_info
 -- ----------------------------
 BEGIN;
-INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', '# 配置文件加密根密码\njasypt:\n  encryptor:\n    password: pigx\n    algorithm: PBEWithMD5AndDES\n    iv-generator-classname: org.jasypt.iv.NoIvGenerator\n\n\nspring:\n  data:\n    redis:\n      host: pigx-redis\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n  cloud:\n    sentinel:\n      eager: true\n      transport:\n        dashboard: pigx-sentinel:5020\n    openfeign:\n      sentinel:\n        enabled: true\n      okhttp:\n        enabled: true\n      httpclient:\n        enabled: false\n        connection-timeout: 20000\n      compression:\n        request:\n          enabled: true\n        response:\n          enabled: true\n\n# 端点对外暴露\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'          \n  endpoint:\n    restart:\n      enabled: true\n    health:\n      show-details: ALWAYS\n\n#开启灰度\ngray:\n  rule:\n    enabled: true\n\n# mybatis-plus 配置\nmybatis-plus:\n  tenant-enable: ture\n  mapper-locations: classpath:/mapper/*Mapper.xml\n  global-config:\n    capitalMode: true\n    banner: false\n    db-config:\n      id-type: auto\n      select-strategy: not_empty\n      insert-strategy: not_empty\n      update-strategy: not_null\n  type-handlers-package:  com.pig4cloud.pigx.common.data.handler\n  configuration:\n    jdbc-type-for-null: \'null\'\n    call-setters-on-nulls: true\n    shrink-whitespaces-in-sql: true\nmybatis-plus-join:\n  banner: false #关闭连表查询组件banner', '90942d7d4856ccba068fe5847643737d', '2022-12-16 10:44:25', '2023-08-14 11:44:19', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (2, 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/', '74f53b71c7799aa754da75662378b93c', '2022-12-16 10:44:25', '2022-12-16 10:44:25', NULL, '0:0:0:0:0:0:0:1', '', '', NULL, NULL, NULL, 'yaml', NULL, '');
-INSERT INTO `config_info` VALUES (3, 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_codegen}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - gen_datasource_conf\n      - gen_form_conf\n      - gen_template\n      - gen_group\n', '765e72c9ff3b0a4504ea4703fbdd7859', '2022-12-16 10:44:25', '2023-04-07 14:14:25', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true', '09996f46e0b80d7b2aa320ef4cb31c82', '2022-12-16 10:44:25', '2023-04-07 14:14:50', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (5, 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'gateway:\n  encode-key: \'pigxpigxpigxpigx\'\n\n# 验证码相关配置参考： http://t.cn/A647jEdu\naj:\n  captcha:\n    cache-type: redis\n    water-mark: pig4cloud\n\n# 固定路由转发配置 无修改\nspring:\n  cloud:\n    gateway:\n      routes:\n        - id: openapi\n          uri: lb://pigx-gateway\n          predicates:\n            - Path=/v3/api-docs/**\n          filters:\n            - RewritePath=/v3/api-docs/(?<path>.*), /$\\{path}/$\\{path}/v3/api-docs\n\n# gateway 刷新端点\nmanagement:\n  endpoint:\n    gateway:\n      enabled: true\n', 'd138f5bafa91ab76dca8c4c1a01c1de2', '2022-12-16 10:44:25', '2023-07-28 16:49:29', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (6, 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n  # 安全配置\n  security:\n    user:\n      name: ENC(rZHA4LW5hHmhLAAzJoFNag==)     # pigx\n      password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n  autoconfigure:\n    exclude: com.pig4cloud.pigx.common.core.config.JacksonConfiguration\n  boot:\n    admin:\n      ui:\n        title: \'pigx 服务状态监控\'\n        brand: \'pigx 服务状态监控\'\n        external-views:\n          - label: \"SQL监控\"\n            url: /druid/sql.html\n            order: 2000\n            iframe: true\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS  #显示详细信息\n\n\n# druid 监控的服务\nmonitor:\n  applications:\n    - pigx-upms-biz\n', '2bb39e4dee3f90d4186d1e42aa666d2a', '2022-12-16 10:44:25', '2023-04-07 14:12:09', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (7, 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /druid/**\n\n# 数据源\nspring:\n  autoconfigure:\n    exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n      stat-view-servlet:\n        enabled: true\n        allow: \"\"\n        url-pattern: /druid/*\n        #login-username: admin\n        #login-password: admin\n      filter:\n        stat:\n          enabled: true\n          log-slow-sql: true\n          slow-sql-millis: 10000\n          merge-sql: false\n        wall:\n          config:\n            multi-statement-allow: true\n\n# 本地文件系统\nfile:\n  local:\n    enable: true\n    basePath: /Users/lengleng/Downloads/files\n\n# Logger Config\nlogging:\n  level:\n    com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - sys_user\n      - sys_role\n      - sys_menu\n      - sys_dept\n      - sys_log\n      - sys_social_details\n      - sys_dict\n      - sys_dict_item\n      - sys_public_param\n      - sys_log\n      - sys_file\n      - sys_file_group\n      - sys_oauth_client_details\n      - sys_post\n      - sys_message\n      - sys_message_relation', '90d96cb006f342d06da031cff829615c', '2022-12-16 10:44:25', '2023-10-28 21:59:30', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (8, 'pigx-daemon-quartz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n  quartz:\n    #相关属性配置\n    properties:\n      org:\n        quartz:\n          scheduler:\n            instanceName: clusteredScheduler\n            instanceId: AUTO\n          jobStore:\n            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n            tablePrefix: QRTZ_\n            isClustered: true\n            clusterCheckinInterval: 10000\n            useProperties: false\n          threadPool:\n            class: org.quartz.simpl.SimpleThreadPool\n            threadCount: 50\n            threadPriority: 5\n            threadsInheritContextClassLoaderOfInitializingThread: true\n    #数据库方式\n    job-store-type: jdbc\n    #初始化表结构\n    #jdbc:\n    #initialize-schema: never\n\n', '5f7a45c377318ce767433a1e210e8584', '2022-12-16 10:44:25', '2023-04-07 14:13:08', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (9, 'pigx-pay-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_pay}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/\n# 租户表维护\npigx:\n  pay:\n    test: lengleng\n    aliPayConfig:\n      expire-time: 30\n      return-url: http://pig4cloud.com\n      notify-url: http://payx.yunjihuitong.com/pay/notify/ali/callbak\n    wxPayConfig:\n      notify-url: https://admin.pig4cloud.com/pay/notify/wx/callbak\n    mergePayConfig:\n      return-url: http://pig4cloud.com\n      notify-url: http://wechat.pigx.top/pay/notify/merge/callbak\n  xsequence:    #发号器相关配置\n    db:\n      retry-times: 3\n      table-name: pay_sequence\n  tenant:\n    column: tenant_id\n    tables:\n      - pay_channel\n      - pay_trade_order\n      - pay_goods_order\n      - pay_notify_record\n      - pay_refund_order', 'c70a66d3c300eab1afef0ed4ad9d42d5', '2022-12-16 10:44:25', '2023-04-07 14:12:40', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (11, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - wx_mp_menu\n      - wx_account\n      - wx_account_tag\n      - wx_account_fans\n      - wx_msg\n      - wx_auto_reply', 'ea4e59c98b8aeb4dd78ec989e7f197a4', '2022-12-16 10:44:25', '2023-01-29 13:12:59', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (12, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n  job:\n    i18n: zh_CN\n    logretentiondays: 30\n    triggerpool:\n      fast.max: 200\n      slow.max: 200\n\n# mybatis\nmybatis:\n  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  mvc:\n    static-path-pattern: /static/**\n  freemarker:\n    suffix: .ftl\n    request-context-attribute: request\n    settings:\n      number_format: 0.##########\n  mail:\n    host: smtp.mxhichina.com\n    port: 465\n    from: xxxx@gitee.wang\n    username: xxxx@gitee.wang\n    password: xxxx\n    properties:\n      mail:\n        smtp:\n          auth: true\n          ssl.enable: true\n          starttls.enable: false\n          required: false\n\nmanagement:\n  health:\n    mail:\n      enabled: false\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS', '6d70dce1f3ee48f261dce29bcfa99cbb', '2022-12-16 10:44:25', '2023-01-04 18:22:48', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (13, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  jpa:\n    database-platform: org.hibernate.dialect.MySQL8Dialect\n\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /\n        - /api/project/getData\n        - /static/**\n        - /api/project/get-file/*\n\n# 文件上传路径\ngv:\n  img-path: /Users/lengleng/Downloads/img/\n', 'ce3fde4b4592cdd61feb2e443b2ddfe5', '2022-12-16 10:44:25', '2023-04-07 12:56:57', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '66319da04963c4c7217f807bf1bd5f2d', '2022-12-16 10:44:25', '2024-01-30 20:44:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (15, 'pigx-app-server-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_app}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - app_user\n      - app_role\n      - app_article\n      - app_article_category\n      - app_article_collect\n      - app_page\n      - app_tabbar', '2513bb14ce549a2a4ea1cdfd83bba1f3', '2022-12-19 10:30:07', '2023-06-20 18:15:07', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (16, 'pigx-flow-engine-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:41:32', '2023-07-28 13:43:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 工作引擎', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (17, 'pigx-flow-task-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - process\n      - process_copy\n      - process_group\n      - process_instance_record\n      - process_node_data\n      - process_node_record\n      - process_node_record_assign_user\n      - process_starter', 'bdead04cdd3666d04786f69e5fb32633', '2023-07-28 13:44:25', '2023-07-28 13:50:08', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 业务', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', '# 配置文件加密根密码\njasypt:\n  encryptor:\n    password: pigx\n    algorithm: PBEWithMD5AndDES\n    iv-generator-classname: org.jasypt.iv.NoIvGenerator\n\n\nspring:\n  data:\n    redis:\n      host: pigx-redis\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n  cloud:\n    sentinel:\n      eager: true\n      transport:\n        dashboard: pigx-sentinel:5020\n    openfeign:\n      sentinel:\n        enabled: true\n      okhttp:\n        enabled: true\n      httpclient:\n        enabled: false\n        connection-timeout: 20000\n      compression:\n        request:\n          enabled: true\n        response:\n          enabled: true\n\n# 端点对外暴露\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'          \n  endpoint:\n    restart:\n      enabled: true\n    health:\n      show-details: ALWAYS\n\n#开启灰度\ngray:\n  rule:\n    enabled: true\n\n# mybatis-plus 配置\nmybatis-plus:\n  tenant-enable: ture\n  mapper-locations: classpath:/mapper/*Mapper.xml\n  global-config:\n    capitalMode: true\n    banner: false\n    db-config:\n      id-type: auto\n      select-strategy: not_empty\n      insert-strategy: not_empty\n      update-strategy: not_null\n  type-handlers-package:  com.pig4cloud.pigx.common.data.handler\n  configuration:\n    jdbc-type-for-null: \'null\'\n    call-setters-on-nulls: true\n    shrink-whitespaces-in-sql: true\nmybatis-plus-join:\n  banner: false #关闭连表查询组件banner', '90942d7d4856ccba068fe5847643737d', '2022-12-16 10:44:25', '2023-08-14 11:44:19', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (2, 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/', '74f53b71c7799aa754da75662378b93c', '2022-12-16 10:44:25', '2022-12-16 10:44:25', NULL, '0:0:0:0:0:0:0:1', '', '', NULL, NULL, NULL, 'yaml', NULL, '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (3, 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_codegen}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n', 'ed6de06e34e2634c28a24e8a1db99b06', '2022-12-16 10:44:25', '2024-02-22 15:08:09', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true', '09996f46e0b80d7b2aa320ef4cb31c82', '2022-12-16 10:44:25', '2023-04-07 14:14:50', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (5, 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'gateway:\n  encode-key: \'pigxpigxpigxpigx\'\n\n# 验证码相关配置参考： http://t.cn/A647jEdu\naj:\n  captcha:\n    cache-type: redis\n    water-mark: pig4cloud\n\n# 固定路由转发配置 无修改\nspring:\n  cloud:\n    gateway:\n      routes:\n        - id: openapi\n          uri: lb://pigx-gateway\n          predicates:\n            - Path=/v3/api-docs/**\n          filters:\n            - RewritePath=/v3/api-docs/(?<path>.*), /$\\{path}/$\\{path}/v3/api-docs\n\n# gateway 刷新端点\nmanagement:\n  endpoint:\n    gateway:\n      enabled: true\n', 'd138f5bafa91ab76dca8c4c1a01c1de2', '2022-12-16 10:44:25', '2023-07-28 16:49:29', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (6, 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n  # 安全配置\n  security:\n    user:\n      name: ENC(rZHA4LW5hHmhLAAzJoFNag==)     # pigx\n      password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n  autoconfigure:\n    exclude: com.pig4cloud.pigx.common.core.config.JacksonConfiguration\n  boot:\n    admin:\n      ui:\n        title: \'pigx 服务状态监控\'\n        brand: \'pigx 服务状态监控\'\n        external-views:\n          - label: \"SQL监控\"\n            url: /druid/sql.html\n            order: 2000\n            iframe: true\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS  #显示详细信息\n\n\n# druid 监控的服务\nmonitor:\n  applications:\n    - pigx-upms-biz\n', '2bb39e4dee3f90d4186d1e42aa666d2a', '2022-12-16 10:44:25', '2023-04-07 14:12:09', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (7, 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /druid/**\n\n# 数据源\nspring:\n  autoconfigure:\n    exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n      stat-view-servlet:\n        enabled: true\n        allow: \"\"\n        url-pattern: /druid/*\n        #login-username: admin\n        #login-password: admin\n      filter:\n        stat:\n          enabled: true\n          log-slow-sql: true\n          slow-sql-millis: 10000\n          merge-sql: false\n        wall:\n          config:\n            multi-statement-allow: true\n\n# 本地文件系统\nfile:\n  local:\n    enable: true\n    basePath: /Users/lengleng/Downloads/files', '28f2305c1cfb413dcc45a3d432ef7098', '2022-12-16 10:44:25', '2024-02-22 15:08:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (8, 'pigx-daemon-quartz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n  quartz:\n    #相关属性配置\n    properties:\n      org:\n        quartz:\n          scheduler:\n            instanceName: clusteredScheduler\n            instanceId: AUTO\n          jobStore:\n            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n            tablePrefix: QRTZ_\n            isClustered: true\n            clusterCheckinInterval: 10000\n            useProperties: false\n          threadPool:\n            class: org.quartz.simpl.SimpleThreadPool\n            threadCount: 50\n            threadPriority: 5\n            threadsInheritContextClassLoaderOfInitializingThread: true\n    #数据库方式\n    job-store-type: jdbc\n    #初始化表结构\n    #jdbc:\n    #initialize-schema: never\n\n', '5f7a45c377318ce767433a1e210e8584', '2022-12-16 10:44:25', '2023-04-07 14:13:08', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (9, 'pigx-pay-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_pay}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  freemarker:\n    allow-request-override: false\n    allow-session-override: false\n    cache: true\n    charset: UTF-8\n    check-template-location: true\n    content-type: text/html\n    enabled: true\n    expose-request-attributes: false\n    expose-session-attributes: false\n    expose-spring-macro-helpers: true\n    prefer-file-system-access: true\n    suffix: .ftl\n    template-loader-path: classpath:/templates/\n# 租户表维护\npigx:\n  pay:\n    test: lengleng\n    aliPayConfig:\n      expire-time: 30\n      return-url: http://pig4cloud.com\n      notify-url: http://payx.yunjihuitong.com/pay/notify/ali/callbak\n    wxPayConfig:\n      notify-url: https://admin.pig4cloud.com/pay/notify/wx/callbak\n    mergePayConfig:\n      return-url: http://pig4cloud.com\n      notify-url: http://wechat.pigx.top/pay/notify/merge/callbak\n  xsequence:    #发号器相关配置\n    db:\n      retry-times: 3\n      table-name: pay_sequence', 'f4e5734a99f3c1f059071deac081b33d', '2022-12-16 10:44:25', '2024-02-22 15:09:08', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (11, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/', 'd5936e0c352fb1fbe1d05f054f14c98a', '2022-12-16 10:44:25', '2024-02-22 15:09:20', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (12, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n  job:\n    i18n: zh_CN\n    logretentiondays: 30\n    triggerpool:\n      fast.max: 200\n      slow.max: 200\n\n# mybatis\nmybatis:\n  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  mvc:\n    static-path-pattern: /static/**\n  freemarker:\n    suffix: .ftl\n    request-context-attribute: request\n    settings:\n      number_format: 0.##########\n  mail:\n    host: smtp.mxhichina.com\n    port: 465\n    from: xxxx@gitee.wang\n    username: xxxx@gitee.wang\n    password: xxxx\n    properties:\n      mail:\n        smtp:\n          auth: true\n          ssl.enable: true\n          starttls.enable: false\n          required: false\n\nmanagement:\n  health:\n    mail:\n      enabled: false\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS', '6d70dce1f3ee48f261dce29bcfa99cbb', '2022-12-16 10:44:25', '2023-01-04 18:22:48', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (13, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  jpa:\n    database-platform: org.hibernate.dialect.MySQL8Dialect\n\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /\n        - /api/project/getData\n        - /static/**\n        - /api/project/get-file/*\n\n# 文件上传路径\ngv:\n  img-path: /Users/lengleng/Downloads/img/\n', 'ce3fde4b4592cdd61feb2e443b2ddfe5', '2022-12-16 10:44:25', '2023-04-07 12:56:57', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '66319da04963c4c7217f807bf1bd5f2d', '2022-12-16 10:44:25', '2024-01-30 20:44:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (15, 'pigx-app-server-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_app}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true', 'e4668a1854e92a5a666e83479ef7d26a', '2022-12-19 10:30:07', '2024-02-22 15:09:50', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (16, 'pigx-flow-engine-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:41:32', '2023-07-28 13:43:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 工作引擎', '', '', 'yaml', '', '');
+INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`, `encrypted_data_key`) VALUES (17, 'pigx-flow-task-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:44:25', '2024-02-22 15:09:34', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 业务', '', '', 'yaml', '', '');
 COMMIT;
+
 -- ----------------------------
 -- Table structure for config_info_aggr
 -- ----------------------------

From 9b0fe3f4e21ade585dc2e8852a91477acdd85cb5 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 22 Feb 2024 21:30:39 +0800
Subject: [PATCH 38/46] :bookmark: Releasing / Version tags. 5.4

---
 pigx-app-server/pigx-app-server-api/pom.xml             | 2 +-
 pigx-app-server/pigx-app-server-biz/pom.xml             | 4 ++--
 pigx-app-server/pom.xml                                 | 2 +-
 pigx-auth/pom.xml                                       | 2 +-
 pigx-common/pigx-common-audit/pom.xml                   | 2 +-
 pigx-common/pigx-common-bom/pom.xml                     | 2 +-
 pigx-common/pigx-common-core/pom.xml                    | 2 +-
 pigx-common/pigx-common-data/pom.xml                    | 2 +-
 pigx-common/pigx-common-datasource/pom.xml              | 2 +-
 pigx-common/pigx-common-encrypt-api/pom.xml             | 2 +-
 pigx-common/pigx-common-excel/pom.xml                   | 2 +-
 pigx-common/pigx-common-feign/pom.xml                   | 2 +-
 pigx-common/pigx-common-gateway/pom.xml                 | 2 +-
 pigx-common/pigx-common-gray/pom.xml                    | 2 +-
 pigx-common/pigx-common-idempotent/pom.xml              | 2 +-
 pigx-common/pigx-common-job/pom.xml                     | 2 +-
 pigx-common/pigx-common-log/pom.xml                     | 2 +-
 pigx-common/pigx-common-oss/pom.xml                     | 2 +-
 pigx-common/pigx-common-seata/pom.xml                   | 2 +-
 pigx-common/pigx-common-security/pom.xml                | 2 +-
 pigx-common/pigx-common-sentinel/pom.xml                | 2 +-
 pigx-common/pigx-common-sequence/pom.xml                | 2 +-
 pigx-common/pigx-common-sse/pom.xml                     | 2 +-
 pigx-common/pigx-common-swagger/pom.xml                 | 2 +-
 pigx-common/pigx-common-websocket/pom.xml               | 2 +-
 pigx-common/pigx-common-xss/pom.xml                     | 2 +-
 pigx-common/pom.xml                                     | 2 +-
 pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml | 2 +-
 pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml | 2 +-
 pigx-flow/pigx-flow-engine/pom.xml                      | 2 +-
 pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml     | 2 +-
 pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml     | 2 +-
 pigx-flow/pigx-flow-task/pom.xml                        | 2 +-
 pigx-flow/pom.xml                                       | 2 +-
 pigx-gateway/pom.xml                                    | 2 +-
 pigx-register/pom.xml                                   | 2 +-
 pigx-upms/pigx-upms-api/pom.xml                         | 2 +-
 pigx-upms/pigx-upms-biz/pom.xml                         | 2 +-
 pigx-upms/pom.xml                                       | 2 +-
 pigx-visual/pigx-codegen/pom.xml                        | 2 +-
 pigx-visual/pigx-daemon-elastic-job/pom.xml             | 2 +-
 pigx-visual/pigx-daemon-quartz/pom.xml                  | 2 +-
 pigx-visual/pigx-jimu-platform/pom.xml                  | 2 +-
 pigx-visual/pigx-monitor/pom.xml                        | 2 +-
 pigx-visual/pigx-mp-platform/pom.xml                    | 2 +-
 pigx-visual/pigx-pay-platform/pom.xml                   | 2 +-
 pigx-visual/pigx-report-platform/pom.xml                | 2 +-
 pigx-visual/pigx-xxl-job-admin/pom.xml                  | 2 +-
 pigx-visual/pom.xml                                     | 2 +-
 pom.xml                                                 | 2 +-
 50 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/pigx-app-server/pigx-app-server-api/pom.xml b/pigx-app-server/pigx-app-server-api/pom.xml
index 0d9db1393..b3aa80463 100644
--- a/pigx-app-server/pigx-app-server-api/pom.xml
+++ b/pigx-app-server/pigx-app-server-api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-app-server</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-app-server-api</artifactId>
diff --git a/pigx-app-server/pigx-app-server-biz/pom.xml b/pigx-app-server/pigx-app-server-biz/pom.xml
index 5ab43f966..8abf71684 100644
--- a/pigx-app-server/pigx-app-server-biz/pom.xml
+++ b/pigx-app-server/pigx-app-server-biz/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-app-server</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-app-server-biz</artifactId>
@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-app-server-api</artifactId>
-			<version>5.3.0</version>
+			<version>5.4.0</version>
 		</dependency>
 		<!--必备: log 依赖-->
 		<dependency>
diff --git a/pigx-app-server/pom.xml b/pigx-app-server/pom.xml
index 1eb70da68..aace13919 100644
--- a/pigx-app-server/pom.xml
+++ b/pigx-app-server/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-app-server</artifactId>
diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml
index 1be77d4f0..bf126ed52 100644
--- a/pigx-auth/pom.xml
+++ b/pigx-auth/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-auth</artifactId>
diff --git a/pigx-common/pigx-common-audit/pom.xml b/pigx-common/pigx-common-audit/pom.xml
index edb6b81a0..51e316040 100644
--- a/pigx-common/pigx-common-audit/pom.xml
+++ b/pigx-common/pigx-common-audit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-audit</artifactId>
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index ea3c9e3bb..21a8ae791 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -17,7 +17,7 @@
     <description>pigx 公共版本控制</description>
 
     <properties>
-        <pigx.version>5.3.0</pigx.version>
+        <pigx.version>5.4.0</pigx.version>
         <mybatis-plus.version>3.5.5</mybatis-plus.version>
         <mybatis-plus-join.version>1.4.10</mybatis-plus-join.version>
         <dynamic-ds.version>4.3.0</dynamic-ds.version>
diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml
index 607f2aeb3..f8bc507f2 100644
--- a/pigx-common/pigx-common-core/pom.xml
+++ b/pigx-common/pigx-common-core/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-core</artifactId>
diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml
index ceab4931c..0b3d0fb63 100644
--- a/pigx-common/pigx-common-data/pom.xml
+++ b/pigx-common/pigx-common-data/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-data</artifactId>
diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml
index d6201a5bc..ed7dc7105 100644
--- a/pigx-common/pigx-common-datasource/pom.xml
+++ b/pigx-common/pigx-common-datasource/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>pigx-common</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/pigx-common/pigx-common-encrypt-api/pom.xml b/pigx-common/pigx-common-encrypt-api/pom.xml
index 3130d3f91..63650c8c2 100644
--- a/pigx-common/pigx-common-encrypt-api/pom.xml
+++ b/pigx-common/pigx-common-encrypt-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-encrypt-api</artifactId>
diff --git a/pigx-common/pigx-common-excel/pom.xml b/pigx-common/pigx-common-excel/pom.xml
index 718ef85a4..6354d7982 100644
--- a/pigx-common/pigx-common-excel/pom.xml
+++ b/pigx-common/pigx-common-excel/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-excel</artifactId>
diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml
index 58ba11758..43f6ef2dd 100755
--- a/pigx-common/pigx-common-feign/pom.xml
+++ b/pigx-common/pigx-common-feign/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml
index 15e6784a0..f203b35ee 100644
--- a/pigx-common/pigx-common-gateway/pom.xml
+++ b/pigx-common/pigx-common-gateway/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-gateway</artifactId>
diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml
index bb9538e00..e7c94a1d1 100644
--- a/pigx-common/pigx-common-gray/pom.xml
+++ b/pigx-common/pigx-common-gray/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-gray</artifactId>
diff --git a/pigx-common/pigx-common-idempotent/pom.xml b/pigx-common/pigx-common-idempotent/pom.xml
index f75ceefc6..140451f2e 100644
--- a/pigx-common/pigx-common-idempotent/pom.xml
+++ b/pigx-common/pigx-common-idempotent/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-idempotent</artifactId>
diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml
index d1f19131d..6abb82133 100644
--- a/pigx-common/pigx-common-job/pom.xml
+++ b/pigx-common/pigx-common-job/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-job</artifactId>
diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml
index 6a4f8aa2f..4dbbd4bc2 100644
--- a/pigx-common/pigx-common-log/pom.xml
+++ b/pigx-common/pigx-common-log/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-log</artifactId>
diff --git a/pigx-common/pigx-common-oss/pom.xml b/pigx-common/pigx-common-oss/pom.xml
index 80bc44739..beab85ca0 100755
--- a/pigx-common/pigx-common-oss/pom.xml
+++ b/pigx-common/pigx-common-oss/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-oss</artifactId>
diff --git a/pigx-common/pigx-common-seata/pom.xml b/pigx-common/pigx-common-seata/pom.xml
index 16858cbfe..6fdeb0dc3 100644
--- a/pigx-common/pigx-common-seata/pom.xml
+++ b/pigx-common/pigx-common-seata/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-seata</artifactId>
diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml
index b29113ce9..4269599c9 100644
--- a/pigx-common/pigx-common-security/pom.xml
+++ b/pigx-common/pigx-common-security/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-security</artifactId>
diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml
index 3fe5387fb..c9ccdd816 100755
--- a/pigx-common/pigx-common-sentinel/pom.xml
+++ b/pigx-common/pigx-common-sentinel/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml
index 6e993f742..1db3ced21 100755
--- a/pigx-common/pigx-common-sequence/pom.xml
+++ b/pigx-common/pigx-common-sequence/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-sequence</artifactId>
diff --git a/pigx-common/pigx-common-sse/pom.xml b/pigx-common/pigx-common-sse/pom.xml
index 3cb211e24..c805d3722 100755
--- a/pigx-common/pigx-common-sse/pom.xml
+++ b/pigx-common/pigx-common-sse/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-sse</artifactId>
diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml
index 86f7efdb3..1dbfe41a3 100644
--- a/pigx-common/pigx-common-swagger/pom.xml
+++ b/pigx-common/pigx-common-swagger/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-common</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-common-swagger</artifactId>
diff --git a/pigx-common/pigx-common-websocket/pom.xml b/pigx-common/pigx-common-websocket/pom.xml
index f79b88418..0e07d9dd9 100755
--- a/pigx-common/pigx-common-websocket/pom.xml
+++ b/pigx-common/pigx-common-websocket/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-websocket</artifactId>
diff --git a/pigx-common/pigx-common-xss/pom.xml b/pigx-common/pigx-common-xss/pom.xml
index f63588e14..db096aa11 100755
--- a/pigx-common/pigx-common-xss/pom.xml
+++ b/pigx-common/pigx-common-xss/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common-xss</artifactId>
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index 809766cd0..ac9bd4693 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-common</artifactId>
diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml
index f6fa2e300..178193d0c 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-flow-engine</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-flow-engine-api</artifactId>
diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml
index 48ebd1da3..efef84cc0 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-flow-engine</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-flow-engine-biz</artifactId>
diff --git a/pigx-flow/pigx-flow-engine/pom.xml b/pigx-flow/pigx-flow-engine/pom.xml
index bf19e5dc0..119d5f448 100644
--- a/pigx-flow/pigx-flow-engine/pom.xml
+++ b/pigx-flow/pigx-flow-engine/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-flow</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-flow-engine</artifactId>
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml
index b8569a2c3..0da1e832f 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-flow-task</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-flow-task-api</artifactId>
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml
index 7e97b5f98..39d49bfb6 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-flow-task</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-flow-task-biz</artifactId>
diff --git a/pigx-flow/pigx-flow-task/pom.xml b/pigx-flow/pigx-flow-task/pom.xml
index f857d53dc..752e53925 100644
--- a/pigx-flow/pigx-flow-task/pom.xml
+++ b/pigx-flow/pigx-flow-task/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-flow</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-flow-task</artifactId>
diff --git a/pigx-flow/pom.xml b/pigx-flow/pom.xml
index 707a3beb3..13d972642 100644
--- a/pigx-flow/pom.xml
+++ b/pigx-flow/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-flow</artifactId>
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index f489f5f5f..b12d46f21 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-gateway</artifactId>
diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml
index 1c8ed8729..556ae1cfb 100644
--- a/pigx-register/pom.xml
+++ b/pigx-register/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-register</artifactId>
diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml
index 235004984..d8466b20f 100644
--- a/pigx-upms/pigx-upms-api/pom.xml
+++ b/pigx-upms/pigx-upms-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-upms</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-upms-api</artifactId>
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index f3f312b78..fa60af007 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-upms</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-upms-biz</artifactId>
diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml
index 1421bd0f6..a5ca37148 100644
--- a/pigx-upms/pom.xml
+++ b/pigx-upms/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-upms</artifactId>
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index 9992960ea..3eee54cd1 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-visual</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-codegen</artifactId>
diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml
index 81867cb4a..654754b4b 100644
--- a/pigx-visual/pigx-daemon-elastic-job/pom.xml
+++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-daemon-elastic-job</artifactId>
diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml
index 771d20cb5..863fab1f9 100644
--- a/pigx-visual/pigx-daemon-quartz/pom.xml
+++ b/pigx-visual/pigx-daemon-quartz/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml
index 0cb92daca..e0e7f2add 100755
--- a/pigx-visual/pigx-jimu-platform/pom.xml
+++ b/pigx-visual/pigx-jimu-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-visual</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-jimu-platform</artifactId>
diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml
index 2093bb194..2bfd1f9a3 100644
--- a/pigx-visual/pigx-monitor/pom.xml
+++ b/pigx-visual/pigx-monitor/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-visual</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-monitor</artifactId>
diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml
index 66cbe5bb4..cc1c12d83 100755
--- a/pigx-visual/pigx-mp-platform/pom.xml
+++ b/pigx-visual/pigx-mp-platform/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>5.3.0</version>
+		<version>5.4.0</version>
 	</parent>
 
 	<artifactId>pigx-mp-platform</artifactId>
diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml
index 78a0f988b..536c5d11f 100755
--- a/pigx-visual/pigx-pay-platform/pom.xml
+++ b/pigx-visual/pigx-pay-platform/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-visual</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-pay-platform</artifactId>
diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml
index edd5ea2dc..f5c030b69 100644
--- a/pigx-visual/pigx-report-platform/pom.xml
+++ b/pigx-visual/pigx-report-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-visual</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-report-platform</artifactId>
diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml
index bdc681170..1498c1814 100644
--- a/pigx-visual/pigx-xxl-job-admin/pom.xml
+++ b/pigx-visual/pigx-xxl-job-admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx-visual</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-xxl-job-admin</artifactId>
diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml
index aa6544371..d27ccf4c2 100644
--- a/pigx-visual/pom.xml
+++ b/pigx-visual/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pigx</artifactId>
-        <version>5.3.0</version>
+        <version>5.4.0</version>
     </parent>
 
     <artifactId>pigx-visual</artifactId>
diff --git a/pom.xml b/pom.xml
index 35fc76197..0207b3fbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>com.pig4cloud</groupId>
     <artifactId>pigx</artifactId>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
     <organization>

From 71e5a0e2abb461085dd7cfc6afd49db1099480d5 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 23 Feb 2024 10:08:08 +0800
Subject: [PATCH 39/46] :arrow_up: Upgrading dependencies. springboot 3.2.3 &
 sas 1.2.2

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

diff --git a/pom.xml b/pom.xml
index 0207b3fbb..3112cac1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,14 +33,14 @@
     </organization>
 
     <properties>
-        <spring-boot.version>3.2.2</spring-boot.version>
+        <spring-boot.version>3.2.3</spring-boot.version>
         <spring-cloud.version>2023.0.0</spring-cloud.version>
         <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <spring-boot-admin.version>3.2.1</spring-boot-admin.version>
-        <spring.authorization.version>1.2.1</spring.authorization.version>
+        <spring.authorization.version>1.2.2</spring.authorization.version>
         <maven.compiler.version>3.11.0</maven.compiler.version>
         <spring.checkstyle.version>0.0.39</spring.checkstyle.version>
         <git.commit.version>2.2.5</git.commit.version>

From 2e582d87100e9dda3d7a71a7c6f0b2d50d42d515 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 23 Feb 2024 10:08:42 +0800
Subject: [PATCH 40/46] :arrow_up: Upgrading dependencies. springbootadmin
 3.2.2

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

diff --git a/pom.xml b/pom.xml
index 3112cac1b..16bc9164b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <spring-boot-admin.version>3.2.1</spring-boot-admin.version>
+        <spring-boot-admin.version>3.2.2</spring-boot-admin.version>
         <spring.authorization.version>1.2.2</spring.authorization.version>
         <maven.compiler.version>3.11.0</maven.compiler.version>
         <spring.checkstyle.version>0.0.39</spring.checkstyle.version>

From 59a202e4d98ca7728d2b4413c536a9076bd6a4d5 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 28 Feb 2024 14:42:37 +0800
Subject: [PATCH 41/46] :arrow_up: Upgrading dependencies. goview 1.0.0

---
 pigx-visual/pigx-report-platform/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml
index f5c030b69..072dc7c13 100644
--- a/pigx-visual/pigx-report-platform/pom.xml
+++ b/pigx-visual/pigx-report-platform/pom.xml
@@ -15,7 +15,7 @@
 
     <description>基于 GoView 的大屏设计系统</description>
     <properties>
-        <goview.version>1.0.0-SNAPSHOT</goview.version>
+        <goview.version>1.0.0</goview.version>
     </properties>
 
     <dependencies>

From c3cdc145d5ea2b62dec5a12b8adc46946b6f58f1 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 28 Feb 2024 21:33:16 +0800
Subject: [PATCH 42/46] :arrow_up: Upgrading dependencies. hutool 5.8.26

---
 pigx-common/pigx-common-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 21a8ae791..657e3ba9d 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -22,7 +22,7 @@
         <mybatis-plus-join.version>1.4.10</mybatis-plus-join.version>
         <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <druid.version>1.2.20</druid.version>
-        <hutool.version>5.8.23</hutool.version>
+        <hutool.version>5.8.26</hutool.version>
         <mysql.connector.version>8.3.0</mysql.connector.version>
         <oracle.version>21.3.0.0</oracle.version>
         <sqlserver.version>8.4.1.jre8</sqlserver.version>

From 8dd3c178d457e1d96aedd47683655d4ba198152b Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 29 Feb 2024 11:36:08 +0800
Subject: [PATCH 43/46] =?UTF-8?q?:recycle:=20Refactoring=20code.=20?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/flow/engine/controller/EngineFlowController.java | 8 ++++----
 .../pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java   | 4 ++--
 .../task/service/impl/ProcessInstanceServiceImpl.java     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java
index 0d98c83fe..1708d02b6 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java
@@ -177,8 +177,8 @@ public class EngineFlowController {
 		}
 
 		List<HistoricActivityInstance> list = activityInstanceQuery.listPage(
-				(taskQueryParamDto.getPageNum() - 1) * taskQueryParamDto.getPageSize(),
-				taskQueryParamDto.getPageSize());
+				(taskQueryParamDto.getCurrent() - 1) * taskQueryParamDto.getSize(),
+				taskQueryParamDto.getSize());
 
 		long count = activityInstanceQuery.count();
 		List<TaskDto> taskDtoList = new ArrayList<>();
@@ -230,8 +230,8 @@ public class EngineFlowController {
 
 		List<TaskDto> taskDtoList = new ArrayList<>();
 
-		int pageIndex = taskQueryParamDto.getPageNum() - 1;
-		int pageSize = taskQueryParamDto.getPageSize();
+		int pageIndex = taskQueryParamDto.getCurrent() - 1;
+		int pageSize = taskQueryParamDto.getSize();
 
 		Page<TaskDto> pageResultDto = new Page<>();
 		TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(assign).orderByTaskCreateTime().desc();
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java
index f05afebfe..349135269 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java
@@ -18,12 +18,12 @@ public class TaskQueryParamDto {
 	/**
 	 * 页码
 	 */
-	private Integer pageNum;
+	private Integer current;
 
 	/**
 	 * 每页的数量
 	 */
-	private Integer pageSize;
+	private Integer size;
 
 	/**
 	 * 流程名称
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java
index 431f4771a..20293b927 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java
@@ -239,7 +239,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService {
 					ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[0] : null,
 					ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[1] : null)
 			.orderByDesc(ProcessInstanceRecord::getCreateTime)
-			.page(new Page<>(taskQueryParamDto.getPageNum(), taskQueryParamDto.getPageSize()));
+			.page(new Page<>(taskQueryParamDto.getCurrent(), taskQueryParamDto.getSize()));
 
 		return R.ok(instanceRecordPage);
 	}
@@ -260,7 +260,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService {
 					ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[0] : null,
 					ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[1] : null)
 			.orderByDesc(ProcessCopy::getNodeTime)
-			.page(new Page<>(taskQueryParamDto.getPageNum(), taskQueryParamDto.getPageSize()));
+			.page(new Page<>(taskQueryParamDto.getCurrent(), taskQueryParamDto.getSize()));
 
 		List<ProcessCopy> records = page.getRecords();
 

From 88ad413fa5cc5d9ad4f35b4a4378afc2176b3c8f Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 1 Mar 2024 15:16:33 +0800
Subject: [PATCH 44/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=20=E7=AE=A1=E7=90=86=E5=91=98=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2pigxx.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index d7754ee48..4bdc752f3 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -1078,6 +1078,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 9063);
 INSERT INTO `sys_role_menu` VALUES (1, 9064);
 INSERT INTO `sys_role_menu` VALUES (1, 9065);
 INSERT INTO `sys_role_menu` VALUES (1, 9070);
+INSERT INTO `sys_role_menu` VALUES (1, 9071);
 INSERT INTO `sys_role_menu` VALUES (1, 9900);
 INSERT INTO `sys_role_menu` VALUES (1, 9910);
 INSERT INTO `sys_role_menu` VALUES (1, 9911);

From 10f979fcf8edbf84fb0cf9ca5692318d87a780b7 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sat, 2 Mar 2024 17:52:24 +0800
Subject: [PATCH 45/46] =?UTF-8?q?#5508=20=E3=80=90=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E3=80=91@sysLog=E6=A0=87=E7=AD=BE=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=B2=A1=E6=9C=89=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java
index 38c56eb4f..5d21ff151 100755
--- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java
+++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java
@@ -61,7 +61,8 @@ public class SysLogUtils {
 		sysLog.setRemoteAddr(JakartaServletUtil.getClientIP(request));
 		sysLog.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
 		sysLog.setCreateBy(getUsername());
-		sysLog.setServiceId(getClientId());
+		// 获取服务名称
+		sysLog.setServiceId(SpringUtil.getProperty("spring.application.name"));
 
 		// get 参数脱敏
 		PigxLogProperties logProperties = SpringUtil.getBean(PigxLogProperties.class);

From 5f3aa969f3ad6e8bde66297488a6527e763edc44 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 3 Mar 2024 21:26:40 +0800
Subject: [PATCH 46/46] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E5=AD=97=E6=AE=B5=E5=8F=AF=E4=BB=A5=E4=B8=BA?=
 =?UTF-8?q?NULL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/8pigxx_codegen.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/8pigxx_codegen.sql b/db/8pigxx_codegen.sql
index 5222c8d6c..605773bc5 100644
--- a/db/8pigxx_codegen.sql
+++ b/db/8pigxx_codegen.sql
@@ -151,7 +151,7 @@ CREATE TABLE `gen_table` (
   `package_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目包名',
   `version` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目版本号',
   `i18n` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '是否生成带有i18n 0 不带有 1带有',
-  `style` bigint NOT NULL COMMENT '代码风格',
+  `style` bigint DEFAULT '1' COMMENT '代码风格',
   `child_table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '子表名称',
   `main_field` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '主表关联键',
   `child_field` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '子表关联键',