diff --git a/Debate_backend/src/main/resources/application.yml b/Debate_backend/src/main/resources/application.yml index 35acca6..d727bc1 100644 --- a/Debate_backend/src/main/resources/application.yml +++ b/Debate_backend/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/wx_miniapp?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: 123456 + password: 1234 mybatis: mapper-locations: classpath:mapper/*.xml diff --git a/Debate_backend/target/classes/application.yml b/Debate_backend/target/classes/application.yml index 35acca6..d727bc1 100644 --- a/Debate_backend/target/classes/application.yml +++ b/Debate_backend/target/classes/application.yml @@ -5,7 +5,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/wx_miniapp?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: 123456 + password: 1234 mybatis: mapper-locations: classpath:mapper/*.xml diff --git a/Debate_backend/target/classes/com/learning/newdemo/common/Result.class b/Debate_backend/target/classes/com/learning/newdemo/common/Result.class index 6b3c970..17902a3 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/common/Result.class and b/Debate_backend/target/classes/com/learning/newdemo/common/Result.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/controller/WxAIController.class b/Debate_backend/target/classes/com/learning/newdemo/controller/WxAIController.class index b136fa9..f2d6c40 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/controller/WxAIController.class and b/Debate_backend/target/classes/com/learning/newdemo/controller/WxAIController.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/controller/WxLoginController.class b/Debate_backend/target/classes/com/learning/newdemo/controller/WxLoginController.class index b1f61a2..bf1946c 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/controller/WxLoginController.class and b/Debate_backend/target/classes/com/learning/newdemo/controller/WxLoginController.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/entity/WxUser.class b/Debate_backend/target/classes/com/learning/newdemo/entity/WxUser.class index ee772e0..2727c47 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/entity/WxUser.class and b/Debate_backend/target/classes/com/learning/newdemo/entity/WxUser.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/service/WxArgumentService.class b/Debate_backend/target/classes/com/learning/newdemo/service/WxArgumentService.class index d8eabf7..27113b1 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/service/WxArgumentService.class and b/Debate_backend/target/classes/com/learning/newdemo/service/WxArgumentService.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/service/WxDebateService.class b/Debate_backend/target/classes/com/learning/newdemo/service/WxDebateService.class index c29f778..72c1833 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/service/WxDebateService.class and b/Debate_backend/target/classes/com/learning/newdemo/service/WxDebateService.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/service/WxReviewService.class b/Debate_backend/target/classes/com/learning/newdemo/service/WxReviewService.class index dccd6e5..cee8393 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/service/WxReviewService.class and b/Debate_backend/target/classes/com/learning/newdemo/service/WxReviewService.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxArgumentServiceImpl.class b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxArgumentServiceImpl.class index 32f48a1..784723a 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxArgumentServiceImpl.class and b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxArgumentServiceImpl.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxDebateServiceImpl.class b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxDebateServiceImpl.class index 90f4229..5bb5452 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxDebateServiceImpl.class and b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxDebateServiceImpl.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxReviewServiceImpl.class b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxReviewServiceImpl.class index cbb0627..e7d3b41 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxReviewServiceImpl.class and b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxReviewServiceImpl.class differ diff --git a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxUserServiceImpl.class b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxUserServiceImpl.class index c83f16f..426cea4 100644 Binary files a/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxUserServiceImpl.class and b/Debate_backend/target/classes/com/learning/newdemo/service/impl/WxUserServiceImpl.class differ diff --git a/Debate_backend/target/classes/db/wx_miniapp.sql b/Debate_backend/target/classes/db/wx_miniapp.sql index f93ea96..bb65f98 100644 --- a/Debate_backend/target/classes/db/wx_miniapp.sql +++ b/Debate_backend/target/classes/db/wx_miniapp.sql @@ -1,22 +1,22 @@ --- 创建数据库 -CREATE DATABASE IF NOT EXISTS wx_miniapp DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; - --- 使用数据库 -USE wx_miniapp; - --- 创建微信用户表 -CREATE TABLE IF NOT EXISTS `wx_user` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `openid` varchar(100) NOT NULL COMMENT '微信openid', - `nickname` varchar(50) DEFAULT NULL COMMENT '昵称', - `avatar_url` varchar(500) DEFAULT NULL COMMENT '头像URL', - `gender` tinyint(4) DEFAULT NULL COMMENT '性别 0-未知 1-男 2-女', - `country` varchar(50) DEFAULT NULL COMMENT '国家', - `province` varchar(50) DEFAULT NULL COMMENT '省份', - `city` varchar(50) DEFAULT NULL COMMENT '城市', - `language` varchar(50) DEFAULT NULL COMMENT '语言', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_openid` (`openid`) COMMENT 'openid唯一索引' +-- 创建数据库 +CREATE DATABASE IF NOT EXISTS wx_miniapp DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; + +-- 使用数据库 +USE wx_miniapp; + +-- 创建微信用户表 +CREATE TABLE IF NOT EXISTS `wx_user` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `openid` varchar(100) NOT NULL COMMENT '微信openid', + `nickname` varchar(50) DEFAULT NULL COMMENT '昵称', + `avatar_url` varchar(500) DEFAULT NULL COMMENT '头像URL', + `gender` tinyint(4) DEFAULT NULL COMMENT '性别 0-未知 1-男 2-女', + `country` varchar(50) DEFAULT NULL COMMENT '国家', + `province` varchar(50) DEFAULT NULL COMMENT '省份', + `city` varchar(50) DEFAULT NULL COMMENT '城市', + `language` varchar(50) DEFAULT NULL COMMENT '语言', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_openid` (`openid`) COMMENT 'openid唯一索引' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='微信用户表'; \ No newline at end of file diff --git a/Debate_backend/target/classes/mapper/WxUserMapper.xml b/Debate_backend/target/classes/mapper/WxUserMapper.xml index 0fb65e4..e8618b1 100644 --- a/Debate_backend/target/classes/mapper/WxUserMapper.xml +++ b/Debate_backend/target/classes/mapper/WxUserMapper.xml @@ -1,58 +1,58 @@ - - - - - - - - - - - - - - - - - - - id, openid, nickname, avatar_url, gender, country, province, city, language, create_time, update_time - - - - - - insert into wx_user ( - openid, nickname, avatar_url, gender, country, province, city, language, create_time - ) - values ( - #{openid,jdbcType=VARCHAR}, - #{nickname,jdbcType=VARCHAR}, - #{avatarUrl,jdbcType=VARCHAR}, - #{gender,jdbcType=INTEGER}, - #{country,jdbcType=VARCHAR}, - #{province,jdbcType=VARCHAR}, - #{city,jdbcType=VARCHAR}, - #{language,jdbcType=VARCHAR}, - now() - ) - - - - update wx_user - set nickname = #{nickname,jdbcType=VARCHAR}, - avatar_url = #{avatarUrl,jdbcType=VARCHAR}, - gender = #{gender,jdbcType=INTEGER}, - country = #{country,jdbcType=VARCHAR}, - province = #{province,jdbcType=VARCHAR}, - city = #{city,jdbcType=VARCHAR}, - language = #{language,jdbcType=VARCHAR}, - update_time = now() - where id = #{id,jdbcType=INTEGER} - + + + + + + + + + + + + + + + + + + + id, openid, nickname, avatar_url, gender, country, province, city, language, create_time, update_time + + + + + + insert into wx_user ( + openid, nickname, avatar_url, gender, country, province, city, language, create_time + ) + values ( + #{openid,jdbcType=VARCHAR}, + #{nickname,jdbcType=VARCHAR}, + #{avatarUrl,jdbcType=VARCHAR}, + #{gender,jdbcType=INTEGER}, + #{country,jdbcType=VARCHAR}, + #{province,jdbcType=VARCHAR}, + #{city,jdbcType=VARCHAR}, + #{language,jdbcType=VARCHAR}, + now() + ) + + + + update wx_user + set nickname = #{nickname,jdbcType=VARCHAR}, + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, + gender = #{gender,jdbcType=INTEGER}, + country = #{country,jdbcType=VARCHAR}, + province = #{province,jdbcType=VARCHAR}, + city = #{city,jdbcType=VARCHAR}, + language = #{language,jdbcType=VARCHAR}, + update_time = now() + where id = #{id,jdbcType=INTEGER} + \ No newline at end of file diff --git a/Debate_front/src/components/ArgumentCom.vue b/Debate_front/src/components/ArgumentCom.vue index a6a978a..1012487 100644 --- a/Debate_front/src/components/ArgumentCom.vue +++ b/Debate_front/src/components/ArgumentCom.vue @@ -1,8 +1,29 @@