Merge branch 'master' of http://139.155.15.221:3000/zoulei/DW5S

DW5S.App/CorTools/DetectToolForm.cs

@@ -55,7 +55,7 @@ namespace DW5S.App.CorTools
                     string file1 = null, file2 = null;
                     try
                     {
-                        file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, SysConfig.GetBaseUrl());
+                        file1 = await HttpHelper.UploadFileAsync(btnFile1.Text);
                     }
                     catch (Exception ex)
                     {
@@ -66,7 +66,7 @@ namespace DW5S.App.CorTools
                     }
                     try
                     {
-                        file2 = await HttpHelper.UploadFileAsync(btnFile2.Text, SysConfig.GetBaseUrl());
+                        file2 = await HttpHelper.UploadFileAsync(btnFile2.Text);
                     }
                     catch (Exception ex)
                     {
@@ -149,7 +149,7 @@ namespace DW5S.App.CorTools
                             t.snr = null;
                         });
                         gridView1.RefreshData();
-                        var file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, SysConfig.GetBaseUrl());
+                        var file1 = await HttpHelper.UploadFileAsync(btnFile1.Text);
                         var smps = data.Select(p => new SmpPosition()
                         {
                             smpStart = p.smpstart,
@@ -241,7 +241,7 @@ namespace DW5S.App.CorTools
             {
                 dto.fsHz = double.Parse(tefs.Text) * 1e6;
                 dto.band = double.Parse(txtBand.Text);
-                dto.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, SysConfig.GetBaseUrl());
+                dto.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text);
                 var dmcResult = await HttpHelper.PostRequestAsync<IEnumerable<DetectResDto>>(SysConfig.GetUrl("DetectCg/DetectCalc"), dto);
                 if (dmcResult.code == 200)
                 {
@@ -298,8 +298,8 @@ namespace DW5S.App.CorTools
             layoutControl1.Enabled = false;
             try
             {
-                xItem.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, SysConfig.GetBaseUrl());
-                xItem.file2 = await HttpHelper.UploadFileAsync(btnFile2.Text, SysConfig.GetBaseUrl());
+                xItem.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text);
+                xItem.file2 = await HttpHelper.UploadFileAsync(btnFile2.Text);
             }
             catch (Exception ex)
             {
@@ -389,8 +389,8 @@ namespace DW5S.App.CorTools
                     smpCount = double.Parse(teCount.Text),
                     snrThreshold = int.Parse(teSnr.Text),
                 };
-                par.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, SysConfig.GetBaseUrl());
-                par.file2 = await HttpHelper.UploadFileAsync(btnFile2.Text, SysConfig.GetBaseUrl());
+                par.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text);
+                par.file2 = await HttpHelper.UploadFileAsync(btnFile2.Text);
                 var resp = await HttpHelper.PostRequestAsync<List<ImageResultDto>>(SysConfig.GetUrl("DetectCg/DrawImage"), par);
                 await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), par.file1, par.file2);
                 if (resp.code != 200)

DW5S.App/CorTools/GpuCalcForm.cs

@@ -63,8 +63,8 @@ namespace DW5S.App.CorTools
             string file1, file2;
             try
             {
-                file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, SysConfig.GetBaseUrl());
-                file2 = await HttpHelper.UploadFileAsync(btnFile2.Text, SysConfig.GetBaseUrl());
+                file1 = await HttpHelper.UploadFileAsync(btnFile1.Text);
+                file2 = await HttpHelper.UploadFileAsync(btnFile2.Text);
             }
             catch (Exception ex)
             {

DW5S.App/CorTools/ResampleForm.cs

@@ -92,7 +92,7 @@ namespace DW5S.App.CorTools
                 string file = null;
                 try
                 {
-                    file = await HttpHelper.UploadFileAsync(txtFile.Text, SysConfig.GetBaseUrl());
+                    file = await HttpHelper.UploadFileAsync(txtFile.Text);
                 }
                 catch (Exception ex)
                 {

DW5S.App/EditForms/FixedStationEditor.Designer.cs

@@ -43,362 +43,355 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.txtEnable = new DevExpress.XtraEditors.CheckEdit();
-            this.btnOk = new DevExpress.XtraEditors.SimpleButton();
-            this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
-            this.txtLon = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtName = new DevExpress.XtraEditors.TextEdit();
-            this.txtFreqUp = new DevExpress.XtraEditors.SearchLookUpEdit();
-            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.txtLat = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtValue = new DevExpress.XtraEditors.ButtonEdit();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEnable.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLon.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFreqUp.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLat.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtValue.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.simpleLabelItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            this.SuspendLayout();
+            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            txtEnable = new DevExpress.XtraEditors.CheckEdit();
+            btnOk = new DevExpress.XtraEditors.SimpleButton();
+            btnCancel = new DevExpress.XtraEditors.SimpleButton();
+            txtLon = new DevExpress.XtraEditors.ButtonEdit();
+            txtName = new DevExpress.XtraEditors.TextEdit();
+            txtFreqUp = new DevExpress.XtraEditors.SearchLookUpEdit();
+            searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            txtLat = new DevExpress.XtraEditors.ButtonEdit();
+            txtValue = new DevExpress.XtraEditors.ButtonEdit();
+            Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
+            simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
+            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+            layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)txtEnable.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtLon.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtName.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtFreqUp.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtLat.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtValue.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)simpleLabelItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
+            SuspendLayout();
             // 
             // layoutControl1
             // 
