Skip to content

Commit d3fa07c

Browse files
moxi624moxi624
committed
refactor: 重构系统管理相关代码，规范化接口返回
1 parent ccee016 commit d3fa07c

File tree

26 files changed

+154
-313
lines changed

26 files changed

+154
-313
lines changed

‎mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/LinkRestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public String getList(@Validated({GetList.class}) @RequestBody LinkVO linkVO, Bi
4747
// 参数校验
4848
ThrowableUtils.checkParamArgument(result);
4949
log.info("获取友链列表");
50-
return ResultUtil.result(SysConf.SUCCESS, linkService.getPageList(linkVO));
50+
return ResultUtil.successWithData(linkService.getPageList(linkVO));
5151
}
5252

5353
@AvoidRepeatableCommit

‎mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/SysDictDataRestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String getList(@Validated({GetList.class}) @RequestBody SysDictDataVO sys
4949
// 参数校验
5050
ThrowableUtils.checkParamArgument(result);
5151
log.info("获取字典数据列表");
52-
return ResultUtil.result(SysConf.SUCCESS, sysDictDataService.getPageList(sysDictDataVO));
52+
return ResultUtil.successWithData(sysDictDataService.getPageList(sysDictDataVO));
5353
}
5454

5555
@AvoidRepeatableCommit

‎mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/SysDictTypeRestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public String getList(@Validated({GetList.class}) @RequestBody SysDictTypeVO sys
5050
// 参数校验
5151
ThrowableUtils.checkParamArgument(result);
5252
log.info("获取字典类型列表");
53-
return ResultUtil.result(SysConf.SUCCESS, sysDictTypeService.getPageList(sysDictTypeVO));
53+
return ResultUtil.successWithData(sysDictTypeService.getPageList(sysDictTypeVO));
5454
}
5555

5656
@AvoidRepeatableCommit

‎mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/SysParamsRestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String getList(@Validated({GetList.class}) @RequestBody SysParamsVO SysPa
4949
// 参数校验
5050
ThrowableUtils.checkParamArgument(result);
5151
log.info("获取参数配置列表");
52-
return ResultUtil.result(SysConf.SUCCESS, sysParamsService.getPageList(SysParamsVO));
52+
return ResultUtil.successWithData(sysParamsService.getPageList(SysParamsVO));
5353
}
5454

5555
@AvoidRepeatableCommit

