Skip to content

Commit

Permalink
Merge pull request #1441 from JeffreySu/Developer
Browse files Browse the repository at this point in the history 
Developer
  • Loading branch information
@JeffreySu
JeffreySu authored Oct 16, 2018
2 parents 16fbd84 + c8eff72 commit 05dd449
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 30 deletions.
17 changes: 16 additions & 1 deletion Samples/Senparc.Weixin.MP.Sample.WebForms/Senparc.Weixin.MP.Sample.WebForms.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.26730.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.Weixin.MP.Sample.WebForms", "Senparc.Weixin.MP.Sample.WebForms\Senparc.Weixin.MP.Sample.WebForms.csproj", "{F4913863-687B-44EF-B1A4-655C49A5BCB7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.Weixin.MP.Sample.CommonService", "..\..\Samples\Senparc.Weixin.MP.Sample\Senparc.Weixin.MP.Sample.CommonService\Senparc.Weixin.MP.Sample.CommonService.csproj", "{CCD291E9-16FA-4B53-B032-EBD3F659567B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.Weixin.MP.Sample.CommonService", "..\Senparc.Weixin.MP.Sample\Senparc.Weixin.MP.Sample.CommonService\Senparc.Weixin.MP.Sample.CommonService.csproj", "{CCD291E9-16FA-4B53-B032-EBD3F659567B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.Weixin", "..\..\src\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.csproj", "{814092CD-9CD0-4FB7-91E8-D147F476F1FB}"
EndProject
Expand All @@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.Weixin.WxOpen", "..
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.WebSocket", "..\..\src\Senparc.WebSocket\src\Senparc.WebSocket\Senparc.WebSocket\Senparc.WebSocket.csproj", "{B745F5F5-9120-4D56-A86D-ED34EADB703C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.Weixin.TenPay", "..\..\src\Senparc.Weixin.TenPay\Senparc.Weixin.TenPay\Senparc.Weixin.TenPay.csproj", "{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -157,6 +159,18 @@ Global
{B745F5F5-9120-4D56-A86D-ED34EADB703C}.Test|Any CPU.Build.0 = Release|Any CPU
{B745F5F5-9120-4D56-A86D-ED34EADB703C}.Test|x86.ActiveCfg = Release|Any CPU
{B745F5F5-9120-4D56-A86D-ED34EADB703C}.Test|x86.Build.0 = Release|Any CPU
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Debug|x86.ActiveCfg = Debug|x86
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Debug|x86.Build.0 = Debug|x86
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Release|Any CPU.Build.0 = Release|Any CPU
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Release|x86.ActiveCfg = Release|x86
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Release|x86.Build.0 = Release|x86
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Test|Any CPU.ActiveCfg = Release|Any CPU
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Test|Any CPU.Build.0 = Release|Any CPU
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Test|x86.ActiveCfg = Release|x86
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C}.Test|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -171,6 +185,7 @@ Global
{CC0EBEC4-7120-4627-A596-C1F2958F3D5E} = {4C3781FC-ED99-404A-BE86-158618E3A8B1}
{379D8C97-4F96-45AF-9F91-6BD160514495} = {4C3781FC-ED99-404A-BE86-158618E3A8B1}
{B745F5F5-9120-4D56-A86D-ED34EADB703C} = {4C3781FC-ED99-404A-BE86-158618E3A8B1}
{DEFC9E7A-F6F0-4E97-AC11-30CF0E6A875C} = {4C3781FC-ED99-404A-BE86-158618E3A8B1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AB54033B-C93A-47CE-BA9C-3B3BDD31E0A0}
Expand Down
2 changes: 1 addition & 1 deletion Samples/Senparc.Weixin.MP.Sample.WebForms/Senparc.Weixin.MP.Sample.WebForms/Default.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,4 +301,4 @@
</div>
</div>
</body>
</html>
</html>
16 changes: 16 additions & 0 deletions ...ample.WebForms/Senparc.Weixin.MP.Sample.WebForms/Senparc.Weixin.MP.Sample.WebForms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,21 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.2.16.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.2.16\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.2.7.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.2.7.3\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
Expand Down Expand Up @@ -91,6 +102,7 @@
<Folder Include="App_Data\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
Expand Down Expand Up @@ -119,6 +131,10 @@
<Project>{54732c3d-b673-4bbf-b0c3-6432e3d6f522}</Project>
<Name>Senparc.Weixin.Open</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Senparc.Weixin.TenPay\Senparc.Weixin.TenPay\Senparc.Weixin.TenPay.csproj">
<Project>{defc9e7a-f6f0-4e97-ac11-30cf0e6a875c}</Project>
<Name>Senparc.Weixin.TenPay</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Senparc.Weixin.Work\Senparc.Weixin.Work\Senparc.Weixin.Work.csproj">
<Project>{cc0ebec4-7120-4627-a596-c1f2958f3d5e}</Project>
<Name>Senparc.Weixin.Work</Name>
Expand Down
70 changes: 43 additions & 27 deletions Samples/Senparc.Weixin.MP.Sample.WebForms/Senparc.Weixin.MP.Sample.WebForms/Web.config
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<!-- URL对接信息 -->
<add key="WeixinToken" value="第三方URL对应的Token"/>
<add key="WeixinEncodingAESKey" value="第三方URL对应的消息加解密密钥"/>
<add key="WeixinToken" value="第三方URL对应的Token" />
<add key="WeixinEncodingAESKey" value="第三方URL对应的消息加解密密钥" />
<!-- 高级接口信息 -->
<add key="WeixinAppId" value="微信AppId"/>
<add key="WeixinAppSecret" value="微信AppSecret"/>
<add key="WeixinAppId" value="微信AppId" />
<add key="WeixinAppSecret" value="微信AppSecret" />
<!-- SDK提供的代理功能设置 -->
<add key="WeixinAgentUrl" value="外部代理Url"/>
<add key="WeixinAgentToken" value="外部代理Token"/>
<add key="WeixinAgentWeiweihiKey" value="外部代理WeiWeiHiKey"/>
<add key="WeixinAgentUrl" value="外部代理Url" />
<add key="WeixinAgentToken" value="外部代理Token" />
<add key="WeixinAgentWeiweihiKey" value="外部代理WeiWeiHiKey" />
<!-- 微信支付相关参数 -->
<!-- 微信支付V2 -->
<add key="WeixinPay_Tenpay" value="WeixinPay_Tenpay"/>
<add key="WeixinPay_PartnerId" value="WeixinPay_PartnerId"/>
<add key="WeixinPay_Key" value="WeixinPay_Key"/>
<add key="WeixinPay_AppId" value="WeixinPay_AppId"/>
<add key="WeixinPay_AppKey" value="WeixinPay_AppKey"/>
<add key="WeixinPay_TenpayNotify" value="WeixinPay_TenpayNotify"/>
<add key="WeixinPay_Tenpay" value="WeixinPay_Tenpay" />
<add key="WeixinPay_PartnerId" value="WeixinPay_PartnerId" />
<add key="WeixinPay_Key" value="WeixinPay_Key" />
<add key="WeixinPay_AppId" value="WeixinPay_AppId" />
<add key="WeixinPay_AppKey" value="WeixinPay_AppKey" />
<add key="WeixinPay_TenpayNotify" value="WeixinPay_TenpayNotify" />
<!-- 微信支付V3 -->
<add key="TenPayV3_MchId" value="TenPayV3_MchId"/>
<add key="TenPayV3_Key" value="TenPayV3_Key"/>
<add key="TenPayV3_AppId" value="TenPayV3_AppId"/>
<add key="TenPayV3_AppSecret" value="TenPayV3_AppSecret"/>
<add key="TenPayV3_TenpayNotify" value="TenPayV3_TenpayNotify"/>
<add key="TenPayV3_MchId" value="TenPayV3_MchId" />
<add key="TenPayV3_Key" value="TenPayV3_Key" />
<add key="TenPayV3_AppId" value="TenPayV3_AppId" />
<add key="TenPayV3_AppSecret" value="TenPayV3_AppSecret" />
<add key="TenPayV3_TenpayNotify" value="TenPayV3_TenpayNotify" />
<!-- 开放平台 -->
<add key="Component_Appid" value="Component_Appid"/>
<add key="Component_Secret" value="Component_Secret"/>
<add key="Component_Token" value="Component_Token"/>
<add key="Component_EncodingAESKey" value="Component_EncodingAESKey"/>
<add key="Component_Appid" value="Component_Appid" />
<add key="Component_Secret" value="Component_Secret" />
<add key="Component_Token" value="Component_Token" />
<add key="Component_EncodingAESKey" value="Component_EncodingAESKey" />
</appSettings>
<connectionStrings/>
<connectionStrings />
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
Expand All @@ -41,13 +41,13 @@
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.5"/>
<compilation debug="true" targetFramework="4.5" />
<!--
通过 <authentication> 节，可配置
ASP.NET 用于识别进入用户的
安全身份验证模式。
-->
<authentication mode="Windows"/>
<authentication mode="Windows" />
<!--
通过 <customErrors> 节，可以配置
在执行请求的过程中出现未处理的错误时要执行
Expand All @@ -60,10 +60,26 @@
<error statusCode="404" redirect="FileNotFound.htm" />
</customErrors>
-->
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
</system.web>
<!--
system.webServer 节是在 Internet Information Services 7.0 下运行 ASP.NET AJAX
所必需的。对于早期版本的 IIS，不必保留此节。
-->
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Enyim.Caching" publicKeyToken="cec98615db04012e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.11.0.0" newVersion="2.11.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
6 changes: 6 additions & 0 deletions Samples/Senparc.Weixin.MP.Sample.WebForms/Senparc.Weixin.MP.Sample.WebForms/packages.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.2.16" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.7.3" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion Samples/Senparc.Weixin.MP.Sample/Senparc.Weixin.MP.Sample/Views/Menu/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
</p>
</div>
<div>
<p class="goto-neuchar"><a href="https://www.neuchar.com/User/WeixinMenu?app=10" target="_blank">开始使用</a></p>
<p class="goto-neuchar"><a href="https://www.neuchar.com/User/WeixinMenu" target="_blank">开始使用</a></p>

<p class="img-area">
<video controls="controls" style="margin-bottom:50px; width:100%">
Expand Down

0 comments on commit 05dd449

Please sign in to comment.