Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/HTTPSUtils.java

@@ -24,10 +24,8 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.ConnectException;
 import java.net.URL;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -192,4 +190,59 @@ public class HTTPSUtils {
         return body;
     }
 
+    public static String httpRequest(String requestUrl, String requestMethod, String msg){
+        OutputStream outputStream = null;
+        InputStream inputStream = null;
+        try {
+            // 创建SSLContext对象，并使用我们指定的信任管理器初始化
+            TrustManager[] tm = {new MyX509TrustManager()};
+            SSLContext sslContext = SSLContext.getInstance("SSL", "SunJSSE");
+            sslContext.init(null, tm, new java.security.SecureRandom());
+            // 从上述SSLContext对象中得到SSLSocketFactory对象
+            SSLSocketFactory ssf = sslContext.getSocketFactory();
+
+            URL url = new URL(requestUrl);
+            HttpsURLConnection httpUrlConn = (HttpsURLConnection) url.openConnection();
+            httpUrlConn.setSSLSocketFactory(ssf);
+
+            httpUrlConn.setDoOutput(true);
+            httpUrlConn.setDoInput(true);
+            httpUrlConn.setUseCaches(false);
+            // 设置请求方式（GET/POST）
+            httpUrlConn.setRequestMethod(requestMethod);
+
+            if ("GET".equalsIgnoreCase(requestMethod))
+                httpUrlConn.connect();
+
+            // 当有数据需要提交时
+            if (null != msg) {
+                outputStream = httpUrlConn.getOutputStream();
+                // 注意编码格式，防止中文乱码
+                outputStream.write(msg.getBytes("UTF-8"));
+            }
+
+            // 将返回的输入流转换成字符串
+            inputStream = httpUrlConn.getInputStream();
+            InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "UTF-8");
+            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+            StringBuffer buffer = new StringBuffer();
+            String str = null;
+            while ((str = bufferedReader.readLine()) != null) {
+                buffer.append(str);
+            }
+
+            httpUrlConn.disconnect();
+            return buffer.toString();
+        } catch (ConnectException ce) {
+            log.error("Weixin server connection timed out.");
+        } catch (Exception e) {
+            log.error("https request error:"+e.getMessage());
+        }finally{
+            if(outputStream != null)try{outputStream.close();}catch (Exception e) {}
+            if(inputStream != null)try{inputStream.close();;}catch (Exception e) {}
+        }
+        return null;
+    }
+
+
 }
\ No newline at end of file

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/FastServiceController.java

@@ -19,7 +19,7 @@ public class FastServiceController {
      * @param code
      * @return
      */
-    @GetMapping(value = "/token")
+    @GetMapping(value = "/app/unauth/getUserToken")
     public ObjectRestResponse getAccessToken(String code) {
         return fastServiceBiz.getAccessToken(code);
     }
@@ -28,7 +28,7 @@ public class FastServiceController {
      * 获取应用token
      * @return
      */
-    @GetMapping(value = "/token")
+    @GetMapping(value = "/app/unauth/getApplicationToken")
     public ObjectRestResponse getAccessToken() {
         return fastServiceBiz.getAccessToken();
     }
@@ -38,7 +38,7 @@ public class FastServiceController {
      * @param accessToken
      * @return
      */
-    @GetMapping(value = "/openId")
+    @GetMapping(value = "/app/unauth/openId")
     public ObjectRestResponse getOpenId(String accessToken) {
         return fastServiceBiz.getOpenId(accessToken);
     }