Ver código fonte

bug修改:质量检测系统--电签管理员<任务状态与资料查询页面的任务状态未统一>、任务查看<任务废除后,无法查看废除位置、废除人和时间>

lvy 3 meses atrás
pai
commit
fc8155c0c2
100 arquivos alterados com 286 adições e 183 exclusões
  1. 1 0
      blade-ops-api/blade-flow-api/target/classes/META-INF/spring-devtools.properties
  2. 5 0
      blade-ops-api/blade-flow-api/target/classes/META-INF/spring.factories
  3. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/constant/ProcessConstant.class
  4. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/entity/BladeFlow.class
  5. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/entity/FlowEntity.class
  6. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/enums/FlowModeEnum.class
  7. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/feign/IFlowClient.class
  8. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/feign/IFlowClientFallback.class
  9. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/feign/NewFlowClient.class
  10. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/utils/FlowUtil.class
  11. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/utils/TaskUtil.class
  12. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/vo/FlowProcessVO.class
  13. BIN
      blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/vo/SendPageVO.class
  14. 1 0
      blade-ops-api/blade-resource-api/target/classes/META-INF/spring-devtools.properties
  15. 8 0
      blade-ops-api/blade-resource-api/target/classes/META-INF/spring.factories
  16. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/dto/batchDownloadFileDTO.class
  17. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/Attach.class
  18. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/LargeFile.class
  19. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/Oss.class
  20. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/Sms.class
  21. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/enums/SmsCodeEnum.class
  22. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/CommonFileClient.class
  23. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/IOSSClient.class
  24. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/ISmsClient.class
  25. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/ISmsClientFallback.class
  26. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/NewIOSSClient.class
  27. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/NewISmsClient.class
  28. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/utils/SmsUtil.class
  29. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/AttachVO.class
  30. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/MultipartFileParam.class
  31. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/NewBladeFile.class
  32. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/OssVO.class
  33. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/SmsVO.class
  34. BIN
      blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/ToPdfVO.class
  35. 45 0
      blade-ops/blade-admin/target/classes/bootstrap.yml
  36. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/AdminApplication.class
  37. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/config/AdminConfiguration.class
  38. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/config/DingTalkConfiguration.class
  39. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/config/SecurityConfiguration.class
  40. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/DingTalkNotifier.class
  41. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/DingTalkService.class
  42. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/MonitorProperties$DingTalk.class
  43. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/MonitorProperties$Service.class
  44. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/MonitorProperties.class
  45. BIN
      blade-ops/blade-admin/target/classes/org/springblade/admin/security/InternalAuthorizationManager.class
  46. 0 89
      blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java
  47. 0 5
      blade-ops/blade-develop/src/test/resources/templates/code.properties
  48. 0 46
      blade-ops/blade-flow/src/test/java/org/springblade/flow/test/BladeTest.java
  49. 0 43
      blade-ops/blade-flow/src/test/java/org/springblade/flow/test/launch/LauncherTestServiceImpl.java
  50. 1 0
      blade-ops/blade-flow/target/classes/META-INF/spring-devtools.properties
  51. 12 0
      blade-ops/blade-flow/target/classes/META-INF/spring.factories
  52. 0 0
      blade-ops/blade-flow/target/classes/application-dev.yml
  53. 0 0
      blade-ops/blade-flow/target/classes/application-prod.yml
  54. 0 0
      blade-ops/blade-flow/target/classes/application-test.yml
  55. 0 0
      blade-ops/blade-flow/target/classes/application.yml
  56. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/FlowApplication.class
  57. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/business/controller/WorkController.class
  58. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/business/feign/FlowClient.class
  59. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/business/feign/NewFlowClientImpl.class
  60. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/business/service/FlowBusinessService.class
  61. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.class
  62. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/config/FlowableConfiguration.class
  63. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/constant/FlowEngineConstant.class
  64. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowFollowController.class
  65. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowManagerController.class
  66. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowModelController.class
  67. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowProcessController.class
  68. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/entity/FlowExecution.class
  69. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/entity/FlowModel.class
  70. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/entity/FlowProcess.class
  71. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/mapper/FlowMapper.class
  72. 50 0
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/mapper/FlowMapper.xml
  73. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/service/FlowEngineService.class
  74. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.class
  75. BIN
      blade-ops/blade-flow/target/classes/org/springblade/flow/engine/utils/FlowCache.class
  76. 130 0
      blade-ops/blade-flow/target/classes/processes/LeaveProcess.bpmn20.xml
  77. 7 0
      blade-ops/blade-resource/target/classes/application-dev.yml
  78. 7 0
      blade-ops/blade-resource/target/classes/application-prod.yml
  79. 6 0
      blade-ops/blade-resource/target/classes/application-test.yml
  80. 13 0
      blade-ops/blade-resource/target/classes/application.yml
  81. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/ResourceApplication.class
  82. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/AliOssBuilder.class
  83. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/AmazonS3OssBuilder.class
  84. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/BladeOssRuleRe.class
  85. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/HuaweiObsBuilder.class
  86. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/MinioOssBuilder.class
  87. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/OssBuilder.class
  88. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/QiniuOssBuilder.class
  89. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/TencentCosBuilder.class
  90. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/TencentOssBuilder.class
  91. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/AliossTemplateRe.class
  92. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/MinioTemplateRe$1.class
  93. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/MinioTemplateRe.class
  94. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/OssTemplateRe.class
  95. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/AliSmsBuilder.class
  96. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/QiniuSmsBuilder.class
  97. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/SmsBuilder.class
  98. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/TencentSmsBuilder.class
  99. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/YunpianSmsBuilder.class
  100. BIN
      blade-ops/blade-resource/target/classes/org/springblade/resource/config/BladeOssConfiguration.class

