2.0.0项目初始化

datax-common/datax-common-core/src/main/java/cn/datax/common/base/BaseEntity.java

@@ -49,4 +49,10 @@ public abstract class BaseEntity implements Serializable {
      */
     @TableField(value = "status", fill = FieldFill.INSERT)
     private Integer status;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
 }

datax-config/src/main/resources/config/datax-service-workflow-dev.yml

@@ -2,10 +2,10 @@
 spring:
   redis:
     database: 1
-    host: 192.168.234.101
+    host: 127.0.0.1
     port: 6379
-    password: 1234@abcd   # 密码（默认为空）
-    timeout: 6000ms       # 连接超时时长（毫秒）
+    password:      # 密码（默认为空）
+    timeout: 6000ms  # 连接超时时长（毫秒）
     lettuce:
       pool:
         max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
@@ -14,7 +14,7 @@ spring:
         min-idle: 5       # 连接池中的最小空闲连接
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.234.100:3306/data_cloud_workflow?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:3306/data_cloud_workflow?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: 1234@abcd
     type: com.zaxxer.hikari.HikariDataSource

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/dto/DataSetDto.java

@@ -30,10 +30,9 @@ public class DataSetDto implements Serializable {
     @ApiModelProperty(value = "数据集名称")
     @NotBlank(message = "数据集名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String setName;
-    @ApiModelProperty(value = "数据集描述")
-    @NotBlank(message = "数据集描述不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private String remark;
     @ApiModelProperty(value = "数据集sql")
     @NotBlank(message = "数据集sql不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String setSql;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/dto/DataSourceDto.java

@@ -31,10 +31,9 @@ public class DataSourceDto implements Serializable {
     @ApiModelProperty(value = "数据源名称")
     @NotBlank(message = "数据源名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String sourceName;
-    @ApiModelProperty(value = "数据源描述")
-    @NotBlank(message = "数据源描述不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private String remark;
     @ApiModelProperty(value = "数据源连接信息")
     @Valid
     private DbSchema dbSchema;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/entity/DataSetEntity.java

@@ -33,11 +33,6 @@ public class DataSetEntity extends DataScopeBaseEntity {
     private String setName;
 
     /**
-     * 数据集描述
-     */
-    private String remark;
-
-    /**
      * 数据集sql
      */
     private String setSql;

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/entity/DataSourceEntity.java

@@ -36,11 +36,6 @@ public class DataSourceEntity extends DataScopeBaseEntity {
     private String sourceName;
 
     /**
-     * 数据源描述
-     */
-    private String remark;
-
-    /**
      * 数据源连接信息
      */
     @TableField(typeHandler = JacksonTypeHandler.class)

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/vo/DataSetVo.java

@@ -25,6 +25,5 @@ public class DataSetVo implements Serializable {
     private LocalDateTime createTime;
     private String sourceId;
     private String setName;
-    private String remark;
     private String setSql;
 }

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/vo/DataSourceVo.java

@@ -26,6 +26,5 @@ public class DataSourceVo implements Serializable {
     private LocalDateTime createTime;
     private Integer dbType;
     private String sourceName;
-    private String remark;
     private DbSchema dbSchema;
 }

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/dto/ApiMaskDto.java

@@ -35,12 +35,11 @@ public class ApiMaskDto implements Serializable {
     @ApiModelProperty(value = "脱敏名称")
     @NotBlank(message = "脱敏名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String maskName;
-    @ApiModelProperty(value = "脱敏描述")
-    @NotBlank(message = "脱敏描述不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private String remark;
     @ApiModelProperty(value = "脱敏字段规则配置")
     @Valid
     @NotEmpty(message = "脱敏字段规则配置不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     @Size(min = 1, message="脱敏字段规则配置长度不能少于{min}位")
     private List<FieldRule> rules;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/dto/DataApiDto.java

@@ -39,8 +39,6 @@ public class DataApiDto implements Serializable {
     @ApiModelProperty(value = "API路径")
     @NotBlank(message = "API路径不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String apiUrl;
-    @ApiModelProperty(value = "API描述")
-    private String remark;
     @ApiModelProperty(value = "请求方式")
     @NotBlank(message = "请求方式不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String reqMethod;
@@ -69,4 +67,6 @@ public class DataApiDto implements Serializable {
     @NotEmpty(message = "返回参数不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     @Size(min = 1, message="返回参数长度不能少于{min}位")
     private List<ResParam> resParams;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/entity/ApiMaskEntity.java

@@ -41,11 +41,6 @@ public class ApiMaskEntity extends DataScopeBaseEntity {
     private String maskName;
 
     /**
-     * 脱敏描述
-     */
-    private String remark;
-
-    /**
      * 脱敏字段规则配置
      */
     @TableField(value = "config_json", typeHandler = JacksonTypeHandler.class)

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/entity/DataApiEntity.java

@@ -45,11 +45,6 @@ public class DataApiEntity extends DataScopeBaseEntity {
     private String apiUrl;
 
     /**
-     * API描述
-     */
-    private String remark;
-
-    /**
      * 请求类型
      */
     private String reqMethod;

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/vo/ApiMaskVo.java

@@ -27,6 +27,5 @@ public class ApiMaskVo implements Serializable {
     private LocalDateTime createTime;
     private String apiId;
     private String maskName;
-    private String remark;
     private List<FieldRule> rules;
 }

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/vo/DataApiVo.java

@@ -30,7 +30,6 @@ public class DataApiVo implements Serializable {
     private String apiName;
     private String apiVersion;
     private String apiUrl;
-    private String remark;
     private String reqMethod;
     private String deny;
     private String resType;

datax-modules/quartz-service-parent/quartz-service-api/src/main/java/cn/datax/service/quartz/api/dto/QrtzJobDto.java

@@ -38,4 +38,6 @@ public class QrtzJobDto implements Serializable {
     @ApiModelProperty(value = "cron表达式")
     @NotBlank(message = "cron表达式不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String cronExpression;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/quartz-service-parent/quartz-service/src/main/resources/mapper/QrtzJobMapper.xml

@@ -11,6 +11,7 @@
         <result column="create_dept" property="createDept" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
         <result column="job_name" property="jobName" />
         <result column="bean_name" property="beanName" />
         <result column="method_name" property="methodName" />
@@ -27,6 +28,7 @@
         create_dept,
         update_by,
         update_time,
+        remark,
         job_name, bean_name, method_name, method_params, cron_expression
     </sql>
 

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/DeptDto.java

@@ -29,4 +29,7 @@ public class DeptDto implements Serializable {
     @ApiModelProperty(value = "部门编码")
     @NotBlank(message = "部门编码不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String deptNo;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/DictDto.java

@@ -30,6 +30,6 @@ public class DictDto implements Serializable {
     @ApiModelProperty(value = "字典编码")
     @NotBlank(message = "字典编码不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String dictCode;
-    @ApiModelProperty(value = "字典描述")
+    @ApiModelProperty(value = "备注")
     private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/DictItemDto.java

@@ -37,6 +37,6 @@ public class DictItemDto implements Serializable {
     @ApiModelProperty(value = "排序")
     @NotNull(message = "排序不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private Integer itemSort;
-    @ApiModelProperty(value = "描述")
+    @ApiModelProperty(value = "备注")
     private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/MenuDto.java

@@ -49,4 +49,7 @@ public class MenuDto implements Serializable {
     @ApiModelProperty(value = "排序")
     @NotNull(message = "排序不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private Integer menuSort;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/PostDto.java

@@ -22,4 +22,6 @@ public class PostDto implements Serializable {
     @NotBlank(message = "岗位名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String postName;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/RoleDto.java

@@ -40,4 +40,6 @@ public class RoleDto implements Serializable {
     @ApiModelProperty(value = "数据范围为2时自定义数据权限")
     private List<String> deptList;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/SysConfigDto.java

+package cn.datax.service.system.api.dto;
+
+import cn.datax.common.validate.ValidationGroups;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+/**
+ * <p>
+ * 系统参数配置信息表 实体DTO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@ApiModel(value = "系统参数配置信息表Model")
+@Data
+public class SysConfigDto implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @NotBlank(message = "主键ID不能为空", groups = {ValidationGroups.Update.class})
+    private String id;
+    @ApiModelProperty(value = "参数名称")
+    @NotBlank(message = "参数名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String configName;
+    @ApiModelProperty(value = "参数键名")
+    @NotBlank(message = "参数键名不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String configKey;
+    @ApiModelProperty(value = "参数键值")
+    @NotBlank(message = "参数键值不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String configValue;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/UserDto.java

@@ -62,4 +62,7 @@ public class UserDto implements Serializable {
     @NotEmpty(message = "岗位不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     @Size(min = 1, max = 1, message="岗位长度必须位于{min}-{max}之间")
     private List<String> postList;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/WorkflowConfigDto.java

+package cn.datax.service.system.api.dto;
+
+import cn.datax.common.validate.ValidationGroups;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+/**
+ * <p>
+ * 工作流配置信息表 实体DTO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@ApiModel(value = "工作流配置信息表Model")
+@Data
+public class WorkflowConfigDto implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @NotBlank(message = "主键ID不能为空", groups = {ValidationGroups.Update.class})
+    private String id;
+    @ApiModelProperty(value = "流程定义")
+    @NotBlank(message = "流程定义不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String procesKey;
+    @ApiModelProperty(value = "业务主题")
+    @NotBlank(message = "业务主题不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String businessTheme;
+    @ApiModelProperty(value = "业务编码")
+    @NotBlank(message = "业务编码不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String businessCode;
+    @ApiModelProperty(value = "业务组件")
+    @NotBlank(message = "业务组件不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String businessComponent;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/entity/DictEntity.java

@@ -37,11 +37,6 @@ public class DictEntity extends BaseEntity {
      */
     private String dictCode;
 
-    /**
-     * 字典描述
-     */
-    private String remark;
-
     @TableField(exist = false)
     private List<DictItemEntity> items;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/entity/DictItemEntity.java

@@ -43,9 +43,4 @@ public class DictItemEntity extends BaseEntity {
      * 排序
      */
     private Integer itemSort;
-
-    /**
-     * 描述
-     */
-    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/entity/SysConfigEntity.java

+package cn.datax.service.system.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.datax.common.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 系统参数配置信息表
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_config")
+public class SysConfigEntity extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 参数名称
+     */
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    private String configValue;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/entity/WorkflowConfigEntity.java

+package cn.datax.service.system.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.datax.common.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 工作流配置信息表
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("workflow_config")
+public class WorkflowConfigEntity extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 流程定义
+     */
+    private String procesKey;
+
+    /**
+     * 业务主题
+     */
+    private String businessTheme;
+
+    /**
+     * 业务编码
+     */
+    private String businessCode;
+
+    /**
+     * 业务组件
+     */
+    private String businessComponent;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/query/SysConfigQuery.java

+package cn.datax.service.system.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 系统参数配置信息表 查询实体
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysConfigQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/query/WorkflowConfigQuery.java

+package cn.datax.service.system.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 工作流配置信息表 查询实体
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkflowConfigQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/DictItemVo.java

@@ -27,5 +27,4 @@ public class DictItemVo implements Serializable {
     private String itemText;
     private String itemValue;
     private Integer itemSort;
-    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/DictVo.java

@@ -25,5 +25,4 @@ public class DictVo implements Serializable {
     private LocalDateTime createTime;
     private String dictName;
     private String dictCode;
-    private String remark;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/SysConfigVo.java

+package cn.datax.service.system.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 系统参数配置信息表 实体VO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Data
+public class SysConfigVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+    private Integer status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+    private String configName;
+    private String configKey;
+    private String configValue;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/WorkflowConfigVo.java

+package cn.datax.service.system.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 工作流配置信息表 实体VO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Data
+public class WorkflowConfigVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+    private Integer status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+    private String procesKey;
+    private String businessTheme;
+    private String businessCode;
+    private String businessComponent;
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/config/StartedUpRunner.java

 package cn.datax.service.system.config;
 
-import cn.datax.service.system.service.DictService;
+import cn.datax.common.core.DataConstant;
+import cn.datax.common.redis.service.RedisService;
+import cn.datax.service.system.api.entity.DictEntity;
+import cn.datax.service.system.dao.DictDao;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
@@ -11,6 +14,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 @Component
 @RequiredArgsConstructor
@@ -20,7 +24,9 @@ public class StartedUpRunner implements ApplicationRunner {
     private final Environment environment;
 
     @Autowired
-    private DictService dictService;
+    private RedisService redisService;
+    @Autowired
+    private DictDao dictDao;
 
     @Override
     public void run(ApplicationArguments args) {
@@ -33,7 +39,12 @@ public class StartedUpRunner implements ApplicationRunner {
             System.out.println(banner);
 
             // 项目启动时，初始化缓存
-            dictService.refreshDict();
+            String key = "data:system:dicts";
+            Boolean hasKey = redisService.hasKey(key);
+            if (!hasKey) {
+                List<DictEntity> dictEntityList = dictDao.queryDictList(DataConstant.EnableState.ENABLE.getKey());
+                redisService.set(key, dictEntityList);
+            }
         }
     }
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/SysConfigController.java

+package cn.datax.service.system.controller;
+
+import cn.datax.common.core.JsonPage;
+import cn.datax.common.core.R;
+import cn.datax.common.validate.ValidationGroups;
+import cn.datax.service.system.api.dto.SysConfigDto;
+import cn.datax.service.system.api.entity.SysConfigEntity;
+import cn.datax.service.system.api.vo.SysConfigVo;
+import cn.datax.service.system.api.query.SysConfigQuery;
+import cn.datax.service.system.mapstruct.SysConfigMapper;
+import cn.datax.service.system.service.SysConfigService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import cn.datax.common.base.BaseController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 系统参数配置信息表 前端控制器
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Api(tags = {"系统参数配置信息表"})
+@RestController
+@RequestMapping("/sysConfigs")
+public class SysConfigController extends BaseController {
+
+    @Autowired
+    private SysConfigService sysConfigService;
+
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+
+    /**
+     * 通过ID查询信息
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/{id}")
+    public R getSysConfigById(@PathVariable String id) {
+        SysConfigEntity sysConfigEntity = sysConfigService.getSysConfigById(id);
+        return R.ok().setData(sysConfigMapper.toVO(sysConfigEntity));
+    }
+
+    /**
+     * 分页查询信息
+     *
+     * @param sysConfigQuery
+     * @return
+     */
+    @ApiOperation(value = "分页查询", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysConfigQuery", value = "查询实体sysConfigQuery", required = true, dataTypeClass = SysConfigQuery.class)
+    })
+    @GetMapping("/page")
+    public R getSysConfigPage(SysConfigQuery sysConfigQuery) {
+        QueryWrapper<SysConfigEntity> queryWrapper = new QueryWrapper<>();
+        IPage<SysConfigEntity> page = sysConfigService.page(new Page<>(sysConfigQuery.getPageNum(), sysConfigQuery.getPageSize()), queryWrapper);
+        List<SysConfigVo> collect = page.getRecords().stream().map(sysConfigMapper::toVO).collect(Collectors.toList());
+        JsonPage<SysConfigVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
+    }
+
+    /**
+     * 添加
+     * @param sysConfig
+     * @return
+     */
+    @ApiOperation(value = "添加信息", notes = "根据sysConfig对象添加信息")
+    @ApiImplicitParam(name = "sysConfig", value = "详细实体sysConfig", required = true, dataType = "SysConfigDto")
+    @PostMapping()
+    public R saveSysConfig(@RequestBody @Validated({ValidationGroups.Insert.class}) SysConfigDto sysConfig) {
+        sysConfigService.saveSysConfig(sysConfig);
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     * @param sysConfig
+     * @return
+     */
+    @ApiOperation(value = "修改信息", notes = "根据url的id来指定修改对象，并根据传过来的信息来修改详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "sysConfig", value = "详细实体sysConfig", required = true, dataType = "SysConfigDto")
+    })
+    @PutMapping("/{id}")
+    public R updateSysConfig(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) SysConfigDto sysConfig) {
+        sysConfigService.updateSysConfig(sysConfig);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @DeleteMapping("/{id}")
+    public R deleteSysConfigById(@PathVariable String id) {
+        sysConfigService.deleteSysConfigById(id);
+        return R.ok();
+    }
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/WorkflowConfigController.java

+package cn.datax.service.system.controller;
+
+import cn.datax.common.core.JsonPage;
+import cn.datax.common.core.R;
+import cn.datax.common.validate.ValidationGroups;
+import cn.datax.service.system.api.dto.WorkflowConfigDto;
+import cn.datax.service.system.api.entity.WorkflowConfigEntity;
+import cn.datax.service.system.api.vo.WorkflowConfigVo;
+import cn.datax.service.system.api.query.WorkflowConfigQuery;
+import cn.datax.service.system.mapstruct.WorkflowConfigMapper;
+import cn.datax.service.system.service.WorkflowConfigService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import cn.datax.common.base.BaseController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 工作流配置信息表 前端控制器
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Api(tags = {"工作流配置信息表"})
+@RestController
+@RequestMapping("/workflowConfigs")
+public class WorkflowConfigController extends BaseController {
+
+    @Autowired
+    private WorkflowConfigService workflowConfigService;
+
+    @Autowired
+    private WorkflowConfigMapper workflowConfigMapper;
+
+    /**
+     * 通过ID查询信息
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/{id}")
+    public R getWorkflowConfigById(@PathVariable String id) {
+        WorkflowConfigEntity workflowConfigEntity = workflowConfigService.getWorkflowConfigById(id);
+        return R.ok().setData(workflowConfigMapper.toVO(workflowConfigEntity));
+    }
+
+    /**
+     * 分页查询信息
+     *
+     * @param workflowConfigQuery
+     * @return
+     */
+    @ApiOperation(value = "分页查询", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "workflowConfigQuery", value = "查询实体workflowConfigQuery", required = true, dataTypeClass = WorkflowConfigQuery.class)
+    })
+    @GetMapping("/page")
+    public R getWorkflowConfigPage(WorkflowConfigQuery workflowConfigQuery) {
+        QueryWrapper<WorkflowConfigEntity> queryWrapper = new QueryWrapper<>();
+        IPage<WorkflowConfigEntity> page = workflowConfigService.page(new Page<>(workflowConfigQuery.getPageNum(), workflowConfigQuery.getPageSize()), queryWrapper);
+        List<WorkflowConfigVo> collect = page.getRecords().stream().map(workflowConfigMapper::toVO).collect(Collectors.toList());
+        JsonPage<WorkflowConfigVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
+    }
+
+    /**
+     * 添加
+     * @param workflowConfig
+     * @return
+     */
+    @ApiOperation(value = "添加信息", notes = "根据workflowConfig对象添加信息")
+    @ApiImplicitParam(name = "workflowConfig", value = "详细实体workflowConfig", required = true, dataType = "WorkflowConfigDto")
+    @PostMapping()
+    public R saveWorkflowConfig(@RequestBody @Validated({ValidationGroups.Insert.class}) WorkflowConfigDto workflowConfig) {
+        workflowConfigService.saveWorkflowConfig(workflowConfig);
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     * @param workflowConfig
+     * @return
+     */
+    @ApiOperation(value = "修改信息", notes = "根据url的id来指定修改对象，并根据传过来的信息来修改详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "workflowConfig", value = "详细实体workflowConfig", required = true, dataType = "WorkflowConfigDto")
+    })
+    @PutMapping("/{id}")
+    public R updateWorkflowConfig(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) WorkflowConfigDto workflowConfig) {
+        workflowConfigService.updateWorkflowConfig(workflowConfig);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @DeleteMapping("/{id}")
+    public R deleteWorkflowConfigById(@PathVariable String id) {
+        workflowConfigService.deleteWorkflowConfigById(id);
+        return R.ok();
+    }
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/dao/SysConfigDao.java

+package cn.datax.service.system.dao;
+
+import cn.datax.common.base.BaseDao;
+import cn.datax.service.system.api.entity.SysConfigEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 系统参数配置信息表 Mapper 接口
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Mapper
+public interface SysConfigDao extends BaseDao<SysConfigEntity> {
+
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/dao/WorkflowConfigDao.java

+package cn.datax.service.system.dao;
+
+import cn.datax.common.base.BaseDao;
+import cn.datax.service.system.api.entity.WorkflowConfigEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 工作流配置信息表 Mapper 接口
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Mapper
+public interface WorkflowConfigDao extends BaseDao<WorkflowConfigEntity> {
+
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/mapstruct/SysConfigMapper.java

+package cn.datax.service.system.mapstruct;
+
+import cn.datax.common.mapstruct.EntityMapper;
+import cn.datax.service.system.api.dto.SysConfigDto;
+import cn.datax.service.system.api.entity.SysConfigEntity;
+import cn.datax.service.system.api.vo.SysConfigVo;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 系统参数配置信息表 Mapper 实体映射
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Mapper(componentModel = "spring")
+public interface SysConfigMapper extends EntityMapper<SysConfigDto, SysConfigEntity, SysConfigVo> {
+
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/mapstruct/WorkflowConfigMapper.java

+package cn.datax.service.system.mapstruct;
+
+import cn.datax.common.mapstruct.EntityMapper;
+import cn.datax.service.system.api.dto.WorkflowConfigDto;
+import cn.datax.service.system.api.entity.WorkflowConfigEntity;
+import cn.datax.service.system.api.vo.WorkflowConfigVo;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 工作流配置信息表 Mapper 实体映射
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Mapper(componentModel = "spring")
+public interface WorkflowConfigMapper extends EntityMapper<WorkflowConfigDto, WorkflowConfigEntity, WorkflowConfigVo> {
+
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/SysConfigService.java

+package cn.datax.service.system.service;
+
+import cn.datax.service.system.api.entity.SysConfigEntity;
+import cn.datax.service.system.api.dto.SysConfigDto;
+import cn.datax.common.base.BaseService;
+
+/**
+ * <p>
+ * 系统参数配置信息表 服务类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+public interface SysConfigService extends BaseService<SysConfigEntity> {
+
+    void saveSysConfig(SysConfigDto sysConfig);
+
+    void updateSysConfig(SysConfigDto sysConfig);
+
+    SysConfigEntity getSysConfigById(String id);
+
+    void deleteSysConfigById(String id);
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/WorkflowConfigService.java

+package cn.datax.service.system.service;
+
+import cn.datax.service.system.api.entity.WorkflowConfigEntity;
+import cn.datax.service.system.api.dto.WorkflowConfigDto;
+import cn.datax.common.base.BaseService;
+
+/**
+ * <p>
+ * 工作流配置信息表 服务类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+public interface WorkflowConfigService extends BaseService<WorkflowConfigEntity> {
+
+    void saveWorkflowConfig(WorkflowConfigDto workflowConfig);
+
+    void updateWorkflowConfig(WorkflowConfigDto workflowConfig);
+
+    WorkflowConfigEntity getWorkflowConfigById(String id);
+
+    void deleteWorkflowConfigById(String id);
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/impl/SysConfigServiceImpl.java

+package cn.datax.service.system.service.impl;
+
+import cn.datax.service.system.api.entity.SysConfigEntity;
+import cn.datax.service.system.api.dto.SysConfigDto;
+import cn.datax.service.system.service.SysConfigService;
+import cn.datax.service.system.mapstruct.SysConfigMapper;
+import cn.datax.service.system.dao.SysConfigDao;
+import cn.datax.common.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 系统参数配置信息表 服务实现类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class SysConfigServiceImpl extends BaseServiceImpl<SysConfigDao, SysConfigEntity> implements SysConfigService {
+
+    @Autowired
+    private SysConfigDao sysConfigDao;
+
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveSysConfig(SysConfigDto sysConfigDto) {
+        SysConfigEntity sysConfig = sysConfigMapper.toEntity(sysConfigDto);
+        sysConfigDao.insert(sysConfig);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSysConfig(SysConfigDto sysConfigDto) {
+        SysConfigEntity sysConfig = sysConfigMapper.toEntity(sysConfigDto);
+        sysConfigDao.updateById(sysConfig);
+    }
+
+    @Override
+    public SysConfigEntity getSysConfigById(String id) {
+        SysConfigEntity sysConfigEntity = super.getById(id);
+        return sysConfigEntity;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteSysConfigById(String id) {
+        sysConfigDao.deleteById(id);
+    }
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/impl/WorkflowConfigServiceImpl.java

+package cn.datax.service.system.service.impl;
+
+import cn.datax.service.system.api.entity.WorkflowConfigEntity;
+import cn.datax.service.system.api.dto.WorkflowConfigDto;
+import cn.datax.service.system.service.WorkflowConfigService;
+import cn.datax.service.system.mapstruct.WorkflowConfigMapper;
+import cn.datax.service.system.dao.WorkflowConfigDao;
+import cn.datax.common.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 工作流配置信息表 服务实现类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-05-19
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class WorkflowConfigServiceImpl extends BaseServiceImpl<WorkflowConfigDao, WorkflowConfigEntity> implements WorkflowConfigService {
+
+    @Autowired
+    private WorkflowConfigDao workflowConfigDao;
+
+    @Autowired
+    private WorkflowConfigMapper workflowConfigMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveWorkflowConfig(WorkflowConfigDto workflowConfigDto) {
+        WorkflowConfigEntity workflowConfig = workflowConfigMapper.toEntity(workflowConfigDto);
+        workflowConfigDao.insert(workflowConfig);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateWorkflowConfig(WorkflowConfigDto workflowConfigDto) {
+        WorkflowConfigEntity workflowConfig = workflowConfigMapper.toEntity(workflowConfigDto);
+        workflowConfigDao.updateById(workflowConfig);
+    }
+
+    @Override
+    public WorkflowConfigEntity getWorkflowConfigById(String id) {
+        WorkflowConfigEntity workflowConfigEntity = super.getById(id);
+        return workflowConfigEntity;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteWorkflowConfigById(String id) {
+        workflowConfigDao.deleteById(id);
+    }
+}

datax-modules/system-service-parent/system-service/src/main/resources/mapper/DeptMapper.xml

@@ -13,6 +13,7 @@
         <result column="dept_name" property="deptName" />
         <result column="dept_no" property="deptNo" />
         <result column="status" property="status" />
+        <result column="remark" property="remark" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,7 +23,7 @@
         create_time,
         update_by,
         update_time,
-        parent_id, dept_name, dept_no, status
+        parent_id, dept_name, dept_no, status, remark
     </sql>
 
     <sql id="Dept_Column_List">
@@ -31,7 +32,7 @@
         ${alias}.create_time,
         ${alias}.update_by,
         ${alias}.update_time,
-        ${alias}.parent_id, ${alias}.dept_name, ${alias}.dept_no, ${alias}.status
+        ${alias}.parent_id, ${alias}.dept_name, ${alias}.dept_no, ${alias}.status, ${alias}.remark
     </sql>
 
 </mapper>

datax-modules/system-service-parent/system-service/src/main/resources/mapper/MenuMapper.xml

@@ -19,6 +19,7 @@
         <result column="menu_type" property="menuType" />
         <result column="menu_sort" property="menuSort" />
         <result column="status" property="status" />
+        <result column="remark" property="remark" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -28,7 +29,7 @@
         create_time,
         update_by,
         update_time,
-        parent_id, menu_name, menu_path, menu_component, menu_redirect, menu_perms, menu_icon, menu_type, menu_sort, status
+        parent_id, menu_name, menu_path, menu_component, menu_redirect, menu_perms, menu_icon, menu_type, menu_sort, status, remark
     </sql>
 
     <sql id="Menu_Column_List">
@@ -38,7 +39,7 @@
         ${alias}.update_by,
         ${alias}.update_time,
         ${alias}.parent_id, ${alias}.menu_name, ${alias}.menu_path, ${alias}.menu_component, ${alias}.menu_redirect, ${alias}.menu_perms,
-        ${alias}.menu_icon, ${alias}.menu_type, ${alias}.menu_sort, ${alias}.status
+        ${alias}.menu_icon, ${alias}.menu_type, ${alias}.menu_sort, ${alias}.status, ${alias}.remark
     </sql>
 
     <select id="selectMenuByRoleIds" parameterType="java.util.List" resultMap="BaseResultMap">

datax-modules/system-service-parent/system-service/src/main/resources/mapper/PostMapper.xml

@@ -11,6 +11,7 @@
         <result column="update_time" property="updateTime" />
         <result column="post_name" property="postName" />
         <result column="status" property="status" />
+        <result column="remark" property="remark" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -20,7 +21,7 @@
         create_time,
         update_by,
         update_time,
-        post_name, status
+        post_name, status, remark
     </sql>
 
     <sql id="Post_Column_List">
@@ -29,7 +30,7 @@
         ${alias}.create_time,
         ${alias}.update_by,
         ${alias}.update_time,
-        ${alias}.post_name, ${alias}.status
+        ${alias}.post_name, ${alias}.status, ${alias}.remark
     </sql>
 
 </mapper>

datax-modules/system-service-parent/system-service/src/main/resources/mapper/RoleMapper.xml

@@ -13,6 +13,7 @@
         <result column="role_code" property="roleCode" />
         <result column="data_scope" property="dataScope" />
         <result column="status" property="status" />
+        <result column="remark" property="remark" />
         <collection property="depts" column="{roleId=id}" select="getDeptList"></collection>
         <collection property="menus" column="{roleId=id}" select="getMenuList"></collection>
     </resultMap>
@@ -24,7 +25,7 @@
         create_time,
         update_by,
         update_time,
-        role_name, role_code, data_scope, status
+        role_name, role_code, data_scope, status, remark
     </sql>
 
     <sql id="Role_Column_List">
@@ -33,7 +34,7 @@
         ${alias}.create_time,
         ${alias}.update_by,
         ${alias}.update_time,
-        ${alias}.role_name, ${alias}.role_code, ${alias}.data_scope, ${alias}.status
+        ${alias}.role_name, ${alias}.role_code, ${alias}.data_scope, ${alias}.status, ${alias}.remark
     </sql>
 
     <select id="getDeptList" resultType="cn.datax.service.system.api.entity.DeptEntity">

datax-modules/system-service-parent/system-service/src/main/resources/mapper/SysConfigMapper.xml

+<?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="cn.datax.service.system.dao.SysConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.datax.service.system.api.entity.SysConfigEntity">
+        <result column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="config_name" property="configName" />
+        <result column="config_key" property="configKey" />
+        <result column="config_value" property="configValue" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark, config_name, config_key, config_value
+    </sql>
+
+</mapper>

datax-modules/system-service-parent/system-service/src/main/resources/mapper/UserMapper.xml

@@ -17,6 +17,7 @@
         <result column="birthday" property="birthday" />
         <result column="status" property="status" />
         <result column="dept_id" property="deptId" />
+        <result column="remark" property="remark" />
         <collection property="dept" column="{userId=id}" select="getDept"></collection>
         <collection property="roles" column="{userId=id}" select="getRoleList"></collection>
         <collection property="posts" column="{userId=id}" select="getPostList"></collection>
@@ -29,7 +30,7 @@
         create_time,
         update_by,
         update_time,
-        username, nickname, password, email, phone, birthday, status, dept_id
+        username, nickname, password, email, phone, birthday, status, dept_id, remark
     </sql>
 
     <update id="updateUserPassword">

datax-modules/system-service-parent/system-service/src/main/resources/mapper/WorkflowConfigMapper.xml

+<?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="cn.datax.service.system.dao.WorkflowConfigDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.datax.service.system.api.entity.WorkflowConfigEntity">
+        <result column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="proces_key" property="procesKey" />
+        <result column="business_theme" property="businessTheme" />
+        <result column="business_code" property="businessCode" />
+        <result column="business_component" property="businessComponent" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark, proces_key, business_theme, business_code, business_component
+    </sql>
+
+</mapper>

datax-modules/workflow-service-parent/workflow-flowable-modeler/src/main/resources/application.yml

@@ -12,5 +12,5 @@ spring:
   liquibase:
     enabled: false
 flowable:
-  # رնʱJOB
-  async-executor-activate: false
+  # 关闭定时任务JOB
+  async-executor-activate: false
\ No newline at end of file