wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-31 18:10:14 +08:00
parent 28914c70f9 40279ba0d8
commit a2bd71734f
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java
View File

@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -77,6 +78,9 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
result.put("data", objects); result.put("data", objects);
return result; return result;
} catch (ResourceAccessException e) {
logger.error("青岛市资源数据接口连接超时！！！");
return null;
} catch (Exception e) { } catch (Exception e) {
logger.error("青岛市资源数据调用失败！！！", e); logger.error("青岛市资源数据调用失败！！！", e);
return null; return null;

9
renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoXHADataResourceService.java
View File

@ -11,6 +11,7 @@ import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.web.client.ResourceAccessException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -47,8 +48,12 @@ public class TsingtaoXHADataResourceService extends AbstractDataResourceService
} else { } else {
logger.error("西海岸数据资源列表获取失败"); logger.error("西海岸数据资源列表获取失败");
} }
} catch (Exception exception) { } catch (ResourceAccessException e) {
logger.error("西海岸数据资源列表获取失败", exception); logger.error("西海岸资源数据接口连接超时！！！");
return null;
} catch (Exception e) {
logger.error("西海岸资源数据调用失败！！！", e);
return null;
} }
return result; return result;
} }

11
renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
View File

@ -82,10 +82,17 @@ public class ShiroConfig {
filterMap.put("/upload", "anon"); filterMap.put("/upload", "anon");
filterMap.put("/upload/**", "anon"); filterMap.put("/upload/**", "anon");
filterMap.put("/census/center/v3/**", "oauth2"); filterMap.put("/census/center/v3/**", "oauth2");
filterMap.put("/census/center/selectDeptDetailTypeCountList", "oauth2");
filterMap.put("/census/center/selectCensusResourceTable", "oauth2"); filterMap.put("/census/center/exportSelectApplyDeptDetailTypeCountList", "oauth2");
filterMap.put("/census/center/exportSelectDeptDetailTypeCountList", "oauth2"); filterMap.put("/census/center/exportSelectDeptDetailTypeCountList", "oauth2");
filterMap.put("/census/center/exportSelectCensusResourceTable", "oauth2"); filterMap.put("/census/center/exportSelectCensusResourceTable", "oauth2");
filterMap.put("/census/center/exportSelectCensusApplyTable", "oauth2");
filterMap.put("/census/center/selectApplyDeptDetailTypeCountList", "oauth2");
filterMap.put("/census/center/selectDeptDetailTypeCountList", "oauth2");
filterMap.put("/census/center/selectCensusResourceTable", "oauth2");
filterMap.put("/census/center/selectCensusApplyTable", "oauth2");
filterMap.put("/census/center/**", "anon"); // 全局各类统计 包含 /census/center/v2 filterMap.put("/census/center/**", "anon"); // 全局各类统计 包含 /census/center/v2
filterMap.put("/metrics/**", "anon"); filterMap.put("/metrics/**", "anon");
filterMap.put("/gateway-monitor/**", "anon"); filterMap.put("/gateway-monitor/**", "anon");