CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(mcwl): 使用昵称替代用户名

master
yang 2025-03-10 16:46:29 +08:00
parent 8cff519d1c
commit 4c90ed1bb8
19 changed files with 30 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java
View File

@ -90,7 +90,6 @@ public class OrderTradeController extends BaseController {
return R.fail("用户未登录");
}
orderTrade.setUserId(userId);
orderTrade.setCreateBy(getUsername());
return R.ok(orderTradeService.insertMallProduct(orderTrade));
}
@ -106,7 +105,6 @@ public class OrderTradeController extends BaseController {
return R.fail("用户未登录");
}
orderTrade.setUserId(userId);
orderTrade.setUpdateBy(getUsername());
orderTradeService.updateMallProduct(orderTrade);
return R.ok();
}

2
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
View File

@ -89,7 +89,6 @@ public class MallProductController extends BaseController {
ModelProduct modelProduct = requestModel.getModelProduct();
Long userId = SecurityUtils.getUserId();
modelProduct.setUserId(userId);
modelProduct.setCreateBy(getUsername());
return modelService.addModel(requestModel);
}
@ -100,7 +99,6 @@ public class MallProductController extends BaseController {
Long userId = SecurityUtils.getUserId();
modelProduct.setUserId(userId);
modelProduct.setUpdateBy(getUsername());
modelService.updaModel(requestModel);
return AjaxResult.success("修改成功");

5
mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java
View File

@ -21,10 +21,11 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
try {
this.strictInsertFill(metaObject, "createBy", String.class, SecurityUtils.getUsername());
this.strictInsertFill(metaObject, "createBy", String.class, SecurityUtils.getLoginUser().getUser().getNickName());
} catch (Exception e) {
this.strictInsertFill(metaObject, "createBy", String.class, "");
}
this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
try {
this.strictInsertFill(metaObject, "tenantId", Long.class, SecurityUtils.getUserId());
@ -36,7 +37,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
@Override
public void updateFill(MetaObject metaObject) {
try {
this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject);
this.setFieldValByName("updateBy", SecurityUtils.getLoginUser().getUser().getNickName(), metaObject);
} catch (Exception e) {
this.setFieldValByName("updateBy", "", metaObject);
}

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java
View File

@ -66,7 +66,7 @@ public class PublishCommentServiceImpl extends ServiceImpl<PublishCommentMapper,
for (CommentVo commentVo : commentVoList) {
Long userId = commentVo.getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
commentVo.setUserName(sysUser.getUserName());
commentVo.setUserName(sysUser.getNickName());
commentVo.setUserAvatar(sysUser.getAvatar());
}

8
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishServiceImpl.java
View File

@ -60,7 +60,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
BeanUtil.copyProperties(publish, publishVo);
Long userId = publish.getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
publishVo.setUserName(sysUser.getUserName());
publishVo.setUserName(sysUser.getNickName());
publishVo.setAvatar(sysUser.getAvatar());
return publishVo;
}
@ -112,7 +112,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
BeanUtil.copyProperties(publish, publishVo);
Long userId = publish.getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
publishVo.setUserName(sysUser.getUserName());
publishVo.setUserName(sysUser.getNickName());
publishVo.setAvatar(sysUser.getAvatar());
publishVoList.add(publishVo);
}
@ -142,7 +142,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
BeanUtil.copyProperties(publish, publishVo);
Long userId = publish.getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
publishVo.setUserName(sysUser.getUserName());
publishVo.setUserName(sysUser.getNickName());
publishVo.setAvatar(sysUser.getAvatar());
publishVoList.add(publishVo);
}
@ -171,7 +171,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
BeanUtil.copyProperties(publish, publishVo);
Long userId = publish.getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
publishVo.setUserName(sysUser.getUserName());
publishVo.setUserName(sysUser.getNickName());
publishVo.setAvatar(sysUser.getAvatar());
publishVoList.add(publishVo);
}

6
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java
View File

