BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 86de4684133b1da6e09e1307357418949f5c015c

Authored by YunaiV
1 parent ee8a5bf8

同步：https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1464/files

Inline Side-by-side
Showing 12 changed files with 69 additions and 10 deletions
sql/dm/ruoyi-vue-pro-dm8.sql
  View file @86de468
... ... @@ -1240,6 +1240,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
1240 1240 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');
1241 1241 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');
1242 1242 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');
1243 1244 COMMIT;
1244 1245 SET IDENTITY_INSERT system_dict_data OFF;
1245 1246 -- @formatter:on
... ... @@ -4179,7 +4180,8 @@ CREATE TABLE system_social_client
4179 4180 social_type smallint NOT NULL,
4180 4181 user_type smallint NOT NULL,
4181 4182 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,
4183 4185 agent_id varchar(255) DEFAULT NULL NULL,
4184 4186 status smallint NOT NULL,
4185 4187 creator varchar(64) DEFAULT '' NULL,
... ... @@ -4195,6 +4197,7 @@ COMMENT ON COLUMN system_social_client.name IS '应用名';
4195 4197 COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
4196 4198 COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
4197 4199 COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
  4200 +COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
4198 4201 COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
4199 4202 COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
4200 4203 COMMENT ON COLUMN system_social_client.status IS '状态';
... ...
sql/kingbase/ruoyi-vue-pro.sql
  View file @86de468
... ... @@ -1354,6 +1354,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
1354 1354 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');
1355 1355 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');
1356 1356 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');
1357 1358 COMMIT;
1358 1359 -- @formatter:on
1359 1360  
... ... @@ -4461,7 +4462,8 @@ CREATE TABLE system_social_client
4461 4462 social_type int2 NOT NULL,
4462 4463 user_type int2 NOT NULL,
4463 4464 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,
4465 4467 agent_id varchar(255) NULL DEFAULT NULL,
4466 4468 status int2 NOT NULL,
4467 4469 creator varchar(64) NULL DEFAULT '',
... ... @@ -4481,6 +4483,7 @@ COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
4481 4483 COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
4482 4484 COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
4483 4485 COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
  4486 +COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
4484 4487 COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
4485 4488 COMMENT ON COLUMN system_social_client.status IS '状态';
4486 4489 COMMENT ON COLUMN system_social_client.creator IS '创建者';
... ...
sql/mysql/ruoyi-vue-pro.sql
  View file @86de468
