Skip to content

1.增加fireUrl判断，如果是http开头则走直接请求，否则走shell执行,2.ui修改文本框长度 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

1.增加fireUrl判断，如果是http开头则走直接请求，否则走shell执行,2.ui修改文本框长度 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb83b80
1.增加fireUrl判断，如果是http开头则走直接请求，否则走shell执行
dazhu6666 Jan 8, 2024
9a34efe
1
dazhu6666 Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions AntDeployWinform/Models/DeployConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class GlobalConfig
public bool UseAsiaShanghai { get; set; }
public bool SaveLogs { get; set; }
public bool MultiInstance { get; set; }
public List<string> ProjectPathList { get; set; }
public List<string> ProjectPathList { get; set; }
}

/// <summary>
Expand Down Expand Up @@ -71,7 +71,7 @@ public string GetNetCorePublishRuntimeArg()
}
}

public delegate void EnvChange(Env env, bool isServerChange,bool isRemove);
public delegate void EnvChange(Env env, bool isServerChange, bool isRemove);
public class DeployConfig
{
public event EnvChange EnvChangeEvent;
Expand All @@ -80,7 +80,7 @@ public class DeployConfig
public void AddEnv(Env env)
{
this.Env.Add(env);
EnvChangeEvent?.Invoke(env, false,false);
EnvChangeEvent?.Invoke(env, false, false);
}

public void RemoveEnv(int index)
Expand All @@ -91,12 +91,12 @@ public void RemoveEnv(int index)
}
var env = this.Env[index];
this.Env.RemoveAt(index);
EnvChangeEvent?.Invoke(env, false,true);
EnvChangeEvent?.Invoke(env, false, true);
}

public void EnvServerChange(Env env)
{
EnvChangeEvent?.Invoke(env, true,false);
EnvChangeEvent?.Invoke(env, true, false);
}


Expand Down Expand Up @@ -154,7 +154,7 @@ public DockerImageConfig()
public ImageCredential TargetImageCredential { get; set; }

public string ImageFormat { get; set; }

public string[] Entrypoint { get; set; }
public string[] Cmd { get; set; }
public List<string> IgnoreList { get; set; }
Expand Down Expand Up @@ -263,6 +263,11 @@ public class BaseServer
public string DockerFireUrl { get; set; }
public string WindowsServiceFireUrl { get; set; }
public string LinuxServiceFireUrl { get; set; }

/// <summary>
/// 判断是否http地址
/// </summary>
public bool IsHttpUrl => string.IsNullOrEmpty(DockerFireUrl) ? false : DockerFireUrl.StartsWith("http", System.StringComparison.InvariantCultureIgnoreCase);
}


Expand Down
6 changes: 1 addition & 5 deletions AntDeployWinform/Models/ProgressBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,11 +495,7 @@ public bool CheckFireUrl()
}

var url = this.FireUrlText.Text.ToLower();
if (!string.IsNullOrEmpty(url) && !url.StartsWith("http"))
{
return false;
}


if (ServerType.Equals(ServerType.IIS))
{
Server.IIsFireUrl = this.FireUrlText.Text;
Expand Down
Loading