Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
roncoo
roncoo-education
提交
ee8ffa62
R
roncoo-education
项目概览
roncoo
/
roncoo-education
9 个月 前同步成功
通知
146
Star
5
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roncoo-education
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ee8ffa62
编写于
11月 25, 2023
作者:
F
fengyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 用户输入参数校验,并过滤手机号
上级
e77e23d2
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
23 addition
and
27 deletion
+23
-27
roncoo-education-feign/roncoo-education-feign-user/src/main/java/com/roncoo/education/user/feign/interfaces/vo/UsersVO.java
...om/roncoo/education/user/feign/interfaces/vo/UsersVO.java
+0
-24
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/admin/biz/AdminUserCourseCommentBiz.java
...n/course/service/admin/biz/AdminUserCourseCommentBiz.java
+1
-0
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/auth/AuthUserCourseCommentController.java
.../course/service/auth/AuthUserCourseCommentController.java
+2
-1
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/auth/req/AuthUserCourseCommentReq.java
...ion/course/service/auth/req/AuthUserCourseCommentReq.java
+2
-0
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/biz/CourseBiz.java
...va/com/roncoo/education/course/service/biz/CourseBiz.java
+8
-1
roncoo-education-service/roncoo-education-service-user/src/main/java/com/roncoo/education/user/service/api/biz/ApiUsersBiz.java
...om/roncoo/education/user/service/api/biz/ApiUsersBiz.java
+3
-0
roncoo-education-service/roncoo-education-service-user/src/main/java/com/roncoo/education/user/service/auth/AuthUsersController.java
...ncoo/education/user/service/auth/AuthUsersController.java
+2
-1
roncoo-education-service/roncoo-education-service-user/src/main/java/com/roncoo/education/user/service/auth/req/AuthUsersReq.java
.../roncoo/education/user/service/auth/req/AuthUsersReq.java
+5
-0
未找到文件。
roncoo-education-feign/roncoo-education-feign-user/src/main/java/com/roncoo/education/user/feign/interfaces/vo/UsersVO.java
浏览文件 @
ee8ffa62
package
com.roncoo.education.user.feign.interfaces.vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* <p>
...
...
@@ -18,40 +14,20 @@ import java.time.LocalDateTime;
*/
@Data
@Accessors
(
chain
=
true
)
@ApiModel
(
description
=
"ADMIN-用户信息查看"
)
public
class
UsersVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"主键"
)
private
Long
id
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
gmtCreate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty
(
value
=
"修改时间"
)
private
LocalDateTime
gmtModified
;
@ApiModelProperty
(
value
=
"状态(1:正常,0:禁用)"
)
private
Integer
statusId
;
@ApiModelProperty
(
value
=
"手机号码"
)
private
String
mobile
;
@ApiModelProperty
(
value
=
"昵称"
)
private
String
nickname
;
@ApiModelProperty
(
value
=
"用户性别(1男,2女,3保密)"
)
private
Integer
userSex
;
@ApiModelProperty
(
value
=
"用户年龄"
)
private
Integer
userAge
;
@ApiModelProperty
(
value
=
"用户头像"
)
private
String
userHead
;
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
}
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/admin/biz/AdminUserCourseCommentBiz.java
浏览文件 @
ee8ffa62
...
...
@@ -56,6 +56,7 @@ public class AdminUserCourseCommentBiz extends BaseBiz {
if
(
StringUtils
.
hasText
(
req
.
getCommentText
()))
{
c
.
andCommentTextLike
(
PageUtil
.
like
(
req
.
getCommentText
()));
}
example
.
setOrderByClause
(
"id desc"
);
Page
<
UserCourseComment
>
page
=
dao
.
page
(
req
.
getPageCurrent
(),
req
.
getPageSize
(),
example
);
Page
<
AdminUserCourseCommentPageResp
>
respPage
=
PageUtil
.
transform
(
page
,
AdminUserCourseCommentPageResp
.
class
);
if
(
CollUtil
.
isNotEmpty
(
respPage
.
getList
()))
{
...
...
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/auth/AuthUserCourseCommentController.java
浏览文件 @
ee8ffa62
...
...
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.Valid
;
import
javax.validation.constraints.NotNull
;
/**
...
...
@@ -51,7 +52,7 @@ public class AuthUserCourseCommentController {
*/
@ApiOperation
(
value
=
"课程评论添加"
,
notes
=
"用户进行课程评论"
)
@RequestMapping
(
value
=
"/add"
,
method
=
RequestMethod
.
POST
)
public
Result
<
String
>
add
(
@RequestBody
AuthUserCourseCommentReq
req
)
{
public
Result
<
String
>
add
(
@RequestBody
@Valid
AuthUserCourseCommentReq
req
)
{
return
biz
.
add
(
req
);
}
...
...
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/auth/req/AuthUserCourseCommentReq.java
浏览文件 @
ee8ffa62
...
...
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
/**
...
...
@@ -28,6 +29,7 @@ public class AuthUserCourseCommentReq implements Serializable {
@ApiModelProperty
(
value
=
"评论ID,被评论的ID"
,
required
=
false
)
private
Long
commentId
;
@NotBlank
(
message
=
"请填写评论内容"
)
@ApiModelProperty
(
value
=
"评论内容"
)
private
String
commentText
;
}
roncoo-education-service/roncoo-education-service-course/src/main/java/com/roncoo/education/course/service/biz/CourseBiz.java
浏览文件 @
ee8ffa62
package
com.roncoo.education.course.service.biz
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.util.DesensitizedUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.roncoo.education.common.core.base.Page
;
import
com.roncoo.education.common.core.base.PageUtil
;
import
com.roncoo.education.common.core.base.Result
;
...
...
@@ -146,7 +148,12 @@ public class CourseBiz extends BaseBiz {
List
<
Long
>
userIds
=
userCourseCommentPage
.
getList
().
stream
().
map
(
UserCourseComment:
:
getUserId
).
collect
(
Collectors
.
toList
());
Map
<
Long
,
UsersVO
>
usersVOMap
=
feignUsers
.
listByIds
(
userIds
);
for
(
CourseCommentResp
commentResp
:
resp
.
getList
())
{
commentResp
.
setUsersVO
(
usersVOMap
.
get
(
commentResp
.
getUserId
()));
UsersVO
usersVO
=
usersVOMap
.
get
(
commentResp
.
getUserId
());
usersVO
.
setMobile
(
DesensitizedUtil
.
mobilePhone
(
usersVO
.
getMobile
()));
if
(
StrUtil
.
isBlank
(
usersVO
.
getNickname
()))
{
usersVO
.
setNickname
(
usersVO
.
getMobile
());
}
commentResp
.
setUsersVO
(
usersVO
);
}
}
return
Result
.
success
(
resp
);
...
...
roncoo-education-service/roncoo-education-service-user/src/main/java/com/roncoo/education/user/service/api/biz/ApiUsersBiz.java
浏览文件 @
ee8ffa62
...
...
@@ -2,6 +2,7 @@ package com.roncoo.education.user.service.api.biz;
import
cn.hutool.core.util.IdUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.RandomUtil
;
import
cn.hutool.crypto.digest.DigestUtil
;
import
cn.hutool.extra.servlet.ServletUtil
;
import
com.roncoo.education.common.cache.CacheRedis
;
...
...
@@ -129,6 +130,8 @@ public class ApiUsersBiz extends BaseBiz {
user
.
setMobile
(
mobile
);
user
.
setMobileSalt
(
IdUtil
.
simpleUUID
());
user
.
setMobilePsw
(
DigestUtil
.
sha1Hex
(
user
.
getMobileSalt
()
+
password
));
// 默认8位随机字符串
user
.
setNickname
(
RandomUtil
.
randomString
(
8
));
userDao
.
save
(
user
);
return
user
;
}
...
...
roncoo-education-service/roncoo-education-service-user/src/main/java/com/roncoo/education/user/service/auth/AuthUsersController.java
浏览文件 @
ee8ffa62
...
...
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.Valid
;
import
javax.validation.constraints.NotNull
;
/**
...
...
@@ -37,7 +38,7 @@ public class AuthUsersController {
@ApiOperation
(
value
=
"更新接口"
,
notes
=
"更新当前用户的基本信息"
)
@RequestMapping
(
value
=
"/edit"
,
method
=
RequestMethod
.
POST
)
public
Result
<
String
>
update
(
@RequestBody
AuthUsersReq
req
)
{
public
Result
<
String
>
update
(
@RequestBody
@Valid
AuthUsersReq
req
)
{
return
biz
.
update
(
req
);
}
...
...
roncoo-education-service/roncoo-education-service-user/src/main/java/com/roncoo/education/user/service/auth/req/AuthUsersReq.java
浏览文件 @
ee8ffa62
...
...
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
/**
...
...
@@ -22,12 +24,15 @@ public class AuthUsersReq implements Serializable {
private
static
final
long
serialVersionUID
=
1L
;
@NotBlank
(
message
=
"请填写昵称"
)
@ApiModelProperty
(
value
=
"昵称"
)
private
String
nickname
;
@NotNull
(
message
=
"请选择性别"
)
@ApiModelProperty
(
value
=
"用户性别(1男,2女,3保密)"
)
private
Integer
userSex
;
@NotNull
(
message
=
"请填写年龄"
)
@ApiModelProperty
(
value
=
"用户年龄"
)
private
Integer
userAge
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录