diff --git a/ClientsLibrary/ClientsLibrary.csproj b/ClientsLibrary/ClientsLibrary.csproj
index 839b402..f3d4684 100644
--- a/ClientsLibrary/ClientsLibrary.csproj
+++ b/ClientsLibrary/ClientsLibrary.csproj
@@ -62,6 +62,12 @@
FormShowMachineId.cs
+
+ Form
+
+
+ FormConfiguration.cs
+
Form
@@ -91,6 +97,9 @@
FormShowMachineId.cs
+
+ FormConfiguration.cs
+
FormLogView.cs
diff --git a/ClientsLibrary/Configuration/FormConfiguration.Designer.cs b/ClientsLibrary/Configuration/FormConfiguration.Designer.cs
new file mode 100644
index 0000000..c7a9f24
--- /dev/null
+++ b/ClientsLibrary/Configuration/FormConfiguration.Designer.cs
@@ -0,0 +1,60 @@
+namespace ClientsLibrary
+{
+ partial class FormConfiguration
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.treeView1 = new System.Windows.Forms.TreeView();
+ this.SuspendLayout();
+ //
+ // treeView1
+ //
+ this.treeView1.Location = new System.Drawing.Point(12, 12);
+ this.treeView1.Name = "treeView1";
+ this.treeView1.Size = new System.Drawing.Size(199, 507);
+ this.treeView1.TabIndex = 0;
+ //
+ // FormConfiguration
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(801, 533);
+ this.Controls.Add(this.treeView1);
+ this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.Name = "FormConfiguration";
+ this.Text = "FormConfiguration";
+ this.Load += new System.EventHandler(this.FormConfiguration_Load);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TreeView treeView1;
+ }
+}
\ No newline at end of file
diff --git a/ClientsLibrary/Configuration/FormConfiguration.cs b/ClientsLibrary/Configuration/FormConfiguration.cs
new file mode 100644
index 0000000..832ad42
--- /dev/null
+++ b/ClientsLibrary/Configuration/FormConfiguration.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace ClientsLibrary
+{
+ public partial class FormConfiguration : Form
+ {
+ public FormConfiguration()
+ {
+ InitializeComponent();
+ }
+
+
+ private void FormConfiguration_Load(object sender, EventArgs e)
+ {
+ Text = "配置系统的参数";
+
+ treeView1.ShowRootLines = false;
+ treeView1.Nodes.Clear();
+
+
+ TreeNode root = new TreeNode("配置系统数据");
+
+
+
+ treeView1.Nodes.Add(root);
+ }
+
+ }
+}
diff --git a/ClientsLibrary/Configuration/FormConfiguration.resx b/ClientsLibrary/Configuration/FormConfiguration.resx
new file mode 100644
index 0000000..7080a7d
--- /dev/null
+++ b/ClientsLibrary/Configuration/FormConfiguration.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/CommonLibrary/BasicSupport/SoftSettings.cs b/CommonLibrary/BasicSupport/SoftSettings.cs
index 001d6d1..336c9c2 100644
--- a/CommonLibrary/BasicSupport/SoftSettings.cs
+++ b/CommonLibrary/BasicSupport/SoftSettings.cs
@@ -153,9 +153,9 @@ namespace CommonLibrary
{ nameof(Announcement), new JValue(Announcement) },
{ nameof(Can_Account_Login), new JValue(Can_Account_Login) },
{ nameof(Account_Forbidden_Reason), new JValue(Account_Forbidden_Reason) },
- { nameof(SystemFactories), new JArray(SystemFactories) },
+ { nameof(SystemFactories), new JValue((new JArray(SystemFactories)).ToString()) },
{ nameof(WhetherToEnableTrustedClientAuthentication),new JValue(WhetherToEnableTrustedClientAuthentication) },
- { nameof(TrustedClientList),new JArray(TrustedClientList) }
+ { nameof(TrustedClientList),new JValue((new JArray(TrustedClientList)).ToString()) }
};
return json.ToString();
}
diff --git a/CommonLibrary/Common.cs b/CommonLibrary/Common.cs
index 3db3ccb..e47375c 100644
--- a/CommonLibrary/Common.cs
+++ b/CommonLibrary/Common.cs
@@ -83,7 +83,7 @@ namespace CommonLibrary
///
public static int Port_Portrait_Server { get; } = 24672;
#endregion
-
+
///
/// 整个系统的加密解密密码
///
diff --git a/Public/HslCommunication.dll b/Public/HslCommunication.dll
index dff7060..1ef7298 100644
Binary files a/Public/HslCommunication.dll and b/Public/HslCommunication.dll differ
diff --git a/Public/HslCommunication.xml b/Public/HslCommunication.xml
index 3b879f8..892f1d9 100644
--- a/Public/HslCommunication.xml
+++ b/Public/HslCommunication.xml
@@ -2175,6 +2175,19 @@
+
+
+ 上传文件给文件管理服务器
+
+
+ 本地完整路径的文件名
+ 文件名称
+ 工厂大类，第一级大类
+ 类别小类，第二级分类
+ 标识号类，第三级分类
+ 汇报进度
+
+
上传文件给服务器
@@ -2200,6 +2213,17 @@
汇报进度
+
+
+ 获取指定路径下的所有的文档
+
+
+
+
+
+
+
+
文件传送类服务器，仅仅负责数据传送部分，不负责数据库的存储
@@ -4254,6 +4278,11 @@
具体的错误代码
+
+
+ 消息附带的额外信息
+
+
获取错误代号及文本描述