Merge remote-tracking branch 'origin/master' into test

# Conflicts:
#	sys-api-service/src/main/java/com/xy/service/SysDictLogServiceImpl.java

sys-api-service/src/main/java/com/xy/service/SysDictLogServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static com.xy.utils.Beans.copy;
@@ -65,13 +64,6 @@ public class SysDictLogServiceImpl extends ServiceImpl<SysDictLogMapper, SysDict
      * @return
      */
     public boolean handleLog(SysDictLog sysDictLog, EnumSysDictOperateType operateType) {
-        // 判断当前环境是否为测试环境
-        String[] activeProfiles = environment.getActiveProfiles();
-        log.info("当前环境：{}", activeProfiles);
-        boolean isTestEnvironment = Arrays.asList(activeProfiles).contains("uat");
-        if (!isTestEnvironment) {
-            return false; // 如果不是测试环境，返回false
-        }
         sysDictLog.setId(null);
         sysDictLog.setIsSync(false);
         sysDictLog.setOperateType(operateType.getIntCode());

sys-api-service/src/main/java/com/xy/service/SysDictServiceImpl.java

@@ -323,6 +323,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         String res = sendPost(SYNC_DICT_URL, JSONUtil.toJsonStr(syncProd));
         if ("fail".equals(res)) {
             return R.fail("同步失败，请稍后重试");
+        } else {
+            sysDictLog.setIsSync(true);
+            sysDictLogService.updateById(sysDictLog);
         }
         return R.ok();
     }
@@ -412,13 +415,17 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         }
         if (Emptys.check(paters)) {
             JList<String> codes = paters.getProperty(SysDict::getCode);
-            if (CollUtil.isNotEmpty(paters)) {
-                paters.forEach(sysDict -> {
+            LambdaQueryWrapper<SysDict> lqw = new LambdaQueryWrapper<SysDict>().in(SysDict::getPaterCode, codes);
+            List<SysDict> sysDicts = list(lqw);
+            if (CollUtil.isNotEmpty(sysDicts)) {
+                removeBatchByIds(sysDicts);
+                sysDicts.forEach(sysDict -> {
                     SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
                     sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.DEL);
                 });
             }
-            remove(new LambdaQueryWrapper<SysDict>().in(SysDict::getPaterCode, codes));
+
+
         }
         //刷新redis
         list.forEach(sysDict -> refuRedis(sysDict));