+ 1 - 0
blade-ops-api/blade-flow-api/target/classes/META-INF/spring-devtools.properties

@@ -0,0 +1 @@
+restart.include.blade-flow-api=/blade-flow-api[\\w-]+\.jar

+ 5 - 0
blade-ops-api/blade-flow-api/target/classes/META-INF/spring.factories

@@ -0,0 +1,5 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  org.springblade.flow.core.feign.IFlowClientFallback
+org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\
+  org.springblade.flow.core.feign.IFlowClient,\
+  org.springblade.flow.core.feign.NewFlowClient

BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/constant/ProcessConstant.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/entity/BladeFlow.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/entity/FlowEntity.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/enums/FlowModeEnum.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/feign/IFlowClient.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/feign/IFlowClientFallback.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/feign/NewFlowClient.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/utils/FlowUtil.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/utils/TaskUtil.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/vo/FlowProcessVO.class


BIN
blade-ops-api/blade-flow-api/target/classes/org/springblade/flow/core/vo/SendPageVO.class


+ 1 - 0
blade-ops-api/blade-resource-api/target/classes/META-INF/spring-devtools.properties

@@ -0,0 +1 @@
+restart.include.blade-resource-api=/blade-resource-api[\\w-]+\.jar

+ 8 - 0
blade-ops-api/blade-resource-api/target/classes/META-INF/spring.factories

@@ -0,0 +1,8 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  org.springblade.resource.feign.ISmsClientFallback
+org.springblade.core.cloud.feign.BladeFeignAutoConfiguration=\
+  org.springblade.resource.feign.NewISmsClient,\
+  org.springblade.resource.feign.ISmsClient,\
+  org.springblade.resource.feign.NewIOSSClient,\
+  org.springblade.resource.feign.IOSSClient,\
+  org.springblade.resource.feign.CommonFileClient

BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/dto/batchDownloadFileDTO.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/Attach.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/LargeFile.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/Oss.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/entity/Sms.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/enums/SmsCodeEnum.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/CommonFileClient.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/IOSSClient.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/ISmsClient.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/ISmsClientFallback.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/NewIOSSClient.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/feign/NewISmsClient.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/utils/SmsUtil.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/AttachVO.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/MultipartFileParam.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/NewBladeFile.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/OssVO.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/SmsVO.class


BIN
blade-ops-api/blade-resource-api/target/classes/org/springblade/resource/vo/ToPdfVO.class


+ 45 - 0
blade-ops/blade-admin/target/classes/bootstrap.yml

@@ -0,0 +1,45 @@
+server:
+  port: 7002
+  undertow:
+    threads:
+      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
+      io: 16
+      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
+      worker: 400
+    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
+    buffer-size: 1024
+    # 是否分配的直接内存
+    direct-buffers: true
+
+spring:
+  boot:
+    admin:
+      discovery:
+        ignored-services:
+          - consul
+          - serverAddr
+      ui:
+        title: BladeX Monitor
+        external-views:
+          - label: 架构官网
+            url: https://bladex.vip/
+            order: 1
+            iframe: true
+      ## 用于内网安全,判断 admin proxy
+      instance-proxy:
+        ignored-headers: "X-Forwarded-For"
+  security:
+    user:
+      name: blade
+      password: blade
+
+# 监控的相关配置
+monitor:
+  ding-talk:
+    enabled: false
+    # 用于自定义域名,默认会自动填充为 http://ip:port
+    link: http://localhost:${server.port}
+    # 钉钉配置的令牌
+    access-token: xxx
+    # 如果采用密钥形式,需要添加,否则需要去掉该参数
+    secret:

BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/AdminApplication.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/config/AdminConfiguration.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/config/DingTalkConfiguration.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/config/SecurityConfiguration.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/DingTalkNotifier.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/DingTalkService.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/MonitorProperties$DingTalk.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/MonitorProperties$Service.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/dingtalk/MonitorProperties.class


BIN
blade-ops/blade-admin/target/classes/org/springblade/admin/security/InternalAuthorizationManager.class


+ 0 - 89
blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java

@@ -1,89 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.test;
-
-
-import org.springblade.develop.support.BladeCodeGenerator;
-
-/**
- * 代码生成器
- *
- * @author Chill
- */
-public class CodeGenerator {
-
-    /**
-     * 代码生成的模块名
-     */
-    public static String CODE_NAME = "资源管理";
-    /**
-     * 代码所在服务名
-     */
-    public static String SERVICE_NAME = "blade-develop";
-    /**
-     * 代码生成的包名
-     */
-    public static String PACKAGE_NAME = "org.springblade.develop";
-    /**
-     * 前端代码生成所属系统
-     */
-    public static String SYSTEM_NAME = "saber";
-    /**
-     * 前端代码生成地址
-     */
-    public static String PACKAGE_WEB_DIR = "/Users/chill/Workspaces/product/Saber";
-    /**
-     * 需要去掉的表前缀
-     */
-    public static String[] TABLE_PREFIX = {"blade_"};
-    /**
-     * 需要生成的表名(两者只能取其一)
-     */
-    public static String[] INCLUDE_TABLES = {"blade_datasource"};
-    /**
-     * 需要排除的表名(两者只能取其一)
-     */
-    public static String[] EXCLUDE_TABLES = {};
-    /**
-     * 是否包含基础业务字段
-     */
-    public static Boolean HAS_SUPER_ENTITY = Boolean.TRUE;
-    /**
-     * 基础业务字段
-     */
-    public static String[] SUPER_ENTITY_COLUMNS = {"id", "create_time", "create_user", "create_dept", "update_time", "update_user", "status", "is_deleted"};
-
-
-    /**
-     * RUN THIS
-     */
-    public static void main11(String[] args) {
-        BladeCodeGenerator generator = new BladeCodeGenerator();
-        generator.setCodeName(CODE_NAME);
-        generator.setServiceName(SERVICE_NAME);
-        generator.setSystemName(SYSTEM_NAME);
-        generator.setPackageName(PACKAGE_NAME);
-        generator.setPackageWebDir(PACKAGE_WEB_DIR);
-        generator.setTablePrefix(TABLE_PREFIX);
-        generator.setIncludeTables(INCLUDE_TABLES);
-        generator.setExcludeTables(EXCLUDE_TABLES);
-        generator.setHasSuperEntity(HAS_SUPER_ENTITY);
-        generator.setSuperEntityColumns(SUPER_ENTITY_COLUMNS);
-        generator.run();
-    }
-
-}

