Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
B
basic-api-boot
概览
概览
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Basic
basic-api-boot
Commits
c488464e
提交
c488464e
authored
10月 14, 2022
作者:
方治民
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 统一采用抛出异常的方式来处理业务异常返回
上级
1f2a6b07
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
55 行增加
和
16 行删除
+55
-16
ExampleController.java
...in/java/com/yiring/app/web/example/ExampleController.java
+1
-1
messages.properties
app/src/main/resources/i18n/messages.properties
+2
-0
messages_zh_CN.properties
app/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
AuthController.java
...rc/main/java/com/yiring/auth/web/auth/AuthController.java
+8
-8
PermissionController.java
.../yiring/auth/web/sys/permission/PermissionController.java
+5
-2
RoleController.java
...ain/java/com/yiring/auth/web/sys/role/RoleController.java
+7
-5
messages.properties
basic-auth/src/main/resources/i18n/messages.properties
+2
-0
messages_zh_CN.properties
basic-auth/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
status.properties
basic-auth/src/main/resources/i18n/status.properties
+13
-0
status_zh_CN.properties
basic-auth/src/main/resources/i18n/status_zh_CN.properties
+13
-0
没有找到文件。
app/src/main/java/com/yiring/app/web/example/ExampleController.java
浏览文件 @
c488464e
...
@@ -94,7 +94,7 @@ public class ExampleController {
...
@@ -94,7 +94,7 @@ public class ExampleController {
User
user
=
auths
.
getLoginUser
();
User
user
=
auths
.
getLoginUser
();
Optional
<
UserExtension
>
optional
=
userExtensionRepository
.
findOne
(
Example
.
of
(
new
UserExtension
(
user
)));
Optional
<
UserExtension
>
optional
=
userExtensionRepository
.
findOne
(
Example
.
of
(
new
UserExtension
(
user
)));
if
(
optional
.
isEmpty
())
{
if
(
optional
.
isEmpty
())
{
return
Result
.
no
(
Status
.
NOT_FOUND
);
throw
Status
.
NOT_FOUND
.
exception
(
);
}
}
UserExtension
ext
=
optional
.
get
();
UserExtension
ext
=
optional
.
get
();
...
...
app/src/main/resources/i18n/messages.properties
浏览文件 @
c488464e
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
example.hello
=
\u
D83D
\u
DE0E Hello World
example.hello
=
\u
D83D
\u
DE0E Hello World
# \u4E1A\u52A1\u72B6\u6001\u7801\u9519\u8BEF\u6D88\u606F
# \u4E1A\u52A1\u72B6\u6001\u7801\u9519\u8BEF\u6D88\u606F
Code.0
=
OK
Code.0
=
OK
Code.1001
=
\u6743\u9650\u6807\u
8BC6
\u
91CD
\u
590D
Code.1002
=
\u
89D2
\u8272\u6807\u
8BC6
\u
91CD
\u
590D
Code.100000
=
\u7528\u6237\u
540D
\u
5DF2
\u
5B58
\u5728
Code.100000
=
\u7528\u6237\u
540D
\u
5DF2
\u
5B58
\u5728
Code.100001
=
\u
624B
\u
673A
\u
53F7
\u
5DF2
\u
5B58
\u5728
Code.100001
=
\u
624B
\u
673A
\u
53F7
\u
5DF2
\u
5B58
\u5728
Code.100002
=
\u
90AE
\u
7BB1
\u
5DF2
\u
5B58
\u5728
Code.100002
=
\u
90AE
\u
7BB1
\u
5DF2
\u
5B58
\u5728
...
...
app/src/main/resources/i18n/messages_zh_CN.properties
浏览文件 @
c488464e
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
example.hello
=
\u
D83D
\u
DE0E Hello World
example.hello
=
\u
D83D
\u
DE0E Hello World
# \u4E1A\u52A1\u72B6\u6001\u7801\u9519\u8BEF\u6D88\u606F
# \u4E1A\u52A1\u72B6\u6001\u7801\u9519\u8BEF\u6D88\u606F
Code.0
=
OK
Code.0
=
OK
Code.1001
=
\u6743\u9650\u6807\u
8BC6
\u
91CD
\u
590D
Code.1002
=
\u
89D2
\u8272\u6807\u
8BC6
\u
91CD
\u
590D
Code.100000
=
\u7528\u6237\u
540D
\u
5DF2
\u
5B58
\u5728
Code.100000
=
\u7528\u6237\u
540D
\u
5DF2
\u
5B58
\u5728
Code.100001
=
\u
624B
\u
673A
\u
53F7
\u
5DF2
\u
5B58
\u5728
Code.100001
=
\u
624B
\u
673A
\u
53F7
\u
5DF2
\u
5B58
\u5728
Code.100002
=
\u
90AE
\u
7BB1
\u
5DF2
\u
5B58
\u5728
Code.100002
=
\u
90AE
\u
7BB1
\u
5DF2
\u
5B58
\u5728
...
...
basic-auth/src/main/java/com/yiring/auth/web/auth/AuthController.java
浏览文件 @
c488464e
...
@@ -11,7 +11,7 @@ import com.yiring.auth.param.auth.LoginParam;
...
@@ -11,7 +11,7 @@ import com.yiring.auth.param.auth.LoginParam;
import
com.yiring.auth.param.auth.RegisterParam
;
import
com.yiring.auth.param.auth.RegisterParam
;
import
com.yiring.auth.vo.auth.LoginVo
;
import
com.yiring.auth.vo.auth.LoginVo
;
import
com.yiring.common.core.Result
;
import
com.yiring.common.core.Result
;
import
com.yiring.common.
core.Status
;
import
com.yiring.common.
exception.BusinessException
;
import
com.yiring.common.util.Commons
;
import
com.yiring.common.util.Commons
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -53,20 +53,20 @@ public class AuthController {
...
@@ -53,20 +53,20 @@ public class AuthController {
// 检查用户名是否存在
// 检查用户名是否存在
long
count
=
userRepository
.
count
(
Example
.
of
(
User
.
builder
().
username
(
param
.
getUsername
()).
build
()));
long
count
=
userRepository
.
count
(
Example
.
of
(
User
.
builder
().
username
(
param
.
getUsername
()).
build
()));
if
(
count
>
0
)
{
if
(
count
>
0
)
{
throw
Status
.
BAD_REQUEST
.
exceptio
n
(
"Code.100000"
);
throw
BusinessException
.
i18
n
(
"Code.100000"
);
}
}
// 检查手机号是否存在
// 检查手机号是否存在
count
=
userRepository
.
count
(
Example
.
of
(
User
.
builder
().
mobile
(
param
.
getMobile
()).
build
()));
count
=
userRepository
.
count
(
Example
.
of
(
User
.
builder
().
mobile
(
param
.
getMobile
()).
build
()));
if
(
count
>
0
)
{
if
(
count
>
0
)
{
throw
Status
.
BAD_REQUEST
.
exceptio
n
(
"Code.100001"
);
throw
BusinessException
.
i18
n
(
"Code.100001"
);
}
}
// 检查邮箱是否存在
// 检查邮箱是否存在
if
(
StrUtil
.
isNotBlank
(
param
.
getEmail
()))
{
if
(
StrUtil
.
isNotBlank
(
param
.
getEmail
()))
{
count
=
userRepository
.
count
(
Example
.
of
(
User
.
builder
().
email
(
param
.
getEmail
()).
build
()));
count
=
userRepository
.
count
(
Example
.
of
(
User
.
builder
().
email
(
param
.
getEmail
()).
build
()));
if
(
count
>
0
)
{
if
(
count
>
0
)
{
throw
Status
.
BAD_REQUEST
.
exceptio
n
(
"Code.100002"
);
throw
BusinessException
.
i18
n
(
"Code.100002"
);
}
}
}
}
...
@@ -91,23 +91,23 @@ public class AuthController {
...
@@ -91,23 +91,23 @@ public class AuthController {
// 查询用户信息是否匹配
// 查询用户信息是否匹配
User
user
=
userRepository
.
findByAccount
(
param
.
getAccount
());
User
user
=
userRepository
.
findByAccount
(
param
.
getAccount
());
if
(
user
==
null
)
{
if
(
user
==
null
)
{
throw
Status
.
BAD_REQUEST
.
exceptio
n
(
"Code.100003"
);
throw
BusinessException
.
i18
n
(
"Code.100003"
);
}
}
// 检查密码
// 检查密码
String
cps
=
SaSecureUtil
.
sha256
(
param
.
getPassword
());
String
cps
=
SaSecureUtil
.
sha256
(
param
.
getPassword
());
if
(!
cps
.
equals
(
user
.
getPassword
()))
{
if
(!
cps
.
equals
(
user
.
getPassword
()))
{
throw
Status
.
BAD_REQUEST
.
exceptio
n
(
"Code.100003"
);
throw
BusinessException
.
i18
n
(
"Code.100003"
);
}
}
// 检查用户是否已被删除
// 检查用户是否已被删除
if
(
user
.
getDeleteTime
()
!=
null
)
{
if
(
user
.
getDeleteTime
()
!=
null
)
{
throw
Status
.
BAD_REQUEST
.
exceptio
n
(
"Code.100004"
);
throw
BusinessException
.
i18
n
(
"Code.100004"
);
}
}
// 检查用户是否被允许登录
// 检查用户是否被允许登录
if
(!
Boolean
.
TRUE
.
equals
(
user
.
getEnabled
()))
{
if
(!
Boolean
.
TRUE
.
equals
(
user
.
getEnabled
()))
{
throw
Status
.
BAD_REQUEST
.
exceptio
n
(
"Code.100005"
);
throw
BusinessException
.
i18
n
(
"Code.100005"
);
}
}
// 更新用户信息
// 更新用户信息
...
...
basic-auth/src/main/java/com/yiring/auth/web/sys/permission/PermissionController.java
浏览文件 @
c488464e
...
@@ -12,6 +12,7 @@ import com.yiring.auth.util.Permissions;
...
@@ -12,6 +12,7 @@ import com.yiring.auth.util.Permissions;
import
com.yiring.auth.vo.permission.PermissionVo
;
import
com.yiring.auth.vo.permission.PermissionVo
;
import
com.yiring.common.core.Result
;
import
com.yiring.common.core.Result
;
import
com.yiring.common.core.Status
;
import
com.yiring.common.core.Status
;
import
com.yiring.common.exception.BusinessException
;
import
com.yiring.common.param.IdParam
;
import
com.yiring.common.param.IdParam
;
import
com.yiring.common.param.OptionalPidParam
;
import
com.yiring.common.param.OptionalPidParam
;
import
com.yiring.common.param.PageParam
;
import
com.yiring.common.param.PageParam
;
...
@@ -57,7 +58,7 @@ public class PermissionController {
...
@@ -57,7 +58,7 @@ public class PermissionController {
@PostMapping
(
"add"
)
@PostMapping
(
"add"
)
public
Result
<
String
>
add
(
@Valid
PermissionParam
param
)
{
public
Result
<
String
>
add
(
@Valid
PermissionParam
param
)
{
if
(
has
(
param
.
getUid
()))
{
if
(
has
(
param
.
getUid
()))
{
return
Result
.
no
(
Status
.
BAD_REQUEST
,
"权限标识重复
"
);
throw
BusinessException
.
i18n
(
"Code.1001
"
);
}
}
Permission
entity
=
new
Permission
();
Permission
entity
=
new
Permission
();
...
@@ -77,7 +78,7 @@ public class PermissionController {
...
@@ -77,7 +78,7 @@ public class PermissionController {
if
(!
entity
.
getUid
().
equals
(
param
.
getUid
()))
{
if
(!
entity
.
getUid
().
equals
(
param
.
getUid
()))
{
// 仅当修改了角色标识时才检查重复
// 仅当修改了角色标识时才检查重复
if
(
has
(
param
.
getUid
()))
{
if
(
has
(
param
.
getUid
()))
{
return
Result
.
no
(
Status
.
BAD_REQUEST
,
"权限标识重复
"
);
throw
BusinessException
.
i18n
(
"Code.1001
"
);
}
}
}
}
...
@@ -135,6 +136,7 @@ public class PermissionController {
...
@@ -135,6 +136,7 @@ public class PermissionController {
/**
/**
* 根据父级 ID 获取当前树节点标识
* 根据父级 ID 获取当前树节点标识
*
* @param pid 父级 ID
* @param pid 父级 ID
* @return 树节点标识
* @return 树节点标识
*/
*/
...
@@ -149,6 +151,7 @@ public class PermissionController {
...
@@ -149,6 +151,7 @@ public class PermissionController {
/**
/**
* 检查是否存在已有相同标识的权限
* 检查是否存在已有相同标识的权限
*
* @param uid 权限标识
* @param uid 权限标识
* @return 是否存在
* @return 是否存在
*/
*/
...
...
basic-auth/src/main/java/com/yiring/auth/web/sys/role/RoleController.java
浏览文件 @
c488464e
...
@@ -11,6 +11,7 @@ import com.yiring.auth.util.Permissions;
...
@@ -11,6 +11,7 @@ import com.yiring.auth.util.Permissions;
import
com.yiring.auth.vo.role.RoleVo
;
import
com.yiring.auth.vo.role.RoleVo
;
import
com.yiring.common.core.Result
;
import
com.yiring.common.core.Result
;
import
com.yiring.common.core.Status
;
import
com.yiring.common.core.Status
;
import
com.yiring.common.exception.BusinessException
;
import
com.yiring.common.param.IdParam
;
import
com.yiring.common.param.IdParam
;
import
com.yiring.common.param.IdsParam
;
import
com.yiring.common.param.IdsParam
;
import
com.yiring.common.param.PageParam
;
import
com.yiring.common.param.PageParam
;
...
@@ -56,7 +57,7 @@ public class RoleController {
...
@@ -56,7 +57,7 @@ public class RoleController {
@PostMapping
(
"add"
)
@PostMapping
(
"add"
)
public
Result
<
String
>
add
(
@Valid
RoleParam
param
)
{
public
Result
<
String
>
add
(
@Valid
RoleParam
param
)
{
if
(
has
(
param
.
getUid
()))
{
if
(
has
(
param
.
getUid
()))
{
return
Result
.
no
(
Status
.
BAD_REQUEST
,
"角色标识重复
"
);
throw
BusinessException
.
i18n
(
"Code.1002
"
);
}
}
Role
entity
=
new
Role
();
Role
entity
=
new
Role
();
...
@@ -70,14 +71,14 @@ public class RoleController {
...
@@ -70,14 +71,14 @@ public class RoleController {
public
Result
<
String
>
modify
(
@Valid
RoleParam
param
,
@Valid
IdParam
idParam
)
{
public
Result
<
String
>
modify
(
@Valid
RoleParam
param
,
@Valid
IdParam
idParam
)
{
Optional
<
Role
>
optional
=
roleRepository
.
findById
(
idParam
.
getId
());
Optional
<
Role
>
optional
=
roleRepository
.
findById
(
idParam
.
getId
());
if
(
optional
.
isEmpty
())
{
if
(
optional
.
isEmpty
())
{
return
Result
.
no
(
Status
.
NOT_FOUND
);
throw
Status
.
NOT_FOUND
.
exception
(
);
}
}
Role
entity
=
optional
.
get
();
Role
entity
=
optional
.
get
();
if
(!
entity
.
getUid
().
equals
(
param
.
getUid
()))
{
if
(!
entity
.
getUid
().
equals
(
param
.
getUid
()))
{
// 仅当修改了角色标识时才检查重复
// 仅当修改了角色标识时才检查重复
if
(
has
(
param
.
getUid
()))
{
if
(
has
(
param
.
getUid
()))
{
return
Result
.
no
(
Status
.
BAD_REQUEST
,
"角色标识重复
"
);
throw
BusinessException
.
i18n
(
"Code.1002
"
);
}
}
}
}
...
@@ -91,7 +92,7 @@ public class RoleController {
...
@@ -91,7 +92,7 @@ public class RoleController {
public
Result
<
String
>
assign
(
@Valid
IdParam
idParam
,
@Valid
IdsParam
idsParam
)
{
public
Result
<
String
>
assign
(
@Valid
IdParam
idParam
,
@Valid
IdsParam
idsParam
)
{
Optional
<
Role
>
optional
=
roleRepository
.
findById
(
idParam
.
getId
());
Optional
<
Role
>
optional
=
roleRepository
.
findById
(
idParam
.
getId
());
if
(
optional
.
isEmpty
())
{
if
(
optional
.
isEmpty
())
{
return
Result
.
no
(
Status
.
NOT_FOUND
);
throw
Status
.
NOT_FOUND
.
exception
(
);
}
}
// 查询权限集合
// 查询权限集合
...
@@ -117,7 +118,7 @@ public class RoleController {
...
@@ -117,7 +118,7 @@ public class RoleController {
public
Result
<
RoleVo
>
find
(
@Valid
IdParam
param
)
{
public
Result
<
RoleVo
>
find
(
@Valid
IdParam
param
)
{
Optional
<
Role
>
optional
=
roleRepository
.
findById
(
param
.
getId
());
Optional
<
Role
>
optional
=
roleRepository
.
findById
(
param
.
getId
());
if
(
optional
.
isEmpty
())
{
if
(
optional
.
isEmpty
())
{
return
Result
.
no
(
Status
.
NOT_FOUND
);
throw
Status
.
NOT_FOUND
.
exception
(
);
}
}
Role
entity
=
optional
.
get
();
Role
entity
=
optional
.
get
();
...
@@ -146,6 +147,7 @@ public class RoleController {
...
@@ -146,6 +147,7 @@ public class RoleController {
/**
/**
* 检查是否存在已有相同标识的角色
* 检查是否存在已有相同标识的角色
*
* @param uid 角色标识
* @param uid 角色标识
* @return 是否存在
* @return 是否存在
*/
*/
...
...
basic-auth/src/main/resources/i18n/messages.properties
0 → 100644
浏览文件 @
c488464e
Code.1001
=
\u6743\u9650\u6807\u
8BC6
\u
91CD
\u
590D
Code.1002
=
\u
89D2
\u8272\u6807\u
8BC6
\u
91CD
\u
590D
basic-auth/src/main/resources/i18n/messages_zh_CN.properties
0 → 100644
浏览文件 @
c488464e
Code.1001
=
\u6743\u9650\u6807\u
8BC6
\u
91CD
\u
590D
Code.1002
=
\u
89D2
\u8272\u6807\u
8BC6
\u
91CD
\u
590D
basic-auth/src/main/resources/i18n/status.properties
0 → 100644
浏览文件 @
c488464e
Status.OK
=
OK
Status.NON_AUTHORITATIVE_INFORMATION
=
Non-Authoritative Information
Status.BAD_REQUEST
=
Bad Request
Status.UNAUTHORIZED
=
Unauthorized
Status.FORBIDDEN
=
Forbidden
Status.NOT_FOUND
=
Not Found
Status.METHOD_NOT_ALLOWED
=
Method Not Allowed
Status.EXPECTATION_FAILED
=
Expectation Failed
Status.INTERNAL_SERVER_ERROR
=
Internal Server Error
Status.UNKNOWN_ERROR
=
Unknown Error
Status.NOT_IMPLEMENTED
=
Not Implemented
Status.BAD_GATEWAY
=
Bad Gateway
Status.SERVICE_UNAVAILABLE
=
Service Unavailable
basic-auth/src/main/resources/i18n/status_zh_CN.properties
0 → 100644
浏览文件 @
c488464e
Status.OK
=
OK
Status.NON_AUTHORITATIVE_INFORMATION
=
\u
8BA4
\u
8BC1
\u5931\u
8D25
Status.BAD_REQUEST
=
\u
8BF7
\u
6C42
\u5931\u
8D25
Status.UNAUTHORIZED
=
\u
51ED
\u
8BC1
\u
8FC7
\u
671F
Status.FORBIDDEN
=
\u7981\u
6B62
\u
8BBF
\u
95EE
Status.NOT_FOUND
=
\u
627E
\u
4E0D
\u5230\u
8D44
\u
6E90
Status.METHOD_NOT_ALLOWED
=
\u
4E0D
\u
652F
\u6301\u7684\u
8BF7
\u
6C42
\u
7C7B
\u
578B
Status.EXPECTATION_FAILED
=
\u
65E0
\u6548\u
53C2
\u6570
Status.INTERNAL_SERVER_ERROR
=
\u
670D
\u
52A1
\u5668\u9519\u
8BEF
Status.UNKNOWN_ERROR
=
\u
672A
\u
77E5
\u9519\u
8BEF
Status.NOT_IMPLEMENTED
=
API
\u
672A
\u
5B9E
\u
73B0
Status.BAD_GATEWAY
=
\u
670D
\u
52A1
\u
5F02
\u
5E38
Status.SERVICE_UNAVAILABLE
=
\u
670D
\u
52A1
\u6682\u
505C
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论