新增演示环境，修改门户查询逻辑

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: 部门审批人
+  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

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:

renren-admin/src/main/resources/logback-spring.xml

@@ -43,7 +43,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,show">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="io.renren" level="DEBUG"/>

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -133,6 +133,9 @@
         <if test="dto.districtId != null and dto.districtId != ''">
             AND tdr.district_id = #{dto.districtId}
         </if>
+        <if test="dto.shareCondition != null and dto.shareCondition != ''">
+            AND tdr.share_condition = #{dto.shareCondition}
+        </if>
         <if test="dto.deptId != null and dto.deptId != ''">
             AND tdr.dept_id = #{dto.deptId}
         </if>
@@ -257,6 +260,9 @@
         <if test="dto.districtId != null and dto.districtId != ''" >
             AND tdr.district_id = #{dto.districtId}
         </if>
+        <if test="dto.shareCondition != null and dto.shareCondition != ''" >
+            AND tdr.share_condition = #{dto.shareCondition}
+        </if>
         <if test="dto.deptId != null and dto.deptId != ''" >
             AND tdr.dept_id = #{dto.deptId}
         </if>