[new] 新增正则表达式和管理员密码输入

src/json/jsonobject.cpp

@@ -326,7 +326,14 @@ QString JsonObject::interfaceName()
 
 QString JsonObject::passWord()
 {
-	return QString("klxts4047");
+	return tmp_psw;
+}
+
+void JsonObject::setPassword(const QString& pwd)
+{
+	//if (!loadcfg())
+	//	return;
+	tmp_psw = pwd;
 }
 void JsonObject::setInterfaceName(const QString& name)
 {
@@ -408,7 +415,7 @@ QList<QStringList> JsonObject::getIpRouteList()
 		char* gw_str = getArrayNode("routing", "routingtable", i, "gateway");
 		char* nm_str = getArrayNode("routing", "routingtable", i, "netmask");
 
-        temp << des_str << nm_str << gw_str;
+		temp << des_str << nm_str << gw_str;
 		obj.push_back(temp);
 	}
 	return obj;
@@ -418,8 +425,8 @@ void JsonObject::setIpRouteList(const QList<QStringList>& list)
 {
 	for (int i = 0; i < list.size(); i++) {
 		setArrayNode("routing", "routingtable", i, "destination", list.at(i)[0].toStdString().c_str());
-        setArrayNode("routing", "routingtable", i, "netmask", list.at(i)[1].toStdString().c_str());
-        setArrayNode("routing", "routingtable", i, "gateway", list.at(i)[2].toStdString().c_str());
+		setArrayNode("routing", "routingtable", i, "netmask", list.at(i)[1].toStdString().c_str());
+		setArrayNode("routing", "routingtable", i, "gateway", list.at(i)[2].toStdString().c_str());
 	}
 	savecfg();
 }

src/json/jsonobject.h

@@ -69,7 +69,9 @@ public:
 	void setServer(ServerType type, const host& list);
 
 	//for network manager
+
 	QString passWord();
+	void setPassword(const QString& pwd);
 
 	QString interfaceName();
 	void setInterfaceName(const QString& name);
@@ -103,11 +105,11 @@ private:
 
 	JsonObject();
 	~JsonObject();
+
 	void* json_root = nullptr;
 	bool m_bLoaded = false;
 
-	int counter;
-
+	QString tmp_psw;
 };
 
 #endif // JSONOBJECT_H