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 insert(T entity) { return DataLogTools.insert(entity); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T insert(T entity, DataOperationListener listener) { return DataLogTools.insert(entity,listener); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List insertBatch(List entitys) { List 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 List insertBatch(List entitys, DataOperationListener listener) { List 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 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 boolean updateById(T entity, DataOperationListener 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 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 deleteById(Class 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 deleteById(Class klazz, long id, DataOperationListener listener) { return DataLogTools.deleteById(klazz,id,listener); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids) { return DataLogTools.deleteByIds(klazz, ids); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.deleteByIds(klazz,ids,listener); } @Transactional(readOnly = true) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List findLogsByEntityId(Class 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 boolean enable(Class klazz, @Valid List ids) { return DataLogTools.enable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean enable(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.enable(klazz,ids,listener); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids) { return DataLogTools.disable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids, DataOperationListener 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: