新增部署版本时，支持指定发布模式，局部发布还是完整发布

NewLifeX · Jul 28, 2024 · 32e07ca · 32e07ca
1 parent d25440a
commit 32e07ca
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 6 deletions.
diff --git a/Stardust.Data/Deployment/Model.xml b/Stardust.Data/Deployment/Model.xml
@@ -123,6 +123,7 @@
         <Column Name="Enable" DataType="Boolean" Description="启用" />
         <Column Name="Url" DataType="String" ItemType="file" Length="500" Description="资源地址。一般打包为Zip包，StarAgent下载后解压缩覆盖" />
         <Column Name="Overwrite" DataType="String" Length="100" Description="覆盖文件。需要拷贝覆盖已存在的文件或子目录，支持*模糊匹配，多文件分号隔开。如果目标文件不存在，配置文件等自动拷贝" />
+        <Column Name="Mode" DataType="Int32" Description="发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件" Type="Stardust.Models.DeployModes" />
         <Column Name="Size" DataType="Int64" ItemType="GMK" Description="文件大小" />
         <Column Name="Hash" DataType="String" Description="文件哈希。MD5散列，避免下载的文件有缺失" />
         <Column Name="Runtime" DataType="Int32" Description="运行时。RID是运行时标识符，用于标识应用程序运行所在的目标平台。如win-x64/linux-arm" Type="Stardust.Models.RuntimeIdentifier" />

diff --git a/Stardust.Data/Deployment/Stardust.htm b/Stardust.Data/Deployment/Stardust.htm
@@ -809,6 +809,17 @@ <h3>部署版本（AppDeployVersion）</h3>
             <td>需要拷贝覆盖已存在的文件或子目录，支持*模糊匹配，多文件分号隔开。如果目标文件不存在，配置文件等自动拷贝</td>
         </tr>
 
+        <tr>
+            <td>Mode</td>
+            <td>发布模式</td>
+            <td>Int32</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>N</td>
+            <td>1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件</td>
+        </tr>
+
         <tr>
             <td>Size</td>
             <td>文件大小</td>

diff --git a/Stardust.Data/Deployment/部署版本.cs b/Stardust.Data/Deployment/部署版本.cs
@@ -70,6 +70,14 @@ public partial class AppDeployVersion
     [BindColumn("Overwrite", "覆盖文件。需要拷贝覆盖已存在的文件或子目录，支持*模糊匹配，多文件分号隔开。如果目标文件不存在，配置文件等自动拷贝", "")]
     public String Overwrite { get => _Overwrite; set { if (OnPropertyChanging("Overwrite", value)) { _Overwrite = value; OnPropertyChanged("Overwrite"); } } }
 
+    private Stardust.Models.DeployModes _Mode;
+    /// <summary>发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件</summary>
+    [DisplayName("发布模式")]
+    [Description("发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件")]
+    [DataObjectField(false, false, false, 0)]
+    [BindColumn("Mode", "发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件", "")]
+    public Stardust.Models.DeployModes Mode { get => _Mode; set { if (OnPropertyChanging("Mode", value)) { _Mode = value; OnPropertyChanged("Mode"); } } }
+
     private Int64 _Size;
     /// <summary>文件大小</summary>
     [DisplayName("文件大小")]
@@ -216,6 +224,7 @@ public override Object this[String name]
             "Enable" => _Enable,
             "Url" => _Url,
             "Overwrite" => _Overwrite,
+            "Mode" => _Mode,
             "Size" => _Size,
             "Hash" => _Hash,
             "Runtime" => _Runtime,
@@ -243,6 +252,7 @@ public override Object this[String name]
                 case "Enable": _Enable = value.ToBoolean(); break;
                 case "Url": _Url = Convert.ToString(value); break;
                 case "Overwrite": _Overwrite = Convert.ToString(value); break;
+                case "Mode": _Mode = (Stardust.Models.DeployModes)value.ToInt(); break;
                 case "Size": _Size = value.ToLong(); break;
                 case "Hash": _Hash = Convert.ToString(value); break;
                 case "Runtime": _Runtime = (Stardust.Models.RuntimeIdentifier)value.ToInt(); break;
