流程模块

bladex/blade-common/src/main/java/org/springblade/common/constant/ApiConstant.java

@@ -36,7 +36,7 @@ public class ApiConstant {
         /**
          * 流程工作流
          */
-        public static final String FLOW_APP_NAME = APPLICATION_NAME_PREFIX_SAAS + "socket";
+        public static final String FLOW_APP_NAME = APPLICATION_NAME_PREFIX_SAAS + "flow";
 
     }
     /**
@@ -57,5 +57,10 @@ public class ApiConstant {
          * 业务服务请求路径前缀
          */
         public static final String SAAS_STORAGE_REQUEST_PREFIX = "/hx/storage";
+
+        /**
+         * 流程审批路径
+         */
+        public static final String SAAS_FLOW_REQUEST_PREFIX = "/hx/flow";
     }
 }

bladex/blade-common/src/main/java/org/springblade/common/utils/MapUtil.java

@@ -0,0 +1,52 @@
+package org.springblade.common.utils;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author:caozj
+ * @DATE:2022/7/19 20:13
+ */
+public class MapUtil {
+    /**
+     * 通用返回结果类
+     * @param objs
+     * @return
+     */
+    public static List<Map<String, Object>> activitiResult(List<?> objs) {
+        // 用于存放多个对象的集合
+        List<Map<String, Object>> pdResult = new ArrayList<>();
+        // 遍历方法参数中的集合
+        for (Object obj : objs) {
+            // 用于封装单个对象 get 方法返回值的 Map 集合
+            Map<String, Object> pdMap = new HashMap<>();
+            // 通过反射获取该对象的方法对象数组
+            Method[] methods = obj.getClass().getMethods();
+            // 遍历方法对象数组
+            for (Method method : methods) {
+                // 获取方法名称
+                String methodName = method.getName();
+                // 判断该方法是否名称不为 null ，并且名称是以 get 开头，满足条件进入 if 中
+                if (methodName != null && methodName.startsWith("get")) {
+                    // 设置方法的访问权限
+                    method.setAccessible(true);
+                    try {
+                        // 将方法名的 get 前缀去掉，并增加 pd 前缀
+                        String pdKey = "pb".concat(methodName.substring(3));
+                        // 将 get 方法的名称作为 Map 的 key，将返回值作为 value 进行封装
+                        pdMap.put(pdKey, method.invoke(obj, null));
+                    } catch (Exception e) {
+                        //输出异常,由于使得后台过乱，所以关掉
+//                        e.printStackTrace();
+                    }
+                }
+            }
+            // 将封装好的 Map 集合添加到 List 集合中
+            pdResult.add(pdMap);
+        }
+        return pdResult;
+    }
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/base/BasicEntity.java

@@ -23,12 +23,12 @@ public class BasicEntity implements Serializable {
      * 创建时间
      */
     @TableField("CreatedTime")
-    private Date CreatedTime;
+    private Date createdTime;
 
     /**
      * 更新时间
      */
     @TableField("UpdatedTime")
-    private Date UpdatedTime;
+    private Date updatedTime;
 
 }

hx-saas-project/saas-entity/src/main/java/com/fjhx/flow/entity/Flow.java

@@ -0,0 +1,73 @@
+/*
+ *      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 com.fjhx.flow.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fjhx.base.BasicEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 业务附件表实体类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Data
+@TableName("act_flow")
+public class Flow extends BasicEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 流程名称
+	*/
+	@ApiModelProperty(value = "流程名称")
+	private String flowName;
+	/**
+	* 流程标识
+	*/
+	@ApiModelProperty(value = "流程标识")
+	private String flowIdentifying;
+	/**
+	* 开始节点
+	*/
+	@ApiModelProperty(value = "开始节点")
+	private String startNodeId;
+	/**
+	* 结束节点
+	*/
+	@ApiModelProperty(value = "结束节点")
+	private String endNodeId;
+	/**
+	* Model表名称
+	*/
+	@ApiModelProperty(value = "Model表名称")
+	private String modelName;
+	/**
+	* 待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）
+	*/
+	@ApiModelProperty(value = "待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）")
+	private Integer dealWithType;
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/flow/entity/FlowApplycheck.java

@@ -0,0 +1,101 @@
+/*
+ *      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 com.fjhx.flow.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fjhx.base.BasicEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 流程审批实体类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Data
+@TableName("act_flow_applycheck")
+public class FlowApplycheck extends BasicEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 软删除
+	*/
+	@ApiModelProperty(value = "软删除")
+	private Boolean isDelete;
+
+	/**
+	* 流程编号
+	*/
+	@ApiModelProperty(value = "流程编号")
+	private String flowId;
+	/**
+	* 当前节点
+	*/
+	@ApiModelProperty(value = "当前节点")
+	private String nodeId;
+	/**
+	* 上个节点
+	*/
+	@ApiModelProperty(value = "上个节点")
+	private String preNodeId;
+	/**
+	* 下个节点
+	*/
+	@ApiModelProperty(value = "下个节点")
+	private String nextNodeId;
+	/**
+	* 审批人
+	*/
+	@ApiModelProperty(value = "审批人")
+	private String checkUserId;
+	/**
+	* 审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）
+	*/
+	@ApiModelProperty(value = "审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）")
+	private Integer checkState;
+	/**
+	* 审核时间
+	*/
+	@ApiModelProperty(value = "审核时间")
+	private LocalDateTime checkTime;
+	/**
+	* 意见
+	*/
+	@ApiModelProperty(value = "意见")
+	private String suggestions;
+	/**
+	* 关联编号
+	*/
+	@ApiModelProperty(value = "关联编号")
+	private String linkId;
+	/**
+	* 审批事项
+	*/
+	@ApiModelProperty(value = "审批事项")
+	private String approvalItem;
+
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/flow/entity/FlowNode.java

@@ -0,0 +1,72 @@
+/*
+ *      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 com.fjhx.flow.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fjhx.base.BasicEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 流程节点表实体类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Data
+@TableName("act_flow_node")
+public class FlowNode extends BasicEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 软删除
+	*/
+	@ApiModelProperty(value = "软删除")
+	@TableField("IsDelete")
+	private Boolean isdelete;
+
+	/**
+	* 流程编号
+	*/
+	@ApiModelProperty(value = "流程编号")
+	private String flowId;
+	/**
+	* 节点名称
+	*/
+	@ApiModelProperty(value = "节点名称")
+	private String nodeName;
+	/**
+	* 驳回节点
+	*/
+	@ApiModelProperty(value = "驳回节点")
+	private String backNodeId;
+	/**
+	* 审核人角色
+	*/
+	@ApiModelProperty(value = "审核人角色")
+	private String roleKey;
+
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/flow/entity/FlowNodeline.java

@@ -0,0 +1,82 @@
+/*
+ *      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 com.fjhx.flow.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fjhx.base.BasicEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 流程节点连线实体类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Data
+@TableName("act_flow_nodeline")
+public class FlowNodeline extends BasicEntity {
+
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	* 软删除
+	*/
+	@ApiModelProperty(value = "软删除")
+	@TableField("IsDelete")
+	private Boolean isdelete;
+	/**
+	* 流程编号
+	*/
+	@ApiModelProperty(value = "流程编号")
+	private String flowId;
+	/**
+	* 到哪个节点
+	*/
+	@ApiModelProperty(value = "到哪个节点")
+	private String toNodeId;
+	/**
+	* 从哪个节点
+	*/
+	@ApiModelProperty(value = "从哪个节点")
+	private String fromNodeId;
+	/**
+	* 条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）
+	*/
+	@ApiModelProperty(value = "条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）")
+	private Integer conditionType;
+	/**
+	* 条件值
+	*/
+	@ApiModelProperty(value = "条件值")
+	private String conditionValue;
+	/**
+	* 条件字段
+	*/
+	@ApiModelProperty(value = "条件字段")
+	private String conditionKey;
+
+
+}

