|
|
@@ -14,6 +14,7 @@ import common.data.Row;
|
|
|
import common.data.Rows;
|
|
|
import common.data.SQLFactory;
|
|
|
import common.password.SmsPassWord;
|
|
|
+import common.password.UserPassword;
|
|
|
import utility.sms.Sms;
|
|
|
import utility.tools.Encryption;
|
|
|
import utility.wechat.WechatUserID;
|
|
|
@@ -94,10 +95,10 @@ public class usercenter extends Controller {
|
|
|
if (usersrows.isEmpty()) {
|
|
|
return getErrReturnObject().setErrMsg("用户信息不存在").toString();
|
|
|
}
|
|
|
- if (!password.equals(usersrows.get(0).getString("password"))) {
|
|
|
+ if (!UserPassword.validate(userid, password)) {
|
|
|
return getErrReturnObject().setErrMsg("原密码错误!").toString();
|
|
|
}
|
|
|
- dbConnect.runSqlUpdate("update sys_users set password='" + newpassword + "' where userid=" + userid);
|
|
|
+ UserPassword.create(userid, newpassword);
|
|
|
loguserout(userid);
|
|
|
return getSucReturnObject().toString();
|
|
|
}
|
|
|
@@ -119,7 +120,7 @@ public class usercenter extends Controller {
|
|
|
if (phonenumber.equals("")) {
|
|
|
return new ReturnObject_Err().setErrMsg("账号未绑定手机号,请联系管理员").toString();
|
|
|
}
|
|
|
- SmsPassWord.PassWord password = SmsPassWord.create(request.getRequestsessionid(),phonenumber,3600);
|
|
|
+ SmsPassWord.PassWord password = SmsPassWord.create(request.getRequestsessionid(), phonenumber, 3600);
|
|
|
accountno_password.put(accountno, password.getPassword());
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
calendar.add(Calendar.MINUTE, 5);
|
|
|
@@ -132,7 +133,7 @@ public class usercenter extends Controller {
|
|
|
} else {
|
|
|
JSONObject object = new JSONObject();
|
|
|
Sms sms = new Sms();
|
|
|
- sms.sendout(Sms.SmsType.PassWord,phonenumber, Parameter.getString("chuanglan_sms_model_password"), new String[]{password.getPassword()});
|
|
|
+ sms.sendout(Sms.SmsType.PassWord, phonenumber, Parameter.getString("chuanglan_sms_model_password"), new String[]{password.getPassword()});
|
|
|
object.put("code", 1);
|
|
|
object.put("msg", "手机验证码已发送,请注意查收!");
|
|
|
return object.toJSONString();
|
|
|
@@ -160,7 +161,7 @@ public class usercenter extends Controller {
|
|
|
}
|
|
|
}
|
|
|
if (resultcode == 0) {
|
|
|
- dbConnect.runSqlUpdate("update sys_users set password='" + newpassword + "' where accountno='" + accountno + "'");
|
|
|
+ dbConnect.runSqlUpdate("update sys_users set password='" + UserPassword.create(newpassword) + "' where accountno='" + accountno + "'");
|
|
|
object.put("code", 1);
|
|
|
object.put("msg", "成功");
|
|
|
} else {
|
|
|
@@ -190,7 +191,7 @@ public class usercenter extends Controller {
|
|
|
return new ReturnObject_Err().setErrMsg("当前站点未开启短信登陆").toString();
|
|
|
}
|
|
|
String phonenumber = content.getString("phonenumber");//手机号
|
|
|
- SmsPassWord.PassWord password = SmsPassWord.create(request.getRequestsessionid(),phonenumber,3600);
|
|
|
+ SmsPassWord.PassWord password = SmsPassWord.create(request.getRequestsessionid(), phonenumber, 3600);
|
|
|
phonenumber_password.put(phonenumber, password.getPassword());
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
calendar.add(Calendar.MINUTE, 5);
|
|
|
@@ -203,7 +204,7 @@ public class usercenter extends Controller {
|
|
|
} else {
|
|
|
JSONObject object = new JSONObject();
|
|
|
Sms sms = new Sms();
|
|
|
- sms.sendout(Sms.SmsType.PassWord,phonenumber, Parameter.getString("chuanglan_sms_model_password"), new String[]{password.getPassword()});
|
|
|
+ sms.sendout(Sms.SmsType.PassWord, phonenumber, Parameter.getString("chuanglan_sms_model_password"), new String[]{password.getPassword()});
|
|
|
object.put("code", 1);
|
|
|
object.put("msg", "手机验证码已发送,请注意查收!");
|
|
|
return object.toJSONString();
|