@@ -312,6 +322,9 @@ public partial class _
         /// <summary>覆盖文件。需要拷贝覆盖已存在的文件或子目录，支持*模糊匹配，多文件分号隔开。如果目标文件不存在，配置文件等自动拷贝</summary>
         public static readonly Field Overwrite = FindByName("Overwrite");
 
+        /// <summary>发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件</summary>
+        public static readonly Field Mode = FindByName("Mode");
+
         /// <summary>文件大小</summary>
         public static readonly Field Size = FindByName("Size");
 
@@ -381,6 +394,9 @@ public partial class __
         /// <summary>覆盖文件。需要拷贝覆盖已存在的文件或子目录，支持*模糊匹配，多文件分号隔开。如果目标文件不存在，配置文件等自动拷贝</summary>
         public const String Overwrite = "Overwrite";
 
+        /// <summary>发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件</summary>
+        public const String Mode = "Mode";
+
         /// <summary>文件大小</summary>
         public const String Size = "Size";
 

diff --git a/Stardust.Data/make.bat → Stardust.Data/xcodetool.bat b/Stardust.Data/make.bat → Stardust.Data/xcodetool.bat
diff --git a/Stardust.Server/Controllers/DeployController.cs b/Stardust.Server/Controllers/DeployController.cs
@@ -72,6 +72,7 @@ public DeployInfo[] GetAll()
                 Url = ver?.Url,
                 Hash = ver?.Hash,
                 Overwrite = ver?.Overwrite,
+                Mode = ver.Mode,
 
                 Service = item.ToService(app),
             };

