Merge remote-tracking branch 'upstream/uat' into dev

LICENSE

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 yudao-cloud
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

deployment.yaml

@@ -0,0 +1,255 @@
+# yudao-module-infra
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-infra
+  labels:
+    app: yudao-module-infra
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: yudao-module-infra
+  template:
+    metadata:
+      labels:
+        app: yudao-module-infra
+    spec:
+      containers:
+        - name: yudao-module-infra
+          image: 172.16.46.66:10043/yudao/yudao-module-infra:20250613031406
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48082
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48082
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            failureThreshold: 5
+      terminationGracePeriodSeconds: 30
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-infra
+spec:
+  type: ClusterIP
+  selector:
+    app: yudao-module-infra
+  ports:
+    - protocol: TCP
+      port: 48082
+      targetPort: 48082
+---
+# yudao-module-system
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-system
+  labels:
+    app: yudao-module-system
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: yudao-module-system
+  template:
+    metadata:
+      labels:
+        app: yudao-module-system
+    spec:
+      containers:
+        - name: yudao-module-system
+          image: 172.16.46.66:10043/yudao/yudao-module-system:20250613031406
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48081
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48081
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            failureThreshold: 5
+      terminationGracePeriodSeconds: 30
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-system
+spec:
+  type: ClusterIP
+  selector:
+    app: yudao-module-system
+  ports:
+    - protocol: TCP
+      port: 48081
+      targetPort: 48081
+---
+# yudao-module-bpm
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-bpm
+  labels:
+    app: yudao-module-bpm
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: yudao-module-bpm
+  template:
+    metadata:
+      labels:
+        app: yudao-module-bpm
+    spec:
+      containers:
+        - name: yudao-module-bpm
+          image: 172.16.46.66:10043/yudao/yudao-module-bpm:20250613031406
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48083
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48083
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            failureThreshold: 5
+      terminationGracePeriodSeconds: 30
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-bpm
+spec:
+  type: ClusterIP
+  selector:
+    app: yudao-module-bpm
+  ports:
+    - protocol: TCP
+      port: 48083
+      targetPort: 48083
+---
+# yudao-module-report
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-report
+  labels:
+    app: yudao-module-report
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: yudao-module-report
+  template:
+    metadata:
+      labels:
+        app: yudao-module-report
+    spec:
+      containers:
+        - name: yudao-module-report
+          image: 172.16.46.66:10043/yudao/yudao-module-report:20250613031406
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48084
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48084
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            failureThreshold: 5
+      terminationGracePeriodSeconds: 30
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
+  name: yudao-module-report
+spec:
+  type: ClusterIP
+  selector:
+    app: yudao-module-report
+  ports:
+    - protocol: TCP
+      port: 48084
+      targetPort: 48084

pom.xml

@@ -43,7 +43,7 @@
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
         <!-- 看看咋放到 bom 里 -->
         <lombok.version>1.18.36</lombok.version>
-        <spring.boot.version>3.5.0</spring.boot.version>
+        <spring.boot.version>3.4.5</spring.boot.version>
         <mapstruct.version>1.6.3</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

sql/mysql/bpm/bpm.sql

