warrenchen/kneo_marketplace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: warrenchen:master
Branches Tags
warrenchen:master
warrenchen:tappay_v5_24
..
compare: warrenchen:tappay_v5_24
Branches Tags
warrenchen:master
warrenchen:tappay_v5_24

No commits in common. "master" and "tappay_v5_24" have entirely different histories.
master ... tappay_v5_

8 changed files with 159 additions and 132 deletions
Show Stats Expand all files Collapse all files

5
.gitignore vendored
View File

@ -173,9 +173,10 @@ src/Presentation/Nop.Web/App_Data/Gmail/AuthStore/*
!src/Presentation/Nop.Web/App_Data/Gmail/AuthStore/Index.htm !src/Presentation/Nop.Web/App_Data/Gmail/AuthStore/Index.htm
src/Presentation/Nop.Web/App_Data/browscap.xml src/Presentation/Nop.Web/App_Data/browscap.xml
src/Presentation/Nop.Web/App_Data/additional.crawlers.xml src/Presentation/Nop.Web/App_Data/additional.crawlers.xml
src/Presentation/Nop.Web/App_Data/installedPlugins.json
src/Presentation/Nop.Web/App_Data/plugins.json
src/Presentation/Nop.Web/App_Data/dataSettings.json src/Presentation/Nop.Web/App_Data/dataSettings.json
src/Presentation/Nop.Web/App_Data/appsettings.* src/Presentation/Nop.Web/App_Data/appsettings.json
!src/Presentation/Nop.Web/App_Data/appsettings.json
src/Presentation/Nop.Web/App_Data/TempUploads/* src/Presentation/Nop.Web/App_Data/TempUploads/*
!src/Presentation/Nop.Web/App_Data/TempUploads/Index.htm !src/Presentation/Nop.Web/App_Data/TempUploads/Index.htm
src/Presentation/Nop.Web/App_Data/DataProtectionKeys/* src/Presentation/Nop.Web/App_Data/DataProtectionKeys/*

5
Dockerfile
View File

@ -50,8 +50,9 @@ RUN apk add --no-cache icu-libs icu-data-full
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
# installs required packages # installs required packages
RUN apk add --no-cache tiff libc-dev tzdata RUN apk add tiff --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main/ --allow-untrusted
RUN apk add --no-cache libgdiplus --repository https://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted RUN apk add libgdiplus --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted
RUN apk add libc-dev tzdata --no-cache
# copy entrypoint script # copy entrypoint script
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh

5
Dockerfile.Staging
View File

@ -50,8 +50,9 @@ RUN apk add --no-cache icu-libs icu-data-full
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
# installs required packages # installs required packages
RUN apk add --no-cache tiff libc-dev tzdata RUN apk add tiff --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main/ --allow-untrusted
RUN apk add --no-cache libgdiplus --repository https://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted RUN apk add libgdiplus --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted
RUN apk add libc-dev tzdata --no-cache
# copy entrypoint script # copy entrypoint script
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh

12
src/Libraries/Nop.Services/Media/PictureService.cs
View File

@ -11,7 +11,6 @@ using Nop.Services.Logging;
using Nop.Services.Seo; using Nop.Services.Seo;
using SkiaSharp; using SkiaSharp;
using Svg.Skia; using Svg.Skia;
using System.IO;
namespace Nop.Services.Media; namespace Nop.Services.Media;
@ -598,14 +597,7 @@ public partial class PictureService : IPictureService
false); false);
} }
var seoFileName = picture.SeoFilename; var seoFileName = picture.SeoFilename; // = GetPictureSeName(picture.SeoFilename); //just for sure
if (!string.IsNullOrEmpty(seoFileName))
{
// ensure seo filename is safe for filesystem (especially on Windows)
seoFileName = await GetPictureSeNameAsync(seoFileName);
var invalidChars = Path.GetInvalidFileNameChars();
seoFileName = string.Concat(seoFileName.Split(invalidChars, StringSplitOptions.RemoveEmptyEntries));
}
var lastPart = await GetFileExtensionFromMimeTypeAsync(picture.MimeType); var lastPart = await GetFileExtensionFromMimeTypeAsync(picture.MimeType);
@ -1260,4 +1252,4 @@ public partial class PictureService : IPictureService
} }
#endregion #endregion
} }

74
src/Presentation/Nop.Web/App_Data/appsettings.Production.json Executable file
View File

@ -0,0 +1,74 @@
{
"ConnectionStrings": {
"ConnectionString": "Host=kneo-db.c7g2iigo8wl7.ap-northeast-1.rds.amazonaws.com;Database=kneo;Username=kneoweb;Password=kneo!admin",
"DataProvider": "postgresql",
"SQLCommandTimeout": null,
"WithNoLock": false
},
"AzureBlobConfig": {
"ConnectionString": "",
"ContainerName": "",
"EndPoint": "",
"AppendContainerName": true,
"StoreDataProtectionKeys": false,
"DataProtectionKeysContainerName": "",
"DataProtectionKeysVaultId": ""
},
"CacheConfig": {
"DefaultCacheTime": 60,
"LinqDisableQueryCache": false
},
"CommonConfig": {
"DisplayFullErrorStack": false,
"UserAgentStringsPath": "~/App_Data/browscap.xml",
"CrawlerOnlyUserAgentStringsPath": "~/App_Data/browscap.crawlersonly.xml",
"CrawlerOnlyAdditionalUserAgentStringsPath": "~/App_Data/additional.crawlers.xml",
"UseSessionStateTempDataProvider": false,
"ScheduleTaskRunTimeout": null,
"StaticFilesCacheControl": "public,max-age=31536000",
"PluginStaticFileExtensionsBlacklist": "",
"ServeUnknownFileTypes": false,
"UseAutofac": true,
"PermitLimit": 0,
"QueueCount": 0,
"RejectionStatusCode": 503
},
"DistributedCacheConfig": {
"DistributedCacheType": "redissynchronizedmemory",
"Enabled": false,
"ConnectionString": "127.0.0.1:6379,ssl=False",
"SchemaName": "dbo",
"TableName": "DistributedCache",
"InstanceName": "nopCommerce",
"PublishIntervalMs": 500
},
"HostingConfig": {
"UseProxy": false,
"ForwardedProtoHeaderName": "",
"ForwardedForHeaderName": "",
"KnownProxies": "",
"KnownNetworks": ""
},
"InstallationConfig": {
"DisableSampleData": false,
"DisabledPlugins": "",
"InstallRegionalResources": true
},
"PluginConfig": {
"UseUnsafeLoadAssembly": true
},
"WebOptimizer": {
"EnableJavaScriptBundling": true,
"EnableCssBundling": true,
"JavaScriptBundleSuffix": ".scripts",
"CssBundleSuffix": ".styles",
"EnableCaching": true,
"EnableMemoryCache": true,
"EnableDiskCache": true,
"CacheDirectory": "/app/wwwroot/bundles",
"EnableTagHelperBundling": false,
"CdnUrl": "",
"AllowEmptyBundle": true,
"HttpsCompression": 2
}
}

74
src/Presentation/Nop.Web/App_Data/appsettings.Staging.json Executable file
View File

@ -0,0 +1,74 @@
{
"ConnectionStrings": {
"ConnectionString": "Host=192.168.0.130;Database=kneo;Username=kneoweb;Password=kneo!admin",
"DataProvider": "postgresql",
"SQLCommandTimeout": null,
"WithNoLock": false
},
"AzureBlobConfig": {
"ConnectionString": "",
"ContainerName": "",
"EndPoint": "",
"AppendContainerName": true,
"StoreDataProtectionKeys": false,
"DataProtectionKeysContainerName": "",
"DataProtectionKeysVaultId": ""
},
"CacheConfig": {
"DefaultCacheTime": 60,
"LinqDisableQueryCache": false
},
"CommonConfig": {
"DisplayFullErrorStack": false,
"UserAgentStringsPath": "~/App_Data/browscap.xml",
"CrawlerOnlyUserAgentStringsPath": "~/App_Data/browscap.crawlersonly.xml",
"CrawlerOnlyAdditionalUserAgentStringsPath": "~/App_Data/additional.crawlers.xml",
"UseSessionStateTempDataProvider": false,
"ScheduleTaskRunTimeout": null,
"StaticFilesCacheControl": "public,max-age=31536000",
"PluginStaticFileExtensionsBlacklist": "",
"ServeUnknownFileTypes": false,
"UseAutofac": true,
"PermitLimit": 0,
"QueueCount": 0,
"RejectionStatusCode": 503
},
"DistributedCacheConfig": {
"DistributedCacheType": "redissynchronizedmemory",
"Enabled": false,
"ConnectionString": "127.0.0.1:6379,ssl=False",
"SchemaName": "dbo",
"TableName": "DistributedCache",
"InstanceName": "nopCommerce",
"PublishIntervalMs": 500
},
"HostingConfig": {
"UseProxy": false,
"ForwardedProtoHeaderName": "",
"ForwardedForHeaderName": "",
"KnownProxies": "",
"KnownNetworks": ""
},
"InstallationConfig": {
"DisableSampleData": false,
"DisabledPlugins": "",
"InstallRegionalResources": true
},
"PluginConfig": {
"UseUnsafeLoadAssembly": true
},
"WebOptimizer": {
"EnableJavaScriptBundling": true,
"EnableCssBundling": true,
"JavaScriptBundleSuffix": ".scripts",
"CssBundleSuffix": ".styles",
"EnableCaching": true,
"EnableMemoryCache": true,
"EnableDiskCache": true,
"CacheDirectory": "/app/wwwroot/bundles",
"EnableTagHelperBundling": false,
"CdnUrl": "",
"AllowEmptyBundle": true,
"HttpsCompression": 2
}
}

74
src/Presentation/Nop.Web/App_Data/appsettings.json
View File

@ -1,74 +0,0 @@
{
"ConnectionStrings": {
"ConnectionString": "Host=192.168.0.130;Database=kneo;Username=kneoweb;Password=kneo!admin",
"DataProvider": "postgresql",
"SQLCommandTimeout": null,
"WithNoLock": false
},
"AzureBlobConfig": {
"ConnectionString": "",
"ContainerName": "",
"EndPoint": "",
"AppendContainerName": true,
"StoreDataProtectionKeys": false,
"DataProtectionKeysContainerName": "",
"DataProtectionKeysVaultId": ""
},
"CacheConfig": {
"DefaultCacheTime": 60,
"LinqDisableQueryCache": false
},
"CommonConfig": {
"DisplayFullErrorStack": false,
"UserAgentStringsPath": "~/App_Data/browscap.xml",
"CrawlerOnlyUserAgentStringsPath": "~/App_Data/browscap.crawlersonly.xml",
"CrawlerOnlyAdditionalUserAgentStringsPath": "~/App_Data/additional.crawlers.xml",
"UseSessionStateTempDataProvider": false,
"ScheduleTaskRunTimeout": null,
"StaticFilesCacheControl": "public,max-age=31536000",
"PluginStaticFileExtensionsBlacklist": "",
"ServeUnknownFileTypes": false,
"UseAutofac": true,
"PermitLimit": 0,
"QueueCount": 0,
"RejectionStatusCode": 503
},
"DistributedCacheConfig": {
"DistributedCacheType": "redissynchronizedmemory",
"Enabled": false,
"ConnectionString": "127.0.0.1:6379,ssl=False",
"SchemaName": "dbo",
"TableName": "DistributedCache",
"InstanceName": "nopCommerce",
"PublishIntervalMs": 500
},
"HostingConfig": {
"UseProxy": false,
"ForwardedProtoHeaderName": "",
"ForwardedForHeaderName": "",
"KnownProxies": "",
"KnownNetworks": ""
},
"InstallationConfig": {
"DisableSampleData": false,
"DisabledPlugins": "",
"InstallRegionalResources": true
},
"PluginConfig": {
"UseUnsafeLoadAssembly": true
},
"WebOptimizer": {
"EnableJavaScriptBundling": true,
"EnableCssBundling": true,
"JavaScriptBundleSuffix": ".scripts",
"CssBundleSuffix": ".styles",
"EnableCaching": true,
"EnableMemoryCache": true,
"EnableDiskCache": true,
"CacheDirectory": "Users/chenyanhan/Documents/Visual Studio/Kneo_marketplace/Presentation/Nop.Web/wwwroot/bundles",
"EnableTagHelperBundling": false,
"CdnUrl": "",
"AllowEmptyBundle": true,
"HttpsCompression": 2
}
}

42
src/Presentation/Nop.Web/App_Data/plugins.json
View File

@ -1,42 +0,0 @@
{
"InstalledPluginNames": [
"Obsolete field, using only for compatibility"
],
"InstalledPlugins": [
{
"SystemName": "DiscountRequirement.MustBeAssignedToCustomerRole",
"Version": "4.70.3"
},
{
"SystemName": "Payments.TapPay",
"Version": "4.70"
},
{
"SystemName": "Misc.Omnisend",
"Version": "4.70.2"
},
{
"SystemName": "Widgets.NivoSlider",
"Version": "4.70.2"
},
{
"SystemName": "Widgets.GoogleAnalytics",
"Version": "4.70.2"
},
{
"SystemName": "Misc.WebApi.Frontend",
"Version": "4.70.2"
},
{
"SystemName": "CurrencyExchange.ECB",
"Version": "4.70.2"
},
{
"SystemName": "Shipping.FixedByWeightByTotal",
"Version": "4.70.7"
}
],
"PluginNamesToUninstall": [],
"PluginNamesToDelete": [],
"PluginNamesToInstall": []
}