diff --git a/.gitignore b/.gitignore
index 7ed0d6b679399a08baa8c4e3d4ee2f95d898f0e5..16e36cd40f5620f891d5bf34da5ddfcc4322b8ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ build/
### VS Code ###
.vscode/
+/swpu-spring-projects-zyt/src/main/java/com/swpu/controller/
diff --git a/pom.xml b/pom.xml
index d545cc00c459e2e302c74a07b7f53ea22551e512..cfa5a6827e313e5476fdd0cd8ab120f6654a4b56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,7 @@
swpu-spring-projects-boot
swpu-spring-projects-testify
+ swpu-spring-projects-zyt
org.springframework.boot
diff --git a/sql/swpu_info.sql b/sql/swpu_info.sql
index 0b54a2d94e873530fe135c70a7ea74f8d90be715..45b3e3e67e07410a869da01deeb2caa14b28b8f2 100644
--- a/sql/swpu_info.sql
+++ b/sql/swpu_info.sql
@@ -10,3 +10,4 @@ create table swpu_info
end_contract date null comment '合同终止日期',
work_age int null comment '工龄'
) charset = utf8;
+
diff --git a/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java b/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java
index 8a516fedc30b4a9ffee299a9c3f8b5f6b20661a2..f8270abff2805a9a520347d9a1ba75717e25dfe0 100644
--- a/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java
+++ b/swpu-spring-projects-boot/src/main/java/com/swpu/controller/SwpuUserController.java
@@ -5,7 +5,7 @@ import com.swpu.entity.SwpuUserEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.List;
+//import java.util.List;
/**
* @author wales
@@ -29,8 +29,8 @@ public class SwpuUserController {
*/
@GetMapping(value = "/findAll")
public Object findAll() {
- List list = swpuUserDao.findAll();
- return list;
+ //List list = swpuUserDao.findAll();
+ return swpuUserDao.findAll();
}
/**
diff --git a/swpu-spring-projects-boot/src/main/resources/application.yml b/swpu-spring-projects-boot/src/main/resources/application.yml
index 2a647f79c18ef95c646f1c31968c923c3d2ab3c2..0d2bcc4555525df04f2be7cc8955fc4695276994 100644
--- a/swpu-spring-projects-boot/src/main/resources/application.yml
+++ b/swpu-spring-projects-boot/src/main/resources/application.yml
@@ -4,9 +4,9 @@ spring:
# 数据库连接信息
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/swpu_db
- username: swpu_user
- password: '123456789'
+ url: jdbc:mysql://192.168.190.128:3306/zyt_db
+ username: zyt
+ password: '201012'
# 数据库连接池
type: com.zaxxer.hikari.HikariDataSource
hikari:
diff --git a/swpu-spring-projects-boot/src/main/resources/mapper/SwpuUserMapper.xml b/swpu-spring-projects-boot/src/main/resources/mapper/SwpuUserMapper.xml
index 1969466c6d8a65e15863e696debeead8108d0d08..f7ec4e537dc20b221504f5a806c510780aa31e3f 100644
--- a/swpu-spring-projects-boot/src/main/resources/mapper/SwpuUserMapper.xml
+++ b/swpu-spring-projects-boot/src/main/resources/mapper/SwpuUserMapper.xml
@@ -16,12 +16,12 @@
-