This commit is contained in:
chy
2026-02-09 11:14:17 +08:00
parent 55d050fbd7
commit 16a985e8cc
23 changed files with 29 additions and 29 deletions

View File

@@ -9,16 +9,16 @@ spring:
datasource: datasource:
master: master:
# MYSQL数据库 主库,业务库 # MYSQL数据库 主库,业务库
url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root username: root
password: root password: root
lideeyunji: # 从库,框架库 lideeyunji: # 从库,框架库
url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root username: root
password: root password: root
slave: # 日志库单独 slave: # 日志库单独
lazy: true # 开启懒加载,保证启动速度 lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root username: root
password: root password: root
redis: redis:

View File

@@ -203,7 +203,7 @@ public class CodegenBuilder {
} }
// url // url
if (StrUtil.endWithIgnoreCase(column.getColumnName(), "url")) { if (StrUtil.endWithIgnoreCase(column.getColumnName(), "url")) {
column.setExample("https://www.iocoder.cn"); column.setExample("https://www.lidee.cn");
return; return;
} }
// reason // reason

View File

@@ -6,7 +6,7 @@
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。 一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。 无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。 代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
文档可见https://www.iocoder.cn/MyBatis/x-plugins/
--> -->
</mapper> </mapper>

View File

@@ -11,7 +11,7 @@ export const rules = reactive({
#end #end
}) })
// CrudSchema https://doc.iocoder.cn/vue3/crud-schema/
const crudSchemas = reactive<CrudSchema[]>([ const crudSchemas = reactive<CrudSchema[]>([
#foreach($column in $columns) #foreach($column in $columns)
#if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation) #if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation)

View File

@@ -59,7 +59,7 @@ import ${simpleClassName}Form from './${simpleClassName}Form.vue'
// tableObject表格的属性对象可获得分页大小、条数等属性 // tableObject表格的属性对象可获得分页大小、条数等属性
// tableMethods表格的操作对象可进行获得分页、删除记录等操作 // tableMethods表格的操作对象可进行获得分页、删除记录等操作
// 详细可见https://doc.iocoder.cn/vue3/crud-schema/
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: ${simpleClassName}Api.get${simpleClassName}Page, // 分页接口 getListApi: ${simpleClassName}Api.get${simpleClassName}Page, // 分页接口
delListApi: ${simpleClassName}Api.delete${simpleClassName} // 删除接口 delListApi: ${simpleClassName}Api.delete${simpleClassName} // 删除接口

View File

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

View File

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

View File

@@ -158,9 +158,9 @@ public class UserController {
public void importTemplate(HttpServletResponse response) throws IOException { public void importTemplate(HttpServletResponse response) throws IOException {
// 手动创建导出 demo // 手动创建导出 demo
List<UserImportExcelVO> list = Arrays.asList( 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(), .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() .nickname("源码").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
); );
// 输出 // 输出

View File

@@ -48,7 +48,7 @@ public class AuthPermissionInfoRespVO {
@Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "云玑源码") @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "云玑源码")
private String nickname; 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; private String avatar;
@Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048") @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")

View File

@@ -21,7 +21,7 @@ public class MailAccountRespVO {
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456") @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
private String password; 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; private String host;
@Schema(description = "SMTP 服务器端口", requiredMode = Schema.RequiredMode.REQUIRED, example = "80") @Schema(description = "SMTP 服务器端口", requiredMode = Schema.RequiredMode.REQUIRED, example = "80")

View File

@@ -26,7 +26,7 @@ public class MailAccountSaveReqVO {
@NotNull(message = "密码必填") @NotNull(message = "密码必填")
private String password; 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 服务器域名不能为空") @NotNull(message = "SMTP 服务器域名不能为空")
private String host; private String host;

View File

@@ -22,7 +22,7 @@ public class OAuth2ClientRespVO {
@Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆") @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆")
private String name; 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; private String logo;
@Schema(description = "应用描述", example = "我是一个应用") @Schema(description = "应用描述", example = "我是一个应用")
@@ -37,7 +37,7 @@ public class OAuth2ClientRespVO {
@Schema(description = "刷新令牌的有效期", requiredMode = Schema.RequiredMode.REQUIRED, example = "8640000") @Schema(description = "刷新令牌的有效期", requiredMode = Schema.RequiredMode.REQUIRED, example = "8640000")
private Integer refreshTokenValiditySeconds; private Integer refreshTokenValiditySeconds;
@Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") @Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.lidee.cn")
private List<String> redirectUris; private List<String> redirectUris;
@Schema(description = "授权类型,参见 OAuth2GrantTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "password") @Schema(description = "授权类型,参见 OAuth2GrantTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "password")

View File

@@ -30,7 +30,7 @@ public class OAuth2ClientSaveReqVO {
@NotNull(message = "应用名不能为空") @NotNull(message = "应用名不能为空")
private String name; 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")
@NotNull(message = "应用图标不能为空") @NotNull(message = "应用图标不能为空")
@URL(message = "应用图标的地址不正确") @URL(message = "应用图标的地址不正确")
private String logo; private String logo;
@@ -50,7 +50,7 @@ public class OAuth2ClientSaveReqVO {
@NotNull(message = "刷新令牌的有效期不能为空") @NotNull(message = "刷新令牌的有效期不能为空")
private Integer refreshTokenValiditySeconds; private Integer refreshTokenValiditySeconds;
@Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn") @Schema(description = "可重定向的 URI 地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.lidee.cn")
@NotNull(message = "可重定向的 URI 地址不能为空") @NotNull(message = "可重定向的 URI 地址不能为空")
private List<@NotEmpty(message = "重定向的 URI 不能为空") @URL(message = "重定向的 URI 格式不正确") String> redirectUris; private List<@NotEmpty(message = "重定向的 URI 不能为空") @URL(message = "重定向的 URI 格式不正确") String> redirectUris;

View File

@@ -30,7 +30,7 @@ public class OAuth2OpenAuthorizeInfoRespVO {
@Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆") @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆")
private String name; 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; private String logo;
} }

View File

@@ -30,7 +30,7 @@ public class OAuth2UserInfoRespVO {
@Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1") @Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1")
private Integer 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; private String avatar;
/** /**

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -32,7 +32,7 @@ public class UserProfileRespVO {
@Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1") @Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1")
private Integer 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; private String avatar;
@Schema(description = "最后登录 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "192.168.1.1") @Schema(description = "最后登录 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "192.168.1.1")

View File

@@ -48,7 +48,7 @@ public class UserRespVO{
@DictFormat(DictTypeConstants.USER_SEX) @DictFormat(DictTypeConstants.USER_SEX)
private Integer 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; private String avatar;
@Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

View File

@@ -43,7 +43,7 @@ public class UserSaveReqVO {
@Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1") @Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1")
private Integer 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; private String avatar;
// ========== 仅【创建】时,需要传递的字段 ========== // ========== 仅【创建】时,需要传递的字段 ==========