Commit c6105db2 by caosy

6.7.1

parent 08f556d9
...@@ -111,6 +111,8 @@ public class UserMController { ...@@ -111,6 +111,8 @@ public class UserMController {
@Autowired @Autowired
private UserInvoiceTitleMService userInvoiceTitleMService = null; private UserInvoiceTitleMService userInvoiceTitleMService = null;
@ResponseBody @ResponseBody
@RequestMapping(value = "/v1/users/setCookie", method = RequestMethod.GET, params = { "userDevice" }) @RequestMapping(value = "/v1/users/setCookie", method = RequestMethod.GET, params = { "userDevice" })
public String setCookie( public String setCookie(
...@@ -744,6 +746,7 @@ public class UserMController { ...@@ -744,6 +746,7 @@ public class UserMController {
if(userBean ==null){ if(userBean ==null){
return null; return null;
} }
Map<String, Comparable> mp = new HashMap<>(); Map<String, Comparable> mp = new HashMap<>();
mp.put("token", userQuery.getToken());// add by caosy mp.put("token", userQuery.getToken());// add by caosy
mp.put("address", userBean.getAddress()); mp.put("address", userBean.getAddress());
...@@ -799,6 +802,7 @@ public class UserMController { ...@@ -799,6 +802,7 @@ public class UserMController {
mp.put("occupation",userBean.getOccupation()); mp.put("occupation",userBean.getOccupation());
mp.put("hobby",userBean.getHobby()); mp.put("hobby",userBean.getHobby());
mp.put("golfLevel",userBean.getGolfLevel()); mp.put("golfLevel",userBean.getGolfLevel());
mp.put("userWorkerId", userBean.getUserWorkerId());
return mp; return mp;
} }
......
...@@ -454,3 +454,7 @@ uri.scorematch.recordUsers=/fun-golf-service/scorematch/recordUsers ...@@ -454,3 +454,7 @@ uri.scorematch.recordUsers=/fun-golf-service/scorematch/recordUsers
uri.scorematch.closeMatch=/fun-golf-service/scorematch/closeMatch uri.scorematch.closeMatch=/fun-golf-service/scorematch/closeMatch
uri.scorematch.detail=/fun-golf-service/scorematch/detail uri.scorematch.detail=/fun-golf-service/scorematch/detail
uri.scorematch.myMatchStatus=/fun-golf-service/scorematch/myMatchStatus uri.scorematch.myMatchStatus=/fun-golf-service/scorematch/myMatchStatus
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment