jar冲突

zhangchao

2024-09-05 6e486acdb66e87af3fc1b264c1a72e0de4342abe

jar冲突

 lib/slf4j-simple-1.7.30.jar

Binary files differ

 pom.xml

@@ -28,9 +28,9 @@
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
            <!--<scope>provided</scope>-->
        <!--<groupId>org.springframework.boot</groupId>-->
        <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
        <!--<scope>provided</scope>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -190,6 +190,30 @@
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/resources/lib/oscarJDBC8.jar</systemPath>
        </dependency>

        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
            <version>1.2.3</version>
        </dependency>
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
            <version>1.2.3</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
                    <artifactId>slf4j-log4j12</artifactId>

                </exclusion>
            </exclusions>
        </dependency>

        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-core</artifactId>
            <version>1.2.3</version>
        </dependency>
    </dependencies>

    <build>

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -803,8 +803,7 @@
                flag = true;
            }
            if (!flag) {
                //TODO
                News.error("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):" + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading() + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable() + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());
                News.errorNoLog("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):" + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading() + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable() + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());
                continue;
            }
            // 获取工作状态为2（设备上走）的入库工作档

 src/main/resources/application.yml

@@ -26,7 +26,7 @@
#    field-strategy: 0

logging:
  path: stock/out/@pom.build.finalName@/logs
  path: ./stock/out/@pom.build.finalName@/logs

super:
  pwd: xltys1995