Merge remote-tracking branch 'origin/develop' into develop

isc-common-service/src/main/java/com/brilliance/isc/common/esb/guarantee/IGuaranteeFeign.java

@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @date 2024-01-05
  * @description 保函接口调用
  */
-@RequestMapping("/webapi/jk")
 public interface IGuaranteeFeign {
 
     /**
@@ -17,7 +16,7 @@ public interface IGuaranteeFeign {
      * @param innerReqBdBhLogout
      * @return
      */
-    @PostMapping("/bh/logout")
+    @PostMapping("/webapi/jk/bh/logout")
     InnerRes<InnerResBdBh> callLogout(InnerReq<InnerReqBdBhLogout> innerReqBdBhLogout);
 
 
@@ -26,7 +25,7 @@ public interface IGuaranteeFeign {
      * @param innerReqBdBhNotice
      * @return
      */
-    @PostMapping("/bh/notice")
+    @PostMapping("/webapi/jk/bh/notice")
     InnerRes<InnerResBdBh> callNotice(InnerReq<InnerReqBdBhNotice> innerReqBdBhNotice);
 
     /**
@@ -34,7 +33,7 @@ public interface IGuaranteeFeign {
      * @param innerReqBdDyNotice
      * @return
      */
-    @PostMapping("/bh/dynotice")
+    @PostMapping("/webapi/jk/bh/dynotice")
     InnerRes<InnerResBdBh> dyNotice(InnerReq<InnerReqBdDyNotice> innerReqBdDyNotice);
 
     /**
@@ -42,7 +41,7 @@ public interface IGuaranteeFeign {
      * @param innerReqBdZcNotice
      * @return
      */
-    @PostMapping("/bh/zcnotice")
+    @PostMapping("/webapi/jk/bh/zcnotice")
     InnerRes<InnerResBdBh> zcNotice(InnerReq<InnerReqBdZcNotice> innerReqBdZcNotice);
 
 
@@ -51,7 +50,7 @@ public interface IGuaranteeFeign {
      * @param innerReqBdTxNotice
      * @return
      */
-    @PostMapping("/bh/txnotice")
+    @PostMapping("/webapi/jk/bh/txnotice")
     InnerRes<InnerResBdBh> txNotice(InnerReq<InnerReqBdTxNotice> innerReqBdTxNotice);
 
 

isc-common-service/src/main/java/com/brilliance/isc/common/esb/inner/InnerServerFeign.java

@@ -6,9 +6,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 
-@RequestMapping("/webapi/jk")
 public interface InnerServerFeign {
-    @PostMapping("/inner")
+    @PostMapping("/webapi/jk/inner")
     InnerRes callInterface(InnerReq innerReq);
 
 } 

isc-common-service/src/main/java/com/brilliance/isc/common/esb/invoice/IImageFeign.java

@@ -5,12 +5,11 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@RequestMapping("/webapi/jk")
 public interface IImageFeign {
 
-    @PostMapping("/ocr/fapRecognize")
+    @PostMapping("/webapi/jk/ocr/fapRecognize")
     InnerRes<InnerResFapRecognize> callFapRecognize(InnerReq<InnerReqFapRecognize> var1);
 
-    @PostMapping("/ocr/fapDownAndOcr")
+    @PostMapping("/webapi/jk/ocr/fapDownAndOcr")
     InnerRes<InnerResFapDownAndOcr> callFapDownAndOcr(InnerReq<InnerReqFapDownAndOcr> req);
 }

isc-common-service/src/main/java/com/brilliance/isc/common/esb/invoice/IInvoiceFeign.java

@@ -10,13 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @Date: 2024/3/25 09:21
  * @Description:发票接口
  */
-@RequestMapping("/webapi/jk")
 public interface IInvoiceFeign {
 
-    @PostMapping("/fapiao/chayan")
+    @PostMapping("/webapi/jk/fapiao/chayan")
     InnerRes<InnerResFapiaoChayan> callChayan(InnerReq<InnerReqFapiaoChayan> innerReqFapiaoChayan);
 
-    @PostMapping("/fapiao/jiankong")
+    @PostMapping("/webapi/jk/fapiao/jiankong")
     InnerRes<InnerResFapiaoJiankong> callJiankong(InnerReq<InnerReqFapiaoJiankong> innerReqFapiaoJiankong);
 
     /**
@@ -25,6 +24,6 @@ public interface IInvoiceFeign {
      * @param innerReqFapiaoChayan
      * @return
      */
-    @PostMapping("/fapiao/ns11")
+    @PostMapping("/webapi/jk/fapiao/ns11")
     InnerRes<InnerResFapiaoChayan> callNs11(InnerReq<InnerReqFapiaoChayan> innerReqFapiaoChayan);
 }

isc-common-service/src/main/java/com/brilliance/isc/common/esb/rwms/IRwmsFeign.java

@@ -7,9 +7,8 @@ import com.brilliance.isc.esb.model.inner.InnerResRW02;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@RequestMapping("/webapi/jk")
 public interface IRwmsFeign {
-    @PostMapping("/RW02")
+    @PostMapping("/webapi/jk/RW02")
     InnerRes<InnerResRW02> callRW02(InnerReq<InnerReqRW02> innerReqRW02InnerReq);
 
 }

isc-common-service/src/main/java/com/brilliance/isc/common/esb/tymd/ITymdFeign.java

@@ -4,11 +4,10 @@ import com.brilliance.isc.esb.model.inner.*;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@RequestMapping("/webapi/jk")
 public interface ITymdFeign {
-    @PostMapping("/E200")
+    @PostMapping("/webapi/jk/E200")
     InnerRes<InnerResE200> callE200(InnerReq<InnerReqE200> innerReqE200);
 
-    @PostMapping("/DU01")
+    @PostMapping("/webapi/jk/DU01")
     InnerRes<InnerResDU01> callDU01(InnerReq<InnerReqDU01> innerReqDU01);
 }

isc-common-service/src/main/java/com/brilliance/isc/common/esb/whj/IWhjFeign.java

@@ -5,7 +5,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@RequestMapping("/webapi/jk")
 public interface IWhjFeign {
 
     /**
@@ -14,7 +13,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/whj")
+    @PostMapping("/webapi/jk/whj")
     InnerRes<InnerResWhj> callWhj(InnerReq<InnerReqWhj> req);
 
     /**
@@ -23,7 +22,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/accept")
+    @PostMapping("/webapi/jk/tax/accept")
     InnerRes<InnerResTax> callTaxaccept(InnerReq<InnerReqTaxaccept> req);
 
     /**
@@ -32,7 +31,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/cancel")
+    @PostMapping("/webapi/jk/tax/cancel")
     InnerRes<InnerResTax> callTaxcancel(InnerReq<InnerReqTaxcancel> req);
 
     /**
@@ -41,7 +40,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/check")
+    @PostMapping("/webapi/jk/tax/check")
     InnerRes<InnerResTax> callTaxcheck(InnerReq<InnerReqTaxcheck> req);
 
     /**
@@ -50,7 +49,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/confirm")
+    @PostMapping("/webapi/jk/tax/confirm")
     InnerRes<InnerResTax> callTaxconfirm(InnerReq<InnerReqTaxconfirm> req);
 
     /**
@@ -59,7 +58,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/modify")
+    @PostMapping("/webapi/jk/tax/modify")
     InnerRes<InnerResTax> callTaxmodify(InnerReq<InnerReqTaxmodify> req);
 
     /**
@@ -68,7 +67,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/qrydetail")
+    @PostMapping("/webapi/jk/tax/qrydetail")
     InnerRes<InnerResTax> callTaxqrydetail(InnerReq<InnerReqTaxqrydetail> req);
 
     /**
@@ -77,7 +76,7 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/qrylist")
+    @PostMapping("/webapi/jk/tax/qrylist")
     InnerRes<InnerResTax> callTaxqrylist(InnerReq<InnerReqTaxqrylist> req);
 
     /**
@@ -86,6 +85,6 @@ public interface IWhjFeign {
      * @param req
      * @return
      */
-    @PostMapping("/tax/retry")
+    @PostMapping("/webapi/jk/tax/retry")
     InnerRes<InnerResTax> callTaxretry(InnerReq<InnerReqTaxretry> req);
 }

isc-common-service/src/main/java/com/brilliance/isc/common/esb/yapin/IYapinFeign.java

@@ -7,8 +7,7 @@ import com.brilliance.isc.esb.model.inner.InnerResCS06;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@RequestMapping("/webapi/jk")
 public interface IYapinFeign {
-    @PostMapping("/CS06")
+    @PostMapping("/webapi/jk/CS06")
     InnerRes<InnerResCS06> callCS06(InnerReq<InnerReqCS06> innerReqCS06InnerReq);
 }