优化代码

server/DirectoryV2.xml

@@ -37,4 +37,5 @@
     <tree path="/like-front/src/main/java/com/mdd/front/cache" title="缓存层"/>
     <tree path="/like-admin/src/main/java/com/mdd/admin/cache" title="缓存层"/>
     <tree path="/like-admin/src/main/java/com/mdd/admin/aop" title="切面层"/>
+    <tree path="/like-common/src/main/java/com/mdd/common/cache" title="缓存层"/>
 </trees>

server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java

@@ -11,7 +11,6 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.mdd.common.entity.setting.DevPayConfig;
-import com.mdd.common.entity.user.UserAuth;
 import com.mdd.common.enums.ClientEnum;
 import com.mdd.common.mapper.setting.DevPayConfigMapper;
 import com.mdd.common.plugin.wechat.request.PaymentRequestV3;
@@ -93,10 +92,9 @@ public class WxPayDriver {
         if (terminal == ClientEnum.H5.getCode()) {
             WxPayUnifiedOrderV3Request.SceneInfo sceneInfo = new WxPayUnifiedOrderV3Request.SceneInfo();
             WxPayUnifiedOrderV3Request.H5Info h5Info = new WxPayUnifiedOrderV3Request.H5Info();
-            h5Info.setType("android");
+            h5Info.setType(RequestUtils.device());
             sceneInfo.setH5Info(h5Info);
             sceneInfo.setPayerClientIp(IpUtils.getHostIp());
-            sceneInfo.setDeviceId("1");
             wxPayUnifiedOrderV3Request.setSceneInfo(sceneInfo);
         }
 

server/like-common/src/main/java/com/mdd/common/util/RequestUtils.java

@@ -110,6 +110,28 @@ public class RequestUtils {
         return null;
     }
 
+    /**
+     * 获取设备标识
+     *
+     * @author fzr
+     * @return String
+     */
+    public static String device() {
+        HttpServletRequest request = RequestUtils.handler();
+        if (request != null) {
+            String userAgent = request.getHeader("User-Agent");
+            if(userAgent.contains("Android")) {
+                return "Android";
+            }else if(userAgent.contains("iPhone") || userAgent.contains("iPod") || userAgent.contains("iPad")) {
+                return "IOS";
+            } else {
+                return "wap";
+            }
+        }
+
+        return "wap";
+    }
+
     /**
      * 判断是否是GET请求
      *