Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

.gitignore

@@ -3,6 +3,6 @@ obj/
 .vs/
 packages/
 Properties/
+PublishProfiles/
 Mall.WindowsService/Properties/PublishProfiles/FolderProfile.pubxml
 Mall.Model/Entity/Sign/RB_Sign_Setting.cs
-Mall.WebApi/Properties/

Mall.WebApi/Controllers/MarketingCenter/ShareController.cs

@@ -140,8 +140,25 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             query.TenantId = parms.TenantId;
             query.MallBaseId = parms.MallBaseId;
             var list = shareModule.GetShareFriendPageListModule(pagelist.pageIndex, pagelist.pageSize, out long count, query, IsUse: true);
+            foreach (var item in list)
+            {
+                if (item.GoodsId > 0)
+                {
+                    item.LinkUrl = "/pages/goods/goods?id=" + item.GoodsId;
+                }
+            }
             pagelist.count = Convert.ToInt32(count);
-            pagelist.pageData = list;
+            pagelist.pageData = list.Select(qitem => new
+            {
+                HeadImg=Common.Config.ReadConfigKey("ShareConfig", "ShareImg"),
+                UserName= Common.Config.ReadConfigKey("ShareConfig", "ShareUserName"),
+                qitem.Id,
+                qitem.MaterialInfo,
+                qitem.ImgList,
+                qitem.CoverImg,
+                qitem.LinkUrl,
+                qitem.CreateDateStr
+            });
             return ApiResult.Success("", pagelist);
         }
 

Mall.WebApi/Mall.WebApi.csproj

@@ -6,6 +6,12 @@
   <PropertyGroup>
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Properties\PublishProfiles\**" />
+    <Content Remove="Properties\PublishProfiles\**" />
+    <EmbeddedResource Remove="Properties\PublishProfiles\**" />
+    <None Remove="Properties\PublishProfiles\**" />
+  </ItemGroup>
 
   <ItemGroup>
     <Content Remove="web.config" />

Mall.WebApi/Mall.WebApi.csproj.user

@@ -9,7 +9,7 @@
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
     <WebStackScaffolding_LayoutPageFile />
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <NameOfLastUsedPublishProfile>mall.oytour.com</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>mallapi.oytour.com</NameOfLastUsedPublishProfile>
     <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Mall.WebApi/Properties/PublishProfiles/mall.oytour.com.pubxml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
-自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <ProjectGuid>ad842a33-b1df-4360-ae06-536353f0276c</ProjectGuid>
-    <SelfContained>false</SelfContained>
-    <publishUrl>F:\网站发布\Mall.oytour.com</publishUrl>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

Mall.WebApi/Properties/PublishProfiles/mall.oytour.com.pubxml.user

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
-自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <_PublishTargetUrl>F:\网站发布\Mall.oytour.com</_PublishTargetUrl>
-  </PropertyGroup>
-  <ItemGroup>
-    <File Include="run.cmd">
-      <publishTime>04/22/2020 10:26:33</publishTime>
-    </File>
-  </ItemGroup>
-</Project>
\ No newline at end of file

Mall.WebApi/appsettings.json

@@ -78,5 +78,9 @@
   },
   "InitializeImages": {
     "GradeEntranceImage": "1234566778"
+  },
+  "ShareConfig": {
+    "ShareImg": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zanyang.png",
+    "ShareUserName": "赞羊生活"
   }
 }
\ No newline at end of file