From 4c40ae594558588a83664d2c583ea8538824727b Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Wed, 10 Sep 2025 16:54:53 +0800
Subject: [PATCH 1/3] update tenant

---
 .../framework/dao/mapper/TenantMapper.xml     |  8 --------
 .../framework/dto/TenantModuleDmlSqlVo.java   |  9 ---------
 .../framework/dto/TenantModuleVo.java         | 20 -------------------
 .../sqlfile/ScriptRunnerManager.java          | 19 +++++++-----------
 .../framework/util/ChangelogUtil.java         |  9 ++++++++-
 .../changelog/2025-09-10/neatlogic.sql        |  5 +++++
 6 files changed, 20 insertions(+), 50 deletions(-)
 create mode 100644 src/main/resources/neatlogic/resources/framework/changelog/2025-09-10/neatlogic.sql

diff --git a/src/main/java/neatlogic/framework/dao/mapper/TenantMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/TenantMapper.xml
index 97ee38894..b2e9a4863 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/TenantMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/TenantMapper.xml
@@ -21,8 +21,6 @@
     <select id="getTenantModuleByTenantUuid" parameterType="java.lang.String"
             resultType="neatlogic.framework.dto.TenantModuleVo" useCache="false">
         SELECT `module_id`  as moduleId,
-               `ddl_status` as ddlStatus,
-               `dml_status` as dmlStatus,
                `version`
         FROM `tenant_module`
         WHERE tenant_uuid = #{value}
@@ -270,12 +268,6 @@
         UPDATE
         `tenant_module`
         SET `lcd` = NOW(3)
-        <if test="ddlStatus != null">
-            ,`ddl_status` = #{ddlStatus}
-        </if>
-        <if test="dmlStatus != null">
-            ,`dml_status` = #{dmlStatus}
-        </if>
         WHERE `tenant_uuid` = #{tenantUuid}
         AND `module_id` = #{moduleId}
     </update>
diff --git a/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java b/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java
index 1cee88dcb..002f004c4 100644
--- a/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java
+++ b/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java
@@ -32,15 +32,6 @@ public class TenantModuleDmlSqlVo {
         this.type = type;
     }
 
-    public TenantModuleDmlSqlVo(String tenantUuid, String moduleId, String sqlMd5, int sqlStatus, String errorMsg, String type) {
-        this.tenantUuid = tenantUuid;
-        this.moduleId = moduleId;
-        this.sqlMd5 = sqlMd5;
-        this.sqlStatus = sqlStatus;
-        this.type = type;
-        this.errorMsg = errorMsg;
-    }
-
     public String getTenantUuid() {
         return tenantUuid;
     }
