renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -570,7 +570,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Override
     public void KnowledgeBase() {
         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());
         final int pageSize = 100;
         final OkHttpClient client = new OkHttpClient();

renren-admin/src/main/resources/application-dev.yml

@@ -10,21 +10,21 @@ spring:
       username: root
       password: Hisense2019
       #Hisense2019
-      #      #Oracle
+#      #Oracle
-      #      driver-class-name: oracle.jdbc.OracleDriver
+#      driver-class-name: oracle.jdbc.OracleDriver
-      #      url: jdbc:oracle:thin:@192.168.10.10:1521:xe
+#      url: jdbc:oracle:thin:@192.168.10.10:1521:xe
-      #      username: renren_security
+#      username: renren_security
-      #      password: 123456
+#      password: 123456
-      #      #SQLServer
+#      #SQLServer
-      #      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-      #      url: jdbc:sqlserver://localhost:1433;DatabaseName=security_enterprise
+#      url: jdbc:sqlserver://localhost:1433;DatabaseName=security_enterprise
-      #      username: sa
+#      username: sa
-      #      password: 123456
+#      password: 123456
-      #      #postgresql
+#      #postgresql
-      #      driver-class-name: org.postgresql.Driver
+#      driver-class-name: org.postgresql.Driver
-      #      url: jdbc:postgresql://192.168.10.10:5432/postgres
+#      url: jdbc:postgresql://192.168.10.10:5432/postgres
-      #      username: postgres
+#      username: postgres
-      #      password: 123456
+#      password: 123456
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -58,13 +58,10 @@ resource:
   pic-host: http://${resource.root_url}:${server.port}${server.servlet.context-path}
   path: /home/yth/files/
   devModelFilePath: /home/yth/files/devModelFile
-
+# 大数据部门相关配置
-# 大数据部门相关配置（平台部署部门）
 big_date:
   name: 青岛市大数据发展管理局
   assignee_role_name: 部门审批人
-  # 平台部署级别 (PROVINCE:省 PREFECTURE:地级市 DISTRICT:区县 STREET:街道)
-  stage: PREFECTURE
 
 hisense:
   gateway:

renren-admin/src/main/resources/application.yml

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

renren-api/src/main/java/io/renren/interceptor/AuthorizationInterceptor.java

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