Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
查尔斯-BUG万象集
Continew Admin
提交
76c65463
Continew Admin
项目概览
查尔斯-BUG万象集
/
Continew Admin
10 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
分析
仓库
DevOps
项目成员
Pages
Continew Admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
76c65463
编写于
8月 11, 2023
作者:
查尔斯-BUG万象集
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 移除所有的 @Accessors(chain = true),并全局配置禁止使用
上级
2d0e1f42
变更
20
显示空白变更内容
内联
并排
Showing
20 changed file
with
26 addition
and
47 deletion
+26
-47
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/CaptchaVO.java
...java/top/charles7c/cnadmin/common/model/vo/CaptchaVO.java
+2
-2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/LabelValueVO.java
...a/top/charles7c/cnadmin/common/model/vo/LabelValueVO.java
+0
-2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java
...ava/top/charles7c/cnadmin/common/model/vo/PageDataVO.java
+0
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java
...ain/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java
+2
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java
...main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java
+0
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java
...ain/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java
+0
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java
.../java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java
+0
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java
.../java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java
+2
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java
...in/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java
+0
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java
...in/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java
+0
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java
...in/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java
+0
-2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java
...in/java/top/charles7c/cnadmin/system/model/vo/UserVO.java
+0
-2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java
...op/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java
+11
-10
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/GenConfigDO.java
.../top/charles7c/cnadmin/tool/model/entity/GenConfigDO.java
+1
-3
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/vo/TableVO.java
...ain/java/top/charles7c/cnadmin/tool/model/vo/TableVO.java
+0
-2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
...les7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
+2
-1
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java
...les7c/cnadmin/webapi/controller/auth/LoginController.java
+1
-1
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java
...c/cnadmin/webapi/controller/common/CaptchaController.java
+1
-4
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java
...nadmin/webapi/controller/system/UserCenterController.java
+1
-1
lombok.config
lombok.config
+3
-1
未找到文件。
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/CaptchaVO.java
浏览文件 @
76c65463
...
...
@@ -18,8 +18,8 @@ package top.charles7c.cnadmin.common.model.vo;
import
java.io.Serializable
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @since 2022/12/11 13:55
*/
@Data
@
Accessors
(
chain
=
true
)
@
Builder
@Schema
(
description
=
"验证码信息"
)
public
class
CaptchaVO
implements
Serializable
{
...
...
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/LabelValueVO.java
浏览文件 @
76c65463
...
...
@@ -20,7 +20,6 @@ import java.io.Serializable;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -33,7 +32,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@NoArgsConstructor
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"键值对信息"
)
public
class
LabelValueVO
<
V
>
implements
Serializable
{
...
...
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java
浏览文件 @
76c65463
...
...
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -39,7 +38,6 @@ import cn.hutool.core.collection.CollUtil;
* @since 2023/1/14 23:40
*/
@Data
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"分页信息"
)
public
class
PageDataVO
<
V
>
implements
Serializable
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java
浏览文件 @
76c65463
...
...
@@ -18,8 +18,8 @@ package top.charles7c.cnadmin.auth.model.vo;
import
java.io.Serializable
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @since 2022/12/21 20:42
*/
@Data
@
Accessors
(
chain
=
true
)
@
Builder
@Schema
(
description
=
"令牌信息"
)
public
class
LoginVO
implements
Serializable
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java
浏览文件 @
76c65463
...
...
@@ -19,7 +19,6 @@ package top.charles7c.cnadmin.auth.model.vo;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -30,7 +29,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @since 2023/2/26 22:51
*/
@Data
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"元数据信息"
)
public
class
MetaVO
implements
Serializable
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java
浏览文件 @
76c65463
...
...
@@ -20,7 +20,6 @@ import java.io.Serializable;
import
java.util.List
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -33,7 +32,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
* @since 2023/2/26 22:51
*/
@Data
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"路由信息"
)
@JsonInclude
(
JsonInclude
.
Include
.
NON_EMPTY
)
public
class
RouteVO
implements
Serializable
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java
浏览文件 @
76c65463
...
...
@@ -22,7 +22,6 @@ import java.time.LocalDateTime;
import
java.util.Set
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -39,7 +38,6 @@ import top.charles7c.cnadmin.common.enums.GenderEnum;
* @since 2022/12/29 20:15
*/
@Data
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"用户信息"
)
public
class
UserInfoVO
implements
Serializable
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java
浏览文件 @
76c65463
...
...
@@ -18,8 +18,8 @@ package top.charles7c.cnadmin.system.model.vo;
import
java.io.Serializable
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @since 2023/1/2 16:29
*/
@Data
@
Accessors
(
chain
=
true
)
@
Builder
@Schema
(
description
=
"头像信息"
)
public
class
AvatarVO
implements
Serializable
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java
浏览文件 @
76c65463
...
...
@@ -17,7 +17,6 @@
package
top.charles7c.cnadmin.system.model.vo
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -33,7 +32,6 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
* @since 2023/1/22 13:53
*/
@Data
@Accessors
(
chain
=
true
)
@TreeField
(
value
=
"id"
,
nameKey
=
"name"
)
@Schema
(
description
=
"部门信息"
)
public
class
DeptVO
extends
BaseVO
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java
浏览文件 @
76c65463
...
...
@@ -17,7 +17,6 @@
package
top.charles7c.cnadmin.system.model.vo
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum;
* @since 2023/2/15 20:23
*/
@Data
@Accessors
(
chain
=
true
)
@TreeField
(
value
=
"id"
)
@ExcelIgnoreUnannotated
@Schema
(
description
=
"菜单信息"
)
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java
浏览文件 @
76c65463
...
...
@@ -17,7 +17,6 @@
package
top.charles7c.cnadmin.system.model.vo
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -33,7 +32,6 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
* @since 2023/2/8 23:05
*/
@Data
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"角色信息"
)
public
class
RoleVO
extends
BaseVO
{
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java
浏览文件 @
76c65463
...
...
@@ -19,7 +19,6 @@ package top.charles7c.cnadmin.system.model.vo;
import
java.util.Objects
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -38,7 +37,6 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper;
* @since 2023/2/20 21:08
*/
@Data
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"用户信息"
)
public
class
UserVO
extends
BaseVO
{
...
...
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java
浏览文件 @
76c65463
...
...
@@ -24,7 +24,6 @@ import javax.validation.constraints.NotBlank;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NonNull
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -48,9 +47,8 @@ import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
* @since 2023/4/12 20:21
*/
@Data
@TableName
(
"gen_field_config"
)
@NoArgsConstructor
@
Accessors
(
chain
=
true
)
@
TableName
(
"gen_field_config"
)
@Schema
(
description
=
"字段配置信息"
)
public
class
FieldConfigDO
implements
Serializable
{
...
...
@@ -144,22 +142,25 @@ public class FieldConfigDO implements Serializable {
String
columnType
=
StrUtil
.
splitToArray
(
column
.
getTypeName
(),
StringConsts
.
SPACE
)[
0
].
toLowerCase
();
boolean
isRequired
=
!
column
.
isPk
()
&&
!
column
.
isNullable
();
this
.
tableName
=
column
.
getTableName
();
this
.
setColumnName
(
column
.
getName
()).
setColumnType
(
columnType
).
setComment
(
column
.
getComment
())
.
setIsRequired
(
isRequired
).
setShowInList
(
true
).
setShowInForm
(
isRequired
).
setShowInQuery
(
isRequired
)
.
setFormType
(
FormTypeEnum
.
TEXT
);
this
.
setColumnName
(
column
.
getName
());
this
.
setColumnType
(
columnType
);
this
.
setComment
(
column
.
getComment
());
this
.
setIsRequired
(
isRequired
);
this
.
setShowInList
(
true
);
this
.
setShowInForm
(
isRequired
);
this
.
setShowInQuery
(
isRequired
);
this
.
setFormType
(
FormTypeEnum
.
TEXT
);
this
.
setQueryType
(
"String"
.
equals
(
this
.
getFieldType
())
?
QueryTypeEnum
.
INNER_LIKE
:
QueryTypeEnum
.
EQUAL
);
}
public
FieldConfigDO
setColumnName
(
String
columnName
)
{
public
void
setColumnName
(
String
columnName
)
{
this
.
columnName
=
columnName
;
this
.
fieldName
=
StrUtil
.
toCamelCase
(
this
.
columnName
);
return
this
;
}
public
FieldConfigDO
setColumnType
(
String
columnType
)
{
public
void
setColumnType
(
String
columnType
)
{
this
.
columnType
=
columnType
;
Props
generatorProp
=
PropsUtil
.
get
(
"generator"
);
this
.
fieldType
=
generatorProp
.
getStr
(
columnType
);
return
this
;
}
}
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/GenConfigDO.java
浏览文件 @
76c65463
...
...
@@ -25,7 +25,6 @@ import javax.validation.constraints.Pattern;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -42,9 +41,8 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
* @since 2023/4/12 20:21
*/
@Data
@TableName
(
"gen_config"
)
@NoArgsConstructor
@
Accessors
(
chain
=
true
)
@
TableName
(
"gen_config"
)
@Schema
(
description
=
"生成配置信息"
)
public
class
GenConfigDO
implements
Serializable
{
...
...
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/vo/TableVO.java
浏览文件 @
76c65463
...
...
@@ -20,7 +20,6 @@ import java.io.Serializable;
import
java.time.LocalDateTime
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -31,7 +30,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @since 2023/4/12 20:21
*/
@Data
@Accessors
(
chain
=
true
)
@Schema
(
description
=
"表信息"
)
public
class
TableVO
implements
Serializable
{
...
...
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
浏览文件 @
76c65463
...
...
@@ -134,7 +134,8 @@ public class GeneratorServiceImpl implements GeneratorService {
if
(
null
!=
fieldConfig
)
{
// 更新已有字段配置
String
columnType
=
StrUtil
.
splitToArray
(
column
.
getTypeName
(),
StringConsts
.
SPACE
)[
0
].
toLowerCase
();
fieldConfig
.
setColumnType
(
columnType
).
setComment
(
column
.
getComment
());
fieldConfig
.
setColumnType
(
columnType
);
fieldConfig
.
setComment
(
column
.
getComment
());
}
else
{
// 新增字段配置
fieldConfig
=
new
FieldConfigDO
(
column
);
...
...
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java
浏览文件 @
76c65463
...
...
@@ -79,7 +79,7 @@ public class LoginController {
ExceptionUtils
.
exToNull
(()
->
SecureUtils
.
decryptByRsaPrivateKey
(
loginRequest
.
getPassword
()));
ValidationUtils
.
throwIfBlank
(
rawPassword
,
"密码解密失败"
);
String
token
=
loginService
.
login
(
loginRequest
.
getUsername
(),
rawPassword
);
return
R
.
ok
(
new
LoginVO
().
setToken
(
token
));
return
R
.
ok
(
LoginVO
.
builder
().
token
(
token
).
build
(
));
}
@SaIgnore
...
...
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java
浏览文件 @
76c65463
...
...
@@ -79,10 +79,7 @@ public class CaptchaController {
String
captchaKey
=
RedisUtils
.
formatKey
(
CacheConsts
.
CAPTCHA_KEY_PREFIX
,
uuid
);
RedisUtils
.
setCacheObject
(
captchaKey
,
captcha
.
text
(),
Duration
.
ofMinutes
(
captchaImage
.
getExpirationInMinutes
()));
// 返回验证码
CaptchaVO
captchaVO
=
new
CaptchaVO
().
setUuid
(
uuid
).
setImg
(
captcha
.
toBase64
());
return
R
.
ok
(
captchaVO
);
return
R
.
ok
(
CaptchaVO
.
builder
().
uuid
(
uuid
).
img
(
captcha
.
toBase64
()).
build
());
}
@Operation
(
summary
=
"获取邮箱验证码"
,
description
=
"发送验证码到指定邮箱"
)
...
...
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java
浏览文件 @
76c65463
...
...
@@ -65,7 +65,7 @@ public class UserCenterController {
// 上传头像
String
newAvatar
=
userService
.
uploadAvatar
(
avatarFile
,
LoginHelper
.
getUserId
());
return
R
.
ok
(
"上传成功"
,
new
AvatarVO
().
setAvatar
(
newAvatar
));
return
R
.
ok
(
"上传成功"
,
AvatarVO
.
builder
().
avatar
(
newAvatar
).
build
(
));
}
@Operation
(
summary
=
"修改基础信息"
,
description
=
"修改用户基础信息"
)
...
...
lombok.config
浏览文件 @
76c65463
...
...
@@ -3,3 +3,5 @@ lombok.toString.callSuper=CALL
lombok
.
equalsAndHashCode
.
callSuper
=
CALL
clear
lombok
.
val
.
flagUsage
lombok
.
val
.
flagUsage
=
ERROR
clear
lombok
.
accessors
.
flagUsage
lombok
.
accessors
.
flagUsage
=
ERROR
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录