Skip to content

Commit 667cf9d

Browse files
YunaiVYunaiV
committed
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
2 parents c3bfdcf + b5a7350 commit 667cf9d

File tree

26 files changed

+339
-160
lines changed

26 files changed

+339
-160
lines changed

‎sql/dm/ruoyi-vue-pro-dm8.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
12401240
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3000, 16, '百川智能', 'BaiChuan', 'ai_platform', 0, '', '', '', '1', '2025-03-23 12:15:46', '1', '2025-03-23 12:15:46', '0');
12411241
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3001, 50, 'Vben5.0 Ant Design Schema 模版', '40', 'infra_codegen_front_type', 0, '', '', NULL, '1', '2025-04-23 21:47:47', '1', '2025-05-02 12:01:15', '0');
12421242
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3002, 6, '支付宝余额', '6', 'brokerage_withdraw_type', 0, '', '', 'API 打款', '1', '2025-05-10 08:24:49', '1', '2025-05-10 08:24:49', '0');
1243+
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3035, 40, '支付宝小程序', '40', 'system_social_type', 0, '', '', '', '1', '2023-11-04 13:05:38', '1', '2023-11-04 13:07:16', '0');
12431244
COMMIT;
12441245
SET IDENTITY_INSERT system_dict_data OFF;
12451246
-- @formatter:on
@@ -4179,7 +4180,8 @@ CREATE TABLE system_social_client
41794180
social_type smallint NOT NULL,
41804181
user_type smallint NOT NULL,
41814182
client_id varchar(255) NOT NULL,
4182-
client_secret varchar(255) NOT NULL,
4183+
client_secret varchar(2048) NOT NULL,
4184+
public_key varchar(2048) DEFAULT NULL NULL,
41834185
agent_id varchar(255) DEFAULT NULL NULL,
41844186
status smallint NOT NULL,
41854187
creator varchar(64) DEFAULT '' NULL,
@@ -4195,6 +4197,7 @@ COMMENT ON COLUMN system_social_client.name IS '应用名';
41954197
COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
41964198
COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
41974199
COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
4200+
COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
41984201
COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
41994202
COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
42004203
COMMENT ON COLUMN system_social_client.status IS '状态';

‎sql/kingbase/ruoyi-vue-pro.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
13541354
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3000, 16, '百川智能', 'BaiChuan', 'ai_platform', 0, '', '', '', '1', '2025-03-23 12:15:46', '1', '2025-03-23 12:15:46', '0');
13551355
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3001, 50, 'Vben5.0 Ant Design Schema 模版', '40', 'infra_codegen_front_type', 0, '', '', NULL, '1', '2025-04-23 21:47:47', '1', '2025-05-02 12:01:15', '0');
13561356
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3002, 6, '支付宝余额', '6', 'brokerage_withdraw_type', 0, '', '', 'API 打款', '1', '2025-05-10 08:24:49', '1', '2025-05-10 08:24:49', '0');
1357+
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3035, 40, '支付宝小程序', 40, '', '', '', '1', '2023-11-04 13:05:38', '1', '2023-11-04 13:07:16', '0');
13571358
COMMIT;
13581359
-- @formatter:on
13591360

@@ -4461,7 +4462,8 @@ CREATE TABLE system_social_client
44614462
social_type int2 NOT NULL,
44624463
user_type int2 NOT NULL,
44634464
client_id varchar(255) NOT NULL,
4464-
client_secret varchar(255) NOT NULL,
4465+
client_secret varchar(2048) NOT NULL,
4466+
public_key varchar(2048) NULL DEFAULT NULL,
44654467
agent_id varchar(255) NULL DEFAULT NULL,
44664468
status int2 NOT NULL,
44674469
creator varchar(64) NULL DEFAULT '',
@@ -4481,6 +4483,7 @@ COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
44814483
COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
44824484
COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
44834485
COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
4486+
COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
44844487
COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
44854488
COMMENT ON COLUMN system_social_client.status IS '状态';
44864489
COMMENT ON COLUMN system_social_client.creator IS '创建者';

‎sql/mysql/ruoyi-vue-pro.sql‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1092,6 +1092,7 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
10921092
INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3032, 50, 'Vben5.0 Element Plus Schema 模版', '50', 'infra_codegen_front_type', 0, '', '', '', '1', '2025-09-04 23:26:38', '1', '2025-09-04 23:26:38', b'0');
10931093
INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3033, 51, 'Vben5.0 Element Plus 标准模版', '51', 'infra_codegen_front_type', 0, '', '', '', '1', '2025-09-04 23:26:49', '1', '2025-09-04 23:26:49', b'0');
10941094
INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3034, 1, 'ttt', 'tt', 'iot_ota_task_record_status', 0, 'success', '', NULL, '1', '2025-09-06 00:02:21', '1', '2025-09-06 00:02:31', b'0');
1095+
INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3035, 40, '支付宝小程序', '40', 'system_social_type', 0, '', '', '', '1', '2023-11-04 13:05:38', '1', '2023-11-04 13:07:16', b'0');
10951096
COMMIT;
10961097

