day_21

Dockerfile

@@ -0,0 +1,7 @@
+# 选择运行时基础镜像
+FROM tencent-kona-jdk:17.0.9
+RUN mkdir "/app"
+WORKDIR /app
+COPY target/*.jar /app/app.jar
+EXPOSE 9500
+ENTRYPOINT ["java","-jar","app.jar"]

DockerfileBase

@@ -0,0 +1,28 @@
+# 选择运行时基础镜像
+FROM ubuntu:latest
+
+
+# 工作空间
+WORKDIR /usr/local/kona-jdk-17
+
+RUN apt-get update
+RUN apt-get install -y language-pack-zh-hans
+RUN locale-gen zh_CN.UTF-8
+ENV LC_ALL=zh_CN.UTF-8
+RUN apt-get clean
+
+
+# 添加jdk
+ADD TencentKona-17.0.9.b1-jdk_linux-x86_64.tar.gz .
+RUN mv TencentKona-17.0.9.b1/* .
+
+# 设置环境变量
+ENV JAVA_HOME=/usr/local/kona-jdk-17
+ENV JAVA_VERSION=17.0.9
+ENV TENCENTKONA_VERSION=17.0.9
+ENV PATH=/usr/local/kona-jdk-17/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+#EXPOSE 9500
+#RUN mkdir "/app"
+#WORKDIR /app
+#COPY target/*.jar /app/app.jar
+#ENTRYPOINT ["java","-jar","app.jar"]

src/main/java/com/scbfkj/uni/api/GenericApi.java

@@ -47,7 +47,7 @@ public class GenericApi {
     @PostMapping("*")
     public ResponseEntity<Map<String,Object>> matchService( @RequestBody Map<String, Object> body) throws Exception {
         String uri = RequestUtil.getUri();
-        List<Map<String, Object>> serviceinfoList = DataBase.query(Config.centerConnectionStr, "select * from serviceinfo where urilist like concat('%',?,'%')", Collections.singletonList(new Object[]{"/openApi/%s".formatted(uri)}));
+        List<Map<String, Object>> serviceinfoList = DataBase.query(Config.getCenterConnectionStr(), "select * from serviceinfo where urilist like concat('%',?,'%')","/openApi/%s".formatted(uri));
 
         if (serviceinfoList.isEmpty()) {
             return ResponseEntity.status(HttpStatusCode.valueOf(404)).build();

src/main/java/com/scbfkj/uni/api/LogAop.java

@@ -24,8 +24,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 @Component
 @Aspect
@@ -62,7 +60,7 @@ public class LogAop {
         String message = null;
 
 
-        if (Config.debug) {
+        if (Config.isDebug()) {
             logger.info("请求参数：{}", DataFormatUtil.toString(args));
             logger.info("请求路径：{}", uri);
             logger.info("请求session：{}", RequestUtil.getSessionId());
@@ -80,7 +78,7 @@ public class LogAop {
                     Optional serviceid = DataAliasGetUtil.getValue("serviceid", map);
                     if (serviceid.isPresent()) {
 //                        查找状态
-                        List<Map<String, Object>> mapList = DataBase.query(Config.centerConnectionStr, "select * from servicestate where serviceid=? and containercode = ?", Collections.singletonList(new Object[]{serviceid.get(), Config.containerCode}));
+                        List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select * from servicestate where serviceid=? and containercode = ?", serviceid.get(), Config.getContainerCode());
                         if (!mapList.isEmpty()) {
                             Map<String, Object> serviceState = mapList.get(0);
                             Object o = serviceState.get("runstate");
@@ -92,7 +90,7 @@ public class LogAop {
                     }
                 }
             }
-            List<Map<String, Object>> ratelimitruleList = DataBase.query(Config.securityConnectionStr, "select * from ratelimitrule where 1=?", Collections.singletonList(new Object[]{1}));
+            List<Map<String, Object>> ratelimitruleList = DataBase.query(Config.getSecurityConnectionStr(), "select * from ratelimitrule ");
             Optional<Map<String, Object>> optional = ratelimitruleList.stream().filter(it -> {
                 Object pathMatch = it.get("pathmatch");
                 if (Objects.isNull(pathMatch)) return true;
@@ -116,10 +114,8 @@ public class LogAop {
             }
 
 
-            if (Config.securityEnable) {
-                List<Map<String, Object>> apiInfos = DataBase.query(Config.securityConnectionStr, "select * from apiinfo", new ArrayList<>() {{
-                    add(new Object[]{});
-                }});
+            if (Config.isSecurityEnable()) {
+                List<Map<String, Object>> apiInfos = DataBase.query(Config.getSecurityConnectionStr(), "select * from apiinfo");
 
 
                 Optional<Map<String, Object>> requestpath = apiInfos.stream().filter(it -> {
@@ -158,12 +154,12 @@ public class LogAop {
             }
             returnData = joinPoint.proceed(args);
 
-            if (Config.debug) {
+            if (Config.isDebug()) {
                 logger.info("返回值：{}", DataFormatUtil.toString(returnData));
             }
             return ((ResponseEntity<Map<String, Object>>) returnData);
         } catch (Throwable e) {
-            if (Config.debug) {
+            if (Config.isDebug()) {
                 e.printStackTrace();
             }
 //            错误异常消息
@@ -180,7 +176,7 @@ public class LogAop {
                 try {
                     put("applicationid", RequestUtil.getAppId());
                 } catch (Exception e) {
-                    if (Config.debug) {
+                    if (Config.isDebug()) {
                         e.printStackTrace();
                     } else {
                         System.out.println(UniReturnUtil.getMessage(e));

src/main/java/com/scbfkj/uni/library/DataAliasGetUtil.java

@@ -17,7 +17,7 @@ public class DataAliasGetUtil {
         if (result.isPresent()) return result;
         if (Objects.isNull(keyAlias) || keyAlias.isEmpty()) {
 
-            keyAlias = DataBase.query(Config.centerConnectionStr, "select * from keyalias where aliasid>?", Collections.singletonList(new Object[]{0}));
+            keyAlias = DataBase.query(Config.getCenterConnectionStr(), "select * from keyalias ");
 
         }
         List<Map<String, Object>> keynames = keyAlias.stream().filter(it -> Objects.equals(it.get("keyname"), key)).toList();

src/main/java/com/scbfkj/uni/library/ImageUtil.java

@@ -1,18 +1,26 @@
 package com.scbfkj.uni.library;
 
+import com.scbfkj.uni.system.SpringContextApplication;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Component;
+import org.springframework.util.FileCopyUtils;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.security.SecureRandom;
 import java.util.Base64;
+import java.util.Objects;
 
+@Component
 public class ImageUtil {
 
+
+    private static ResourcePatternResolver resourcePatternResolver;
     private static final int WIDTH = 120; // 图片宽度
     private static final int HEIGHT = 45; // 图片高度
     private static final String IMAGE_FORMAT = "JPG";
@@ -23,6 +31,10 @@ public class ImageUtil {
     };
     private static final SecureRandom RANDOM = new SecureRandom();
 
+    public ImageUtil(ResourcePatternResolver resourcePatternResolver) {
+        this.resourcePatternResolver = resourcePatternResolver;
+    }
+
 
     public static String stringToImage(String code) throws IOException, FontFormatException {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
@@ -44,18 +56,26 @@ public class ImageUtil {
 
         Font font = graphics.getFont();
         if (font == null) {
-            File fontFile = new ClassPathResource("font/SourceHanSansSC-Regular-2.otf").getFile();
-            font = Font.createFont(Font.TRUETYPE_FONT, fontFile);
+            Resource resource = resourcePatternResolver.getResource("classpath:font/SourceHanSansSC-Regular-2.otf");
+
+            try (
+                    InputStream inputStream = resource.getInputStream()
+            ) {
+                File font1 = File.createTempFile("font", ".otf");
+                System.out.println(Objects.isNull(inputStream));
+                FileCopyUtils.copy(inputStream, new FileOutputStream(font1));
+                font = Font.createFont(Font.TRUETYPE_FONT, font1);
+            }
         }
-        font  = font.deriveFont((float) (HEIGHT - 10));
+        font = font.deriveFont((float) (HEIGHT - 10));
         graphics.setFont(font);
 
-        int desX, desY=HEIGHT-10, distance = 18;
+        int desX, desY = HEIGHT - 10, distance = 18;
 //        绘制验证码
         for (int i = 0; i < verifyCode.length(); i++) {
             graphics.setColor(COLORS[RANDOM.nextInt(COLORS.length)]);
-            desX = i * distance+18;
-            graphics.drawString(Character.toString(verifyCode.charAt(i)), desX,desY+ RANDOM.nextInt(desY%10));
+            desX = i * distance + 18;
+            graphics.drawString(Character.toString(verifyCode.charAt(i)), desX, desY + RANDOM.nextInt(desY % 10));
         }
 //        绘制干扰线
         for (int x = 0; x < 6; x++) {

src/main/java/com/scbfkj/uni/library/RequestUtil.java

@@ -6,28 +6,29 @@ import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_SESSION;
 
 public class RequestUtil {
+    private RequestUtil(){}
+    public final static String APP_ID = "appid";
 
     public static String getIpAddr() {
 //        请求
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
         HttpServletRequest request = requestAttributes.getRequest();
         String ip = request.getHeader("x-forwarded-for");
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+        String unknown = "unknown";
+        if (ip == null || ip.isEmpty() || unknown.equalsIgnoreCase(ip)) {
             ip = request.getHeader("Proxy-Client-IP");
         }
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+        if (ip == null || ip.isEmpty() || unknown.equalsIgnoreCase(ip)) {
             ip = request.getHeader("WL-Proxy-Client-IP");
         }
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+        if (ip == null || ip.isEmpty() || unknown.equalsIgnoreCase(ip)) {
             ip = request.getRemoteAddr();
         }
         return ip;
@@ -50,11 +51,11 @@ public class RequestUtil {
     public static String getAppId() throws Exception {
 //        请求
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
-        Object appid = requestAttributes.getAttribute("appid", SCOPE_SESSION);
-        if(Objects.nonNull(appid)) {
-            return  appid.toString();
+        Object appid = requestAttributes.getAttribute(APP_ID, SCOPE_SESSION);
+        if (Objects.nonNull(appid)) {
+            return appid.toString();
         }
-        return getApplication().get("appid").toString();
+        return getApplication().get(APP_ID).toString();
 
     }
 
@@ -67,24 +68,21 @@ public class RequestUtil {
             String appToken = getAppToken();
             String requestIp = getIpAddr();
             String query = "select * from appconnectlog where apptoken=? and requestip =?";
-            List<Map<String, Object>> appConnectLogList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-                add(new Object[]{appToken, requestIp});
-            }});
+            List<Map<String, Object>> appConnectLogList = DataBase.query(Config.getSecurityConnectionStr(), query,
+                    appToken, requestIp);
             if (appConnectLogList.isEmpty()) {
                 throw new RuntimeException("当前连接未登录");
             }
             Map<String, Object> stringObjectMap = appConnectLogList.get(0);
-            Object applicationid = stringObjectMap.get("appid");
+            Object applicationid = stringObjectMap.get(APP_ID);
 
             query = "select * from application where appid=?";
-            List<Map<String, Object>> applicationList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-                add(new Object[]{applicationid});
-            }});
+            List<Map<String, Object>> applicationList = DataBase.query(Config.getSecurityConnectionStr(), query, applicationid);
             if (applicationList.isEmpty()) {
                 throw new RuntimeException("获取应用失败");
             }
             Map<String, Object> app = applicationList.get(0);
-            requestAttributes.setAttribute("application",app, SCOPE_SESSION);
+            requestAttributes.setAttribute("application", app, SCOPE_SESSION);
             return app;
         }
         return (Map<String, Object>) application;

src/main/java/com/scbfkj/uni/library/UniReturnUtil.java

@@ -7,6 +7,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class UniReturnUtil {
+    private UniReturnUtil() {
+    }
 
     public static Map<String, Object> success(Object data) {
         HashMap<String, Object> result = new HashMap<>();
@@ -31,10 +33,11 @@ public class UniReturnUtil {
         }
         return result;
     }
+
     public static Map<String, Object> fail(String message, Object returnData) {
         Map<String, Object> result = fail(message);
         if (Objects.nonNull(returnData)) {
-            result.put("returnData",returnData);
+            result.put("returnData", returnData);
         }
         return result;
     }
@@ -65,8 +68,10 @@ public class UniReturnUtil {
         return result;
     }
 
-    public static String getMessage(Throwable e){
+    public static String getMessage(Throwable e) {
         String detailMessage = Arrays.stream(e.getStackTrace()).limit(8).map(it -> "%s.%s:%s".formatted(it.getClassName(), it.getMethodName(), it.getLineNumber())).collect(Collectors.joining("\n"));
-        return "异常消息：%s\n 错误详情:%s".formatted(e.getMessage(),detailMessage);
+        return """
+                异常消息：%s 错误详情:%s
+                """.formatted(e.getMessage(), detailMessage);
     }
 }

src/main/java/com/scbfkj/uni/library/script/DatabaseScriptUtil.java

@@ -81,7 +81,7 @@ public class DatabaseScriptUtil {
                     }
                     values.add(objects.toArray());
                 }
-                List<Map<String, Object>> result = DataBase.query(connectionStr, expression, values);
+                List<Map<String, Object>> result = DataBase.queryBatch(connectionStr, expression, values);
                 return UniReturnUtil.success(result);
 //                更新或新增
             } else if (Objects.equals("6", event)) {
@@ -212,12 +212,12 @@ public class DatabaseScriptUtil {
                 sql = "select %s from (%s) as T".formatted(String.join(",", filterColumns), sql);
             }
 
-            List<Map<String, Object>> queryResult = DataBase.query(connectionStr, sql, Collections.singletonList(dbFilter.toArray()));
+            List<Map<String, Object>> queryResult = DataBase.queryBatch(connectionStr, sql, Collections.singletonList(dbFilter.toArray()));
             return UniReturnUtil.success(queryResult);
 
         } else {
             if (Objects.equals(event, "0")) {
-                List<Map<String, Object>> queryResult = DataBase.query(connectionStr, expression, args, filterColumns, filterLines);
+                List<Map<String, Object>> queryResult = query(connectionStr, expression, args, filterColumns, filterLines);
                 return UniReturnUtil.success(queryResult);
             } else if (Objects.equals(event, "1")) {
                 if (sqlStrVarList.containsKey(expression)) {
@@ -261,9 +261,70 @@ public class DatabaseScriptUtil {
     }
 
     private static boolean exists(String connectionStr, String sql, Object[] args) throws Exception {
-        List<Map<String, Object>> mapList = DataBase.query(connectionStr, sql, Collections.singletonList(args));
+        List<Map<String, Object>> mapList = DataBase.queryBatch(connectionStr, sql, Collections.singletonList(args));
         if (mapList.isEmpty()) return false;
         return !Objects.equals(mapList.get(0).get("existscount").toString(), "0");
     }
 
+    public static List<Map<String, Object>> query(String connectionStr, String sql, List<Map<String, Object>> argsList, List<String> filterColumns, List<Map<String, Object>> filterLines) throws Exception {
+
+        sql = sql.replaceAll("(\\r)?\\n", " ");
+        String filterLineWhereStr = null;
+        for (Object f : filterLines) {
+            Map<String, Object> it = ((Map<String, Object>) f);
+            Object comparator = it.get("comparator");
+            filterLineWhereStr = " %s %s %s %s %s %s %s %s ".formatted(
+                    filterLineWhereStr,
+                    it.getOrDefault("left", ""),
+                    it.get("column"),
+                    comparator,
+                    Objects.equals(comparator, " is null ") ? "" : "?",
+                    !Objects.equals(comparator, " is null ") ? " " : it.get("value"),
+                    it.getOrDefault("right", ""),
+                    it.getOrDefault("connector", "")
+            );
+        }
+        if (Objects.nonNull(filterLineWhereStr)) {
+            sql = " %s %s and %s ".formatted(sql, sql.contains(" where ") ? " 1 = 1" : " where ", Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+        }
+        if (Objects.nonNull(filterColumns) && !filterColumns.isEmpty()) {
+            sql = "select %s from ( %s ) T".formatted(String.join(",", filterColumns), sql);
+        }
+
+        List<List<Object>> result = new ArrayList<>();
+
+        List<String> names = DatabaseScriptUtil.getSQLVarList(sql);
+        String newSql = DatabaseScriptUtil.sqlStrNewSQL.get(sql);
+
+        if (names.size() == 1 && names.contains("whereStr")) {
+            List<Map<String, Object>> list = new ArrayList<>();
+            for (Map<String, Object> stringObjectMap : argsList) {
+                List<Object> args = new ArrayList<>();
+                StringJoiner joiner = new StringJoiner(" and ");
+                for (Map.Entry<String, Object> entry : stringObjectMap.entrySet()) {
+                    String formatted = "%s = ?".formatted(entry.getKey());
+                    args.add(entry.getValue());
+                    joiner.add(formatted);
+                }
+                String whereStr = " " + joiner;
+                String sqlStr = sql.replace("《whereStr》", whereStr);
+                List<Map<String, Object>> apply = DataBase.queryBatch(connectionStr, sqlStr, new ArrayList<>() {{
+                    add(args.toArray());
+                }});
+                list.addAll(apply);
+            }
+            return list;
+        } else {
+            for (Map<String, Object> map : argsList) {
+                List<Object> args = new ArrayList<>();
+                map = ((Map<String, Object>) map.getOrDefault("filter", map));
+                for (String name : names) {
+                    args.add(map.get(name));
+                }
+                result.add(args);
+            }
+            return DataBase.queryBatch(connectionStr, newSql, result.stream().map(List::toArray).toList());
+        }
+    }
+
 }

src/main/java/com/scbfkj/uni/library/script/JsScriptEngineUtil.java

@@ -11,6 +11,9 @@ import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Map;
 import java.util.Objects;
 
@@ -42,12 +45,46 @@ public final class JsScriptEngineUtil {
     }, new GenericKeyedObjectPoolConfig<>());
 
 
-    public static Map<String,Object> eval(String script, Object... args) throws Exception {
+    public static Map<String, Object> eval(String script, Object... args) throws Exception {
         Value function = null;
         try {
-        function = scriptPool.borrowObject(script);
+            function = scriptPool.borrowObject(script);
             if (function.canExecute()) {
                 Value result = function.execute(args);
+                if (result.isString()) {
+                    return UniReturnUtil.success(result.asString());
+                } else if (result.isBoolean()) {
+                    return UniReturnUtil.success(result.asBoolean());
+                } else if (result.isNumber()) {
+                    if (result.fitsInShort()) {
+                        return UniReturnUtil.success(result.asShort());
+                    }
+                    if (result.fitsInInt()) {
+                        return UniReturnUtil.success(result.asInt());
+                    }
+                    if (result.fitsInLong()) {
+                        return UniReturnUtil.success(result.asLong());
+                    }
+                    if (result.fitsInFloat()) {
+                        return UniReturnUtil.success(result.asFloat());
+                    }
+                    if (result.fitsInDouble()) {
+                        return UniReturnUtil.success(result.asDouble());
+                    }
+                    if (result.fitsInBigInteger()) {
+                        return UniReturnUtil.success(result.asBigInteger());
+                    }
+                    if (result.fitsInByte()) {
+                        return UniReturnUtil.success(result.asByte());
+                    }
+                } else if (result.isInstant()) {
+                    Instant instant = result.asInstant();
+                    return UniReturnUtil.success(LocalDateTime.now(ZoneId.from(instant)));
+                } else if (result.isNull()) {
+                    return UniReturnUtil.success(null);
+                } else if (result.isHostObject()) {
+                    return UniReturnUtil.success(result.asHostObject());
+                }
                 return UniReturnUtil.success(toString(result));
             } else {
                 return UniReturnUtil.success(toString(function));
@@ -56,7 +93,7 @@ public final class JsScriptEngineUtil {
             throw new RuntimeException(e);
         } finally {
             if (Objects.nonNull(function)) {
-                    scriptPool.returnObject(script, function);
+                scriptPool.returnObject(script, function);
 
             }
         }

src/main/java/com/scbfkj/uni/process/DataBase.java

@@ -2,7 +2,6 @@ package com.scbfkj.uni.process;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.scbfkj.uni.library.DataFormatUtil;
-import com.scbfkj.uni.library.script.DatabaseScriptUtil;
 import com.scbfkj.uni.system.Config;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.pool.HikariPool;
@@ -19,7 +18,7 @@ public class DataBase {
     public final static Map<String, HikariPool> dataSourcePools = new HashMap<>();
 
 
-    public static List<Map<String, Object>> query(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
+    public static List<Map<String, Object>> queryBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
 
 //        缓存数据 connectionStr + sql
 
@@ -54,15 +53,63 @@ public class DataBase {
 
         String querySql = "select * from datacache where 1=?";
         if (!Objects.equals(querySql, sql)) {
-            cacheConfigList = query(Config.centerConnectionStr, querySql, Collections.singletonList(new Object[]{1}));
+            cacheConfigList = query(Config.getCenterConnectionStr(), querySql, 1);
         }
         cacheConfigList.stream().filter(it -> Objects.equals(it.get("querysql"), sql) && Objects.equals(it.get("connectset"), connectionStr)).findFirst().ifPresent(it -> {
             Object o = it.get(effectivedurationColumnName);
             LocalDateTime localDateTime = LocalDateTime.now().plusSeconds(Long.parseLong(o.toString()));
-            cacheDatas.put(key, new HashMap<>() {{
-                put(effectivedurationColumnName, localDateTime);
-                put("data", result);
-            }});
+            HashMap<String, Object> data = new HashMap<>();
+            data.put(effectivedurationColumnName, localDateTime);
+            data.put("data", result);
+            cacheDatas.put(key, data);
+        });
+        return result;
+    }
+
+
+    public static List<Map<String, Object>> query(String connectionStr, String sql, Object... args) throws Exception {
+
+//        缓存数据 connectionStr + sql
+
+        String key = "%s;%s;%s".formatted(connectionStr, sql, DataFormatUtil.toString(args));
+        String effectivedurationColumnName = "effectiveduration";
+        if (cacheDatas.containsKey(key)) {
+            Map<String, Object> cacheData = cacheDatas.get(key);
+
+            Object effectiveduration = cacheData.get(effectivedurationColumnName);
+            if (Objects.isNull(effectiveduration) || ((LocalDateTime) effectiveduration).isBefore(LocalDateTime.now())) {
+                cacheDatas.remove(key);
+            } else {
+                return ((List<Map<String, Object>>) cacheData.get("data"));
+            }
+
+        }
+
+        HikariPool dataSourcePool = getDataSourcePool(connectionStr);
+        List<Map<String, Object>> result;
+        try (Connection connection = dataSourcePool.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement(sql)
+        ) {
+            for (int i = 0; i < args.length; i++) {
+                preparedStatement.setObject(i + 1, args[i]);
+            }
+            ResultSet resultSet = preparedStatement.executeQuery();
+            result = getResult(connectionStr, sql, resultSet);
+        } catch (Exception exception) {
+            throw new RuntimeException("数据异常: %s\n sql: %s ;\n args: %s ".formatted(exception.getMessage(), sql, DataFormatUtil.toDate(args)));
+        }
+
+        String querySql = "select * from datacache where 1=?";
+        if (!Objects.equals(querySql, sql)) {
+            cacheConfigList = query(Config.getCenterConnectionStr(), querySql, 1);
+        }
+        cacheConfigList.stream().filter(it -> Objects.equals(it.get("querysql"), sql) && Objects.equals(it.get("connectset"), connectionStr)).findFirst().ifPresent(it -> {
+            Object o = it.get(effectivedurationColumnName);
+            LocalDateTime localDateTime = LocalDateTime.now().plusSeconds(Long.parseLong(o.toString()));
+            HashMap<String, Object> data = new HashMap<>();
+            data.put(effectivedurationColumnName, localDateTime);
+            data.put("data", result);
+            cacheDatas.put(key, data);
         });
         return result;
     }
@@ -88,7 +135,7 @@ public class DataBase {
                 connection.commit();
             } catch (SQLException e) {
                 connection.rollback();
-                throw new RuntimeException(e.getMessage());
+                throw e;
             }
 
             return result;
@@ -111,11 +158,14 @@ public class DataBase {
         }
     }
 
-    public static boolean baseUpdate(String connectionStr, String sql) throws Exception {
+    public static boolean update(String connectionStr, String sql, Object... args) throws Exception {
         HikariPool dataSourcePool = getDataSourcePool(connectionStr);
         try (Connection connection = dataSourcePool.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement(sql)
         ) {
+            for (int i = 0; i < args.length; i++) {
+                preparedStatement.setObject(i + 1, args[i]);
+            }
             boolean execute = preparedStatement.execute();
             connection.commit();
             return execute;
@@ -123,68 +173,6 @@ public class DataBase {
     }
 
 
-    public static List<Map<String, Object>> query(String connectionStr, String sql, List<Map<String, Object>> argsList, List<String> filterColumns, List<Map<String, Object>> filterLines) throws Exception {
-
-        sql = sql.replaceAll("(\\r)?\\n", " ");
-        String filterLineWhereStr = null;
-        for (Object f : filterLines) {
-            Map<String, Object> it = ((Map<String, Object>) f);
-            Object comparator = it.get("comparator");
-            filterLineWhereStr = " %s %s %s %s %s %s %s %s ".formatted(
-                    filterLineWhereStr,
-                    it.getOrDefault("left", ""),
-                    it.get("column"),
-                    comparator,
-                    Objects.equals(comparator, " is null ") ? "" : "?",
-                    !Objects.equals(comparator, " is null ") ? " " : it.get("value"),
-                    it.getOrDefault("right", ""),
-                    it.getOrDefault("connector", "")
-            );
-        }
-        if (Objects.nonNull(filterLineWhereStr)) {
-            sql = " %s %s and %s ".formatted(sql, sql.contains(" where ") ? " 1 = 1" : " where ", Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
-        }
-        if (Objects.nonNull(filterColumns) && !filterColumns.isEmpty()) {
-            sql = "select %s from ( %s ) T".formatted(String.join(",", filterColumns), sql);
-        }
-
-        List<List<Object>> result = new ArrayList<>();
-
-        List<String> names = DatabaseScriptUtil.getSQLVarList(sql);
-        String newSql = DatabaseScriptUtil.sqlStrNewSQL.get(sql);
-
-        if (names.size() == 1 && names.contains("whereStr")) {
-            List<Map<String, Object>> list = new ArrayList<>();
-            for (Map<String, Object> stringObjectMap : argsList) {
-                List<Object> args = new ArrayList<>();
-                StringJoiner joiner = new StringJoiner(" and ");
-                for (Map.Entry<String, Object> entry : stringObjectMap.entrySet()) {
-                    String formatted = "%s = ?".formatted(entry.getKey());
-                    args.add(entry.getValue());
-                    joiner.add(formatted);
-                }
-                String whereStr = " " + joiner;
-                String sqlStr = sql.replace("《whereStr》", whereStr);
-                List<Map<String, Object>> apply = query(connectionStr, sqlStr, new ArrayList<>() {{
-                    add(args.toArray());
-                }});
-                list.addAll(apply);
-            }
-            return list;
-        } else {
-            for (Map<String, Object> map : argsList) {
-                List<Object> args = new ArrayList<>();
-                map = ((Map<String, Object>) map.getOrDefault("filter", map));
-                for (String name : names) {
-                    args.add(map.get(name));
-                }
-                result.add(args);
-            }
-            return query(connectionStr, newSql, result.stream().map(List::toArray).toList());
-        }
-    }
-
-
     public static HikariPool getDataSourcePool(String connectionStr) throws Exception {
         if (dataSourcePools.containsKey(connectionStr)) {
             return dataSourcePools.get(connectionStr);

src/main/java/com/scbfkj/uni/service/ControlService.java

@@ -3,74 +3,85 @@ package com.scbfkj.uni.service;
 import com.scbfkj.uni.library.DataAliasGetUtil;
 import com.scbfkj.uni.library.DataFormatUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
-import com.scbfkj.uni.library.script.DatabaseScriptUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.system.Config;
 import com.scbfkj.uni.system.ScheduleUtil;
 
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class ControlService {
 
+    private final static String SERVICEINFO_WHERE_CONTAINERCODE = "select serviceid from serviceinfo where containercode=? ";
 
-    public static void stopServiceByContainerCode() throws Exception {
+    private final static String SERVICE_ID = "serviceid";
+    private final static String CODE = "code";
+
+    public static Map<String, Object> stopServiceByContainerCode() {
 
 //        查询服务类型为主动采集的服务
-        String queryServiceInfos = "select * from serviceinfo where containercode=? ";
-        List<Map<String, Object>> serviceInfos = DataBase.query(Config.centerConnectionStr, queryServiceInfos, Collections.singletonList(new Object[]{Config.containerCode}));
+
+        try {
+            List<Map<String, Object>> serviceInfos = DataBase.query(Config.getCenterConnectionStr(), SERVICEINFO_WHERE_CONTAINERCODE, Config.getContainerCode());
 //        循环启动
-        for (Map<String, Object> serviceInfo : serviceInfos) {
-            stop(serviceInfo.get("serviceid").toString());
+
+            Map<String, List<Map<String, Object>>> results = serviceInfos.stream()
+                    .map(it -> stop(it.get(SERVICE_ID).toString()))
+                    .collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
+            return UniReturnUtil.success(results);
+        } catch (Exception e) {
+            return UniReturnUtil.fail(e);
         }
     }
 
-    public static void startServiceByContainerCode() throws Exception {
+    public static Map<String, Object> startServiceByContainerCode() {
 
 //        查询服务类型为主动采集的服务
-        String queryServiceInfos = "select * from serviceinfo where containercode=? ";
-        List<Map<String, Object>> serviceInfos = DataBase.query(Config.centerConnectionStr, queryServiceInfos, Collections.singletonList(new Object[]{Config.containerCode}));
-//        循环启动
-        for (Map<String, Object> serviceInfo : serviceInfos) {
-            start(serviceInfo);
+        try {
+            List<Map<String, Object>> serviceInfos = DataBase.query(Config.getCenterConnectionStr(), SERVICEINFO_WHERE_CONTAINERCODE, Config.getContainerCode());
+            Map<String, List<Map<String, Object>>> results = serviceInfos.stream()
+                    .map(it -> start(it.get(SERVICE_ID).toString()))
+                    .collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
+            return UniReturnUtil.success(results);
+        } catch (Exception e) {
+            return UniReturnUtil.fail(e);
         }
     }
 
     /**
      * 服务启动 主要用于前端或者第三方请求
      *
-     * @param inData
+     * @param serviceId
      * @return
      */
