wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 18:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-02-15

Browse Source 
### 1.3.6 开源社区版：
【调整】应广大会员需求，平台设计上传图片从裁剪上传，调整后直接录入图片地址或本地非裁剪上传。
### 0.1.8 会员专业版：
【调整】平台设计上传图片从裁剪上传，调整后直接录入图片地址或本地非裁剪上传。
【修复】调整下单地址实现2行被遮挡问题。
【修复】修复下单地址未记录街道地址问题，导致订单地址可能出现误差的异常。
【修复】修复核销【提货单】详情图片未限制大小导致容易被撑破的问题。
【修复】修复核销【服务券】详情图片未限制大小导致容易被撑破的问题。
【升级】升级腾讯云COS云存储组件。
【降级】SixLabors.ImageSharp海报组件降级到1.04版本。解决海报生成问题。#I4SWCC
【修复】修复接龙模块列表图片未限制大小导致容易被撑破的问题。
This commit is contained in:
JianWeie
2022-02-15 01:30:19 +08:00
parent a07106127e
commit a2e189fe76
14 changed files with 142 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Services/CoreCms.Net.Services.csproj
View File

@@ -13,10 +13,10 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Qc.YilianyunSdk" Version="1.0.7" />
<PackageReference Include="Qiniu" Version="8.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.26" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.27" />
<PackageReference Include="ToolGood.Words" Version="3.0.3.1" />
</ItemGroup>

2
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
View File

@@ -435,7 +435,7 @@ namespace CoreCms.Net.Services
//快递邮寄
order.shipAreaId = userShipInfo.areaId;
order.shipAddress = userShipInfo.address;
order.shipAddress = userShipInfo.street + " " + userShipInfo.address;
order.shipName = userShipInfo.name;
order.shipMobile = userShipInfo.mobile;

53
CoreCms.Net.Services/Share/CoreCmsShareServices.cs
View File

@@ -32,7 +32,6 @@ using Newtonsoft.Json.Linq;
using SixLabors.Fonts;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Drawing.Processing;
using SixLabors.ImageSharp.Formats.Jpeg;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using SKIT.FlurlHttpClient.Wechat.Api;
@@ -855,10 +854,7 @@ namespace CoreCms.Net.Services
//文件硬地址
var savePath = _webHostEnvironment.WebRootPath + "/static/poster/";
//用户二维码头像
var qrCodeDir = _webHostEnvironment.WebRootPath + "/static/qrCode/weChat/" + otherData;
//如果文件夹不存在，则创建文件夹
if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath);
@@ -886,13 +882,14 @@ namespace CoreCms.Net.Services
var images = goodModel.images.Split(",");
if (images.Any())
{
var image = images[0];
//创建一个背景宽度为400X600的底图
using var imageTemple = new SixLabors.ImageSharp.Image<Rgba32>(400, 600);
//设置底图的背景色为白色
imageTemple.Mutate(x => x.BackgroundColor(SixLabors.ImageSharp.Color.White));
//绘制商品图片（网络下载图片）
HttpClient client = new HttpClient();
HttpResponseMessage response = await client.GetAsync(goodModel.image);
HttpResponseMessage response = await client.GetAsync(image);
response.EnsureSuccessStatusCode();
var stream = await response.Content.ReadAsStreamAsync();
//载入下载的图片流
@@ -904,22 +901,15 @@ namespace CoreCms.Net.Services
});
//将商品大图合并到背景图上
imageTemple.Mutate(x => x.DrawImage(imageThumbnail, new SixLabors.ImageSharp.Point(0, 0), 1));
//如果已经存在用户头像的情况下。则附加渲染二维码
//QrCode 根目录
if (File.Exists(qrCodeDir))
//将用户的分享二维码合并大背景图上
var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir);
//将二维码缩略至120X120
imageQrcode.Mutate(x =>
{
//将用户的分享二维码合并大背景图上
var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir);
//将二维码缩略至120X120
imageQrcode.Mutate(x =>
{
x.Resize(120, 120);
});
//将二维码图片合并到背景图上
imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1));
}
x.Resize(120, 120);
});
//将二维码图片合并到背景图上
imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1));
//构建字体//装载字体(ttf)（而且字体一定要支持简体中文的）
var fonts = new FontCollection();
SixLabors.Fonts.FontFamily fontFamily = fonts.Install(_webHostEnvironment.WebRootPath + "/fonts/SourceHanSansK-Normal.ttf");
@@ -992,22 +982,15 @@ namespace CoreCms.Net.Services
});
//将商品大图合并到背景图上
imageTemple.Mutate(x => x.DrawImage(imageThumbnail, new SixLabors.ImageSharp.Point(0, 0), 1));
//如果已经存在用户头像的情况下。则附加渲染二维码
//QrCode 根目录
if (File.Exists(qrCodeDir))
//将用户的分享二维码合并大背景图上
var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir);
//将二维码缩略至120X120
imageQrcode.Mutate(x =>
{
//将用户的分享二维码合并大背景图上
var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir);
//将二维码缩略至120X120
imageQrcode.Mutate(x =>
{
x.Resize(120, 120);
});
//将二维码图片合并到背景图上
imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1));
}
x.Resize(120, 120);
});
//将二维码图片合并到背景图上
imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1));
//构建字体//装载字体(ttf)（而且字体一定要支持简体中文的）
var fonts = new FontCollection();
SixLabors.Fonts.FontFamily fontFamily = fonts.Install(_webHostEnvironment.WebRootPath + "/fonts/SourceHanSansK-Normal.ttf");