+ 0 - 5
blade-ops/blade-develop/src/test/resources/templates/code.properties

@@ -1,5 +0,0 @@
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-spring.datasource.username=root
-spring.datasource.password=123456
-author=BladeX

+ 0 - 46
blade-ops/blade-flow/src/test/java/org/springblade/flow/test/BladeTest.java

@@ -1,46 +0,0 @@
-package org.springblade.flow.test;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springblade.core.test.BladeBootTest;
-import org.springblade.core.test.BladeSpringRunner;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flow.engine.entity.FlowModel;
-import org.springblade.flow.engine.service.FlowEngineService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-/**
- * Blade单元测试
- *
- * @author Chill
- */
-@RunWith(BladeSpringRunner.class)
-@BladeBootTest(appName = "blade-flow", enableLoader = true)
-public class BladeTest {
-
-    @Autowired
-    private FlowEngineService service;
-
-    @Test
-    public void contextLoads() {
-        System.out.println("=====数据迁移启动=====");
-
-        // 获取 ACT_DE_MODEL 表需要转换的数据
-        List<FlowModel> list = service.list();
-        // 循环转换
-        list.forEach(flowModel -> {
-            if (StringUtil.isBlank(flowModel.getModelEditorXml())) {
-                service.update(Wrappers.<FlowModel>lambdaUpdate()
-                        .set(FlowModel::getModelEditorXml, new String(service.getModelEditorXML(flowModel)))
-                        .ge(FlowModel::getId, flowModel.getId())
-                );
-            }
-        });
-
-        System.out.println("=====数据迁移完毕=====");
-    }
-
-}

+ 0 - 43
blade-ops/blade-flow/src/test/java/org/springblade/flow/test/launch/LauncherTestServiceImpl.java

@@ -1,43 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.flow.test.launch;
-
-import org.springblade.common.constant.LauncherConstant;
-import org.springblade.core.auto.service.AutoService;
-import org.springblade.core.launch.service.LauncherService;
-import org.springblade.core.launch.utils.PropsUtil;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-
-import java.util.Properties;
-
-/**
- * 启动参数拓展
- *
- * @author smallchil
- */
-@AutoService(LauncherService.class)
-public class LauncherTestServiceImpl implements LauncherService {
-
-    @Override
-    public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
-        Properties props = System.getProperties();
-        PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
-        PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
-        PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");
-    }
-
-}

+ 1 - 0
blade-ops/blade-flow/target/classes/META-INF/spring-devtools.properties

@@ -0,0 +1 @@
+restart.include.blade-flow=/blade-flow[\\w-]+\.jar

+ 12 - 0
blade-ops/blade-flow/target/classes/META-INF/spring.factories

@@ -0,0 +1,12 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  org.springblade.flow.engine.config.FlowableConfiguration,\
+  org.springblade.flow.business.feign.NewFlowClientImpl,\
+  org.springblade.flow.engine.controller.FlowFollowController,\
+  org.springblade.flow.FlowApplication,\
+  org.springblade.flow.engine.controller.FlowManagerController,\
+  org.springblade.flow.business.feign.FlowClient,\
+  org.springblade.flow.business.service.impl.FlowBusinessServiceImpl,\
+  org.springblade.flow.engine.controller.FlowModelController,\
+  org.springblade.flow.engine.controller.FlowProcessController,\
+  org.springblade.flow.engine.service.impl.FlowEngineServiceImpl,\
+  org.springblade.flow.business.controller.WorkController

