From 8f425f79445b45fb1ea1397ea4516cfde9f5519c Mon Sep 17 00:00:00 2001
From: Mc7246 <jiangshans@163.com>
Date: Sat, 20 Oct 2018 12:17:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=94=B1nuget=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Senparc.Weixin.WxOpen.csproj              | 20 ++++++++++++-------
 .../Senparc.Weixin.WxOpen/packages.config     |  2 --
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.csproj b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.csproj
index d9af5e9097..174ec81c79 100644
--- a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.csproj
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.csproj
@@ -50,12 +50,6 @@
     <Reference Include="Senparc.NeuChar, Version=0.2.10.3, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.2.10.3\lib\net45\Senparc.NeuChar.dll</HintPath>
     </Reference>
-    <Reference Include="Senparc.Weixin, Version=6.1.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.Weixin.6.1.7\lib\net45\Senparc.Weixin.dll</HintPath>
-    </Reference>
-    <Reference Include="Senparc.Weixin.MP, Version=16.4.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.Weixin.MP.16.4.6\lib\net45\Senparc.Weixin.MP.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -124,7 +118,19 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.csproj">
+      <Project>{1d815fbf-451c-4e23-939c-cb80172f445c}</Project>
+      <Name>Senparc.Weixin.MP</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.csproj">
+      <Project>{814092cd-9cd0-4fb7-91e8-d147f476f1fb}</Project>
+      <Name>Senparc.Weixin</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/packages.config b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/packages.config
index a08f944fc0..3e90e6dcbb 100644
--- a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/packages.config
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/packages.config
@@ -6,6 +6,4 @@
   <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.10.3" targetFramework="net45" />
-  <package id="Senparc.Weixin" version="6.1.7" targetFramework="net45" />
-  <package id="Senparc.Weixin.MP" version="16.4.6" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 0c067db9ce563ae1a29cab89db30d71bc4369dc6 Mon Sep 17 00:00:00 2001
From: Mc7246 <jiangshans@163.com>
Date: Thu, 3 Jan 2019 16:38:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ComponentAPIs/ComponentApi.cs             | 99 +++++++++++++++++++
 .../RequestMessageThirdFasteRegister.cs       | 75 ++++++++++++++
 .../Senparc.Weixin.Open/Enums.cs              | 16 ++-
 .../ThirdPartyMessageHandler.cs               | 14 +++
 .../RequestMessageFactory.cs                  |  4 +-
 src/Senparc.Weixin/Senparc.Weixin/Enums.cs    | 20 ++++
 6 files changed, 226 insertions(+), 2 deletions(-)
 create mode 100644 src/Senparc.Weixin.Open/Senparc.Weixin.Open/Entities/Request/RequestMessageThirdFasteRegister.cs

diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/ComponentAPIs/ComponentApi.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/ComponentAPIs/ComponentApi.cs
index 94d2e05149..8dae342218 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/ComponentAPIs/ComponentApi.cs
+++ b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/ComponentAPIs/ComponentApi.cs
@@ -302,6 +302,56 @@ public static JsApiTicketResult GetJsApiTicket(string authorizerAccessToken, str
             JsApiTicketResult result = Get.GetJson<JsApiTicketResult>(url);
             return result;
         }
