[fix]修改视频相关

ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -72,7 +72,7 @@ public class CaptchaController {
             log.error("验证码短信发送异常 => {}", smsResponse);
             return R.fail(smsResponse.getData().toString());
         }
-        return R.ok(code);
+        return R.ok("ok",code);
     }
 
     /**

ruoyi-admin/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: false
-  url: http://localhost:9090/admin
+  url: http://192.168.1.65:9090/admin
   instance:
     service-host-type: IP
     metadata:
@@ -26,7 +26,7 @@ snail-job:
   # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
-    host: 127.0.0.1
+    host: 192.168.1.65
     port: 17888
   # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
   namespace: ${spring.profiles.active}

ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://82.156.121.2:23306/wzj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.65:13306/snail_job?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
     username: wzj
     password: A085F27A43B0
     hikari:
@@ -30,7 +30,7 @@ snail-job:
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090/admin
+  url: http://192.168.1.65:9090/admin
   instance:
     service-host-type: IP
     metadata:

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java

@@ -80,8 +80,6 @@ public class Member  extends BaseAudit {
     @Schema(description ="等级")
     private Integer level;
 
-    @Schema(description ="用户剩余积分")
-    private BigDecimal integral;
 
     @Schema(description ="im签名")
     private String userSig; // 添加 UserSig 属性

script/docker/docker-compose.yml

@@ -135,7 +135,7 @@ services:
       TZ: Asia/Shanghai
     volumes:
       # 配置文件
-      - /docker/monitor/logs/:/ruoyi/monitor/logs
+      - /var/local/docker/monitor/logs/:/ruoyi/monitor/logs
     privileged: true
     network_mode: "host"
 
@@ -149,15 +149,11 @@ services:
       - "8800:8800"
       - "17888:17888"
     volumes:
-      - /docker/snailjob/logs/:/ruoyi/snailjob/logs
+      - /var/local/docker/snailjob/logs/:/ruoyi/snailjob/logs
     privileged: true
     network_mode: "host"
   elasticsearch:
     image: elasticsearch:7.14.0
-
-
-
-
     container_name: elasticsearch
     environment:
       - discovery.type=single-node
@@ -173,8 +169,8 @@ services:
       image: fluent/fluentd:v1.12-debian-1
       container_name: fluentd
       volumes:
-        - ./fluentd/conf:/fluentd/etc
+        - var/local/docker/fluentd/conf:/fluentd/etc
-        - ./fluentd/log:/fluentd/log
+        - var/local/docker/fluentd/log:/fluentd/log
       ports:
         - "24224:24224"
         - "24224:24224/udp"

script/sql/snail_job_mysql.sql

@@ -1,5 +1,9 @@
 SET NAMES utf8mb4;
 
+DROP DATABASE IF EXISTS snail_job;
+CREATE DATABASE snail_job;
+USE snail_job;
+
 CREATE TABLE `sj_namespace`
 (
     `id`          bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -15,8 +19,9 @@ CREATE TABLE `sj_namespace`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='命名空间';
 
-INSERT INTO `sj_namespace` VALUES (1, 'Development', 'dev', '', 0, now(), now());
+INSERT INTO `sj_namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`)
-INSERT INTO `sj_namespace` VALUES (2, 'Production', 'prod', '', 0, now(), now());
+VALUES (1, 'Default', '764d604ec6fc45f68cd92514c40e9e1a', now(), now(), 0);
+
 
 CREATE TABLE `sj_group_config`
 (
@@ -36,10 +41,8 @@ CREATE TABLE `sj_group_config`
     UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='组配置';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='组配置'
-
+;
-INSERT INTO `sj_group_config` VALUES (1, 'dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  now(), now());
-INSERT INTO `sj_group_config` VALUES (2, 'prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  now(), now());
 
 CREATE TABLE `sj_notify_config`
 (
@@ -61,7 +64,8 @@ CREATE TABLE `sj_notify_config`
     KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='通知配置';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='通知配置'
+;
 
 CREATE TABLE `sj_notify_recipient`
 (
@@ -77,17 +81,22 @@ CREATE TABLE `sj_notify_recipient`
     KEY `idx_namespace_id` (`namespace_id`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='告警通知接收人';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='告警通知接收人'
+;
 
 CREATE TABLE `sj_retry_dead_letter`
 (
     `id`              bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
     `namespace_id`    varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
     `group_name`      varchar(64)         NOT NULL COMMENT '组名称',
+    `group_id`        bigint(20)          NOT NULL COMMENT '组Id',
     `scene_name`      varchar(64)         NOT NULL COMMENT '场景名称',
+    `scene_id`        bigint(20)          NOT NULL COMMENT '场景ID',
     `idempotent_id`   varchar(64)         NOT NULL COMMENT '幂等id',
     `biz_no`          varchar(64)         NOT NULL DEFAULT '' COMMENT '业务编号',
     `executor_name`   varchar(512)        NOT NULL DEFAULT '' COMMENT '执行器名称',
+    -- jackson 兼容历史数据 预计1.8.0默认改为fury
+    `serializer_name` varchar(32)         NOT NULL DEFAULT 'jackson' COMMENT '执行方法参数序列化器名称',
     `args_str`        text                NOT NULL COMMENT '执行方法参数',
     `ext_attrs`       text                NOT NULL COMMENT '扩展字段',
     `create_dt`       datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -98,19 +107,24 @@ CREATE TABLE `sj_retry_dead_letter`
     KEY `idx_create_dt` (`create_dt`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='死信队列表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='死信队列表'
+;
 
 CREATE TABLE `sj_retry`
 (
     `id`              bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
     `namespace_id`    varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
     `group_name`      varchar(64)         NOT NULL COMMENT '组名称',
+    `group_id`        bigint(20)          NOT NULL COMMENT '组Id',
     `scene_name`      varchar(64)         NOT NULL COMMENT '场景名称',
+    `scene_id`        bigint(20)          NOT NULL COMMENT '场景ID',
     `idempotent_id`   varchar(64)         NOT NULL COMMENT '幂等id',
     `biz_no`          varchar(64)         NOT NULL DEFAULT '' COMMENT '业务编号',
     `executor_name`   varchar(512)        NOT NULL DEFAULT '' COMMENT '执行器名称',
     `args_str`        text                NOT NULL COMMENT '执行方法参数',
     `ext_attrs`       text                NOT NULL COMMENT '扩展字段',
+    -- jackson 兼容历史数据 预计1.8.0默认改为fury
+    `serializer_name` varchar(32)         NOT NULL DEFAULT 'jackson' COMMENT '执行方法参数序列化器名称',
     `next_trigger_at` bigint(13)          NOT NULL COMMENT '下次触发时间',
     `retry_count`     int(11)             NOT NULL DEFAULT 0 COMMENT '重试次数',
     `retry_status`    tinyint(4)          NOT NULL DEFAULT 0 COMMENT '重试状态 0、重试中 1、成功 2、最大重试次数',
@@ -121,16 +135,16 @@ CREATE TABLE `sj_retry`
     `create_dt`       datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_dt`       datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
     PRIMARY KEY (`id`),
-    KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`),
-    KEY `idx_namespace_id_group_name_retry_status` (`namespace_id`, `group_name`, `retry_status`),
-    KEY `idx_idempotent_id` (`idempotent_id`),
     KEY `idx_biz_no` (`biz_no`),
+    KEY `idx_idempotent_id` (`idempotent_id`),
+    KEY `idx_retry_status_bucket_index` (`retry_status`, `bucket_index`),
     KEY `idx_parent_id` (`parent_id`),
     KEY `idx_create_dt` (`create_dt`),
-    UNIQUE KEY `uk_name_task_type_idempotent_id_deleted` (`namespace_id`, `group_name`, `task_type`, `idempotent_id`, `deleted`)
+    UNIQUE KEY `uk_scene_tasktype_idempotentid_deleted` (`scene_id`, `task_type`, `idempotent_id`, `deleted`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='重试信息表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='重试信息表'
+;
 
 CREATE TABLE `sj_retry_task`
 (
@@ -153,7 +167,8 @@ CREATE TABLE `sj_retry_task`
     KEY `idx_retry_id` (`retry_id`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='重试任务表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='重试任务表'
+;
 
 CREATE TABLE `sj_retry_task_log_message`
 (
@@ -171,7 +186,8 @@ CREATE TABLE `sj_retry_task_log_message`
     KEY `idx_create_dt` (`create_dt`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='任务调度日志信息记录表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='任务调度日志信息记录表'
+;
 
 CREATE TABLE `sj_retry_scene_config`
 (
@@ -192,6 +208,8 @@ CREATE TABLE `sj_retry_scene_config`
     `cb_trigger_type`     tinyint(4)          NOT NULL DEFAULT 1 COMMENT '1、默认等级 2、固定间隔时间 3、CRON 表达式',
     `cb_max_count`        int(11)             NOT NULL DEFAULT 16 COMMENT '回调的最大执行次数',
     `cb_trigger_interval` varchar(16)         NOT NULL DEFAULT '' COMMENT '回调的最大执行次数',
+    `owner_id`            bigint(20)          NULL     DEFAULT NULL COMMENT '负责人id',
+    `labels`              varchar(512)        NULL     DEFAULT '' COMMENT '标签',
     `description`         varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
     `create_dt`           datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_dt`           datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
@@ -199,7 +217,8 @@ CREATE TABLE `sj_retry_scene_config`
     UNIQUE KEY `uk_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='场景配置';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='场景配置'
+;
 
 CREATE TABLE `sj_server_node`
 (
@@ -212,6 +231,7 @@ CREATE TABLE `sj_server_node`
     `expire_at`    datetime            NOT NULL COMMENT '过期时间',
     `node_type`    tinyint(4)          NOT NULL COMMENT '节点类型 1、客户端 2、是服务端',
     `ext_attrs`    varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `labels`       varchar(512)        NULL     DEFAULT '' COMMENT '标签',
     `create_dt`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_dt`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
     PRIMARY KEY (`id`),
@@ -220,7 +240,8 @@ CREATE TABLE `sj_server_node`
     UNIQUE KEY `uk_host_id_host_ip` (`host_id`, `host_ip`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='服务器节点';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='服务器节点'
+;
 
 CREATE TABLE `sj_distributed_lock`
 (
@@ -233,7 +254,8 @@ CREATE TABLE `sj_distributed_lock`
     PRIMARY KEY (`name`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8mb4 COMMENT ='锁定表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='锁定表'
+;
 
 CREATE TABLE `sj_system_user`
 (
@@ -265,19 +287,6 @@ CREATE TABLE `sj_system_user_permission`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='系统用户权限表';
 
-CREATE TABLE `sj_sequence_alloc`
-(
-    `id`           bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `namespace_id` varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
-    `group_name`   varchar(64)         NOT NULL DEFAULT '' COMMENT '组名称',
-    `max_id`       bigint(20)          NOT NULL DEFAULT 1 COMMENT '最大id',
-    `step`         int(11)             NOT NULL DEFAULT 100 COMMENT '步长',
-    `update_dt`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='号段模式序号ID分配表';
-
 -- 分布式调度DDL
 CREATE TABLE `sj_job`
 (
@@ -303,7 +312,8 @@ CREATE TABLE `sj_job`
     `bucket_index`     int(11)             NOT NULL DEFAULT 0 COMMENT 'bucket',
     `resident`         tinyint(4)          NOT NULL DEFAULT 0 COMMENT '是否是常驻任务',
     `notify_ids`       varchar(128)        NOT NULL DEFAULT '' COMMENT '通知告警场景配置id列表',
-    `owner_id`         bigint(20)          NULL                 COMMENT '负责人id',
+    `owner_id`         bigint(20)          NULL     DEFAULT NULL COMMENT '负责人id',
+    `labels`           varchar(512)        NULL     DEFAULT '' COMMENT '标签',
     `description`      varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
     `ext_attrs`        varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
     `deleted`          tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
@@ -317,8 +327,6 @@ CREATE TABLE `sj_job`
   AUTO_INCREMENT = 0
   DEFAULT CHARSET = utf8mb4 COMMENT ='任务信息';
 
-INSERT INTO `sj_job` VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '', '', 0 , now(), now());
-
 CREATE TABLE `sj_job_log_message`
 (
     `id`            bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -458,6 +466,7 @@ CREATE TABLE `sj_workflow`
     `notify_ids`       varchar(128)        NOT NULL DEFAULT '' COMMENT '通知告警场景配置id列表',
     `bucket_index`     int(11)             NOT NULL DEFAULT 0 COMMENT 'bucket',
     `version`          int(11)             NOT NULL COMMENT '版本号',
+    `owner_id`         bigint(20)          NULL     DEFAULT NULL COMMENT '负责人id',
     `ext_attrs`        varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
     `deleted`          tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
     `create_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -518,3 +527,19 @@ CREATE TABLE `sj_workflow_task_batch`
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 0
   DEFAULT CHARSET = utf8mb4 COMMENT ='工作流批次';
+
+CREATE TABLE `sj_job_executor`
+(
+    `id`            bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`  varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`    varchar(64)         NOT NULL COMMENT '组名称',
+    `executor_info` varchar(256)        NOT NULL COMMENT '任务执行器名称',
+    `executor_type` varchar(3)          NOT NULL COMMENT '1:java 2:python 3:go',
+    `create_dt`     datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`     datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`),
+    KEY `idx_create_dt` (`create_dt`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='任务执行器信息';