@ -130,7 +130,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
BeanUtil.copyProperties(question, questionVo);
Long questionUserId = question.getQuestionUserId();
SysUser sysUser = sysUserService.selectUserById(questionUserId);
questionVo.setQuestionUserName(sysUser.getUserName());
questionVo.setQuestionUserName(sysUser.getNickName());
questionVo.setQuestionUserAvatar(sysUser.getAvatar());
questionVoList.add(questionVo);
@ -160,7 +160,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
BeanUtil.copyProperties(question, questionVo);
Long questionUserId = question.getQuestionUserId();
SysUser sysUser = sysUserService.selectUserById(questionUserId);
questionVo.setQuestionUserName(sysUser.getUserName());
questionVo.setQuestionUserName(sysUser.getNickName());
questionVo.setQuestionUserAvatar(sysUser.getAvatar());
@ -215,7 +215,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
BeanUtil.copyProperties(question, questionVo);
Long questionUserId = question.getQuestionUserId();
SysUser sysUser = sysUserService.selectUserById(questionUserId);
questionVo.setQuestionUserName(sysUser.getUserName());
questionVo.setQuestionUserName(sysUser.getNickName());
questionVo.setQuestionUserAvatar(sysUser.getAvatar());
questionVoList.add(questionVo);

3
mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java
View File

@ -240,9 +240,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
memberConsume.setConsumePoints(consumePoints);
memberConsume.setRemainingPoints(points - consumePoints);
memberConsume.setConsumeTime(new Date());
memberConsume.setCreateBy(SecurityUtils.getUsername());
memberConsume.setUpdateBy(SecurityUtils.getUsername());
memberConsume.setUpdateTime(new Date());
memberConsumeService.save(memberConsume);
}

12
mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java
View File

@ -186,7 +186,7 @@ public class AliPayServiceImpl implements AliPayService {
BeanUtil.copyProperties(orderTradeDto, tradeEntity);
tradeEntity.setCode(UUID.randomUUID().toString(true).substring(0, 30) + "_member");
tradeEntity.setUserId(SecurityUtils.getUserId());
tradeEntity.setUserName(SecurityUtils.getUsername());
tradeEntity.setUserName(SecurityUtils.getLoginUser().getUser().getNickName());
tradeEntity.setProductId(productId);
tradeEntity.setProductName(memberLevel.getMemberName());
tradeEntity.setTotalAmount(orderTradeDto.getAmount());
@ -230,7 +230,7 @@ public class AliPayServiceImpl implements AliPayService {
tradeEntity.setUserId(SecurityUtils.getUserId());
tradeEntity.setProductId(-1L);
tradeEntity.setProductName("积分充值");
tradeEntity.setUserName(SecurityUtils.getUsername());
tradeEntity.setUserName(SecurityUtils.getLoginUser().getUser().getNickName());
tradeEntity.setTotalAmount(paymentAmount);
tradeEntity.setOrderStatus(1);
tradeEntity.setPayStatus(1);
@ -268,7 +268,7 @@ public class AliPayServiceImpl implements AliPayService {
tradeEntity.setUserId(SecurityUtils.getUserId());
tradeEntity.setProductId(-1L);
tradeEntity.setProductName("金币充值");
tradeEntity.setUserName(SecurityUtils.getUsername());
tradeEntity.setUserName(SecurityUtils.getLoginUser().getUser().getNickName());
tradeEntity.setTotalAmount(paymentAmount);
tradeEntity.setOrderStatus(1);
tradeEntity.setPayStatus(1);
@ -395,11 +395,11 @@ public class AliPayServiceImpl implements AliPayService {
// 账户余额不足，发送邮件通知
ArrayList<String> tos = CollUtil.newArrayList("2119157836@qq.com");
String content = String.format("账户余额不足：用户%s提现%s", sysUser.getUserName(), amount);
MailUtil.send(tos, "上海辰风互娱", content, false);
String content = String.format("账户余额不足：用户%s提现%s", sysUser.getNickName(), amount);
MailUtil.send(tos, "魔创未来", content, false);
throw new ServiceException("网络连接出错,请稍后再试");
}
System.out.println("用户" + SecurityUtils.getUsername() + "提现失败：" + response.getSubMsg());
System.out.println("用户" + SecurityUtils.getLoginUser().getUser().getNickName() + "提现失败：" + response.getSubMsg());
throw new ServiceException("提现失败");
}

5
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentLikeServiceImpl.java
View File

@ -58,9 +58,6 @@ public class ModelCommentLikeServiceImpl extends ServiceImpl<ModelCommentLikeMap
modelCommentLike = new ModelCommentLike();
modelCommentLike.setUserId(userId);
modelCommentLike.setModelCommentId(commentId);
modelCommentLike.setCreateBy(SecurityUtils.getUsername());
modelCommentLike.setUpdateBy(SecurityUtils.getUsername());
modelCommentLike.setUpdateTime(new Date());
baseMapper.insert(modelCommentLike);
// 更新模型点赞数
@ -81,7 +78,7 @@ public class ModelCommentLikeServiceImpl extends ServiceImpl<ModelCommentLikeMap
}
String content = StringUtils.format("恭喜！{}点赞了您的评论",
SecurityUtils.getUsername());
SecurityUtils.getLoginUser().getUser().getNickName());
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(userId);