+
+        /// <summary>
+        /// 文档：https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=21538208049W8uwq&token=&lang=zh_CN
+        /// 创建(查询)小程序接口
+        /// </summary>
+        /// <param name="componentAccessToken"></param>
+        /// <param name="entName">企业名（需与工商部门登记信息一致）</param>
+        /// <param name="legalPersonaWechat">法人微信号</param>
+        /// <param name="legalPersonaName">法人姓名（绑定银行卡）</param>
+        /// <param name="action">动作类型：create或search，当为search时，entCode,codeType,componentPhone可不传参</param>
+        /// <param name="entCode">企业代码</param>
+        /// <param name="codeType">企业代码类型 1：统一社会信用代码（18位） 2：组织机构代码（9位xxxxxxxx-x） 3：营业执照注册号(15位)</param>
+        /// <param name="componentPhone">第三方联系电话（方便法人与第三方联系）</param>
+        /// <param name="timeOut"></param>
+        /// <returns></returns>
+        [ApiBind(NeuChar.PlatformType.WeChat_Open, "ComponentApi.FastRegisterWeApp", true)]
+        public static WxJsonResult FastRegisterWeApp(string componentAccessToken, string entName, string legalPersonaWechat, string legalPersonaName, string action ="create", string entCode="", CodeType codeType = CodeType.统一社会信用代码, string componentPhone = "", int timeOut = Config.TIME_OUT)
+        {
+            var url = string.Format(
+                Config.ApiMpHost + "/cgi-bin/component/fastregisterweapp?action={0}&component_access_token={1}",
+                action.AsUrlData(),
+                componentAccessToken.AsUrlData());
+
+            //var data;
+            object data;
+            if (action == "create")
+            {
+               data = new
+                {
+                    name = entName,
+                    code = entCode,
+                    code_type = codeType,
+                    legal_persona_wechat = legalPersonaWechat,
+                    legal_persona_name = legalPersonaName,
+                    component_phone = componentPhone
+                };
+            }
+            else
+            {
+               data = new
+                {
+                    name = entName,
+                    legal_persona_wechat = legalPersonaWechat,
+                    legal_persona_name = legalPersonaName,
+                };
+            }
+
+            return CommonJsonSend.Send<WxJsonResult>(null, url, data, CommonJsonSendType.POST, timeOut);
+        }
+
         #endregion
 
 #if !NET35 && !NET40
@@ -535,6 +585,55 @@ public static async Task<JsApiTicketResult> GetJsApiTicketAsync(string authorize
             JsApiTicketResult result = await Get.GetJsonAsync<JsApiTicketResult>(url);
             return result;
         }
+
+        /// <summary>
+        /// 文档：https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=21538208049W8uwq&token=&lang=zh_CN
+        /// 创建小程序接口
+        /// </summary>
+        /// <param name="componentAccessToken"></param>
+        /// <param name="entName">企业名（需与工商部门登记信息一致）</param>
+        /// <param name="entCode">企业代码</param>
+        /// <param name="codeType">企业代码类型 1：统一社会信用代码（18位） 2：组织机构代码（9位xxxxxxxx-x） 3：营业执照注册号(15位)</param>
+        /// <param name="legalPersonaWechat">法人微信号</param>
+        /// <param name="legalPersonaName">法人姓名（绑定银行卡）</param>
+        /// <param name="componentPhone">第三方联系电话（方便法人与第三方联系）</param>
+        /// <param name="timeOut"></param>
+        /// <returns></returns>
+        [ApiBind(NeuChar.PlatformType.WeChat_Open, "ComponentApi.FastRegisterWeAppAsync", true)]
+        public static async Task<WxJsonResult> FastRegisterWeAppAsync(string componentAccessToken, string entName, string legalPersonaWechat, string legalPersonaName, string action ="create", string entCode="", CodeType codeType = CodeType.统一社会信用代码, string componentPhone = "", int timeOut = Config.TIME_OUT)
+        {
+            var url = string.Format(
+                Config.ApiMpHost + "/cgi-bin/component/fastregisterweapp?action={0}&component_access_token={1}",
+                action.AsUrlData(),
+                componentAccessToken.AsUrlData());
+
+            //var data;
+            object data;
+            if (action == "create")
+            {
+               data = new
+                {
+                    name = entName,
+                    code = entCode,
+                    code_type = codeType,
+                    legal_persona_wechat = legalPersonaWechat,
+                    legal_persona_name = legalPersonaName,
+                    component_phone = componentPhone
+                };
+            }
+            else
+            {
+               data = new
+                {
+                    name = entName,
+                    legal_persona_wechat = legalPersonaWechat,
+                    legal_persona_name = legalPersonaName,
+                };
+            }
+
+            return await Senparc.Weixin.CommonAPIs.CommonJsonSend.SendAsync<WxJsonResult>(null, url, data, CommonJsonSendType.POST, timeOut);
+        }
+
         #endregion
 #endif
         //////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Entities/Request/RequestMessageThirdFasteRegister.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Entities/Request/RequestMessageThirdFasteRegister.cs
