update

src/main/java/com/qiankun/controller/UserController.java

@@ -10,13 +10,11 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.qiankun.utils.JwtTokenUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.qiankun.annotation.Auth;
@@ -35,6 +33,8 @@ public class UserController extends BaseController<Object>{
     
     @Autowired
 	private UserService userService;
+    @Autowired
+    private JwtTokenUtil tokenUtil;
     
     
     
@@ -119,7 +119,7 @@ public class UserController extends BaseController<Object>{
     
     @Auth(verifyLogin = false,verifyURL = false)
     @RequestMapping(value = "/wx/api/user/save",method = RequestMethod.POST)
-    public Map<String,Object> saveUserFormWX(@RequestParam UserVo userVo, HttpServletResponse response, HttpServletRequest request) throws Exception{   	
+    public @ResponseBody Map<String,Object> saveUserFormWX(@RequestBody UserVo userVo, HttpServletResponse response, HttpServletRequest request) throws Exception{
     	return this.saveUser(userVo, response, request);
     }
     
@@ -181,6 +181,7 @@ public class UserController extends BaseController<Object>{
 
     	user.setUserName(userVo.getMobile());
         user.setName(userVo.getName());
+        user.setOpenid(userVo.getOpenid());
         user.setGender(userVo.getGender());
         user.setBirthday(userVo.getBirthday());
         user.setPaperType(userVo.getPaperType());
@@ -231,6 +232,7 @@ public class UserController extends BaseController<Object>{
     	
         User u = userService.save(user);
         map.put("user", u);
+        map.put("sKey",tokenUtil.generateToken(u.getOpenid()));
         return map;
     }
     

src/main/java/com/qiankun/controller/mdp/MdpController.java

@@ -81,6 +81,7 @@ public class MdpController {
             }else {
                 user.setOpenid(vo.getOpenid());
                 userService.save(user);
+                result.put("sKey",tokenUtil.generateToken(user.getOpenid()));
                 result.put("userInfo",user);
             }
             result.put("isExist",true);
@@ -88,4 +89,15 @@ public class MdpController {
         return result;
     }
 
+    @Auth(verifyLogin = false,verifyURL = false)
+    @RequestMapping(value = "/userInfo",method = RequestMethod.GET)
+    public User getUserInfo(@RequestHeader String sKey){
+        if (Strings.isNullOrEmpty(sKey)){
+            throw new IllegalArgumentException("请求参数错误");
+        }
+        String openid = tokenUtil.getUsernameFromToken(sKey);
+        User user = userService.findByOpenid(openid);
+        return user;
+    }
+
 }

src/main/java/com/qiankun/vo/UserVo.java

@@ -5,7 +5,7 @@ import java.util.Date;
 public class UserVo {
 	
 	private String id;
-    
+
 	private String userCode;
     private String userName; 	  //用户名
     private String name;          //姓名