Compare commits

..

No commits in common. "15fda12059ae28f45ea1d9cf82f1bb9e030251bd" and "a63f63bb66ca9f526609731ca248485a0d5b4d62" have entirely different histories.

5 changed files with 18 additions and 26 deletions

View File

@ -570,7 +570,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
@Override @Override
public void KnowledgeBase() { public void KnowledgeBase() {
final List<String> knowledgeUUID = final List<String> knowledgeUUID =
jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库' AND note1 IS NOT NULL FOR UPDATE;", String.class) jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库';", String.class)
.stream().distinct().collect(Collectors.toList()); .stream().distinct().collect(Collectors.toList());
final int pageSize = 100; final int pageSize = 100;
final OkHttpClient client = new OkHttpClient(); final OkHttpClient client = new OkHttpClient();

View File

@ -58,13 +58,10 @@ resource:
pic-host: http://${resource.root_url}:${server.port}${server.servlet.context-path} pic-host: http://${resource.root_url}:${server.port}${server.servlet.context-path}
path: /home/yth/files/ path: /home/yth/files/
devModelFilePath: /home/yth/files/devModelFile devModelFilePath: /home/yth/files/devModelFile
# 大数据部门相关配置
# 大数据部门相关配置(平台部署部门)
big_date: big_date:
name: 青岛市大数据发展管理局 name: 青岛市大数据发展管理局
assignee_role_name: 部门审批人 assignee_role_name: 部门审批人
# 平台部署级别 (PROVINCE:省 PREFECTURE:地级市 DISTRICT:区县 STREET:街道)
stage: PREFECTURE
hisense: hisense:
gateway: gateway:

View File

@ -52,7 +52,6 @@ spring:
resources: resources:
static-locations: classpath:/static,classpath:/public,file:${resource.path} static-locations: classpath:/static,classpath:/public,file:${resource.path}
flyway: flyway:
enable: true
locations: classpath:db locations: classpath:db
baseline-on-migrate: true baseline-on-migrate: true
baseline-version: 0 baseline-version: 0

View File

@ -6,8 +6,6 @@ import io.renren.common.exception.RenException;
import io.renren.entity.TokenEntity; import io.renren.entity.TokenEntity;
import io.renren.service.TokenService; import io.renren.service.TokenService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
@ -26,12 +24,10 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
private TokenService tokenService; private TokenService tokenService;
public static final String USER_KEY = "userId"; public static final String USER_KEY = "userId";
public static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationInterceptor.class);
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
Login annotation; Login annotation;
LOGGER.info("请求地址:{}", request.getRemoteAddr());
if(handler instanceof HandlerMethod) { if(handler instanceof HandlerMethod) {
annotation = ((HandlerMethod) handler).getMethodAnnotation(Login.class); annotation = ((HandlerMethod) handler).getMethodAnnotation(Login.class);
}else{ }else{