去除 flowable,相关秘钥配置，jdk版本调整，redis,mysql 相关配置配置

zrj

2024-10-24 63870f3f31237a641284d16fcd5f14892b99ee5a

去除 flowable,相关秘钥配置，jdk版本调整，redis,mysql 相关配置配置

 pom.xml

@@ -13,7 +13,7 @@
        <bladex.project.id>blade-api</bladex.project.id>
        <bladex.project.version>3.4.0.RELEASE</bladex.project.version>

        <java.version>1.8</java.version>
        <java.version>11</java.version>
        <maven.plugin.version>3.8.1</maven.plugin.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -110,10 +110,10 @@
            <artifactId>blade-starter-report</artifactId>
        </dependency>
        <!-- 工作流 -->
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-flowable</artifactId>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>org.springblade</groupId>-->
<!--            <artifactId>blade-starter-flowable</artifactId>-->
<!--        </dependency>-->
        <!-- 验证码 -->
        <dependency>
            <groupId>com.github.whvcse</groupId>

 src/main/java/org/springblade/flow/business/controller/WorkController.java

File was deleted

 src/main/java/org/springblade/flow/business/service/FlowBusinessService.java

File was deleted

 src/main/java/org/springblade/flow/business/service/IFlowService.java

File was deleted

 src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java

File was deleted

 src/main/java/org/springblade/flow/business/service/impl/FlowServiceImpl.java

File was deleted

 src/main/java/org/springblade/flow/core/constant/ProcessConstant.java

File was deleted

 src/main/java/org/springblade/flow/core/entity/BladeFlow.java

File was deleted

 src/main/java/org/springblade/flow/core/entity/FlowEntity.java

File was deleted

 src/main/java/org/springblade/flow/core/enums/FlowModeEnum.java

File was deleted

 src/main/java/org/springblade/flow/core/utils/FlowUtil.java

File was deleted

 src/main/java/org/springblade/flow/core/utils/TaskUtil.java

File was deleted

 src/main/java/org/springblade/flow/demo/leave/controller/LeaveController.java

File was deleted

 src/main/java/org/springblade/flow/demo/leave/entity/ProcessLeave.java

File was deleted

 src/main/java/org/springblade/flow/demo/leave/mapper/LeaveMapper.java

File was deleted

 src/main/java/org/springblade/flow/demo/leave/mapper/LeaveMapper.xml

File was deleted

 src/main/java/org/springblade/flow/demo/leave/service/ILeaveService.java

File was deleted

 src/main/java/org/springblade/flow/demo/leave/service/impl/LeaveServiceImpl.java

File was deleted

 src/main/java/org/springblade/flow/demo/package-info.java

File was deleted

 src/main/java/org/springblade/flow/engine/config/FlowableConfiguration.java

File was deleted

 src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java

File was deleted

 src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java

File was deleted

 src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java

File was deleted

 src/main/java/org/springblade/flow/engine/controller/FlowModelController.java

File was deleted

 src/main/java/org/springblade/flow/engine/controller/FlowProcessController.java

File was deleted

 src/main/java/org/springblade/flow/engine/entity/FlowExecution.java

File was deleted

 src/main/java/org/springblade/flow/engine/entity/FlowModel.java

File was deleted

 src/main/java/org/springblade/flow/engine/entity/FlowProcess.java

File was deleted

 src/main/java/org/springblade/flow/engine/mapper/FlowMapper.java

File was deleted

 src/main/java/org/springblade/flow/engine/mapper/FlowMapper.xml

File was deleted

 src/main/java/org/springblade/flow/engine/service/FlowEngineService.java

File was deleted

 src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java

File was deleted

 src/main/java/org/springblade/flow/engine/utils/FlowCache.java

File was deleted

 src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@
    host: 127.0.0.1
    port: 6379
    password:
    database: 0
    database: 3
    ssl: false
    ##redis 集群环境配置
    #cluster:
@@ -13,9 +13,9 @@
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://139.196.74.78:3306/zhyq_dev?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: root
    password: jxpskj_2018
    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
    #username: postgres

 src/main/resources/application-prod.yml

@@ -6,17 +6,17 @@
    ##生产环境推荐使用阿里云高可用redis服务并设置密码
    host: 127.0.0.1
    port: 6379
    password:
    database: 0
    password: jxpskj_2018
    database: 6
    ssl: false
    ##redis 集群环境配置
    #cluster:
    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
    #  commandTimeout: 5000
  datasource:
    url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://127.0.0.1:3306/zhyq_prod?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: root
    password: jxpskj_2018

#第三方登陆
social:

 src/main/resources/application.yml

@@ -1,6 +1,6 @@
#服务器配置
server:
  port: 80
  port: 15870
  undertow:
    threads:
      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
@@ -191,9 +191,9 @@
    #单用户登录范围
    single-level: all
    #token签名 使用 @org.springblade.test.SignKeyGenerator 获取
    sign-key: 请配置32位签名
    sign-key: JduYPzYW51Ez1yaMvwWGB9ORkdzlmp1A
    #token加密 使用 @org.springblade.test.CryptoKeyGenerator 获取
    crypto-key: 请配置cryptoKey
    crypto-key: XibqUXy97uEt8usFfO89cnJQLoyC3IGu
  #接口配置
  api:
    #报文加密配置
@@ -201,9 +201,9 @@
      #启用报文加密配置
      enabled: false
      #使用 @org.springblade.test.CryptoKeyGenerator 获取,需和前端保持一致
      aes-key: 请配置aesKey
      aes-key: yturE1LvhdJpSRHkdGgf41eRYGr9TlBy
      #使用 @org.springblade.test.CryptoKeyGenerator 获取,需和前端保持一致
      des-key: 请配置desKey
      des-key: fF1D8t8ufz36Foed
  #jackson配置
  jackson:
    #null自动转空值

 src/test/java/org/springblade/test/BladeTest.java

@@ -1,46 +1,46 @@
package org.springblade.test;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springblade.core.test.BladeBootTest;
import org.springblade.core.test.BladeSpringExtension;
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
 */
@ExtendWith(BladeSpringExtension.class)
@BladeBootTest(appName = "blade-runner", 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("=====数据迁移完毕=====");
    }

}
//package org.springblade.test;
//
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import org.junit.jupiter.api.Test;
//import org.junit.jupiter.api.extension.ExtendWith;
//import org.springblade.core.test.BladeBootTest;
//import org.springblade.core.test.BladeSpringExtension;
//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
// */
//@ExtendWith(BladeSpringExtension.class)
//@BladeBootTest(appName = "blade-runner", 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("=====数据迁移完毕=====");
//    }
//
//}