修复tokenUtils

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/ErpDataController.java

@@ -41,9 +41,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getPsy")
     public Result getPsy(@RequestParam(value = "accessToken") String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
@@ -64,9 +61,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getReEstrusRate")
     public Result getReEstrusRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken") String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
@@ -87,9 +81,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getParturitionRate")
     public Result getParturitionRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
@@ -110,9 +101,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getStorage")
     public Result getStorage(@RequestParam(value = "accessToken") String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
@@ -133,9 +121,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getPigletInfo")
     public Result getPigletInfo(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken") String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
@@ -156,9 +141,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getMateQuantity")
     public Result getMateQuantity(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken") String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
@@ -180,9 +162,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getConceptionRate")
     public Result getConceptionRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken") String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
@@ -203,9 +182,6 @@ public class ErpDataController {
      */
     @RequestMapping("/getAllStorage")
     public Result getAllStorage(@RequestParam(value = "accessToken",required = false) String accessToken){
-        if(StringUtils.isBlank(accessToken)){
-            return new Result(10001,"token不能为空.",false);
-        }
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/utils/TokenUtil.java

@@ -9,6 +9,7 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.huimv.common.result.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -76,6 +77,9 @@ public class TokenUtil {
      * @Time        : 18:53
      */
     public Result verifyToken(String token) {
+        if(StringUtils.isBlank(token)){
+            return new Result(10001,"token不能为空.",false);
+        }
         try {
             JWTVerifier verifier = JWT.require(Algorithm.HMAC256(TOKEN_SECRET))
                     .withIssuer("auth0").build();