代码更改

src/main/java/cn/chjyj/szwh/controller/admin/AdminIndexController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,21 +23,18 @@ public class AdminIndexController extends BaseController {
     private IndexService indexService;
 
     @PostMapping("/home")
-    public JSONObject home(@RequestParam("leftDate") String leftDate,
-                           @RequestParam("rightDate") String rightDate,
-                           @RequestParam("sale_ranking")String saleRanking,
-                           @RequestParam("saleRankingDate")String saleRankingDate){
+    public JSONObject home(HttpServletRequest request){
         // 拼装查询条件
-        Map<String,Object> queryMap = new HashMap<>();
-        queryMap.put("leftDate",leftDate);
-        queryMap.put("rightDate",rightDate);
-        queryMap.put("sale_ranking",saleRanking);
-        queryMap.put("saleRankingDate",saleRankingDate);
-        // 执行查询操作
-        Map result =indexService.getCountSys(queryMap);
+//        Map<String,Object> queryMap = new HashMap<>();
+//        queryMap.put("leftDate",leftDate);
+//        queryMap.put("rightDate",rightDate);
+//        queryMap.put("sale_ranking",saleRanking);
+//        queryMap.put("saleRankingDate",saleRankingDate);
+//        // 执行查询操作
+//        Map result =indexService.getCountSys(queryMap);
         // 拼装结果
         jsonObject.put("code",200);
-        jsonObject.put("data",result);
+//        jsonObject.put("data",result);
         return jsonObject;
     }
 }

src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java

@@ -6,6 +6,7 @@ import cn.chjyj.szwh.service.LoginService;
 import cn.chjyj.szwh.service.UserService;
 import com.alibaba.fastjson.JSONObject;
 import com.auth0.jwt.JWT;
+import com.auth0.jwt.interfaces.DecodedJWT;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -73,9 +74,10 @@ public class AdminUserController extends BaseController {
         String token = request.getHeader("token");
         String murl= request.getHeader("url");
 
-        String payload  = JWT.decode(token).getPayload();
-        JSONObject json = JSONObject.parseObject(payload);
-        String accountid = json.getString("accountId");
+        DecodedJWT decode = JWT.decode(token);
+        //String payload  = JWT.decode(token).getClaim("accountId").asString();
+        //JSONObject json = JSONObject.parseObject(payload);
+        String accountid = decode.getClaim("accountId").asString();
 
         Map retmap = loginService.checkUser(accountid,murl);
         jsonObject.put("code",retmap.get("code"));