new file mode 100644
index 0000000000..ba37264198
--- /dev/null
+++ b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Entities/Request/RequestMessageThirdFasteRegister.cs
@@ -0,0 +1,75 @@
+/*----------------------------------------------------------------
+    Copyright (C) 2018 Senparc
+    
+    文件名：RequestMessageThirdFasteRegister.cs
+    文件功能描述：注册审核事件推送
+    
+    
+    创建标识：Senparc - 20190103
+----------------------------------------------------------------*/
+
+using System;
+
+namespace Senparc.Weixin.Open
+{
+    /// <summary>
+    /// 注册审核事件推送
+    /// </summary>
+    public class RequestMessageThirdFasteRegister : RequestMessageBase
+    {
+        public override RequestInfoType InfoType
+        {
+            get { return RequestInfoType.notify_third_fasteregister; }
+        }
+
+        /// <summary>
+        /// 创建小程序appid
+        /// </summary>
+        public string appid { get; set; }
+
+        public ReturnCode status { get; set; }
+        /// <summary>
+        /// 第三方授权码
+        /// </summary>
+        public string auth_code { get; set; }
+
+        public string msg { get; set; }
+
+        /// <summary>
+        /// 注册时提交的资料
+        /// </summary>
+        public info info {get;set;}
+    }
+
+    /// <summary>
+    /// 注册时提交的资料信息
+    /// </summary>
+    public class info
+    {
+        /// <summary>
+        /// 企业名称
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 企业代码
+        /// </summary>
+        public string code { get; set; }
+        /// <summary>
+        /// 企业代码类型 
+        /// </summary>
+        public CodeType code_type { get; set; }
+        /// <summary>
+        /// 法人微信号
+        /// </summary>
+        public string legal_persona_wechat { get; set; }
+        /// <summary>
+        /// 法人姓名
+        /// </summary>
+        public string legal_persona_name { get; set; }
+        /// <summary>
+        /// 第三方联系电话
+        /// </summary>
+        public string component_phone { get; set; }
+    }
+}
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Enums.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Enums.cs
index b8afd4a513..6bbe5383a1 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Enums.cs
+++ b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Enums.cs
@@ -90,7 +90,11 @@ public enum RequestInfoType
         /// <summary>
         /// 授权成功通知
         /// </summary>
-        authorized
+        authorized,
+        /// <summary>
+        /// 小程序注册审核事件推送
+        /// </summary>
+        notify_third_fasteregister
     }
 
     /// <summary>
@@ -269,4 +273,14 @@ public enum LoginAuthType
         仅展示小程序 = 2,
         表示公众号和小程序都展示 = 3
     }
+
+    /// <summary>
+    /// 企业代码类型 1：统一社会信用代码（18位） 2：组织机构代码（9位xxxxxxxx-x） 3：营业执照注册号(15位)
+    /// </summary>
+    public enum CodeType
+    {
+        统一社会信用代码 =1,
+        组织机构代码=2,
+        营业执照注册号=3
+    }
 }
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/MessageHandlers/ThirdPartyMessageHandler.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/MessageHandlers/ThirdPartyMessageHandler.cs
index 668af6b526..b944ace254 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/MessageHandlers/ThirdPartyMessageHandler.cs
+++ b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/MessageHandlers/ThirdPartyMessageHandler.cs
@@ -135,6 +135,12 @@ public void Execute()
                             ResponseMessageText = OnUpdateAuthorizedRequest(requestMessage);
                         }
                         break;
