a版本同步

src/main/java/com/izouma/weixin/web/LeYunFuController.java

@@ -32,6 +32,7 @@ import javax.servlet.http.HttpSession;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.util.*;
 
 @Controller
@@ -230,10 +231,14 @@ public class LeYunFuController {
     @RequestMapping(value = "/appUnifiedOrder", method = RequestMethod.GET)
     @ResponseBody
     public Result appUnifiedOrder(@RequestParam(required = true, value = "userId") String userId,
-                                  @RequestParam(required = true, value = "productId") String productId,
-                                  @RequestParam(required = true, value = "ip") String ip) {
+                                  @RequestParam(required = true, value = "productId") String productId
+                                 ) {
         try {
 
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+            String ip = WeixinUtil.getIpAdderss(request);
+
 
             double cash = 1;
 
@@ -297,8 +302,7 @@ public class LeYunFuController {
             String base64encodedString = Base64.getEncoder().encodeToString(paramsStr.getBytes("utf-8"));
             System.out.println("Base64 编码字符串 (URL) :" + base64encodedString);
 
-
-            return new Result(true, base64encodedString);
+            return new Result(true, URLEncoder.encode(base64encodedString, "utf-8"));
 
         } catch (Exception e) {
             logger.error("leyunfu下单失败", e);