Browse Source

修改密码地址修改returnUrl修改

wangmh 7 years ago
parent
commit
5304c6af63

+ 2 - 2
src/main/java/com/uas/platform/b2b/controller/UserController.java

@@ -496,10 +496,10 @@ public class UserController {
 
 	@RequestMapping(value = "/getUrl", method = RequestMethod.GET, params = "_operate=updatePassword")
 	@ResponseBody
-	public ModelMap getUpdatePasswordUrl(HttpServletRequest request) {
+	public ModelMap getUpdatePasswordUrl(HttpServletRequest request, String returnUrl) {
 		ModelMap map = new ModelMap();
 		try {
-			map.put("url", SSOHelper.getUpdatePasswordUrl(request));
+			map.put("url", SSOHelper.getUpdatePasswordUrl(request, returnUrl));
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}

+ 1 - 1
src/main/webapp/resources/js/index/app.js

@@ -11389,7 +11389,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
         $scope.updatePassword = function () {
             var newPage = window.open("about:black");
-            AccountUser.getUpdatePasswordUrl({}, function (data) {
+            AccountUser.getUpdatePasswordUrl({returnUrl: window.location.href}, function (data) {
                 newPage.location.href = data.url;
             });
         };