diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index f6e9f858..3c4ec85a 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -43,6 +43,16 @@ org.springframework.boot spring-boot-starter-undertow + + org.springframework.cloud + spring-cloud-starter + 4.0.0 + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + 4.0.0 + org.springframework.cloud spring-cloud-starter-openfeign diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java b/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java index f0953c73..1829e736 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java @@ -5,10 +5,15 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; //import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.web.client.RestTemplate; //@EnableDiscoveryClient //@MapperScan("cn.qihangerp.oms.mapper") +@EnableFeignClients(basePackages = "cn.qihangerp.oms") @EnableDiscoveryClient @ComponentScan(basePackages={"cn.qihangerp"}) @SpringBootApplication @@ -18,5 +23,9 @@ public class OmsApi { System.out.println( "Hello oms-api!" ); SpringApplication.run(OmsApi.class, args); } - + @Bean + @LoadBalanced + public RestTemplate restTemplate() { + return new RestTemplate(); + } } diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java index 34156f76..294c06c0 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java @@ -1,17 +1,40 @@ package cn.qihangerp.oms.controller; +import cn.qihangerp.oms.feign.EchoService; +import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; @AllArgsConstructor @RestController public class HomeController { + @Resource + private EchoService echoService; + @Autowired + private RestTemplate restTemplate; + @Autowired + private RedisTemplate redisTemplate; @GetMapping("/") public String home(){ return "{'code':0,'msg':'oms-api请通过api访问'}"; } + + + + @GetMapping(value = "/echo-rest") + public String rest() { + return restTemplate.getForObject("http://tao-oms/test/na", String.class); + } + @GetMapping(value = "/echo-feign") + public String feign() { + String token = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdkOTBmN2EzLWUwNWQtNDkxNy04NjIzLTU1OGRhNGY3NjE3NiJ9._Oukm9b0P1WvcOywLdhs6_BOt_6mRSF41Q6f4fBm_DGUkPR86Qg1tqyRTM5ouTR2Xz46IRuRAVez8Wcl3NIlwg"; + + return echoService.echo(token); + } } \ No newline at end of file diff --git a/api/sys-api/pom.xml b/api/sys-api/pom.xml index 6772cc41..ba26e6c8 100644 --- a/api/sys-api/pom.xml +++ b/api/sys-api/pom.xml @@ -72,16 +72,16 @@ 4.13.2 test - - org.springframework.cloud - spring-cloud-starter - 4.0.0 - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - 4.0.0 - + + + + + + + + + + diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/SysApi.java b/api/sys-api/src/main/java/cn/qihangerp/sys/SysApi.java index a0a3d7f0..9eba13f7 100644 --- a/api/sys-api/src/main/java/cn/qihangerp/sys/SysApi.java +++ b/api/sys-api/src/main/java/cn/qihangerp/sys/SysApi.java @@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.loadbalancer.LoadBalanced; -import org.springframework.cloud.openfeign.EnableFeignClients; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.web.client.RestTemplate; @@ -13,7 +13,7 @@ import org.springframework.web.client.RestTemplate; * Hello world! * */ -@EnableFeignClients(basePackages = "cn.qihangerp.sys") + @EnableDiscoveryClient @ComponentScan(basePackages={"cn.qihangerp"}) //@MapperScan("com.qihang.sys.api.mapper") @@ -26,9 +26,5 @@ public class SysApi SpringApplication.run(SysApi.class, args); } - @Bean - @LoadBalanced - public RestTemplate restTemplate() { - return new RestTemplate(); - } + } diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/HomeController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/HomeController.java deleted file mode 100644 index 35a7a3dd..00000000 --- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/HomeController.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.qihangerp.sys.controller; - -import cn.qihangerp.sys.feign.EchoService; -import jakarta.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; - -@RestController -public class HomeController { - @Autowired - private RestTemplate restTemplate; - @Autowired - private RedisTemplate redisTemplate; - @Resource - private EchoService echoService; - @GetMapping("/") - public String home(){ - return "{'code':0,'msg':'请通过api访问'}"; - } - @GetMapping(value = "/echo-rest") - public String rest() { - return restTemplate.getForObject("http://tao-oms/test/na", String.class); - } - @GetMapping(value = "/echo-feign") - public String feign() { - String token = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdkOTBmN2EzLWUwNWQtNDkxNy04NjIzLTU1OGRhNGY3NjE3NiJ9._Oukm9b0P1WvcOywLdhs6_BOt_6mRSF41Q6f4fBm_DGUkPR86Qg1tqyRTM5ouTR2Xz46IRuRAVez8Wcl3NIlwg"; - - return echoService.echo(token); - } - -} diff --git a/vue/src/views/dou/ewaybill/index.vue b/vue/src/views/dou/ewaybill/index.vue index f3003c96..65d730c5 100644 --- a/vue/src/views/dou/ewaybill/index.vue +++ b/vue/src/views/dou/ewaybill/index.vue @@ -242,7 +242,7 @@ export default { }, created() { this.openWs() - listShop({platform: 6}).then(response => { + listShop({type: 400}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id diff --git a/vue/src/views/jd/ewaybill/index.vue b/vue/src/views/jd/ewaybill/index.vue index 76f40bb1..c30f5e1d 100644 --- a/vue/src/views/jd/ewaybill/index.vue +++ b/vue/src/views/jd/ewaybill/index.vue @@ -233,7 +233,7 @@ export default { }, created() { this.openWs() - listShop({platform: 3}).then(response => { + listShop({type: 200}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id diff --git a/vue/src/views/pdd/ewaybill/index.vue b/vue/src/views/pdd/ewaybill/index.vue index bf692b80..0906e0c6 100644 --- a/vue/src/views/pdd/ewaybill/index.vue +++ b/vue/src/views/pdd/ewaybill/index.vue @@ -239,7 +239,7 @@ export default { }, created() { this.openWs() - listShop({platform: 5}).then(response => { + listShop({type: 300}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id diff --git a/vue/src/views/tao/ewaybill/index.vue b/vue/src/views/tao/ewaybill/index.vue index 0fa219b1..0ff4d9b7 100644 --- a/vue/src/views/tao/ewaybill/index.vue +++ b/vue/src/views/tao/ewaybill/index.vue @@ -249,7 +249,7 @@ export default { }, created() { this.openWs() - listShop({platform: 4}).then(response => { + listShop({type: 100}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id diff --git a/vue/src/views/wei/ewaybill/index.vue b/vue/src/views/wei/ewaybill/index.vue index 6d958f3e..3b293a8e 100644 --- a/vue/src/views/wei/ewaybill/index.vue +++ b/vue/src/views/wei/ewaybill/index.vue @@ -221,7 +221,7 @@ export default { }, created() { this.openWs() - listShop({platform: 2}).then(response => { + listShop({type: 500}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id