From 72df8e8ae96a4a3199332a10e5c104c6a603aa39 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 02 十月 2024 20:46:59 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java | 2 --
zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java | 3 ---
zy-acs-gateway/pom.xml | 7 +------
zy-acs-manager/pom.xml | 17 +++++++++++------
zy-acs-gateway/src/main/java/com/zy/acs/gateway/process/ActivateLauncher.java | 3 ---
5 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/zy-acs-gateway/pom.xml b/zy-acs-gateway/pom.xml
index a1ca1ae..dd68dcd 100644
--- a/zy-acs-gateway/pom.xml
+++ b/zy-acs-gateway/pom.xml
@@ -26,11 +26,6 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
- <groupId>com.zy</groupId>
- <artifactId>acs-rpc</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.25.Final</version>
@@ -45,7 +40,7 @@
</dependency>
<dependency>
<groupId>com.zy</groupId>
- <artifactId>acs-framework</artifactId>
+ <artifactId>acs-common</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
diff --git a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java
index 9223b29..3981f3f 100644
--- a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java
+++ b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java
@@ -9,7 +9,6 @@
import com.zy.acs.gateway.constant.ProtocolType;
import com.zy.acs.gateway.domain.AgvPackage;
import com.zy.acs.gateway.process.AckMsgBuilder;
-import com.zy.acs.rpc.gateway.control.AgvDataFeignApi;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import org.slf4j.Logger;
@@ -31,8 +30,6 @@
@Autowired
private Executors executors;
- @Autowired
- private AgvDataFeignApi agvDataFeignApi;
@Override
@SuppressWarnings("all")
diff --git a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/process/ActivateLauncher.java b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/process/ActivateLauncher.java
index 27f169a..ec47890 100644
--- a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/process/ActivateLauncher.java
+++ b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/process/ActivateLauncher.java
@@ -9,7 +9,6 @@
import com.zy.acs.gateway.job.DispatcherPublisher;
import com.zy.acs.gateway.utils.ProtocolUtils;
import com.zy.acs.common.utils.RedisSupport;
-import com.zy.acs.rpc.gateway.control.AgvCmdFeignApi;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -27,8 +26,6 @@
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
- @Autowired
- private AgvCmdFeignApi agvCmdFeignApi;
@Autowired
private Executors executors;
@Autowired
diff --git a/zy-acs-manager/pom.xml b/zy-acs-manager/pom.xml
index 090d536..a7cdadc 100644
--- a/zy-acs-manager/pom.xml
+++ b/zy-acs-manager/pom.xml
@@ -25,12 +25,6 @@
<dependencies>
<dependency>
<groupId>com.zy</groupId>
- <artifactId>acs-rpc</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.zy</groupId>
<artifactId>acs-common</artifactId>
<version>1.0.0</version>
</dependency>
@@ -89,6 +83,17 @@
<version>3.4.1</version>
</dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.9.19</version> <!-- 纭繚浣跨敤鏈�鏂扮増鏈� -->
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.9.19</version> <!-- 鐢ㄤ簬缁囧叆鍒囬潰 -->
+ </dependency>
+
<!-- swagger -->
<dependency>
<groupId>io.springfox</groupId>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
index 327f8e8..03bec89 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
@@ -5,14 +5,12 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
@MapperScan("com.zy.**.mapper")
@EnableDiscoveryClient
@SpringBootApplication
@EnableScheduling
-@EnableFeignClients(basePackages = "com.zy.acs.rpc")
public class ManagerBoot {
public static void main(String[] args) {
--
Gitblit v1.9.1