@@ -1,145 +0,0 @@
-DROP TABLE IF EXISTS `bpm_category`;
-CREATE TABLE `bpm_category` (
-                                `id` bigint(0) NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT '分类编号',
-                                `name` varchar(255) DEFAULT NULL COMMENT '分类名',
-                                `code` varchar(255) DEFAULT NULL COMMENT '分类标志',
-                                `description` varchar(255) DEFAULT NULL COMMENT '分类描述',
-                                `status` int(11) DEFAULT NULL COMMENT '分类状态，枚举 CommonStatusEnum',
-                                `sort` int(11) DEFAULT NULL COMMENT '分类排序',
-                                `create_time` datetime COMMENT '创建时间',
-                                `update_time` datetime COMMENT '最后更新时间',
-                                `creator` varchar(255) COMMENT '创建者，目前使用 SysUser 的 id 编号',
-                                `updater` varchar(255) COMMENT '更新者，目前使用 SysUser 的 id 编号',
-                                `deleted` tinyint(1) DEFAULT NULL COMMENT '是否删除',
-                                `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号'
-) ENGINE=InnoDB  COMMENT='流程分类';
-
-DROP TABLE IF EXISTS `bpm_form`;
-CREATE TABLE `bpm_form`  (
-                             `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                             `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '表单名',
-                             `status` tinyint NOT NULL COMMENT '开启状态',
-                             `conf` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '表单的配置',
-                             `fields` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '表单项的数组',
-                             `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
-                             `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-                             `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                             `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-                             `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                             `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-                             `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-                             PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB  CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的表单定义';
-
-
-DROP TABLE IF EXISTS `bpm_oa_leave`;
-CREATE TABLE `bpm_oa_leave`  (
-                                 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '请假表单主键',
-                                 `user_id` bigint NOT NULL COMMENT '申请人的用户编号',
-                                 `type` tinyint NOT NULL COMMENT '请假类型',
-                                 `reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '请假原因',
-                                 `start_time` datetime NOT NULL COMMENT '开始时间',
-                                 `end_time` datetime NOT NULL COMMENT '结束时间',
-                                 `day` tinyint NOT NULL COMMENT '请假天数',
-                                 `result` tinyint NOT NULL COMMENT '请假结果',
-                                 `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '流程实例的编号',
-                                 `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-                                 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                 `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-                                 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                                 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-                                 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-                                 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB  CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OA 请假申请表';
-
-
-DROP TABLE IF EXISTS `bpm_process_definition_info`;
-CREATE TABLE `bpm_process_definition_info`  (
-                                                `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                                                `process_definition_id` varchar(64)  NOT NULL COMMENT '流程定义的编号',
-                                                `model_id` varchar(64)  NOT NULL COMMENT '流程模型的编号',
-                                                `icon` varchar(255) DEFAULT NULL COMMENT '图标',
-                                                `description` varchar(255)  DEFAULT NULL COMMENT '描述',
-                                                `form_type` tinyint NOT NULL COMMENT '表单类型',
-                                                `form_id` bigint NULL DEFAULT NULL COMMENT '表单编号',
-                                                `form_conf` varchar(1000)  DEFAULT NULL COMMENT '表单的配置',
-                                                `form_fields` varchar(5000)  DEFAULT NULL COMMENT '表单项的数组',
-                                                `form_custom_create_path` varchar(255) DEFAULT NULL COMMENT '自定义表单的提交路径',
-                                                `form_custom_view_path` varchar(255) DEFAULT NULL COMMENT '自定义表单的查看路径',
-                                                `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-                                                `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                                `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-                                                `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                                                `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-                                                `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-                                                PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 流程定义信息表';
-
-
-DROP TABLE IF EXISTS `bpm_process_expression`;
-CREATE TABLE `bpm_process_expression`  (
-                                           `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                                           `name` varchar(64) DEFAULT NULL COMMENT '流程实例的名字',
-                                           `status` tinyint NOT NULL COMMENT '流程实例的状态',
-                                           `expression` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '表达式',
-                                           `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-                                           `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                           `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-                                           `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                                           `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-                                           `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-                                           PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '流程表达式';
-
-DROP TABLE IF EXISTS `bpm_process_instance_copy`;
-CREATE TABLE `bpm_process_instance_copy`  (
-                                              `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                                              `start_user_id` bigint NOT NULL COMMENT '发起流程的用户编号',
-                                              `process_instance_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '流程实例的名字',
-                                              `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '流程实例的编号',
-                                              `category` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '流程分类',
-                                              `task_id` varchar(64)  DEFAULT NULL COMMENT '任务主键',
-                                              `task_name` varchar(64)  DEFAULT NULL COMMENT '任务名称',
-                                              `user_id` bigint NOT NULL COMMENT '用户编号（被抄送的用户编号）',
-                                              `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-                                              `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                              `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-                                              `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                                              `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-                                              `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-                                              PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 296 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '流程抄送表';
-
-DROP TABLE IF EXISTS `bpm_process_listener`;
-CREATE TABLE `bpm_process_listener` (
-                                        `id` bigint(20) NOT NULL COMMENT '主键 ID，自增',
-                                        `name` varchar(255) DEFAULT NULL COMMENT '监听器名字',
-                                        `status` int(11) DEFAULT NULL COMMENT '状态',
-                                        `type` varchar(255) DEFAULT NULL COMMENT '监听类型',
-                                        `event` varchar(255) DEFAULT NULL COMMENT '监听事件',
-                                        `value_type` varchar(255) DEFAULT NULL COMMENT '值类型',
-                                        `value` varchar(255) DEFAULT NULL COMMENT '值',
-                                        `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-                                        `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                        `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-                                        `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                                        `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-                                        `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-                                        PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='流程监听器';
-
-DROP TABLE IF EXISTS `bpm_user_group`;
-CREATE TABLE `bpm_user_group`  (
-                                   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                                   `name` varchar(30) DEFAULT '' COMMENT '组名',
-                                   `description` varchar(255) DEFAULT '' COMMENT '描述',
-                                   `status` tinyint NOT NULL COMMENT '状态（0正常 1停用）',
-                                   `user_ids` varchar(1024) DEFAULT '0' COMMENT '成员编号数组',
-                                   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-                                   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                   `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-                                   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                                   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-                                   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-                                   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 113 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户组';

sql/mysql/bpm/bpm_tables.sql

@@ -1,171 +0,0 @@
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_category`;
-CREATE TABLE `bpm_category` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '分类编号',
-  `name` varchar(255) NOT NULL COMMENT '分类名',
-  `code` varchar(255) NOT NULL COMMENT '分类标志',
-  `description` varchar(255) DEFAULT NULL COMMENT '分类描述',
-  `status` int NOT NULL COMMENT '分类状态',
-  `sort` int DEFAULT NULL COMMENT '分类排序',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='BPM 流程分类';
-
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_form`;
-CREATE TABLE `bpm_form` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `name` varchar(255) NOT NULL COMMENT '表单名',
-  `status` int NOT NULL COMMENT '状态',
-  `conf` varchar(2000) DEFAULT NULL COMMENT '表单的配置',
-  `fields` varchar(2000) DEFAULT NULL COMMENT '表单项的数组',
-  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='BPM 工作流的表单定义';
-
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_process_definition_info`;
-CREATE TABLE `bpm_process_definition_info` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `process_definition_id` varchar(255) NOT NULL COMMENT '流程定义的编号',
-  `model_id` varchar(255) DEFAULT NULL COMMENT '流程模型的编号',
-  `model_type` int DEFAULT NULL COMMENT '流程模型的类型',
-  `category` varchar(255) DEFAULT NULL COMMENT '流程分类的编码',
-  `icon` varchar(255) DEFAULT NULL COMMENT '图标',
-  `description` varchar(255) DEFAULT NULL COMMENT '描述',
-  `form_type` int DEFAULT NULL COMMENT '表单类型',
-  `form_id` bigint DEFAULT NULL COMMENT '动态表单编号',
-  `form_conf` varchar(2000) DEFAULT NULL COMMENT '表单的配置',
-  `form_fields` varchar(2000) DEFAULT NULL COMMENT '表单项的数组',
-  `form_custom_create_path` varchar(255) DEFAULT NULL COMMENT '自定义表单的提交路径',
-  `form_custom_view_path` varchar(255) DEFAULT NULL COMMENT '自定义表单的查看路径',
-  `simple_model` varchar(2000) DEFAULT NULL COMMENT 'SIMPLE 设计器模型数据 json 格式',
-  `visible` bit(1) DEFAULT NULL COMMENT '是否可见',
-  `sort` bigint DEFAULT NULL COMMENT '排序值',
-  `start_user_ids` varchar(2000) DEFAULT NULL COMMENT '可发起用户编号数组',
-  `start_dept_ids` varchar(2000) DEFAULT NULL COMMENT '可发起部门编号数组',
-  `manager_user_ids` varchar(2000) DEFAULT NULL COMMENT '可管理用户编号数组',
-  `allow_cancel_running_process` bit(1) DEFAULT NULL COMMENT '是否允许撤销审批中的申请',
-  `process_id_rule` varchar(2000) DEFAULT NULL COMMENT '流程 ID 规则',
-  `auto_approval_type` int DEFAULT NULL COMMENT '自动去重类型',
-  `title_setting` varchar(2000) DEFAULT NULL COMMENT '标题设置',
-  `summary_setting` varchar(2000) DEFAULT NULL COMMENT '摘要设置',
-  `process_before_trigger_setting` varchar(2000) DEFAULT NULL COMMENT '流程前置通知设置',
-  `process_after_trigger_setting` varchar(2000) DEFAULT NULL COMMENT '流程后置通知设置',
-  `task_before_trigger_setting` varchar(2000) DEFAULT NULL COMMENT '任务前置通知设置',
-  `task_after_trigger_setting` varchar(2000) DEFAULT NULL COMMENT '任务后置通知设置',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='BPM 流程定义的拓信息';
-
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_process_expression`;
-CREATE TABLE `bpm_process_expression` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `name` varchar(255) NOT NULL COMMENT '表达式名字',
-  `status` int NOT NULL COMMENT '表达式状态',
-  `expression` varchar(2000) NOT NULL COMMENT '表达式',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='BPM 流程表达式';
-
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_process_listener`;
-CREATE TABLE `bpm_process_listener` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键 ID',
-  `name` varchar(255) NOT NULL COMMENT '监听器名字',
-  `status` int NOT NULL COMMENT '状态',
-  `type` varchar(64) NOT NULL COMMENT '监听类型',
-  `event` varchar(64) DEFAULT NULL COMMENT '监听事件',
-  `value_type` varchar(64) DEFAULT NULL COMMENT '值类型',
-  `value` varchar(255) DEFAULT NULL COMMENT '值',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='BPM 流程监听器';
-
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_user_group`;
-CREATE TABLE `bpm_user_group` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `name` varchar(255) NOT NULL COMMENT '组名',
-  `description` varchar(255) DEFAULT NULL COMMENT '描述',
-  `status` int NOT NULL COMMENT '状态',
-  `user_ids` varchar(2000) DEFAULT NULL COMMENT '成员用户编号数组',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='BPM 用户组';
-
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_oa_leave`;
-CREATE TABLE `bpm_oa_leave` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '请假表单主键',
-  `user_id` bigint NOT NULL COMMENT '申请人的用户编号',
-  `type` varchar(255) NOT NULL COMMENT '请假类型',
-  `reason` varchar(255) DEFAULT NULL COMMENT '原因',
-  `start_time` datetime DEFAULT NULL COMMENT '开始时间',
-  `end_time` datetime DEFAULT NULL COMMENT '结束时间',
-  `day` bigint DEFAULT NULL COMMENT '请假天数',
-  `status` int DEFAULT NULL COMMENT '审批结果',
-  `process_instance_id` varchar(255) DEFAULT NULL COMMENT '对应的流程编号',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA 请假申请';
-
--- 删除表，如果已存在
-DROP TABLE IF EXISTS `bpm_process_instance_copy`;
-CREATE TABLE `bpm_process_instance_copy` (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `start_user_id` bigint DEFAULT NULL COMMENT '发起人 Id',
-  `process_instance_name` varchar(255) DEFAULT NULL COMMENT '流程名',
-  `process_instance_id` varchar(255) DEFAULT NULL COMMENT '流程实例的编号',
-  `process_definition_id` varchar(255) DEFAULT NULL COMMENT '流程实例的流程定义编号',
-  `category` varchar(255) DEFAULT NULL COMMENT '流程分类',
-  `activity_id` varchar(255) DEFAULT NULL COMMENT '流程活动的编号',
-  `activity_name` varchar(255) DEFAULT NULL COMMENT '流程活动的名字',
-  `task_id` varchar(255) DEFAULT NULL COMMENT '流程活动的编号',
-  `user_id` bigint DEFAULT NULL COMMENT '用户编号（被抄送的用户编号）',
-  `reason` varchar(255) DEFAULT NULL COMMENT '抄送意见',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `creator` varchar(64) DEFAULT NULL COMMENT '创建者',
-  `updater` varchar(64) DEFAULT NULL COMMENT '更新者',
-  `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='流程抄送';

sql/mysql/xxl-job.sql

@@ -0,0 +1,118 @@
+
+CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4 collate utf8mb4_unicode_ci;
+use `xxl_job`;
+
+SET NAMES utf8mb4;
+
+CREATE TABLE `xxl_job_info` (
+                                `id` int(11) NOT NULL AUTO_INCREMENT,
+                                `job_group` int(11) NOT NULL COMMENT '执行器主键ID',
+                                `job_desc` varchar(255) NOT NULL,
+                                `add_time` datetime DEFAULT NULL,
+                                `update_time` datetime DEFAULT NULL,
+                                `author` varchar(64) DEFAULT NULL COMMENT '作者',
+                                `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮件',
+                                `schedule_type` varchar(50) NOT NULL DEFAULT 'NONE' COMMENT '调度类型',
+                                `schedule_conf` varchar(128) DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型',
+                                `misfire_strategy` varchar(50) NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略',
+                                `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略',
+                                `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
+                                `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
+                                `executor_block_strategy` varchar(50) DEFAULT NULL COMMENT '阻塞处理策略',
+                                `executor_timeout` int(11) NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒',
+                                `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数',
+                                `glue_type` varchar(50) NOT NULL COMMENT 'GLUE类型',
+                                `glue_source` mediumtext COMMENT 'GLUE源代码',
+                                `glue_remark` varchar(128) DEFAULT NULL COMMENT 'GLUE备注',
+                                `glue_updatetime` datetime DEFAULT NULL COMMENT 'GLUE更新时间',
+                                `child_jobid` varchar(255) DEFAULT NULL COMMENT '子任务ID，多个逗号分隔',
+                                `trigger_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行',
+                                `trigger_last_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '上次调度时间',
+                                `trigger_next_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '下次调度时间',
+                                PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `xxl_job_log` (
+                               `id` bigint(20) NOT NULL AUTO_INCREMENT,
+                               `job_group` int(11) NOT NULL COMMENT '执行器主键ID',
+                               `job_id` int(11) NOT NULL COMMENT '任务，主键ID',
+                               `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址',
+                               `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
+                               `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
+                               `executor_sharding_param` varchar(20) DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2',
+                               `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数',
+                               `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间',
+                               `trigger_code` int(11) NOT NULL COMMENT '调度-结果',
+                               `trigger_msg` text COMMENT '调度-日志',
+                               `handle_time` datetime DEFAULT NULL COMMENT '执行-时间',
+                               `handle_code` int(11) NOT NULL COMMENT '执行-状态',
+                               `handle_msg` text COMMENT '执行-日志',
+                               `alarm_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败',
+                               PRIMARY KEY (`id`),
+                               KEY `I_trigger_time` (`trigger_time`),
+                               KEY `I_handle_code` (`handle_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `xxl_job_log_report` (
+                                      `id` int(11) NOT NULL AUTO_INCREMENT,
+                                      `trigger_day` datetime DEFAULT NULL COMMENT '调度-时间',
+                                      `running_count` int(11) NOT NULL DEFAULT '0' COMMENT '运行中-日志数量',
+                                      `suc_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量',
+                                      `fail_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量',
+                                      `update_time` datetime DEFAULT NULL,
+                                      PRIMARY KEY (`id`),
+                                      UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `xxl_job_logglue` (
+                                   `id` int(11) NOT NULL AUTO_INCREMENT,
+                                   `job_id` int(11) NOT NULL COMMENT '任务，主键ID',
+                                   `glue_type` varchar(50) DEFAULT NULL COMMENT 'GLUE类型',
+                                   `glue_source` mediumtext COMMENT 'GLUE源代码',
+                                   `glue_remark` varchar(128) NOT NULL COMMENT 'GLUE备注',
+                                   `add_time` datetime DEFAULT NULL,
+                                   `update_time` datetime DEFAULT NULL,
+                                   PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `xxl_job_registry` (
+                                    `id` int(11) NOT NULL AUTO_INCREMENT,
+                                    `registry_group` varchar(50) NOT NULL,
+                                    `registry_key` varchar(255) NOT NULL,
+                                    `registry_value` varchar(255) NOT NULL,
+                                    `update_time` datetime DEFAULT NULL,
+                                    PRIMARY KEY (`id`),
+                                    KEY `i_g_k_v` (`registry_group`,`registry_key`,`registry_value`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `xxl_job_group` (
+                                 `id` int(11) NOT NULL AUTO_INCREMENT,
+                                 `app_name` varchar(64) NOT NULL COMMENT '执行器AppName',
+                                 `title` varchar(12) NOT NULL COMMENT '执行器名称',
+                                 `address_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入',
+                                 `address_list` text COMMENT '执行器地址列表，多地址逗号分隔',
+                                 `update_time` datetime DEFAULT NULL,
+                                 PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `xxl_job_user` (
+                                `id` int(11) NOT NULL AUTO_INCREMENT,
+                                `username` varchar(50) NOT NULL COMMENT '账号',
+                                `password` varchar(50) NOT NULL COMMENT '密码',
+                                `role` tinyint(4) NOT NULL COMMENT '角色：0-普通用户、1-管理员',
+                                `permission` varchar(255) DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割',
+                                PRIMARY KEY (`id`),
+                                UNIQUE KEY `i_username` (`username`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `xxl_job_lock` (
+                                `lock_name` varchar(50) NOT NULL COMMENT '锁名称',
+                                PRIMARY KEY (`lock_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `address_type`, `address_list`, `update_time`) VALUES (1, 'xxl-job-executor-sample', '示例执行器', 0, NULL, '2018-11-03 22:21:31' );
+INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `schedule_type`, `schedule_conf`, `misfire_strategy`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`) VALUES (1, 1, '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'CRON', '0 0 0 * * ? *', 'DO_NOTHING', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '');
+INSERT INTO `xxl_job_user`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL);
+INSERT INTO `xxl_job_lock` ( `lock_name`) VALUES ( 'schedule_lock');
+
+commit;

yudao-module-infra/yudao-module-infra-server/src/main/resources/application-local.yaml

@@ -99,7 +99,7 @@ xxl:
   job:
     enabled: false # 是否开启调度中心，默认为 true 开启
     admin:
-      addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
+      addresses: http://127.0.0.1:8080/xxl-job-admin # 调度中心部署跟地址
 
 --- #################### 服务保障相关配置 ####################
 

yudao-module-report/yudao-module-report-server/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: report-server
 
   profiles:
-    active: local
+    active: dev
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。

yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml

@@ -136,7 +136,7 @@ aj:
     cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存
     timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
     type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
-    water-mark: 芋道源码 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
+    water-mark: 中国铜业 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
     interference-options: 0 # 滑动干扰项(0/1/2)
     req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
     req-get-lock-limit: 5 # 验证失败5次，get接口锁定