... ... @@ -1092,6 +1092,7 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
1092 1092 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');
1093 1093 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');
1094 1094 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');
1095 1096 COMMIT;
1096 1097  
1097 1098 -- ----------------------------
... ... @@ -3669,7 +3670,8 @@ CREATE TABLE `system_social_client` (
3669 3670 `social_type` tinyint NOT NULL COMMENT '社交平台的类型',
3670 3671 `user_type` tinyint NOT NULL COMMENT '用户类型',
3671 3672 `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公钥',
3673 3675 `agent_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '代理编号',
3674 3676 `status` tinyint NOT NULL COMMENT '状态',
3675 3677 `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
... ...
sql/opengauss/ruoyi-vue-pro.sql
  View file @86de468
... ... @@ -1354,6 +1354,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
1354 1354 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');
1355 1355 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');
1356 1356 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');
1357 1358 COMMIT;
1358 1359 -- @formatter:on
1359 1360  
... ... @@ -4461,7 +4462,8 @@ CREATE TABLE system_social_client
4461 4462 social_type int2 NOT NULL,
4462 4463 user_type int2 NOT NULL,
4463 4464 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,
4465 4467 agent_id varchar(255) NULL DEFAULT NULL,
4466 4468 status int2 NOT NULL,
4467 4469 creator varchar(64) NULL DEFAULT '',
... ... @@ -4481,6 +4483,7 @@ COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
4481 4483 COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
4482 4484 COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
4483 4485 COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
  4486 +COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
4484 4487 COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
4485 4488 COMMENT ON COLUMN system_social_client.status IS '状态';
4486 4489 COMMENT ON COLUMN system_social_client.creator IS '创建者';
... ...
sql/oracle/ruoyi-vue-pro.sql
  View file @86de468
... ... @@ -1306,6 +1306,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
1306 1306 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');
1307 1307 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');
1308 1308 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');
1309 1310 COMMIT;
1310 1311 -- @formatter:on
1311 1312  
... ... @@ -4355,7 +4356,8 @@ CREATE TABLE system_social_client
4355 4356 social_type smallint NOT NULL,
4356 4357 user_type smallint NOT NULL,
4357 4358 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,
4359 4361 agent_id varchar2(255) DEFAULT NULL NULL,
4360 4362 status smallint NOT NULL,
4361 4363 creator varchar2(64) DEFAULT '' NULL,
... ... @@ -4375,6 +4377,7 @@ COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
4375 4377 COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
4376 4378 COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
4377 4379 COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
  4380 +COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
4378 4381 COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
4379 4382 COMMENT ON COLUMN system_social_client.status IS '状态';
4380 4383 COMMENT ON COLUMN system_social_client.creator IS '创建者';
... ...
sql/postgresql/ruoyi-vue-pro.sql
  View file @86de468
... ... @@ -1354,6 +1354,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
1354 1354 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');
1355 1355 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');
1356 1356 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');
1357 1358 COMMIT;
1358 1359 -- @formatter:on
1359 1360  
... ... @@ -4461,7 +4462,8 @@ CREATE TABLE system_social_client
4461 4462 social_type int2 NOT NULL,
4462 4463 user_type int2 NOT NULL,
4463 4464 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,
4465 4467 agent_id varchar(255) NULL DEFAULT NULL,
4466 4468 status int2 NOT NULL,
4467 4469 creator varchar(64) NULL DEFAULT '',
... ... @@ -4481,6 +4483,7 @@ COMMENT ON COLUMN system_social_client.social_type IS '社交平台的类型';
4481 4483 COMMENT ON COLUMN system_social_client.user_type IS '用户类型';
4482 4484 COMMENT ON COLUMN system_social_client.client_id IS '客户端编号';
4483 4485 COMMENT ON COLUMN system_social_client.client_secret IS '客户端密钥';
  4486 +COMMENT ON COLUMN system_social_client.public_key IS 'publicKey公钥';
4484 4487 COMMENT ON COLUMN system_social_client.agent_id IS '代理编号';
4485 4488 COMMENT ON COLUMN system_social_client.status IS '状态';
4486 4489 COMMENT ON COLUMN system_social_client.creator IS '创建者';
... ...
sql/sqlserver/ruoyi-vue-pro.sql
  View file @86de468
... ... @@ -3299,6 +3299,8 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
3299 3299 GO
3300 3300 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, N'支付宝余额', N'6', N'brokerage_withdraw_type', 0, N'', N'', N'API 打款', N'1', N'2025-05-10 08:24:49', N'1', N'2025-05-10 08:24:49', N'0')
3301 3301 GO
  3302 +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, N'支付宝小程序', N'40', N'system_social_type', 0, N'', N'', N'', N'1', N'2023-11-04 13:05:38', N'1', N'2023-11-04 13:07:16', N'0')
  3303 +GO
3302 3304 SET IDENTITY_INSERT system_dict_data OFF
3303 3305 GO
3304 3306 COMMIT
... ... @@ -10433,7 +10435,8 @@ CREATE TABLE system_social_client
10433 10435 social_type tinyint NOT NULL,
10434 10436 user_type tinyint NOT NULL,
10435 10437 client_id nvarchar(255) NOT NULL,
10436   - client_secret nvarchar(255) NOT NULL,
  10438 + client_secret nvarchar(2048) NOT NULL,
  10439 + public_key nvarchar(2048) DEFAULT NULL NULL,
10437 10440 agent_id nvarchar(255) DEFAULT NULL NULL,
10438 10441 status tinyint NOT NULL,
10439 10442 creator nvarchar(64) DEFAULT '' NULL,
... ... @@ -10488,6 +10491,13 @@ EXEC sp_addextendedproperty
10488 10491 GO
10489 10492  
10490 10493 EXEC sp_addextendedproperty
  10494 + 'MS_Description', N'publicKey公钥',
  10495 + 'SCHEMA', N'dbo',
  10496 + 'TABLE', N'system_social_client',
  10497 + 'COLUMN', N'public_key'
  10498 +GO
  10499 +
  10500 +EXEC sp_addextendedproperty
10491 10501 'MS_Description', N'代理编号',
10492 10502 'SCHEMA', N'dbo',
10493 10503 'TABLE', N'system_social_client',
... ...
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/client/SocialClientRespVO.java
  View file @86de468
... ... @@ -27,9 +27,12 @@ public class SocialClientRespVO {
27 27 @Schema(description = "客户端密钥", requiredMode = Schema.RequiredMode.REQUIRED, example = "peter")
28 28 private String clientSecret;
29 29  
30   - @Schema(description = "授权方的网页应用编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000045")
  30 + @Schema(description = "授权方的网页应用编号", example = "2000045")
31 31 private String agentId;
32 32  
  33 + @Schema(description = "publicKey 公钥", example = "2000045")
  34 + private String publicKey;
  35 +
33 36 @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
34 37 private Integer status;
35 38  
... ...
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java
  View file @86de468
... ... @@ -45,6 +45,9 @@ public class SocialClientSaveReqVO {
45 45 @Schema(description = "授权方的网页应用编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000045")
46 46 private String agentId;
47 47  
  48 + @Schema(description = "publicKey 公钥", example = "2000045")
  49 + private String publicKey;
  50 +
48 51 @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
49 52 @NotNull(message = "状态不能为空")
50 53 @InEnum(CommonStatusEnum.class)
... ... @@ -58,4 +61,12 @@ public class SocialClientSaveReqVO {
58 61 || !StrUtil.isEmpty(agentId);
59 62 }
60 63  
  64 + @AssertTrue(message = "publicKey 不能为空")
  65 + @JsonIgnore
  66 + public boolean isPublicKeyValid() {
  67 + // 如果是支付宝，必须填写 publicKey 属性
  68 + return !Objects.equals(socialType, SocialTypeEnum.ALIPAY.getType())
  69 + || !StrUtil.isEmpty(publicKey);
  70 + }
  71 +
61 72 }
... ...
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/social/SocialClientDO.java
  View file @86de468
... ... @@ -73,4 +73,12 @@ public class SocialClientDO extends TenantBaseDO {
73 73 */
74 74 private String agentId;
75 75  
  76 + /**
  77 + * publicKey 公钥
  78 + *
  79 + * 目前只有部分“社交类型”在使用：
  80 + * 1. 支付宝：支付宝公钥
  81 + */
  82 + private String publicKey;
  83 +
76 84 }
... ...
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/social/SocialTypeEnum.java
  View file @86de468
... ... @@ -53,6 +53,12 @@ public enum SocialTypeEnum implements ArrayValuable<Integer> {
53 53 * @see <a href="https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/login.html">接入文档</a>
54 54 */
55 55 WECHAT_MINI_PROGRAM(34, "WECHAT_MINI_PROGRAM"),
  56 + /**
  57 + * 支付宝小程序
  58 + *
  59 + * @see <a href="https://opendocs.alipay.com/mini/05dxgc?pathHash=1a3ecb13">接入文档</a>
  60 + */
  61 + ALIPAY_MINI_PROGRAM(40, "ALIPAY"),
56 62 ;
57 63  
58 64 public static final Integer[] ARRAYS = Arrays.stream(values()).map(SocialTypeEnum::getType).toArray(Integer[]::new);
... ...
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
  View file @86de468
... ... @@ -11,7 +11,6 @@ import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
11 11 import cn.binarywang.wx.miniapp.constant.WxMaConstants;
12 12 import cn.hutool.core.bean.BeanUtil;
13 13 import cn.hutool.core.collection.CollUtil;
14   -import cn.hutool.core.date.LocalDateTimeUtil;
15 14 import cn.hutool.core.lang.Assert;
16 15 import cn.hutool.core.util.DesensitizedUtil;
17 16 import cn.hutool.core.util.ObjUtil;
... ... @@ -52,6 +51,7 @@ import me.zhyd.oauth.config.AuthConfig;
52 51 import me.zhyd.oauth.model.AuthCallback;
53 52 import me.zhyd.oauth.model.AuthResponse;
54 53 import me.zhyd.oauth.model.AuthUser;
  54 +import me.zhyd.oauth.request.AuthAlipayRequest;
55 55 import me.zhyd.oauth.request.AuthRequest;
56 56 import me.zhyd.oauth.utils.AuthStateUtils;
57 57 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -169,7 +169,7 @@ public class SocialClientServiceImpl implements SocialClientService {
169 169 public AuthUser getAuthUser(Integer socialType, Integer userType, String code, String state) {
170 170 // 构建请求
171 171 AuthRequest authRequest = buildAuthRequest(socialType, userType);
172   - AuthCallback authCallback = AuthCallback.builder().code(code).state(state).build();
  172 + AuthCallback authCallback = AuthCallback.builder().code(code).auth_code(code).state(state).build();
173 173 // 执行请求
174 174 AuthResponse<?> authResponse = authRequest.login(authCallback);
175 175 log.info("[getAuthUser][请求社交平台 type({}) request({}) response({})]", socialType,
... ... @@ -206,6 +206,10 @@ public class SocialClientServiceImpl implements SocialClientService {
206 206 newAuthConfig.setAgentId(client.getAgentId());
207 207 }
208 208 // 2.3 设置会 request 里，进行后续使用
  209 + if (SocialTypeEnum.ALIPAY_MINI_PROGRAM.getType().equals(socialType)) {
  210 + // 特殊：如果是支付宝的小程序，多了 publicKey 属性，可见 AuthConfig 里的 alipayPublicKey 字段说明
  211 + return new AuthAlipayRequest(newAuthConfig, client.getPublicKey());
  212 + }
209 213 ReflectUtil.setFieldValue(request, "config", newAuthConfig);
210 214 }
211 215 return request;
... ...