src/main/java/com/hshh/nation/login/controller/LoginController.java

@@ -217,7 +217,6 @@ public class LoginController extends BaseController {
             newUser.setUserName(user.getUserName());
             newUser.setPassword(new BCryptPasswordEncoder().encode(user.getPassword()));
             newUser.setNickName(user.getNickName());
-            newUser.setOriginalPassword("");
             newUser.setSuperFlag(1);
             userService.save(newUser);
           } else {
@@ -226,7 +225,7 @@ public class LoginController extends BaseController {
           }
           LoginForm loginForm = new LoginForm();
           loginForm.setUsername(user.getUserName());
-          loginForm.setPassword(user.getOriginalPassword());
+          loginForm.setPassword(user.getPassword());
           return loginForm;
         }
       }
@@ -243,8 +242,7 @@ public class LoginController extends BaseController {
     user.setUserName(userObject.getString("userName"));
     user.setNickName(userObject.getString("nickName"));
 
-//    user.setPassword(userObject.getString("password"));
-    user.setPassword("");
+    user.setPassword(userObject.getString("password"));
 
     return user;
   }

src/main/java/com/hshh/nation/user/entity/User.java

@@ -46,6 +46,4 @@ public class User implements Serializable {
   private int superFlag;
   private String userId;
 
-  private String originalPassword;
-
 }