resolve merge conflict
Change-Id: I89952ba3cc1de77f88ed7f42fca3d12305ec87d2
diff --git a/src/main/resources/mapper/UserStatsMapper.xml b/src/main/resources/mapper/UserStatsMapper.xml
new file mode 100644
index 0000000..3560a39
--- /dev/null
+++ b/src/main/resources/mapper/UserStatsMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.example.g8backend.mapper.UserStatsMapper">
+ <update id="incrementTraffic">
+ UPDATE user_stats
+ SET total_upload = total_upload + #{deltaUploaded},
+ total_download = total_download + #{deltaDownloaded}
+ WHERE passkey = #{passkey}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index c0659b3..bf74097 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -6,7 +6,17 @@
`email` VARCHAR(255) NOT NULL UNIQUE,
`passkey` VARCHAR(255) NOT NULL UNIQUE
);
--- 种子表（保持不变）
+-- 用户统计表
+CREATE TABLE IF NOT EXISTS `user_stats` (
+ user_id INT PRIMARY KEY,
+ passkey VARCHAR(255) NOT NULL UNIQUE,
+ total_upload FLOAT NOT NULL DEFAULT 0,
+ total_download FLOAT NOT NULL DEFAULT 0,
+ last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ FOREIGN KEY (user_id) REFERENCES users(user_id),
+ FOREIGN KEY (passkey) REFERENCES users(passkey)
+);
+-- 种子表
CREATE TABLE IF NOT EXISTS `torrents` (
`torrent_id` INT AUTO_INCREMENT PRIMARY KEY,
`user_id` INT NOT NULL,