From 6e486acdb66e87af3fc1b264c1a72e0de4342abe Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期四, 05 九月 2024 11:56:02 +0800 Subject: [PATCH] jar冲突 --- lib/slf4j-simple-1.7.30.jar | 0 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +-- pom.xml | 30 +++++++++++++++++++++++++++--- src/main/resources/application.yml | 2 +- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/resources/lib/slf4j-simple-1.7.30.jar b/lib/slf4j-simple-1.7.30.jar similarity index 100% rename from src/main/resources/lib/slf4j-simple-1.7.30.jar rename to lib/slf4j-simple-1.7.30.jar Binary files differ diff --git a/pom.xml b/pom.xml index 62f1064..0561b5e 100644 --- a/pom.xml +++ b/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> diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 3dd16f4..b8a304a 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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() + "鑳藉叆淇″彿锛坵ms璁剧疆锛�.equals(\"Y\")" + staDetl.getCanining()); + News.errorNoLog("" + mark + " - 1" + " - 3" + " - 鍫嗗灈鏈哄叆搴撶珯淇℃伅(浠ヤ笅闇�瑕佸叏true):" + "鑷姩淇″彿" + staProtocol.isAutoing() + "鏈夌墿淇″彿" + staProtocol.isLoading() + "宸ヤ綔鍙�>0" + staProtocol.getWorkNo() + "鍙叆淇″彿" + staProtocol.isInEnable() + "鑳藉叆淇″彿锛坵ms璁剧疆锛�.equals(\"Y\")" + staDetl.getCanining()); continue; } // 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 06a53b8..1fe52b7 100644 --- a/src/main/resources/application.yml +++ b/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 -- Gitblit v1.9.1