hx-saas-project/saas-flow/pom.xml

@@ -37,6 +37,17 @@
             <artifactId>activiti-image-generator</artifactId>
             <version>${flow.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-engine</artifactId>
+            <version>${flow.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/controller/FlowApplycheckController.java

@@ -0,0 +1,89 @@
+/*
+ *      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 com.fjhx.flow.controller;
+
+import com.fjhx.flow.entity.FlowApplycheck;
+import com.fjhx.flow.service.IFlowApplycheckService;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 流程审批 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX+"/flowapplycheck")
+public class FlowApplycheckController extends BladeController {
+
+	private final IFlowApplycheckService flowApplycheckService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	public R<FlowApplycheck> detail(FlowApplycheck flowApplycheck) {
+		FlowApplycheck detail = flowApplycheckService.getOne(Condition.getQueryWrapper(flowApplycheck));
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 新增 流程审批
+	 */
+	@PostMapping("/save")
+	public R save(@Valid @RequestBody FlowApplycheck flowApplycheck) {
+		return R.status(flowApplycheckService.save(flowApplycheck));
+	}
+
+	/**
+	 * 修改 流程审批
+	 */
+	@PostMapping("/update")
+	public R update(@Valid @RequestBody FlowApplycheck flowApplycheck) {
+		return R.status(flowApplycheckService.updateById(flowApplycheck));
+	}
+
+	/**
+	 * 新增或修改 流程审批
+	 */
+	@PostMapping("/submit")
+	public R submit(@Valid @RequestBody FlowApplycheck flowApplycheck) {
+		return R.status(flowApplycheckService.saveOrUpdate(flowApplycheck));
+	}
+
+	
+	/**
+	 * 删除 流程审批
+	 */
+	@PostMapping("/remove")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(flowApplycheckService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/controller/FlowController.java

@@ -0,0 +1,89 @@
+/*
+ *      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 com.fjhx.flow.controller;
+
+import com.fjhx.flow.entity.Flow;
+import com.fjhx.flow.service.IFlowService;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 业务附件表 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX+"/flow")
+public class FlowController extends BladeController {
+
+	private final IFlowService flowService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	public R<Flow> detail(Flow flow) {
+		Flow detail = flowService.getOne(Condition.getQueryWrapper(flow));
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 新增 业务附件表
+	 */
+	@PostMapping("/save")
+	public R save(@Valid @RequestBody Flow flow) {
+		return R.status(flowService.save(flow));
+	}
+
+	/**
+	 * 修改 业务附件表
+	 */
+	@PostMapping("/update")
+	public R update(@Valid @RequestBody Flow flow) {
+		return R.status(flowService.updateById(flow));
+	}
+
+	/**
+	 * 新增或修改 业务附件表
+	 */
+	@PostMapping("/submit")
+	public R submit(@Valid @RequestBody Flow flow) {
+		return R.status(flowService.saveOrUpdate(flow));
+	}
+
+	
+	/**
+	 * 删除 业务附件表
+	 */
+	@PostMapping("/remove")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(flowService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/controller/FlowNodeController.java

@@ -0,0 +1,92 @@
+/*
+ *      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 com.fjhx.flow.controller;
+
+import com.fjhx.flow.entity.FlowNode;
+import com.fjhx.flow.service.IFlowNodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 流程节点表 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX+"/flownode")
+@Api(value = "流程节点表", tags = "流程节点表接口")
+public class FlowNodeController extends BladeController {
+
+	private final IFlowNodeService flowNodeService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	public R<FlowNode> detail(FlowNode flowNode) {
+		FlowNode detail = flowNodeService.getOne(Condition.getQueryWrapper(flowNode));
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 新增 流程节点表
+	 */
+	@PostMapping("/save")
+	public R save(@Valid @RequestBody FlowNode flowNode) {
+		return R.status(flowNodeService.save(flowNode));
+	}
+
+	/**
+	 * 修改 流程节点表
+	 */
+	@PostMapping("/update")
+	public R update(@Valid @RequestBody FlowNode flowNode) {
+		return R.status(flowNodeService.updateById(flowNode));
+	}
+
+	/**
+	 * 新增或修改 流程节点表
+	 */
+	@PostMapping("/submit")
+	public R submit(@Valid @RequestBody FlowNode flowNode) {
+		return R.status(flowNodeService.saveOrUpdate(flowNode));
+	}
+
+	
+	/**
+	 * 删除 流程节点表
+	 */
+	@PostMapping("/remove")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(flowNodeService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/controller/FlowNodelineController.java

@@ -0,0 +1,91 @@
+/*
+ *      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 com.fjhx.flow.controller;
+
+import com.fjhx.flow.entity.FlowNodeline;
+import com.fjhx.flow.service.IFlowNodelineService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 流程节点连线 控制器
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX+"/flownodeline")
+@Api(value = "流程节点连线", tags = "流程节点连线接口")
+public class FlowNodelineController extends BladeController {
+
+	private final IFlowNodelineService flowNodelineService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	public R<FlowNodeline> detail(FlowNodeline flowNodeline) {
+		FlowNodeline detail = flowNodelineService.getOne(Condition.getQueryWrapper(flowNodeline));
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 新增 流程节点连线
+	 */
+	@PostMapping("/save")
+	public R save(@Valid @RequestBody FlowNodeline flowNodeline) {
+		return R.status(flowNodelineService.save(flowNodeline));
+	}
+
+	/**
+	 * 修改 流程节点连线
+	 */
+	@PostMapping("/update")
+	public R update(@Valid @RequestBody FlowNodeline flowNodeline) {
+		return R.status(flowNodelineService.updateById(flowNodeline));
+	}
+
+	/**
+	 * 新增或修改 流程节点连线
+	 */
+	@PostMapping("/submit")
+	public R submit(@Valid @RequestBody FlowNodeline flowNodeline) {
+		return R.status(flowNodelineService.saveOrUpdate(flowNodeline));
+	}
+
+	
+	/**
+	 * 删除 流程节点连线
+	 */
+	@PostMapping("/remove")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(flowNodelineService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.java

@@ -0,0 +1,31 @@
+/*
+ *      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 com.fjhx.flow.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.flow.entity.FlowApplycheck;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 流程审批 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface FlowApplycheckMapper extends BaseMapper<FlowApplycheck> {
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.xml

@@ -0,0 +1,23 @@
+<?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="com.fjhx.flow.mapper.FlowApplycheckMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="flowApplycheckResultMap" type="com.fjhx.flow.entity.FlowApplycheck">
+        <id column="ID" property="id"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="CreatedTime" property="createdTime"/>
+        <result column="UpdatedTime" property="updatedTime"/>
+        <result column="flow_id" property="flowId"/>
+        <result column="node_id" property="nodeId"/>
+        <result column="pre_node_id" property="preNodeId"/>
+        <result column="next_node_id" property="nextNodeId"/>
+        <result column="check_user_id" property="checkUserId"/>
+        <result column="check_state" property="checkState"/>
+        <result column="check_time" property="checkTime"/>
+        <result column="suggestions" property="suggestions"/>
+        <result column="link_id" property="linkId"/>
+        <result column="approval_item" property="approvalItem"/>
+    </resultMap>
+
+</mapper>

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.java

@@ -0,0 +1,31 @@
+/*
+ *      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 com.fjhx.flow.mapper;
+
+import com.fjhx.flow.entity.Flow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 业务附件表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface FlowMapper extends BaseMapper<Flow> {
+
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.xml

@@ -0,0 +1,18 @@
+<?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="com.fjhx.flow.mapper.FlowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="flowResultMap" type="com.fjhx.flow.entity.Flow">
+        <id column="id" property="id"/>
+        <result column="flow_name" property="flowName"/>
+        <result column="flow_identifying" property="flowIdentifying"/>
+        <result column="start_node_id" property="startNodeId"/>
+        <result column="end_node_id" property="endNodeId"/>
+        <result column="model_name" property="modelName"/>
+        <result column="deal_with_type" property="dealWithType"/>
+        <result column="CreatedTime" property="createdTime"/>
+        <result column="UpdatedTime" property="updatedTime"/>
+    </resultMap>
+
+</mapper>

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.java

@@ -0,0 +1,32 @@
+/*
+ *      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 com.fjhx.flow.mapper;
+
+import com.fjhx.flow.entity.FlowNode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 流程节点表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface FlowNodeMapper extends BaseMapper<FlowNode> {
+
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.xml

@@ -0,0 +1,16 @@
+<?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="com.fjhx.flow.mapper.FlowNodeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="flowNodeResultMap" type="com.fjhx.flow.entity.FlowNode">
+        <id column="ID" property="id"/>
+        <result column="IsDelete" property="isdelete"/>
+        <result column="CreatedTime" property="createdTime"/>
+        <result column="UpdatedTime" property="updatedTime"/>
+        <result column="flow_id" property="flowId"/>
+        <result column="node_name" property="nodeName"/>
+        <result column="back_node_id" property="backNodeId"/>
+        <result column="role_key" property="roleKey"/>
+    </resultMap>
+</mapper>

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.java

@@ -0,0 +1,31 @@
+/*
+ *      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 com.fjhx.flow.mapper;
+
+import com.fjhx.flow.entity.FlowNodeline;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 流程节点连线 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface FlowNodelineMapper extends BaseMapper<FlowNodeline> {
+
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.xml

@@ -0,0 +1,19 @@
+<?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="com.fjhx.flow.mapper.FlowNodelineMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="flowNodelineResultMap" type="com.fjhx.flow.entity.FlowNodeline">
+        <id column="ID" property="id"/>
+        <result column="IsDelete" property="isdelete"/>
+        <result column="CreatedTime" property="createdTime"/>
+        <result column="UpdatedTime" property="updatedTime"/>
+        <result column="flow_id" property="flowId"/>
+        <result column="to_node_id" property="toNodeId"/>
+        <result column="from_node_id" property="fromNodeId"/>
+        <result column="condition_type" property="conditionType"/>
+        <result column="condition_value" property="conditionValue"/>
+        <result column="condition_key" property="conditionKey"/>
+    </resultMap>
+
+</mapper>

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/IFlowApplycheckService.java

@@ -0,0 +1,30 @@
+/*
+ *      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 com.fjhx.flow.service;
+
+import com.fjhx.flow.entity.FlowApplycheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 流程审批 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface IFlowApplycheckService extends IService<FlowApplycheck> {
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/IFlowNodeService.java

@@ -0,0 +1,31 @@
+/*
+ *      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 com.fjhx.flow.service;
+
+import com.fjhx.flow.entity.FlowNode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 流程节点表 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface IFlowNodeService extends IService<FlowNode> {
+
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/IFlowNodelineService.java

@@ -0,0 +1,31 @@
+/*
+ *      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 com.fjhx.flow.service;
+
+import com.fjhx.flow.entity.FlowNodeline;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 流程节点连线 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface IFlowNodelineService extends IService<FlowNodeline> {
+
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/IFlowService.java

@@ -0,0 +1,30 @@
+/*
+ *      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 com.fjhx.flow.service;
+
+import com.fjhx.flow.entity.Flow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 业务附件表 服务类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+public interface IFlowService extends IService<Flow> {
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/impl/FlowApplycheckServiceImpl.java

@@ -0,0 +1,34 @@
+/*
+ *      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 com.fjhx.flow.service.impl;
+
+import com.fjhx.flow.entity.FlowApplycheck;
+import com.fjhx.flow.mapper.FlowApplycheckMapper;
+import com.fjhx.flow.service.IFlowApplycheckService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流程审批 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Service
+public class FlowApplycheckServiceImpl extends ServiceImpl<FlowApplycheckMapper, FlowApplycheck> implements IFlowApplycheckService {
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodeServiceImpl.java

@@ -0,0 +1,35 @@
+/*
+ *      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 com.fjhx.flow.service.impl;
+
+import com.fjhx.flow.entity.FlowNode;
+import com.fjhx.flow.mapper.FlowNodeMapper;
+import com.fjhx.flow.service.IFlowNodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流程节点表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Service
+public class FlowNodeServiceImpl extends ServiceImpl<FlowNodeMapper, FlowNode> implements IFlowNodeService {
+
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodelineServiceImpl.java

@@ -0,0 +1,36 @@
+/*
+ *      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 com.fjhx.flow.service.impl;
+
+import com.fjhx.flow.entity.FlowNodeline;
+import com.fjhx.flow.mapper.FlowNodelineMapper;
+import com.fjhx.flow.service.IFlowNodelineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 流程节点连线 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Service
+public class FlowNodelineServiceImpl extends ServiceImpl<FlowNodelineMapper, FlowNodeline> implements IFlowNodelineService {
+
+
+}

hx-saas-project/saas-flow/src/main/java/com/fjhx/flow/service/impl/FlowServiceImpl.java

@@ -0,0 +1,35 @@
+/*
+ *      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 com.fjhx.flow.service.impl;
+
+import com.fjhx.flow.entity.Flow;
+import com.fjhx.flow.mapper.FlowMapper;
+import com.fjhx.flow.service.IFlowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 业务附件表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-07-20
+ */
+@Service
+public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements IFlowService {
+
+
+}

hx-saas-project/saas-flow/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 # 服务器端口
 server:
-  port: 8301
+  port: 8304
 logging:
   level:
     org.springframework.data.mongodb.core: DEBUG
@@ -8,9 +8,9 @@ logging:
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.storage.dev.url}
-    username: ${blade.datasource.storage.dev.username}
-    password: ${blade.datasource.storage.dev.password}
+    url: ${blade.datasource.flow.dev.url}
+    username: ${blade.datasource.flow.dev.username}
+    password: ${blade.datasource.flow.dev.password}
 #rocketmq 配置
 rocketmq:
   name-server: 114.116.8.29:9876

hx-saas-project/saas-flow/src/main/resources/application-prod.yml

@@ -1,14 +1,14 @@
 # 服务器端口
 server:
-  port: 8301
+  port: 8304
 
 # 数据源配置
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.storage.prod.url}
-    username: ${blade.datasource.storage.prod.username}
-    password: ${blade.datasource.storage.prod.password}
+    url: ${blade.datasource.flow.prod.url}
+    username: ${blade.datasource.flow.prod.username}
+    password: ${blade.datasource.flow.prod.password}
 #rocketmq 配置
 rocketmq:
   name-server: 114.116.8.29:9876

hx-saas-project/saas-flow/src/main/resources/application-test.yml

@@ -1,14 +1,14 @@
 # 服务器端口
 server:
-  port: 8301
+  port: 8304
 
 # 数据源配置
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.storage.test.url}
-    username: ${blade.datasource.storage.test.username}
-    password: ${blade.datasource.storage.test.password}
+    url: ${blade.datasource.flow.test.url}
+    username: ${blade.datasource.flow.test.username}
+    password: ${blade.datasource.flow.test.password}
 #rocketmq 配置
 rocketmq:
   name-server: 114.116.8.29:9876