diff --git a/src/main/java/neatlogic/framework/dto/TenantModuleVo.java b/src/main/java/neatlogic/framework/dto/TenantModuleVo.java
index 7e8c85a0f..cb6956377 100644
--- a/src/main/java/neatlogic/framework/dto/TenantModuleVo.java
+++ b/src/main/java/neatlogic/framework/dto/TenantModuleVo.java
@@ -11,10 +11,6 @@ public class TenantModuleVo {
 	private String tenantUuid;
 	@EntityField(name = "term.cmdb.moduleid", type = ApiParamType.STRING)
 	private String moduleId;
-	@EntityField(name = "nfd.tenantmodulevo.ddlstatus", type = ApiParamType.INTEGER)
-	private Integer ddlStatus;
-	@EntityField(name = "nfd.tenantmodulevo.dmlstatus", type = ApiParamType.INTEGER)
-	private Integer dmlStatus;
 	@EntityField(name = "common.createdate", type = ApiParamType.LONG)
 	private Date fcd;
 	@EntityField(name = "common.editdate", type = ApiParamType.LONG)
@@ -54,22 +50,6 @@ public class TenantModuleVo {
 		this.lcd = lcd;
 	}
 
-	public Integer getDdlStatus() {
-		return ddlStatus;
-	}
-
-	public void setDdlStatus(Integer ddlStatus) {
-		this.ddlStatus = ddlStatus;
-	}
-
-	public Integer getDmlStatus() {
-		return dmlStatus;
-	}
-
-	public void setDmlStatus(Integer dmlStatus) {
-		this.dmlStatus = dmlStatus;
-	}
-
 	public String getVersion() {
 		return version;
 	}
diff --git a/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java b/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
index dfc38c738..6fe4ae5e4 100644
--- a/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
+++ b/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
@@ -23,7 +23,6 @@ import neatlogic.framework.dto.TenantVo;
 import neatlogic.framework.exception.module.ModuleInitRuntimeException;
 import neatlogic.framework.store.mysql.DatasourceManager;
 import neatlogic.framework.store.mysql.NeatLogicBasicDataSource;
-import neatlogic.framework.util.I18nUtils;
 import neatlogic.framework.util.JdbcUtil;
 import neatlogic.framework.util.Md5Util;
 import org.apache.commons.lang3.StringUtils;
@@ -97,7 +96,7 @@ public class ScriptRunnerManager {
     /**
      * 仅执行一次sql，执行过的sql跳过不执行
      */
-    public static void runScriptOnceWithJdbc(ExecuteSqlParamVo executeSqlParamVo) throws Exception {
+    public static void runDmlScriptWithJdbc(ExecuteSqlParamVo executeSqlParamVo) throws Exception {
         StringWriter logStrWriter = new StringWriter();
         PrintWriter logWriter = new PrintWriter(logStrWriter);
         StringWriter errStrWriter = new StringWriter();
@@ -120,20 +119,16 @@ public class ScriptRunnerManager {
                 // 如果没有执行过该sql，则执行
                 String sqlMd5 = Md5Util.encryptMD5(line);
                 if (!executeSqlParamVo.getDmlSqlHashList().contains(sqlMd5)) {
+                    TenantModuleDmlSqlVo tenantModuleDmlSqlVo = new TenantModuleDmlSqlVo(executeSqlParamVo.getTenant().getUuid(), executeSqlParamVo.getModuleId(), sqlMd5, executeSqlParamVo.getSqlFile());
                     runner.runScript(new StringReader(line));
-                    TenantModuleDmlSqlVo tenantModuleDmlSqlVo;
                     if (StringUtils.isNotBlank(errStrWriter.toString())) {
                         String error = "  ✖" + executeSqlParamVo.getTenant().getName() + "·" + executeSqlParamVo.getModuleId() + "." + executeSqlParamVo.getSqlFile() + ": " + errStrWriter;
-                        //tenantModuleDmlSqlVo = new TenantModuleDmlSqlVo(tenant.getUuid(), moduleId, sqlMd5, 0, errStrWriter.toString(), type);
-                        //errStrWriter.getBuffer().setLength(0);
-                        if (StringUtils.isNotBlank(executeSqlParamVo.getSqlFile()) && executeSqlParamVo.getSqlFile().equals("dml.sql")) {
-                            error += I18nUtils.getStaticMessage("nfs.scriptrunnermanager.runscriptoncewithjdbc.failed");
-                        }
-                        throw new ModuleInitRuntimeException(error);
-                    } else {
-                        tenantModuleDmlSqlVo = new TenantModuleDmlSqlVo(executeSqlParamVo.getTenant().getUuid(), executeSqlParamVo.getModuleId(), sqlMd5, executeSqlParamVo.getSqlFile());
-                        executeSqlParamVo.getDmlSqlHashList().add(sqlMd5);
+                        System.out.println(error);
+                        executeSqlParamVo.setError(true);
+                        tenantModuleDmlSqlVo.setSqlStatus(0);
+                        tenantModuleDmlSqlVo.setErrorMsg(error);
                     }
+                    executeSqlParamVo.getDmlSqlHashList().add(sqlMd5);
                     insertTenantModuleDmlSql(tenantModuleDmlSqlVo, executeSqlParamVo.getNeatlogicConn());
                     insertTenantModuleDmlSqlDetail(sqlMd5, line, executeSqlParamVo.getNeatlogicConn());
                 }
diff --git a/src/main/java/neatlogic/framework/util/ChangelogUtil.java b/src/main/java/neatlogic/framework/util/ChangelogUtil.java
index f4ff914f6..8f85c19cf 100644
--- a/src/main/java/neatlogic/framework/util/ChangelogUtil.java
+++ b/src/main/java/neatlogic/framework/util/ChangelogUtil.java
@@ -234,6 +234,7 @@ public class ChangelogUtil {
     public static void initDmlSql(ResourcePatternResolver resolver, List<TenantVo> activeTenantList, List<ModuleVo> moduleVoList, Connection neatlogicConn) throws Exception {
         System.out.printf("⚡" + (I18nUtils.getStaticMessage("nfb.moduleinitializer.initdmlsql.tenant")) + "%n");
         Map<String, List<String>> allActiveTenantDmlSqlHashMap = ChangelogUtil.getAllActiveTenantDmlSqlHashMap(activeTenantList, neatlogicConn);
+        boolean isError = false;
         for (TenantVo tenantVo : activeTenantList) {
             try (Connection tenantConnection = JdbcUtil.getNeatlogicTenantConnection(tenantVo, false)) {
                 for (ModuleVo moduleVo : moduleVoList) {
@@ -244,12 +245,18 @@ public class ChangelogUtil {
                             tenantDmlSqlList = new ArrayList<>();
                         }
                         ExecuteSqlParamVo executeSqlParamVo = new ExecuteSqlParamVo(tenantVo, moduleVo.getId(), resource, tenantDmlSqlList, tenantConnection, neatlogicConn, false);
-                        ScriptRunnerManager.runScriptOnceWithJdbc(executeSqlParamVo);
+                        ScriptRunnerManager.runDmlScriptWithJdbc(executeSqlParamVo);
+                        if (executeSqlParamVo.isError()) {
+                            isError = true;
+                        }
                     }
                 }
                 System.out.println("  ✓" + tenantVo.getName());
             }
         }
+        if (isError) {
+            System.exit(1);
+        }
     }
 
     /**
diff --git a/src/main/resources/neatlogic/resources/framework/changelog/2025-09-10/neatlogic.sql b/src/main/resources/neatlogic/resources/framework/changelog/2025-09-10/neatlogic.sql
new file mode 100644
index 000000000..853468240
--- /dev/null
+++ b/src/main/resources/neatlogic/resources/framework/changelog/2025-09-10/neatlogic.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `tenant_module_dmlsql` ADD COLUMN `ignored` tinyint(1) NULL COMMENT '是否忽略，0:不忽略，1:已忽略，默认忽略' AFTER `fcd`;
+
+ALTER TABLE `tenant_module` DROP COLUMN `ddl_status`,
+
+ALTER TABLE `tenant_module` DROP COLUMN `dml_status`;
\ No newline at end of file
-- 
Gitee


From 1cf6c3ffc07679ea5a537811d8d01dfdbd2d66fe Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Thu, 11 Sep 2025 11:03:58 +0800
Subject: [PATCH 2/3] update tenant

---
 .../neatlogic/framework/dto/TenantModuleDmlSqlVo.java | 11 +++++++++++
 .../framework/sqlfile/ScriptRunnerManager.java        |  9 ++++++---
 .../java/neatlogic/framework/util/ChangelogUtil.java  |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java b/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java
index 002f004c4..2d0a41a3a 100644
--- a/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java
+++ b/src/main/java/neatlogic/framework/dto/TenantModuleDmlSqlVo.java
@@ -19,6 +19,9 @@ public class TenantModuleDmlSqlVo {
     @EntityField(name = "类型", type = ApiParamType.STRING)
     private String type;
 
+    @EntityField(name = "是否忽略", type = ApiParamType.STRING)
+    private int ignored = 0;
+
     private String errorMsg;
 
     public TenantModuleDmlSqlVo() {
@@ -79,4 +82,12 @@ public class TenantModuleDmlSqlVo {
     public void setErrorMsg(String errorMsg) {
         this.errorMsg = errorMsg;
     }
+
+    public int getIgnored() {
+        return ignored;
+    }
+
+    public void setIgnored(int ignored) {
+        this.ignored = ignored;
+    }
 }
diff --git a/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java b/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
index 6fe4ae5e4..0b324f17a 100644
--- a/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
+++ b/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
@@ -125,6 +125,7 @@ public class ScriptRunnerManager {
                         String error = "  ✖" + executeSqlParamVo.getTenant().getName() + "·" + executeSqlParamVo.getModuleId() + "." + executeSqlParamVo.getSqlFile() + ": " + errStrWriter;
                         System.out.println(error);
                         executeSqlParamVo.setError(true);
+                        tenantModuleDmlSqlVo.setIgnored(1);
                         tenantModuleDmlSqlVo.setSqlStatus(0);
                         tenantModuleDmlSqlVo.setErrorMsg(error);
                     }
@@ -320,15 +321,17 @@ public class ScriptRunnerManager {
      * @param tenantModuleDmlSqlVo dml sql对象
      */
     private static void insertTenantModuleDmlSql(TenantModuleDmlSqlVo tenantModuleDmlSqlVo, Connection neatlogicConn) throws Exception {
-        try (PreparedStatement statement = neatlogicConn.prepareStatement("insert into `tenant_module_dmlsql` (`tenant_uuid`,`module_id`,`sql_uuid`,`sql_status`,`error_msg`,`fcd`,`type`) VALUES (?,?,?,?,?,now(),?) ON DUPLICATE KEY UPDATE `sql_status` = ? , `error_msg` = ?")) {
+        try (PreparedStatement statement = neatlogicConn.prepareStatement("insert into `tenant_module_dmlsql` (`tenant_uuid`,`module_id`,`sql_uuid`,`sql_status`,`error_msg`,`fcd`,`type`, `ignored`) VALUES (?,?,?,?,?,now(),?,?) ON DUPLICATE KEY UPDATE `sql_status` = ? , `error_msg` = ?, `ignored` = ?")) {
             statement.setString(1, tenantModuleDmlSqlVo.getTenantUuid());
             statement.setString(2, tenantModuleDmlSqlVo.getModuleId());
             statement.setString(3, tenantModuleDmlSqlVo.getSqlMd5());
             statement.setInt(4, tenantModuleDmlSqlVo.getSqlStatus());
             statement.setString(5, tenantModuleDmlSqlVo.getErrorMsg());
             statement.setString(6, tenantModuleDmlSqlVo.getType());
-            statement.setInt(7, tenantModuleDmlSqlVo.getSqlStatus());
-            statement.setString(8, tenantModuleDmlSqlVo.getErrorMsg());
+            statement.setInt(7, tenantModuleDmlSqlVo.getIgnored());
+            statement.setInt(8, tenantModuleDmlSqlVo.getSqlStatus());
+            statement.setString(9, tenantModuleDmlSqlVo.getErrorMsg());
+            statement.setInt(10, tenantModuleDmlSqlVo.getIgnored());
             statement.execute();
         } catch (Exception ex) {
             throw new Exception(ex);
diff --git a/src/main/java/neatlogic/framework/util/ChangelogUtil.java b/src/main/java/neatlogic/framework/util/ChangelogUtil.java
index 8f85c19cf..476305342 100644
--- a/src/main/java/neatlogic/framework/util/ChangelogUtil.java
+++ b/src/main/java/neatlogic/framework/util/ChangelogUtil.java
@@ -169,7 +169,7 @@ public class ChangelogUtil {
         String placeholders = tenantUuidList.stream().map(id -> "?").collect(Collectors.joining(","));
         placeholders = placeholders + " , ?";
         ResultSet sqlMd5ResultSet = null;
-        try (PreparedStatement sqlMd5Statement = connection.prepareStatement("select sql_uuid,`tenant_uuid` from tenant_module_dmlsql where `tenant_uuid` in (" + placeholders + ")  and `sql_status` = 1  order by tenant_uuid")) {
+        try (PreparedStatement sqlMd5Statement = connection.prepareStatement("select sql_uuid,`tenant_uuid` from tenant_module_dmlsql where `tenant_uuid` in (" + placeholders + ")  and (`sql_status` = 1 or `ignored` = 1) order by tenant_uuid")) {
             for (int i = 0; i < tenantUuidList.size(); i++) {
                 sqlMd5Statement.setString(i + 1, tenantUuidList.get(i));
             }
-- 
Gitee


From 21bb4680257776b87591a3da9d2a0e3665bc2498 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Mon, 15 Sep 2025 17:01:28 +0800
Subject: [PATCH 3/3] update tenant

---
 .../framework/sqlfile/ScriptRunnerManager.java   | 14 ++------------
 .../framework/store/mysql/DatasourceManager.java |  8 ++++++++
 .../neatlogic/framework/util/ChangelogUtil.java  | 16 ++++++++--------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java b/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
index 0b324f17a..2914ab4b3 100644
--- a/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
+++ b/src/main/java/neatlogic/framework/sqlfile/ScriptRunnerManager.java
@@ -19,10 +19,8 @@ import neatlogic.framework.dao.mapper.TenantMapper;
 import neatlogic.framework.dto.ChangelogAuditVo;
 import neatlogic.framework.dto.ExecuteSqlParamVo;
 import neatlogic.framework.dto.TenantModuleDmlSqlVo;
-import neatlogic.framework.dto.TenantVo;
 import neatlogic.framework.exception.module.ModuleInitRuntimeException;
-import neatlogic.framework.store.mysql.DatasourceManager;
-import neatlogic.framework.store.mysql.NeatLogicBasicDataSource;
+import neatlogic.framework.util.I18nUtils;
 import neatlogic.framework.util.JdbcUtil;
 import neatlogic.framework.util.Md5Util;
 import org.apache.commons.lang3.StringUtils;
@@ -54,21 +52,13 @@ public class ScriptRunnerManager {
     /**
      * 执行sql文件
      *
-     * @param tenant       租户
      * @param scriptReader 脚本读取
      * @param logWriter    日志
      * @param errWriter    错误日志
      */
-    public static void runScript(TenantVo tenant, Reader scriptReader, PrintWriter logWriter, PrintWriter errWriter, boolean isDataDb) throws Exception {
-        Connection conn = null;
+    public static void runScript(Connection conn, Reader scriptReader, PrintWriter logWriter, PrintWriter errWriter) throws Exception {
         ScriptRunner runner = null;
-        String tenantUuid = tenant.getUuid();
-        if (isDataDb) {
-            tenantUuid = tenantUuid + "_data";
-        }
-        NeatLogicBasicDataSource tenantDatasource = DatasourceManager.getDatasource(tenantUuid);
         try {
-            conn = tenantDatasource.getConnection();
             runner = new ScriptRunner(conn);
             runner.setSendFullScript(false);
             runner.setAutoCommit(true);
diff --git a/src/main/java/neatlogic/framework/store/mysql/DatasourceManager.java b/src/main/java/neatlogic/framework/store/mysql/DatasourceManager.java
index d6b241f45..3607b3e97 100644
--- a/src/main/java/neatlogic/framework/store/mysql/DatasourceManager.java
+++ b/src/main/java/neatlogic/framework/store/mysql/DatasourceManager.java
@@ -68,6 +68,14 @@ public class DatasourceManager {
         return (NeatLogicBasicDataSource) (datasourceMap.get(tenantUuid));
     }
 
+    public static void removeDatasource(String tenantUuid) {
+        if (datasourceMap.containsKey(tenantUuid)) {
+            NeatLogicBasicDataSource dataSource = (NeatLogicBasicDataSource) (datasourceMap.get(tenantUuid));
+            dataSource.close();
+            datasourceMap.remove(tenantUuid);
+        }
+    }
+
 
     @PostConstruct
     public void init() {
diff --git a/src/main/java/neatlogic/framework/util/ChangelogUtil.java b/src/main/java/neatlogic/framework/util/ChangelogUtil.java
index 476305342..f4db9a69c 100644
--- a/src/main/java/neatlogic/framework/util/ChangelogUtil.java
+++ b/src/main/java/neatlogic/framework/util/ChangelogUtil.java
@@ -254,9 +254,9 @@ public class ChangelogUtil {
                 System.out.println("  ✓" + tenantVo.getName());
             }
         }
-        if (isError) {
-            System.exit(1);
-        }
+//        if (isError) {
+//            System.exit(1);
+//        }
     }
 
     /**
@@ -293,7 +293,7 @@ public class ChangelogUtil {
             for (String path : errorList) {
                 System.out.println(I18nUtils.getStaticMessage("nfb.moduleinitializer.checkchangelog.invalid", path, TimeUtil.YYYY_MM_DD));
             }
-            System.exit(1);
+            //System.exit(1);
         }
         Map<String, List<String>> allActiveTenantChangelogSqlHashMap = ChangelogUtil.getAllActiveTenantChangelogSqlHashMap(activeTenantList, neatlogicConn);
         updateNeatlogicDatabase(resolver, allActiveTenantChangelogSqlHashMap, neatlogicConn);
@@ -385,7 +385,7 @@ public class ChangelogUtil {
      * @return 激活的租户
      */
     private static String getNeatlogicVersion(Connection connection) throws Exception {
-        try (PreparedStatement versionStatement = connection.prepareStatement("SELECT * FROM version limit 1"); ResultSet versionResultSet = versionStatement.executeQuery();) {
+        try (PreparedStatement versionStatement = connection.prepareStatement("SELECT * FROM version order by version desc limit 1"); ResultSet versionResultSet = versionStatement.executeQuery();) {
             if (versionResultSet.next()) {
                 return versionResultSet.getString("version");
             }
@@ -488,9 +488,9 @@ public class ChangelogUtil {
                 }
             }
         }
-        if (isError) {
-            System.exit(1);
-        }
+//        if (isError) {
+//            System.exit(1);
+//        }
     }
 
     /**
-- 
Gitee