diff --git a/pom.xml b/pom.xml index e7f3555..b996971 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ cn.chjyj szwh - 1.0.2 + 1.0.1 jar szwh 深圳文化交易所api系统 diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java index 183d86d..bb1537f 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -74,15 +76,20 @@ public class AdminUserController extends BaseController { String token = request.getHeader("token"); String murl= request.getHeader("url"); + List retlist = new ArrayList(); + //解析token中到信息 DecodedJWT decode = JWT.decode(token); - //String payload = JWT.decode(token).getClaim("accountId").asString(); - //JSONObject json = JSONObject.parseObject(payload); + retlist.add(decode.getPayload()); String accountid = decode.getClaim("accountId").asString(); + // 用户权限 + Map auth = loginService.checkUser(accountid,murl,token); + Map retmap = new HashMap(); + retmap.put("auth",auth); + retlist.add(retmap); - Map retmap = loginService.checkUser(accountid,murl,token); - jsonObject.put("code",retmap.get("code")); - jsonObject.put("data",retmap.get("data")); - jsonObject.put("msg",retmap.get("msg")); + jsonObject.put("code",200); + jsonObject.put("data",retlist); + jsonObject.put("msg","成功"); return jsonObject; } }