-            this.layoutControl1.Controls.Add(this.txtEnable);
-            this.layoutControl1.Controls.Add(this.btnOk);
-            this.layoutControl1.Controls.Add(this.btnCancel);
-            this.layoutControl1.Controls.Add(this.txtLon);
-            this.layoutControl1.Controls.Add(this.txtName);
-            this.layoutControl1.Controls.Add(this.txtFreqUp);
-            this.layoutControl1.Controls.Add(this.txtLat);
-            this.layoutControl1.Controls.Add(this.txtValue);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(831, 101, 650, 400);
-            this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(270, 385);
-            this.layoutControl1.TabIndex = 0;
-            this.layoutControl1.Text = "layoutControl1";
+            layoutControl1.Controls.Add(txtEnable);
+            layoutControl1.Controls.Add(btnOk);
+            layoutControl1.Controls.Add(btnCancel);
+            layoutControl1.Controls.Add(txtLon);
+            layoutControl1.Controls.Add(txtName);
+            layoutControl1.Controls.Add(txtFreqUp);
+            layoutControl1.Controls.Add(txtLat);
+            layoutControl1.Controls.Add(txtValue);
+            layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            layoutControl1.Location = new System.Drawing.Point(0, 0);
+            layoutControl1.Name = "layoutControl1";
+            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(831, 101, 650, 400);
+            layoutControl1.Root = Root;
+            layoutControl1.Size = new System.Drawing.Size(270, 416);
+            layoutControl1.TabIndex = 0;
+            layoutControl1.Text = "layoutControl1";
             // 
             // txtEnable
             // 
-            this.txtEnable.Location = new System.Drawing.Point(22, 302);
-            this.txtEnable.Name = "txtEnable";
-            this.txtEnable.Properties.Caption = "是否启用";
-            this.txtEnable.Size = new System.Drawing.Size(226, 20);
-            this.txtEnable.StyleController = this.layoutControl1;
-            this.txtEnable.TabIndex = 9;
+            txtEnable.Location = new System.Drawing.Point(22, 302);
+            txtEnable.Name = "txtEnable";
+            txtEnable.Properties.Caption = "是否启用";
+            txtEnable.Size = new System.Drawing.Size(226, 20);
+            txtEnable.StyleController = layoutControl1;
+            txtEnable.TabIndex = 6;
             // 
             // btnOk
             // 
-            this.btnOk.Location = new System.Drawing.Point(136, 340);
-            this.btnOk.Name = "btnOk";
-            this.btnOk.Size = new System.Drawing.Size(112, 22);
-            this.btnOk.StyleController = this.layoutControl1;
-            this.btnOk.TabIndex = 8;
-            this.btnOk.Text = "确定";
-            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+            btnOk.Location = new System.Drawing.Point(136, 350);
+            btnOk.Name = "btnOk";
+            btnOk.Size = new System.Drawing.Size(112, 22);
+            btnOk.StyleController = layoutControl1;
+            btnOk.TabIndex = 8;
+            btnOk.Text = "确定";
+            btnOk.Click += btnOk_Click;
             // 
             // btnCancel
             // 
-            this.btnCancel.Location = new System.Drawing.Point(22, 340);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(110, 22);
-            this.btnCancel.StyleController = this.layoutControl1;
-            this.btnCancel.TabIndex = 7;
-            this.btnCancel.Text = "取消";
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            btnCancel.Location = new System.Drawing.Point(22, 350);
+            btnCancel.Name = "btnCancel";
+            btnCancel.Size = new System.Drawing.Size(110, 22);
+            btnCancel.StyleController = layoutControl1;
+            btnCancel.TabIndex = 7;
+            btnCancel.Text = "取消";
+            btnCancel.Click += btnCancel_Click;
             // 
             // txtLon
             // 
-            this.txtLon.Location = new System.Drawing.Point(22, 147);
-            this.txtLon.Name = "txtLon";
-            this.txtLon.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
-            this.txtLon.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtLon.Properties.MaxLength = 10;
-            this.txtLon.Size = new System.Drawing.Size(226, 23);
-            this.txtLon.StyleController = this.layoutControl1;
-            this.txtLon.TabIndex = 6;
+            txtLon.Location = new System.Drawing.Point(22, 147);
+            txtLon.Name = "txtLon";
+            txtLon.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+            txtLon.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+            txtLon.Properties.MaxLength = 10;
+            txtLon.Size = new System.Drawing.Size(226, 23);
+            txtLon.StyleController = layoutControl1;
+            txtLon.TabIndex = 3;
             // 
             // txtName
             // 
-            this.txtName.Location = new System.Drawing.Point(22, 39);
-            this.txtName.Name = "txtName";
-            this.txtName.Properties.AutoHeight = false;
-            this.txtName.Size = new System.Drawing.Size(226, 23);
-            this.txtName.StyleController = this.layoutControl1;
-            this.txtName.TabIndex = 5;
+            txtName.Location = new System.Drawing.Point(22, 39);
+            txtName.Name = "txtName";
+            txtName.Properties.AutoHeight = false;
+            txtName.Size = new System.Drawing.Size(226, 23);
+            txtName.StyleController = layoutControl1;
+            txtName.TabIndex = 0;
             // 
             // txtFreqUp
             // 
