bugfix

Author: sanluan

publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/cms/CmsContentAdminController.java

@@ -66,6 +66,7 @@
 import com.publiccms.logic.component.exchange.ContentExchangeComponent;
 import com.publiccms.logic.component.exchange.ContentExportComponent;
 import com.publiccms.logic.component.exchange.SiteExchangeComponent;
+import com.publiccms.logic.component.site.FileUploadComponent;
 import com.publiccms.logic.component.site.SiteComponent;
 import com.publiccms.logic.component.site.StatisticsComponent;
 import com.publiccms.logic.component.template.ModelComponent;
@@ -128,6 +129,8 @@ public class CmsContentAdminController {
     @Resource
     private StatisticsComponent statisticsComponent;
     @Resource
+    protected FileUploadComponent fileUploadComponent;
+    @Resource
     private SysWorkflowProcessItemService workflowProcessItemService;
     @Resource
     private SysWorkflowProcessService workflowProcessService;
@@ -852,7 +855,10 @@ public String distribute(@RequestAttribute SysSite site, @SessionAttribute SysUs
                     }
 
                     if (0 != userId) {
-                        CmsUrlUtils.initContentUrl(site, entity);
+                        if(category.getSiteId() != site.getId()) {
+                            CmsUrlUtils.initContentUrl(site, entity);
+                            fileUploadComponent.initContentCover(site, entity);
+                        }
                         CmsContent content = service.copy(site, entity, category, status, userId);
                         if (null != content) {
                             try {

publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/service/cms/CmsContentService.java

@@ -30,6 +30,7 @@
 import com.publiccms.common.handler.FacetPageHandler;
 import com.publiccms.common.handler.PageHandler;
 import com.publiccms.common.tools.CmsFileUtils;
+import com.publiccms.common.tools.CmsUrlUtils;
 import com.publiccms.common.tools.CommonUtils;
 import com.publiccms.common.tools.ControllerUtils;
 import com.publiccms.common.tools.ExtendUtils;
@@ -44,6 +45,7 @@
 import com.publiccms.entities.sys.SysExtendField;
 import com.publiccms.entities.sys.SysSite;
 import com.publiccms.entities.sys.SysUser;
+import com.publiccms.logic.component.site.FileUploadComponent;
 import com.publiccms.logic.dao.cms.CmsContentDao;
 import com.publiccms.logic.dao.cms.CmsContentSearchDao;
 import com.publiccms.logic.service.sys.SysExtendFieldService;
@@ -118,6 +120,8 @@ public class CmsContentService extends BaseService<CmsContent> {
     private CmsContentAttributeService attributeService;
     @Resource
     private CmsContentRelatedService cmsContentRelatedService;
+    @Resource
+    protected FileUploadComponent fileUploadComponent;
 
     /**
      * @param queryEntity
@@ -517,7 +521,7 @@ public CmsContent rejectInProcess(short siteId, Long userId, Serializable id) {
         }
         return entity;
     }
-    
+
     /**
      * @param siteId
      * @param user
@@ -935,6 +939,9 @@ public CmsContent copy(SysSite site, CmsContent content, CmsCategory category, i
                     contentFile.setUserId(userId);
                     resultList.add(contentFile);
                 }
+                if(category.getSiteId() != site.getId()) {
+                    resultList.forEach(e -> e.setFilePath(CmsUrlUtils.getUrl(fileUploadComponent.getPrefix(site), e.getFilePath())));
+                }
                 contentFileService.save(resultList);
             }
             @SuppressWarnings("unchecked")
@@ -950,6 +957,9 @@ public CmsContent copy(SysSite site, CmsContent content, CmsCategory category, i
                     contentProduct.setUserId(userId);
                     resultList.add(contentProduct);
                 }
+                if(category.getSiteId() != site.getId()) {
+                    resultList.forEach(e -> e.setCover(CmsUrlUtils.getUrl(fileUploadComponent.getPrefix(site), e.getCover())));
+                }
                 contentProductService.save(resultList);
             }
             return entity;