支持aspnet_packer在linux上运行打包

ixre · ixre · commit f23e19a51a99 · 2022-03-01T13:11:22.000+08:00
diff --git a/aspnet_pack.sh b/aspnet_pack.sh
@@ -21,18 +21,34 @@ cp -r ../../JR.Cms.App/install ../../JR.Cms.App/oem  \
 echo "setup2: building.." && \
 #xbuild *.csproj /p:Configuration=Release
 
+
 mkdir ${RELEASE_DIR}/root \
     && cp -r root/*.md ${RELEASE_DIR}/root \
     && mkdir ${RELEASE_DIR}/templates \
     && cp -r templates/default ${RELEASE_DIR}/templates \
-    && cp -r bin public oem install plugins ${RELEASE_DIR} \
+    && cp -r public oem install plugins ${RELEASE_DIR} \
     && cp  Global.asax Web.config ${RELEASE_DIR}
 
+# optimize Web.config file
+sed -i 's/compilation debug="true"/compilation debug="false"/g' Web.config \
+    && sed -i 's/\s*targetFramework="[^"]*"//g' Web.config
+
+# if bin folder not exists. such on linux platform, use prebuild dll files to package. 
+if [ -d bin ];then 
+    cp -r bin ${RELEASE_DIR}
+else
+    mkdir ${RELEASE_DIR}/bin \
+        && cd ${RELEASE_DIR}/bin \
+        && unzip ../../../dll/aspnet_bin.zip >/dev/null
+    # replace cms core dll
+    find ../../../src/JR.Cms.App/bin/Debug -name "JR*.dll" | xargs -I {} cp {} .
+    # remove net core entrypoint dll
+    rm -rf JR.Cms.App.dll
+fi
+
 cd ${RELEASE_DIR} \
-    && sed -i 's/compilation debug="true"/compilation debug="false"/g' Web.config \
-    && sed -i 's/\s*targetFramework="[^"]*"//g' Web.config \
     && echo "setup3: clean assemblies.." \
-    && cd bin && rm -rf *.pdb *.xml *.config roslyn zh-Hans \
+    && cd bin && rm -rf *.pdb *.xml *.json *.config roslyn zh-Hans \
     Microsoft.Extensions.DependencyInjection.Abstractions.dll \
     Google.Protobuf.dll Microsoft.DotNet.PlatformAbstractions.dll \
     Microsoft.Extensions.WebEncoders.dll Microsoft.Extensions.Options.dll \
diff --git a/src/JR.Cms.App/config/cache.pid b/src/JR.Cms.App/config/cache.pid
@@ -1 +1 @@
-481662
+127917
diff --git a/src/JR.Cms/Cms.cs b/src/JR.Cms/Cms.cs
@@ -23,6 +23,7 @@
 using JR.Stand.Core.Framework.Web.UI;
 using JR.Stand.Core.PluginKernel;
 using JR.Stand.Core.Template.Impl;
+using JR.Stand.Core.Utils;
 using JR.Stand.Core.Web;
 using JR.Stand.Core.Web.Cache;
 using Logger = JR.Stand.Core.Framework.Logger;
diff --git a/src/JR.Cms/Conf/LangReader.cs b/src/JR.Cms/Conf/LangReader.cs
@@ -16,7 +16,7 @@ public class LangLabelReader
         public LangLabelReader(string filePath)
         {
             this.filePath = filePath;
-            this.cache = CacheFactory.Sington.RawCache();
+            this.cache = CacheFactory.Singleton.RawCache();
             cacheKey = String.Format("lang_cache_{0}" ,this.filePath.GetHashCode());
         }
 
diff --git a/src/JR.Cms/Conf/WebConfig.cs b/src/JR.Cms/Conf/WebConfig.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Conf
 {
diff --git a/src/JR.Cms/Core/CmsContext.cs b/src/JR.Cms/Core/CmsContext.cs
@@ -24,6 +24,7 @@
 using JR.Stand.Core;
 using JR.Stand.Core.Framework.Web.Cache;
 using JR.Stand.Core.Template.Impl;
+using JR.Stand.Core.Utils;
 using JR.Stand.Core.Web;
 
 namespace JR.Cms.Core
diff --git a/src/JR.Cms/Core/CmsUtility.cs b/src/JR.Cms/Core/CmsUtility.cs
@@ -14,6 +14,7 @@
 using System;
 using System.IO;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Core
 {
diff --git a/src/JR.Cms/Infrastructure/ResourceMap.cs b/src/JR.Cms/Infrastructure/ResourceMap.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.IO;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Infrastructure
 {
diff --git a/src/JR.Cms/Library/CacheProvider/Variables.cs b/src/JR.Cms/Library/CacheProvider/Variables.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Library.CacheProvider
 {
diff --git a/src/JR.Cms/Library/DataAccess/DB/DBAccess.cs b/src/JR.Cms/Library/DataAccess/DB/DBAccess.cs
@@ -3,6 +3,7 @@
 using JR.Stand.Core;
 using JR.Stand.Core.Data;
 using JR.Stand.Core.Framework;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Library.DataAccess.DB
 {
diff --git a/src/JR.Cms/Library/DataAccess/DB/DBAccessCreator.cs b/src/JR.Cms/Library/DataAccess/DB/DBAccessCreator.cs
@@ -3,6 +3,7 @@
 using System.Text.RegularExpressions;
 using JR.Stand.Core;
 using JR.Stand.Core.Data;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Library.DataAccess.DB
 {
diff --git a/src/JR.Cms/Updater.cs b/src/JR.Cms/Updater.cs
@@ -7,6 +7,7 @@
 using JR.Cms.Conf;
 using JR.Cms.Infrastructure;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 using SharpCompress.Archives;
 using SharpCompress.Common;
 
diff --git a/src/JR.Cms/Web/Addon/HttpTag/HttpTags.cs b/src/JR.Cms/Web/Addon/HttpTag/HttpTags.cs
@@ -5,6 +5,7 @@
 using JR.Stand.Core;
 using Microsoft.AspNetCore.Http;
 using JR.Stand.Core.Extensions.Http;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Toolkit.HttpTag
 {
diff --git a/src/JR.Cms/Web/Manager/FileExplor.cs b/src/JR.Cms/Web/Manager/FileExplor.cs
@@ -5,6 +5,7 @@
 using System.Text.RegularExpressions;
 using JR.Stand.Abstracts.Web;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Web.Manager
 {
diff --git a/src/JR.Cms/Web/Manager/Handle/AjaxHandler.cs b/src/JR.Cms/Web/Manager/Handle/AjaxHandler.cs
@@ -29,6 +29,7 @@
 using JR.Cms.Web.Util;
 using JR.Stand.Core;
 using JR.Stand.Core.Framework.Text;
+using JR.Stand.Core.Utils;
 using JR.Stand.Core.Web;
 using static JR.Cms.Updater;
 
diff --git a/src/JR.Cms/Web/Manager/Handle/ArchiveHandler.cs b/src/JR.Cms/Web/Manager/Handle/ArchiveHandler.cs
@@ -31,6 +31,7 @@
 using JR.Stand.Abstracts.Web;
 using JR.Stand.Core;
 using JR.Stand.Core.Framework;
+using JR.Stand.Core.Utils;
 using JR.Stand.Core.Web;
 using JsonSerializer = JR.Cms.Web.Util.JsonSerializer;
 
diff --git a/src/JR.Cms/Web/Manager/Handle/FileHandler.cs b/src/JR.Cms/Web/Manager/Handle/FileHandler.cs
@@ -16,6 +16,7 @@
 using System.Text;
 using JR.Cms.Conf;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Web.Manager.Handle
 {
diff --git a/src/JR.Cms/Web/Manager/Handle/ResourceHandler.cs b/src/JR.Cms/Web/Manager/Handle/ResourceHandler.cs
@@ -22,6 +22,7 @@
 using JR.Cms.Web.Resource;
 using JR.Stand.Core;
 using JR.Stand.Core.Framework.Web.Cache;
+using JR.Stand.Core.Utils;
 
 
 // http://bbs.csdn.net/topics/300217787 #17
diff --git a/src/JR.Cms/Web/Manager/Handle/TemplateHandler.cs b/src/JR.Cms/Web/Manager/Handle/TemplateHandler.cs
@@ -20,6 +20,7 @@
 using JR.Cms.Library.Utility;
 using JR.Stand.Core;
 using JR.Stand.Core.Framework;
+using JR.Stand.Core.Utils;
 using Newtonsoft.Json;
 using SharpCompress.Archives;
 using SharpCompress.Common;
diff --git a/src/JR.Cms/Web/Manager/Helper.cs b/src/JR.Cms/Web/Manager/Helper.cs
@@ -20,6 +20,7 @@
 using JR.Stand.Core;
 using JR.Stand.Core.Framework;
 using JR.Stand.Core.Framework.Web.UI;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Web.Manager
 {
diff --git a/src/JR.Cms/Web/Resource/SiteResourceInit.cs b/src/JR.Cms/Web/Resource/SiteResourceInit.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using JR.Cms.Conf;
 using JR.Stand.Core;
+using JR.Stand.Core.Utils;
 
 namespace JR.Cms.Web.Resource
 {
diff --git a/src/JR.Stand.Core/Data/DataBaseAccess.cs b/src/JR.Stand.Core/Data/DataBaseAccess.cs
@@ -17,6 +17,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using JR.Stand.Core.Data.Extensions;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.Data
 {
diff --git a/src/JR.Stand.Core/Framework/Graphic/GraphicsHelper.cs b/src/JR.Stand.Core/Framework/Graphic/GraphicsHelper.cs
@@ -4,6 +4,7 @@
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.IO;
+using JR.Stand.Core.Utils;
 
 /*******************************************
 * 文 件 名：ImageGraphicsUtility.cs
diff --git a/src/JR.Stand.Core/Framework/InnerAppDomainResolver.cs b/src/JR.Stand.Core/Framework/InnerAppDomainResolver.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.IO;
 using System.Reflection;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.Framework
 {
diff --git a/src/JR.Stand.Core/Framework/Web/Utils/FileUpload.cs b/src/JR.Stand.Core/Framework/Web/Utils/FileUpload.cs
@@ -8,6 +8,7 @@
 using System;
 using System.IO;
 using JR.Stand.Abstracts.Web;
+using JR.Stand.Core.Utils;
 using JR.Stand.Core.Web;
 using Microsoft.AspNetCore.Http;
 
diff --git a/src/JR.Stand.Core/FwCtx.cs b/src/JR.Stand.Core/FwCtx.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using JR.Stand.Core.Framework;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core
 {
diff --git a/src/JR.Stand.Core/PluginKernel/BasePluginHost.cs b/src/JR.Stand.Core/PluginKernel/BasePluginHost.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using JR.Stand.Core.Framework;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.PluginKernel
 {
diff --git a/src/JR.Stand.Core/PluginKernel/Logger.cs b/src/JR.Stand.Core/PluginKernel/Logger.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using JR.Stand.Core.Framework;
 using JR.Stand.Core.Framework.Extensions;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.PluginKernel
 {
diff --git a/src/JR.Stand.Core/PluginKernel/PluginPackAttribute.cs b/src/JR.Stand.Core/PluginKernel/PluginPackAttribute.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.IO;
 using JR.Stand.Core.Framework;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.PluginKernel
 {
diff --git a/src/JR.Stand.Core/Template/Impl/TemplatePage.cs b/src/JR.Stand.Core/Template/Impl/TemplatePage.cs
@@ -10,6 +10,7 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.Template.Impl
 {
diff --git a/src/JR.Stand.Core/Template/Impl/TemplateRegistry.cs b/src/JR.Stand.Core/Template/Impl/TemplateRegistry.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.Template.Impl
 {
diff --git a/src/JR.Stand.Core/Utils/EnvUtil.cs b/src/JR.Stand.Core/Utils/EnvUtil.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace JR.Stand.Core
+namespace JR.Stand.Core.Utils
 {
     public static class EnvUtil
     {
diff --git a/src/JR.Stand.Core/Web/Cache/CacheFactory.cs b/src/JR.Stand.Core/Web/Cache/CacheFactory.cs
@@ -1,4 +1,5 @@
-﻿using JR.Stand.Abstracts;
+﻿using System;
+using JR.Stand.Abstracts;
 using JR.Stand.Core.Utils;
 using JR.Stand.Core.Web.Cache.Component;
 
@@ -14,7 +15,7 @@ public static class CacheFactory
         /// <summary>
         /// 
         /// </summary>
-        public static ICache Sington
+        public static ICache Singleton
         {
             get
             {
@@ -24,7 +25,7 @@ public static ICache Sington
         }
 
         public static void Configure(IMemoryCacheWrapper  cache)
-        {
+        {     
             _cacheInstance = new BasicCache(new DependCache(cache));
         }
     }
diff --git a/src/JR.Stand.Core/Web/Cache/CacheUpdateAttribute.cs b/src/JR.Stand.Core/Web/Cache/CacheUpdateAttribute.cs
@@ -43,7 +43,7 @@ public CacheUpdateAttribute(CacheSign sign)
 		
 		public void Clear()
 		{
-            CacheFactory.Sington.Clear(this.Key);
+            CacheFactory.Singleton.Clear(this.Key);
 		}
 	}
 }
diff --git a/src/JR.Stand.Core/Web/Cache/Variables.cs b/src/JR.Stand.Core/Web/Cache/Variables.cs
@@ -1,12 +1,13 @@
 ﻿using System;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Core.Web.Cache
 {
     /// <summary>
     /// 
     /// </summary>
-    internal class Variables
+    internal static class Variables
     {
-        public static string PhysicPath =  EnvUtil.GetBaseDirectory();
+        public static readonly string PhysicPath =  EnvUtil.GetBaseDirectory();
     }
 }
diff --git a/src/JR.Stand.Core/Web/HttpHostingImpl.cs b/src/JR.Stand.Core/Web/HttpHostingImpl.cs
@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using JR.Stand.Abstracts;
+using JR.Stand.Core.Utils;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/JR.Stand.Core/Web/WebCtx.cs b/src/JR.Stand.Core/Web/WebCtx.cs
@@ -4,6 +4,7 @@
 using JR.Stand.Abstracts.Web;
 using JR.Stand.Core.Framework.Web.Cache;
 using JR.Stand.Core.PluginKernel.Web;
+using JR.Stand.Core.Utils;
 using JR.Stand.Core.Web.Cache;
 using JR.Stand.Core.Web.Cache.Component;
 using JR.Stand.Core.Web.Plugin;
@@ -122,7 +123,7 @@ public IPluginApp<HttpContextImpl> Plugin
 
         public ICache Cache
         {
-            get { return CacheFactory.Sington; }
+            get { return CacheFactory.Singleton; }
         }
 
      
diff --git a/src/JR.Stand.Toolkit/Crawl/Impl/WebManageHandler.cs b/src/JR.Stand.Toolkit/Crawl/Impl/WebManageHandler.cs
@@ -6,6 +6,7 @@
 using System.Web;
 using JR.Stand.Core;
 using JR.Stand.Core.Extensions.Http;
+using JR.Stand.Core.Utils;
 using Microsoft.AspNetCore.Http;
 
 namespace JR.Stand.Toolkit.Crawl.Impl
diff --git a/src/JR.Stand.Toolkit/HttpTag/HttpTags.cs b/src/JR.Stand.Toolkit/HttpTag/HttpTags.cs
@@ -5,6 +5,7 @@
 using JR.Stand.Core;
 using Microsoft.AspNetCore.Http;
 using JR.Stand.Core.Extensions.Http;
+using JR.Stand.Core.Utils;
 
 namespace JR.Stand.Toolkit.HttpTag
 {
diff --git a/src/NetFx/JR.Cms.AspNet.App/Web.config b/src/NetFx/JR.Cms.AspNet.App/Web.config
@@ -15,14 +15,14 @@
 
     可在 <httpRuntime> 标记上设置以下特性。
       <system.Web>
-        <httpRuntime targetFramework="4.7.2" />
+        <httpRuntime />
       </system.Web>
   -->
   <system.web>
-    <httpRuntime targetFramework="4.5" executionTimeout="3600" maxRequestLength="1048576" requestValidationMode="2.0" />
+    <httpRuntime executionTimeout="3600" maxRequestLength="1048576" requestValidationMode="2.0" />
     <customErrors mode="Off" />
     <pages validateRequest="false" controlRenderingCompatibilityVersion="4.0" />
-    <compilation debug="true" targetFramework="4.5" />
+    <compilation debug="false" />
   </system.web>
   <system.webServer>
     <security>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class LangLabelReader`
`16`	`16`	`public LangLabelReader(string filePath)`
`17`	`17`	`{`
`18`	`18`	`this.filePath = filePath;`
`19`		`- this.cache = CacheFactory.Sington.RawCache();`
	`19`	`+ this.cache = CacheFactory.Singleton.RawCache();`
`20`	`20`	`cacheKey = String.Format("lang_cache_{0}" ,this.filePath.GetHashCode());`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using System.Text.RegularExpressions;`
`5`	`5`	`using JR.Stand.Core;`
	`6`	`+using JR.Stand.Core.Utils;`
`6`	`7`
`7`	`8`	`namespace JR.Cms.Conf`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using System;`
`15`	`15`	`using System.IO;`
`16`	`16`	`using JR.Stand.Core;`
	`17`	`+using JR.Stand.Core.Utils;`
`17`	`18`
`18`	`19`	`namespace JR.Cms.Core`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
`3`	`3`	`using JR.Stand.Core;`
	`4`	`+using JR.Stand.Core.Utils;`
`4`	`5`
`5`	`6`	`namespace JR.Cms.Infrastructure`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using JR.Stand.Core;`
	`3`	`+using JR.Stand.Core.Utils;`
`3`	`4`
`4`	`5`	`namespace JR.Cms.Library.CacheProvider`
`5`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using JR.Stand.Core;`
`4`	`4`	`using JR.Stand.Core.Data;`
`5`	`5`	`using JR.Stand.Core.Framework;`
	`6`	`+using JR.Stand.Core.Utils;`
`6`	`7`
`7`	`8`	`namespace JR.Cms.Library.DataAccess.DB`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using JR.Stand.Core;`
`6`	`6`	`using Microsoft.AspNetCore.Http;`
`7`	`7`	`using JR.Stand.Core.Extensions.Http;`
	`8`	`+using JR.Stand.Core.Utils;`
`8`	`9`
`9`	`10`	`namespace JR.Stand.Toolkit.HttpTag`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Text.RegularExpressions;`
`6`	`6`	`using JR.Stand.Abstracts.Web;`
`7`	`7`	`using JR.Stand.Core;`
	`8`	`+using JR.Stand.Core.Utils;`
`8`	`9`
`9`	`10`	`namespace JR.Cms.Web.Manager`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using System.Text;`
`17`	`17`	`using JR.Cms.Conf;`
`18`	`18`	`using JR.Stand.Core;`
	`19`	`+using JR.Stand.Core.Utils;`
`19`	`20`
`20`	`21`	`namespace JR.Cms.Web.Manager.Handle`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`using JR.Stand.Core;`
`21`	`21`	`using JR.Stand.Core.Framework;`
`22`	`22`	`using JR.Stand.Core.Framework.Web.UI;`
	`23`	`+using JR.Stand.Core.Utils;`
`23`	`24`
`24`	`25`	`namespace JR.Cms.Web.Manager`
`25`	`26`	`{`