From 789abbcc049eefc7db3c63a5a84613b6aab5c6d4 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Wed, 15 Jun 2022 14:23:09 +0800 Subject: [PATCH] ... --- .../service/impl/ResourceServiceImpl.java | 2 +- .../src/main/resources/application-dev.yml | 35 ++++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 14b821dd..24923b75 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -570,7 +570,7 @@ public class ResourceServiceImpl extends CrudServiceImpl knowledgeUUID = - jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库';", String.class) + jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库' AND note1 IS NOT NULL FOR UPDATE;", String.class) .stream().distinct().collect(Collectors.toList()); final int pageSize = 100; final OkHttpClient client = new OkHttpClient(); diff --git a/renren-admin/src/main/resources/application-dev.yml b/renren-admin/src/main/resources/application-dev.yml index 60d6d891..bf7332ea 100644 --- a/renren-admin/src/main/resources/application-dev.yml +++ b/renren-admin/src/main/resources/application-dev.yml @@ -10,21 +10,21 @@ spring: username: root password: Hisense2019 #Hisense2019 -# #Oracle -# driver-class-name: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@192.168.10.10:1521:xe -# username: renren_security -# password: 123456 -# #SQLServer -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=security_enterprise -# username: sa -# password: 123456 -# #postgresql -# driver-class-name: org.postgresql.Driver -# url: jdbc:postgresql://192.168.10.10:5432/postgres -# username: postgres -# password: 123456 + # #Oracle + # driver-class-name: oracle.jdbc.OracleDriver + # url: jdbc:oracle:thin:@192.168.10.10:1521:xe + # username: renren_security + # password: 123456 + # #SQLServer + # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + # url: jdbc:sqlserver://localhost:1433;DatabaseName=security_enterprise + # username: sa + # password: 123456 + # #postgresql + # driver-class-name: org.postgresql.Driver + # url: jdbc:postgresql://192.168.10.10:5432/postgres + # username: postgres + # password: 123456 initial-size: 10 max-active: 100 min-idle: 10 @@ -58,10 +58,13 @@ 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: