优化

bin/Win32/Debug/zhipuzi_pos_windows/skin/login.xml

@@ -59,7 +59,7 @@
 		
 		<HorizontalLayout padding="0,0,0,15">
 			<Control></Control>
-			<Button name="guanwang" text="{u}www.lewaimai.com{/u}" showhtml="true" width="200" align="center"/>
+			<Button name="guanwang" text="{u}www.zhipuzi.com{/u}" showhtml="true" width="200" align="center"/>
 			<Control></Control>
 		</HorizontalLayout>
     </VerticalLayout>

zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp

@@ -3,6 +3,8 @@
 
 #include "../helper/MD5.h"
 
+#include <curl/curl.h>
+
 CZhipuziHttpClient::CZhipuziHttpClient()
 {
 #ifdef _DEBUG
@@ -13,21 +15,21 @@ CZhipuziHttpClient::CZhipuziHttpClient()
 
 	if (m_env == DEV)
 	{
-		m_pingtai_url = "https://pf-api-dev.zhipuzi.com/seller";
-		m_canyin_yewu_url = "https://cyapi-dev.zhipuzi.com/seller";
-		m_lingshou_yewu_url = "https://lsapi-dev.zhipuzi.com/seller";
+		m_pingtai_url = "https://pf-api-dev.zhipuzi.com/pos";
+		m_canyin_yewu_url = "https://cyapi-dev.zhipuzi.com/pos";
+		m_lingshou_yewu_url = "https://lsapi-dev.zhipuzi.com/pos";
 	}
 	else if (m_env == TEST)
 	{
-		m_pingtai_url = "https://pf-api-test.zhipuzi.com/seller";
-		m_canyin_yewu_url = "https://cyapi-test.zhipuzi.com/seller";
-		m_lingshou_yewu_url = "https://lsapi-test.zhipuzi.com/seller";
+		m_pingtai_url = "https://pf-api-test.zhipuzi.com/pos";
+		m_canyin_yewu_url = "https://cyapi-test.zhipuzi.com/pos";
+		m_lingshou_yewu_url = "https://lsapi-test.zhipuzi.com/pos";
 	}
 	else if (m_env == RELEASE)
 	{
-		m_pingtai_url = "https://pf-api.zhipuzi.com/seller";
-		m_canyin_yewu_url = "https://cyapi.zhipuzi.com/seller";
-		m_lingshou_yewu_url = "https://lsapi.zhipuzi.com/seller";
+		m_pingtai_url = "https://pf-api.zhipuzi.com/pos";
+		m_canyin_yewu_url = "https://cyapi.zhipuzi.com/pos";
+		m_lingshou_yewu_url = "https://lsapi.zhipuzi.com/pos";
 	}
 
 	//初始化curl
@@ -104,11 +106,11 @@ bool CZhipuziHttpClient::Login(std::string& errmsg)
 
 	if (m_client.m_version_type == "1")
 	{
-		m_client.m_yewu_ur = "https://cyapi.zhipuzi.com/pos";
+		m_client.m_yewu_url = "https://cyapi.zhipuzi.com/pos";
 	}
 	else
 	{
-		m_client.m_yewu_ur = "https://lsapi.zhipuzi.com/pos";
+		m_client.m_yewu_url = "https://lsapi.zhipuzi.com/pos";
 	}
 
 	rapidjson::Value& v_lwm_sess_token = v_data["lwm_sess_token"];
@@ -128,8 +130,7 @@ bool CZhipuziHttpClient::Request(std::string url, std::map<string, string> param
     params["username"] = m_client.m_username;
     params["nonce"] = nonce;
     params["timestamp"] = timestamp;
-	params["machinecode"] = "d1a6af1d480d0de7";
-    params["url"] = m_client.m_yewu_ur + url;
+    params["url"] = m_client.m_yewu_url + url;
 
     //计算签名
     std::string postString;
@@ -178,7 +179,7 @@ bool CZhipuziHttpClient::Request(std::string url, std::map<string, string> param
     LOG_INFO("postString:" << postString.c_str());
 
     CHttpClient m_httpClient;
-    int ret = m_httpClient.Posts(m_client.m_yewu_ur + url, postString, response, NULL);
+    int ret = m_httpClient.Posts(m_client.m_yewu_url + url, postString, response, NULL);
 
     LOG_INFO("response:" << response.c_str());
 

zhipuzi_pos_windows/pch/pch.cpp

@@ -7,14 +7,6 @@
 //所有的全局变量都在这里初始化
 
 //最先初始化sqllite数据
-
-std::map<std::string, std::string> CSetting::m_paramsMap;
-std::vector<ChufangPrinter> CSetting::m_chufang_printers;
-std::mutex CSetting::m_mutex;
-std::vector<FoodType> CSetting::m_foodtypes;
-std::map<std::string, std::string> CSetting::m_foodtype_id_name;
-std::map<string, string> CSetting::m_users;
-std::string CSetting::m_username;
-std::string CSetting::m_password;
+CSetting CSetting::m_setting;
 
 CZhipuziHttpClient CZhipuziHttpClient::m_client;

zhipuzi_pos_windows/tool/CSetting.cpp

@@ -7,6 +7,7 @@
 
 CSetting::CSetting()
 {
+	this->Init();
 }
 
 
@@ -16,11 +17,11 @@ CSetting::~CSetting()
 
 void CSetting::SetParam(std::string name, std::string value, bool isSave)
 {
-	m_mutex.lock();
+	m_setting.m_mutex.lock();
 
-	m_paramsMap[name] = value;
+	m_setting.m_paramsMap[name] = value;
 
-	m_mutex.unlock();
+	m_setting.m_mutex.unlock();
 
 	if (isSave)
 	{
@@ -30,11 +31,11 @@ void CSetting::SetParam(std::string name, std::string value, bool isSave)
 
 std::string CSetting::GetParam(std::string name)
 {
-	m_mutex.lock();
+	m_setting.m_mutex.lock();
 
-	std::string value = m_paramsMap[name];
+	std::string value = m_setting.m_paramsMap[name];
 
-	m_mutex.unlock();
+	m_setting.m_mutex.unlock();
 
 	return value;
 }
@@ -51,7 +52,7 @@ void CSetting::AddChufangPrinter(std::string date, std::string name, std::string
 	newPrinter.fenlei = fenlei;
 	newPrinter.fenlei_ids = fenlei_ids;
 
-	m_chufang_printers.push_back(newPrinter);
+	m_setting.m_chufang_printers.push_back(newPrinter);
 
 	if (isSave)
 	{
@@ -61,7 +62,7 @@ void CSetting::AddChufangPrinter(std::string date, std::string name, std::string
 
 void CSetting::UpdateChufangPrinter(std::string date, std::string name, std::string ip, std::string guige, std::string fendan, std::string fenlei, std::string fenlei_ids, bool isSave)
 {
-	for (std::vector<ChufangPrinter>::iterator it = m_chufang_printers.begin(); it != m_chufang_printers.end(); it++)
+	for (std::vector<ChufangPrinter>::iterator it = m_setting.m_chufang_printers.begin(); it != m_setting.m_chufang_printers.end(); it++)
 	{
 		if ((*it).date == date)
 		{
@@ -87,11 +88,11 @@ void CSetting::UpdateChufangPrinter(std::string date, std::string name, std::str
  **/
 void CSetting::DelChufangPrinter(std::string date)
 {
-	for (std::vector<ChufangPrinter>::iterator it = m_chufang_printers.begin(); it != m_chufang_printers.end(); it++)
+	for (std::vector<ChufangPrinter>::iterator it = m_setting.m_chufang_printers.begin(); it != m_setting.m_chufang_printers.end(); it++)
 	{
 		if ((*it).date == date)
 		{
-			m_chufang_printers.erase(it);
+			m_setting.m_chufang_printers.erase(it);
 
 			break;
 		}
@@ -102,7 +103,7 @@ void CSetting::DelChufangPrinter(std::string date)
 
 ChufangPrinter CSetting::GetChufangPrinter(std::string date)
 {
-	for (std::vector<ChufangPrinter>::iterator it = m_chufang_printers.begin(); it != m_chufang_printers.end(); it++)
+	for (std::vector<ChufangPrinter>::iterator it = m_setting.m_chufang_printers.begin(); it != m_setting.m_chufang_printers.end(); it++)
 	{
 		if ((*it).date == date)
 		{
@@ -309,23 +310,112 @@ void CSetting::Init()
 	m_mutex.unlock();
 
 	//设置好默认参数之后，将默认参数写回到数据库
-	SaveParams();
+	CSetting::SaveParams();
 }
 
 void CSetting::SaveParams()
 {
 	CSqlite3 sqllite;
-	sqllite.SaveParams(m_paramsMap);
+	sqllite.SaveParams(m_setting.m_paramsMap);
 }
 
 void CSetting::SaveChufangPrinter()
 {
 	CSqlite3 sqllite;
-	sqllite.SaveChufangPrinter(m_chufang_printers);
+	sqllite.SaveChufangPrinter(m_setting.m_chufang_printers);
 }
 
 void CSetting::SaveUsers()
 {
 	CSqlite3 sqllite;
-	sqllite.SaveUsers(m_users);
+	sqllite.SaveUsers(m_setting.m_users);
+}
+
+void CSetting::SetUser(std::string name, std::string password, bool isSave)
+{
+	m_setting.m_users[name] = password;
+
+	if (isSave)
+	{
+		SaveUsers();
+	}
+}
+
+std::string CSetting::GetUser(std::string name)
+{
+	if (m_setting.m_users.find(name) == m_setting.m_users.end())
+	{
+		return "";
+	}
+
+	return m_setting.m_users[name];
+}
+
+std::map<string, string> CSetting::getUsers()
+{
+	return m_setting.m_users;
+}
+
+std::string CSetting::getValue(std::string name)
+{
+	return m_setting.m_paramsMap[name];
+}
+
+ChufangPrinter CSetting::getLastChufangPrinter()
+{
+	return m_setting.m_chufang_printers.back();
+}
+
+std::vector<ChufangPrinter>& CSetting::getChufangPrints()
+{
+	return m_setting.m_chufang_printers;
+}
+
+void CSetting::ClearFoodtype()
+{
+	m_setting.m_foodtypes.clear();
+	m_setting.m_foodtype_id_name.clear();
+}
+
+void CSetting::AddFoodtype(std::string name, std::string type_id)
+{
+	FoodType newFoodType;
+	newFoodType.name = name;
+	newFoodType.type_id = type_id;
+
+	m_setting.m_foodtypes.push_back(newFoodType);
+
+	m_setting.m_foodtype_id_name[type_id] = name;
+}
+
+std::vector<FoodType>& CSetting::GetFoodtype()
+{
+	return m_setting.m_foodtypes;
+}
+
+std::string CSetting::getFoodtypeName(std::string type_id)
+{
+	if (m_setting.m_foodtype_id_name.find(type_id) != m_setting.m_foodtype_id_name.end())
+	{
+		return m_setting.m_foodtype_id_name[type_id];
+	}
+
+	//返回这个表示没找到这个分类
+	return "zhipuzi_not_found_xxx";
+}
+
+void CSetting::SetLoginInfo(std::string username, std::string password)
+{
+	m_setting.m_username = username;
+	m_setting.m_password = password;
+}
+
+std::string CSetting::getUsername()
+{
+	return m_setting.m_username;
+}
+
+std::string CSetting::getPassword()
+{
+	return m_setting.m_password;
 }

zhipuzi_pos_windows/tool/CSetting.h

@@ -27,6 +27,9 @@ public:
 	CSetting();
 	~CSetting();
 
+	//刚打开程序的时候，根据数据库初始化内存，并且添加默认参数
+	void Init();
+
 	//修改内存中的参数设置
 	static void SetParam(std::string name, std::string value, bool isSave = true);
 	static std::string GetParam(std::string name);
@@ -38,97 +41,31 @@ public:
 
 	static ChufangPrinter GetChufangPrinter(std::string date);
 
-	static void SetUser(std::string name, std::string password, bool isSave = true)
-	{
-		m_users[name] = password;
+	static void SetUser(std::string name, std::string password, bool isSave = true);
 
-		if (isSave)
-		{
-			SaveUsers();
-		}
-	}
+	static std::string GetUser(std::string name);
 
-	static std::string GetUser(std::string name)
-	{
-		if (m_users.find(name) == m_users.end())
-		{
-			return "";
-		}
+	static std::map<string, string> getUsers();
 
-		return m_users[name];
-	}
+	static std::string getValue(std::string name);
 
-	static std::map<string, string> getUsers()
-	{
-		return m_users;
-	}
+	static ChufangPrinter getLastChufangPrinter();
 
-	//刚打开程序的时候，根据数据库初始化内存，并且添加默认参数
-	static void Init();
-
-	static std::string getValue(std::string name)
-	{
-		return m_paramsMap[name];
-	}
-
-	static ChufangPrinter getLastChufangPrinter()
-	{
-		return m_chufang_printers.back();
-	}
-
-	static std::vector<ChufangPrinter>& getChufangPrints()
-	{
-		return m_chufang_printers;
-	}
-
-	static void ClearFoodtype()
-	{
-		m_foodtypes.clear();
-		m_foodtype_id_name.clear();
-	}
-
-	static void AddFoodtype(std::string name, std::string type_id)
-	{
-		FoodType newFoodType;
-		newFoodType.name = name;
-		newFoodType.type_id = type_id;
-
-		m_foodtypes.push_back(newFoodType);
-
-		m_foodtype_id_name[type_id] = name;
-	}
-
-	static std::vector<FoodType>& GetFoodtype()
-	{
-		return m_foodtypes;
-	}
-
-	static std::string getFoodtypeName(std::string type_id)
-	{
-		if (m_foodtype_id_name.find(type_id) != m_foodtype_id_name.end())
-		{
-			return m_foodtype_id_name[type_id];
-		}
-
-		//返回这个表示没找到这个分类
-		return "zhipuzi_not_found_xxx";
-	}
-
-	static void SetLoginInfo(std::string username, std::string password)
-	{
-		m_username = username;
-		m_password = password;
-	}
-
-	static std::string getUsername()
-	{
-		return m_username;
-	}
-
-	static std::string getPassword()
-	{
-		return m_password;
-	}
+	static std::vector<ChufangPrinter>& getChufangPrints();
+
+	static void ClearFoodtype();
+
+	static void AddFoodtype(std::string name, std::string type_id);
+
+	static std::vector<FoodType>& GetFoodtype();
+
+	static std::string getFoodtypeName(std::string type_id);
+
+	static void SetLoginInfo(std::string username, std::string password);
+
+	static std::string getUsername();
+
+	static std::string getPassword();
 
 	/*
 	 *把内存中的参数，写到数据库中
@@ -142,20 +79,23 @@ public:
 
 	static void SaveUsers();
 
+public:
+	static CSetting m_setting;
+
 private:
-	static std::map<std::string, std::string> m_paramsMap;
-	static std::vector<ChufangPrinter> m_chufang_printers;
+	std::map<std::string, std::string> m_paramsMap;
+	std::vector<ChufangPrinter> m_chufang_printers;
 
-	static std::mutex m_mutex;
+	std::mutex m_mutex;
 
-	static std::vector<FoodType> m_foodtypes;
+	std::vector<FoodType> m_foodtypes;
 
 	//从商品分类的id到name的映射
-	static std::map<std::string, std::string> m_foodtype_id_name;
+	std::map<std::string, std::string> m_foodtype_id_name;
 
-	static std::map<string, string> m_users;
+	std::map<string, string> m_users;
 
-	static std::string m_username;
-	static std::string m_password;
+	std::string m_username;
+	std::string m_password;
 };
 

zhipuzi_pos_windows/zhipuzi_pos_windows.cpp

@@ -13,12 +13,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
     CLewaimaiLog log;
     log.Init();
 
-    //初始化系统设置
-	CSetting::Init();
-
-	//初始化curl
-	curl_global_init(CURL_GLOBAL_ALL);
-
     //开始展示窗口
     CPaintManagerUI::SetInstance(hInstance);
 #ifdef NDEBUG