Merge remote-tracking branch 'origin/main'

# Conflicts:
#	pom.xml

pom.xml

@@ -20,6 +20,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- Spring Boot 3 必须用 JDK 17+，否则编译报错 -->
+    <java.version>22</java.version>
   </properties>
 
   <dependencies>
@@ -37,11 +39,61 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-redis</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>mysql</groupId>
+      <groupId>org.springframework.boot</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <artifactId>spring-boot-starter-jdbc</artifactId>
-      <version>8.0.33</version>
+    </dependency>
+    <!-- 2. MySQL 驱动（适配 Spring Boot 3，运行时依赖） -->
+    <dependency>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <scope>runtime</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.junit.vintage</groupId>
+          <artifactId>junit-vintage-engine</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mybatis.spring.boot</groupId>
+      <artifactId>mybatis-spring-boot-starter</artifactId>
+      <version>3.0.3</version>
+    </dependency>
+
   </dependencies>
+
+  <build>
+    <!-- 必须指定最终生成的 JAR 包名称（可选，但便于识别） -->
+    <finalName>javamemories</finalName>
+
+    <plugins>
+      <!-- 核心：Spring Boot 打包插件（必须配置，否则无主清单） -->
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>3.2.3</version> <!-- 和你的 Spring Boot 版本一致 -->
+        <executions>
+          <!-- 必须添加这个 execution，否则插件不会生效 -->
+          <execution>
+            <goals>
+              <goal>repackage</goal> <!-- 重新打包为可执行 JAR -->
+            </goals>
+          </execution>
+        </executions>
+        <!-- 可选：手动指定启动类（防止插件找不到） -->
+        <configuration>
+          <mainClass>cn.mayiming.App</mainClass> <!-- 替换为你的实际启动类全限定名 -->
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

src/main/java/cn/mayiming/App.java

@@ -1,8 +1,10 @@
 package cn.mayiming;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+@MapperScan("cn.mayiming.Mapper")
 @SpringBootApplication
 public class App
 {

src/main/java/cn/mayiming/Controller/Redis/Redistest.java

@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.concurrent.TimeUnit;
 
-
 @RestController
 public class Redistest {
     @Autowired

src/main/java/cn/mayiming/Controller/User.java

@@ -1,17 +0,0 @@
-package cn.mayiming.Controller;
-
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@RestController
-public class User {
-    @PostMapping("/login")
-    public Map<String, String>  login() {
-        Map<String, String> map = new HashMap<>();
-        map.put("username", "admin");
-        return map;
-    }
-}

src/main/java/cn/mayiming/Controller/UserCon/UserBody.java

@@ -0,0 +1,22 @@
+package cn.mayiming.Controller.UserCon;
+
+public class UserBody {
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String username;
+    public String password;
+}

src/main/java/cn/mayiming/Controller/UserCon/UserController.java

@@ -0,0 +1,46 @@
+package cn.mayiming.Controller.UserCon;
+
+import cn.mayiming.Mapper.UserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class UserController {
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @PostMapping("/login")
+    public Map<String, Object>  login(@RequestBody UserBody user) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            String dbPassword = userMapper.getPasswordByUsername(user.getUsername());
+            String username = user.getUsername();
+            String password = user.getPassword();
+            // 3. 编写 SQL 查询数据库中的用户密码
+            // 用 ? 占位符，防止 SQL 注入（必须！）
+
+            // 4. 验证密码（实际项目要加密对比，这里简单演示）
+            if (password != null && password.equals(dbPassword)) {
+                result.put("code", 200);
+                result.put("msg", "登录成功");
+                result.put("data", username);
+            } else {
+                result.put("code", 400);
+                result.put("msg", "密码错误");
+            }
+        } catch (Exception e) {
+            // 捕获“用户不存在”等异常
+            result.put("code", 404);
+            result.put("msg", "用户名不存在或登录失败");
+            result.put("error", e.getMessage());
+        }
+        return result;
+    }
+}

src/main/java/cn/mayiming/Mapper/UserMapper.java

