From 4292649baf8bac82a799b4fa67ebd56df8422053 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Wed, 6 Jul 2022 10:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/hd/nladmin-system/pom.xml | 5 +-- wms/hd/nladmin-test/pom.xml | 39 ------------------- .../src/main/java/org/nl/Cat.java | 8 ---- .../src/main/java/org/nl/Dog.java | 8 ---- .../src/main/java/org/nl/IShout.java | 5 --- .../src/main/java/org/nl/Test111.java | 27 ------------- .../java/org/nl/starter/TianProperties.java | 11 ------ .../main/java/org/nl/starter/TianService.java | 15 ------- .../starter/TianServiceAutoConfiguration.java | 23 ----------- .../resources/META-INF/services/org.nl.IShout | 2 - .../META-INF/services/spring.factories | 2 - wms/hd/pom.xml | 3 +- 12 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 wms/hd/nladmin-test/pom.xml delete mode 100644 wms/hd/nladmin-test/src/main/java/org/nl/Cat.java delete mode 100644 wms/hd/nladmin-test/src/main/java/org/nl/Dog.java delete mode 100644 wms/hd/nladmin-test/src/main/java/org/nl/IShout.java delete mode 100644 wms/hd/nladmin-test/src/main/java/org/nl/Test111.java delete mode 100644 wms/hd/nladmin-test/src/main/java/org/nl/starter/TianProperties.java delete mode 100644 wms/hd/nladmin-test/src/main/java/org/nl/starter/TianService.java delete mode 100644 wms/hd/nladmin-test/src/main/java/org/nl/starter/TianServiceAutoConfiguration.java delete mode 100644 wms/hd/nladmin-test/src/main/resources/META-INF/services/org.nl.IShout delete mode 100644 wms/hd/nladmin-test/src/main/resources/META-INF/services/spring.factories diff --git a/wms/hd/nladmin-system/pom.xml b/wms/hd/nladmin-system/pom.xml index b743670..03a4863 100644 --- a/wms/hd/nladmin-system/pom.xml +++ b/wms/hd/nladmin-system/pom.xml @@ -3,11 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - nladmin org.nl - 2.6 + jl_wms + 1.0-SNAPSHOT - 4.0.0 nladmin-system diff --git a/wms/hd/nladmin-test/pom.xml b/wms/hd/nladmin-test/pom.xml deleted file mode 100644 index 4bd9ee0..0000000 --- a/wms/hd/nladmin-test/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - llsh_wms - org.nl - 1.0-SNAPSHOT - - 4.0.0 - 2.6 - - nladmin-test - - - - - org.nl - nladmin-system - 2.6 - compile - - - - - org.springframework.boot - spring-boot-autoconfigure - 2.0.0.RELEASE - - - org.springframework.boot - spring-boot-configuration-processor - 2.0.0.RELEASE - true - - - - - diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/Cat.java b/wms/hd/nladmin-test/src/main/java/org/nl/Cat.java deleted file mode 100644 index 8ef8808..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/Cat.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl; - -public class Cat implements IShout { - @Override - public void shout() { - System.out.println("miao miao111"); - } -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/Dog.java b/wms/hd/nladmin-test/src/main/java/org/nl/Dog.java deleted file mode 100644 index be93aba..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/Dog.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl; - -public class Dog implements IShout { - @Override - public void shout() { - System.out.println("wang wang"); - } -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/IShout.java b/wms/hd/nladmin-test/src/main/java/org/nl/IShout.java deleted file mode 100644 index ba49fd4..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/IShout.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.nl; - -public interface IShout { - void shout(); -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/Test111.java b/wms/hd/nladmin-test/src/main/java/org/nl/Test111.java deleted file mode 100644 index a2533da..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/Test111.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.nl; - -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ServiceLoader; - -@RestController -@RequiredArgsConstructor -@Api(tags = "运维：应用管理") -@RequestMapping("/api/test") -public class Test111 { - public static void main(String[] args) { - ServiceLoader shouts = ServiceLoader.load(IShout.class); - for (IShout s : shouts) { - s.shout(); - } - } - @GetMapping(value = "/test") - public String getStr() { - return "hello"; - } - -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianProperties.java b/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianProperties.java deleted file mode 100644 index 1e01819..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianProperties.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.nl.starter; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "spring.tian") -@Data -public class TianProperties { - private String name; - private int age; - private String sex = "M"; -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianService.java b/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianService.java deleted file mode 100644 index 19db779..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianService.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.starter; - -public class TianService { - private TianProperties properties; - public TianService() { - } - public TianService(TianProperties userProperties) { - this.properties = userProperties; - } - public void sayHello(){ - System.out.println("hi, 我叫: " + properties.getName() + - ", 今年" + properties.getAge() + "岁" - + ", 性别: " + properties.getSex()); - } -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianServiceAutoConfiguration.java b/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianServiceAutoConfiguration.java deleted file mode 100644 index 1d84981..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianServiceAutoConfiguration.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.nl.starter; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties(TianProperties.class) -@ConditionalOnClass(TianService.class) -@ConditionalOnProperty(prefix = "spring.tian", value = "enabled", matchIfMissing = true) -public class TianServiceAutoConfiguration { - @Autowired - private TianProperties properties; - @Bean - @ConditionalOnMissingBean(TianService.class) - public TianService tianService() { - return new TianService(properties); - } -} diff --git a/wms/hd/nladmin-test/src/main/resources/META-INF/services/org.nl.IShout b/wms/hd/nladmin-test/src/main/resources/META-INF/services/org.nl.IShout deleted file mode 100644 index 9c82046..0000000 --- a/wms/hd/nladmin-test/src/main/resources/META-INF/services/org.nl.IShout +++ /dev/null @@ -1,2 +0,0 @@ -org.nl.Cat -org.nl.Dog diff --git a/wms/hd/nladmin-test/src/main/resources/META-INF/services/spring.factories b/wms/hd/nladmin-test/src/main/resources/META-INF/services/spring.factories deleted file mode 100644 index 8b0aee2..0000000 --- a/wms/hd/nladmin-test/src/main/resources/META-INF/services/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.nl.starter.TianServiceAutoConfiguration - diff --git a/wms/hd/pom.xml b/wms/hd/pom.xml index bb048b5..dafa2c5 100644 --- a/wms/hd/pom.xml +++ b/wms/hd/pom.xml @@ -6,8 +6,8 @@ org.nl jl_wms - pom 1.0-SNAPSHOT + pom 开发平台 nladmin @@ -17,7 +17,6 @@ nladmin-system - nladmin-test