bug: fix resttemplate bug

deploy/bootstrap

@@ -2,4 +2,4 @@
 #
 #
 
-java -jar ./colmo-1.0.1.jar
+java -jar ./colmo-1.0.3.jar

deploy/s.yml

@@ -15,7 +15,7 @@ services:
         name: colmo-service
         description: 'colmo h5'
         ossBucket: yz-serverless
-        ossKey: dianyang/colmo-1.0.1.zip
+        ossKey: dianyang/colmo-1.0.3.zip
         handler: 'com.yunzhi.dianyang.SpringApplication::main'
         memorySize: 1024
         timeout: 30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>dianyang</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.3</version>
 	<name>colmo</name>
 	<description>colmo</description>
 

src/main/java/com/yunzhi/dianyang/common/HttpUtils.java

@@ -4,8 +4,9 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Arrays;
-import java.util.Map;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
 
 @Component
 public class HttpUtils {
@@ -14,7 +15,12 @@ public class HttpUtils {
         HttpHeaders headers = new HttpHeaders();
         headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
         HttpEntity<String> entity = new HttpEntity<String>(headers);
-        ResponseEntity<String> resp = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, String.class, params);
         return resp.getBody();
     }
 
@@ -26,7 +32,56 @@ public class HttpUtils {
         headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
         headers.setAll(header);
         HttpEntity<String> entity = new HttpEntity<String>(body, headers);
-        ResponseEntity<String> resp = restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.POST, entity, String.class, params);
         return resp.getBody();
     }
+
+    // RestTemplate 不能正常的处理 querystring, 必须按照约定的方式处理
+    private Map<String, Object> parseURL(String url) {
+        Map<String, Object> res = new HashMap<>();
+
+        String[] parts = url.split("\\?");
+        String baseURL = parts[0];
+
+        if (parts.length < 2) {
+            res.put("url", baseURL);
+            res.put("params", new HashMap<>());
+            return res;
+        }
+
+
+        String[] fields = parts[1].split("&");
+        Map<String, String> params = new HashMap<>();
+        List<String> searchList = new ArrayList<>();
+        for (String field : fields) {
+            String[] pairs = field.split("=");
+            if (2 != pairs.length) {
+                continue;
+            }
+
+            try {
+                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
+                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
+
+                // 转化为 "foo={foo}" 这种字符串
+                searchList.add(String.format("%s={%s}", key, key));
+                // 把 foo 对应的值存储起来
+                params.put(key, val);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // url 格式类似 http://foo.org/bar?name={name}
+        String formatURL = baseURL + "?" + String.join("&", searchList);
+        res.put("url", formatURL);
+        res.put("params", params);
+
+        return res;
+    }
 }

src/main/java/com/yunzhi/dianyang/controller/WxMpController.java

@@ -22,7 +22,8 @@ public class WxMpController extends BaseController {
     @ApiOperation("获取JSSDK相关")
     @GetMapping("/wx/jssdk")
     public ResponseBean jssdk(@RequestParam("url") String url) throws Exception {
-        String json = httpUtils.get(String.format(jssdkAPI, url));
+        String json = httpUtils.get(String.format(jssdkAPI, StringUtils.urlEncode(url)));
+//        String json = httpUtils.get(String.format(jssdkAPI, url));
         JSONObject jsonObject = JSONUtil.parseObj(json);
 
         if (jsonObject.getInt("code") == ResponseBean.CODE_SUCCESS) {