‎mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/SystemConfigRestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class SystemConfigRestApi {
3434
@ApiOperation(value = "获取系统配置", notes = "获取系统配置")
3535
@GetMapping("/getSystemConfig")
3636
public String getSystemConfig() {
37-
return ResultUtil.result(SysConf.SUCCESS, systemConfigService.getConfig());
37+
return ResultUtil.successWithData(systemConfigService.getConfig());
3838
}
3939

4040
@AuthorityVerify

‎mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/SystemRestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class SystemRestApi {
4444
@ApiOperation(value = "获取我的信息", notes = "获取我的信息")
4545
@GetMapping("/getMe")
4646
public String getMe() {
47-
return ResultUtil.result(SysConf.SUCCESS, adminService.getMe());
47+
return ResultUtil.successWithData(adminService.getMe());
4848
}
4949

5050
@AuthorityVerify

‎mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/WebConfigRestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class WebConfigRestApi {
3535
@ApiOperation(value = "获取网站配置", notes = "获取网站配置")
3636
@GetMapping("/getWebConfig")
3737
public String getWebConfig() {
38-
return ResultUtil.result(SysConf.SUCCESS, webConfigService.getWebConfig());
38+
return ResultUtil.successWithData(webConfigService.getWebConfig());
3939
}
4040

4141
@AuthorityVerify

‎mogu_sms/src/main/java/com/moxi/mogublog/sms/listener/MailListener.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,10 @@ public class MailListener {
2626
@RabbitListener(queues = "mogu.email")
2727
public void sendMail(Map<String, String> map) {
2828
if (map != null) {
29-
try {
30-
sendMailUtils.sendEmail(
31-
map.get("receiver"),
32-
map.get("text")
33-
);
34-
} catch (MessagingException e) {
35-
log.error("发送邮件失败！");
36-
}
29+
sendMailUtils.sendEmail(
30+
map.get("receiver"),
31+
map.get("text")
32+
);
3733
}
3834
}
3935
}

‎mogu_sms/src/main/java/com/moxi/mogublog/sms/util/SendMailUtils.java

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,33 @@ public class SendMailUtils {
3333
* @param receiver
3434
* @param text
3535
*/
36-
public void sendEmail(String receiver, String text) throws MessagingException {
37-
//创建一个复杂的消息邮件
38-
MimeMessage mimeMessage = mailSender.createMimeMessage();
36+
public void sendEmail(String receiver, String text) {
37+
try{
38+
//创建一个复杂的消息邮件
39+
MimeMessage mimeMessage = mailSender.createMimeMessage();
3940

40-
//multipart:true
41-
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
41+
//multipart:true
42+
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
4243

43-
helper.setSubject("蘑菇博客");
44+
helper.setSubject("蘑菇博客");
4445

45-
helper.setText(text, true);
46-
//邮件接收人
47-
helper.setTo(receiver);
46+
helper.setText(text, true);
47+
//邮件接收人
48+
helper.setTo(receiver);
4849

49-
//邮件发送者
50-
helper.setFrom(SENDER);
50+
//邮件发送者
51+
helper.setFrom(SENDER);
5152

52-
mailSender.send(mimeMessage);
53+
mailSender.send(mimeMessage);
5354

54-
log.info("邮件发送成功");
55-
/*添加邮件附件
56-
String path = ""; //文件路径
57-
String fileName = ""; //文件名
58-
helper.addAttachment(fileName, new File(path));
59-
*/
55+
log.info("邮件发送成功");
56+
/*添加邮件附件
57+
String path = ""; //文件路径
58+
String fileName = ""; //文件名
59+
helper.addAttachment(fileName, new File(path));
60+
*/
61+
} catch (Exception e) {
62+
log.error(e.getMessage());
63+
}
6064
}
6165
}

‎mogu_web/src/main/java/com/moxi/mogublog/web/restapi/LoginRestApi.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public String login(@Validated({GetOne.class}) @RequestBody UserVO userVO, Bindi
7373
if (!isOpenLoginType){
7474
return ResultUtil.result(SysConf.ERROR, "后台未开启该登录方式!");
7575
}
76-
7776
String userName = userVO.getUserName();
7877
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
7978
queryWrapper.and(wrapper -> wrapper.eq(SQLConf.USER_NAME, userName).or().eq(SQLConf.EMAIL, userName));
@@ -82,11 +81,9 @@ public String login(@Validated({GetOne.class}) @RequestBody UserVO userVO, Bindi
8281
if (user == null || EStatus.DISABLED == user.getStatus()) {
8382
return ResultUtil.result(SysConf.ERROR, "用户不存在");
8483
}
85-
8684
if (EStatus.FREEZE == user.getStatus()) {
8785
return ResultUtil.result(SysConf.ERROR, "用户账号未激活");
8886
}
89-
9087
if (StringUtils.isNotEmpty(user.getPassWord()) && user.getPassWord().equals(MD5Utils.string2MD5(userVO.getPassWord()))) {
9188
// 更新登录信息
9289
HttpServletRequest request = RequestHolder.getRequest();
@@ -107,7 +104,6 @@ public String login(@Validated({GetOne.class}) @RequestBody UserVO userVO, Bindi
107104
}
108105
// 生成token
109106
String token = StringUtils.getUUID();
110-
111107
// 过滤密码
112108
user.setPassWord("");
113109
//将从数据库查询的数据缓存到redis中
@@ -123,6 +119,11 @@ public String login(@Validated({GetOne.class}) @RequestBody UserVO userVO, Bindi
123119
@PostMapping("/register")
124120
public String register(@Validated({Insert.class}) @RequestBody UserVO userVO, BindingResult result) {
125121
ThrowableUtils.checkParamArgument(result);
122+
// 判断是否开启登录方式
123+
Boolean isOpenLoginType = webConfigService.isOpenLoginType(RedisConf.PASSWORD);
124+
if (!isOpenLoginType){
125+
return ResultUtil.result(SysConf.ERROR, "后台未开启注册功能!");
126+
}
126127
if (userVO.getUserName().length() < Constants.NUM_FIVE || userVO.getUserName().length() >= Constants.NUM_TWENTY || userVO.getPassWord().length() < Constants.NUM_FIVE || userVO.getPassWord().length() >= Constants.NUM_TWENTY) {
127128
return ResultUtil.result(SysConf.ERROR, MessageConf.PARAM_INCORRECT);
128129
}

‎mogu_xo/src/main/java/com/moxi/mogublog/xo/service/impl/AdminServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public String editAdmin(AdminVO adminVO) {
328328
@Override
329329
public String editMe(AdminVO adminVO) {
330330
String adminUid = RequestHolder.getAdminUid();
331-
if (StringUtils.isNotBlank(adminUid)) {
331+
if (StringUtils.isEmpty(adminUid)) {
332332
return ResultUtil.errorWithMessage(MessageConf.INVALID_TOKEN);
333333
}
334334
Admin admin = new Admin();

‎mogu_xo/src/main/java/com/moxi/mogublog/xo/service/impl/LinkServiceImpl.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class LinkServiceImpl extends SuperServiceImpl<LinkMapper, Link> implemen
3838
private LinkMapper linkMapper;
3939
@Autowired
4040
private LinkService linkService;
41-
@Autowired
41+
@Resource
4242
private PictureFeignClient pictureFeignClient;
4343
@Autowired
4444
private WebUtil webUtil;
@@ -92,7 +92,7 @@ public IPage<Link> getPageList(LinkVO linkVO) {
9292
//获取图片
9393
if (StringUtils.isNotEmpty(item.getFileUid())) {
9494
List<String> pictureUidsTemp = StringUtils.changeStringToString(item.getFileUid(), Constants.SYMBOL_COMMA);
95-
List<String> pictureListTemp = new ArrayList<String>();
95+
List<String> pictureListTemp = new ArrayList<>();
9696

9797
pictureUidsTemp.forEach(picture -> {
9898
pictureListTemp.add(pictureMap.get(picture));
@@ -118,7 +118,7 @@ public String addLink(LinkVO linkVO) {
118118
link.setStatus(EStatus.ENABLE);
119119
link.setUpdateTime(new Date());
120120
link.insert();
121-
return ResultUtil.result(SysConf.SUCCESS, MessageConf.INSERT_SUCCESS);
121+
return ResultUtil.successWithMessage(MessageConf.INSERT_SUCCESS);
122122
}
123123

124124
@Override
@@ -133,7 +133,7 @@ public String editLink(LinkVO linkVO) {
133133
link.setFileUid(linkVO.getFileUid());
134134
link.setUpdateTime(new Date());
135135
link.updateById();
136-
return ResultUtil.result(SysConf.SUCCESS, MessageConf.UPDATE_SUCCESS);
136+
return ResultUtil.successWithMessage(MessageConf.UPDATE_SUCCESS);
137137
}
138138

139139
@Override
@@ -142,7 +142,7 @@ public String deleteLink(LinkVO linkVO) {
142142
link.setStatus(EStatus.DISABLED);
143143
link.setUpdateTime(new Date());
144144
link.updateById();
145-
return ResultUtil.result(SysConf.SUCCESS, MessageConf.DELETE_SUCCESS);
145+
return ResultUtil.successWithMessage(MessageConf.DELETE_SUCCESS);
146146
}
147147

148148
@Override
@@ -158,31 +158,31 @@ public String stickLink(LinkVO linkVO) {
158158
List<Link> list = pageList.getRecords();
159159
Link maxSort = list.get(0);
160160
if (StringUtils.isEmpty(maxSort.getUid())) {
161-
return ResultUtil.result(SysConf.ERROR, MessageConf.PARAM_INCORRECT);
161+
return ResultUtil.errorWithMessage(MessageConf.PARAM_INCORRECT);
162162
}
163163
if (maxSort.getUid().equals(link.getUid())) {
164-
return ResultUtil.result(SysConf.ERROR, MessageConf.OPERATION_FAIL);
164+
return ResultUtil.errorWithMessage(MessageConf.OPERATION_FAIL);
165165
}
166166
Integer sortCount = maxSort.getSort() + 1;
167167
link.setSort(sortCount);
168168
link.setUpdateTime(new Date());
169169
link.updateById();
170-
return ResultUtil.result(SysConf.SUCCESS, MessageConf.OPERATION_SUCCESS);
170+
return ResultUtil.successWithMessage(MessageConf.OPERATION_SUCCESS);
171171
}
172172

173173
@Override
174174
public String addLinkCount(String uid) {
175175
if (StringUtils.isEmpty(uid)) {
176-
return ResultUtil.result(SysConf.ERROR, MessageConf.PARAM_INCORRECT);
176+
return ResultUtil.errorWithMessage(MessageConf.PARAM_INCORRECT);
177177
}
178178
Link link = linkService.getById(uid);
179179
if (link != null) {
180180
int count = link.getClickCount() + 1;
181181
link.setClickCount(count);
182182
link.updateById();
183183
} else {
184-
return ResultUtil.result(SysConf.ERROR, MessageConf.PARAM_INCORRECT);
184+
return ResultUtil.errorWithMessage(MessageConf.PARAM_INCORRECT);
185185
}
186-
return ResultUtil.result(SysConf.SUCCESS, MessageConf.UPDATE_SUCCESS);
186+
return ResultUtil.successWithMessage(MessageConf.UPDATE_SUCCESS);
187187
}
188188
}

0 commit comments

Comments
 (0)