null 占位符 注释

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java

@@ -98,6 +98,7 @@ public class OssBuilder {
                 oss.setEndpoint("https://xinan1.zos.ctyun.cn");
             }
         }
+        oss.setEndpoint("https://xinan1.zos.ctyun.cn");
 		//oss.setEndpoint("https://xinan1.zos.ctyun.cn");
 		System.out.println("oss111="+oss.getEndpoint());
 		Oss ossCached = ossPool.get(tenantId);

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1334,7 +1334,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             checkTable = op.get().getInitTableName();
         }
         for (FormData fd : tec.formDataList) {
-            if(fd.getCode().equals("m_20220929100217_1575304930258845696:key_10")){
+
+            Formula formula222=fd.getFormula();
+            String test=formula222.getFormula();
+            if(test.contains("converge")){
                 System.out.println("111");
             }
             if (fd.verify()) {
@@ -1602,8 +1605,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                     }
                                     if (local.size() > 0) {
                                         List<Object> values = FormulaUtils.slice(local, f);
-                                        //设置特殊展位符
-                                        values = values.stream().map(s -> StringUtils.isEmpty(s) ? "/!@#$%^" : s).collect(Collectors.toList());
+                                        //设置特殊占位符
+                                      //  values = values.stream().map(s -> StringUtils.isEmpty(s) ? "/!@#$%^" : s).collect(Collectors.toList());
                                         FormulaUtils.write(fd, values, !fd.getTableName().equals(checkTable));
                                     }
                                 } else {

blade-service/blade-meter/src/main/java/org/springblade/meter/config/RedissonConfig.java

@@ -12,8 +12,8 @@ public class RedissonConfig {
     public RedissonClient redissonClient() {
         Config config = new Config();
         config.useSingleServer()
-                .setAddress("redis://127.0.0.1:6378")
-                .setPassword("123456");
+                .setAddress("redis://127.0.0.1:6379");
+              //  .setPassword("123456");
         return Redisson.create(config);
     }
 }