diff --git a/Stardust.Web/Areas/Deployment/Controllers/AppDeployController.cs b/Stardust.Web/Areas/Deployment/Controllers/AppDeployController.cs
@@ -19,7 +19,7 @@ public class AppDeployController : EntityController<AppDeploy>
     static AppDeployController()
     {
         ListFields.RemoveCreateField();
-        ListFields.RemoveField("AppId", "Repository", "Branch", "ProjectPath", "PackageFilters", "WorkingDirectory", "UserName", "MaxMemory", "Mode", "Remark");
+        ListFields.RemoveField("AppId", "MultiVersion", "Repository", "Branch", "ProjectPath", "PackageFilters", "WorkingDirectory", "UserName", "Environments", "MaxMemory", "Mode", "Remark");
         AddFormFields.RemoveCreateField();
 
         LogOnChange = true;

diff --git a/Stardust/Deployment/ZipDeploy.cs b/Stardust/Deployment/ZipDeploy.cs
@@ -2,6 +2,7 @@
 using System.Xml.Serialization;
 using NewLife;
 using NewLife.Log;
+using Stardust.Models;
 
 namespace Stardust.Deployment;
 
@@ -37,6 +38,9 @@ public class ZipDeploy
     /// <summary>覆盖文件。需要拷贝覆盖已存在的文件或子目录，支持*模糊匹配，多文件分号隔开。如果目标文件不存在，配置文件等自动拷贝</summary>
     public String? Overwrite { get; set; }
 
+    /// <summary>发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件</summary>
+    public DeployModes Mode { get; set; }
+
     /// <summary>进程</summary>
     public Process? Process { get; private set; }
 
@@ -391,19 +395,42 @@ public virtual void Extract(String shadow, CopyModes exefile, CopyModes configfi
     {
         if (FileName.IsNullOrEmpty()) throw new ArgumentNullException(nameof(FileName));
 
-        using var span = Tracer?.NewSpan("ZipDeploy-Extract", new { shadow, WorkingDirectory, Overwrite });
+        using var span = Tracer?.NewSpan("ZipDeploy-Extract", new { shadow, WorkingDirectory, Overwrite, Mode });
 
         var fi = WorkingDirectory.CombinePath(FileName).AsFile();
         var rundir = fi.DirectoryName!;
         WriteLog("解压缩 {0} 到 {1}", FileName, shadow);
 
+        var sdi = shadow.AsDirectory();
+        span?.AppendTag($"sdi={sdi.FullName} rundir={rundir}");
+
+        // 前置清理
+        switch (Mode)
+        {
+            case DeployModes.Partial:
+                break;
+            case DeployModes.Standard:
+                WriteLog("清空影子目录中的可执行文件");
+                foreach (var item in sdi.GetFiles())
+                {
+                    if (IsExe(item.Extension))
+                        item.Delete();
+                }
+                break;
+            case DeployModes.Full:
+                WriteLog("清空影子目录中的所有文件");
+                sdi.Delete(true);
+                shadow.EnsureDirectory(false);
+                break;
+            default:
+                break;
+        }
+
         fi.Extract(shadow, true);
 
         var ovs = Overwrite?.Split(';');
 
         // 复制配置文件和数据文件到运行目录
-        var sdi = shadow.AsDirectory();
-        span?.AppendTag($"sdi={sdi.FullName} rundir={rundir}");
         if (!sdi.FullName.EnsureEnd("\\").EqualIgnoreCase(rundir.EnsureEnd("\\")))
         {
             if (exefile == CopyModes.ClearBeforeCopy)

diff --git a/Stardust/Managers/ServiceController.cs b/Stardust/Managers/ServiceController.cs
@@ -225,12 +225,18 @@ public Boolean Start()
             Name = Name,
             FileName = file,
             WorkingDirectory = workDir,
-            Overwrite = DeployInfo?.Overwrite,
 
             Tracer = Tracer,
             Log = new ActionLog(WriteLog),
         };
 
+        var di = DeployInfo;
+        if (di != null)
+        {
+            deploy.Overwrite = di.Overwrite;
+            deploy.Mode = di.Mode;
+        }
+
         //var args = service.Arguments?.Trim();
         if (!args.IsNullOrEmpty() && !deploy.Parse(args.Split(" "))) return null;
 
@@ -271,12 +277,18 @@ public Boolean Start()
             WorkingDirectory = workDir,
             UserName = service.UserName,
             Environments = service.Environments,
-            Overwrite = DeployInfo?.Overwrite,
 
             Tracer = Tracer,
             Log = new ActionLog(WriteLog),
         };
 
+        var di = DeployInfo;
+        if (di != null)
+        {
+            deploy.Overwrite = di.Overwrite;
+            deploy.Mode = di.Mode;
+        }
+
         // 如果出现超过一次的重启，则打开调试模式，截取控制台输出到日志
         if (_error > 1) deploy.Debug = true;
 

diff --git a/Stardust/Models/DeployInfo.cs b/Stardust/Models/DeployInfo.cs
@@ -18,6 +18,9 @@ public class DeployInfo
     /// <summary>覆盖文件。需要拷贝覆盖已存在的文件或子目录，支持*模糊匹配，多文件分号隔开。如果目标文件不存在，配置文件等自动拷贝</summary>
     public String? Overwrite { get; set; }
 
+    /// <summary>发布模式。1部分包，仅覆盖；2标准包，清空可执行文件再覆盖；3完整包，清空所有文件</summary>
+    public DeployModes Mode { get; set; }
+
     /// <summary>应用服务</summary>
     public ServiceInfo? Service { get; set; }
 }
diff --git a/Stardust/Models/DeployModes.cs b/Stardust/Models/DeployModes.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel;
+
+namespace Stardust.Models;
+
+/// <summary>发布模式</summary>
+public enum DeployModes
+{
+    ///// <summary>默认</summary>
+    //Default = 0,
+
+    /// <summary>部分包。覆盖已有文件，保留其它文件</summary>
+    [Description("部分包")]
+    Partial = 1,
+
+    /// <summary>标准包。清空所有可执行文件，保留配置和数据等其它文件</summary>
+    [Description("标准包")]
+    Standard = 2,
+
+    /// <summary>完整包。清空所有文件</summary>
+    [Description("完整包")]
+    Full = 3,
+}