10971098
-- ----------------------------
@@ -3669,7 +3670,8 @@ CREATE TABLE `system_social_client` (
36693670
`social_type` tinyint NOT NULL COMMENT '社交平台的类型',
36703671
`user_type` tinyint NOT NULL COMMENT '用户类型',
36713672
`client_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户端编号',
3672-
`client_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户端密钥',
3673+
`client_secret` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户端密钥',
3674+
`public_key` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT 'publicKey公钥',
36733675
`agent_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '代理编号',
36743676
`status` tinyint NOT NULL COMMENT '状态',
36753677
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',

‎sql/opengauss/ruoyi-vue-pro.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
13541354
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3000, 16, '百川智能', 'BaiChuan', 'ai_platform', 0, '', '', '', '1', '2025-03-23 12:15:46', '1', '2025-03-23 12:15:46', '0');
13551355
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3001, 50, 'Vben5.0 Ant Design Schema 模版', '40', 'infra_codegen_front_type', 0, '', '', NULL, '1', '2025-04-23 21:47:47', '1', '2025-05-02 12:01:15', '0');
13561356
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3002, 6, '支付宝余额', '6', 'brokerage_withdraw_type', 0, '', '', 'API 打款', '1', '2025-05-10 08:24:49', '1', '2025-05-10 08:24:49', '0');
1357+
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3035, 40, '支付宝小程序', '40', 'system_social_type', 0, '', '', '', '1', '2023-11-04 13:05:38', '1', '2023-11-04 13:07:16', '0');
13571358
COMMIT;
13581359
-- @formatter:on
13591360

@@ -4461,7 +4462,8 @@ CREATE TABLE system_social_client
44614462
social_type int2 NOT NULL,
44624463
user_type int2 NOT NULL,
44634464
client_id varchar(255) NOT NULL,
4464-
client_secret varchar(255) NOT NULL,
4465+
client_secret varchar(2048) NOT NULL,
4466+
public_key varchar(2048) NULL DEFAULT NULL,
44654467
agent_id varchar(255) NULL DEFAULT NULL,
44664468
status int2 NOT NULL,
44674469
creator varchar(64) NULL DEFAULT '',
@@ -4481,6 +4483,7 @@ COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
44814483
COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
44824484
COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
44834485
COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
4486+
COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
44844487
COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
44854488
COMMENT ON COLUMN system_social_client.status IS '状态';
44864489
COMMENT ON COLUMN system_social_client.creator IS '创建者';

‎sql/oracle/ruoyi-vue-pro.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
13061306
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3000, 16, '百川智能', 'BaiChuan', 'ai_platform', 0, '', '', '', '1', to_date('2025-03-23 12:15:46', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-03-23 12:15:46', 'SYYYY-MM-DD HH24:MI:SS'), '0');
13071307
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3001, 50, 'Vben5.0 Ant Design Schema 模版', '40', 'infra_codegen_front_type', 0, '', '', NULL, '1', to_date('2025-04-23 21:47:47', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-05-02 12:01:15', 'SYYYY-MM-DD HH24:MI:SS'), '0');
13081308
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3002, 6, '支付宝余额', '6', 'brokerage_withdraw_type', 0, '', '', 'API 打款', '1', to_date('2025-05-10 08:24:49', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-05-10 08:24:49', 'SYYYY-MM-DD HH24:MI:SS'), '0');
1309+
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3035, 40, '支付宝小程序', '40', 'system_social_type', 0, '', '', '', '1', to_date('2023-11-04 13:05:38', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2023-11-04 13:07:16', 'SYYYY-MM-DD HH24:MI:SS'), '0');
13091310
COMMIT;
13101311
-- @formatter:on
13111312

@@ -4355,7 +4356,8 @@ CREATE TABLE system_social_client
43554356
social_type smallint NOT NULL,
43564357
user_type smallint NOT NULL,
43574358
client_id varchar2(255) NULL,
4358-
client_secret varchar2(255) NULL,
4359+
client_secret varchar2(2048) NULL,
4360+
public_key varchar2(2048) DEFAULT NULL NULL,
43594361
agent_id varchar2(255) DEFAULT NULL NULL,
43604362
status smallint NOT NULL,
43614363
creator varchar2(64) DEFAULT '' NULL,
@@ -4375,6 +4377,7 @@ COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
43754377
COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
43764378
COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
43774379
COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
4380+
COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
43784381
COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
43794382
COMMENT ON COLUMN system_social_client.status IS '状态';
43804383
COMMENT ON COLUMN system_social_client.creator IS '创建者';

0 commit comments

Comments
 (0)