diff --git a/doc/新建 文本文档.txt b/doc/新建 文本文档.txt deleted file mode 100644 index 34266f5..0000000 --- a/doc/新建 文本文档.txt +++ /dev/null @@ -1 +0,0 @@ -yunji_report_field 新增is_amount字段 \ No newline at end of file diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientRespVO.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientRespVO.java index 385e61e..3da6be8 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientRespVO.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientRespVO.java @@ -22,6 +22,9 @@ public class OAuth2ClientRespVO { @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆") private String name; + @Schema(description = "应用分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "category1") + private String category; + @Schema(description = "应用图标", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.png") private String logo; @@ -37,8 +40,11 @@ public class OAuth2ClientRespVO { @Schema(description = "刷新令牌的有效期", requiredMode = Schema.RequiredMode.REQUIRED, example = "8640000") private Integer refreshTokenValiditySeconds; +// @Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") +// private List redirectUris; + @Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") - private List redirectUris; + private String redirectUris; @Schema(description = "授权类型,参见 OAuth2GrantTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "password") private List authorizedGrantTypes; @@ -55,6 +61,9 @@ public class OAuth2ClientRespVO { @Schema(description = "资源", example = "1024") private List resourceIds; + @Schema(description = "回调URI地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") + private String callbackUris; + @Schema(description = "附加信息", example = "{yunai: true}") private String additionalInformation; diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientSaveReqVO.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientSaveReqVO.java index b3258fc..b4a5662 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientSaveReqVO.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientSaveReqVO.java @@ -30,6 +30,10 @@ public class OAuth2ClientSaveReqVO { @NotNull(message = "应用名不能为空") private String name; + @Schema(description = "应用分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "category1") + @NotNull(message = "应用分类不能为空") + private String category; + @Schema(description = "应用图标", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.png") @NotNull(message = "应用图标不能为空") @URL(message = "应用图标的地址不正确") @@ -50,9 +54,13 @@ public class OAuth2ClientSaveReqVO { @NotNull(message = "刷新令牌的有效期不能为空") private Integer refreshTokenValiditySeconds; +// @Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") +// @NotNull(message = "可重定向的 URI 地址不能为空") +// private List<@NotEmpty(message = "重定向的 URI 不能为空") @URL(message = "重定向的 URI 格式不正确") String> redirectUris; + + @Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") - @NotNull(message = "可重定向的 URI 地址不能为空") - private List<@NotEmpty(message = "重定向的 URI 不能为空") @URL(message = "重定向的 URI 格式不正确") String> redirectUris; + private String redirectUris; @Schema(description = "授权类型,参见 OAuth2GrantTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "password") @NotNull(message = "授权类型不能为空") @@ -73,6 +81,9 @@ public class OAuth2ClientSaveReqVO { @Schema(description = "附加信息", example = "{yunai: true}") private String additionalInformation; + @Schema(description = "回调URI地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") + private String callbackUris; + @AssertTrue(message = "附加信息必须是 JSON 格式") public boolean isAdditionalInformationJson() { return StrUtil.isEmpty(additionalInformation) || JsonUtils.isJson(additionalInformation);