Browse Source

与账户中心数据对接

liusw 8 years ago
parent
commit
90ee5df75c

+ 13 - 0
src/main/java/com/uas/platform/b2c/common/account/v2/controller/UserController.java

@@ -1,7 +1,13 @@
 package com.uas.platform.b2c.common.account.v2.controller;
 package com.uas.platform.b2c.common.account.v2.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.uas.account.entity.User;
 import com.uas.account.entity.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
+import com.uas.sso.SSOHelper;
+import com.uas.sso.SSOToken;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -39,4 +45,11 @@ public class UserController {
     public void removeUser(@PathVariable Long uu) {
     public void removeUser(@PathVariable Long uu) {
         userService.delete(uu);
         userService.delete(uu);
     }
     }
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public void login(HttpServletRequest request,HttpServletResponse response,User user,String lastLoginTime){
+				SSOToken st = new SSOToken(request, user.getUid());
+				st.setData(JSON.toJSONString(user));
+				SSOHelper.setSSOCookie(request, response, st, true);
+		}
 }
 }

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -1013,7 +1013,7 @@ define(['app/app'], function(app) {
         $scope.ok = function () {
         $scope.ok = function () {
         	var arr = [];
         	var arr = [];
         	for(var key in $scope.uq){
         	for(var key in $scope.uq){
-            $scope.uq[key].sort= Integer.parseInt(key)+1;
+            $scope.uq[key].sort= Number(key)+1;
 							arr[key]=$scope.uq[key];
 							arr[key]=$scope.uq[key];
 					}
 					}
             User.updateUserQuestion({},arr, function(){
             User.updateUserQuestion({},arr, function(){