-            this.txtFreqUp.Location = new System.Drawing.Point(22, 93);
-            this.txtFreqUp.Name = "txtFreqUp";
-            this.txtFreqUp.Properties.AutoHeight = false;
-            this.txtFreqUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtFreqUp.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtFreqUp.Size = new System.Drawing.Size(226, 23);
-            this.txtFreqUp.StyleController = this.layoutControl1;
-            this.txtFreqUp.TabIndex = 4;
+            txtFreqUp.Location = new System.Drawing.Point(22, 93);
+            txtFreqUp.Name = "txtFreqUp";
+            txtFreqUp.Properties.AutoHeight = false;
+            txtFreqUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtFreqUp.Properties.PopupView = searchLookUpEdit1View;
+            txtFreqUp.Size = new System.Drawing.Size(226, 23);
+            txtFreqUp.StyleController = layoutControl1;
+            txtFreqUp.TabIndex = 2;
             // 
             // searchLookUpEdit1View
             // 
-            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
-            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
             // txtLat
             // 
-            this.txtLat.Location = new System.Drawing.Point(22, 198);
-            this.txtLat.Name = "txtLat";
-            this.txtLat.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
-            this.txtLat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtLat.Properties.MaxLength = 10;
-            this.txtLat.Size = new System.Drawing.Size(226, 23);
-            this.txtLat.StyleController = this.layoutControl1;
-            this.txtLat.TabIndex = 6;
+            txtLat.Location = new System.Drawing.Point(22, 198);
+            txtLat.Name = "txtLat";
+            txtLat.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+            txtLat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+            txtLat.Properties.MaxLength = 10;
+            txtLat.Size = new System.Drawing.Size(226, 23);
+            txtLat.StyleController = layoutControl1;
+            txtLat.TabIndex = 4;
             // 
             // txtValue
             // 
-            this.txtValue.EditValue = "2";
-            this.txtValue.Location = new System.Drawing.Point(149, 263);
-            this.txtValue.Name = "txtValue";
-            this.txtValue.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
-            this.txtValue.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "秒", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtValue.Properties.MaxLength = 10;
-            this.txtValue.Size = new System.Drawing.Size(76, 23);
-            this.txtValue.StyleController = this.layoutControl1;
-            this.txtValue.TabIndex = 6;
+            txtValue.EditValue = "2";
+            txtValue.Location = new System.Drawing.Point(149, 263);
+            txtValue.Name = "txtValue";
+            txtValue.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+            txtValue.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "秒", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+            txtValue.Properties.MaxLength = 10;
+            txtValue.Size = new System.Drawing.Size(76, 23);
+            txtValue.StyleController = layoutControl1;
+            txtValue.TabIndex = 5;
             // 
             // Root
             // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem3,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.emptySpaceItem2,
-            this.layoutControlItem2,
-            this.layoutControlItem7,
-            this.layoutControlGroup1,
-            this.layoutControlItem8});
-            this.Root.Name = "Root";
-            this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
-            this.Root.Size = new System.Drawing.Size(270, 385);
-            this.Root.TextVisible = false;
+            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            Root.GroupBordersVisible = false;
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem4, layoutControlItem5, emptySpaceItem2, layoutControlItem2, layoutControlItem7, layoutControlGroup1, layoutControlItem8, emptySpaceItem1 });
+            Root.Name = "Root";
+            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
+            Root.Size = new System.Drawing.Size(270, 416);
+            Root.TextVisible = false;
             // 
             // layoutControlItem1
             // 
-            this.layoutControlItem1.Control = this.txtFreqUp;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 44);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 54);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(54, 54);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(230, 54);
-            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem1.Text = "上行频点";
-            this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(120, 14);
+            layoutControlItem1.Control = txtFreqUp;
+            layoutControlItem1.Location = new System.Drawing.Point(0, 44);
+            layoutControlItem1.MaxSize = new System.Drawing.Size(0, 54);
+            layoutControlItem1.MinSize = new System.Drawing.Size(54, 54);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            layoutControlItem1.Size = new System.Drawing.Size(230, 54);
+            layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem1.Text = "上行频点";
+            layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem1.TextSize = new System.Drawing.Size(120, 14);
             // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txtLon;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 98);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(230, 51);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.Text = "位置经度";
-            this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(120, 14);
+            layoutControlItem3.Control = txtLon;
+            layoutControlItem3.Location = new System.Drawing.Point(0, 98);
+            layoutControlItem3.MaxSize = new System.Drawing.Size(0, 51);
+            layoutControlItem3.MinSize = new System.Drawing.Size(54, 51);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            layoutControlItem3.Size = new System.Drawing.Size(230, 51);
+            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem3.Text = "位置经度";
+            layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem3.TextSize = new System.Drawing.Size(120, 14);
             // 
             // layoutControlItem4
             // 
-            this.layoutControlItem4.Control = this.btnCancel;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 318);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(114, 27);
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem4.TextVisible = false;
+            layoutControlItem4.Control = btnCancel;
+            layoutControlItem4.Location = new System.Drawing.Point(0, 328);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Size = new System.Drawing.Size(114, 26);
+            layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem4.TextVisible = false;
             // 
             // layoutControlItem5
             // 
-            this.layoutControlItem5.Control = this.btnOk;
-            this.layoutControlItem5.Location = new System.Drawing.Point(114, 318);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(116, 27);
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem5.TextVisible = false;
+            layoutControlItem5.Control = btnOk;
+            layoutControlItem5.Location = new System.Drawing.Point(114, 328);
+            layoutControlItem5.Name = "layoutControlItem5";
+            layoutControlItem5.Size = new System.Drawing.Size(116, 26);
+            layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem5.TextVisible = false;
             // 
             // emptySpaceItem2
             // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 304);
