From 8e813132f6b8b5df25c4b3afe85ff240011ca041 Mon Sep 17 00:00:00 2001 From: yubinCloud Date: Sun, 25 Apr 2021 09:16:51 +0800 Subject: [PATCH] =?UTF-8?q?9-4=20=E5=AF=B9=E7=BC=96=E8=BE=91=E5=92=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=9A=84=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E4=BC=A0=E8=BE=93=E5=92=8C?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fairywiki/controller/UserController.java | 3 + .../fairywiki/dto/req/UserSaveReqDto.java | 2 +- web/public/index.html | 3 +- web/public/js/md5.js | 251 ++++++++++++++++++ web/src/views/admin/admin-user.vue | 4 + 5 files changed, 261 insertions(+), 2 deletions(-) create mode 100644 web/public/js/md5.js diff --git a/src/main/java/io/github/yubincloud/fairywiki/controller/UserController.java b/src/main/java/io/github/yubincloud/fairywiki/controller/UserController.java index f745e94..d047d46 100644 --- a/src/main/java/io/github/yubincloud/fairywiki/controller/UserController.java +++ b/src/main/java/io/github/yubincloud/fairywiki/controller/UserController.java @@ -6,6 +6,7 @@ import io.github.yubincloud.fairywiki.dto.resp.PageRespDto; import io.github.yubincloud.fairywiki.dto.resp.RestfulModel; import io.github.yubincloud.fairywiki.dto.resp.UserQueryRespDto; import io.github.yubincloud.fairywiki.service.UserService; +import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -26,6 +27,8 @@ public class UserController { @PostMapping("/save") public RestfulModel saveUser(@RequestBody @Valid UserSaveReqDto userSaveReqDto) { + userSaveReqDto.setPassword( + DigestUtils.md5DigestAsHex(userSaveReqDto.getPassword().getBytes())); userService.save(userSaveReqDto); return new RestfulModel<>(0, "", 0); } diff --git a/src/main/java/io/github/yubincloud/fairywiki/dto/req/UserSaveReqDto.java b/src/main/java/io/github/yubincloud/fairywiki/dto/req/UserSaveReqDto.java index 68f1d45..a87cb98 100644 --- a/src/main/java/io/github/yubincloud/fairywiki/dto/req/UserSaveReqDto.java +++ b/src/main/java/io/github/yubincloud/fairywiki/dto/req/UserSaveReqDto.java @@ -16,7 +16,7 @@ public class UserSaveReqDto { private String name; @NotNull(message = "【密码】不能为空") - @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$", message = "【密码】至少包含 数字和英文，长度6-20") + @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,32}$", message = "【密码】至少包含 数字和英文，长度6-32") private String password; } diff --git a/web/public/index.html b/web/public/index.html index 3e5a139..d59caab 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -5,7 +5,8 @@ - <%= htmlWebpackPlugin.options.title %> + + <%= htmlWebpackPlugin.options.title %>