diff --git a/novel-admin/src/main/resources/templates/login.html b/novel-admin/src/main/resources/templates/login.html index 2f09be2..f57eb80 100644 --- a/novel-admin/src/main/resources/templates/login.html +++ b/novel-admin/src/main/resources/templates/login.html @@ -2,7 +2,7 @@ - 后台管理-登陆 + 后台管理-登录 diff --git a/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java b/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java index 1fce47a..d51596f 100644 --- a/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java +++ b/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java @@ -18,7 +18,7 @@ public enum ResponseStatus implements IResultCode { /** * 用户相关错误 * */ - NO_LOGIN(1001, "未登录或登陆失效！"), + NO_LOGIN(1001, "未登录或登录失效！"), VEL_CODE_ERROR(1002, "验证码错误！"), USERNAME_EXIST(1003,"该手机号已注册！"), USERNAME_PASS_ERROR(1004,"手机号或密码错误！"), diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java b/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java index 96d2e0f..d9c75fe 100644 --- a/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java +++ b/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java @@ -50,7 +50,7 @@ public class PayController extends BaseController { UserDetails userDetails = getUserDetails(request); if (userDetails == null) { - //未登录，跳转到登陆页面 + //未登录，跳转到登录页面 httpResponse.sendRedirect("/user/login.html?originUrl=/pay/index.html"); } else { //创建充值订单 diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java index 958db22..5d5c6ad 100644 --- a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java +++ b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java @@ -40,12 +40,12 @@ public class UserController extends BaseController { private final BookService bookService; /** - * 登陆 + * 登录 */ @PostMapping("login") public RestResult> login(User user) { - //登陆 + //登录 UserDetails userDetails = userService.login(user); Map data = new HashMap<>(1); diff --git a/novel-front/src/main/java/com/java2nb/novel/service/UserService.java b/novel-front/src/main/java/com/java2nb/novel/service/UserService.java index 577954b..b005f38 100644 --- a/novel-front/src/main/java/com/java2nb/novel/service/UserService.java +++ b/novel-front/src/main/java/com/java2nb/novel/service/UserService.java @@ -26,8 +26,8 @@ public interface UserService { UserDetails register(User user); /** - * 用户登陆 - * @param user 用户登陆信息类 + * 用户登录 + * @param user 用户登录信息类 * @return jwt载体信息类 * */ UserDetails login(User user); diff --git a/novel-front/src/main/resources/static/javascript/bookdetail.js b/novel-front/src/main/resources/static/javascript/bookdetail.js index a0bf95c..7760961 100644 --- a/novel-front/src/main/resources/static/javascript/bookdetail.js +++ b/novel-front/src/main/resources/static/javascript/bookdetail.js @@ -91,7 +91,7 @@ }, SaveComment: function (cmtBId, cmtCId, cmtDetail) { if (!isLogin) { - layer.alert('请先登陆'); + layer.alert('请先登录'); return; } var cmtDetailTemp = cmtDetail.replace(/(^\s*)/g, ""); @@ -137,7 +137,7 @@ SaveCommentReply: function (cmtBId, cmtCId, cmtDetail) { if (!isLogin) { - layer.alert('请先登陆'); + layer.alert('请先登录'); return; } var cmtDetailTemp = cmtDetail.replace(/(^\s*)/g, ""); diff --git a/novel-front/src/main/resources/templates/user/login.html b/novel-front/src/main/resources/templates/user/login.html index 2420d9c..e22aafc 100644 --- a/novel-front/src/main/resources/templates/user/login.html +++ b/novel-front/src/main/resources/templates/user/login.html @@ -17,7 +17,7 @@
-

+

    • diff --git a/templates/green/html/user/login.html b/templates/green/html/user/login.html index 2420d9c..e22aafc 100644 --- a/templates/green/html/user/login.html +++ b/templates/green/html/user/login.html @@ -17,7 +17,7 @@
    -

    +

      • diff --git a/templates/green/static/javascript/bookdetail.js b/templates/green/static/javascript/bookdetail.js index 7e78c68..3f6acd3 100644 --- a/templates/green/static/javascript/bookdetail.js +++ b/templates/green/static/javascript/bookdetail.js @@ -91,7 +91,7 @@ }, SaveComment: function (cmtBId, cmtCId, cmtDetail) { if (!isLogin) { - layer.alert('请先登陆'); + layer.alert('请先登录'); return; } var cmtDetailTemp = cmtDetail.replace(/(^\s*)/g, ""); diff --git a/templates/orange/html/user/login.html b/templates/orange/html/user/login.html index 2420d9c..e22aafc 100644 --- a/templates/orange/html/user/login.html +++ b/templates/orange/html/user/login.html @@ -17,7 +17,7 @@
      -

      +

        • diff --git a/templates/orange/static/javascript/bookdetail.js b/templates/orange/static/javascript/bookdetail.js index 8d5f66b..b9cd1ee 100644 --- a/templates/orange/static/javascript/bookdetail.js +++ b/templates/orange/static/javascript/bookdetail.js @@ -92,7 +92,7 @@ }, SaveComment: function (cmtBId, cmtCId, cmtDetail) { if(!isLogin){ - layer.alert('请先登陆'); + layer.alert('请先登录'); return; } var cmtDetailTemp = cmtDetail.replace(/(^\s*)/g, "");