-    public static Map<String, Object> start(Map<String, Object> inData) throws Exception {
-        Optional<String> serviceidOpt = DataAliasGetUtil.getValue("serviceid", inData);
-        if (serviceidOpt.isEmpty()) {
-            throw new RuntimeException("服务编号不能为空");
-        }
-        String serviceId = serviceidOpt.get();
-        List<Map<String, Object>> serviceInfoList = null;
-            serviceInfoList = DataBase.query(Config.centerConnectionStr, "select * from serviceinfo where serviceid=?", Collections.singletonList(new Object[]{serviceId}));
+    public static Map<String, Object> start(String serviceId) {
+        try {
+            List<Map<String, Object>> serviceInfoList = DataBase.query(Config.getCenterConnectionStr(), "select tasktype from serviceinfo where serviceid=?", serviceId);
 
-        if (serviceInfoList.isEmpty()) {
-            return UniReturnUtil.fail("服务%s没有配置".formatted(serviceId));
-        }
-        Map<String, Object> serviceInfo = serviceInfoList.get(0);
-        Object cronexpress = serviceInfo.get("cronexpress");
-        if (Objects.isNull(cronexpress)) {
+            if (serviceInfoList.isEmpty()) {
+                return UniReturnUtil.fail("服务%s没有配置".formatted(serviceId));
+            }
+            Map<String, Object> serviceInfo = serviceInfoList.get(0);
+            Object taskType = serviceInfo.get("tasktype");
+            if (Objects.equals(taskType, "0")) {
 //            设置服务状态为运行中
 
-            updateServiceState(serviceId, "1");
-            return UniReturnUtil.success(null);
-        } else {
-            //启动定时任务：
-            boolean start = ScheduleUtil.startByService(serviceId);
-            if (start) {
-
                 updateServiceState(serviceId, "1");
-                return UniReturnUtil.success("启动成功");
+                return UniReturnUtil.success(null);
             } else {
-                return UniReturnUtil.fail("启动失败");
+                //启动定时任务：
+                boolean start = ScheduleUtil.startService(serviceId);
+                if (start) {
+
+                    updateServiceState(serviceId, "1");
+                    return UniReturnUtil.success("启动成功");
+                } else {
+                    return UniReturnUtil.fail("启动失败");
+                }
             }
+        } catch (Exception e) {
+            return UniReturnUtil.fail(e);
         }
     }
 
@@ -81,30 +92,25 @@ public class ControlService {
      * @param serviceId
      * @return
      */
-    public static Map<String, Object> stop(String serviceId) throws Exception {
-        boolean cancel = ScheduleUtil.cancel(serviceId);
-        updateServiceState(serviceId,"0");
-        return UniReturnUtil.success("停止" + (cancel ? "成功" : "失败"));
+    public static Map<String, Object> stop(String serviceId) {
+        Map<String, Object> cancel = ScheduleUtil.cancel(serviceId);
+
+        boolean isCancel = Objects.equals(cancel.get(CODE), "0");
+        try {
+            if (isCancel)
+                updateServiceState(serviceId, "0");
+        } catch (Exception e) {
+            return UniReturnUtil.fail(e);
+        }
+        return UniReturnUtil.success("停止" + (isCancel ? "成功" : "失败"));
     }
 
     private static void updateServiceState(String serviceId, String state) throws Exception {
-        DatabaseScriptUtil.exec(Config.centerConnectionStr, "servicestate", new ArrayList<>() {{
-            add(new HashMap<>() {{
-                put("value", new HashMap<>() {{
-                    put("serviceid", serviceId);
-                    put("starttime", DataFormatUtil.toString(LocalDateTime.now()));
-                    put("containercode", Config.containerCode);
-                    put("runstate", state);
-
-                }});
-                put("filter", new HashMap<>() {{
-                    put("serviceid", serviceId);
-                    put("containercode", Config.containerCode);
-
-                }});
-
-            }});
-        }}, "6", null, null);
+        DataBase.update(Config.getCenterConnectionStr(), "insert into  servicestate(serviceid,starttime,containercode,runstate) values (?,?,?,?)",
+                serviceId,
+                DataFormatUtil.toString(LocalDateTime.now()),
+                Config.getContainerCode(),
+                state);
     }
 
     /**
@@ -117,7 +123,7 @@ public class ControlService {
      */
 
     public static Map<String, Object> startOrStop(Map<String, Object> params, String statue, boolean all) throws Exception {
-        Optional<String> serviceIdOpt = DataAliasGetUtil.getValue("serviceid", params);
+        Optional<String> serviceIdOpt = DataAliasGetUtil.getValue(SERVICE_ID, params);
         if (serviceIdOpt.isEmpty() && !all) {
             return UniReturnUtil.fail("服务ID不能为空");
         } else if (serviceIdOpt.isPresent()) {
@@ -127,13 +133,11 @@ public class ControlService {
             if (statue.equals("0")) {
                 return stop;
             }
-            List<Map<String, Object>> serviceTypeData = DataBase.query(Config.centerConnectionStr, "select serviceType from serviceinfo where serviceID=? and containercode=? and servicetype='4'", Collections.singletonList(new Object[]{serviceId, Config.containerCode}));
+            List<Map<String, Object>> serviceTypeData = DataBase.query(Config.getCenterConnectionStr(), "select serviceType from serviceinfo where serviceID=? and containercode=? and servicetype='4'", serviceId, Config.getContainerCode());
             if (serviceTypeData.isEmpty()) {
                 throw new RuntimeException("没有找到服务配置");
             }
-            return start(new HashMap<>() {{
-                put("serviceid", serviceId);
-            }});
+            return start(serviceId);
         } else {
             if (Objects.equals(statue, "0")) {
                 stopServiceByContainerCode();

src/main/java/com/scbfkj/uni/service/DataProcessService.java

@@ -37,7 +37,7 @@ public class DataProcessService {
                 throw new RuntimeException("服务编号不能为空");
             serviceId = serviceIdOpt.get();
 
-            List<Map<String, Object>> serviceInfoList = DataBase.query(Config.centerConnectionStr, "select * from serviceinfo where serviceid = ?", Collections.singletonList(new Object[]{serviceId}));
+            List<Map<String, Object>> serviceInfoList = DataBase.query(Config.getCenterConnectionStr(), "select * from serviceinfo where serviceid = ?", serviceId);
             if (!serviceInfoList.isEmpty()) {
                 serviceInfo = serviceInfoList.get(0);
             }
@@ -45,14 +45,14 @@ public class DataProcessService {
 //        熔断
 
             List<Map<String, Object>> algorithmLibraries;
-            algorithmLibraries = DataBase.query(Config.centerConnectionStr, "select * from algorithmlibrary where serviceid=?", Collections.singletonList(new Object[]{serviceId}));
+            algorithmLibraries = DataBase.query(Config.getCenterConnectionStr(), "select * from algorithmlibrary where serviceid=?", serviceId);
 
 
             Optional<String> lifecycleidOpt;
             lifecycleidOpt = DataAliasGetUtil.getValue("lifecycleid", inData);
 
             if (lifecycleidOpt.isEmpty()) {
-                lifecycleid = DataAliasGetUtil.createLifeCycleCol(Config.containerCode, serviceId);
+                lifecycleid = DataAliasGetUtil.createLifeCycleCol(Config.getContainerCode(), serviceId);
                 inData.put("lifecycleid", lifecycleid);
             } else {
                 lifecycleid = lifecycleidOpt.get();
@@ -108,8 +108,8 @@ public class DataProcessService {
                 resource.add(data);
                 Object parameterSet = algorithmLibrary.get("parameterset");
                 Object dataSourceId = algorithmLibrary.get("datasourceid");
-                List<Map<String, Object>> datasourceList = DataBase.query(Config.centerConnectionStr, "select * from datasource where datasourceid=?", Collections.singletonList(new Object[]{dataSourceId}));
-                Map<String, Object> datasource = datasourceList.get(0);
+                List<Map<String, Object>> datasourceList = DataBase.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid=?", dataSourceId);
+                Map<String, Object> datasource = datasourceList.isEmpty()?null: datasourceList.get(0);
 
 //        获取入参列表
                 parameters = new ArrayList<>();
@@ -142,7 +142,7 @@ public class DataProcessService {
             return UniReturnUtil.fail(e);
         } finally {
 //                    不管成功还是失败都记录日志
-            if (Config.debug || Objects.nonNull(serviceInfo) && Objects.equals("1", serviceInfo.get("enablelog"))) {
+            if (Config.isDebug() || Objects.nonNull(serviceInfo) && Objects.equals("1", serviceInfo.get("enablelog"))) {
                 LoggerService.LogType target = LoggerService.LogType.SERVICE;
                 if (Objects.nonNull(message)) {
                     target = LoggerService.LogType.SERVICE_ERR;
@@ -190,8 +190,10 @@ public class DataProcessService {
 //                参数表达式顺序是 数据源连接字符串（String.$.datasource.connectset）,sql表达式(String.$.algorithm.computingexpression)，需要操作的值(List.$.args[1].returnData)，执行编号(String.$.algorithm.executionnumber)
                 return DatabaseScriptUtil.exec(DataFormatUtil.toString(parameters.get(0)), DataFormatUtil.toString(parameters.get(1)), ((List<Map<String, Object>>) parameters.get(2)), parameters.get(3), (List<String>) parameters.get(4), (List<Map<String, Object>>) parameters.get(5));
             }
+            default -> {
+                return UniReturnUtil.fail("算法类型不支持");
+            }
         }
-        return UniReturnUtil.fail("算法类型不支持");
     }
 
 

src/main/java/com/scbfkj/uni/service/LoggerService.java

@@ -35,7 +35,7 @@ public class LoggerService {
 
     }
 
-    private static final String connection = """
+    private static final String CONNECTION = """
             {
               "jdbcUrl": "jdbc:sqlite:%s",
               "driverClassName": "org.sqlite.JDBC",
@@ -45,14 +45,13 @@ public class LoggerService {
     private static String currentFileName;
 
     private final static Set<Long> fileNames = new HashSet<>();
-    private static final String dir = "logs/";
+    private static final String DIR = "logs/";
 
     public static void log(LogType type, Map<String, Object> data) {
-//        if (true) return;
-        long filename = System.currentTimeMillis() / Config.splitCount;
+        long filename = System.currentTimeMillis() / Config.getSplitCount();
         currentFileName = filename + ".sqlite";
-        String filePath = dir + currentFileName;
-        String connectionStr = connection.formatted(filePath);
+        String filePath = DIR + currentFileName;
+        String connectionStr = CONNECTION.formatted(filePath);
         synchronized (fileNames) {
             if (!fileNames.contains(filename)) {
                 if (!new File(filePath).exists()) {
@@ -78,8 +77,7 @@ public class LoggerService {
         }
         try {
             List<Object[]> datas = new ArrayList<>();
-//            List<Map<String, Object>> targets = Config.targets.stream().filter(it -> Objects.equals(it.get(""), type.getName())).toList();
-            List<Map<String, Object>> targets = DataBase.query(Config.centerConnectionStr, "select * from systeminfo where keyname=?", Collections.singletonList(new Object[]{type.getName()}));
+            List<Map<String, Object>> targets = DataBase.query(Config.getCenterConnectionStr(), "select * from systeminfo where keyname=?", type.getName());
             for (Map<String, Object> targetconnection : targets) {
                 datas.add(new Object[]{type.getName(), filePath, targetconnection.get("datasourceid"), targetconnection.get("expression"), DataFormatUtil.toString(data)});
             }
@@ -92,10 +90,10 @@ public class LoggerService {
     public static void sendMessage() {
 //        判断目录
 
-        File file = new File(dir);
+        File file = new File(DIR);
 
 //        过滤出当前不使用的文件
-        List<File> logsFiles = Arrays.stream(file.listFiles())
+        List<File> logsFiles = Arrays.stream(Objects.requireNonNull(file.listFiles()))
                 .filter(logFile -> {
                     String fileName = logFile.getName();
                     return !fileName.equals(currentFileName) && fileName.endsWith("sqlite");
@@ -106,12 +104,12 @@ public class LoggerService {
                 .map(logFile -> {
                     String fileName = logFile.getName();
 //                    转成连接字符串
-                    return connection.formatted(dir + fileName);
+                    return CONNECTION.formatted(DIR + fileName);
                 })
                 .flatMap(connectionStr -> {
 //                    查询数据
                     try {
-                        return DataBase.query(connectionStr, "select * from logs where 1=?", Collections.singletonList(new Object[]{1})).stream();
+                        return DataBase.query(connectionStr, "select * from logs ").stream();
                     } catch (Exception e) {
                         Matcher matcher = Pattern.compile("logs/\\d+\\.sqlite").matcher(connectionStr);
                         if (matcher.find()) {
@@ -120,16 +118,7 @@ public class LoggerService {
                         return Stream.empty();
                     } finally {
 
-                        HikariPool hikariPool = DataBase.dataSourcePools.remove(connectionStr);
-                        if (Objects.nonNull(hikariPool)) {
-                            try {
-                                hikariPool.shutdown();
-                            } catch (InterruptedException e) {
-                                if (Config.debug) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        }
+                        removeDataSource(connectionStr);
                     }
 
 
@@ -151,7 +140,7 @@ public class LoggerService {
 
 //                        解析发送目标连接字符串
                         try {
-                            List<Map<String, Object>> dataSourceList = DataBase.query(Config.centerConnectionStr, "select * from datasource where datasourceid=?", Collections.singletonList(new Object[]{datasourceid}));
+                            List<Map<String, Object>> dataSourceList = DataBase.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid=?", datasourceid);
                             if (dataSourceList.isEmpty()) {
                                 return;
                             }
@@ -187,11 +176,15 @@ public class LoggerService {
                         }
                     });
                 });
+        cleanFile(logsFiles, errorFileNames);
+    }
+
+    private static void cleanFile(List<File> logsFiles, List<String> errorFileNames) {
         logsFiles.stream().filter(f ->
                 errorFileNames.stream().filter(Objects::nonNull).noneMatch(errorFileName ->
                         errorFileName.contains(f.getName()))
         ).forEach(f -> {
-            String connectionStr = connection.formatted(dir + f.getName());
+            String connectionStr = CONNECTION.formatted(DIR + f.getName());
             try {
                 DataBase.exec(connectionStr, "delete  from logs");
                 HikariPool hikariPool = DataBase.dataSourcePools.remove(connectionStr);
@@ -199,26 +192,29 @@ public class LoggerService {
                     hikariPool.shutdown();
 //                删除文件一直不成功 怀疑是数据库连接导致文件被使用导致一直删除不成功
                 f.delete();
-                fileNames.remove(Long.parseLong(f.getName().substring(0,f.getName().indexOf(".sqlite"))));
+                fileNames.remove(Long.parseLong(f.getName().substring(0, f.getName().indexOf(".sqlite"))));
             } catch (Exception e) {
-                if (Config.debug) {
+                if (Config.isDebug()) {
                     e.printStackTrace();
                 } else {
                     System.out.println(UniReturnUtil.getMessage(e));
                 }
             } finally {
+                removeDataSource(connectionStr);
+            }
+        });
+    }
 
-                HikariPool hikariPool = DataBase.dataSourcePools.remove(connectionStr);
-                if (Objects.nonNull(hikariPool)) {
-                    try {
-                        hikariPool.shutdown();
-                    } catch (InterruptedException e) {
-                        if (Config.debug) {
-                            e.printStackTrace();
-                        }
-                    }
+    private static void removeDataSource(String connectionStr) {
+        HikariPool hikariPool = DataBase.dataSourcePools.remove(connectionStr);
+        if (Objects.nonNull(hikariPool)) {
+            try {
+                hikariPool.shutdown();
+            } catch (InterruptedException e) {
+                if (Config.isDebug()) {
+                    e.printStackTrace();
                 }
             }
-        });
+        }
     }
 }

src/main/java/com/scbfkj/uni/service/SecurityService.java

@@ -1,7 +1,6 @@
 package com.scbfkj.uni.service;
 
 import com.scbfkj.uni.library.*;
-import com.scbfkj.uni.library.script.DatabaseScriptUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.system.Config;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,7 +11,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.regex.Pattern;
 
 import static com.scbfkj.uni.library.DataAliasGetUtil.getValue;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
@@ -51,13 +49,10 @@ public class SecurityService {
         Optional<String> appSecret = getValue("appsecret", requestData);
         if (appSecret.isPresent() && appid.isPresent()) {
             String clean = "delete from appconnectlog where expiretime < ? ";
-            DataBase.updateBatch(Config.securityConnectionStr, clean, new ArrayList<>() {{
-                add(new Object[]{LocalDateTime.now()});
-            }});
+            DataBase.update(Config.getSecurityConnectionStr(), clean,
+                    LocalDateTime.now());
             String query = "select * from application where appid = ? and appsecret = ?";
-            List<Map<String, Object>> applicationList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-                add(new Object[]{appid.get(), appSecret.get()});
-            }});
+            List<Map<String, Object>> applicationList = DataBase.query(Config.getSecurityConnectionStr(), query, appid.get(), appSecret.get());
 
             if (applicationList.isEmpty()) {
                 return UniReturnUtil.fail("appid 或 appsecret 错误");
@@ -73,13 +68,13 @@ public class SecurityService {
             LocalDateTime expiresTime = LocalDateTime.now().plusSeconds(apptokeneffective);
             Map<String, Object> data = new HashMap<>();
             String ip = RequestUtil.getIpAddr();
-            List<Map<String, Object>> logs = DataBase.query(Config.securityConnectionStr, "select * from appconnectlog where requestip=? and appid = ?", Collections.singletonList(new Object[]{ip, appid.get()}));
+            List<Map<String, Object>> logs = DataBase.query(Config.getSecurityConnectionStr(), "select * from appconnectlog where requestip=? and appid = ?", ip, appid.get());
             String appToken;
             if (!logs.isEmpty()) {
-                DataBase.updateBatch(Config.securityConnectionStr, """
+                DataBase.update(Config.getSecurityConnectionStr(), """
                                                 update appconnectlog
                         set expiretime = ?,lasttime=?
-                        where connid=?""", Collections.singletonList(new Object[]{expiresTime, LocalDateTime.now(), logs.get(0).get("connid")}));
+                        where connid=?""", expiresTime, LocalDateTime.now(), logs.get(0).get("connid"));
                 Map<String, Object> map = logs.get(0);
                 RequestContextHolder.currentRequestAttributes().setAttribute("application", application, SCOPE_SESSION);
                 appToken = map.get("apptoken").toString();
@@ -88,9 +83,9 @@ public class SecurityService {
                 appToken = DataEncryptionUtil.signatureMD5("%s:%s".formatted(LocalDateTime.now(), sessionId));
                 RequestContextHolder.currentRequestAttributes().setAttribute("appid", appid, SCOPE_SESSION);
 
-                DataBase.updateBatch(Config.securityConnectionStr, """
+                DataBase.update(Config.getSecurityConnectionStr(), """
                                                 insert into appconnectlog (appid, requesttime, requestip, apptoken, expiretime, lasttime)
-                        values (?,?,?,?,?,?)""", Collections.singletonList(new Object[]{appid.get(), LocalDateTime.now(), ip, appToken, expiresTime, LocalDateTime.now()}));
+                        values (?,?,?,?,?,?)""", appid.get(), LocalDateTime.now(), ip, appToken, expiresTime, LocalDateTime.now());
 
             }
             data.put("token", appToken);
@@ -112,15 +107,13 @@ public class SecurityService {
     public Map<String, Object> verifyToken(String appToken) throws Exception {
         String clean = "delete from appconnectlog where expiretime <  ?";
 
-        DataBase.updateBatch(Config.securityConnectionStr, clean, new ArrayList<>() {{
-            add(new Object[]{LocalDateTime.now()});
-        }});
+        DataBase.update(Config.getSecurityConnectionStr(), clean, LocalDateTime.now());
+
 
         String requestIp = RequestUtil.getIpAddr();
         String query = "select * from appconnectlog where apptoken=? and requestip =?";
-        List<Map<String, Object>> appConnectLogList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-            add(new Object[]{appToken, requestIp});
-        }});
+        List<Map<String, Object>> appConnectLogList = DataBase.query(Config.getSecurityConnectionStr(), query,
+                appToken, requestIp);
         Map<String, Object> data = new HashMap<>();
         if (!appConnectLogList.isEmpty()) {
             Map<String, Object> appConnectLog = appConnectLogList.get(0);
@@ -152,9 +145,7 @@ public class SecurityService {
         Map<String, Object> data = new HashMap<>();
         try {
             String update = "update appconnectlog set expiretime=? where apptoken =? and requestip =? and appid=?";
-            DataBase.updateBatch(Config.securityConnectionStr, update, new ArrayList<>() {{
-                add(new Object[]{expiresTime, appToken, RequestUtil.getIpAddr(), appid});
-            }});
+            DataBase.update(Config.getSecurityConnectionStr(), update, expiresTime, appToken, RequestUtil.getIpAddr(), appid);
             data.put("expirestime", DataFormatUtil.toString(expiresTime));
             data.put("token", appToken);
             return UniReturnUtil.success(data);
@@ -250,9 +241,7 @@ public class SecurityService {
         }
 
         String query = "select * from userinfo where  account =? and userpassword=? ";
-        List<Map<String, Object>> userInfoList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-            add(new Object[]{username.get(), DataEncryptionUtil.decryptRSAByPrivateKey(password.get())});
-        }});
+        List<Map<String, Object>> userInfoList = DataBase.query(Config.getSecurityConnectionStr(), query, username.get(), DataEncryptionUtil.decryptRSAByPrivateKey(password.get()));
         if (userInfoList.isEmpty()) {
             return UniReturnUtil.fail("用户名密码错误");
         }
@@ -261,33 +250,25 @@ public class SecurityService {
         RequestContextHolder.currentRequestAttributes().setAttribute("userid", userId, SCOPE_SESSION);
         RequestContextHolder.currentRequestAttributes().setAttribute("userinfo", userInfo, SCOPE_SESSION);
         String query1 = "select * from userloginlog where userid=?";
-        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.securityConnectionStr, query1, new ArrayList<>() {{
-            add(new Object[]{userInfo.get("userid")});
-        }});
+        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query1, userInfo.get("userid"));
 
         Map<String, Object> data = new HashMap<>();
         String appToken = RequestUtil.getAppToken();
         String insert = "insert into userloginlog ( userid, requestip, sessionid, logintime, usertoken, lasttime, lastheartbeat,apptoken,isexpires,appid)values (?,?,?,?,?,?,?,?,0,?)";
         if (userLoginLogList.isEmpty()) {
             data.put("userstatus", "0");
-            DataBase.updateBatch(Config.securityConnectionStr, insert, new ArrayList<>() {{
-                add(new Object[]{userId, ip, sessionId, LocalDateTime.now(), null, LocalDateTime.now(), LocalDateTime.now(), appToken, appId});
-            }});
+            DataBase.update(Config.getSecurityConnectionStr(), insert, userId, ip, sessionId, LocalDateTime.now(), null, LocalDateTime.now(), LocalDateTime.now(), appToken, appId);
         } else {
             Object multilogin = application.get("multilogin");
             if (Objects.equals(DataFormatUtil.toString(multilogin), "1")) {
                 Optional<Map<String, Object>> log = userLoginLogList.stream().filter(it -> it.get("sessionid").equals(sessionId)).findAny();
                 if (log.isEmpty()) {
-                    DataBase.updateBatch(Config.securityConnectionStr, insert, new ArrayList<>() {{
-                        add(new Object[]{userId, ip, sessionId, LocalDateTime.now(), null, LocalDateTime.now(), LocalDateTime.now(), appToken, appId});
-                    }});
+                    DataBase.update(Config.getSecurityConnectionStr(), insert, userId, ip, sessionId, LocalDateTime.now(), null, LocalDateTime.now(), LocalDateTime.now(), appToken, appId);
                 } else {
                     Map<String, Object> map = log.get();
                     if (Objects.isNull(map.get("apptoken"))) {
 
-                        DataBase.updateBatch(Config.securityConnectionStr, "update  userloginlog set apptoken = ? where loginid = ?", new ArrayList<>() {{
-                            add(new Object[]{appToken, map.get("loginid")});
-                        }});
+                        DataBase.update(Config.getSecurityConnectionStr(), "update  userloginlog set apptoken = ? where loginid = ?", appToken, map.get("loginid"));
                     }
                 }
                 data.put("userstatus", "0");
@@ -296,9 +277,7 @@ public class SecurityService {
                 Optional<Map<String, Object>> log = userLoginLogList.stream().filter(it -> it.get("sessionid").equals(sessionId)).findAny();
                 if (log.isEmpty()) {
 
-                    DataBase.updateBatch(Config.securityConnectionStr, insert, new ArrayList<>() {{
-                        add(new Object[]{userId, ip, sessionId, LocalDateTime.now(), null, LocalDateTime.now(), LocalDateTime.now(), appToken, appId});
-                    }});
+                    DataBase.update(Config.getSecurityConnectionStr(), insert, userId, ip, sessionId, LocalDateTime.now(), null, LocalDateTime.now(), LocalDateTime.now(), appToken, appId);
                 }
                 data.put("userstatus", "1");
             }
@@ -321,9 +300,7 @@ public class SecurityService {
         String ip = RequestUtil.getIpAddr();
         String sessionId = RequestUtil.getSessionId();
         String query = "select * from userloginlog where apptoken=? and sessionid=? and requestip=? and isexpires=0 ";
-        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-            add(new Object[]{appToken, sessionId, ip});
-        }});
+        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query, appToken, sessionId, ip);
         if (userLoginLogList.isEmpty()) {
             return UniReturnUtil.fail("登录失败");
         }
@@ -336,9 +313,9 @@ public class SecurityService {
         LocalDateTime expiresTime = LocalDateTime.now().plusSeconds(securityCodeEffective);
         String userToken = DataEncryptionUtil.signatureMD5("%s:%s".formatted(LocalDateTime.now(), sessionId));
         String update = "update userloginlog set apptoken=null,usertoken=?,lasttime=? where  loginid=?";
-        DataBase.updateBatch(Config.securityConnectionStr, update, new ArrayList<>() {{
-            add(new Object[]{userToken, expiresTime, userLoginLog.get("loginid")});
-        }});
+        DataBase.update(Config.getSecurityConnectionStr(), update,
+                userToken, expiresTime, userLoginLog.get("loginid")
+        );
         HashMap<String, Object> data = new HashMap<>();
         data.put("expirestime", expiresTime);
         data.put("usertoken", userToken);
@@ -349,9 +326,7 @@ public class SecurityService {
     public Map<String, Object> checkUserToken(String userToken) throws Exception {
         String sessionId = RequestUtil.getSessionId();
         String query = "select * from userloginlog where isexpires = 0 and usertoken = ? and sessionid = ?";
-        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-            add(new Object[]{userToken, sessionId});
-        }});
+        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query, userToken, sessionId);
         if (userLoginLogList.isEmpty()) {
             return UniReturnUtil.fail("用户登录查询失败");
         }
@@ -381,9 +356,8 @@ public class SecurityService {
         String sessionId = RequestUtil.getSessionId();
         String query = "select * from userloginlog where isexpires=0 and usertoken=? and sessionid=?";
 
-        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-            add(new Object[]{userToken, sessionId});
-        }});
+        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query,
+                userToken, sessionId);
 
         if (userLoginLogList.isEmpty()) {
             return UniReturnUtil.fail("登出失败");
@@ -391,9 +365,9 @@ public class SecurityService {
         Map<String, Object> userLoginLog = userLoginLogList.get(0);
         Object userIdObj = userLoginLog.get("userid");
         String delete = "delete from userloginlog where  userid=?";
-        DataBase.updateBatch(Config.securityConnectionStr, delete, new ArrayList<>() {{
-            add(new Object[]{userIdObj});
-        }});
+        DataBase.update(Config.getSecurityConnectionStr(), delete,
+                userIdObj
+        );
         return UniReturnUtil.success("成功");
     }
 
@@ -405,23 +379,20 @@ public class SecurityService {
         Map<String, Object> userInfo = RequestUtil.getUserInfo();
         Object usergroupid = userInfo.get("usergroupid");
         List<Map<String, Object>> permission;
-        if (Objects.equals("0", usergroupid)) {
+        if (Objects.equals("0", usergroupid.toString())) {
             String query = """
                     select
                            null as userpermissionsid,
                            null as userid,
-                           t.*,
+                           pageconfiguration.*,
                            null as serviceid,
                            null as insetcolumnlist,
                            null as updatecolumnlist,
                            null as selectcolumnlist,
                            null as filterset
                     from
-                        pageconfiguration t
-                    where 1 = ?""";
-            permission = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-                add(new Object[]{1});
-            }});
+                        pageconfiguration""";
+            permission = DataBase.query(Config.getSecurityConnectionStr(), query);
         } else {
             String query = """
                                     select userpermissionsid,
@@ -437,9 +408,7 @@ public class SecurityService {
                     where t3.pageconfigurationid = t1.pageconfigurationid
                       and t1.userid = ?""";
 
-            permission = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-                add(new Object[]{userId});
-            }});
+            permission = DataBase.query(Config.getSecurityConnectionStr(), query, userId);
         }
         return UniReturnUtil.success(permission);
     }
@@ -458,9 +427,9 @@ public class SecurityService {
         } else {
             String userId = RequestUtil.getUserId();
             String update = "update userinfo set userpassword=? where userid=?";
-            DataBase.updateBatch(Config.securityConnectionStr, update, new ArrayList<>() {{
-                add(new Object[]{password, userId});
-            }});
+            DataBase.update(Config.getSecurityConnectionStr(), update,
+                    password, userId
+            );
             return UniReturnUtil.success("成功");
         }
 
@@ -472,9 +441,7 @@ public class SecurityService {
         String userToken = RequestUtil.getUserToken();
         String sessionId = RequestUtil.getSessionId();
         String query = "select * from userloginlog where isexpires=0 and usertoken=? and sessionid=?";
-        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.securityConnectionStr, query, new ArrayList<>() {{
-            add(new Object[]{userToken, sessionId});
-        }});
+        List<Map<String, Object>> userLoginLogList = DataBase.query(Config.getSecurityConnectionStr(), query, userToken, sessionId);
         if (userLoginLogList.isEmpty()) {
             return UniReturnUtil.fail("查询失败");
         } else {
@@ -486,30 +453,28 @@ public class SecurityService {
 //      使用数据库
         LocalDateTime localDateTime = LocalDateTime.now().plusSeconds(securitycodeeffective);
         String insertSql = "insert into tempsecuritycode(appid,requestip,sessionid,securitycode,expiretime) values (?,?,?,?,?)";
-        DataBase.updateBatch(Config.securityConnectionStr, insertSql, new ArrayList<>() {{
-            add(new Object[]{appid, requestIp, sessionId, code, localDateTime});
-        }});
+        DataBase.update(Config.getSecurityConnectionStr(), insertSql,
+                appid, requestIp, sessionId, code, localDateTime
+        );
         String deleteSql = "delete from tempsecuritycode where expiretime < ?";
-        DataBase.updateBatch(Config.securityConnectionStr, deleteSql, new ArrayList<>() {{
-            add(new Object[]{LocalDateTime.now()});
-        }});
+        DataBase.update(Config.getSecurityConnectionStr(), deleteSql,
+                LocalDateTime.now()
+        );
     }
 
     public boolean check(String code, String sessionId, String appid, String requestIp) throws Exception {
 
         String selectSql = "select * from tempsecuritycode where securitycode=? and sessionid=? and appid=? and requestip=?";
-        List<Map<String, Object>> map = DataBase.query(Config.securityConnectionStr, selectSql, new ArrayList<>() {{
-            add(new Object[]{code, sessionId, appid, requestIp});
-        }});
+        List<Map<String, Object>> map = DataBase.query(Config.getSecurityConnectionStr(), selectSql,
+                code, sessionId, appid, requestIp
+        );
         return !map.isEmpty();
 
     }
 
     public void remove(String code, String sessionId, String appid, String requestIp) throws Exception {
         String deleteSql = "delete from tempsecuritycode where securitycode=? and sessionid=? and appid=? and requestip=?";
-        DataBase.updateBatch(Config.securityConnectionStr, deleteSql, new ArrayList<>() {{
-            add(new Object[]{code, sessionId, appid, requestIp});
-        }});
+        DataBase.update(Config.getSecurityConnectionStr(), deleteSql, code, sessionId, appid, requestIp);
 
     }
 

src/main/java/com/scbfkj/uni/system/Config.java

@@ -1,25 +1,77 @@
 package com.scbfkj.uni.system;
 
-import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
-import java.util.*;
 
-@Component
 public class Config {
+    /**
+     * 不能创建这个类
+     */
+    private Config() {
+    }
 
-    public static String centerConnectionStr;
-    public static String securityConnectionStr;
+    private static String centerConnectionStr;
+    private static String securityConnectionStr;
 
     //    是否启动安全验证
-    public static boolean securityEnable;
-    public static boolean debug;
+    private static boolean securityEnable;
+    private static boolean debug;
 
-    public static String containerCode;
+    private static String containerCode;
 
     public static List<Map<String,Object>> targets = new ArrayList<>();
 
     //    本地日志缓存分片 10分钟
-    public static int splitCount = 600000;
+    private static int splitCount = 600000;
 
 
+    public static String getCenterConnectionStr() {
+        return centerConnectionStr;
+    }
+
+    public static void setCenterConnectionStr(String centerConnectionStr) {
+        Config.centerConnectionStr = centerConnectionStr;
+    }
+
+    public static String getSecurityConnectionStr() {
+        return securityConnectionStr;
+    }
+
+    public static void setSecurityConnectionStr(String securityConnectionStr) {
+        Config.securityConnectionStr = securityConnectionStr;
+    }
+
+    public static boolean isSecurityEnable() {
+        return securityEnable;
+    }
+
+    public static void setSecurityEnable(boolean securityEnable) {
+        Config.securityEnable = securityEnable;
+    }
+
+    public static boolean isDebug() {
+        return debug;
+    }
+
+    public static void setDebug(boolean debug) {
+        Config.debug = debug;
+    }
+
+    public static String getContainerCode() {
+        return containerCode;
+    }
+
+    public static void setContainerCode(String containerCode) {
+        Config.containerCode = containerCode;
+    }
+
+    public static int getSplitCount() {
+        return splitCount;
+    }
+
+    public static void setSplitCount(int splitCount) {
+        Config.splitCount = splitCount;
+    }
 }

src/main/java/com/scbfkj/uni/system/ScheduleTask.java

@@ -40,7 +40,7 @@ public class ScheduleTask implements Runnable {
             try {
                 ScheduleUtil.cancel(id);
             } catch (Exception e) {
-                if (Config.debug) {
+                if (Config.isDebug()) {
                     e.printStackTrace();
                 } else {
                     System.out.println(UniReturnUtil.getMessage(e));

src/main/java/com/scbfkj/uni/system/ScheduleUtil.java

@@ -1,33 +1,28 @@
 package com.scbfkj.uni.system;
 
+import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.process.DataBase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
 
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ScheduledFuture;
 
 public class ScheduleUtil {
 
-    private final static Logger logger = LoggerFactory.getLogger(ScheduleUtil.class);
-
 
     private static ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
 
 
     private static Map<String, ScheduledFuture<?>> scheduledFutureMap = new HashMap<>();
-
-    private final static Map<String, Map<String, Object>> serviceInfoesMap = new HashMap<>();
     public static Map<String, ScheduleTask> scheduleTaskMaps = new HashMap<>();
 
     static {
         threadPoolTaskScheduler.setPoolSize(8);
         threadPoolTaskScheduler.initialize();
-       logger.info("定时任务线程池启动");
+        System.out.println("定时任务线程池启动");
     }
 
     /**
@@ -35,21 +30,15 @@ public class ScheduleUtil {
      *
      * @param serviceId 服务id
      */
-    public static boolean startByService(String serviceId) throws Exception {
+    public static boolean startService(String serviceId) throws Exception {
 
-        if (!serviceInfoesMap.containsKey(serviceId)) {
-            //采集数据源及参数配置
-            List<Map<String, Object>> serviceInfos = DataBase.query(Config.centerConnectionStr, "SELECT SI.* FROM  serviceinfo SI WHERE SI.servicetype ='4'  AND serviceid = ?", Collections.singletonList(new Object[]{serviceId}));
+        //采集数据源及参数配置
+        List<Map<String, Object>> serviceInfos = DataBase.query(Config.getCenterConnectionStr(), "SELECT * FROM  serviceinfo  WHERE  serviceid = ?", serviceId);
 
-            if (Objects.isNull(serviceInfos) || serviceInfos.isEmpty()) {
-                throw new RuntimeException("采集服务不存在");
-            }
-            Map<String, Object> serviceInfo = serviceInfos.get(0);
-            serviceInfoesMap.put(serviceId, serviceInfo);
+        if (Objects.isNull(serviceInfos) || serviceInfos.isEmpty()) {
+            throw new RuntimeException("采集服务不存在");
         }
-
-        Map<String, Object> serviceInfo = serviceInfoesMap.get(serviceId); //采集服务
-
+        Map<String, Object> serviceInfo = serviceInfos.get(0);
         Integer loopCount = Objects.isNull(serviceInfo.get("loopcount")) ? null : Integer.parseInt(serviceInfo.get("loopcount").toString());
         Object cronExpress = serviceInfo.get("cronexpress");
         if (Objects.isNull(cronExpress)) {
@@ -68,7 +57,7 @@ public class ScheduleUtil {
         }
         ScheduledFuture<?> scheduledFuture = threadPoolTaskScheduler.schedule(scheduleTask, new CronTrigger(cronExpress.toString()));
         scheduledFutureMap.put(serviceId, scheduledFuture);
-        DataBase.updateBatch(Config.centerConnectionStr, "update serviceinfo set runState = 1 where  serviceid =?", Collections.singletonList(new Object[]{serviceId}));
+        DataBase.update(Config.getCenterConnectionStr(), "update serviceinfo set runState = 1 where  serviceid =?", serviceId);
         return true;
     }
 
@@ -91,7 +80,7 @@ public class ScheduleUtil {
      * @param frequency
      * @return
      */
-    public static boolean startByService(Runnable runnable, long frequency) {
+    public static boolean startService(Runnable runnable, long frequency) {
         threadPoolTaskScheduler.schedule(runnable, new PeriodicTrigger(Duration.ofMillis(frequency)));
         return true;
     }
@@ -101,13 +90,17 @@ public class ScheduleUtil {
      *
      * @param serviceId 定时任务
      */
-    public static boolean cancel(String serviceId) throws Exception {
+    public static Map<String, Object> cancel(String serviceId) {
         System.out.println("关闭定时任务线程 taskId " + serviceId);
         ScheduledFuture<?> scheduledFuture = scheduledFutureMap.remove(serviceId);
         if (scheduledFuture != null && !scheduledFuture.isCancelled()) {
             scheduledFuture.cancel(false);
-            DataBase.updateBatch(Config.centerConnectionStr, "update serviceinfo set runState = 0 where  serviceID =?", Collections.singletonList(new Object[]{serviceId}));
+            try {
+                DataBase.update(Config.getCenterConnectionStr(), "update serviceinfo set runState = 0 where  serviceID =?", serviceId);
+            } catch (Exception e) {
+                return UniReturnUtil.fail(e);
+            }
         }
-        return true;
+        return UniReturnUtil.success(true);
     }
 }

src/main/java/com/scbfkj/uni/system/SpringContextApplication.java

@@ -1,11 +1,8 @@
 package com.scbfkj.uni.system;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
@@ -15,53 +12,40 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SpringContextApplication implements ApplicationContextAware, EnvironmentAware {
-    private static ApplicationContext applicationContext;
-    private static Environment environment;
+    private static ApplicationContext content;
+
+
+    private static Environment env;
+
+    private static void setContent(ApplicationContext content) {
+        SpringContextApplication.content = content;
+    }
+
+    private static void setEnv(Environment env) {
+        SpringContextApplication.env = env;
+    }
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        SpringContextApplication.applicationContext = applicationContext;
+        setContent(applicationContext);
     }
 
     @SuppressWarnings("unchecked")
     public static <T> T getBean(String beanName) throws BeansException {
-        return (T) applicationContext.getBean(beanName);
+        return (T) content.getBean(beanName);
     }
 
     public static <T> T getBean(Class<T> type) throws BeansException {
-        return applicationContext.getBean(type);
-    }
-
-
-    /**
-     * 动态注入单例bean实例
-     *
-     * @param beanName        bean名称
-     * @param singletonObject 单例bean实例
-     * @return 注入实例
-     */
-    public static Object registerSingletonBean(String beanName, Object singletonObject) {
-
-        //将applicationContext转换为ConfigurableApplicationContext
-        ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) applicationContext;
-
-        //获取BeanFactory
-        DefaultListableBeanFactory defaultListableBeanFactory = (DefaultListableBeanFactory) configurableApplicationContext.getAutowireCapableBeanFactory();
-
-        //动态注册bean.
-        defaultListableBeanFactory.registerSingleton(beanName, singletonObject);
-
-        //获取动态注册的bean.
-        return configurableApplicationContext.getBean(beanName);
+        return content.getBean(type);
     }
 
     @Override
     public void setEnvironment(Environment environment) {
-        SpringContextApplication.environment=environment;
+        setEnv(environment);
     }
 
     public static String getString(String key) {
-        return environment.getProperty(key);
+        return env.getProperty(key);
     }
 
 }

src/main/java/com/scbfkj/uni/system/SystemInit.java

@@ -7,24 +7,23 @@ import com.scbfkj.uni.service.LoggerService;
 import jakarta.annotation.PostConstruct;
 import org.flywaydb.core.Flyway;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ResourceUtils;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.net.URL;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Objects;
 import java.util.Scanner;
 
 
 @Component
 public class SystemInit {
 
+    private final ResourcePatternResolver resourcePatternResolver;
+
 
     @Value("${db.center.config}")
     private String centerConfig;
@@ -41,22 +40,27 @@ public class SystemInit {
     @Value("${app.debug:false}")
     private boolean debug = true;
 
+    public SystemInit(ResourcePatternResolver resourcePatternResolver) {
+        this.resourcePatternResolver = resourcePatternResolver;
+    }
+
     @PostConstruct
     public void init() throws Exception {
-        Config.containerCode = containerCode;
-        Config.securityEnable = securityEnable;
-        Config.debug = debug;
-        Config.centerConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(centerConfig);
-        Config.securityConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(securityConfig);
-        migrateDB();
+        Config.setContainerCode(containerCode);
+        Config.setSecurityEnable(securityEnable);
+        Config.setDebug(debug);
+        Config.setCenterConnectionStr(DataEncryptionUtil.decryptRSAByPrivateKey(centerConfig));
+        Config.setSecurityConnectionStr(DataEncryptionUtil.decryptRSAByPrivateKey(securityConfig));
+//        初始化数据结构
+//        migrateDB();
 
 //        日志配置初始化
-        Config.targets.addAll(DataBase.query(Config.centerConnectionStr, "select * from systeminfo where 1=?", Collections.singletonList(new Object[]{1})));
+        Config.targets.addAll(DataBase.query(Config.getCenterConnectionStr(), "select * from systeminfo"));
 
         initializeSystemEnvironment();
         ControlService.startServiceByContainerCode();
 //        日志任务
-        ScheduleUtil.startByService(LoggerService::sendMessage, 100);
+        ScheduleUtil.startService(LoggerService::sendMessage, 100);
 //        LoggerService.logSystemError(LocalDateTime.now(), "", "");
         LoggerService.log(LoggerService.LogType.SYSTEM, new HashMap<>() {{
             put("occurrencetime", LocalDateTime.now());
@@ -85,18 +89,21 @@ public class SystemInit {
             }
         }
         readConfigFile();
-        cleanRemoteConfig();
+//        cleanRemoteConfig(Config.getCenterConnectionStr(),"classpath:sql/systemset/*");
+//        cleanRemoteConfig(Config.getSecurityConnectionStr(),"classpath:sql/uniauth/*");
         ControlService.startServiceByContainerCode();
     }
 
     private String readConfigFile() throws Exception {
         File resource = new File("config");
         if (resource.exists()) {
-            BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(resource));
-            byte[] bytes = new byte[1024];
-            StringBuilder builder = new StringBuilder();
-            while (inputStream.read(bytes) > 0) {
-                builder.append(new String(bytes));
+            StringBuilder builder;
+            try (BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(resource))) {
+                byte[] bytes = new byte[1024];
+                builder = new StringBuilder();
+                while (inputStream.read(bytes) > 0) {
+                    builder.append(new String(bytes));
+                }
             }
             String string = builder.toString();
             return DataEncryptionUtil.decryptRSAByPrivateKey(string);
@@ -108,31 +115,34 @@ public class SystemInit {
     /**
      * 清理远程数据配置
      */
-    private void cleanRemoteConfig() throws Exception {
-        URL url = ResourceUtils.getURL("classpath:sql");
-        File file = new File(url.getPath());
-        removeRemoteData();
-        if (file.exists()) {
-            if (!file.isFile()) {
-                for (File listFile : file.listFiles()) {
-                    String sqls = readFileToString(listFile);
-                    for (String sql : sqls.split(";")) {
-                        if (!sql.trim().isEmpty()) {
-                            DataBase.baseUpdate(Config.centerConnectionStr, sql);
-                        }
+    private void cleanRemoteConfig(String connection,String path) throws Exception {
+
+
+        Resource[] resources = resourcePatternResolver.getResources(path);
+
+        for (Resource resource : resources) {
+
+            StringBuilder stringBuilder = new StringBuilder();
+            try (InputStream inputStream = resource.getInputStream();
+                 BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
+                String line;
+                while ((line = bufferedReader.readLine()) != null) {
+                    stringBuilder.append(line);
+                }
+            }
+            for (String sql : stringBuilder.toString().split(";")) {
+                if (!sql.trim().isEmpty()) {
+                    if(Config.isDebug()) {
+                        System.out.printf("执行语句：%s%n", sql);
                     }
+                    DataBase.update(connection, sql);
                 }
             }
         }
-    }
-
-    /**
-     * 删除远程数据库
-     */
-    private void removeRemoteData() {
 
     }
 
+
     public static String readFileToString(File file) {
         StringBuilder content = new StringBuilder();
         try (Scanner scanner = new Scanner(file)) {
@@ -140,7 +150,7 @@ public class SystemInit {
                 content.append(scanner.nextLine());
             }
         } catch (FileNotFoundException e) {
-            if (Config.debug) {
+            if (Config.isDebug()) {
                 e.printStackTrace();
             }
         }
@@ -153,9 +163,9 @@ public class SystemInit {
      * @throws Exception
      */
     private void migrateDB() throws Exception {
-        Flyway systemSetFlyway = Flyway.configure().dataSource(DataBase.getDataSourcePool(Config.centerConnectionStr).getUnwrappedDataSource()).locations("db/systemset").baselineOnMigrate(true).load();
+        Flyway systemSetFlyway = Flyway.configure().dataSource(DataBase.getDataSourcePool(Config.getCenterConnectionStr()).getUnwrappedDataSource()).locations("db/systemset").baselineOnMigrate(true).load();
         systemSetFlyway.migrate();
-        Flyway uniAuthFlyway = Flyway.configure().dataSource(DataBase.getDataSourcePool(Config.securityConnectionStr).getUnwrappedDataSource()).locations("db/uniauth").baselineOnMigrate(true).load();
+        Flyway uniAuthFlyway = Flyway.configure().dataSource(DataBase.getDataSourcePool(Config.getSecurityConnectionStr()).getUnwrappedDataSource()).locations("db/uniauth").baselineOnMigrate(true).load();
         uniAuthFlyway.migrate();
     }
 }

src/main/resources/application.properties

@@ -2,4 +2,5 @@ db.center.config=hLcDKcDr4MgqYdb8j0gF0nF806yUy1UdEp1nmztEdo5rNL8IZliDj7/feOp2Fc7
 db.security.config=Jnj84d14EmSgKEXyAbSH+bratWGkpV89/VA5Er4yQOt7qlnKtGYJzBVJNNYMBdmSlW0G+nqDHMhJQcmHrwbjjChYuGeDcmKSRmvFQ9u7LwqmgEfazzKKoVawXmJ40dMsec2yaFyNnCM92xn1hzHvle5BL7x3kza2htGm+iOqO7Y=
 #log.target=B7xSbq4imA5zapX8kEO42mU/5sA2TyF/Ba2Y/++F3z9Np7iT4ywDUkbRC4w/Xrxv1kMSR8PQMJ4dfYwc3mYj0SJJivN5A5/6hI+ZSQBabfZZrYwaIIRdM1XIk4wo1SIrSCXKzef8X6YUH70R2tnh+Uq6KNNp08KaZ2ZXM8vX5Ss=
 server.port=9500
-app.container.code=dev
+app.container.code=dev
+spring.profiles.default=${ACTIVE:default}

src/main/resources/db/uniauth/V1_1__create_page_configuration_table.sql

@@ -0,0 +1,45 @@
+create table if not exists pageconfiguration
+(
+    pageconfigurationid          int auto_increment
+        primary key,
+    pagetype                     tinytext not null comment '类型（模块、页面、按钮、Table表格、树、数据项、From表单）',
+    superiorid                   int      null comment '上级编号',
+    pagename                     tinytext not null comment '名称',
+    pagecode                     tinytext not null comment '编码',
+    pagedescribe                 tinytext null comment '描述',
+    serviceid                    int      null comment '绑定服务编号',
+    shortcutkeys                 tinytext null comment '快捷键(核心用于按钮)',
+    openmode                     tinytext null comment '打开方式（新页、弹出或抽屉、同页关联查询）',
+    pageroute                    tinytext null comment '路由',
+    pageaddress                  tinytext null comment '地址',
+    passparameters               tinytext null comment '传递参数',
+    defaultfilter                tinytext null comment '页面打开时的默认查询条件',
+    pageicon                     tinytext null comment '图标',
+    rowbackgroundcolorexpression tinytext null comment '行背景色表达式',
+    rowfontcolorexpression       tinytext null comment '行字体色表达式',
+    datatype                     tinytext null comment '渲染类型',
+    datalength                   int      null comment '数据长度',
+    isdisplay                    int      null comment '是否显示',
+    displaynumber                int      null comment '显示顺序',
+    displaywidth                 int      null comment '显示宽度',
+    backgroundcolorexpression    tinytext null comment '背景色表达式',
+    fontcolorexpression          tinytext null comment '字体色表达式',
+    enablesort                   int      null comment '启用排序功能',
+    enablefilter                 int      null comment '启用过滤功能',
+    enablegroup                  int      null comment '是否分组',
+    enablecount                  int      null comment '启用合计',
+    counttopmost                 int      null comment '合计置顶',
+    isfiltercolumn               int      null comment '是否为查询条件',
+    isprimarykey                 int      null comment '是否主键',
+    defaultparameters            tinytext null comment '默认查询参数',
+    dropdownlist                 tinytext null comment '下来列表（服务编号）',
+    dropdownlistid               tinytext null comment '下来列表键值',
+    dropdownlistlabel            tinytext null comment '下来列表显示名称',
+    isrequired                   int      null comment '是否必填',
+    uniquitytype                 tinytext null comment '唯一性',
+    formatrule                   tinytext null comment '格式校验规则',
+    defaultvalue                 tinytext null comment '默认值',
+    calculationformula           tinytext null comment '计算公式',
+    servicetype                  int      null comment '服务类型'
+);
+

src/main/resources/sql/init.sql

@@ -1,54 +0,0 @@
-delete from serviceinfo where serviceid <= 18;
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency)
-VALUES (1, 'application', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (2, 'pageconfiguration', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (3, 'tableconfiguration', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (4, 'usergroup', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (5, 'userinfo', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (6, 'usergrouppermissions', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (7, 'userpermissions', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (8, 'apiinfo', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (9, 'applicationpermissions', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (10, 'ratelimitrule', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (11, 'container', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (12, 'datasource', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (13, 'servicetype', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (14, 'serviceinfo', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (15, 'algorithmlibrary', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (16, 'systeminfo', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (17, 'keyalias', 1, 'dev', null, null, null, null, null, null, null);
-INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,
-                         nullresultparameters, autonotification, loopcount, frequency)
-VALUES (18, 'datacache', 1, 'dev', null, null, null, null, null, null, null);

src/main/resources/sql/systemset/add_serviceinfo.sql

@@ -0,0 +1,19 @@
+delete from serviceinfo where serviceid <= 18;
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (1, 'application', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (2, 'pageconfiguration', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (3, 'tableconfiguration', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (4, 'usergroup', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (5, 'userinfo', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (6, 'usergrouppermissions', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (7, 'userpermissions', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (8, 'apiinfo', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (9, 'applicationpermissions', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (10, 'ratelimitrule', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (11, 'container', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (12, 'datasource', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (13, 'servicetype', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (14, 'serviceinfo', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (15, 'algorithmlibrary', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (16, 'systeminfo', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (17, 'keyalias', 1, 'dev', null, null, null, null, null, null, null);
+INSERT INTO serviceinfo (serviceid, servicename, servicetype, containercode, tasktype, cronexpress, urilist,nullresultparameters, autonotification, loopcount, frequency) VALUES (18, 'datacache', 1, 'dev', null, null, null, null, null, null, null);

src/main/resources/sql/uniauth/add_pageconfiguration.sql

@@ -0,0 +1,63 @@
+delete from pageconfiguration where pageconfigurationid<=62;
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('module', 0, '查询统计', 'searchMode', '查询统计', null, null, null, 'searchMode', null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('module', 0, '数据可视化', 'dataVisualizationMode', '数据可视化', null, null, null, 'dataVisualizationMode', null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('module', 0, '基础数据管理', 'basicDataMode', '基础数据管理', null, null, null, 'basicDataMode', null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('module', 0, '系统管理', 'systemAdministrationMode', '系统管理', null, null, null, 'systemAdministrationMode', null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('module', 0, '权限管理', 'permissionsManagementMode', '权限管理', null, null, null, 'permissionsManagementMode', null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('module', 0, '日志管理', 'logManagementMode', '日志管理', null, null, null, 'logManagementMode', null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('page', 5, '界面配置', 'permissionsManagementPage', '界面配置', null, null, null, 'permissionsManagementPage', '/tablePage/index.vue', null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('tree', 7, '界面配置树', 'permissionsManagementTree', '界面配置树', 2, null, null, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 1);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 8, '名称', 'pagename', '名称', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 8, '编号', 'pageconfigurationid', '编号', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 8, '上级编号', 'superiorid', '上级编号', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('table', 7, '界面配置管理表格', 'columnList', '界面配置管理表格', 2, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 1);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 12, '主键', 'pageconfigurationid', '主键编号', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 12, '类型', 'pagetype', '类型', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 12, '上级编号', 'superiorid', '上级编号', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 12, '名称', 'pagename', '名称', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 12, '编码', 'pagecode', '编码', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 12, '描述', 'pagedescribe', '描述', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('button', 7, '高级查询', 'advancedQueriesButton', '高级查询按钮', null, null, null, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('button', 7, '新增', 'addedButton', '新增按钮', null, null, null, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('form', 20, '编辑表单', 'addedFrom', '新增表单', 2, null, null, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 6);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '类型', 'pagetype', '类型', null, null, null, null, null, null, null, null, null, null, 'SELECT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '上级编号', 'superiorid', '上级编号', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '名称', 'pagename', '名称', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '编码', 'pagecode', '编码', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '描述', 'pagedescribe', '描述', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '绑定服务编号', 'serviceid', '绑定服务编号', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '快捷键(核心用于按钮)', 'shortcutkeys', '快捷键(核心用于按钮)', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '打开方式（新页、弹出或抽屉、同页关联查询）', 'openmode', '打开方式（新页、弹出或抽屉、同页关联查询）', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '路由', 'pageroute', '路由', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '地址', 'pageaddress', '地址', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '传递参数', 'passparameters', '传递参数', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '页面打开时的默认查询条件', 'defaultfilter', '页面打开时的默认查询条件', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '图标', 'pageicon', '图标', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '行背景色表达式', 'rowbackgroundcolorexpression', '行背景色表达式', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '行字体色表达式', 'rowfontcolorexpression', '行字体色表达式', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '渲染类型', 'datatype', '渲染类型', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '数据长度', 'datalength', '数据长度', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '是否显示', 'isdisplay', '是否显示', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '显示顺序', 'displaynumber', '显示顺序', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '显示宽度', 'displaywidth', '显示宽度', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '背景色表达式', 'backgroundcolorexpression', '背景色表达式', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '字体色表达式', 'fontcolorexpression', '字体色表达式', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '启用排序功能', 'enablesort', '启用排序功能', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '启用过滤功能', 'enablefilter', '启用过滤功能', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '是否分组', 'enablegroup', '是否分组', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '启用合计', 'enablecount', '启用合计', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '合计置顶', 'counttopmost', '合计置顶', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '是否为查询条件', 'isfiltercolumn', '是否为查询条件', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '是否主键', 'isprimarykey', '是否主键', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '默认查询参数', 'defaultparameters', '默认查询参数', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '下来列表（服务编号）', 'dropdownlist', '下来列表（服务编号）', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '下来列表键值', 'dropdownlistid', '下来列表键值', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '下来列表显示名称', 'dropdownlistlabel', '下来列表显示名称', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '是否必填', 'isrequired', '是否必填', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '唯一性', 'uniquitytype', '唯一性', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '格式校验规则', 'formatrule', '格式校验规则', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '默认值', 'defaultvalue', '默认值', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '计算公式', 'calculationformula', '计算公式', null, null, null, null, null, null, null, null, null, null, 'TEXT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('column', 21, '服务类型', 'servicetype', '服务类型', null, null, null, null, null, null, null, null, null, null, 'INT', null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('button', 21, '取消', 'cancelButton', '取消按钮', null, null, null, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO pageconfiguration (pagetype, superiorid, pagename, pagecode, pagedescribe, serviceid, shortcutkeys, openmode, pageroute, pageaddress, passparameters, defaultfilter, pageicon, rowbackgroundcolorexpression, rowfontcolorexpression, datatype, datalength, isdisplay, displaynumber, displaywidth, backgroundcolorexpression, fontcolorexpression, enablesort, enablefilter, enablegroup, enablecount, counttopmost, isfiltercolumn, isprimarykey, defaultparameters, dropdownlist, dropdownlistid, dropdownlistlabel, isrequired, uniquitytype, formatrule, defaultvalue, calculationformula, servicetype) VALUES ('button', 21, '确认', 'confirmButton', '确认按钮', null, null, null, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);

src/test/java/com/scbfkj/uni/library/script/JsScriptEngineUtilTest.java

@@ -4,8 +4,6 @@ import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class JsScriptEngineUtilTest {
 
     @Test
@@ -13,4 +11,10 @@ class JsScriptEngineUtilTest {
         Map<String, Object> result = JsScriptEngineUtil.eval("(a,b) => a+b", 1, 2);
         System.out.println(result);
     }
+
+    @Test
+    void testEval() throws Exception {
+
+
+    }
 }