|
|
@@ -4,7 +4,7 @@ import com.template.annotation.PassToken;
|
|
|
import com.template.api.LoginControllerAPI;
|
|
|
import com.template.model.enumModel.eStatu;
|
|
|
import com.template.model.pojo.RepairAdmin;
|
|
|
-import com.template.model.request.changePasswordRequest;
|
|
|
+import com.template.model.pojo.SmartUser;
|
|
|
import com.template.model.request.loginRequest;
|
|
|
import com.template.model.result.CommonResult;
|
|
|
import com.template.model.vo.LoginVO;
|
|
|
@@ -106,8 +106,8 @@ public class LoginController implements LoginControllerAPI {
|
|
|
if(!encPassword.equals(result.getPassword())){
|
|
|
return CommonResult.fail("密码错误");
|
|
|
}
|
|
|
-
|
|
|
- String token = JWTUtil.getToken(result);
|
|
|
+ SmartUser user = new SmartUser();
|
|
|
+ String token = JWTUtil.getToken(user);
|
|
|
LoginVO login = new LoginVO();
|
|
|
login.setToken(token);
|
|
|
login.setTokenTtl(JWTUtil.getExpired());
|
|
|
@@ -128,7 +128,7 @@ public class LoginController implements LoginControllerAPI {
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public CommonResult ChangePassword(changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
|
|
|
+ public CommonResult ChangePassword(com.repair.model.request.changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
String st = paramUtils.getParamError(bindingResult);
|
|
|
return CommonResult.fail(st);
|