feature: 令牌在线查询修改

dcuc-auth-api/src/main/java/com/dragoninfo/dcuc/auth/token/facade/IAuthTokenFacade.java

@@ -3,9 +3,7 @@ package com.dragoninfo.dcuc.auth.token.facade;
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustMessageRespVO;
 import com.dragoninfo.dcuc.auth.token.vo.TokenOnlineReqVo;
 import com.dragoninfo.dcuc.auth.token.vo.TokenOnlineRespVo;
-import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustMessageRespVO;
 import com.dragoninfo.dcuc.auth.token.vo.TokenReceiveVO;
-import com.dragoninfo.duceap.core.response.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -32,6 +30,6 @@ public interface IAuthTokenFacade {
      * @return
      */
     @PostMapping("tokenOnlineQuery")
-    Result<TokenOnlineRespVo> tokenOnlineQuery(@RequestBody TokenOnlineReqVo reqVo);
+    TokenOnlineRespVo tokenOnlineQuery(@RequestBody TokenOnlineReqVo reqVo);
 
 }

dcuc-auth-model/pom.xml

@@ -27,10 +27,5 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.dragoninfo</groupId>
-            <artifactId>dcuc-common</artifactId>
-            <version>2.1.0-tjdsj-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/business/impl/zerotrust/AuthTokenBusinessImpl.java

@@ -65,6 +65,8 @@ public class AuthTokenBusinessImpl implements IAuthTokenBusiness {
 
     private SMFactory smFactory;
 
+    private IAuthTokenBusiness tokenBusiness;
+
     @Autowired
     public void setSmFactory(SMFactory smFactory) {
         this.smFactory = smFactory;
@@ -203,12 +205,12 @@ public class AuthTokenBusinessImpl implements IAuthTokenBusiness {
 
 
     @Override
-    public Result<TokenOnlineRespVo> tokenOnlineQuery(TokenOnlineReqVo reqVo) {
+    public TokenOnlineRespVo tokenOnlineQuery(TokenOnlineReqVo reqVo) {
         TokenOnlineRespVo respVo = new TokenOnlineRespVo();
         String userTokenId = reqVo.getUserTokenId();
         String appTokenId = reqVo.getAppTokenId();
         if (StringUtils.isNotBlank(userTokenId)) {
-            UserTokenInfoRespVO userToken = cacheBusiness.getUserToken(userTokenId);
+            UserTokenInfoRespVO userToken = tokenBusiness.getUserTokenInfo(userTokenId);
             if (null != userToken) {
                 respVo.setUserTokenOnline(TokenActionEnum.ONLINE.getLabel());
             } else {
@@ -216,14 +218,14 @@ public class AuthTokenBusinessImpl implements IAuthTokenBusiness {
             }
         }
         if (StringUtils.isNotBlank(appTokenId)) {
-            AppTokenInfoRespVO appToken = cacheBusiness.getAppToken(appTokenId);
+            AppTokenInfoRespVO appToken = tokenBusiness.getAppTokenInfo(appTokenId);
             if (null != appToken) {
                 respVo.setAppTokenOnline(TokenActionEnum.ONLINE.getLabel());
             } else {
                 respVo.setAppTokenOnline(TokenActionEnum.OFFLINE.getLabel());
             }
         }
-        return Result.success(respVo);
+        return respVo;
     }
 
 

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/business/zerotrust/IAuthTokenBusiness.java

@@ -1,10 +1,8 @@
 package com.dragoninfo.dcuc.auth.business.zerotrust;
 
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustMessageRespVO;
-import com.dragoninfo.dcuc.auth.token.vo.AppTokenInfoRespVO;
-import com.dragoninfo.dcuc.auth.token.vo.TokenDetailRespVo;
-import com.dragoninfo.dcuc.auth.token.vo.TokenReceiveVO;
-import com.dragoninfo.dcuc.auth.token.vo.UserTokenInfoRespVO;
+import com.dragoninfo.dcuc.auth.token.vo.*;
+import com.dragoninfo.duceap.core.response.Result;
 
 /**
  * @author mazq
@@ -51,5 +49,5 @@ public interface IAuthTokenBusiness {
      * @param reqVo
      * @return
      */
-    Result<TokenOnlineRespVo> tokenOnlineQuery(TokenOnlineReqVo reqVo);
+    TokenOnlineRespVo tokenOnlineQuery(TokenOnlineReqVo reqVo);
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/token/facade/AuthTokenFacade.java

@@ -2,6 +2,8 @@ package com.dragoninfo.dcuc.auth.token.facade;
 
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustMessageRespVO;
 import com.dragoninfo.dcuc.auth.business.zerotrust.IAuthTokenBusiness;
+import com.dragoninfo.dcuc.auth.token.vo.TokenOnlineReqVo;
+import com.dragoninfo.dcuc.auth.token.vo.TokenOnlineRespVo;
 import com.dragoninfo.dcuc.auth.token.vo.TokenReceiveVO;
 import com.dragoninfo.duceap.core.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +31,7 @@ public class AuthTokenFacade implements IAuthTokenFacade {
     }
 
     @Override
-    public Result<TokenOnlineRespVo> tokenOnlineQuery(TokenOnlineReqVo reqVo) {
+    public TokenOnlineRespVo tokenOnlineQuery(TokenOnlineReqVo reqVo) {
         return tokenBusiness.tokenOnlineQuery(reqVo);
     }