4
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentServiceImpl.java
View File

@ -86,7 +86,7 @@ public class ModelCommentServiceImpl extends ServiceImpl<ModelCommentMapper, Mod
String content = StringUtils.format("{}给您的模型发了一条评论：{}",
SecurityUtils.getUsername(), modelCommentRes.getContent());
SecurityUtils.getLoginUser().getUser().getNickName(), modelCommentRes.getContent());
// 向通知表中插入一条记录
SysAdvice sysAdvice = new SysAdvice();
@ -282,7 +282,7 @@ public class ModelCommentServiceImpl extends ServiceImpl<ModelCommentMapper, Mod
}
ModelCommentVo vo = new ModelCommentVo();
vo.setUserId(comment.getUserId());
vo.setUserName(user.getUserName());
vo.setUserName(user.getNickName());
vo.setUserAvatar(user.getAvatar());
vo.setCommentId(comment.getId());
vo.setContent(comment.getContent());

5
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageCommentLikeServiceImpl.java
View File

@ -58,9 +58,6 @@ public class ModelImageCommentLikeServiceImpl extends ServiceImpl<ModelImageComm
modelImageCommentLike = new ModelImageCommentLike();
modelImageCommentLike.setUserId(userId);
modelImageCommentLike.setModelImageCommentId(commentId);
modelImageCommentLike.setCreateBy(SecurityUtils.getUsername());
modelImageCommentLike.setUpdateBy(SecurityUtils.getUsername());
modelImageCommentLike.setUpdateTime(new Date());
baseMapper.insert(modelImageCommentLike);
// 更新图片点赞数
@ -81,7 +78,7 @@ public class ModelImageCommentLikeServiceImpl extends ServiceImpl<ModelImageComm
}
String content = StringUtils.format("恭喜！{}点赞了您的评论",
SecurityUtils.getUsername());
SecurityUtils.getLoginUser().getUser().getNickName());
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(userId);

4
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageCommentServiceImpl.java
View File

@ -72,7 +72,7 @@ public class ModelImageCommentServiceImpl extends ServiceImpl<ModelImageCommentM
String content = StringUtils.format("{}给您的图片发了一条评论：{}",
SecurityUtils.getUsername(), modelImageCommentRes.getContent());
SecurityUtils.getLoginUser().getUser().getNickName(), modelImageCommentRes.getContent());
// 向通知表中插入一条记录
SysAdvice sysAdvice = new SysAdvice();
@ -267,7 +267,7 @@ public class ModelImageCommentServiceImpl extends ServiceImpl<ModelImageCommentM
ModelImageCommentVo vo = new ModelImageCommentVo();
vo.setUserId(comment.getUserId());
vo.setUserName(user.getUserName());
vo.setUserName(user.getNickName());
vo.setUserAvatar(user.getAvatar());
vo.setCommentId(comment.getId());
vo.setContent(comment.getContent());

5
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageLikeServiceImpl.java
View File

@ -76,9 +76,6 @@ public class ModelImageLikeServiceImpl extends ServiceImpl<ModelImageLikeMapper,
modelImageLike = new ModelImageLike();
modelImageLike.setUserId(userId);
modelImageLike.setModelImageId(imageId);
modelImageLike.setCreateBy(SecurityUtils.getUsername());
modelImageLike.setUpdateBy(SecurityUtils.getUsername());
modelImageLike.setUpdateTime(new Date());
baseMapper.insert(modelImageLike);
// 更新图片点赞数
@ -207,7 +204,7 @@ public class ModelImageLikeServiceImpl extends ServiceImpl<ModelImageLikeMapper,
}
String content = StringUtils.format("恭喜！{}点赞了您的图片：{}",
SecurityUtils.getUsername(), modelImage.getTitle());
SecurityUtils.getLoginUser().getUser().getNickName(), modelImage.getTitle());
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(userId);

