diff --git a/src/main/java/com/m2pool/lease/config/LoginInterceptor.java b/src/main/java/com/m2pool/lease/config/LoginInterceptor.java index 598e8f6..2bb340c 100644 --- a/src/main/java/com/m2pool/lease/config/LoginInterceptor.java +++ b/src/main/java/com/m2pool/lease/config/LoginInterceptor.java @@ -65,6 +65,7 @@ public class LoginInterceptor implements HandlerInterceptor { * 验证token 并刷新token */ private boolean isValidToken(String token) { + System.out.println("token:"+token); String userEmail = JwtUtils.getUserName(token); String getUserId = JwtUtils.getUserId(token); //1.把userEmail存入ThreadLocal 本地线程变量中 diff --git a/src/main/java/com/m2pool/lease/controller/LeaseUserController.java b/src/main/java/com/m2pool/lease/controller/LeaseUserController.java index e0da72a..beb2ce7 100644 --- a/src/main/java/com/m2pool/lease/controller/LeaseUserController.java +++ b/src/main/java/com/m2pool/lease/controller/LeaseUserController.java @@ -101,12 +101,14 @@ public class LeaseUserController { } @GetMapping("/downloadClient") + @LoginRequired(value = false) @ApiOperation(value = "卖家:下载客户端") public void downloadClient(@RequestParam String userEmail,@RequestParam String type,HttpServletRequest request, HttpServletResponse response){ leaseUserService.downloadClient(userEmail,type,request, response); } @GetMapping("/getClientVersion") + @LoginRequired(value = false) @ApiOperation(value = "获取客户端版本号") public String getClientVersion(){ return leaseUserService.getClientVersion(); diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java index 13c7502..da12ee1 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java @@ -1470,7 +1470,8 @@ public class LeaseUserServiceImpl extends ServiceImpl() .select(LeaseShop::getUserEmail) - .eq(LeaseShop::getUserEmail, userEmail)); + .eq(LeaseShop::getUserEmail, userEmail) + .eq(LeaseShop::getDel,false)); if (leaseShop == null){ throw new RuntimeException("下载失败,下载客户端权限,请重新登录并创建店铺"); @@ -1512,7 +1513,13 @@ public class LeaseUserServiceImpl extends ServiceImpl !Files.isDirectory(path))