修改文件地址拼接

base-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java

@@ -57,9 +57,7 @@ public class UploadServiceImpl implements UploadService {
             log.error("文件上传大小超过限制，当前文件---" + tempFile.getSize() + "，允许大小----------" + type.getMaxSize());
             throw new AppException("文件上传大小超过限制！");
         }
-        if (null != fileName && fileName.length() > 50) {
-            throw new AppException("文件名称过长，无法上传！");
-        }
+
 
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
         String filePath = rootPath + (StringUtils.isEmpty(prePath) ? "" : prePath + "/");

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -107,7 +107,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             //  String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
             for (SkinFieldEntity field : skinFieldEntities) {
                 if ("2".equals(field.getFieldType())) {
-                    String fieldUrl = String.format("%s/%s", domainUrl, field.getFieldValue());
+                    String fieldUrl = String.format("%s%s", domainUrl, StrUtil.prependIfMissing(field.getFieldValue(), "/", "/"));
                     //UrlBuilder builder = UrlBuilder.ofHttp(domainUrl, CharsetUtil.CHARSET_UTF_8).addPath(field.getFieldValue());
                     field.setFieldValueUrl(fieldUrl);
                 }
@@ -119,7 +119,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             item.setSkinFieldList(skinFieldEntities);
             if (!ObjectUtils.isEmpty(item.getPreviewImagePath())) {
                 // UrlBuilder builder = UrlBuilder.ofHttp(domainUrl, CharsetUtil.CHARSET_UTF_8).addPath(item.getPreviewImagePath());
-                String fieldUrl = String.format("%s/%s", domainUrl, item.getPreviewImagePath());
+
+                String fieldUrl = String.format("%s%s", domainUrl, StrUtil.prependIfMissing(item.getPreviewImagePath(), "/", "/"));
                 // item.setPreviewImagePath(builder.build());
                 item.setPreviewImagePath(fieldUrl);
                 //log.info("cssUrl:" + URLDecoder.decode(item.getPreviewImagePath(), CharsetUtil.CHARSET_UTF_8));
@@ -127,7 +128,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             if (!ObjectUtils.isEmpty(item.getCssFilePath())) {
                 //UrlBuilder builder = UrlBuilder.ofHttp(domainUrl, CharsetUtil.CHARSET_UTF_8).addPath(item.getCssFilePath());
                 //item.setCssFilePath(builder.build());
-                String fieldUrl = String.format("%s/%s", domainUrl, item.getCssFilePath());
+                String fieldUrl = String.format("%s%s", domainUrl, StrUtil.prependIfMissing(item.getCssFilePath(), "/", "/"));
                 item.setCssFilePath(fieldUrl);
                 //log.info("cssUrl:" + URLDecoder.decode(item.getCssFilePath(), CharsetUtil.CHARSET_UTF_8));
             }
@@ -135,16 +136,6 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
         super.findAfter(entity, pageInfo, context, list);
     }
 
-    private void updateUrl(SkinFieldEntity field) {
-        if ("2".equals(field.getFieldType())) {
-            String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
-            UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(field.getFieldValue());
-            field.setFieldValue(builder.build());
-            log.info("setFieldValue:" + URLDecoder.decode(field.getFieldValue(), CharsetUtil.CHARSET_UTF_8));
-
-        }
-    }
-
     @Override
     protected void saveAfter(SkinBaseEntity entity, Context context) throws AppException {
         //删除关联后新增
@@ -205,14 +196,13 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
     }
 
 
-
     private void genTemplateCss(SkinBaseEntity entity, Context context) {
         //加载模板，合成模板数据
         Map data = new HashMap();
         List<SkinFieldEntity> collect = entity.getSkinFieldList().stream().map(field -> {
             SkinFieldEntity skinFieldEntity = new SkinFieldEntity();
             BeanUtils.copyProperties(field, skinFieldEntity, BeanUtil.getNullPropertyNames(field));
-         //   updateUrl(skinFieldEntity);
+            //   updateUrl(skinFieldEntity);
             return skinFieldEntity;
         }).collect(Collectors.toList());
 
@@ -295,4 +285,16 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
         return item;
     }
 
+
+    public static void main(String[] args) {
+
+        String str = "/file/upload/12332.png";
+
+        String result = StrUtil.prependIfMissing(str, "/", "/");
+
+
+        System.out.println(result);
+
+    }
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

@@ -124,10 +124,6 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
 
         for (SkinFieldEntity field : skinFieldEntities) {
             if ("2".equals(field.getFieldType())) {
-//                String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
-//                UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(field.getFieldValue());
-//                field.setFieldValue(builder.build());
-
                 String fieldUrl = String.format("%s/%s", domainUrl, field.getFieldValue());
                 field.setFieldValueUrl(fieldUrl);
             }