完善小程序水印验证方法及Demo

JeffreySu · JeffreySu · commit d355846c21fa · 2017-01-31T00:18:43.000+08:00
diff --git a/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/DecodedUserInfo.cs b/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/DecodedUserInfo.cs
@@ -22,7 +22,7 @@ namespace Senparc.Weixin.WxOpen.Entities
     }
     */
 
-    public class DecodedUserInfo: WatermarkBase
+    public class DecodedUserInfo: DecodeEntityBase
     {
         public string openId { get; set; }
         public string nickName { get; set; }
diff --git a/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Watermark.cs b/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Watermark.cs
@@ -6,7 +6,7 @@
 
 namespace Senparc.Weixin.WxOpen.Entities
 {
-    public class WatermarkBase
+    public class DecodeEntityBase
     {
         public Watermark watermark { get; set; }
     }
diff --git a/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Helpers/EncryptHelper.cs b/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Helpers/EncryptHelper.cs
@@ -26,7 +26,7 @@ namespace Senparc.Weixin.WxOpen.Helpers
     /// <summary>
     /// EncryptHelper
     /// </summary>
-    public class EncryptHelper
+    public static class EncryptHelper
     {
         ///// <summary>
         ///// SHA1加密
@@ -187,6 +187,21 @@ public static DecodedUserInfo DecodeUserInfoBySessionId(string sessionId, string
             return userInfo;
         }
 
+        /// <summary>
+        /// 检查解密消息水印
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="appId"></param>
+        /// <returns>entity为null时也会返回false</returns>
+        public static bool CheckWatermark(this DecodeEntityBase entity, string appId)
+        {
+            if (entity == null)
+            {
+                return false;
+            }
+            return entity.watermark.appid == appId;
+        }
+
         #endregion
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace Senparc.Weixin.WxOpen.Entities`
`22`	`22`	`}`
`23`	`23`	`*/`
`24`	`24`
`25`		`- public class DecodedUserInfo: WatermarkBase`
	`25`	`+ public class DecodedUserInfo: DecodeEntityBase`
`26`	`26`	`{`
`27`	`27`	`public string openId { get; set; }`
`28`	`28`	`public string nickName { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Senparc.Weixin.WxOpen.Entities`
`8`	`8`	`{`
`9`		`- public class WatermarkBase`
	`9`	`+ public class DecodeEntityBase`
`10`	`10`	`{`
`11`	`11`	`public Watermark watermark { get; set; }`
`12`	`12`	`}`