优化登录

zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp

@@ -27,7 +27,7 @@ bool CZhipuziHttpClient::Login(std::string& errmsg)
     std::map<string, string> params;
 
     std::string response;
-    bool ret = m_client.RequestPingtai("/login/userlogin", params, response);
+    bool ret = m_client.RequestPingtai("/userlogin/userlogin", params, response);
 
     if(!ret)
     {
@@ -175,6 +175,8 @@ bool CZhipuziHttpClient::RequestPingtai(std::string url, std::map<string, string
 	params["timestamp"] = timestamp;
 	params["url"] = m_client.m_pingtai_url + url;
 
+	params["timestamp"] = "1564301876";
+
 	//计算签名
 	std::string postString;
 	for (std::map<string, string>::iterator it = params.begin(); it != params.end();)

zhipuzi_pos_windows/wnd/CLoginWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CLoginWnd.h"
 #include "CUpdateWnd.h"
 
@@ -7,7 +7,7 @@
 void CLoginWnd::Init()
 {
     CLabelUI* version = static_cast<CLabelUI*>(m_pm.FindControl(_T("login_version")));
-    version->SetText((L"智铺子收银软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
+    version->SetText((L"智铺子收银软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
 
     std::map<string, string> users = CSetting::getUsers();
 
@@ -37,7 +37,7 @@ void CLoginWnd::Init()
 
     if(CSetting::GetParam("setting_is_auto_login") == "1")
     {
-        //自动登录开启了，记住密码一定要开启
+        //自动登录开启了，记住密码一定要开启
         pAuto->Selected(true, false);
         pRemember->Selected(true, false);
     }
@@ -140,7 +140,7 @@ LRESULT CLoginWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHand
     styleValue &= ~WS_CAPTION;
     ::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-    // 把自己的窗口句柄与窗口绘制管理器挂接在一起
+    // 把自己的窗口句柄与窗口绘制管理器挂接在一起
     m_pm.Init(m_hWnd);
 
     m_pm.AddPreMessageFilter(this);
@@ -150,10 +150,10 @@ LRESULT CLoginWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHand
     CControlUI* pRoot = builder.Create(_T("login.xml"), (UINT)0, NULL, &m_pm);
     ASSERT(pRoot && "Failed to parse XML");
 
-    // 把这些控件绘制到本窗口上
+    // 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙ｄ笂
     m_pm.AttachDialog(pRoot);
 
-    // 把自己加入到CPaintManagerUI的m_aNotifiers数组中，用于处理Notify函数
+    // 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
     m_pm.AddNotifier(this);
 
     Init();
@@ -168,7 +168,7 @@ LRESULT CLoginWnd::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl
 }
 
 /*
- *这个是窗口被销毁的时候调用的
+ *杩欎釜鏄�獥鍙ｈ�閿€姣佺殑鏃跺€欒皟鐢ㄧ殑
  **/
 LRESULT CLoginWnd::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
@@ -192,7 +192,7 @@ LRESULT CLoginWnd::OnNcCalcSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
 
 LRESULT CLoginWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-    //在这里设置焦点才有用
+    //鍦ㄨ繖閲岃�缃�劍鐐规墠鏈夌敤
     CEditUI* pAccountEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("accountedit")));
     if(pAccountEdit)
     {
@@ -333,7 +333,7 @@ LRESULT CLoginWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool&
 	}
 	else if (uMsg == WM_NEED_UPDATE)
 	{
-		//说明需要升级了
+		//璇存槑闇€瑕佸崌绾т簡
 
 		Update();
 
@@ -351,7 +351,7 @@ LRESULT CLoginWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool&
 
 void CLoginWnd::StartLogin()
 {
-    //隐藏密码输入框，显示进度条
+    //隐藏密码输入框，显示进度条
     CVerticalLayoutUI* pInput = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("login_input")));
     pInput->SetVisible(false);
 
@@ -361,7 +361,7 @@ void CLoginWnd::StartLogin()
     CLabelUI* pLoginResultLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("loginresult")));
     pLoginResultLabel->SetVisible(false);
 
-    //开启一个线程，开始处理登录
+    //开启一个线程，开始处理登录
     std::thread(&CLoginWnd::HandleLogin, this).detach();
 }
 
@@ -369,14 +369,14 @@ void CLoginWnd::HandleLogin()
 {
 	CLabelUI* pLoginResultLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("loginresult")));
 
-	//真正登录前，先检测是否有需要更新
+	//真正登录前，先检测是否有需要更新
 	//std::map<string, string> params;
 
 	//std::string response;
 	//bool ret = CZhipuziHttpClient::Request("/version/getwindowsversion", params, response);
 	//if (!ret)
 	//{
-	//	pLoginResultLabel->SetText(std::wstring(_T("网络请求出错")).c_str());
+	//	pLoginResultLabel->SetText(std::wstring(_T("缃戠粶璇锋眰鍑洪敊")).c_str());
 	//	pLoginResultLabel->SetVisible(true);
 
 	//	PostMessage(WM_LOGIN_ERROR);
@@ -389,7 +389,7 @@ void CLoginWnd::HandleLogin()
 
 	//if (document.HasParseError())
 	//{
-	//	pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
+	//	pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
 	//	pLoginResultLabel->SetVisible(true);
 
 	//	PostMessage(WM_LOGIN_ERROR);
@@ -400,7 +400,7 @@ void CLoginWnd::HandleLogin()
 	//{
 	//	if (!document.HasMember("errcode") || !document.HasMember("errmsg") || !document.HasMember("data"))
 	//	{
-	//		pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
+	//		pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
 	//		pLoginResultLabel->SetVisible(true);
 
 	//		PostMessage(WM_LOGIN_ERROR);
@@ -428,13 +428,13 @@ void CLoginWnd::HandleLogin()
 
 	//	if (newest_version > CSystem::GetVersion())
 	//	{
-	//		//说明有新版本，要更新
+	//		//璇存槑鏈夋柊鐗堟湰锛岃�鏇存柊
 	//		PostMessage(WM_NEED_UPDATE);
 	//		return;
 	//	}
 	//}
 
-	//判断账号密码是否正确
+	//鍒ゆ柇璐﹀彿瀵嗙爜鏄�惁姝ｇ‘
 	std::wstring account, password;
 	CEditUI* pAccountEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("accountedit")));
 	if (pAccountEdit)
@@ -448,8 +448,8 @@ void CLoginWnd::HandleLogin()
 		password = pPasswordEdit->GetText().GetData();
 	}
 
-	//把第1个中文冒号替换成英文冒号
-	CLewaimaiString::Replace(account, _T("："), _T(":"), 1);
+	//鎶婄�1涓�腑鏂囧啋鍙锋浛鎹㈡垚鑻辨枃鍐掑彿
+	CLewaimaiString::Replace(account, _T("："), _T(":"), 1);
 
 	//LOG_INFO("account:" << account.c_str() << ", password:" << password.c_str());
 
@@ -461,7 +461,7 @@ void CLoginWnd::HandleLogin()
 
 	if (s_account.compare("") == 0)
 	{
-		pLoginResultLabel->SetText(std::wstring(_T("用户名不能为空")).c_str());
+		pLoginResultLabel->SetText(std::wstring(_T("用户名不能为空")).c_str());
 		pLoginResultLabel->SetVisible(true);
 
 		PostMessage(WM_LOGIN_ERROR);
@@ -471,7 +471,7 @@ void CLoginWnd::HandleLogin()
 
 	if (s_password.compare("") == 0)
 	{
-		pLoginResultLabel->SetText(std::wstring(_T("密码不能为空")).c_str());
+		pLoginResultLabel->SetText(std::wstring(_T("瀵嗙爜涓嶈兘涓虹┖")).c_str());
 		pLoginResultLabel->SetVisible(true);
 
 		PostMessage(WM_LOGIN_ERROR);
@@ -494,7 +494,7 @@ void CLoginWnd::HandleLogin()
 			CSetting::SetParam("setting_is_auto_login", "1", false);
 			CSetting::SetParam("setting_is_remember_password", "1", false);
 
-			//相当于开启自动登录，默认就是开启了记住密码了
+			//相当于开启自动登录，默认就是开启了记住密码了
 			CSetting::SetUser(s_account, s_password, true);
 		}
 		else
@@ -521,10 +521,10 @@ void CLoginWnd::HandleLogin()
 			}
 		}
 
-		//在这里设置完参数后，统一保存到数据库
+		//鍦ㄨ繖閲岃�缃�畬鍙傛暟鍚庯紝缁熶竴淇濆瓨鍒版暟鎹�簱
 		CSetting::SetParam("last_login_username", s_account, true);
 
-		//把用户名和密码保存起来
+		//把用户名和密码保存起来
 		CSetting::SetLoginInfo(s_account, s_password);
 
 		PostMessage(WM_LOGIN_SUCCESS);
@@ -533,10 +533,10 @@ void CLoginWnd::HandleLogin()
 	}
 	else
 	{
-		//登录失败了
+		//登录失败了
 		CLabelUI* pLoginResultLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("loginresult")));
 
-		pLoginResultLabel->SetText(std::wstring(_T("登录失败：") + CLewaimaiString::UTF8ToUnicode(errmsg)).c_str());
+		pLoginResultLabel->SetText(std::wstring(_T("登录失败：") + CLewaimaiString::UTF8ToUnicode(errmsg)).c_str());
 		pLoginResultLabel->SetVisible(true);
 
 		PostMessage(WM_LOGIN_ERROR);
@@ -552,7 +552,7 @@ void CLoginWnd::LoginSuccess()
     }
 
     pFrame->SetIcon(IDI_ICON_DUILIB);
-    pFrame->Create(NULL, _T("智铺子收银软件"), UI_WNDSTYLE_FRAME, 0L, 0, 0, 1024, 768);
+    pFrame->Create(NULL, _T("智铺子收银软件"), UI_WNDSTYLE_FRAME, 0L, 0, 0, 1024, 768);
     pFrame->CenterWindow();
 
     ::ShowWindow(*pFrame, SW_SHOWMAXIMIZED);
@@ -588,7 +588,7 @@ void CLoginWnd::Update()
 	pFrame->InitData(url, filename);
 
 	pFrame->SetIcon(IDI_ICON_DUILIB);
-	pFrame->Create(NULL, _T("自动更新"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
+	pFrame->Create(NULL, _T("鑷�姩鏇存柊"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
 	pFrame->CenterWindow();
 
 	::ShowWindow(*pFrame, SW_SHOWNORMAL);
@@ -598,7 +598,7 @@ void CLoginWnd::Update()
 
 void CLoginWnd::ShowLoginAgainOut()
 {
-    //这种模式是本人强制挤下线了
+    //这种模式是本人强制挤下线了
     CMessageboxWnd* pMessagebox = new CMessageboxWnd;
     pMessagebox->Create(m_hWnd, _T(""), UI_WNDSTYLE_DIALOG, WS_EX_WINDOWEDGE);
     pMessagebox->SetIcon(IDI_ICON_DUILIB);