+                    case RequestInfoType.notify_third_fasteregister:
+                        {
+                            var requestMessage = RequestMessage as RequestMessageThirdFasteRegister;
+                            ResponseMessageText = OnThirdFasteRegisterRequest(requestMessage);
+                        }
+                        break;
                     default:
                         throw new UnknownRequestMsgTypeException("未知的InfoType请求类型", null);
                 }
@@ -199,5 +205,13 @@ public virtual string OnUpdateAuthorizedRequest(RequestMessageUpdateAuthorized r
         {
             return "success";
         }
+
+        public virtual string OnThirdFasteRegisterRequest(RequestMessageThirdFasteRegister requestMessage)
+        {
+            return "success";
+        }
+
+
+
     }
 }
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/RequestMessageFactory.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/RequestMessageFactory.cs
index 99dda15bf8..f15f6adb38 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/RequestMessageFactory.cs
+++ b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/RequestMessageFactory.cs
@@ -89,7 +89,9 @@ public static IRequestMessageBase GetRequestEntity(XDocument doc, PostModel post
                     case RequestInfoType.updateauthorized:
                         requestMessage = new RequestMessageUpdateAuthorized();
                         break;
-
+                    case RequestInfoType.notify_third_fasteregister:
+                        requestMessage = new RequestMessageThirdFasteRegister();
+                        break;
                     default:
                         throw new UnknownRequestMsgTypeException(string.Format("InfoType：{0} 在RequestMessageFactory中没有对应的处理程序！", infoType), new ArgumentOutOfRangeException());//为了能够对类型变动最大程度容错（如微信目前还可以对公众账号suscribe等未知类型，但API没有开放），建议在使用的时候catch这个异常
                 }
diff --git a/src/Senparc.Weixin/Senparc.Weixin/Enums.cs b/src/Senparc.Weixin/Senparc.Weixin/Enums.cs
index beecd785dc..5c7e2fd785 100644
--- a/src/Senparc.Weixin/Senparc.Weixin/Enums.cs
+++ b/src/Senparc.Weixin/Senparc.Weixin/Enums.cs
@@ -253,6 +253,26 @@ public enum ReturnCode
         //开放平台
 
         该公众号_小程序已经绑定了开放平台帐号 = 89000,//account has bound open，该公众号/小程序已经绑定了开放平台帐号
+        该主体已有任务执行中_距上次任务24h后再试 = 89249,//  task running
+        内部错误= 89247,//    inner error
+        无效微信号 = 86004,//   invalid wechat
+        法人姓名与微信号不一致= 61070,// name, wechat name not in accordance
+        企业代码类型无效_请选择正确类型填写= 89248,//  invalid code type
+        未找到该任务= 89250,//  task not found
+        待法人人脸核身校验= 89251,//   legal person checking
+        法人_企业信息一致性校验中= 89252,//   front checking
+        缺少参数= 89253,//    lack of some params
+        第三方权限集不全_补全权限集全网发布后生效= 89254,//   lack of some component rights
+        已下发的模板消息法人并未确认且已超时_24h_未进行身份证校验= 100001,
+        已下发的模板消息法人并未确认且已超时_24h_未进行人脸识别校验 = 100002,
+        已下发的模板消息法人并未确认且已超时_24h= 100003,
+        工商数据返回_企业已注销=101,
+        工商数据返回_企业不存在或企业信息未更新=102,
+        工商数据返回_企业法定代表人姓名不一致= 103,
+        工商数据返回_企业法定代表人身份证号码不一致=104,
+        法定代表人身份证号码_工商数据未更新_请5_15个工作日之后尝试= 105,
+        工商数据返回_企业信息或法定代表人信息不一致=1000,
+
 
         //小程序代码管理返回码
         不是由第三方代小程序进行调用 = 86000,