diff --git a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java index 92a89806..8aabc279 100644 --- a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java +++ b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java @@ -482,7 +482,7 @@ public class SecurityUtil { // redis token = IdUtil.simpleUUID(); tokenWorker = new TokenWorker(worker, saved); - String key = SecurityConstant.WORKER_TOKEN + tokenWorker.getWorkerName(); + String key = SecurityConstant.WORKER_TOKEN + tokenWorker.getWorkerId()+":"+tokenWorker.getWorkerName(); // 单平台登录 之前的token失效 if (appTokenProperties.getSpl()) { String oldToken = redisTemplate.get(key); diff --git a/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenWorker.java b/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenWorker.java index 8cca3e9d..a51d2262 100644 --- a/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenWorker.java +++ b/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenWorker.java @@ -29,6 +29,7 @@ public class TokenWorker implements UserDetails, Serializable { public TokenWorker(Worker worker,Boolean platform) { this.workerId = worker.getWorkerId(); + this.workerName = worker.getWorkerName(); this.platform = platform; } diff --git a/hiver-core/src/main/java/cc/hiver/core/config/security/jwt/TokenAuthenticationFilter.java b/hiver-core/src/main/java/cc/hiver/core/config/security/jwt/TokenAuthenticationFilter.java index c6d6a597..ee498c2e 100644 --- a/hiver-core/src/main/java/cc/hiver/core/config/security/jwt/TokenAuthenticationFilter.java +++ b/hiver-core/src/main/java/cc/hiver/core/config/security/jwt/TokenAuthenticationFilter.java @@ -215,7 +215,7 @@ public class TokenAuthenticationFilter extends BasicAuthenticationFilter { tokenWorker = new Gson().fromJson(v, TokenWorker.class); // 权限 // 重新设置失效时间 - redisTemplate.set(SecurityConstant.WORKER_TOKEN + tokenWorker.getWorkerName() + ":" + tokenWorker.getPlatform(), appYSHeader, appTokenProperties.getTokenExpireTime(), TimeUnit.DAYS); + redisTemplate.set(SecurityConstant.WORKER_TOKEN + tokenWorker.getWorkerName(), appYSHeader, appTokenProperties.getTokenExpireTime(), TimeUnit.DAYS); redisTemplate.set(SecurityConstant.TOKEN_WORKER_PRE + appYSHeader, v, appTokenProperties.getTokenExpireTime(), TimeUnit.DAYS); } else { // JWT @@ -235,7 +235,7 @@ public class TokenAuthenticationFilter extends BasicAuthenticationFilter { ResponseUtil.out(response, ResponseUtil.resultMap(false, 500, "解析token错误")); } } - if (tokenWorker != null && StrUtil.isNotBlank(tokenWorker.getWorkerName())) { + if (tokenWorker != null && StrUtil.isNotBlank(tokenWorker.getWorkerId())) { return new UsernamePasswordAuthenticationToken(tokenWorker, null, null); } return null; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java index 448c9cee..fe0b5b51 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java @@ -213,7 +213,7 @@ public class OrderController { * key值定义暂定以区域为类型进行查询 * * */ - @RequestMapping(value = "/app/getAll/{id}", method = RequestMethod.POST) + @RequestMapping(value = "/app/getAll/{id}", method = RequestMethod.GET) @ApiOperation(value = "获取可抢单订单列表-App") public Result> getAllList(@PathVariable String id) { Worker worker = workerService.findById(id); @@ -231,7 +231,7 @@ public class OrderController { OrderXd orderxd = new OrderXd(); BeanUtils.copyBeanProp(orderxd,orderVO); List list = orderService.findByCondition(orderxd); - return new ResultUtil>().setData(list); + return new ResultUtil>().setData(list,"查询成功"); } @RequestMapping(value = "/app/modifyOrder", method = RequestMethod.POST)