-            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 14);
-            this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 14);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(230, 14);
-            this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            emptySpaceItem2.AllowHotTrack = false;
+            emptySpaceItem2.Location = new System.Drawing.Point(0, 304);
+            emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
+            emptySpaceItem2.Name = "emptySpaceItem2";
+            emptySpaceItem2.Size = new System.Drawing.Size(230, 24);
+            emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.txtName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 44);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 44);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(230, 44);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.Text = "名称";
-            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(120, 14);
+            layoutControlItem2.Control = txtName;
+            layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+            layoutControlItem2.MaxSize = new System.Drawing.Size(0, 44);
+            layoutControlItem2.MinSize = new System.Drawing.Size(54, 44);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new System.Drawing.Size(230, 44);
+            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem2.Text = "名称";
+            layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem2.TextSize = new System.Drawing.Size(120, 14);
             // 
             // layoutControlItem7
             // 
-            this.layoutControlItem7.Control = this.txtLat;
-            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem7.CustomizationFormText = "位置经度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 149);
-            this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem7.Size = new System.Drawing.Size(230, 51);
-            this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem7.Text = "位置纬度";
-            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(120, 14);
+            layoutControlItem7.Control = txtLat;
+            layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem7.CustomizationFormText = "位置经度";
+            layoutControlItem7.Location = new System.Drawing.Point(0, 149);
+            layoutControlItem7.MaxSize = new System.Drawing.Size(0, 51);
+            layoutControlItem7.MinSize = new System.Drawing.Size(54, 51);
+            layoutControlItem7.Name = "layoutControlItem7";
+            layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            layoutControlItem7.Size = new System.Drawing.Size(230, 51);
+            layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem7.Text = "位置纬度";
+            layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem7.TextSize = new System.Drawing.Size(120, 14);
             // 
             // layoutControlGroup1
             // 
-            this.layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Light;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem6,
-            this.emptySpaceItem3,
-            this.simpleLabelItem1});
-            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 200);
-            this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 9, 9, 9);
-            this.layoutControlGroup1.Size = new System.Drawing.Size(230, 80);
-            this.layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 2);
-            this.layoutControlGroup1.Text = "判定规则";
+            layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Light;
+            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6, emptySpaceItem3, simpleLabelItem1 });
+            layoutControlGroup1.Location = new System.Drawing.Point(0, 200);
+            layoutControlGroup1.Name = "layoutControlGroup1";
+            layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 9, 9, 9);
+            layoutControlGroup1.Size = new System.Drawing.Size(230, 80);
+            layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 2);
+            layoutControlGroup1.Text = "判定规则";
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.txtValue;
-            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem6.CustomizationFormText = "位置经度";
-            this.layoutControlItem6.Location = new System.Drawing.Point(124, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(80, 27);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(80, 27);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(80, 27);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
+            layoutControlItem6.Control = txtValue;
+            layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem6.CustomizationFormText = "位置经度";
+            layoutControlItem6.Location = new System.Drawing.Point(124, 0);
+            layoutControlItem6.MaxSize = new System.Drawing.Size(80, 27);
+            layoutControlItem6.MinSize = new System.Drawing.Size(80, 27);
+            layoutControlItem6.Name = "layoutControlItem6";
+            layoutControlItem6.Size = new System.Drawing.Size(80, 27);
+            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem6.TextVisible = false;
             // 
             // emptySpaceItem3
             // 
-            this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(204, 0);
-            this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(11, 27);
-            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
+            emptySpaceItem3.AllowHotTrack = false;
+            emptySpaceItem3.Location = new System.Drawing.Point(204, 0);
+            emptySpaceItem3.Name = "emptySpaceItem3";
+            emptySpaceItem3.Size = new System.Drawing.Size(11, 27);
+            emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
             // simpleLabelItem1
             // 
-            this.simpleLabelItem1.AllowHotTrack = false;
-            this.simpleLabelItem1.Location = new System.Drawing.Point(0, 0);
-            this.simpleLabelItem1.MinSize = new System.Drawing.Size(124, 18);
-            this.simpleLabelItem1.Name = "simpleLabelItem1";
-            this.simpleLabelItem1.Size = new System.Drawing.Size(124, 27);
-            this.simpleLabelItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.simpleLabelItem1.Text = "与上一个突发间隔超过";
-            this.simpleLabelItem1.TextSize = new System.Drawing.Size(120, 14);
+            simpleLabelItem1.AllowHotTrack = false;
+            simpleLabelItem1.Location = new System.Drawing.Point(0, 0);
+            simpleLabelItem1.MinSize = new System.Drawing.Size(124, 18);
+            simpleLabelItem1.Name = "simpleLabelItem1";
+            simpleLabelItem1.Size = new System.Drawing.Size(124, 27);
+            simpleLabelItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            simpleLabelItem1.Text = "与上一个突发间隔超过";
+            simpleLabelItem1.TextSize = new System.Drawing.Size(120, 14);
             // 
             // layoutControlItem8
             // 
-            this.layoutControlItem8.Control = this.txtEnable;
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 280);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(230, 24);
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem8.TextVisible = false;
+            layoutControlItem8.Control = txtEnable;
+            layoutControlItem8.Location = new System.Drawing.Point(0, 280);
+            layoutControlItem8.Name = "layoutControlItem8";
+            layoutControlItem8.Size = new System.Drawing.Size(230, 24);
+            layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem8.TextVisible = false;
+            // 
+            // emptySpaceItem1
+            // 
+            emptySpaceItem1.AllowHotTrack = false;
+            emptySpaceItem1.Location = new System.Drawing.Point(0, 354);
+            emptySpaceItem1.Name = "emptySpaceItem1";
+            emptySpaceItem1.Size = new System.Drawing.Size(230, 22);
+            emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // FixedStationEditor
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(270, 385);
-            this.Controls.Add(this.layoutControl1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Name = "FixedStationEditor";
-            this.Text = "TaskEditor";
-            this.Load += new System.EventHandler(this.SatEditor_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtEnable.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLon.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFreqUp.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLat.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtValue.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.simpleLabelItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            this.ResumeLayout(false);
-
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            ClientSize = new System.Drawing.Size(270, 416);
+            Controls.Add(layoutControl1);
+            FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            Name = "FixedStationEditor";
+            Text = "TaskEditor";
+            Load += SatEditor_Load;
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+            layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)txtEnable.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtLon.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtName.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtFreqUp.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtLat.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtValue.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit();
+            ((System.ComponentModel.ISupportInitialize)simpleLabelItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
+            ResumeLayout(false);
         }
 
         #endregion
@@ -426,5 +419,6 @@
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
         private DevExpress.XtraEditors.CheckEdit txtEnable;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
     }
 }

