diff --git a/pom.xml b/pom.xml index 34dc322..148aac2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,9 +5,7 @@ parent 0.0.1-SNAPSHOT - com.hp user-parent - 0.0.1-SNAPSHOT pom user-client diff --git a/user-service/pom.xml b/user-service/pom.xml index 10301ef..3c41688 100644 --- a/user-service/pom.xml +++ b/user-service/pom.xml @@ -6,7 +6,6 @@ 0.0.1-SNAPSHOT user-service - jar @@ -25,6 +24,12 @@ 0.0.1-SNAPSHOT - + + junit + junit + 4.12 + test + + \ No newline at end of file diff --git a/user-service/src/main/java/com/hp/user/service/TestService.java b/user-service/src/main/java/com/hp/user/service/TestService.java new file mode 100644 index 0000000..236282e --- /dev/null +++ b/user-service/src/main/java/com/hp/user/service/TestService.java @@ -0,0 +1,16 @@ +package com.hp.user.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.hp.user.service.entity.Account; +import com.hp.user.service.mapper.TestMapper; + +@Service +public class TestService { + @Autowired(required=true) + TestMapper userMapper; + public Account Sel(int id){ + return userMapper.Sel(id); + } +} diff --git a/user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java b/user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java index 297604c..f664661 100644 --- a/user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java +++ b/user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java @@ -1,8 +1,10 @@ package com.hp.user.service; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource; /** * 用户服务启动类 @@ -10,13 +12,18 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @since 2020/11/18 * */ -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@MapperScan("com.hp.user.service.mapper") //扫描的mapper +@SpringBootApplication +@NacosPropertySource(dataId = "datasource1", autoRefreshed = true) public class UserServiceApplaction { + public static void main(String[] args) { SpringApplication.run(UserServiceApplaction.class, args); + } + } diff --git a/user-service/src/main/java/com/hp/user/service/controller/TestController.java b/user-service/src/main/java/com/hp/user/service/controller/TestController.java new file mode 100644 index 0000000..a90a100 --- /dev/null +++ b/user-service/src/main/java/com/hp/user/service/controller/TestController.java @@ -0,0 +1,21 @@ +package com.hp.user.service.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.hp.user.service.TestService; + + +@RestController +public class TestController { + @Autowired + private TestService userService; + + @RequestMapping("getUser/{id}") + public String GetUser(@PathVariable int id){ + return userService.Sel(id).getName().toString(); + } + +} diff --git a/user-service/src/test/java/test/Test.java b/user-service/src/test/java/test/Test1.java similarity index 84% rename from user-service/src/test/java/test/Test.java rename to user-service/src/test/java/test/Test1.java index ca884d4..369c40a 100644 --- a/user-service/src/test/java/test/Test.java +++ b/user-service/src/test/java/test/Test1.java @@ -5,18 +5,20 @@ import com.alibaba.nacos.api.config.annotation.NacosValue; import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -@SpringBootApplication + @NacosPropertySource(dataId = "springboot2-nacos-config", autoRefreshed = true) +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) @RestController -public class Test{ +public class Test1{ public static void main(String[] args) { try { - ConfigurableApplicationContext context = SpringApplication.run(Test.class, args); + ConfigurableApplicationContext context = SpringApplication.run(Test1.class, args); System.out.print(context.getEnvironment().getProperty("nacos.test.propertie")); }catch(Exception e) {