1、兼容合并 FreemudWrapper.dll + PaymentWrapper.dll 功能;

2、编译注意事项 请参考 READ.md

3、Version: 1.20.11.3

FreemudWrapper.vcxproj

@@ -44,6 +44,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LibraryPath>$(LibraryPath)</LibraryPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>FreemudWrapper</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -83,7 +86,6 @@
   <ItemGroup>
     <ClInclude Include="NetDataLog.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="resource1.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="FreemudWrapper.rc" />

FreemudWrapper.vcxproj.filters

@@ -31,9 +31,6 @@
     <ClInclude Include="resource.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="resource1.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="NetDataLog.h">
       <Filter>头文件</Filter>
     </ClInclude>

README.md

-#FreemudWrapper
-星巴克包装类
\ No newline at end of file
+#FreemudWrapper   -> sbkpay.dll 的包装类 (微信+支付宝);
+
+#PaymentWrapper   -> fmclient.dll 的包装类 (券+银联);
+
+##变更  FreemudWrapper.cpp 源码, 是否定义宏: PAYMENT_WRAPPER_DLL 进入不同逻辑分支
+
+###详细操作如下:
+① 根据宏:PAYMENT_WRAPPER_DLL 定义来控制内部逻辑调用 fmclient.dll(券+银联) Or sbkpay.dll(微信+支付宝);
+
+② 如果定义宏:PAYMENT_WRAPPER_DLL 则需将  工程属性->配置属性->常规->目标文件名 设定为  PaymentWrapper  否则设定为   FreemudWrapper
+

freemudwrapper.def

@@ -2,3 +2,6 @@ LIBRARY
 
 EXPORTS
 	FreemudPay
+	GetValue
+	RESGetValue
+	GetRSACret

resource.h

@@ -11,4 +11,4 @@
 #define _APS_NEXT_CONTROL_VALUE         1001
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
-#endif
+#endif
\ No newline at end of file