From 2d3311932841d8664ac8b31392c5555f4b02c08f Mon Sep 17 00:00:00 2001
From: "t-shunyi.kuang" <846002312@qq.com>
Date: Fri, 21 Nov 2025 16:53:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DatalogServiceImpl.java      | 32 +++++++++----------
 .../src/main/resources/bootstrap-dev.yml      |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java
index 9868ee2..9fcfdec 100644
--- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java
+++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java
@@ -18,21 +18,21 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 public class DatalogServiceImpl implements DatalogService{
 
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> T insert(T entity) {
 		return DataLogTools.insert(entity);
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> T insert(T entity, DataOperationListener<T> listener) {
 		return DataLogTools.insert(entity,listener);
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> List<T> insertBatch(List<T> entitys) {
 		List<T> res = Lists.newArrayList();
@@ -43,7 +43,7 @@ public class DatalogServiceImpl implements DatalogService{
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> List<T> insertBatch(List<T> entitys, DataOperationListener<T> listener) {
 		List<T> res = Lists.newArrayList();
@@ -54,7 +54,7 @@ public class DatalogServiceImpl implements DatalogService{
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean updateById(T entity) {
 		DataLogTools.update(entity);
@@ -62,7 +62,7 @@ public class DatalogServiceImpl implements DatalogService{
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean updateById(T entity, DataOperationListener<T> listener) {
 		DataLogTools.update(entity,listener);
@@ -70,7 +70,7 @@ public class DatalogServiceImpl implements DatalogService{
 	}
 
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> T delete(T entity) {
 		return DataLogTools.delete(entity);
@@ -78,7 +78,7 @@ public class DatalogServiceImpl implements DatalogService{
 	
 
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> T deleteById(Class<T> klazz, long id) {
 		return DataLogTools.deleteById(klazz, id);
@@ -86,28 +86,28 @@ public class DatalogServiceImpl implements DatalogService{
 	
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> T deleteById(Class<T> klazz, long id, DataOperationListener<T> listener) {
 		return DataLogTools.deleteById(klazz,id,listener);
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean deleteByIds(Class<T> klazz, @Valid List<Long> ids) {
 		return DataLogTools.deleteByIds(klazz, ids);
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean deleteByIds(Class<T> klazz, @Valid List<Long> ids, DataOperationListener<T> listener) {
 		return DataLogTools.deleteByIds(klazz,ids,listener);
 	}
 	
 	@Transactional(readOnly = true)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> List<DataChangeLogVo> findLogsByEntityId(Class<T> klazz, long dataId) {
 		return DataLogTools.findLogsByEntityId(klazz, dataId);
@@ -115,28 +115,28 @@ public class DatalogServiceImpl implements DatalogService{
 	
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean enable(Class<T> klazz, @Valid List<Long> ids) {
 		return DataLogTools.enable(klazz, ids);
 	}
 	
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean enable(Class<T> klazz, @Valid List<Long> ids, DataOperationListener<T> listener) {
 		return DataLogTools.enable(klazz,ids,listener);
 	}
 
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean disable(Class<T> klazz, @Valid List<Long> ids) {
 		return DataLogTools.disable(klazz, ids);
 	}
 
 	@Transactional(rollbackFor = Exception.class)
-	//@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
+	@GlobalTransactional(rollbackFor = Exception.class)  // Seata全局事务注解
 	@Override
 	public <T> boolean disable(Class<T> klazz, @Valid List<Long> ids, DataOperationListener<T> listener) {
 		return DataLogTools.disable(klazz,ids,listener);
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml
index dd09976..ac06c3b 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml
@@ -45,7 +45,7 @@ spring:
             group: DNE
             
       discovery: 
-        ip: 10.0.0.4
+        ip: 10.0.0.2
         #network-interface: net7
             
 xjrsoft: