xuqiang před 6 měsíci
rodič
revize
3e5b0d2d38

+ 5 - 0
commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -192,4 +192,9 @@ public class BaseController {
         return userSystemCode;
     }
 
+    public String getUserIdAndSystemCode(){
+        return getUserId() + ":" + getAppSystemCode();
+    }
+
+
 }

+ 1 - 0
gateway/src/main/resources/application-dev.yml

@@ -105,6 +105,7 @@ spring:
                   - /orderTrack/**
                   - /feeAudit/**
                   - /adjust/**
+                  - /order/searchHistory/**
 
         - id: costsorrule_route
           uri: http://localhost:8085/

+ 4 - 0
partner/src/main/resources/application-dev.yml

@@ -18,3 +18,7 @@ spring:
       - nacos:redisson
 
 
+feign:
+  client:
+    jzg-org:
+      url: http://localhost:8084/

+ 5 - 0
partner/src/main/resources/application-test.yml

@@ -22,4 +22,9 @@ config:
   sso: 1
 
 
+feign:
+  client:
+    jzg-org:
+      url: http://localhost:8084/
+
 

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/client/OrgClient.java

@@ -12,7 +12,7 @@ public interface OrgClient {
 
     @PostMapping("/ptlAgreementDispatch/getAgreementDispatch")
     public HttpResult getAgreementDispatch(@RequestBody PtlAgreementDispatchQuery ptlAgreementDispatchQuery,
-                                           @RequestHeader("Authorization") String token);
+                                           @RequestHeader("Authorization") String token,@RequestHeader("system_code") String sysCode);
 
 
 }

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/client/PartnerDistributionClient.java

@@ -8,7 +8,7 @@ import com.jzg.commons.entity.vo.SysUserVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(name = "jzg-partner",url = "http://localhost:8087")
+@FeignClient(name = "jzg-partner",url = "${feign.client.jzg-partner.url}")
 public interface PartnerDistributionClient {
 
 

+ 2 - 0
tenant/organization/src/main/resources/application-dev.yml

@@ -44,4 +44,6 @@ feign:
       url: http://localhost:8085/
     jzg-platform:
       url: http://localhost:8083/
+    jzg-partner:
+      url: http://localhost:8087/