修复minio远程调用的问题。

blade-ops/blade-resource/src/main/resources/application.yml

@@ -18,18 +18,18 @@ oss:
   # endpoint: http://49.232.74.228:9000
   #minio转换服务地址，用于内网上传后将返回地址改为转换的外网地址
   # 本机-
-  # transform-endpoint: http://192.168.0.220:9000
+  transform-endpoint: http://192.168.0.220:9000
   # 49 tencent cloud-
-  transform-endpoint: http://49.232.74.228:9000
+  #transform-endpoint: http://49.232.74.228:9000
   #访问key
   # local-
-  # access-key: T5PCRlMc5PxxubLCrVhR
+  access-key: T5PCRlMc5PxxubLCrVhR
   # 49 tencent cloud-
-  access-key: ozUrsZCh4SVxIkfXAyp4
+  #access-key: ozUrsZCh4SVxIkfXAyp4
   #密钥key
   # local-
-  #secret-key: mbIbJKpTWulCdcsalKjoxaFJ8UDapGSU6Zw9QKjz
+  secret-key: mbIbJKpTWulCdcsalKjoxaFJ8UDapGSU6Zw9QKjz
   # 49 tencent cloud-
-  secret-key: uuk7LoVscPwPlB6jQUcLHNAdpupNavA1DDiI3n6r
+  #secret-key: uuk7LoVscPwPlB6jQUcLHNAdpupNavA1DDiI3n6r
   #存储桶
   bucket-name: bladex

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java

@@ -204,6 +204,7 @@ public class CycleTestTaskService2 {
 
     /**
      * 检查配置的周期。
+     *
      * @param ct
      * @return true ok or false failed.
      */
@@ -221,6 +222,15 @@ public class CycleTestTaskService2 {
             log.warn("不生成 ct id = {}. checkStr = {}", ct.getId(), checkFailMsg);
             return false;
         }
+        if (ct.getTestDuration() < 0) {
+            return false;
+        }
+        if (ct.getGenBefore() < 0) {
+            return false;
+        }
+        if (ct.getRemind() < 0) {
+            return false;
+        }
         return true;
     }
 
@@ -358,7 +368,7 @@ public class CycleTestTaskService2 {
     }
 
     public void setVOValue(CycleTestTaskVO vo) {
-        CycleTestItem item = itemService.getByIdIgnoreLogicDelete(vo.getCycleTestItemId());
+        CycleTestItem item = itemService.getById(vo.getCycleTestItemId());
         if (item != null) {
             vo.setCycleTestItemName(item.getName());
             vo.setCycleTestItemCondition(item.getCondition());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java

@@ -87,13 +87,14 @@ public class CycleTestServiceImpl extends BaseServiceImpl<CycleTestMapper, Cycle
         List<CycleTest> list = new ArrayList<>();
         for (Long puId : puIdList) {
             CycleTest addOne = new CycleTest();
+            log.info("addOne {}", addOne);
+            BeanUtil.copyProperties(ct, addOne, true);
+            addOne.setProcessUserId(puId);
+            addOne.setId(null);
             R rCheck = check(addOne);
             if (rCheck != null) {
                 return rCheck;
             }
-            BeanUtil.copyProperties(ct, addOne, true);
-            addOne.setProcessUserId(puId);
-            addOne.setId(null);
             list.add(addOne);
         }
         return R.status(saveBatch(list));

blade-service/blade-desk/src/main/resources/application-dev.yml

@@ -21,8 +21,8 @@ business:
 #角色配置
 role-config:
   #工艺员角色id
-  # process-engineer-id: "2004331529923555330"
+  process-engineer-id: "1993624442365915137"
   # 49 tencent cloud
-  process-engineer-id: "2004331529923555330"
+  #process-engineer-id: "2004331529923555330"
   #工艺员角色alias
   process-engineer-alias: "process_engineer"

blade-service/blade-system/src/main/resources/application-dev.yml

@@ -12,8 +12,8 @@ spring:
 #角色配置
 role-config:
   #工艺员角色id
-  # process-engineer-id: "2004331529923555330"
+  process-engineer-id: "1993624442365915137"
   # 49 tencent cloud
-  process-engineer-id: "2004331529923555330"
+  #process-engineer-id: "2004331529923555330"
   #工艺员角色alias
   process-engineer-alias: "process_engineer"