java110 hace 4 años
padre
commit
841cfc18f8

+ 1 - 1
java110-interface/src/main/java/com/java110/intf/acct/IAccountBankInnerServiceSMO.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @Version 1.0
  * @Version 1.0
  * add by wuxw 2019/4/24
  * add by wuxw 2019/4/24
  **/
  **/
-@FeignClient(name = "acct-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.acct-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/accountBankApi")
 @RequestMapping("/accountBankApi")
 public interface IAccountBankInnerServiceSMO {
 public interface IAccountBankInnerServiceSMO {
 
 

+ 1 - 1
java110-interface/src/main/java/com/java110/intf/demo/IDemoInnerServiceSMO.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * @Version 1.0
  * add by wuxw 2019/4/24
  * add by wuxw 2019/4/24
  **/
  **/
-@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.store-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/demoApi")
 @RequestMapping("/demoApi")
 public interface IDemoInnerServiceSMO {
 public interface IDemoInnerServiceSMO {
 
 

+ 1 - 1
java110-interface/src/main/java/com/java110/intf/store/IAllocationStorehouseApplyInnerServiceSMO.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * @Version 1.0
  * add by wuxw 2019/4/24
  * add by wuxw 2019/4/24
  **/
  **/
-@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.store-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/allocationStorehouseApplyApi")
 @RequestMapping("/allocationStorehouseApplyApi")
 public interface IAllocationStorehouseApplyInnerServiceSMO {
 public interface IAllocationStorehouseApplyInnerServiceSMO {
 
 

+ 1 - 1
java110-interface/src/main/java/com/java110/intf/store/IAllocationStorehouseInnerServiceSMO.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * @Version 1.0
  * add by wuxw 2019/4/24
  * add by wuxw 2019/4/24
  **/
  **/
-@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.store-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/allocationStorehouseApi")
 @RequestMapping("/allocationStorehouseApi")
 public interface IAllocationStorehouseInnerServiceSMO {
 public interface IAllocationStorehouseInnerServiceSMO {
 
 

+ 1 - 1
java110-interface/src/main/java/com/java110/intf/store/IAllocationUserStorehouseInnerServiceSMO.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * @Version 1.0
  * add by wuxw 2019/4/24
  * add by wuxw 2019/4/24
  **/
  **/
-@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.store-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/allocationUserAllocationUserStorehouseApi")
 @RequestMapping("/allocationUserAllocationUserStorehouseApi")
 public interface IAllocationUserStorehouseInnerServiceSMO {
 public interface IAllocationUserStorehouseInnerServiceSMO {
 
 

+ 1 - 1
java110-interface/src/main/java/com/java110/intf/store/IContractInnerServiceSMO.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @Version 1.0
  * @Version 1.0
  * add by wuxw 2019/4/24
  * add by wuxw 2019/4/24
  **/
  **/
-@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.store-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/contractApi")
 @RequestMapping("/contractApi")
 public interface IContractInnerServiceSMO {
 public interface IContractInnerServiceSMO {
 
 

+ 1 - 1
java110-interface/src/main/java/com/java110/intf/store/purchase/IPurchaseApi.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 /**
 /**
  * 采购申请类
  * 采购申请类
  */
  */
-@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.store-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/purchase")
 @RequestMapping("/purchase")
 public interface IPurchaseApi {
 public interface IPurchaseApi {
 
 

+ 9 - 0
service-acct/src/main/resources/application-dev.yml

@@ -26,6 +26,15 @@ server:
 
 
 java110:
 java110:
   community-service: community-service
   community-service: community-service
+  acct-service: acct-service
+  user-service: user-service
+  store-service: store-service
+  common-service: common-service
+  job-service: job-service
+  fee-service: fee-service
+  report-service: report-service
+  dev-service: dev-service
+  oa-service: oa-service
 
 
 spring:
 spring:
   http:
   http:

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

@@ -46,6 +46,7 @@ spring:
 
 
 java110:
 java110:
   community-service: community-service
   community-service: community-service
+  acct-service: acct-service
 
 
 feign:
 feign:
   client:
   client:

+ 2 - 4
service-busi-merge/src/main/java/com/java110/BusiServiceApplicationStart.java

@@ -48,15 +48,13 @@ import java.nio.charset.Charset;
 )
 )
 @EnableDiscoveryClient
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
-        basePackages = {"com.java110.user.listener"})
+        basePackages = {"com.java110.user.listener","com.java110.acct.listener"})
 @Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
 @Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
-        basePackages = {"com.java110.user.cmd"})
+        basePackages = {"com.java110.user.cmd","com.java110.acct.cmd"})
 public class BusiServiceApplicationStart {
 public class BusiServiceApplicationStart {
 
 
     private static Logger logger = LoggerFactory.getLogger(BusiServiceApplicationStart.class);
     private static Logger logger = LoggerFactory.getLogger(BusiServiceApplicationStart.class);
 
 
-    private static final String LISTENER_PATH = "java110.UserService.listeners";
-
     public static void main(String[] args) throws Exception {
     public static void main(String[] args) throws Exception {
         try {
         try {
             ApplicationContext context = SpringApplication.run(BusiServiceApplicationStart.class, args);
             ApplicationContext context = SpringApplication.run(BusiServiceApplicationStart.class, args);

+ 2 - 1
service-busi-merge/src/main/resources/application-dev.yml

@@ -25,7 +25,8 @@ server:
     uri-encoding: UTF-8
     uri-encoding: UTF-8
 
 
 java110:
 java110:
-  community-service: community-service
+  community-service: busi-service
+  acct-service: busi-service
 
 
 spring:
 spring:
   http:
   http: