|
@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.fdkankan.common.util.JwtUtil;
|
|
import com.fdkankan.common.util.JwtUtil;
|
|
|
|
+import com.fdkankan.ucenter.common.BaseController;
|
|
import com.fdkankan.ucenter.common.Result;
|
|
import com.fdkankan.ucenter.common.Result;
|
|
import com.fdkankan.ucenter.service.IUserService;
|
|
import com.fdkankan.ucenter.service.IUserService;
|
|
import com.fdkankan.ucenter.service.impl.LoginService;
|
|
import com.fdkankan.ucenter.service.impl.LoginService;
|
|
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/ucenter/user")
|
|
@RequestMapping("/ucenter/user")
|
|
-public class UserController {
|
|
|
|
|
|
+public class UserController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private IUserService userService;
|
|
private IUserService userService;
|
|
@@ -34,8 +35,8 @@ public class UserController {
|
|
* 获取用户信息
|
|
* 获取用户信息
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
|
|
- public Result getUserInfo( @RequestHeader String token) throws Exception {
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result getUserInfo() {
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
return Result.success(userService.getUserInfo(username));
|
|
return Result.success(userService.getUserInfo(username));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -53,8 +54,8 @@ public class UserController {
|
|
* imgdata 图片的base64码
|
|
* imgdata 图片的base64码
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/uploadHead", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/uploadHead", method = RequestMethod.POST)
|
|
- public Result uploadHead(@RequestBody JSONObject jsonObject, @RequestHeader String token) throws Exception {
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result uploadHead(@RequestBody JSONObject jsonObject) throws Exception {
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
return Result.success(userService.uploadHead(jsonObject.getString("imgdata"),username));
|
|
return Result.success(userService.uploadHead(jsonObject.getString("imgdata"),username));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -68,8 +69,8 @@ public class UserController {
|
|
* shipMobile 收货人手机
|
|
* shipMobile 收货人手机
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/insertAddress", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/insertAddress", method = RequestMethod.POST)
|
|
- public Result insertAddress(@RequestBody ShipAddressParam param, @RequestHeader String token){
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result insertAddress(@RequestBody ShipAddressParam param){
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
userService.insertAddress(param,username);
|
|
userService.insertAddress(param,username);
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|
|
@@ -87,8 +88,8 @@ public class UserController {
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/updateAddress", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateAddress", method = RequestMethod.POST)
|
|
|
|
|
|
- public Result updateAddress(@RequestBody ShipAddressParam param,@RequestHeader String token){
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result updateAddress(@RequestBody ShipAddressParam param){
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
userService.updateAddress(param,username);
|
|
userService.updateAddress(param,username);
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|
|
@@ -106,8 +107,8 @@ public class UserController {
|
|
* email 邮箱地址
|
|
* email 邮箱地址
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/updateEmail", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateEmail", method = RequestMethod.POST)
|
|
- public Result updateEmail(@RequestBody UserParam param,@RequestHeader String token){
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result updateEmail(@RequestBody UserParam param){
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
userService.updateEmail(param.getEmail(),username);
|
|
userService.updateEmail(param.getEmail(),username);
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|
|
@@ -116,8 +117,8 @@ public class UserController {
|
|
* 获取用户默认收货信息
|
|
* 获取用户默认收货信息
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/getReceiverInfo", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/getReceiverInfo", method = RequestMethod.POST)
|
|
- public Result getReceiverInfo(@RequestHeader String token){
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result getReceiverInfo(){
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
return Result.success(userService.getReceiverInfo(username));
|
|
return Result.success(userService.getReceiverInfo(username));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -125,8 +126,8 @@ public class UserController {
|
|
* 获取用户收货信息列表
|
|
* 获取用户收货信息列表
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/getReceiverList", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/getReceiverList", method = RequestMethod.POST)
|
|
- public Result getReceiverList(@RequestHeader String token){
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result getReceiverList(){
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
return Result.success(userService.getReceiverList(username));
|
|
return Result.success(userService.getReceiverList(username));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -135,8 +136,8 @@ public class UserController {
|
|
* nickName 用户昵称
|
|
* nickName 用户昵称
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/updateNickName", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateNickName", method = RequestMethod.POST)
|
|
- public Result updateNickName(@RequestBody UserParam param,@RequestHeader String token){
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result updateNickName(@RequestBody UserParam param){
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
userService.updateNickName(param.getNickName(),username);
|
|
userService.updateNickName(param.getNickName(),username);
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|
|
@@ -147,8 +148,8 @@ public class UserController {
|
|
* isNotice isNotice
|
|
* isNotice isNotice
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
|
|
- public Result updateUserDetail(@RequestBody UserParam param, @RequestHeader String token){
|
|
|
|
- String username = JwtUtil.getUsername(token);
|
|
|
|
|
|
+ public Result updateUserDetail(@RequestBody UserParam param){
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
userService.updateUserDetail(param,username);
|
|
userService.updateUserDetail(param,username);
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|