fix new feature

1、向请求体中 额外添加  dllVersion + serverUrl key-value
2、优化代码结构目录 完善注释
3、Version： 2.21.1.12

ZH_Client/ZH_Client.vcxproj

@@ -43,13 +43,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client\include;E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client\include\curl-7.40.0\include\curl;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client\lib;E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)ZH_Client\include;$(SolutionDir)ZH_Client\include\curl-7.40.0\include\curl;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)ZH_Client\include\curl-7.40.0\lib;$(SolutionDir)ZH_Client\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client;E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client\include;E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client\include\curl-7.40.0\include\curl;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client;E:\zouwuyang\StarBucks\UPP-Client-Project\fmclient-CCO-1438\sbkclient\ZH_Client\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)ZH_Client\include;$(SolutionDir)ZH_Client\include\curl-7.40.0\include\curl;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)ZH_Client;$(SolutionDir)ZH_Client\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -88,7 +88,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="sbk_client.cpp" />
+    <ClCompile Include="fmclient.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="dataprocess.h" />
@@ -108,4 +108,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

ZH_Client/ZH_Client.vcxproj.filters

@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="sbk_client.cpp">
+    <ClCompile Include="fmclient.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -59,4 +59,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

ZH_Client/fmglobal.h

@@ -17,7 +17,7 @@
 //EC-1446
 #define EC_DES3_KEY                    "DDDDEEEE45LPODDCXZZLKDDO"
 
-#define DLL_VERSION                   "2.20.11.3"
+#define DLL_VERSION                   "2.21.1.12"
 
 #define CRET_FILE_NAME				"client.p12"
 #define JSON_KEY_ONLY				"partnerOrderId"
@@ -26,6 +26,8 @@
 #define DB_ORDER					"order.db"
 #define DB_TABLE_NAME				"orderlist"
 #define MAX_ORDERID_LEN				200
-#define POSTYPE                      "posType"
 
+#define POS_TYPE_KEY            "posType"
+#define UPS_URL_KEY              "serverUrl"
+#define DLL_VER_KEY              "dllVersion"
 #endif
\ No newline at end of file

ZH_Client/main.cpp

 //#define FM_TEST
 //#ifdef FM_TEST
-//
+
 //#include "fmtool.h"
-//
 //#include <iostream>
-//
 //#include <rapidjson/document.h>
 //#include <rapidjson/prettywriter.h>  
 //#include <rapidjson/filereadstream.h>  
 //#include <rapidjson/error/en.h>
 //#include <rapidjson/filewritestream.h> 
 //#include <rapidjson/stringbuffer.h>
-//
 //#include <gtest/gtest.h>
+
 //using rapidjson::StringStream;
 //using rapidjson::Document;
 //using std::string;
 //using std::endl;
 //
-//#include <gtest/gtest.h>
-//
-//TEST(TestApp, TestComplementJson)
-//{
+//TEST(TestApp, TestComplementJson) {
 //	char in[] = "{\"ver\":1,\"message\":\"\",\"products\":[{\"pid\":4,\"name\":\"lcd\"},{\"name\":\"lcd\"},{\"pid\":4},{}]}";
-//
-//
 //	char out[MAX_BUF_LEN] = { 0 };
-//
-//	try
-//	{
-//		int i = Tool::ComplementJson(in, out, 0);
-//		LOG() << out << "\r\n" << i ;
-//	}
-//	catch (...)
-//	{
-//		std::cout << "asdasdasdasdasdas" << std::endl;
-//	}
-//	
-//	
-//	//Document outdata;
-//	//outdata.Parse(out);
-//	//if(outdata.HasParseError())
-//	//{
-//	//	LOG()<< "outdata error";
-//	//}
-//	//Value value;
-//	//if (outdata.HasMember("reqtype"))
-//	//{
-//	//	value = outdata["reqtype"];
-//	//	EXPECT_EQ(value.GetInt(), 0);
-//	//}
-//
 //}
 //
-//int main(int argc, char *argv[])
-//{
+//int main(int argc, char *argv[]) {
 //	::testing::InitGoogleTest(&argc, argv);
-//	//teststring();
+//	teststring();
 //	RUN_ALL_TESTS();
-//	//testAll();
+//	testAll();
 //	system("pause");
 //	return 1;
 //}
-//
+
 //#endif
\ No newline at end of file