@@ -0,0 +1,81 @@
+package cn.mayiming.Mapper;
+import cn.mayiming.Controller.UserCon.UserBody;
+import org.apache.ibatis.annotations.*;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface UserMapper {
+    @Select("SELECT password FROM user WHERE username = #{username}")
+    String getPasswordByUsername(String username);
+    /**
+     * 根据ID查询用户（单条查询）
+     * @param id 用户ID
+     * @return 完整用户信息
+     */
+    @Select("SELECT id, username, password, nickname, create_time AS createTime FROM user WHERE id = #{id}")
+    UserBody getUserById(Long id);
+
+    /**
+     * 根据用户名查询完整用户信息（登录/校验用）
+     * @param username 用户名
+     * @return 完整用户信息
+     */
+    @Select("SELECT id, username, password, nickname, create_time AS createTime FROM user WHERE username = #{username}")
+    UserBody getUserByUsername(String username);
+
+    /**
+     * 查询所有用户（分页建议用 MyBatis-Plus，这里先实现全量）
+     * @return 用户列表
+     */
+    @Select("SELECT id, username, password, nickname, create_time AS createTime FROM user")
+    List<UserBody> listAllUsers();
+
+    // ==================== 增 ====================
+    /**
+     * 新增用户（自增ID）
+     * @param user 用户实体
+     * @return 影响行数（1=成功，0=失败）
+     */
+    @Insert("INSERT INTO user (username, password, nickname, create_time) VALUES (#{username}, #{password}, #{nickname}, #{createTime})")
+    @Options(useGeneratedKeys = true, keyProperty = "id") // 自动返回自增的ID到user对象的id字段
+    int insertUser(UserBody user);
+
+    // ==================== 改 ====================
+    /**
+     * 根据ID修改用户昵称
+     * @param id 用户ID
+     * @param nickname 新昵称
+     * @return 影响行数
+     */
+    @Update("UPDATE user SET nickname = #{nickname} WHERE id = #{id}")
+    int updateNicknameById(@Param("id") Long id, @Param("nickname") String nickname);
+
+    /**
+     * 根据用户名修改密码
+     * @param username 用户名
+     * @param newPassword 新密码
+     * @return 影响行数
+     */
+    @Update("UPDATE user SET password = #{newPassword} WHERE username = #{username}")
+    int updatePasswordByUsername(@Param("username") String username, @Param("newPassword") String password);
+
+    // ==================== 删 ====================
+    /**
+     * 根据ID删除用户
+     * @param id 用户ID
+     * @return 影响行数
+     */
+    @Delete("DELETE FROM user WHERE id = #{id}")
+    int deleteUserById(Long id);
+
+    /**
+     * 根据用户名删除用户
+     * @param username 用户名
+     * @return 影响行数
+     */
+    @Delete("DELETE FROM user WHERE username = #{username}")
+    int deleteUserByUsername(String username);
+}

src/main/resources/application.yml

@@ -7,3 +7,18 @@ spring:
       password: ""
       database: 0
       timeout: 10000
+  datasource:
+    # 连接 URL（关键：test_db 是你要连接的数据库名，需提前创建）
+    url: jdbc:mysql://rm-f8z6oc5a03331500p8o.mysql.rds.aliyuncs.com:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    # 数据库用户名
+    username: root
+    # 数据库密码（替换为你的 MySQL 密码）
+    password: Root123456
+    # 驱动类名（MySQL 8.x 用这个，5.x 改为 com.mysql.jdbc.Driver）
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    # 连接池配置（可选，提升性能）
+    hikari:
+      maximum-pool-size: 10  # 最大连接数
+      minimum-idle: 2        # 最小空闲连接数
+      idle-timeout: 60000    # 空闲连接超时时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）

src/test/java/cn/mayiming/AppTest.java

@@ -3,18 +3,27 @@ package cn.mayiming;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
  * Unit test for simple App.
  */
+@SpringBootTest
 public class AppTest 
     extends TestCase
 {
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
+
     public AppTest( String testName )
     {
         super( testName );
@@ -36,3 +45,7 @@ public class AppTest
         assertTrue( true );
     }
 }
+
+
+
+

target/classes/application.yml

@@ -1,9 +0,0 @@
-server:
-  port: 9090
-spring:
-  data:
-    redis:
-      port: 6379
-      password: ""
-      database: 0
-      timeout: 10000