Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CustomerServiceServiceImpl.java

@@ -48,7 +48,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
     public R uploadImage(MultipartFile file, HttpServletRequest request, String wechatId) throws IOException {
 
         String basePath = request.getScheme() + "://" + request.getServerName()
-                + ":" + request.getServerPort()+"/upload/video/";
+                + ":" + request.getServerPort();
 
         Long time = System.currentTimeMillis();
 
@@ -67,7 +67,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
         //将内存中的数据写入磁盘
         file.transferTo(newFile);
 //      图片上传保存url
-        String videoUrl = basePath + newName;
+        String videoUrl = basePath + rootPath + newName;
 
         CustomerService customerService = new CustomerService();
         customerService.setWechatId(wechatId);