DW5S.App/EditForms/FixedStationEditor.cs

@@ -20,20 +20,17 @@ namespace DW5S.App.EditForms
 {
     public partial class FixedStationEditor : DevExpress.XtraEditors.XtraForm
     {
-
-
-
-        public FixedStation info;
-        private List<FixedStation> infos;
+        public FixedStationViewModel info;
+        private List<FixedStationViewModel> infos;
         public FixedStationEditor()
         {
             InitializeComponent();
             this.layoutControl1.UseDefault();
             this.Text = "固定站添加";
-            info = new FixedStation();
+            info = new FixedStationViewModel();
             this.StartPosition = FormStartPosition.CenterParent;
         }
-        public FixedStationEditor(FixedStation info)
+        public FixedStationEditor(FixedStationViewModel info)
             : this()
         {
             this.Text = "固定站编辑";
@@ -41,21 +38,22 @@ namespace DW5S.App.EditForms
         }
         private async void SatEditor_Load(object sender, EventArgs e)
         {
-            infos = new List<FixedStation>();
+            infos = new List<FixedStationViewModel>();
             var unitOfWork = IocContainer.UnitOfWork;
             var repsFixed = unitOfWork.Of<FixedStation>();
             var res = await repsFixed.GetAllAsync();
-            infos.AddRange(res);
+            infos.AddRange(res.To<List<FixedStationViewModel>>());
             var repsSig = unitOfWork.Of<SigInfo>();
            var sigs = await repsSig.GetAllAsync();
-            this.txtFreqUp.UseDefault().SetData(sigs.To<List<SigViewModel>>(), displayField: nameof(SigViewModel.FreqUpDis)).UseDoubleClickToSelectAll();
+            var sigsData = sigs.To<List<SigViewModel>>();
+            this.txtFreqUp.UseDefault().SetData(sigsData, displayField: nameof(SigViewModel.FreqUpDis)).UseDoubleClickToSelectAll();
             if (this.Text == "固定站编辑" && info != null)
             {
                 this.txtName.Text = info.StationName;
                 this.txtLon.Text = info.Lon.ToString();
                 this.txtLat.Text = info.Lat.ToString();
                 this.txtValue.Text = info.Value.ToString();
-                this.txtFreqUp.EditValue = sigs.FirstOrDefault(p => p.FreqUp == info.FreqUpHz);
+                this.txtFreqUp.EditValue = sigsData.FirstOrDefault(p => p.FreqUp == info.FreqUpHz);
                 this.txtEnable.Checked = info.Enable;
             }
         }
@@ -76,7 +74,7 @@ namespace DW5S.App.EditForms
                     DxHelper.MsgBoxHelper.ShowError($"已经存在名称为[{name}]的固定站!");
                     return;
                 }
-                var freqUpHz = (txtFreqUp.EditValue as SigInfo).FreqUp;
+                var freqUpHz = (txtFreqUp.EditValue as SigViewModel).FreqUp;
                 if (infos.Any(i => i.Id != info.Id && i.FreqUpHz == freqUpHz))
                 {
                     DxHelper.MsgBoxHelper.ShowError($"已经存在上行频点为[{freqUpHz / 1e6:f3}MHz]的固定站!");

DW5S.App/EditForms/FixedStationEditor.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
+  <!--
     Microsoft ResX Schema 
-    
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

DW5S.App/MainForm.cs

@@ -101,6 +101,11 @@ namespace DW5S
             //_ = ClearLog();
             //_ = MonitorCpuAndMemory();
             //await XlLonCalc();
+
+
+            var unitOfWork = IocContainer.UnitOfWork;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
+            await repsXl.GetAllSat();
             DxHelper.WaitHelper.CloseForm();
         }
         private Task MonitorCpuAndMemory()
@@ -152,7 +157,7 @@ namespace DW5S
                     bool succeed = false;
                     try
                     {
-                        var fileName = await HttpHelper.UploadFileAsync(file, SysConfig.GetBaseUrl());
+                        var fileName = await HttpHelper.UploadFileAsync(file);
                         XlImportDto dto = new XlImportDto() { File = fileName };
                         var res = await HttpHelper.PostRequestAsync<RecordRes>(SysConfig.GetUrl("Xl/ImportTleAsync"), dto);
                         if (res.code == 200)

DW5S.App/UserControl/CtrlFixedStation.cs

@@ -10,15 +10,15 @@ using DW5S.App.EditForms;
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using Serilog;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlFixedStation : DevExpress.XtraEditors.XtraUserControl
     {
-        
 
-        readonly List<FixedStation> list = new List<FixedStation>();
+        readonly List<FixedStationViewModel> list = new List<FixedStationViewModel>();
 
         public CtrlFixedStation()
         {
@@ -30,12 +30,14 @@ namespace DW5S.App.UserControl
             {
                 gridFixedStation.UseDefault(list).UseMultiSelect().UseRowNumber()
                     .UseAddAsync(Add)
-                    .UseEditAsync<FixedStation>(Edit)
-                    .UseDeleteAsync<FixedStation>(Delete).SetDisplayText(nameof(FixedStation.Value), val => $"{val}秒");
+                    .UseEditAsync<FixedStationViewModel>(Edit)
+                    .UseDeleteAsync<FixedStationViewModel>(Delete).SetDisplayText(nameof(FixedStationViewModel.Value), val => $"{val}秒")
+                    .UseBoolColumn(nameof(FixedStationViewModel.Enable), "启用", "禁用");
+
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsFix = unitOfWork.Of<FixedStation>();
                 var items = await repsFix.GetAllAsync(p => p.StationName);
-                list.AddRange(items);
+                list.AddRange(items.To<List<FixedStationViewModel>>());
             }
             catch (Exception ex)
             {
@@ -44,7 +46,7 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<FixedStation> Add()
+        private async Task<FixedStationViewModel> Add()
         {
             try
             {
@@ -53,19 +55,19 @@ namespace DW5S.App.UserControl
                 var addItem = frm.info;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsFix = unitOfWork.Of<FixedStation>();
-                await repsFix.AddOrUpdateAsync(addItem);
+                var res =  await repsFix.AddOrUpdateAsync(addItem.To<FixedStation>());
                 await unitOfWork.SaveAsync();
-                return addItem;
+                return res.To<FixedStationViewModel>();
             }
             catch (Exception ex)
             {
-                IocContainer.Logger.Error(ex,"添加卫星信息异常");
-                DxHelper.MsgBoxHelper.ShowError("添加卫星信息异常");
+                IocContainer.Logger.Error(ex, "添加固定站信息异常");
+                DxHelper.MsgBoxHelper.ShowError("添加固定站信息异常");
                 return null;
             }
         }
 
-        private async Task<FixedStation> Edit(FixedStation editItem)
+        private async Task<FixedStationViewModel> Edit(FixedStationViewModel editItem)
         {
             try
             {
@@ -95,28 +97,27 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<bool> Delete(List<FixedStation> list)
+        private async Task<bool> Delete(List<FixedStationViewModel> list)
         {
             try
             {
-                var ids = list.Select(p => p.Id);
                 var unitOfWork = IocContainer.UnitOfWork;
-                var repsSat = unitOfWork.Of<SatInfo>();
-                await repsSat.DeleteAsync(p => ids.Contains(p.Id));
+                var repsFixed = unitOfWork.Of<FixedStation>();
+                await repsFixed.DeleteAsync(list.To<List<FixedStation>>());
                 await unitOfWork.SaveAsync();
                 return true;
             }
             catch (Exception ex)
             {
-                IocContainer.Logger.Error(ex,"删除卫星信息异常");
-                DxHelper.MsgBoxHelper.ShowError("删除卫星信息异常");
+                IocContainer.Logger.Error(ex, "删除固定站信息异常");
+                DxHelper.MsgBoxHelper.ShowError("删除固定站信息异常");
                 return false;
             }
         }
 
         private async void gridView1_DoubleClick(object sender, EventArgs e)
         {
-            var editItem = gridView1.GetFocusedRow() as FixedStation;
+            var editItem = gridView1.GetFocusedRow() as FixedStationViewModel;
             if (editItem == null) return;
             await Edit(editItem);
         }

DW5S.App/UserControl/CtrlXl.cs

@@ -137,7 +137,7 @@ namespace DW5S.App.UserControl
             string file;
             try
             {
-                file = await HttpHelper.UploadFileAsync(btnOpen.Text, SysConfig.GetBaseUrl());
+                file = await HttpHelper.UploadFileAsync(btnOpen.Text);
             }
             catch (Exception ex)
             {
@@ -150,7 +150,7 @@ namespace DW5S.App.UserControl
             try
             {
                 XlImportDto dto = new XlImportDto() { File = file };
-                var result = await HttpHelper.PostRequestAsync<RecordRes>(SysConfig.GetUrl("Xl/ImportTleAsync"), dto);
+                var result = await HttpHelper.PostRequestAsync<RecordRes>(SysConfig.GetUrl("Xl/ImportTle"), dto);
                 if (result.code == 200)
                 {
                     DxHelper.MsgBoxHelper.ShowInfo($"星历导入成功.共导入{result.data.Count}条");

DW5S.Basic/SysConfig.cs

@@ -20,15 +20,15 @@ public static class SysConfig
     {
         return utcTime.ToOffset(TimeSpan.FromHours(AppConfigHelper.Get("TimeZone", 8)));
     }
-    
+
 
     public static string GetBaseUrl()
     {
         return $"http://{IpHelper.GetLocalIp()}:{AppConfigHelper.Get("HttpPort", 8090)}/api/";
     }
-    public static string GetUrl(string url)
+    public static string GetUrl(string url, string baseUrl = null)
     {
-        if (!url.ToLower().StartsWith("http"))
+        if (url.ToLower().StartsWith("http"))
         {
             return url;
         }
@@ -36,11 +36,15 @@ public static class SysConfig
         {
             if (url.StartsWith("/"))
             {
-                return $"{GetBaseUrl}{url}";
+                url = url.Substring(1);
             }
+            if (string.IsNullOrWhiteSpace(baseUrl))
+                return $"{GetBaseUrl()}{url}";
             else
             {
-                return $"{GetBaseUrl}{url}/{url}";
+                if (!baseUrl.EndsWith("/"))
+                    baseUrl = $"{baseUrl}/";
+                return $"{baseUrl}{url}";
             }
         }
     }

DW5S.Controller/XlController.cs

@@ -36,11 +36,11 @@ namespace DW5S.Controllers
             string line = null;
             try
             {
-                var count = await Task.Run(async () =>
+                List<XlInfo> tmp = new List<XlInfo>();
+                await Task.Run(() =>
                  {
                      var lines = System.IO.File.ReadAllLines(GetLocalFile(dto.File)).ToList();
                      lines.RemoveAll(p => string.IsNullOrWhiteSpace(p));
-                     List<XlInfo> tmp = new List<XlInfo>();
                      for (int i = 0; i < lines.Count; i += 3)
                      {
                          line = lines[i];
@@ -72,17 +72,17 @@ namespace DW5S.Controllers
                          xl.TimeUTC = dt;
                          tmp.Add(xl);
                      }
-                     var repsXl = unitOfWork.Of<XlInfo>();
-                     await repsXl.AddOrUpdateAsync(tmp);
-
-                     return tmp.Count;
+                  
                  });
-                logger.Information($"星历导入成功,共{count}条");
-                return Success(new RecordRes(count));
+                var repsXl = unitOfWork.Of<XlInfo>();
+                await repsXl.AddOrUpdateAsync(tmp);
+                await unitOfWork.SaveAsync();
+                logger.Information($"星历导入成功,共{tmp.Count}条");
+                return Success(new RecordRes(tmp.Count));
             }
             catch (Exception ex)
             {
-                string msg = $"{line}星历导入异常,不支持的格式";
+                string msg = $"{line}星历导入异常";
                 logger.Error(ex, msg);
                 return Error<RecordRes>(msg);
             }

DW5S.Service/HttpHelper.cs

@@ -153,55 +153,90 @@ public class HttpHelper
         };
     }
 
-    public static async Task<string> UploadFileAsync(string localFile, string baseUrl, CancellationToken token = default)
+    public static async Task<string> UploadFileAsync(string localFile,string baseUrl=null, CancellationToken token = default)
     {
-        string url = SysConfig.GetUrl("File/UploadFileAsync");
+        string url = SysConfig.GetUrl("file/upload", baseUrl);
         try
         {
             var factory = IocContainer.GetService<IHttpClientFactory>();
             var client = factory.CreateClient(httpFileKey);
-            using (var fileStream = File.OpenRead(localFile))
-            using (var fileContent = new StreamContent(fileStream))
-            {
-                // 3. （可选）设置文件 MIME 类型
-                string fileName = Path.GetFileName(localFile);
-                string contentType = GetMimeType(fileName);
-                fileContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(contentType);
+            using var formData = new MultipartFormDataContent();
+            var fileContent = new StreamContent(File.OpenRead(localFile));
+            fileContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream");
+
+            //注意:files必须和接口中的参数保持一致
+            formData.Add(fileContent, "files", Path.GetFileName(localFile));
+
 
-                // 4. 构造 MultipartFormDataContent
-                using var formData = new MultipartFormDataContent();
-                formData.Add(fileContent, "file", fileName);
-                var response = await client.PostAsync(url, formData);
-                if (response.IsSuccessStatusCode)
+            // 发送请求
+            var response = await client.PostAsync(url, formData, token);
+            if (response.IsSuccessStatusCode)
+            {
+                string responseBody = await response.Content.ReadAsStringAsync(token);
+                var AjaxResult = JsonConvert.DeserializeObject<AjaxResult<List<string>>>(responseBody);
+                if (AjaxResult.code == 200)
                 {
-                    string responseBody = await response.Content.ReadAsStringAsync();
-                    var AjaxResult = JsonConvert.DeserializeObject<AjaxResult<string>>(responseBody);
-                    if (AjaxResult.code == 200)
-                    {
-                        return AjaxResult.data;
-                    }
-                    else
-                    {
-                        throw new Exception(AjaxResult.msg);
-                    }
+                    return AjaxResult.data.FirstOrDefault();
                 }
                 else
                 {
-                    throw new Exception($"上传文件{Path.GetFileName(localFile)}到{url}失败!");
+                    throw new Exception(AjaxResult.msg);
                 }
             }
+            else
+            {
+                throw new Exception($"上传文件{Path.GetFileName(localFile)}到{url}失败!");
+            }
+
         }
-        catch (TaskCanceledException)
+        catch (Exception ex)
         {
-            if (token != default && token.IsCancellationRequested)
-                throw new TaskCanceledException();
+            throw new Exception($"上传文件{Path.GetFileName(localFile)}到{url}失败!", ex);
+        }
+    }
+
+    public static async Task<List<string>> UploadFileAsync(IEnumerable<string> localFiles, string baseUrl=null, CancellationToken token = default)
+    {
+        string url = SysConfig.GetUrl("file/upload",baseUrl);
+        try
+        {
+            var factory = IocContainer.GetService<IHttpClientFactory>();
+            var client = factory.CreateClient(httpFileKey);
+            using var formData = new MultipartFormDataContent();
+
+            foreach (var localFile in localFiles)
+            {
+                var fileContent = new StreamContent(File.OpenRead(localFile));
+                fileContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream");
+
+                //注意:files必须和接口中的参数保持一致
+                formData.Add(fileContent, "files", Path.GetFileName(localFile));
+            }
+
+            // 发送请求
+            var response = await client.PostAsync(url, formData, token);
+            if (response.IsSuccessStatusCode)
+            {
+                string responseBody = await response.Content.ReadAsStringAsync(token);
+                var AjaxResult = JsonConvert.DeserializeObject<AjaxResult<List<string>>>(responseBody);
+                if (AjaxResult.code == 200)
+                {
+                    return AjaxResult.data;
+                }
+                else
+                {
+                    throw new Exception(AjaxResult.msg);
+                }
+            }
             else
-                throw new Exception($"上传文件{Path.GetFileName(localFile)}到{url}超时!");
+            {
+                throw new Exception($"批量上传文件到{url}失败!");
+            }
 
         }
         catch (Exception ex)
         {
-            throw new Exception($"上传文件{Path.GetFileName(localFile)}到{url}失败!", ex);
+            throw new Exception($"批量上传文件到到{url}失败!", ex);
         }
     }
 

DW5S.ViewModel/FixedStationViewModel.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DW5S.ViewModel
+{
+    public class FixedStationViewModel : BaseViewModel<int>
+    {
+
+        [Display(Name = "名称")]
+        public string StationName { get; set; }
+
+        [Display(Name = "固定站位置经度")]
+        public double Lon { get; set; }
+
+        [Display(Name = "固定站位置经度")]
+        public double Lat { get; set; }
+
+        [Display(Name = "上行频点Hz", AutoGenerateField = false)]
+        public long FreqUpHz { get; set; }
+
+        /// <summary>
+        /// 上行频点MHz
+        /// </summary>
+        [Display(Name = "上行频点MHz")]
+        public string FreqUpMHz => $"{FreqUpHz / 1e6:f3}MHz";
+
+        /// <summary>
+        /// 固定站信号判定规则(突发信号和前一个突发超过Value秒则认为是固定站发出的信号)
+        /// </summary>
+        [Display(Name = "信号判定规则")]
+        public double Value { get; set; }
+
+        /// <summary>
+        /// 固定站信号判定规则后续可能还会有改动,多添加一个字段备用
+        /// </summary>
+        [Display(Name ="",AutoGenerateField = false)]
+        public double SpareField { get; set; }
+
+        [Display(Name = "状态")]
+        public bool Enable { get; set; }
+    }
+}

DW5S.WebApi/BaseController.cs

@@ -25,7 +25,7 @@ namespace DW5S.WebApi
         /// </summary>
         public BaseController()
         {
-            this.uploadFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot");
+            this.uploadFolder =AppDomain.CurrentDomain.BaseDirectory;
         }
 
         /// <summary>

DW5S.WebApi/FileOperatorController.cs

@@ -32,7 +32,7 @@ namespace DW5S.WebApi
         /// <param name="files">表单文件集合</param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<AjaxResult<List<string>>> UploadWithRandom(List<IFormFile> files)
+        public async Task<AjaxResult<List<string>>> UploadWithRandomAsync(List<IFormFile> files)
         {
             if (files.Count == 0) return Error<List<string>>("请选择文件");
             string uploadDir = "Upload";
@@ -70,7 +70,7 @@ namespace DW5S.WebApi
         /// <param name="overwriteExisted">是否覆盖已经存在的本地文件</param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<AjaxResult<List<string>>> Upload(List<IFormFile> files, bool overwriteExisted = true)
+        public async Task<AjaxResult<List<string>>> UploadAsync(List<IFormFile> files, bool overwriteExisted = true)
         {
             if (files.Count == 0) return Error<List<string>>("请选择文件");
             string uploadDir = "Upload";
@@ -85,19 +85,15 @@ namespace DW5S.WebApi
                 string localFile = Path.Combine(path, filename);
                 if (overwriteExisted)
                 {
-                    using (var stream = new FileStream(localFile, FileMode.Create))
-                    {
-                        await file.CopyToAsync(stream);
-                    }
+                    using var stream = new FileStream(localFile, FileMode.Create);
+                    await file.CopyToAsync(stream);
                 }
                 else
                 {
                     if (!System.IO.File.Exists(localFile))
                     {
-                        using (var stream = new FileStream(localFile, FileMode.Create))
-                        {
-                            await file.CopyToAsync(stream);
-                        }
+                        using var stream = new FileStream(localFile, FileMode.Create);
+                        await file.CopyToAsync(stream);
                     }
                 }
                 string fileUrl = $"{uploadDir}/{time}/{filename}";