From dda2c6c6b5b9fbdc282590e136e7f4e4643ee23b Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Fri, 13 May 2022 11:17:21 +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

---
 .../controller/ResourceController.java        |  6 +--
 .../service/impl/ResourceServiceImpl.java     |  6 +--
 .../src/main/resources/application-show.yml   | 46 +++++++++++++++++++
 3 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 renren-admin/src/main/resources/application-show.yml

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
index 89a9f64d..4020afc6 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
@@ -50,9 +50,9 @@ public class ResourceController {
             @ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String")
     })
     public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
-        if (!params.containsKey("del_flag")) {
-            params.put("del_flag", 0);
-        }
+        //if (!params.containsKey("del_flag")) {
+        //    params.put("del_flag", 0);
+        //}
         PageData<ResourceDTO> page = resourceService.page(params);
         page.getList().forEach(item -> {
             item.setInfoList(resourceService.selectAttrsByResourceId(item.getId()));
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 52a5a346..da69b420 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
@@ -72,9 +72,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                     wrapper.eq(StringUtils.isNotBlank(params.get("creator").toString()), "creator", params.get("creator").toString())
                             .ne("del_flag", 1);
                     break;
-                case "del_flag":
-                    wrapper.eq("del_flag", params.get("del_flag"));
-                    break;
+                //case "del_flag":
+                //    wrapper.eq("del_flag", params.get("del_flag"));
+                //    break;
             }
         });
         wrapper.orderByDesc("create_date");
diff --git a/renren-admin/src/main/resources/application-show.yml b/renren-admin/src/main/resources/application-show.yml
new file mode 100644
index 00000000..d2f6bb19
--- /dev/null
+++ b/renren-admin/src/main/resources/application-show.yml
@@ -0,0 +1,46 @@
+server:
+  port: 8888
+spring:
+  datasource:
+    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
+      username: root
+      password: Hisense2019
+      initial-size: 10
+      max-active: 100
+      min-idle: 10
+      max-wait: 60000
+      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
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+
+#上传的静态资源配置
+resource:
+  root_url: 15.2.21.238
+  path: /home/yth/files/
+  devModelFilePath: /home/yth/files/devModelFile
+# 大数据部门相关配置
+big_date:
+  name: 青岛市大数据发展管理局
+  assignee_role_name: 部门审批人
\ No newline at end of file