From e217a51a977051c5d65b6352e100c079d06387dd Mon Sep 17 00:00:00 2001
From: root <393696201@qq.com>
Date: Tue, 10 Aug 2021 09:03:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?controller=E4=B8=AD=E5=88=A4=E6=96=ADuser?=
=?UTF-8?q?=E4=B8=BAnull=EF=BC=8C=20changepwd=E4=B8=ADalert=E5=85=B3?=
=?UTF-8?q?=E9=94=AE=E5=AD=97=E7=BA=A0=E9=94=99=E5=92=8C=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E9=95=BF=E5=BA=A6=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/cetc32/dh/controller/rest/AuthController.java | 3 +++
src/main/resources/templates/changepwd.html | 6 +++---
src/main/resources/templates/register.html | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
index 1bff8f1..ca35025 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
@@ -149,6 +149,9 @@ public class AuthController {
@Nullable
private ResponseData verifyUserLoginEnable(String username, String password, BaseAdminUser user) {
+ if(null==user){
+ return ResponseData.error("未注册");
+ }
if(user.getUserStatus() == -1){
return ResponseData.error("未激活用户请先联系管理员审核账号。");
}else if( user.getUserStatus()<1){
diff --git a/src/main/resources/templates/changepwd.html b/src/main/resources/templates/changepwd.html
index 73a644c..f8d1d97 100644
--- a/src/main/resources/templates/changepwd.html
+++ b/src/main/resources/templates/changepwd.html
@@ -57,14 +57,14 @@
var passwordN = $("#passwordN").val();
var passwordC = $("#passwordC").val();
if(passwordN !== passwordC){
- alter("两次密码不匹配")
+ alert("两次密码不匹配")
return false;
}
var validators = new InputValidators();
validators.importStrategies(validationStrategies);
validators.addValidator('isNoSpecialChar', $("#username"), '用户名不能包含特殊字符，请填写完整', username);
validators.addValidator('maxLength:50', $("#username"), '用户名长度不能超过50个字符', username);
- validators.addValidator('minLength:3', $("#username"), '用户名长度不能小于3个字符', username);
+ validators.addValidator('minLength:1', $("#username"), '用户名长度不能小于1个字符', username);
var result = validators.check()
if(result){
//layer.msg(result.errMsg);
@@ -84,7 +84,7 @@
// setCookie("token",data.data.token,2*60*60*1000);
alert("操作成功！");
}else{
- alert(data.message);
+ alert("帐号信息有误！");
}
},
error: function () {
diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html
index cda0d15..1848126 100644
--- a/src/main/resources/templates/register.html
+++ b/src/main/resources/templates/register.html
@@ -28,6 +28,7 @@
+
--
Gitee
From 624c22c785a6448f2885de370aad236212e786c0 Mon Sep 17 00:00:00 2001
From: root <393696201@qq.com>
Date: Tue, 10 Aug 2021 11:06:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/static/js/selectTree/selectTree.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/static/js/selectTree/selectTree.js b/src/main/resources/static/js/selectTree/selectTree.js
index 6faad4f..266d496 100644
--- a/src/main/resources/static/js/selectTree/selectTree.js
+++ b/src/main/resources/static/js/selectTree/selectTree.js
@@ -61,7 +61,7 @@ $(document).ready(function(){
if(v.length > 0) {
v = v.substring(0, v.length-1);
};
- $("#relationTypeId").html(relationTypeId);//将选中的值放到select
+ $("#areacode").html(relationTypeId);//将选中的值放到select
$('.pull-left1', '#relationBtn').text(v).attr('title', v);//将中文（要显示的内容）放到button中显示
if(v == ""){//如果没有选中任何值，显示默认内容
$('.pull-left1', '#relationBtn').text('请选择').attr('title', '请选择');
--
Gitee