增加客户端面板验证；修复新增条目不reload；

codemonkey-m · Dec 30, 2021 · 7ce746b · 7ce746b
1 parent dac3ce3
commit 7ce746b
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 35 deletions.
diff --git a/FrpClient-Win/DB.cs b/FrpClient-Win/DB.cs
@@ -12,6 +12,8 @@ class ServerInfo
         public string strToken = "";
         public string strUser = "";
         public int nAdminPort = 7400;
+        public string strAdminUser = "admin";
+        public string strAdminPwd = "admin";
     }
 
     class ItemInfo
@@ -48,6 +50,8 @@ class DB
         private const string strServerToken = "token";
         private const string strServerUser = "user";
         private const string strAdminPort = "admin_port";
+        private const string strAdminUser = "admin_user";
+        private const string strAdminPwd = "admin_pwd";
 
         private const string strFrpType = "type";
         private const string strLocalPort = "local_port";
@@ -84,6 +88,8 @@ public bool ReadConfig()
             cServerinfo.strToken = GetValue(strCommon, strServerToken);
             cServerinfo.strUser = GetValue(strCommon, strServerUser);
             cServerinfo.nAdminPort = Convert.ToInt32(GetValue(strCommon, strAdminPort));
+            cServerinfo.strAdminUser = GetValue(strCommon, strAdminUser);
+            cServerinfo.strAdminPwd = GetValue(strCommon, strAdminPwd);
 
             //读取各个项
             string[] arrSections = GetSectionNames(strFileName);
@@ -189,6 +195,8 @@ public bool SaveConfig()
                 WritePrivateProfileString(strCommon, strServerUser, cServerinfo.strUser, strFileName);
             if(cServerinfo.nAdminPort!=0)
                 WritePrivateProfileString(strCommon, strAdminPort, cServerinfo.nAdminPort.ToString(), strFileName);
+            WritePrivateProfileString(strCommon, strAdminUser, cServerinfo.strAdminUser, strFileName);
+            WritePrivateProfileString(strCommon, strAdminPwd, cServerinfo.strAdminPwd, strFileName);
 
             //写各个项
             foreach (var info in listItems)

diff --git a/FrpClient-Win/MainForm.Designer.cs b/FrpClient-Win/MainForm.Designer.cs
diff --git a/FrpClient-Win/MainForm.cs b/FrpClient-Win/MainForm.cs
@@ -18,10 +18,9 @@ public partial class MainForm : Form
 
         // 32位的MD5加密
         public static string MD5Encrypt32(string password) {
-            string cl = password;
             string pwd = "";
             MD5 md5 = MD5.Create();
-            byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(cl));
+            byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
             for(int i = 0; i < s.Length; i++) {
                 pwd = pwd + s[i].ToString("x");
             }
@@ -257,6 +256,7 @@ private void AddItem_Click(object sender, EventArgs e)
 
             //关闭之后刷新界面
             InitList();
+            ReloadFrp();
         }
 
         private void UpdateStartButton()

diff --git a/FrpClient-Win/RdpConfigDlg.Designer.cs b/FrpClient-Win/RdpConfigDlg.Designer.cs
diff --git a/FrpClient-Win/RdpConfigDlg.cs b/FrpClient-Win/RdpConfigDlg.cs
@@ -1,16 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace FrpClient_Win
-{
+namespace FrpClient_Win {
     public partial class RdpConfigDlg : Form
     {
 

diff --git a/FrpClient-Win/ServerConfigDlg.Designer.cs b/FrpClient-Win/ServerConfigDlg.Designer.cs
diff --git a/FrpClient-Win/ServerConfigDlg.cs b/FrpClient-Win/ServerConfigDlg.cs
@@ -23,6 +23,8 @@ private void SaveServerConfig_Click(object sender, EventArgs e)
             DB.Instance().cServerinfo.strToken = FrpToken.Text;
             DB.Instance().cServerinfo.strUser = FrpUser.Text;
             DB.Instance().cServerinfo.nAdminPort = Convert.ToInt32(FrpAdminPort.Text);
+            DB.Instance().cServerinfo.strAdminUser = FrpAdminUser.Text;
+            DB.Instance().cServerinfo.strAdminPwd = FrpAdminPwd.Text;
 
             DB.Instance().SaveConfig();
             Close();
@@ -36,14 +38,23 @@ private void OnConfigDlgLoad(object sender, EventArgs e)
             FrpToken.Text = DB.Instance().cServerinfo.strToken;
             FrpUser.Text = DB.Instance().cServerinfo.strUser;
             FrpAdminPort.Text = DB.Instance().cServerinfo.nAdminPort.ToString();
+            FrpAdminUser.Text = DB.Instance().cServerinfo.strAdminUser;
+            FrpAdminPwd.Text = DB.Instance().cServerinfo.strAdminPwd;
             if(DB.Instance().cServerinfo.nAdminPort > 0) {
-                FrpAdminPort.Enabled = FrpAdmin.Checked = true;
+                FrpAdminUser.Enabled = FrpAdminPwd.Enabled = FrpAdminPort.Enabled = FrpAdmin.Checked = true;
             }
         }
 
         private void FrpAdmin_CheckedChanged(object sender, EventArgs e) {
-            FrpAdminPort.Enabled = FrpAdmin.Checked;
+            FrpAdminUser.Enabled = FrpAdminPwd.Enabled = FrpAdminPort.Enabled = FrpAdmin.Checked;
             FrpAdminPort.Text = FrpAdmin.Checked ? "7400" : "0";
+            if(FrpAdminUser.Text == "") {
+                FrpAdminUser.Text = "admin";
+            }
+            if(FrpAdminPwd.Text == "") {
+                Random rd = new Random();
+                FrpAdminPwd.Text = "admin" + rd.Next(100000,999999).ToString();
+            }
         }
     }
 }