Merge remote-tracking branch 'origin/master'

renren-admin/src/main/java/io/renren/modules/resourceCar/controller/ResourceCarController.java

@@ -1,5 +1,6 @@
 package io.renren.modules.resourceCar.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.renren.common.annotation.LogOperation;
@@ -67,8 +68,12 @@ public class ResourceCarController {
     public Result save(@RequestBody ResourceCarDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        resourceCarService.insertOrUpdate(dto);
+        if (ObjectUtil.isAllNotEmpty(dto.getResourceId()) || ObjectUtil.isAllNotEmpty(dto.getUserId())) {
-        return new Result();
+            resourceCarService.insertOrUpdate(dto);
+            return new Result();
+        } else {
+            return new Result().error(500, "加申购车失败，请重试！");
+        }
     }
 
     @DeleteMapping("/delete")

renren-admin/src/main/resources/application-dev.yml

@@ -49,6 +49,12 @@ spring:
           config:
             multi-statement-allow: true
 
+#上传的静态资源配置
+resource:
+  root_url: 15.2.21.238
+  path: /home/yth/files/
+  devModelFilePath: /home/yth/files/resource
+
 ##多数据源的配置，需要引用renren-dynamic-datasource
 #dynamic:
 #  datasource:

renren-admin/src/main/resources/application-prod.yml

@@ -32,6 +32,8 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+#上传的静态资源配置
 resource:
   root_url: 15.2.21.238
-  path: /home/yth/files/
+  path: /data/services/nengli/files/
+  devModelFilePath: /data/services/nengli/files/resource

renren-admin/src/main/resources/application-test.yml

@@ -31,4 +31,10 @@ spring:
           merge-sql: false
         wall:
           config:
-            multi-statement-allow: true
+            multi-statement-allow: true
+
+#上传的静态资源配置
+resource:
+  root_url: 15.2.21.238
+  path: /home/yth/files/
+  devModelFilePath: /home/yth/files/resource

renren-admin/src/main/resources/application.yml

@@ -1,8 +1,3 @@
-#上传的静态资源配置
-resource:
-  root_url: 15.2.21.238
-  path: /home/yth/files/
-  devModelFilePath: /home/yth/files/resource
 # Tomcat
 server:
   tomcat: