commit 9a4fa03f19ff43cb469d2885144e36f93e84add0
author sijun.li <sijun.li@supwisdom.com> 周四 10月 15 10:04:46 2020 +0800
committer sijun.li <sijun.li@supwisdom.com> 周四 10月 15 11:41:13 2020 +0800
tree f6a96344739341551e701bfc35905edcc9d4547f
parent 3f8620b02b11327aeacab75bc949142c656e5426

区分微信和小程序扫码

src/main/java/com/supwisdom/dlpay/framework/util/Constants.java

diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/Constants.java b/src/main/java/com/supwisdom/dlpay/framework/util/Constants.java
index fe5c95a..148138c 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/util/Constants.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/util/Constants.java
@@ -11,4 +11,5 @@
   public static final String DTLTYPE_WATER = "water";
   public static final String REDISKEY_SHORTURL = "shorturl_";
   public static final String WECHAT_AGENT = "micromessenger";
+  public static final String WECHAT_MINIPROGRAM = "miniprogram";
 }

src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt

diff --git a/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
index 465fb80..a68ee5f 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
@@ -224,7 +224,10 @@
             if (!StringUtil.isEmpty(agent)) {
                 //判断是否微信扫码
                 if (agent.toLowerCase().contains(Constants.WECHAT_AGENT)) {
-                    return ModelAndView("error/prompt")
+                    //判断是否微信小程序
+                    if (!agent.toLowerCase().contains(Constants.WECHAT_MINIPROGRAM)) {
+                        return ModelAndView("error/prompt")
+                    }
                 }
             }
             val cobillno = redisTemplate.opsForValue().get(Constants.REDISKEY_SHORTURL + shortId)