From c2a98813173a56dba14723735b68c813cdf600ef Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Fri, 13 May 2022 17:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=BC=94=E7=A4=BA=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=97=A8=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-show.yml | 42 +++++++++++++++++-- .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../resources/mapper/resource/ResourceDao.xml | 6 +++ 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/renren-admin/src/main/resources/application-show.yml b/renren-admin/src/main/resources/application-show.yml index d2f6bb19..1968042b 100644 --- a/renren-admin/src/main/resources/application-show.yml +++ b/renren-admin/src/main/resources/application-show.yml @@ -5,19 +5,34 @@ spring: druid: #MySQL driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://15.2.21.238:3310/share_platform_show?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + url: jdbc:mysql://15.2.21.238:3310/share_platform_show?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false username: root password: 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 initial-size: 10 max-active: 100 min-idle: 10 - max-wait: 60000 + max-wait: 10 pool-prepared-statements: true max-pool-prepared-statement-per-connection-size: 20 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL + validation-query: SELECT 1 test-while-idle: true test-on-borrow: false test-on-return: false @@ -43,4 +58,23 @@ resource: # 大数据部门相关配置 big_date: name: 青岛市大数据发展管理局 - assignee_role_name: 部门审批人 \ No newline at end of file + assignee_role_name: 部门审批人 + +hisense: + gateway: + url: http://devtest-security-app.hismarttv.com:8080 + + +##多数据源的配置，需要引用renren-dynamic-datasource +#dynamic: +# datasource: +# slave1: +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://123456:1433;DatabaseName=security_enterprise +# username: sa +# password: 123456 +# slave2: +# driver-class-name: org.postgresql.Driver +# url: jdbc:postgresql://123456:5432/security_enterprise +# username: postgres +# password: 123456 \ No newline at end of file diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml index a7afb428..e6012efd 100644 --- a/renren-admin/src/main/resources/application.yml +++ b/renren-admin/src/main/resources/application.yml @@ -20,7 +20,7 @@ server: http-only: true spring: - # 环境 dev|test|prod + # 环境 dev|test|prod|show profiles: active: dev messages: diff --git a/renren-admin/src/main/resources/logback-spring.xml b/renren-admin/src/main/resources/logback-spring.xml index 1baa41c2..f1e05f43 100644 --- a/renren-admin/src/main/resources/logback-spring.xml +++ b/renren-admin/src/main/resources/logback-spring.xml @@ -43,7 +43,7 @@ - + diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 332ee1ec..df79b077 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -133,6 +133,9 @@ AND tdr.district_id = #{dto.districtId} + + AND tdr.share_condition = #{dto.shareCondition} + AND tdr.dept_id = #{dto.deptId} @@ -257,6 +260,9 @@ AND tdr.district_id = #{dto.districtId} + + AND tdr.share_condition = #{dto.shareCondition} + AND tdr.dept_id = #{dto.deptId}