消费端加入sudo

720yun_fd_consumer/gis_consumer_oss/src/main/java/com/gis/oss/command/CmdConstant.java

@@ -43,5 +43,5 @@ public class CmdConstant {
      *
      *  sudo bash /opt/ossutil/fyun-upload.sh test-4dkankan /root/data test_2/data aws folder
      */
-    public final static String UPLOAD_DIR = "bash /opt/ossutil/fyun-upload.sh %s %s %s %s folder";
+    public final static String UPLOAD_DIR = "sudo bash /opt/ossutil/fyun-upload.sh %s %s %s %s folder";
 }

720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/ErrorEnum.java

@@ -14,6 +14,9 @@ public enum ErrorEnum {
 //    FAILURE_SYS_2001(2001, "对象不存在"),
     FAILURE_SYS_2020(2020, "appId为空"),
     FAILURE_SYS_2021(2021, "appId解析有误"),
+    FAILURE_SYS_5001(5001, "token为空"),
+    FAILURE_SYS_5002(5002, "redis token不存在"),
+    FAILURE_SYS_5003(5003, "token invalid(无效)"),
 
     // 201X -> 权限问题类
 //    FAILURE_SYS_2011(2011, "没有操作权限"),
@@ -22,7 +25,7 @@ public enum ErrorEnum {
     FAILURE_SYS_3001(3001, "对象不存在"),
 
     // 301X -> 权限问题类
-    FAILURE_SYS_3010(3010, "Token为空"),
+//    FAILURE_SYS_3010(3010, "Token为空"),
     FAILURE_SYS_3011(3011, "没有操作权限"),
 //    FAILURE_CODE_3001(3001, "缺少必要参数"),
 //    FAILURE_CODE_3002(3002, "访问异常!"),

720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/MyRealm.java

@@ -1,5 +1,6 @@
 package com.gis.common.shiro;
 
+import com.gis.common.constant.ErrorEnum;
 import com.gis.common.exception.JwtAuthenticationException;
 import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
@@ -74,19 +75,17 @@ public class MyRealm extends AuthorizingRealm {
 
         if (StringUtils.isBlank(token)) {
             log.error("header token is null ");
-            throw new JwtAuthenticationException(5001, "header token is null");
+            throw new JwtAuthenticationException(ErrorEnum.FAILURE_SYS_5001.code(), "header token is null");
         }
 
 
         // 这里redis的key是token， value是用户信息，所以只要有返回结果，就算是验证通过
         String tokenKey = "token#" + token;
-        // String redisToken = redisTemplate.opsForValue().get(tokenKey);
-//        Boolean aBoolean = redisTemplate.hasKey(tokenKey);
 
         // 2022-11-04 四维看看v4 用户登录key:token#token  , value: 用户信息jsonStr
         if (!redisTemplate.hasKey(tokenKey)) {
             log.error("redis token is null");
-            throw new JwtAuthenticationException(5001, "redis token is null");
+            throw new JwtAuthenticationException(ErrorEnum.FAILURE_SYS_5002.code(), ErrorEnum.FAILURE_SYS_5002.message());
 
         }
 
@@ -95,7 +94,7 @@ public class MyRealm extends AuthorizingRealm {
         String username = JwtUtil.getUsername(token);
         if (username == null) {
             log.error("error token username");
-            throw new JwtAuthenticationException(5001, "token invalid");
+            throw new JwtAuthenticationException(ErrorEnum.FAILURE_SYS_5003.code(), "token invalid");
         }
 
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -500,7 +500,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         HashMap<String, String> headers = new HashMap<>();
         String token = getToken();
         if (StringUtils.isBlank(token)) {
-            return Result.failure(ErrorEnum.FAILURE_SYS_3010.code(), "token无空");
+            return Result.failure(ErrorEnum.FAILURE_SYS_5001.code(), "token无空");
         }
         headers.put("token", token);
         String restResult = null;

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkController.java

@@ -109,14 +109,14 @@ public class WorkController extends BaseController {
         String token = getToken();
         if (token == null) {
             log.error("token is null");
-            return Result.failure(5001, "Token为空");
+            return Result.failure(ErrorEnum.FAILURE_SYS_5001.code(), ErrorEnum.FAILURE_SYS_5001.message());
         }
 
         String redisKey = "token#"+ token;
         String redisToken = redisTemplate.opsForValue().get(redisKey);
         if (redisToken == null) {
             log.error("redis token is null");
-            return Result.failure(5001, "Token无效");
+            return Result.failure(ErrorEnum.FAILURE_SYS_5002.code(), ErrorEnum.FAILURE_SYS_5002.message());
         }
 
         log.info("查找作品id: {}", workId);