添加皮肤分辨率与预览模块

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

@@ -8,6 +8,7 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.utils.FreeMarkerUtils;
+import com.mortals.xhx.module.product.service.ProductService;
 import com.mortals.xhx.module.skin.dao.SkinBaseDao;
 import com.mortals.xhx.module.skin.model.SkinBaseEntity;
 import com.mortals.xhx.module.skin.model.SkinBaseQuery;
@@ -46,6 +47,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
     private SkinFieldService skinFieldService;
     @Autowired
     private UploadService uploadService;
+    @Autowired
+    private ProductService productService;
 
     @Override
     protected void validData(SkinBaseEntity entity, Context context) throws AppException {
@@ -62,17 +65,18 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
     protected void findAfter(SkinBaseEntity entity, PageInfo pageInfo, Context context, List<SkinBaseEntity> list) throws AppException {
         list.stream().forEach(item -> {
             List<SkinFieldEntity> skinFieldEntities = skinFieldService.find(new SkinFieldQuery().skinId(item.getId()));
-            skinFieldEntities.stream().forEach(field->{
+/*            skinFieldEntities.stream().forEach(field->{
                 updateUrl(field);
-            });
+            });*/
+            item.setProductCode(productService.get(item.getProductId()).getProductCode());
             item.setSkinFieldList(skinFieldEntities);
 
-            if(!ObjectUtils.isEmpty(item.getPreviewImagePath())){
+      /*      if(!ObjectUtils.isEmpty(item.getPreviewImagePath())){
                 item.setPreviewImagePath(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/")+ item.getPreviewImagePath());
             }
             if(!ObjectUtils.isEmpty(item.getCssFilePath())){
                 item.setCssFilePath(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/")+ item.getCssFilePath());
-            }
+            }*/
         });
         super.findAfter(entity, pageInfo, context, list);
     }

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -5,7 +5,7 @@
   "dev": {
     "baseUrl": "http://192.168.0.217:17311/zwfw"
   },
-  "test": {
+  "test2": {
     "baseUrl": "http://192.168.0.98:11071/zwfw"
   }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -25,7 +25,7 @@ Content-Type: application/json
 
 ###短信设置查看
 GET {{baseUrl}}/sms/set/info?id=1
-Authorization: Bearer  {{authToken}}
+Authorization: {{authToken}}
 Accept: application/json
 
 ###解析token

portal-manager/doc/api.md

@@ -1096,7 +1096,6 @@ dict|object|字典对象|-
 
 **请求方式:** POST
 
-
 **内容类型:** application/json;charset=utf-8
 
 **简要描述:** 保存或更新资源信息业务：id为空时为新增保存，否则为更新提交