Explorar el Código

修改服务器获取文件列表,解决Windows服务器格式不一致导致的异常。

Dail hace 1 año
padre
commit
7c016b9dd9

BIN
.vs/MOTINOVA_Motor_Factory_Set/v17/.suo


+ 16 - 13
Enter.Designer.cs

@@ -43,10 +43,10 @@
             // 
             // button1
             // 
-            this.button1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(295, 83);
+            this.button1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button1.Location = new System.Drawing.Point(281, 78);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(61, 63);
+            this.button1.Size = new System.Drawing.Size(61, 72);
             this.button1.TabIndex = 0;
             this.button1.Text = "进入";
             this.button1.UseVisualStyleBackColor = true;
@@ -54,12 +54,12 @@
             // 
             // textBox_Passwd
             // 
-            this.textBox_Passwd.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_Passwd.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.textBox_Passwd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.textBox_Passwd.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_Passwd.Location = new System.Drawing.Point(104, 118);
+            this.textBox_Passwd.Location = new System.Drawing.Point(104, 117);
             this.textBox_Passwd.Name = "textBox_Passwd";
-            this.textBox_Passwd.Size = new System.Drawing.Size(171, 29);
+            this.textBox_Passwd.Size = new System.Drawing.Size(171, 33);
             this.textBox_Passwd.TabIndex = 2;
             this.textBox_Passwd.UseSystemPasswordChar = true;
             this.textBox_Passwd.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBox_Passwd_KeyUp);
@@ -67,18 +67,20 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(57, 87);
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(35, 82);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(37, 20);
+            this.label1.Size = new System.Drawing.Size(50, 25);
             this.label1.TabIndex = 3;
             this.label1.Text = "账户";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(57, 122);
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(35, 121);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(37, 20);
+            this.label2.Size = new System.Drawing.Size(50, 25);
             this.label2.TabIndex = 3;
             this.label2.Text = "密码";
             // 
@@ -117,13 +119,14 @@
             // 
             // comboBox_User
             // 
+            this.comboBox_User.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox_User.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comboBox_User.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.comboBox_User.FormattingEnabled = true;
-            this.comboBox_User.Location = new System.Drawing.Point(104, 86);
+            this.comboBox_User.Location = new System.Drawing.Point(104, 78);
             this.comboBox_User.Name = "comboBox_User";
-            this.comboBox_User.Size = new System.Drawing.Size(171, 28);
+            this.comboBox_User.Size = new System.Drawing.Size(171, 33);
             this.comboBox_User.TabIndex = 35;
-            this.comboBox_User.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             // 
             // Enter
             // 

+ 1 - 1
bin/Debug/CheckSerialNum

@@ -1,4 +1,4 @@
 流水号:
-13
+14
 合格计数:
 4

+ 1 - 1
bin/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>kVwIIF5g3WLb6KFnFCS3SQhOj2zw9x3/d4Wz60v9O0s=</dsig:DigestValue>
+        <dsig:DigestValue>L2IbCkpglg2zu6qqlDobBcBYampcOR/3pv1ejXiwvdM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -85,7 +85,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>bD8AwPVeNap2oPtM5KVYY6jbWTzOfQDUxtVXxGUQehw=</dsig:DigestValue>
+        <dsig:DigestValue>gYE0rdnLmUOx7/cKnutqFtPEPauhNhszATNXK1sYoiw=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.pdb


+ 8 - 41
bin/Debug/Server

@@ -1,48 +1,15 @@
-#生产服务器
-IP=10.176.42.30
-PORT=8021
-USER=factory_test
-PASSWD=ttium
+#阿里云服务器
+IP=8.134.109.44
+PORT=21
+USER=ttium
+PASSWD=ttium123
 ROOT=MOTINOVA_MC_Factory_Set
 LOCAL=DISABLE
 
-
-#内部服务器
-IP=10.176.47.90
+#生产服务器
+IP=10.176.42.30
 PORT=21
 USER=factory_test
 PASSWD=ttium
 ROOT=MOTINOVA_MC_Factory_Set
-LOCAL=ENABLE
-
-#虚拟机
-IP=192.168.1.246
-PORT=21
-USER=hero
-PASSWD=1229
-ROOT=/home/hero/MOTINOVA_MC_Factory_Set
-LOCAL=ENABLE
-
-#Raspberry
-IP=192.168.0.104
-PORT=21
-USER=pi
-PASSWD=1229
-ROOT=/home/pi/FactoryTest
-LOCAL=ENABLE
-
-#阿里云
-IP=47.105.122.91
-PORT=21
-USER=dail
-PASSWD=123456
-ROOT=/home/dail
-LOCAL=ENABLE
-
-#阿里云
-IP=47.105.122.91
-PORT=21
-USER=ftptest
-PASSWD=123456
-ROOT=/home/ftptest
-LOCAL=ENABLE
+LOCAL=DISABLE

+ 1 - 1
bin/Debug/TestSerialNum

@@ -1,4 +1,4 @@
 流水号:
-117
+118
 合格计数:
 22

BIN
bin/Debug/app.publish/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
ftp.cs

@@ -342,7 +342,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     {
                         if (str.Trim().Substring(0, 1).ToUpper() == "D")
                         {
-                            strList.Add(str.Substring(55).Trim());
+                            strList.Add(str.Split(' ')[str.Split(' ').Length - 1].Trim());
                         }
                     }
                 }

+ 1 - 1
obj/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>kVwIIF5g3WLb6KFnFCS3SQhOj2zw9x3/d4Wz60v9O0s=</dsig:DigestValue>
+        <dsig:DigestValue>L2IbCkpglg2zu6qqlDobBcBYampcOR/3pv1ejXiwvdM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.AssemblyReference.cache


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
obj/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -85,7 +85,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>bD8AwPVeNap2oPtM5KVYY6jbWTzOfQDUxtVXxGUQehw=</dsig:DigestValue>
+        <dsig:DigestValue>gYE0rdnLmUOx7/cKnutqFtPEPauhNhszATNXK1sYoiw=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.pdb