#

luxiaotao1123

2024-10-02 72df8e8ae96a4a3199332a10e5c104c6a603aa39

#

 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>

 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")

 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

 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>

 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) {