Pārlūkot izejas kodu

bug:#4、#5 修改补充

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

+ 0 - 8
blade-auth/blade-auth.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>

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

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

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

@@ -1,5 +0,0 @@
-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


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

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

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

@@ -1,8 +0,0 @@
-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


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

@@ -1,45 +0,0 @@
-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 - 1
blade-ops/blade-flow/target/classes/META-INF/spring-devtools.properties

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

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

@@ -1,12 +0,0 @@
-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 - 6
blade-ops/blade-flow/target/classes/application-dev.yml

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

+ 0 - 6
blade-ops/blade-flow/target/classes/application-prod.yml

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

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

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

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

@@ -1,13 +0,0 @@
-#服务器端口
-server:
-  port: 8008
-
-#flowable配置
-flowable:
-  activity-font-name: \u5B8B\u4F53
-  label-font-name: \u5B8B\u4F53
-  annotation-font-name: \u5B8B\u4F53
-  check-process-definitions: false
-  database-schema-update: false
-  async-executor-activate: false
-  async-history-executor-activate: false

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


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

@@ -1,50 +0,0 @@
-<?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


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

@@ -1,130 +0,0 @@
-<?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>

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

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

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

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

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

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

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

@@ -1,13 +0,0 @@
-#服务器端口
-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


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


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


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


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels