From df648dd90daf8ee7f01f61ca55d3be37b0983a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E8=8B=B1=E6=9D=B0?= <327782001@qq.com> Date: Wed, 22 Mar 2023 21:14:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=87=E4=BB=B6=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/kwan/spring5/dao/BookDao.java | 2 +- .../java/com/kwan/spring5/dao/impl/BookDaoImpl.java | 2 +- src/main/java/com/kwan/spring5/factorybean/MyBean.java | 2 +- src/main/java/com/kwan/spring5/{ => pojo}/Book.java | 2 +- src/main/java/com/kwan/spring5/{ => pojo}/Course.java | 2 +- src/main/java/com/kwan/spring5/{ => pojo}/Dept.java | 2 +- src/main/java/com/kwan/spring5/{ => pojo}/Emp.java | 2 +- src/main/java/com/kwan/spring5/{ => pojo}/Orders.java | 2 +- src/main/java/com/kwan/spring5/{ => pojo}/Stu.java | 2 +- src/main/java/com/kwan/spring5/{ => pojo}/User.java | 2 +- .../kwan/spring5/pojo/{ => chat}/ChoiceMessage.java | 10 +++++++++- .../java/com/kwan/spring5/pojo/{ => chat}/Choices.java | 10 +++++++++- .../spring5/pojo/{ => chat}/CompletionChatRequest.java | 2 +- .../pojo/{ => chat}/CompletionChatResponse.java | 10 +++++++++- src/main/java/com/kwan/spring5/proxy/PersonProxy.java | 10 +++++----- src/main/java/com/kwan/spring5/proxy/UserProxy.java | 10 +++++----- .../java/com/kwan/spring5/service/BookService.java | 2 +- .../java/com/kwan/spring5/utils/OpenAIChatGpt.java | 10 +++++----- src/main/resources/spring1.xml | 6 +++--- src/main/resources/spring10.xml | 2 +- src/main/resources/spring12.xml | 4 ++-- src/main/resources/spring13.xml | 2 +- src/main/resources/spring2-p.xml | 2 +- src/main/resources/spring24.xml | 4 ++-- src/main/resources/spring3.xml | 2 +- src/main/resources/spring5.xml | 4 ++-- src/main/resources/spring6.xml | 4 ++-- src/main/resources/spring7.xml | 4 ++-- src/main/resources/spring8.xml | 2 +- src/main/resources/spring9.xml | 6 +++--- src/test/java/Spring_00_XmlGetTest.java | 2 +- src/test/java/Spring_01_BookTest.java | 2 +- src/test/java/Spring_01_OrdersTest.java | 2 +- src/test/java/Spring_01_UserTest.java | 2 +- src/test/java/Spring_02_BookTest.java | 2 +- src/test/java/Spring_03_BookTest.java | 2 +- src/test/java/Spring_05_DeptTest.java | 2 +- src/test/java/Spring_06_DeptTest.java | 2 +- src/test/java/Spring_07_DeptTest.java | 2 +- src/test/java/Spring_08_StuTest.java | 2 +- src/test/java/Spring_09_StuTest.java | 2 +- src/test/java/Spring_10_BookTest.java | 2 +- src/test/java/Spring_11_FactoryBeanTest.java | 2 +- src/test/java/Spring_12_ScopeTest.java | 2 +- src/test/java/Spring_13_MyBeanPostTest.java | 2 +- src/test/java/Spring_24_.java | 2 +- src/test/java/Spring_25_add.java | 2 +- 47 files changed, 92 insertions(+), 68 deletions(-) rename src/main/java/com/kwan/spring5/{ => pojo}/Book.java (98%) rename src/main/java/com/kwan/spring5/{ => pojo}/Course.java (92%) rename src/main/java/com/kwan/spring5/{ => pojo}/Dept.java (92%) rename src/main/java/com/kwan/spring5/{ => pojo}/Emp.java (96%) rename src/main/java/com/kwan/spring5/{ => pojo}/Orders.java (97%) rename src/main/java/com/kwan/spring5/{ => pojo}/Stu.java (97%) rename src/main/java/com/kwan/spring5/{ => pojo}/User.java (93%) rename src/main/java/com/kwan/spring5/pojo/{ => chat}/ChoiceMessage.java (70%) rename src/main/java/com/kwan/spring5/pojo/{ => chat}/Choices.java (74%) rename src/main/java/com/kwan/spring5/pojo/{ => chat}/CompletionChatRequest.java (95%) rename src/main/java/com/kwan/spring5/pojo/{ => chat}/CompletionChatResponse.java (81%) diff --git a/src/main/java/com/kwan/spring5/dao/BookDao.java b/src/main/java/com/kwan/spring5/dao/BookDao.java index 7a0aea5..a10c9af 100644 --- a/src/main/java/com/kwan/spring5/dao/BookDao.java +++ b/src/main/java/com/kwan/spring5/dao/BookDao.java @@ -1,6 +1,6 @@ package com.kwan.spring5.dao; -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import java.util.List; diff --git a/src/main/java/com/kwan/spring5/dao/impl/BookDaoImpl.java b/src/main/java/com/kwan/spring5/dao/impl/BookDaoImpl.java index 328b48f..b7196ce 100644 --- a/src/main/java/com/kwan/spring5/dao/impl/BookDaoImpl.java +++ b/src/main/java/com/kwan/spring5/dao/impl/BookDaoImpl.java @@ -1,6 +1,6 @@ package com.kwan.spring5.dao.impl; -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import com.kwan.spring5.dao.BookDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; diff --git a/src/main/java/com/kwan/spring5/factorybean/MyBean.java b/src/main/java/com/kwan/spring5/factorybean/MyBean.java index 389b6a7..9b2a1d3 100644 --- a/src/main/java/com/kwan/spring5/factorybean/MyBean.java +++ b/src/main/java/com/kwan/spring5/factorybean/MyBean.java @@ -1,6 +1,6 @@ package com.kwan.spring5.factorybean; -import com.kwan.spring5.Course; +import com.kwan.spring5.pojo.Course; import org.springframework.beans.factory.FactoryBean; /** diff --git a/src/main/java/com/kwan/spring5/Book.java b/src/main/java/com/kwan/spring5/pojo/Book.java similarity index 98% rename from src/main/java/com/kwan/spring5/Book.java rename to src/main/java/com/kwan/spring5/pojo/Book.java index aaebc66..5c6d204 100644 --- a/src/main/java/com/kwan/spring5/Book.java +++ b/src/main/java/com/kwan/spring5/pojo/Book.java @@ -1,4 +1,4 @@ -package com.kwan.spring5; +package com.kwan.spring5.pojo; import java.util.List; diff --git a/src/main/java/com/kwan/spring5/Course.java b/src/main/java/com/kwan/spring5/pojo/Course.java similarity index 92% rename from src/main/java/com/kwan/spring5/Course.java rename to src/main/java/com/kwan/spring5/pojo/Course.java index 608f471..048375f 100644 --- a/src/main/java/com/kwan/spring5/Course.java +++ b/src/main/java/com/kwan/spring5/pojo/Course.java @@ -1,4 +1,4 @@ -package com.kwan.spring5; +package com.kwan.spring5.pojo; /** * 课程 diff --git a/src/main/java/com/kwan/spring5/Dept.java b/src/main/java/com/kwan/spring5/pojo/Dept.java similarity index 92% rename from src/main/java/com/kwan/spring5/Dept.java rename to src/main/java/com/kwan/spring5/pojo/Dept.java index 2511d3e..565360b 100644 --- a/src/main/java/com/kwan/spring5/Dept.java +++ b/src/main/java/com/kwan/spring5/pojo/Dept.java @@ -1,4 +1,4 @@ -package com.kwan.spring5; +package com.kwan.spring5.pojo; /** * 部门 diff --git a/src/main/java/com/kwan/spring5/Emp.java b/src/main/java/com/kwan/spring5/pojo/Emp.java similarity index 96% rename from src/main/java/com/kwan/spring5/Emp.java rename to src/main/java/com/kwan/spring5/pojo/Emp.java index b1b9ecf..54add52 100644 --- a/src/main/java/com/kwan/spring5/Emp.java +++ b/src/main/java/com/kwan/spring5/pojo/Emp.java @@ -1,4 +1,4 @@ -package com.kwan.spring5; +package com.kwan.spring5.pojo; /** * 员工 diff --git a/src/main/java/com/kwan/spring5/Orders.java b/src/main/java/com/kwan/spring5/pojo/Orders.java similarity index 97% rename from src/main/java/com/kwan/spring5/Orders.java rename to src/main/java/com/kwan/spring5/pojo/Orders.java index a74053d..6bcb69d 100644 --- a/src/main/java/com/kwan/spring5/Orders.java +++ b/src/main/java/com/kwan/spring5/pojo/Orders.java @@ -1,4 +1,4 @@ -package com.kwan.spring5; +package com.kwan.spring5.pojo; /** diff --git a/src/main/java/com/kwan/spring5/Stu.java b/src/main/java/com/kwan/spring5/pojo/Stu.java similarity index 97% rename from src/main/java/com/kwan/spring5/Stu.java rename to src/main/java/com/kwan/spring5/pojo/Stu.java index ae6f69d..03f9cc5 100644 --- a/src/main/java/com/kwan/spring5/Stu.java +++ b/src/main/java/com/kwan/spring5/pojo/Stu.java @@ -1,4 +1,4 @@ -package com.kwan.spring5; +package com.kwan.spring5.pojo; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/kwan/spring5/User.java b/src/main/java/com/kwan/spring5/pojo/User.java similarity index 93% rename from src/main/java/com/kwan/spring5/User.java rename to src/main/java/com/kwan/spring5/pojo/User.java index 2506c47..a203732 100644 --- a/src/main/java/com/kwan/spring5/User.java +++ b/src/main/java/com/kwan/spring5/pojo/User.java @@ -1,4 +1,4 @@ -package com.kwan.spring5; +package com.kwan.spring5.pojo; /** * 用户 diff --git a/src/main/java/com/kwan/spring5/pojo/ChoiceMessage.java b/src/main/java/com/kwan/spring5/pojo/chat/ChoiceMessage.java similarity index 70% rename from src/main/java/com/kwan/spring5/pojo/ChoiceMessage.java rename to src/main/java/com/kwan/spring5/pojo/chat/ChoiceMessage.java index 0717291..11402bb 100644 --- a/src/main/java/com/kwan/spring5/pojo/ChoiceMessage.java +++ b/src/main/java/com/kwan/spring5/pojo/chat/ChoiceMessage.java @@ -1,10 +1,18 @@ -package com.kwan.spring5.pojo; +package com.kwan.spring5.pojo.chat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + +/** + * 结果 + * + * @author : qinyingjie + * @version : 2.2.0 + * @date : 2023/3/22 21:12 + */ @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/kwan/spring5/pojo/Choices.java b/src/main/java/com/kwan/spring5/pojo/chat/Choices.java similarity index 74% rename from src/main/java/com/kwan/spring5/pojo/Choices.java rename to src/main/java/com/kwan/spring5/pojo/chat/Choices.java index b157fb6..324ca65 100644 --- a/src/main/java/com/kwan/spring5/pojo/Choices.java +++ b/src/main/java/com/kwan/spring5/pojo/chat/Choices.java @@ -1,10 +1,18 @@ -package com.kwan.spring5.pojo; +package com.kwan.spring5.pojo.chat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + +/** + * 结果集 + * + * @author : qinyingjie + * @version : 2.2.0 + * @date : 2023/3/22 21:12 + */ @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/kwan/spring5/pojo/CompletionChatRequest.java b/src/main/java/com/kwan/spring5/pojo/chat/CompletionChatRequest.java similarity index 95% rename from src/main/java/com/kwan/spring5/pojo/CompletionChatRequest.java rename to src/main/java/com/kwan/spring5/pojo/chat/CompletionChatRequest.java index f56ccb7..72967f0 100644 --- a/src/main/java/com/kwan/spring5/pojo/CompletionChatRequest.java +++ b/src/main/java/com/kwan/spring5/pojo/chat/CompletionChatRequest.java @@ -1,4 +1,4 @@ -package com.kwan.spring5.pojo; +package com.kwan.spring5.pojo.chat; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/kwan/spring5/pojo/CompletionChatResponse.java b/src/main/java/com/kwan/spring5/pojo/chat/CompletionChatResponse.java similarity index 81% rename from src/main/java/com/kwan/spring5/pojo/CompletionChatResponse.java rename to src/main/java/com/kwan/spring5/pojo/chat/CompletionChatResponse.java index 06b281c..6de1d34 100644 --- a/src/main/java/com/kwan/spring5/pojo/CompletionChatResponse.java +++ b/src/main/java/com/kwan/spring5/pojo/chat/CompletionChatResponse.java @@ -1,4 +1,4 @@ -package com.kwan.spring5.pojo; +package com.kwan.spring5.pojo.chat; import com.theokanning.openai.Usage; import lombok.AllArgsConstructor; @@ -8,6 +8,14 @@ import lombok.NoArgsConstructor; import java.util.List; + +/** + * 响应结果 + * + * @author : qinyingjie + * @version : 2.2.0 + * @date : 2023/3/22 21:13 + */ @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/kwan/spring5/proxy/PersonProxy.java b/src/main/java/com/kwan/spring5/proxy/PersonProxy.java index 934ed48..5c31fb3 100644 --- a/src/main/java/com/kwan/spring5/proxy/PersonProxy.java +++ b/src/main/java/com/kwan/spring5/proxy/PersonProxy.java @@ -19,7 +19,7 @@ public class PersonProxy { /** * 相同切入点抽取 */ - @Pointcut(value = "execution(* com.kwan.spring5.User.add(..))") + @Pointcut(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void pointdemo() { } @@ -31,25 +31,25 @@ public class PersonProxy { } //后置通知（返回通知） - @AfterReturning(value = "execution(* com.kwan.spring5.User.add(..))") + @AfterReturning(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void afterReturning() { System.out.println("afterReturning........."); } //最终通知 - @After(value = "execution(* com.kwan.spring5.User.add(..))") + @After(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void after() { System.out.println("after........."); } //异常通知 - @AfterThrowing(value = "execution(* com.kwan.spring5.User.add(..))") + @AfterThrowing(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void afterThrowing() { System.out.println("afterThrowing........."); } //环绕通知 - @Around(value = "execution(* com.kwan.spring5.User.add(..))") + @Around(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void around(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { System.out.println("环绕之前........."); //被增强的方法执行 diff --git a/src/main/java/com/kwan/spring5/proxy/UserProxy.java b/src/main/java/com/kwan/spring5/proxy/UserProxy.java index e766c74..59ecec5 100644 --- a/src/main/java/com/kwan/spring5/proxy/UserProxy.java +++ b/src/main/java/com/kwan/spring5/proxy/UserProxy.java @@ -12,7 +12,7 @@ public class UserProxy { /** * 相同切入点抽取 */ - @Pointcut(value = "execution(* com.kwan.spring5.User.add(..))") + @Pointcut(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void pointdemo() { } @@ -24,25 +24,25 @@ public class UserProxy { } //后置通知（返回通知） - @AfterReturning(value = "execution(* com.kwan.spring5.User.add(..))") + @AfterReturning(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void afterReturning() { System.out.println("afterReturning........."); } //最终通知 - @After(value = "execution(* com.kwan.spring5.User.add(..))") + @After(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void after() { System.out.println("after........."); } //异常通知 - @AfterThrowing(value = "execution(* com.kwan.spring5.User.add(..))") + @AfterThrowing(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void afterThrowing() { System.out.println("afterThrowing........."); } //环绕通知 - @Around(value = "execution(* com.kwan.spring5.User.add(..))") + @Around(value = "execution(* com.kwan.spring5.pojo.User.add(..))") public void around(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { System.out.println("环绕之前........."); //被增强的方法执行 diff --git a/src/main/java/com/kwan/spring5/service/BookService.java b/src/main/java/com/kwan/spring5/service/BookService.java index 97e14aa..5b0c908 100644 --- a/src/main/java/com/kwan/spring5/service/BookService.java +++ b/src/main/java/com/kwan/spring5/service/BookService.java @@ -1,6 +1,6 @@ package com.kwan.spring5.service; -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import com.kwan.spring5.dao.BookDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/kwan/spring5/utils/OpenAIChatGpt.java b/src/main/java/com/kwan/spring5/utils/OpenAIChatGpt.java index 4f1a144..5dd5dfe 100644 --- a/src/main/java/com/kwan/spring5/utils/OpenAIChatGpt.java +++ b/src/main/java/com/kwan/spring5/utils/OpenAIChatGpt.java @@ -3,10 +3,10 @@ package com.kwan.spring5.utils; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson2.JSON; -import com.kwan.spring5.pojo.ChoiceMessage; -import com.kwan.spring5.pojo.Choices; -import com.kwan.spring5.pojo.CompletionChatRequest; -import com.kwan.spring5.pojo.CompletionChatResponse; +import com.kwan.spring5.pojo.chat.ChoiceMessage; +import com.kwan.spring5.pojo.chat.Choices; +import com.kwan.spring5.pojo.chat.CompletionChatRequest; +import com.kwan.spring5.pojo.chat.CompletionChatResponse; import java.util.ArrayList; import java.util.HashMap; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; /** - * chatgpt-api + * 人工智能chatgpt-api * * @author : qinyingjie * @version : 2.2.0 diff --git a/src/main/resources/spring1.xml b/src/main/resources/spring1.xml index 5814835..c855a62 100644 --- a/src/main/resources/spring1.xml +++ b/src/main/resources/spring1.xml @@ -8,9 +8,9 @@ https://www.springframework.org/schema/context/spring-context.xsd"> - + - + - + diff --git a/src/main/resources/spring10.xml b/src/main/resources/spring10.xml index 6cc3d2d..2edd9e4 100644 --- a/src/main/resources/spring10.xml +++ b/src/main/resources/spring10.xml @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/src/main/resources/spring12.xml b/src/main/resources/spring12.xml index 3714b2e..1e2c843 100644 --- a/src/main/resources/spring12.xml +++ b/src/main/resources/spring12.xml @@ -18,8 +18,8 @@ - - + + \ No newline at end of file diff --git a/src/main/resources/spring13.xml b/src/main/resources/spring13.xml index d6a5646..492a6e8 100644 --- a/src/main/resources/spring13.xml +++ b/src/main/resources/spring13.xml @@ -10,7 +10,7 @@ - diff --git a/src/main/resources/spring2-p.xml b/src/main/resources/spring2-p.xml index d10f653..2b75e94 100644 --- a/src/main/resources/spring2-p.xml +++ b/src/main/resources/spring2-p.xml @@ -9,5 +9,5 @@ https://www.springframework.org/schema/context/spring-context.xsd"> - + \ No newline at end of file diff --git a/src/main/resources/spring24.xml b/src/main/resources/spring24.xml index 38029b2..360b252 100644 --- a/src/main/resources/spring24.xml +++ b/src/main/resources/spring24.xml @@ -13,13 +13,13 @@ - + - + diff --git a/src/main/resources/spring3.xml b/src/main/resources/spring3.xml index fb27139..7ddcb99 100644 --- a/src/main/resources/spring3.xml +++ b/src/main/resources/spring3.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"> - + diff --git a/src/main/resources/spring5.xml b/src/main/resources/spring5.xml index ca29b21..49cb7d8 100644 --- a/src/main/resources/spring5.xml +++ b/src/main/resources/spring5.xml @@ -8,13 +8,13 @@ https://www.springframework.org/schema/context/spring-context.xsd"> - + - + diff --git a/src/main/resources/spring6.xml b/src/main/resources/spring6.xml index 57f26c9..5301864 100644 --- a/src/main/resources/spring6.xml +++ b/src/main/resources/spring6.xml @@ -8,14 +8,14 @@ https://www.springframework.org/schema/context/spring-context.xsd"> - + - + diff --git a/src/main/resources/spring7.xml b/src/main/resources/spring7.xml index 04a628e..f7048e2 100644 --- a/src/main/resources/spring7.xml +++ b/src/main/resources/spring7.xml @@ -8,7 +8,7 @@ https://www.springframework.org/schema/context/spring-context.xsd"> - + @@ -16,7 +16,7 @@ - + diff --git a/src/main/resources/spring8.xml b/src/main/resources/spring8.xml index 7b5e605..04dd3d5 100644 --- a/src/main/resources/spring8.xml +++ b/src/main/resources/spring8.xml @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/spring9.xml b/src/main/resources/spring9.xml index 8cd835d..622e31a 100644 --- a/src/main/resources/spring9.xml +++ b/src/main/resources/spring9.xml @@ -8,14 +8,14 @@ https://www.springframework.org/schema/context/spring-context.xsd"> - + - + - + diff --git a/src/test/java/Spring_00_XmlGetTest.java b/src/test/java/Spring_00_XmlGetTest.java index 079c9d4..9013826 100644 --- a/src/test/java/Spring_00_XmlGetTest.java +++ b/src/test/java/Spring_00_XmlGetTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.User; +import com.kwan.spring5.pojo.User; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_01_BookTest.java b/src/test/java/Spring_01_BookTest.java index 2b0ab1c..813dcf6 100644 --- a/src/test/java/Spring_01_BookTest.java +++ b/src/test/java/Spring_01_BookTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_01_OrdersTest.java b/src/test/java/Spring_01_OrdersTest.java index e7004e0..81fbfa2 100644 --- a/src/test/java/Spring_01_OrdersTest.java +++ b/src/test/java/Spring_01_OrdersTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Orders; +import com.kwan.spring5.pojo.Orders; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_01_UserTest.java b/src/test/java/Spring_01_UserTest.java index 208668b..23c9561 100644 --- a/src/test/java/Spring_01_UserTest.java +++ b/src/test/java/Spring_01_UserTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.User; +import com.kwan.spring5.pojo.User; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_02_BookTest.java b/src/test/java/Spring_02_BookTest.java index 14b3c10..16bea57 100644 --- a/src/test/java/Spring_02_BookTest.java +++ b/src/test/java/Spring_02_BookTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_03_BookTest.java b/src/test/java/Spring_03_BookTest.java index 1bebd9f..1ccc751 100644 --- a/src/test/java/Spring_03_BookTest.java +++ b/src/test/java/Spring_03_BookTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_05_DeptTest.java b/src/test/java/Spring_05_DeptTest.java index 5166332..05fc184 100644 --- a/src/test/java/Spring_05_DeptTest.java +++ b/src/test/java/Spring_05_DeptTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Emp; +import com.kwan.spring5.pojo.Emp; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_06_DeptTest.java b/src/test/java/Spring_06_DeptTest.java index fc08b5c..363d59d 100644 --- a/src/test/java/Spring_06_DeptTest.java +++ b/src/test/java/Spring_06_DeptTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Emp; +import com.kwan.spring5.pojo.Emp; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_07_DeptTest.java b/src/test/java/Spring_07_DeptTest.java index d02ac47..1107af1 100644 --- a/src/test/java/Spring_07_DeptTest.java +++ b/src/test/java/Spring_07_DeptTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Emp; +import com.kwan.spring5.pojo.Emp; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_08_StuTest.java b/src/test/java/Spring_08_StuTest.java index 85040ae..f172014 100644 --- a/src/test/java/Spring_08_StuTest.java +++ b/src/test/java/Spring_08_StuTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Stu; +import com.kwan.spring5.pojo.Stu; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_09_StuTest.java b/src/test/java/Spring_09_StuTest.java index bdd69f2..be40c54 100644 --- a/src/test/java/Spring_09_StuTest.java +++ b/src/test/java/Spring_09_StuTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Stu; +import com.kwan.spring5.pojo.Stu; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_10_BookTest.java b/src/test/java/Spring_10_BookTest.java index a914de4..8bcfa13 100644 --- a/src/test/java/Spring_10_BookTest.java +++ b/src/test/java/Spring_10_BookTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_11_FactoryBeanTest.java b/src/test/java/Spring_11_FactoryBeanTest.java index bf3525e..f43bbd9 100644 --- a/src/test/java/Spring_11_FactoryBeanTest.java +++ b/src/test/java/Spring_11_FactoryBeanTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Course; +import com.kwan.spring5.pojo.Course; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_12_ScopeTest.java b/src/test/java/Spring_12_ScopeTest.java index cc2463e..176193b 100644 --- a/src/test/java/Spring_12_ScopeTest.java +++ b/src/test/java/Spring_12_ScopeTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_13_MyBeanPostTest.java b/src/test/java/Spring_13_MyBeanPostTest.java index aec5551..22209f9 100644 --- a/src/test/java/Spring_13_MyBeanPostTest.java +++ b/src/test/java/Spring_13_MyBeanPostTest.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.Orders; +import com.kwan.spring5.pojo.Orders; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_24_.java b/src/test/java/Spring_24_.java index 0b95c74..1362ea7 100644 --- a/src/test/java/Spring_24_.java +++ b/src/test/java/Spring_24_.java @@ -1,4 +1,4 @@ -import com.kwan.spring5.User; +import com.kwan.spring5.pojo.User; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/Spring_25_add.java b/src/test/java/Spring_25_add.java index b7fc628..496d0ad 100644 --- a/src/test/java/Spring_25_add.java +++ b/src/test/java/Spring_25_add.java @@ -1,5 +1,5 @@ -import com.kwan.spring5.Book; +import com.kwan.spring5.pojo.Book; import com.kwan.spring5.service.BookService; import org.junit.Test; import org.springframework.context.ApplicationContext; -- GitLab