From b165e916631e39c743c66b7ec48b432da72a0f94 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 20 Jun 2022 14:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=BD=BF=E7=94=A8=E5=BC=82=E6=AD=A5=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=B9=B3=E5=8F=B0=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=98=BB=E5=A1=9E=E9=97=AE=E9=A2=98=EF=BC=81?=
 =?UTF-8?q?=EF=BC=81=20=E5=B1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/service/impl/SysLogOperationServiceImpl.java  | 11 +++++++----
 .../resource/controller/ResourceController.java       |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java
index 7f004163..a1390bc1 100644
--- a/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java
@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 操作日志
@@ -28,8 +29,8 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl<SysLogOperationD
     @Override
     public PageData<SysLogOperationDTO> page(Map<String, Object> params) {
         IPage<SysLogOperationEntity> page = baseDao.selectPage(
-            getPage(params, Constant.CREATE_DATE, false),
-            getWrapper(params)
+                getPage(params, Constant.CREATE_DATE, false),
+                getWrapper(params)
         );
 
         return getPageData(page, SysLogOperationDTO.class);
@@ -42,7 +43,7 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl<SysLogOperationD
         return ConvertUtils.sourceToTarget(entityList, SysLogOperationDTO.class);
     }
 
-    private QueryWrapper<SysLogOperationEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<SysLogOperationEntity> getWrapper(Map<String, Object> params) {
         String status = (String) params.get("status");
 
         QueryWrapper<SysLogOperationEntity> wrapper = new QueryWrapper<>();
@@ -54,7 +55,9 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl<SysLogOperationD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SysLogOperationEntity entity) {
-        insert(entity);
+        CompletableFuture.runAsync(() -> {
+            insert(entity);
+        });
     }
 
 }
\ No newline at end of file
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 91324236..7353e579 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
@@ -210,7 +210,7 @@ public class ResourceController {
     @ApiOperation("导入")
     @LogOperation("导入")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "source", value = "请求来源", paramType = "string", dataType = "string")
+            @ApiImplicitParam(name = "file", value = "数据文件文件", paramType = "file", dataType = "file")
     })
     public Result importResource(@RequestParam("file") MultipartFile uploadFile, HttpServletRequest request) {
         List<Map<String, Object>> dept =