+ 0 - 0
blade-ops/blade-flow/src/test/resources/application-dev.yml → blade-ops/blade-flow/target/classes/application-dev.yml


+ 0 - 0
blade-ops/blade-flow/src/test/resources/application-prod.yml → blade-ops/blade-flow/target/classes/application-prod.yml


+ 0 - 0
blade-ops/blade-flow/src/test/resources/application-test.yml → blade-ops/blade-flow/target/classes/application-test.yml


+ 0 - 0
blade-ops/blade-flow/src/test/resources/application.yml → blade-ops/blade-flow/target/classes/application.yml


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/FlowApplication.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/business/controller/WorkController.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/business/feign/FlowClient.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/business/feign/NewFlowClientImpl.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/business/service/FlowBusinessService.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/config/FlowableConfiguration.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/constant/FlowEngineConstant.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowFollowController.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowManagerController.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowModelController.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/controller/FlowProcessController.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/entity/FlowExecution.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/entity/FlowModel.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/entity/FlowProcess.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/mapper/FlowMapper.class


+ 50 - 0
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/mapper/FlowMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.flow.engine.mapper.FlowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="flowModelResultMap" type="org.springblade.flow.engine.entity.FlowModel">
+        <result column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="model_key" property="modelKey"/>
+        <result column="description" property="description"/>
+        <result column="model_comment" property="modelComment"/>
+        <result column="created" property="created"/>
+        <result column="created_by" property="createdBy"/>
+        <result column="last_updated" property="lastUpdated"/>
+        <result column="last_updated_by" property="lastUpdatedBy"/>
+        <result column="version" property="version"/>
+        <result column="model_editor_json" property="modelEditorJson"/>
+        <result column="thumbnail" property="thumbnail"/>
+        <result column="model_type" property="modelType"/>
+        <result column="tenant_id" property="tenantId"/>
+    </resultMap>
+
+    <select id="selectFlowPage" resultMap="flowModelResultMap">
+        SELECT a.id,
+               a.name,
+               a.model_key,
+               a.description,
+               a.model_comment,
+               a.created,
+               a.created_by,
+               a.last_updated,
+               a.last_updated_by,
+               a.version,
+               a.model_editor_json,
+               a.thumbnail,
+               a.model_type,
+               a.tenant_id
+        FROM ACT_DE_MODEL a
+        WHERE 1 = 1
+        ORDER BY a.created DESC
+    </select>
+
+    <select id="findByParentModelId" parameterType="string" resultMap="flowModelResultMap">
+        select model.*
+        from ACT_DE_MODEL_RELATION modelrelation
+                 inner join ACT_DE_MODEL model on modelrelation.model_id = model.id
+        where modelrelation.parent_model_id = #{_parameter}
+    </select>
+
+</mapper>

BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/service/FlowEngineService.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.class


BIN
blade-ops/blade-flow/target/classes/org/springblade/flow/engine/utils/FlowCache.class


