diff --git a/PublishSite/PublishForm.Designer.cs b/PublishSite/PublishForm.Designer.cs index 5d1f6833..8e83ccc7 100644 --- a/PublishSite/PublishForm.Designer.cs +++ b/PublishSite/PublishForm.Designer.cs @@ -59,6 +59,15 @@ startOrStopServiceTbox = new TextBox(); tabPage2 = new TabPage(); groupBox6 = new GroupBox(); + sshNetCorePublishBtn2 = new Button(); + selectPublishFolderPathBtn = new Button(); + label8 = new Label(); + publishFolderTBox = new TextBox(); + sshNetCorePublishBtn = new Button(); + sshVuePublishBtn = new Button(); + selectPublishFilePathBtn = new Button(); + publishFileTBox = new TextBox(); + label7 = new Label(); bakConfigSaveBtn = new Button(); startBakBtn = new Button(); backExePath = new TextBox(); @@ -71,15 +80,8 @@ netCorePublishBtn = new Button(); vuePublishBtn = new Button(); openFileDialog1 = new OpenFileDialog(); - label7 = new Label(); - publishFileTBox = new TextBox(); - selectPublishFilePathBtn = new Button(); - sshVuePublishBtn = new Button(); - sshNetCorePublishBtn = new Button(); - publishFolderTBox = new TextBox(); - label8 = new Label(); - selectPublishFolderPathBtn = new Button(); - sshNetCorePublishBtn2 = new Button(); + openPublishFileDialog = new OpenFileDialog(); + folderBrowserDialog1 = new FolderBrowserDialog(); groupBox1.SuspendLayout(); groupBox3.SuspendLayout(); tabControl1.SuspendLayout(); @@ -233,11 +235,11 @@ // label6 // label6.AutoSize = true; - label6.Location = new Point(71, 223); + label6.Location = new Point(47, 226); label6.Name = "label6"; - label6.Size = new Size(32, 17); + label6.Size = new Size(80, 17); label6.TabIndex = 39; - label6.Text = "端口"; + label6.Text = "服务启动端口"; // // serviceNameTBox // @@ -301,20 +303,20 @@ // label9 // label9.AutoSize = true; - label9.Location = new Point(72, 172); + label9.Location = new Point(47, 172); label9.Name = "label9"; - label9.Size = new Size(32, 17); + label9.Size = new Size(80, 17); label9.TabIndex = 32; - label9.Text = "程序"; + label9.Text = "程序完整路径"; // // label1 // label1.AutoSize = true; - label1.Location = new Point(71, 274); + label1.Location = new Point(35, 280); label1.Name = "label1"; - label1.Size = new Size(44, 17); + label1.Size = new Size(92, 17); label1.TabIndex = 35; - label1.Text = "环境名"; + label1.Text = "服务定义环境名"; // // exePathTbox // @@ -325,7 +327,7 @@ // // selectPathBtn // - selectPathBtn.Location = new Point(589, 123); + selectPathBtn.Location = new Point(589, 172); selectPathBtn.Name = "selectPathBtn"; selectPathBtn.Size = new Size(95, 27); selectPathBtn.TabIndex = 34; @@ -419,6 +421,88 @@ groupBox6.TabStop = false; groupBox6.Text = "上传文件到远程服务器发布"; // + // sshNetCorePublishBtn2 + // + sshNetCorePublishBtn2.Location = new Point(290, 341); + sshNetCorePublishBtn2.Name = "sshNetCorePublishBtn2"; + sshNetCorePublishBtn2.Size = new Size(128, 40); + sshNetCorePublishBtn2.TabIndex = 52; + sshNetCorePublishBtn2.Text = "发布后端"; + sshNetCorePublishBtn2.UseVisualStyleBackColor = true; + sshNetCorePublishBtn2.Click += sshNetCorePublishBtn2_Click; + // + // selectPublishFolderPathBtn + // + selectPublishFolderPathBtn.Location = new Point(606, 282); + selectPublishFolderPathBtn.Name = "selectPublishFolderPathBtn"; + selectPublishFolderPathBtn.Size = new Size(95, 27); + selectPublishFolderPathBtn.TabIndex = 51; + selectPublishFolderPathBtn.Text = "选择"; + selectPublishFolderPathBtn.UseVisualStyleBackColor = true; + selectPublishFolderPathBtn.Click += selectPublishFolderPathBtn_Click; + // + // label8 + // + label8.AutoSize = true; + label8.Location = new Point(14, 245); + label8.Name = "label8"; + label8.Size = new Size(360, 17); + label8.TabIndex = 50; + label8.Text = "方式二： 后端发布程序文件夹（自己打成压缩包，上传然后发布）"; + // + // publishFolderTBox + // + publishFolderTBox.Location = new Point(14, 282); + publishFolderTBox.Name = "publishFolderTBox"; + publishFolderTBox.Size = new Size(547, 23); + publishFolderTBox.TabIndex = 49; + // + // sshNetCorePublishBtn + // + sshNetCorePublishBtn.Location = new Point(290, 153); + sshNetCorePublishBtn.Name = "sshNetCorePublishBtn"; + sshNetCorePublishBtn.Size = new Size(128, 40); + sshNetCorePublishBtn.TabIndex = 48; + sshNetCorePublishBtn.Text = "发布后端"; + sshNetCorePublishBtn.UseVisualStyleBackColor = true; + sshNetCorePublishBtn.Click += sshNetCorePublishBtn_Click; + // + // sshVuePublishBtn + // + sshVuePublishBtn.Location = new Point(55, 153); + sshVuePublishBtn.Name = "sshVuePublishBtn"; + sshVuePublishBtn.Size = new Size(128, 40); + sshVuePublishBtn.TabIndex = 47; + sshVuePublishBtn.Text = "发布前端"; + sshVuePublishBtn.UseVisualStyleBackColor = true; + sshVuePublishBtn.Click += sshVuePublishBtn_Click; + // + // selectPublishFilePathBtn + // + selectPublishFilePathBtn.Location = new Point(606, 94); + selectPublishFilePathBtn.Name = "selectPublishFilePathBtn"; + selectPublishFilePathBtn.Size = new Size(95, 27); + selectPublishFilePathBtn.TabIndex = 46; + selectPublishFilePathBtn.Text = "选择"; + selectPublishFilePathBtn.UseVisualStyleBackColor = true; + selectPublishFilePathBtn.Click += selectPublishFilePathBtn_Click; + // + // publishFileTBox + // + publishFileTBox.Location = new Point(14, 98); + publishFileTBox.Name = "publishFileTBox"; + publishFileTBox.Size = new Size(547, 23); + publishFileTBox.TabIndex = 45; + // + // label7 + // + label7.AutoSize = true; + label7.Location = new Point(27, 65); + label7.Name = "label7"; + label7.Size = new Size(276, 17); + label7.TabIndex = 44; + label7.Text = "方式一： 前端发布选择html | 后端发布选择压缩包"; + // // bakConfigSaveBtn // bakConfigSaveBtn.Location = new Point(160, 186); @@ -523,89 +607,9 @@ // openFileDialog1.FileName = "openFileDialog1"; // - // label7 + // openPublishFileDialog // - label7.AutoSize = true; - label7.Location = new Point(27, 65); - label7.Name = "label7"; - label7.Size = new Size(276, 17); - label7.TabIndex = 44; - label7.Text = "方式一： 前端发布选择html | 后端发布选择压缩包"; - // - // publishFileTBox - // - publishFileTBox.Enabled = false; - publishFileTBox.Location = new Point(14, 98); - publishFileTBox.Name = "publishFileTBox"; - publishFileTBox.Size = new Size(547, 23); - publishFileTBox.TabIndex = 45; - // - // selectPublishFilePathBtn - // - selectPublishFilePathBtn.Location = new Point(606, 94); - selectPublishFilePathBtn.Name = "selectPublishFilePathBtn"; - selectPublishFilePathBtn.Size = new Size(95, 27); - selectPublishFilePathBtn.TabIndex = 46; - selectPublishFilePathBtn.Text = "选择"; - selectPublishFilePathBtn.UseVisualStyleBackColor = true; - selectPublishFilePathBtn.Click += selectPublishFilePathBtn_Click; - // - // sshVuePublishBtn - // - sshVuePublishBtn.Location = new Point(55, 153); - sshVuePublishBtn.Name = "sshVuePublishBtn"; - sshVuePublishBtn.Size = new Size(128, 40); - sshVuePublishBtn.TabIndex = 47; - sshVuePublishBtn.Text = "发布前端"; - sshVuePublishBtn.UseVisualStyleBackColor = true; - sshVuePublishBtn.Click += sshVuePublishBtn_Click; - // - // sshNetCorePublishBtn - // - sshNetCorePublishBtn.Location = new Point(290, 153); - sshNetCorePublishBtn.Name = "sshNetCorePublishBtn"; - sshNetCorePublishBtn.Size = new Size(128, 40); - sshNetCorePublishBtn.TabIndex = 48; - sshNetCorePublishBtn.Text = "发布后端"; - sshNetCorePublishBtn.UseVisualStyleBackColor = true; - sshNetCorePublishBtn.Click += sshNetCorePublishBtn_Click; - // - // publishFolderTBox - // - publishFolderTBox.Enabled = false; - publishFolderTBox.Location = new Point(14, 282); - publishFolderTBox.Name = "publishFolderTBox"; - publishFolderTBox.Size = new Size(547, 23); - publishFolderTBox.TabIndex = 49; - // - // label8 - // - label8.AutoSize = true; - label8.Location = new Point(14, 245); - label8.Name = "label8"; - label8.Size = new Size(360, 17); - label8.TabIndex = 50; - label8.Text = "方式二： 后端发布程序文件夹（自己打成压缩包，上传然后发布）"; - // - // selectPublishFolderPathBtn - // - selectPublishFolderPathBtn.Location = new Point(606, 282); - selectPublishFolderPathBtn.Name = "selectPublishFolderPathBtn"; - selectPublishFolderPathBtn.Size = new Size(95, 27); - selectPublishFolderPathBtn.TabIndex = 51; - selectPublishFolderPathBtn.Text = "选择"; - selectPublishFolderPathBtn.UseVisualStyleBackColor = true; - selectPublishFolderPathBtn.Click += selectPublishFolderPathBtn_Click; - // - // sshNetCorePublishBtn2 - // - sshNetCorePublishBtn2.Location = new Point(290, 341); - sshNetCorePublishBtn2.Name = "sshNetCorePublishBtn2"; - sshNetCorePublishBtn2.Size = new Size(128, 40); - sshNetCorePublishBtn2.TabIndex = 52; - sshNetCorePublishBtn2.Text = "发布后端"; - sshNetCorePublishBtn2.UseVisualStyleBackColor = true; - sshNetCorePublishBtn2.Click += sshNetCorePublishBtn2_Click; + openPublishFileDialog.FileName = "openFileDialog2"; // // PublishForm // @@ -688,5 +692,7 @@ private Label label8; private TextBox publishFolderTBox; private Button sshNetCorePublishBtn2; + private OpenFileDialog openPublishFileDialog; + private FolderBrowserDialog folderBrowserDialog1; } } \ No newline at end of file diff --git a/PublishSite/PublishForm.cs b/PublishSite/PublishForm.cs index 24ef5daa..a87b63de 100644 --- a/PublishSite/PublishForm.cs +++ b/PublishSite/PublishForm.cs @@ -19,6 +19,7 @@ using System.ServiceProcess; using Renci.SshNet.Messages; using System.Management; using System.IO; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window; namespace PublishSite { @@ -652,11 +653,27 @@ namespace PublishSite private void selectPublishFilePathBtn_Click(object sender, EventArgs e) { + + OpenFileDialog dialog = new OpenFileDialog(); + if (dialog.ShowDialog() == DialogResult.OK) + { + publishFileTBox.Text = dialog.FileName; + + WinformLog($"远程部署文件选择成功", Color.Green); + } + } private void selectPublishFolderPathBtn_Click(object sender, EventArgs e) { + FolderBrowserDialog dialog = new FolderBrowserDialog(); + dialog.Description = "选择目录"; + if (dialog.ShowDialog() == DialogResult.OK) + { + publishFolderTBox.Text = dialog.SelectedPath; + WinformLog($"远程部署后端发布文件夹选择成功", Color.Green); + } } private void sshVuePublishBtn_Click(object sender, EventArgs e) diff --git a/PublishSite/PublishForm.resx b/PublishSite/PublishForm.resx index 4a03187d..91fcf53d 100644 --- a/PublishSite/PublishForm.resx +++ b/PublishSite/PublishForm.resx @@ -60,4 +60,10 @@ 17, 17 + + 165, 17 + + + 349, 17 + \ No newline at end of file