瀏覽代碼

修改token抓取逻辑

yumeng 3 年之前
父節點
當前提交
4c4380f4cf

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IOauthAgentTokenService.java

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IOauthAgentTokenService extends IService<OauthAgentToken> {
 
+    OauthAgentToken getTokenByAppId(Long appId);
 }

+ 20 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -5,6 +5,7 @@ import cn.com.ctop.common.module.entity.OauthAgentToken;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.mapper.OauthAgentTokenMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IOauthAgentTokenService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.common.module.utils.PropertiesUtils;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.context.XxlJobHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -45,12 +47,21 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
     @Resource
     private OauthAgentTokenMapper agentTokenMapper;
 
+    @Autowired
+    private IOauthAgentTokenService agentTokenService;
     @Override
     public CtopOauthToken getOauthTokenByAccountId(String accountId) {
         QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account_id", accountId).orderByDesc("create_time");
         queryWrapper.last("limit 1");
-        return this.getOne(queryWrapper);
+        CtopOauthToken one = this.getOne(queryWrapper);
+        if (one.getMediaId().equals("2") || one.getMediaId().equals("4")) {
+            OauthAgentToken tokenByAppId = agentTokenService.getTokenByAppId(one.getAppId());
+            if (!Check.isNull(tokenByAppId)) {
+                one.setAccessToken(tokenByAppId.getAccessToken());
+            }
+        }
+        return one;
     }
 
 
@@ -59,7 +70,14 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account_id", accountId).orderByDesc("create_time");
         queryWrapper.last("limit 1");
-        return this.getOne(queryWrapper);
+        CtopOauthToken one = this.getOne(queryWrapper);
+        if (one.getMediaId().equals("2") || one.getMediaId().equals("4")) {
+            OauthAgentToken tokenByAppId = agentTokenService.getTokenByAppId(one.getAppId());
+            if (!Check.isNull(tokenByAppId)) {
+                one.setAccessToken(tokenByAppId.getAccessToken());
+            }
+        }
+        return one;
     }
 
     /**

+ 9 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/OauthAgentTokenServiceImpl.java

@@ -3,6 +3,7 @@ package cn.com.ctop.common.module.service.impl;
 import cn.com.ctop.common.module.entity.OauthAgentToken;
 import cn.com.ctop.common.module.mapper.OauthAgentTokenMapper;
 import cn.com.ctop.common.module.service.IOauthAgentTokenService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -16,4 +17,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class OauthAgentTokenServiceImpl extends ServiceImpl<OauthAgentTokenMapper, OauthAgentToken> implements IOauthAgentTokenService {
 
+    @Override
+    public OauthAgentToken getTokenByAppId(Long appId) {
+        QueryWrapper<OauthAgentToken> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("app_id",appId);
+        queryWrapper.last("limit 1");
+        OauthAgentToken one = this.getOne(queryWrapper);
+        return one;
+    }
 }