Commit 1de40ae4 by 胡懿

去除平台的验证,

parent 3fdf2083
...@@ -54,51 +54,55 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { ...@@ -54,51 +54,55 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
throws ServletException, IOException { throws ServletException, IOException {
MyReadApplicationUtils.readApplication(); MyReadApplicationUtils.readApplication();
String pdToken = request.getHeader("pdToken"); boolean b = false; // 是否有别的平台的认证
StringBuffer requestURL = request.getRequestURL(); if (b) {
stringRedisTemplate.opsForValue().set("pdToken", pdToken); String pdToken = request.getHeader("pdToken");
StringBuffer requestURL = request.getRequestURL();
stringRedisTemplate.opsForValue().set("pdToken", pdToken);
// System.out.println(requestURL.toString()); // System.out.println(requestURL.toString());
if (requestURL.toString().contains("system/") || requestURL.toString().contains("get-by-website") || requestURL.toString().contains("checkPdToken") || requestURL.toString().contains("initIotDBDatabase")) { if (requestURL.toString().contains("system/") || requestURL.toString().contains("get-by-website") || requestURL.toString().contains("checkPdToken") || requestURL.toString().contains("initIotDBDatabase")) {
} else {
if (StrUtil.isBlank(pdToken)) {
CommonResult<?> result = new CommonResult<>();
result.setCode(403);
result.setMsg("未登录");
ServletUtils.writeJSON(response, result);
return;
} else { } else {
if (StrUtil.isBlank(pdToken)) {
Map<String, String> headers = new HashMap<>(); CommonResult<?> result = new CommonResult<>();
headers.put("appkey", MyReadApplicationUtils.getAppkey()); result.setCode(403);
headers.put("Authorization", pdToken); result.setMsg("未登录");
String rStr = MyHttpTwoUtils.get(MyReadApplicationUtils.getUserByToken(), headers, null); ServletUtils.writeJSON(response, result);
PtResult<LoginUserInfo> result = JSON.parseObject(rStr, new TypeReference<PtResult<LoginUserInfo>>() {}); return;
if (null == result || result.getCode() != 200) {
CommonResult<?> result1 = new CommonResult<>();
result1.setCode(403);
result1.setMsg("未登录");
ServletUtils.writeJSON(response, result1);
return ;
} else if (null == result || result.getCode() == 5001) {
CommonResult<?> result1 = new CommonResult<>();
result1.setCode(402);
result1.setMsg("Token无效");
ServletUtils.writeJSON(response, result1);
return ;
} else { } else {
LoginUserInfo data = result.getData();
String accessToken = data.getAccessToken(); Map<String, String> headers = new HashMap<>();
String refreshToken = data.getRefreshToken(); headers.put("appkey", MyReadApplicationUtils.getAppkey());
stringRedisTemplate.opsForValue().set("pdToken", accessToken); headers.put("Authorization", pdToken);
stringRedisTemplate.opsForValue().set("refreshToken", refreshToken); String rStr = MyHttpTwoUtils.get(MyReadApplicationUtils.getUserByToken(), headers, null);
stringRedisTemplate.opsForValue().set("pdUserInfo", JSON.toJSONString(data)); PtResult<LoginUserInfo> result = JSON.parseObject(rStr, new TypeReference<PtResult<LoginUserInfo>>() {});
if (null == result || result.getCode() != 200) {
CommonResult<?> result1 = new CommonResult<>();
result1.setCode(403);
result1.setMsg("未登录");
ServletUtils.writeJSON(response, result1);
return ;
} else if (null == result || result.getCode() == 5001) {
CommonResult<?> result1 = new CommonResult<>();
result1.setCode(402);
result1.setMsg("Token无效");
ServletUtils.writeJSON(response, result1);
return ;
} else {
LoginUserInfo data = result.getData();
String accessToken = data.getAccessToken();
String refreshToken = data.getRefreshToken();
stringRedisTemplate.opsForValue().set("pdToken", accessToken);
stringRedisTemplate.opsForValue().set("refreshToken", refreshToken);
stringRedisTemplate.opsForValue().set("pdUserInfo", JSON.toJSONString(data));
}
} }
}
// return; // return;
}
} }
String token = SecurityFrameworkUtils.obtainAuthorization(request, String token = SecurityFrameworkUtils.obtainAuthorization(request,
securityProperties.getTokenHeader(), securityProperties.getTokenParameter()); securityProperties.getTokenHeader(), securityProperties.getTokenParameter());
if (StrUtil.isNotEmpty(token)) { if (StrUtil.isNotEmpty(token)) {
......
...@@ -82,7 +82,8 @@ public class AuthController { ...@@ -82,7 +82,8 @@ public class AuthController {
@PermitAll @PermitAll
@Operation(summary = "验证平台token") @Operation(summary = "验证平台token")
public CommonResult<PtResult<LoginUserInfo>> checkPdToken(String code, String redirect_uri) { public CommonResult<PtResult<LoginUserInfo>> checkPdToken(String code, String redirect_uri) {
if (null != code && !"".equals(code)) { boolean b = false;
if (null != code && !"".equals(code) && b) {
return CommonResult.success(authService.checkPdToken(code, redirect_uri)); return CommonResult.success(authService.checkPdToken(code, redirect_uri));
} }
......
...@@ -132,8 +132,8 @@ spring: ...@@ -132,8 +132,8 @@ spring:
# virtual-host: / # virtual-host: /
# Kafka 配置项,对应 KafkaProperties 配置类 # Kafka 配置项,对应 KafkaProperties 配置类
kafka: kafka:
# bootstrap-servers: 192.168.19.128:9092 bootstrap-servers: 192.168.19.128:9092
bootstrap-servers: 59.195.13.208:9092 # bootstrap-servers: 59.195.13.208:9092
producer: producer:
retries: 3 retries: 3
request.timeout.ms: 60000 request.timeout.ms: 60000
......
...@@ -3,8 +3,8 @@ spring: ...@@ -3,8 +3,8 @@ spring:
name: yudao-server name: yudao-server
profiles: profiles:
active: local # active: local
# active: dev active: dev
main: main:
allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。 allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment