Test_Project_Web/e5
1
0
Fork 0
mirror of https://github.com/luoye663/e5.git synced 2024-12-26 19:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

备份

Browse Source
This commit is contained in:
APLS 2020-03-10 23:18:24 +08:00
parent 8d6df46e2d
commit 8aced448b4
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/io/qyi/e5/outlook/service/impl/OutlookServiceImpl.java
View File

@ -13,11 +13,14 @@ import io.qyi.e5.outlook.service.IOutlookService;
import io.qyi.e5.outlook_log.service.IOutlookLogService; import io.qyi.e5.outlook_log.service.IOutlookLogService;
import io.qyi.e5.util.netRequest.OkHttpClientUtil; import io.qyi.e5.util.netRequest.OkHttpClientUtil;
import io.qyi.e5.util.netRequest.OkHttpRequestUtils; import io.qyi.e5.util.netRequest.OkHttpRequestUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -37,6 +40,9 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
@Autowired @Autowired
IOutlookLogService outlookLogService; IOutlookLogService outlookLogService;
@Value("${outlook.errorMsg}")
private String[] errorMsg;
// 2020-03-2 10:38 这里需要进行查询判断数据库是否有内容再进行插入。 // 2020-03-2 10:38 这里需要进行查询判断数据库是否有内容再进行插入。
@Override @Override
@ -79,7 +85,7 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
} }
QueryWrapper<Outlook> queryWrapper = new QueryWrapper<>(); QueryWrapper<Outlook> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("github_id", github_id) queryWrapper.eq("github_id", github_id)
.or().eq("client_id",client_id); .or().eq("client_id", client_id);
Outlook outlook1 = baseMapper.selectOne(queryWrapper); Outlook outlook1 = baseMapper.selectOne(queryWrapper);
// 有数据 // 有数据
if (outlook1 != null) { if (outlook1 != null) {
@ -118,10 +124,11 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
if (json.containsKey("error")) { if (json.containsKey("error")) {
String code = json.getJSONObject("error").getString("code"); String code = json.getJSONObject("error").getString("code");
String message = json.getJSONObject("error").getString("message"); String message = json.getJSONObject("error").getString("message");
if (!("Access token has expired.".equals(message) || "Access token validation failure.".equals(message))) { if (!errorCheck(message)) {
outlookLogService.addLog(outlook.getGithubId(), "无法刷新令牌!code:3", "0", json.getJSONObject("error").getString("message")); outlookLogService.addLog(outlook.getGithubId(), "无法刷新令牌!code:3", "0", message);
return false; return false;
} }
// CompactToken validation failed with reason code: 80049228
logger.info("令牌过期!"); logger.info("令牌过期!");
String token = refresh_token(outlook); String token = refresh_token(outlook);
@ -192,4 +199,23 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
return null; return null;
} }
} }
/**
* 检查出现的错误是否能够刷新令牌
*
* @throws
* @title errorCheck
* @description
* @author 落叶随风
* @updateTime 2020/3/5 14:47
*/
public boolean errorCheck(String msg) {
System.out.println(Arrays.toString(errorMsg));
for (String s : errorMsg) {
if (msg.indexOf(s) != -1) {
return true;
}
}
return false;
}
} }

20
src/test/java/io/qyi/e5/string/dome01.java Normal file
View File

@ -0,0 +1,20 @@
package io.qyi.e5.string;
import org.junit.jupiter.api.Test;
/**
* @program: e5
* @description:
* @author: 落叶随风
* @create: 2020-03-05 17:09
**/
public class dome01 {
@Test
public void test01(){
String[] s = new String[]{"CompactToken validation", "Access token has expired.", "Access token validation failure"};
String msg = "Access token has expired.";
System.out.println(s[1]);
System.out.println(msg.indexOf(s[1]));
}
}