Merge remote-tracking branch 'origin/master'

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;
 
 /**
  * 操作日志
@@ -54,7 +55,9 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl<SysLogOperationD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SysLogOperationEntity entity) {
+        CompletableFuture.runAsync(() -> {
             insert(entity);
+        });
     }
 
 }

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 =