Merge branch 'develop'

# Conflicts:
#	pom.xml

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.26</version>
+    <version>1.3.27</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/gateway/web/GtwPayController.java

@@ -16,7 +16,7 @@ import javax.annotation.Resource;
  * @author taylor
  */
 @RestController
-@RequestMapping("/api/v1.0/gateway/partners/{shortId}")
+@RequestMapping("/api/v1.0/gateway/org/{shortId}")
 @Gtw2Ctrl
 public class GtwPayController {
     @Resource

src/test/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImplTest.java

@@ -129,8 +129,7 @@ public class CityPartnerPrizeServiceImplTest {
             put("settle_info", settleConfig);
             put("compliance_file_info", complianceInfo);
         }};
-        String originUrl = "http://127.0.0.1:5000/api/v1.0/gateway/partners/AXLCEXDDMB/merchant/application";
-//        String originUrl = "http://127.0.0.1:5000/api/v1.0/gateway/partners/2121/merchant/application";
+        String originUrl = "https://mpay.royalpay.com.au/api/v1.0/gateway/org/AXLCEXDDMB/merchant/application";
         String url = addSignUrl(originUrl, params, PRIKEY);
         HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.POST);
         gen.setJSONEntity(params);
@@ -147,7 +146,7 @@ public class CityPartnerPrizeServiceImplTest {
     @Test
     public void queryMerchantStatus() throws Exception{
         String partnerCode = "PBAR";
-        String originUrl = "http://127.0.0.1:5000/api/v1.0/gateway/partners/AXLCEXDDMB/merchant/" + partnerCode + "/status";
+        String originUrl = "https://mpay.royalpay.com.au/api/v1.0/gateway/org/AXLCEXDDMB/merchant/" + partnerCode + "/status";
         String url = addSignUrl(originUrl, null, PRIKEY);
         HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET);
         HttpRequestResult result = gen.execute();
@@ -160,7 +159,7 @@ public class CityPartnerPrizeServiceImplTest {
 
     @Test
     public void updateFile() throws Exception{
-        String originUrl = "http://127.0.0.1:5000/api/v1.0/gateway/partners/AXLCEXDDMB/attachment/files";
+        String originUrl = "https://mpay.royalpay.com.au/api/v1.0/gateway/org/RQ6CJ4CGJZ/attachment/files";
         String url = addSignUrl(originUrl, null, PRIKEY);
         File file = new File("/Users/luoyang/Downloads/121.jpg");
         InputStream stream =  new FileInputStream(file);