Merge branch 'master' into main_hhl0209

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/OAuth2OpenController.java

@@ -88,7 +88,7 @@ public class OAuth2OpenController {
     @Parameters({
             @Parameter(name = "grant_type", required = true, description = "授权类型", example = "code"),
             @Parameter(name = "code", description = "授权范围", example = "userinfo.read"),
-            @Parameter(name = "redirect_uri", description = "重定向 URI", example = "https://www.iocoder.cn"),
+            @Parameter(name = "redirect_uri", description = "重定向 URI", example = "https://www.lidee.cn"),
             @Parameter(name = "state", description = "状态", example = "1"),
             @Parameter(name = "username", example = "tudou"),
             @Parameter(name = "password", example = "cai"), // 多个使用空格分隔
@@ -212,7 +212,7 @@ public class OAuth2OpenController {
             @Parameter(name = "response_type", required = true, description = "响应类型", example = "code"),
             @Parameter(name = "client_id", required = true, description = "客户端编号", example = "tudou"),
             @Parameter(name = "scope", description = "授权范围", example = "userinfo.read"), // 使用 Map<String, Boolean> 格式，Spring MVC 暂时不支持这么接收参数
-            @Parameter(name = "redirect_uri", required = true, description = "重定向 URI", example = "https://www.iocoder.cn"),
+            @Parameter(name = "redirect_uri", required = true, description = "重定向 URI", example = "https://www.lidee.cn"),
             @Parameter(name = "auto_approve", required = true, description = "用户是否接受", example = "true"),
             @Parameter(name = "state", example = "1")
     })

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/TenantController.java

@@ -46,7 +46,7 @@ public class TenantController {
     @GetMapping("/get-by-website")
     @PermitAll
     @Operation(tags = "租户管理",summary = "使用域名，获得租户信息", description = "登录界面，根据用户的域名，获得租户信息")
-    @Parameter(name = "website", description = "域名", required = true, example = "www.iocoder.cn")
+    @Parameter(name = "website", description = "域名", required = true, example = "www.lidee.cn")
     public CommonResult<TenantSimpleRespVO> getTenantByWebsite(@RequestParam("website") String website) {
         TenantDO tenant = tenantService.getTenantByWebsite(website);
         return success(BeanUtils.toBean(tenant, TenantSimpleRespVO.class));

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/UserController.java

@@ -158,9 +158,9 @@ public class UserController {
     public void importTemplate(HttpServletResponse response) throws IOException {
         // 手动创建导出 demo
         List<UserImportExcelVO> list = Arrays.asList(
-                UserImportExcelVO.builder().username("yunai").email("yunai@iocoder.cn").mobile("15601691300")
+                UserImportExcelVO.builder().username("lidee").email("lidee@lidee.cn").mobile("15601691300")
                         .nickname("云玑").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
-                UserImportExcelVO.builder().username("yuanma").email("yuanma@iocoder.cn").mobile("15601701300")
+                UserImportExcelVO.builder().username("lidee").email("lidee@lidee.cn").mobile("15601701300")
                         .nickname("源码").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
         );
         // 输出

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/auth/AuthPermissionInfoRespVO.java

@@ -48,7 +48,7 @@ public class AuthPermissionInfoRespVO {
         @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "云玑源码")
         private String nickname;
 
-        @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.jpg")
+        @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.lidee.cn/xx.jpg")
         private String avatar;
 
         @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/mail/account/MailAccountRespVO.java

@@ -21,7 +21,7 @@ public class MailAccountRespVO {
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
     private String password;
 
-    @Schema(description = "SMTP 服务器域名", requiredMode = Schema.RequiredMode.REQUIRED, example = "www.iocoder.cn")
+    @Schema(description = "SMTP 服务器域名", requiredMode = Schema.RequiredMode.REQUIRED, example = "www.lidee.cn")
     private String host;
 
     @Schema(description = "SMTP 服务器端口", requiredMode = Schema.RequiredMode.REQUIRED, example = "80")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/mail/account/MailAccountSaveReqVO.java

@@ -26,7 +26,7 @@ public class MailAccountSaveReqVO {
     @NotNull(message = "密码必填")
     private String password;
 
-    @Schema(description = "SMTP 服务器域名", requiredMode = Schema.RequiredMode.REQUIRED, example = "www.iocoder.cn")
+    @Schema(description = "SMTP 服务器域名", requiredMode = Schema.RequiredMode.REQUIRED, example = "www.lidee.cn")
     @NotNull(message = "SMTP 服务器域名不能为空")
     private String host;
 

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientRespVO.java

@@ -64,7 +64,7 @@ public class OAuth2ClientRespVO {
     @Schema(description = "回调URI地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
     private String callbackUris;
 
-    @Schema(description = "附加信息", example = "{yunai: true}")
+    @Schema(description = "附加信息", example = "{lidee: true}")
     private String additionalInformation;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/client/OAuth2ClientSaveReqVO.java

@@ -79,7 +79,7 @@ public class OAuth2ClientSaveReqVO {
     @Schema(description = "资源", example = "1024")
     private List<String> resourceIds;
 
-    @Schema(description = "附加信息", example = "{yunai: true}")
+    @Schema(description = "附加信息", example = "{lidee: true}")
     private String additionalInformation;
 
     @Schema(description = "回调URI地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/open/OAuth2OpenAuthorizeInfoRespVO.java

@@ -30,7 +30,7 @@ public class OAuth2OpenAuthorizeInfoRespVO {
         @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆")
         private String name;
 
-        @Schema(description = "应用图标", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.png")
+        @Schema(description = "应用图标", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.lidee.cn/xx.png")
         private String logo;
 
     }

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/oauth2/user/OAuth2UserInfoRespVO.java

@@ -30,7 +30,7 @@ public class OAuth2UserInfoRespVO {
     @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
 
-    @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
+    @Schema(description = "用户头像", example = "https://www.lidee.cn/xxx.png")
     private String avatar;
 
     /**

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sms/channel/SmsChannelRespVO.java

@@ -35,7 +35,7 @@ public class SmsChannelRespVO {
     @Schema(description = "短信 API 的密钥", example = "yuanma")
     private String apiSecret;
 
-    @Schema(description = "短信发送回调 URL", example = "https://www.iocoder.cn")
+    @Schema(description = "短信发送回调 URL", example = "https://www.lidee.cn")
     @URL(message = "回调 URL 格式不正确")
     private String callbackUrl;
 

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sms/channel/SmsChannelSaveReqVO.java

@@ -35,7 +35,7 @@ public class SmsChannelSaveReqVO {
     @Schema(description = "短信 API 的密钥", example = "yuanma")
     private String apiSecret;
 
-    @Schema(description = "短信发送回调 URL", example = "http://www.iocoder.cn")
+    @Schema(description = "短信发送回调 URL", example = "http://www.lidee.cn")
     @URL(message = "回调 URL 格式不正确")
     private String callbackUrl;
 

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/socail/user/SocialUserRespVO.java

@@ -27,7 +27,7 @@ public class SocialUserRespVO {
     @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "金灯剑客")
     private String nickname;
 
-    @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
+    @Schema(description = "用户头像", example = "https://www.lidee.cn/xxx.png")
     private String avatar;
 
     @Schema(description = "原始用户数据，一般是 JSON 格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "{}")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/tenant/tenant/TenantRespVO.java

@@ -36,7 +36,7 @@ public class TenantRespVO {
     @DictFormat(DictTypeConstants.COMMON_STATUS)
     private Integer status;
 
-    @Schema(description = "绑定域名", example = "https://www.iocoder.cn")
+    @Schema(description = "绑定域名", example = "https://www.lidee.cn")
     private String website;
 
     @Schema(description = "租户套餐编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/tenant/tenant/TenantSaveReqVO.java

@@ -34,7 +34,7 @@ public class TenantSaveReqVO {
     @NotNull(message = "租户状态")
     private Integer status;
 
-    @Schema(description = "绑定域名", example = "https://www.iocoder.cn")
+    @Schema(description = "绑定域名", example = "https://www.lidee.cn")
     private String website;
 
     @Schema(description = "租户套餐编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/user/profile/UserProfileRespVO.java

@@ -32,7 +32,7 @@ public class UserProfileRespVO {
     @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
 
-    @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
+    @Schema(description = "用户头像", example = "https://www.lidee.cn/xxx.png")
     private String avatar;
 
     @Schema(description = "最后登录 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "192.168.1.1")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/user/user/UserRespVO.java

@@ -48,7 +48,7 @@ public class UserRespVO{
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;
 
-    @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
+    @Schema(description = "用户头像", example = "https://www.lidee.cn/xxx.png")
     private String avatar;
 
     @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/user/user/UserSaveReqVO.java

@@ -43,7 +43,7 @@ public class UserSaveReqVO {
     @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
 
-    @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
+    @Schema(description = "用户头像", example = "https://www.lidee.cn/xxx.png")
     private String avatar;
 
     // ========== 仅【创建】时，需要传递的字段 ==========

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/mapper/OAuth2ClientMapper.java

@@ -22,6 +22,7 @@ public interface OAuth2ClientMapper extends BaseMapperX<OAuth2ClientDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<OAuth2ClientDO>()
                 .likeIfPresent(OAuth2ClientDO::getName, reqVO.getName())
                 .eqIfPresent(OAuth2ClientDO::getStatus, reqVO.getStatus())
+                .neIfPresent(OAuth2ClientDO::getClientId, "default")
                 .inIfPresent(OAuth2ClientDO::getId, reqVO.getIds())
                 .orderByDesc(OAuth2ClientDO::getId));
     }

lidee-service/lidee-service-system-biz/target/classes/META-INF/spring-configuration-metadata.json

@@ -1,42 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "lideeyunji.sms-code",
-      "type": "com.lideeyunji.service.system.config.framework.sms.config.SmsCodeProperties",
-      "sourceType": "com.lideeyunji.service.system.config.framework.sms.config.SmsCodeProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "lideeyunji.sms-code.begin-code",
-      "type": "java.lang.Integer",
-      "description": "验证码最小值",
-      "sourceType": "com.lideeyunji.service.system.config.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "lideeyunji.sms-code.end-code",
-      "type": "java.lang.Integer",
-      "description": "验证码最大值",
-      "sourceType": "com.lideeyunji.service.system.config.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "lideeyunji.sms-code.expire-times",
-      "type": "java.time.Duration",
-      "description": "过期时间",
-      "sourceType": "com.lideeyunji.service.system.config.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "lideeyunji.sms-code.send-frequency",
-      "type": "java.time.Duration",
-      "description": "短信发送频率",
-      "sourceType": "com.lideeyunji.service.system.config.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "lideeyunji.sms-code.send-maximum-quantity-per-day",
-      "type": "java.lang.Integer",
-      "description": "每日发送最大数量",
-      "sourceType": "com.lideeyunji.service.system.config.framework.sms.config.SmsCodeProperties"
-    }
-  ],
-  "hints": []
-}