Просмотр исходного кода

V1.9.1
ftp写入时采用管理员账号。

Dail 1 год назад
Родитель
Сommit
343e0cbd22

BIN
.vs/MOTINOVA_Motor_Factory_Set/v17/.suo


+ 3 - 3
StartForm.cs

@@ -19,8 +19,8 @@ namespace MOTINOVA_Motor_Factory_Set
         public static Enter EnterForm1 = new Enter();
         public static Note NoteForm = new Note();
         public static string UserPath = "";
-        public static string Version = "Ver: V1.9.0";
-        public static string BuildTime = "Build Time: 2024-05-20 17:00";
+        public static string Version = "Ver: V1.9.1";
+        public static string BuildTime = "Build Time: 2024-07-02 18:00";
 
         public StartForm()
         {
@@ -28,7 +28,7 @@ namespace MOTINOVA_Motor_Factory_Set
             //配置网络服务参数
             myServerCfg.MyServerOption(Directory.GetCurrentDirectory() + "\\Server");
             //配置FTP服务器
-            myFtp.FtpOption(myServerCfg.IP, myServerCfg.Port, myServerCfg.User, myServerCfg.PassWd);
+            myFtp.FtpOption(myServerCfg.IP, myServerCfg.Port, myServerCfg.User, myServerCfg.PassWd, "admin", "ttium_admin");
             //配置数据存储路径
             UserPath = GetLogSavePath(Directory.GetCurrentDirectory() + "\\UserPath");
             ImportForm1.LocalCfgFilePath = UserPath + "\\cfg\\";

+ 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>euH3tWwX/sR3+v7TGQhSO3W17JulOwCXQcIwaO9SMwg=</dsig:DigestValue>
+        <dsig:DigestValue>sbN/1w5tnR8f5uBSsJnSJDWjhZBZ334PXfBoV/Jvbr8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.exe


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

@@ -66,26 +66,26 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027528">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027720">
       <assemblyIdentity name="Microsoft.mshtml" version="7.0.3300.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>iImaEsY4Ajoi2RrsoJYZA8vV2qeezV/nnmEYjymY4C4=</dsig:DigestValue>
+        <dsig:DigestValue>QN04AHKT/C1jE/TsFBoloJJLGvm0mYqHU37XfBwLleA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="698880">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="699392">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>NXqGIfAO9YqE3+SHZynxUUcObSutUDCyAHqqUQ5/U14=</dsig:DigestValue>
+        <dsig:DigestValue>vZ11N5Z7dsEW+hhXHTt+XGNXc/eN6S0hO90x03+ki/4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.pdb


BIN
bin/Debug/Microsoft.mshtml.dll


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


+ 10 - 8
ftp.cs

@@ -11,8 +11,8 @@ namespace MOTINOVA_Motor_Factory_Set
     {
         string serverIP;
         string serverPort;
-        string userId;
-        string passWord;
+        string userId, userId_Admin;
+        string passWord, passWord_Admin;
         public bool IsNetConnected = false;
 
         /// <summary>
@@ -22,12 +22,14 @@ namespace MOTINOVA_Motor_Factory_Set
         /// <param name="serverPort"></param>
         /// <param name="userId"></param>
         /// <param name="passWord"></param>
-        public void FtpOption(string serverIP, string serverPort, string userId, string passWord)
+        public void FtpOption(string serverIP, string serverPort, string userId, string passWord, string userId_Admin, string passWord_Admin)
         {
             this.serverIP = serverIP;
             this.serverPort = serverPort;
             this.userId = userId;
             this.passWord = passWord;
+            this.userId_Admin = userId_Admin;
+            this.passWord_Admin = passWord_Admin;
         }
 
         /// <summary>
@@ -77,7 +79,7 @@ namespace MOTINOVA_Motor_Factory_Set
 
             Uri uri = new Uri("ftp://" + serverIP + ":" + serverPort + "/" + targetPath + "/" + Uri.EscapeDataString(fileName));
             reqFTP = (FtpWebRequest)FtpWebRequest.Create(uri);
-            reqFTP.Credentials = new NetworkCredential(userId, passWord);
+            reqFTP.Credentials = new NetworkCredential(userId_Admin, passWord_Admin);
             reqFTP.KeepAlive = false;
             reqFTP.Method = WebRequestMethods.Ftp.UploadFile;
             reqFTP.UseBinary = true;
@@ -169,7 +171,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 FtpWebRequest reqFTP;
                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(uri);
 
-                reqFTP.Credentials = new NetworkCredential(userId, passWord);
+                reqFTP.Credentials = new NetworkCredential(userId_Admin, passWord_Admin);
                 reqFTP.KeepAlive = false;
                 reqFTP.Method = WebRequestMethods.Ftp.DeleteFile;
                 reqFTP.UsePassive = false;
@@ -202,7 +204,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 FtpWebRequest reqFTP;
                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(uri);
 
-                reqFTP.Credentials = new NetworkCredential(userId, passWord);
+                reqFTP.Credentials = new NetworkCredential(userId_Admin, passWord_Admin);
                 reqFTP.KeepAlive = false;
                 reqFTP.Method = WebRequestMethods.Ftp.RemoveDirectory;
                 reqFTP.UsePassive = false;
@@ -386,7 +388,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 reqFTP.Method = WebRequestMethods.Ftp.MakeDirectory;
                 reqFTP.UseBinary = true;
                 reqFTP.UsePassive = true;
-                reqFTP.Credentials = new NetworkCredential(userId, passWord);
+                reqFTP.Credentials = new NetworkCredential(userId_Admin, passWord_Admin);
                 FtpWebResponse response = (FtpWebResponse)reqFTP.GetResponse();
                 Stream ftpStream = response.GetResponseStream();
                 ftpStream.Close();
@@ -414,7 +416,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 reqFTP.RenameTo = newFilename;
                 reqFTP.UseBinary = true;
                 reqFTP.UsePassive = false;
-                reqFTP.Credentials = new NetworkCredential(userId, passWord);
+                reqFTP.Credentials = new NetworkCredential(userId_Admin, passWord_Admin);
                 FtpWebResponse response = (FtpWebResponse)reqFTP.GetResponse();
                 Stream ftpStream = response.GetResponseStream();
 

BIN
obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 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>euH3tWwX/sR3+v7TGQhSO3W17JulOwCXQcIwaO9SMwg=</dsig:DigestValue>
+        <dsig:DigestValue>sbN/1w5tnR8f5uBSsJnSJDWjhZBZ334PXfBoV/Jvbr8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

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


+ 1 - 1
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-318323314540ff0af6fddcbb3ed9569615fa7141
+e4dbf2094c396e9c367523ae953e7cab56c8eda0920534e954a1d1d96994b4b0

+ 1 - 1
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.FileListAbsolute.txt

@@ -214,6 +214,6 @@ D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\facto
 D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\factory_-test\obj\Debug\MOTINOVA_Motor_Factory_Set.TrustInfo.xml
 D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\factory_-test\obj\Debug\MOTINOVA_Motor_Factory_Set.exe.manifest
 D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\factory_-test\obj\Debug\MOTINOVA_Motor_Factory_Set.application
-D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\factory_-test\obj\Debug\MOTINOVA_Motor_Factory_Set.csproj.CopyComplete
 D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\factory_-test\obj\Debug\MOTINOVA_Motor_Factory_Set.exe
 D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\factory_-test\obj\Debug\MOTINOVA_Motor_Factory_Set.pdb
+D:\笔记本20221223\zhouxiong9\Documents\Tools\MOTINOVA_Motor_Factory_Set\factory_-test\obj\Debug\MOTINOVA.3C6FF733.Up2Date

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.exe


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

@@ -66,26 +66,26 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027528">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027720">
       <assemblyIdentity name="Microsoft.mshtml" version="7.0.3300.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>iImaEsY4Ajoi2RrsoJYZA8vV2qeezV/nnmEYjymY4C4=</dsig:DigestValue>
+        <dsig:DigestValue>QN04AHKT/C1jE/TsFBoloJJLGvm0mYqHU37XfBwLleA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="698880">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="699392">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>NXqGIfAO9YqE3+SHZynxUUcObSutUDCyAHqqUQ5/U14=</dsig:DigestValue>
+        <dsig:DigestValue>vZ11N5Z7dsEW+hhXHTt+XGNXc/eN6S0hO90x03+ki/4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.pdb