2
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
View File

@ -209,7 +209,7 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
continue;
}
modelImageVo.setUserId(sysUser.getUserId());
modelImageVo.setUserName(sysUser.getUserName());
modelImageVo.setUserName(sysUser.getNickName());
modelImageVo.setUserAvatar(sysUser.getAvatar());
modelImageVoList.add(modelImageVo);
}

5
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelLikeServiceImpl.java
View File

@ -74,9 +74,6 @@ public class ModelLikeServiceImpl extends ServiceImpl<ModelLikeMapper, ModelLike
modelLike = new ModelLike();
modelLike.setUserId(userId);
modelLike.setModelId(modelId);
modelLike.setCreateBy(SecurityUtils.getUsername());
modelLike.setUpdateBy(SecurityUtils.getUsername());
modelLike.setUpdateTime(new Date());
baseMapper.insert(modelLike);
// 更新图片点赞数
@ -144,7 +141,7 @@ public class ModelLikeServiceImpl extends ServiceImpl<ModelLikeMapper, ModelLike
}
String content = StringUtils.format("恭喜！{}点赞了您的模型：{}",
SecurityUtils.getUsername(), model.getModelName());
SecurityUtils.getLoginUser().getUser().getNickName(), model.getModelName());
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(userId);

2
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java
View File

@ -71,7 +71,7 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
//关注
SysUserAttention sysUserAttention = SysUserAttention.builder().userId(SecurityUtils.getUserId())
.toUserId(userId)
.createName(SecurityUtils.getUsername())
.createName(SecurityUtils.getLoginUser().getUser().getNickName())
.createTime(new Date())
.build();
sysUserAttentionMapper.insert(sysUserAttention);

5
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentLikeServiceImpl.java
View File

@ -63,9 +63,6 @@ public class WorkFlowCommentLikeServiceImpl extends ServiceImpl<WorkFlowCommentL
workFlowCommentLike = new WorkFlowCommentLike();
workFlowCommentLike.setUserId(userId);
workFlowCommentLike.setWorkFlowCommentId(commentId);
workFlowCommentLike.setCreateBy(SecurityUtils.getUsername());
workFlowCommentLike.setUpdateBy(SecurityUtils.getUsername());
workFlowCommentLike.setUpdateTime(new Date());
baseMapper.insert(workFlowCommentLike);
// 更新模型点赞数
@ -86,7 +83,7 @@ public class WorkFlowCommentLikeServiceImpl extends ServiceImpl<WorkFlowCommentL
}
String content = StringUtils.format("恭喜！{}点赞了您的评论",
SecurityUtils.getUsername());
SecurityUtils.getLoginUser().getUser().getNickName());
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(userId);

2
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentServiceImpl.java
View File

@ -86,7 +86,7 @@ public class WorkFlowCommentServiceImpl extends ServiceImpl<WorkFlowCommentMappe
String content = StringUtils.format("{}给您的图片发了一条评论：{}",
SecurityUtils.getUsername(), workFlowCommentRes.getContent());
SecurityUtils.getLoginUser().getUser().getNickName(), workFlowCommentRes.getContent());
// 向通知表中插入一条记录
SysAdvice sysAdvice = new SysAdvice();

5
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java
View File

@ -80,9 +80,6 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl<WorkFlowLikeMapper, Wor
workFlowLike = new WorkFlowLike();
workFlowLike.setUserId(userId);
workFlowLike.setWorkFlowId(modelId);
workFlowLike.setCreateBy(SecurityUtils.getUsername());
workFlowLike.setUpdateBy(SecurityUtils.getUsername());
workFlowLike.setUpdateTime(new Date());
baseMapper.insert(workFlowLike);
// 更新图片点赞数
@ -158,7 +155,7 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl<WorkFlowLikeMapper, Wor
}
String content = StringUtils.format("恭喜！{}点赞了您的工作流：{}",
SecurityUtils.getUsername(), workFlow.getWorkflowName());
SecurityUtils.getLoginUser().getUser().getNickName(), workFlow.getWorkflowName());
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(userId);