Merge branch 'master' into test

api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SyncController.java

@@ -24,6 +24,7 @@ import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -64,7 +65,7 @@ public class SyncController {
      *
      * @return
      */
-    @PostMapping("/udispsync/sync/testConnection")
+    @GetMapping("/udispsync/sync/testConnection")
     public BaseResponse testConnection(HttpServletRequest request) {
         String uri = uriUtils.parseUri(request.getRequestURL().toString());
         String upperServerHost = systemParamConfigService.selectValueByParamKey("upper_server_ip");