修改密码

@@ -19,6 +19,8 @@ public class BuildRequest implements Serializable {
 
 	private String branch;
 
+	private String user;
+
 	public String getTag() {
 		return tag;
 	}
@@ -74,4 +76,12 @@ public class BuildRequest implements Serializable {
 	public void setBranch(String branch) {
 		this.branch = branch;
 	}
+
+	public String getUser() {
+		return user;
+	}
+
+	public void setUser(String user) {
+		this.user = user;
+	}
 }

@@ -13,6 +13,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -90,8 +91,10 @@ public class ProjectBuildCtrl {
      */
     @RequestMapping(value = "build", method = RequestMethod.POST)
     @ResponseBody
-    public String build(@RequestBody BuildRequest request) {
+    public String build(@RequestBody BuildRequest request,HttpSession session) {
         try {
+            String user = String.valueOf(session.getAttribute("user"));
+            request.setUser(user);
             return httpRestClient.post(ProjectEnvironment.getUrl(request.getEnvironment()) + "build", request, String.class);
         } catch (Exception ex) {
             return "failed";

@@ -70,7 +70,7 @@ public class UserCtrl {
         Object obj = session.getAttribute("user");
         String username = String.valueOf(obj);
         if ("admin".equals(username) && !"admin".equals(name)) {
-            User user = userAuthLocal.getUserByname(username);
+            User user = userAuthLocal.getUserByname(name);
             if (user == null) {
                 model.addAttribute("message", "当前用户不存在");
                 return new ModelAndView("user/modifypwd");
@@ -78,10 +78,10 @@ public class UserCtrl {
             user.setPwd(MD5Util.encryption(newpwd));
             httpRestClient.defaultPost(HttpUriContants.USER_UPDATE_PWD, user, BaseResponse.class);
             userAuthLocal.flushUser(name);
-            return new ModelAndView("dashboard/dashBoard");
+            return new ModelAndView("dashBoard/dashBoard");
 
         } else if (name.equals(username)) {
-            User user = userAuthLocal.getUserByname(username);
+            User user = userAuthLocal.getUserByname(name);
             if (!user.getPwd().equals(MD5Util.encryption(oldpwd))) {
                 model.addAttribute("message", "旧密码错误");
                 return new ModelAndView("user/modifypwd");