+ 130 - 0
blade-ops/blade-flow/target/classes/processes/LeaveProcess.bpmn20.xml

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn"
+             xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+             xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
+             typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
+             targetNamespace="http://www.flowable.org/processdef">
+    <process id="Leave" name="请假流程" isExecutable="true">
+        <documentation>请假流程</documentation>
+        <startEvent id="start" name="开始" flowable:initiator="applyUser"></startEvent>
+        <userTask id="hrTask" name="人事审批" flowable:assignee="${taskUser}">
+            <extensionElements>
+                <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler">
+                    <![CDATA[false]]></modeler:initiator-can-complete>
+            </extensionElements>
+        </userTask>
+        <exclusiveGateway id="judgeTask"></exclusiveGateway>
+        <userTask id="managerTak" name="经理审批" flowable:candidateGroups="manager"></userTask>
+        <userTask id="bossTask" name="老板审批" flowable:candidateGroups="boss"></userTask>
+        <endEvent id="end" name="结束"></endEvent>
+        <sequenceFlow id="flow1" sourceRef="start" targetRef="hrTask"></sequenceFlow>
+        <sequenceFlow id="managerPassFlow" name="通过" sourceRef="managerTak" targetRef="end">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass}]]></conditionExpression>
+        </sequenceFlow>
+        <userTask id="userTask" name="调整申请" flowable:assignee="${applyUser}">
+            <extensionElements>
+                <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler">
+                    <![CDATA[false]]></modeler:initiator-can-complete>
+            </extensionElements>
+        </userTask>
+        <sequenceFlow id="bossPassFlow" name="通过" sourceRef="bossTask" targetRef="end">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="judgeMore" name="大于3天" sourceRef="judgeTask" targetRef="bossTask">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${days > 3}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="managerNotPassFlow" name="驳回" sourceRef="managerTak" targetRef="userTask">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!pass}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="bossNotPassFlow" name="驳回" sourceRef="bossTask" targetRef="userTask">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!pass}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="hrPassFlow" name="同意" sourceRef="hrTask" targetRef="judgeTask">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="hrNotPassFlow" name="驳回" sourceRef="hrTask" targetRef="userTask">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!pass}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="judgeLess" name="小于3天" sourceRef="judgeTask" targetRef="managerTak">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${days <= 3}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="userPassFlow" name="重新申请" sourceRef="userTask" targetRef="hrTask">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass}]]></conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="userNotPassFlow" name="关闭申请" sourceRef="userTask" targetRef="end">
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!pass}]]></conditionExpression>
+        </sequenceFlow>
+    </process>
+    <bpmndi:BPMNDiagram id="BPMNDiagram_Leave">
+        <bpmndi:BPMNPlane bpmnElement="Leave" id="BPMNPlane_Leave">
+            <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
+                <omgdc:Bounds height="30.0" width="30.0" x="300.0" y="135.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="hrTask" id="BPMNShape_hrTask">
+                <omgdc:Bounds height="80.0" width="100.0" x="360.0" y="165.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="judgeTask" id="BPMNShape_judgeTask">
+                <omgdc:Bounds height="40.0" width="40.0" x="255.0" y="300.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="managerTak" id="BPMNShape_managerTak">
+                <omgdc:Bounds height="80.0" width="100.0" x="555.0" y="75.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="bossTask" id="BPMNShape_bossTask">
+                <omgdc:Bounds height="80.0" width="100.0" x="450.0" y="420.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
+                <omgdc:Bounds height="28.0" width="28.0" x="705.0" y="390.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="userTask" id="BPMNShape_userTask">
+                <omgdc:Bounds height="80.0" width="100.0" x="510.0" y="270.0"></omgdc:Bounds>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
+                <omgdi:waypoint x="327.9390183144677" y="157.4917313275668"></omgdi:waypoint>
+                <omgdi:waypoint x="360.0" y="176.05263157894737"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="hrPassFlow" id="BPMNEdge_hrPassFlow">
+                <omgdi:waypoint x="363.04347826086956" y="244.95000000000002"></omgdi:waypoint>
+                <omgdi:waypoint x="285.77299999999997" y="310.79999999999995"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="hrNotPassFlow" id="BPMNEdge_hrNotPassFlow">
+                <omgdi:waypoint x="459.95" y="236.21875000000006"></omgdi:waypoint>
+                <omgdi:waypoint x="513.9794844818516" y="270.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="judgeLess" id="BPMNEdge_judgeLess">
+                <omgdi:waypoint x="274.3359375" y="300.66397214564284"></omgdi:waypoint>
+                <omgdi:waypoint x="274.3359375" y="115.0"></omgdi:waypoint>
+                <omgdi:waypoint x="554.9999999999982" y="115.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="userPassFlow" id="BPMNEdge_userPassFlow">
+                <omgdi:waypoint x="510.0" y="310.0"></omgdi:waypoint>
+                <omgdi:waypoint x="411.0" y="310.0"></omgdi:waypoint>
+                <omgdi:waypoint x="411.0" y="244.95000000000002"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="bossPassFlow" id="BPMNEdge_bossPassFlow">
+                <omgdi:waypoint x="549.9499999999998" y="447.2146118721461"></omgdi:waypoint>
+                <omgdi:waypoint x="705.4331577666419" y="407.4567570622598"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="judgeMore" id="BPMNEdge_judgeMore">
+                <omgdi:waypoint x="287.29730895645025" y="327.65205479452055"></omgdi:waypoint>
+                <omgdi:waypoint x="450.0" y="428.8888888888889"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="managerPassFlow" id="BPMNEdge_managerPassFlow">
+                <omgdi:waypoint x="620.7588235294118" y="154.95"></omgdi:waypoint>
+                <omgdi:waypoint x="713.8613704477151" y="390.96328050279476"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="userNotPassFlow" id="BPMNEdge_userNotPassFlow">
+                <omgdi:waypoint x="609.95" y="339.5301886792453"></omgdi:waypoint>
+                <omgdi:waypoint x="706.9383699359797" y="396.87411962686997"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="bossNotPassFlow" id="BPMNEdge_bossNotPassFlow">
+                <omgdi:waypoint x="515.98" y="420.0"></omgdi:waypoint>
+                <omgdi:waypoint x="544.0" y="349.95000000000005"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="managerNotPassFlow" id="BPMNEdge_managerNotPassFlow">
+                <omgdi:waypoint x="595.438344721373" y="154.95"></omgdi:waypoint>
+                <omgdi:waypoint x="567.9366337262223" y="270.0"></omgdi:waypoint>
+            </bpmndi:BPMNEdge>
+        </bpmndi:BPMNPlane>
+    </bpmndi:BPMNDiagram>
+</definitions>

+ 7 - 0
blade-ops/blade-resource/target/classes/application-dev.yml

@@ -0,0 +1,7 @@
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
+

+ 7 - 0
blade-ops/blade-resource/target/classes/application-prod.yml

@@ -0,0 +1,7 @@
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.prod.url}
+    username: ${blade.datasource.prod.username}
+    password: ${blade.datasource.prod.password}
+

+ 6 - 0
blade-ops/blade-resource/target/classes/application-test.yml

@@ -0,0 +1,6 @@
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.test.url}
+    username: ${blade.datasource.test.username}
+    password: ${blade.datasource.test.password}

+ 13 - 0
blade-ops/blade-resource/target/classes/application.yml

@@ -0,0 +1,13 @@
+#服务器端口
+server:
+  port: 8099
+
+#默认对象存储配置
+#oss:
+#  enabled: true
+#  name: minio
+#  tenant-mode: true
+#  endpoint: http://127.0.0.1:9000
+#  access-key: D99KGE6ZTQXSATTJWU24
+#  secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
+#  bucket-name: bladex

BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/ResourceApplication.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/AliOssBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/AmazonS3OssBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/BladeOssRuleRe.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/HuaweiObsBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/MinioOssBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/OssBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/QiniuOssBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/TencentCosBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/oss/TencentOssBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/AliossTemplateRe.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/MinioTemplateRe$1.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/MinioTemplateRe.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/ossre/OssTemplateRe.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/AliSmsBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/QiniuSmsBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/SmsBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/TencentSmsBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/builder/sms/YunpianSmsBuilder.class


BIN
blade-ops/blade-resource/target/classes/org/springblade/resource/config/BladeOssConfiguration.class


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff