feat:finish task

sh4ll0t · sh4ll0t · commit bbf84cc14a7f · 2024-10-05T18:32:15.000+08:00
diff --git a/sh4ll0t/api/admin/admin.go b/sh4ll0t/api/admin/admin.go
@@ -3,9 +3,8 @@ package admin
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/api/user"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func Admin(c *gin.Context) {
@@ -18,7 +17,7 @@ func Admin(c *gin.Context) {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "管理员才可以访问！"})
 		return
 	}
-	var questions []user.Question
+	var questions []db.Question
 	if err := db.DB.Preload("Answers").Find(&questions).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
diff --git a/sh4ll0t/api/admin/check_answer.go b/sh4ll0t/api/admin/check_answer.go
@@ -4,8 +4,8 @@ import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 	"strconv"
 )
 
@@ -37,9 +37,7 @@ func CheckAnswer(c *gin.Context) {
 		}
 		return
 	}
-
-	// 更新审核状态
-	answer.CheckStatus = checkStatus // 假设你在 Answer 结构体中添加了 CheckStatus 字段
+	answer.CheckStatus = checkStatus
 	if err := db.DB.Save(&answer).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
diff --git a/sh4ll0t/api/admin/check_question.go b/sh4ll0t/api/admin/check_question.go
@@ -4,8 +4,8 @@ import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 	"strconv"
 )
 
diff --git a/sh4ll0t/api/answer/answer.go b/sh4ll0t/api/answer/answer.go
@@ -3,8 +3,8 @@ package answer
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 	"strconv"
 )
 
@@ -15,18 +15,16 @@ func Answer(c *gin.Context) {
 		return
 	}
 	respondent := session.Get("username").(string)
-	idStr := c.PostForm("id") // 获取问题 ID
-	answerText := c.PostForm("Answer")
-
-	// 将问题 ID 从 string 转换为 uint
+	idStr := c.PostForm("id")
+	answerText := c.PostForm("answer")
 	questionID, err := strconv.ParseUint(idStr, 10, 32)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "无效的问题 ID"})
 		return
 	}
 
 	answer := db.Answer{
-		QuestionID: uint(questionID), // 转换为 uint
+		QuestionID: uint(questionID),
 		AnswerText: answerText,
 		Respondent: respondent,
 	}
diff --git a/sh4ll0t/api/answer/change_answer.go b/sh4ll0t/api/answer/change_answer.go
@@ -3,8 +3,8 @@ package answer
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func ChangeAnswer(c *gin.Context) {
diff --git a/sh4ll0t/api/answer/delete_answer.go b/sh4ll0t/api/answer/delete_answer.go
@@ -3,8 +3,8 @@ package answer
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func DeleteAnswer(c *gin.Context) {
@@ -15,17 +15,17 @@ func DeleteAnswer(c *gin.Context) {
 	}
 
 	id := c.PostForm("id")
-	var question db.Question
-	if err := db.DB.First(&question, id).Error; err != nil {
+	var answer db.Answer
+	if err := db.DB.First(&answer, id).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
-	if session.Get("username") != question.Questioner {
+	if session.Get("username") != answer.Respondent {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "只有本作者才可以删除！"})
 		return
 	}
 
-	db.DB.Delete(&db.Answer{}, "question_id = ?", id)
-	db.DB.Delete(&question)
+	db.DB.Delete(&db.Answer{}, "id = ?", id)
+	db.DB.Delete(&answer)
 	c.JSON(http.StatusOK, gin.H{"message": "删除成功"})
 }
diff --git a/sh4ll0t/api/question/ask.go b/sh4ll0t/api/question/ask.go
@@ -3,9 +3,9 @@ package question
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
-	"hduhelp_text/utils"
 	"net/http"
+	"sh4ll0t/db"
+	"sh4ll0t/utils"
 )
 
 func Ask(c *gin.Context) {
@@ -44,7 +44,7 @@ func Ask(c *gin.Context) {
 	}
 
 	answer := db.Answer{
-		QuestionID: newQuestion.ID, // 确保这里是 uint 类型
+		QuestionID: newQuestion.ID,
 		AnswerText: answerText,
 		Respondent: "ai",
 	}
diff --git a/sh4ll0t/api/question/change_question.go b/sh4ll0t/api/question/change_question.go
@@ -3,8 +3,8 @@ package question
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func ChangeQuestion(c *gin.Context) {
diff --git a/sh4ll0t/api/question/delete_question.go b/sh4ll0t/api/question/delete_question.go
@@ -3,8 +3,8 @@ package question
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func DeleteQuestion(c *gin.Context) {
diff --git a/sh4ll0t/api/user/like.go b/sh4ll0t/api/user/like.go
@@ -3,8 +3,8 @@ package user
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func Like(c *gin.Context) {
diff --git a/sh4ll0t/api/user/login.go b/sh4ll0t/api/user/login.go
@@ -4,8 +4,8 @@ import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"golang.org/x/crypto/bcrypt"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func Login(c *gin.Context) {
diff --git a/sh4ll0t/api/user/register.go b/sh4ll0t/api/user/register.go
@@ -3,9 +3,8 @@ package user
 import (
 	"github.com/gin-gonic/gin"
 	"golang.org/x/crypto/bcrypt"
-	"gorm.io/gorm"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func Register(c *gin.Context) {
@@ -19,13 +18,12 @@ func Register(c *gin.Context) {
 		return
 	}
 	user.Password = string(hashedPassword)
-
+	if db.DB.Where("username = ?", user.Username).First(&db.User{}).Error == nil {
+		c.JSON(http.StatusConflict, gin.H{"error": "用户名已存在"})
+		return
+	}
 	result := db.DB.Create(&user)
 	if result.Error != nil {
-		if result.Error == gorm.ErrDuplicatedKey {
-			c.JSON(http.StatusConflict, gin.H{"error": "用户名已存在"})
-			return
-		}
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "注册失败"})
 		return
 	}
diff --git a/sh4ll0t/api/user/show_question_and_answer.go b/sh4ll0t/api/user/show_question_and_answer.go
@@ -3,33 +3,18 @@ package user
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
 	"net/http"
+	"sh4ll0t/db"
 )
 
-type Answer struct {
-	AnswerID   int    `json:"answer_id"`
-	AnswerText string `json:"answer_text"`
-	Respondent string `json:"respondent"`
-	LikesCount int    `json:"likes_count"`
-}
-
-type Question struct {
-	ID           int      `json:"id"`
-	QuestionText string   `json:"question_text"`
-	TotalLikes   int      `json:"total_likes"`
-	Answers      []Answer `json:"answers"`
-	Questioner   string   `json:"questioner"`
-}
-
 func ShowQuestionAndAnswer(c *gin.Context) {
 	session := sessions.Default(c)
 	if auth, ok := session.Get("authenticated").(bool); !ok || !auth {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "未登录"})
 		return
 	}
-	var questions []Question
-	if err := db.DB.Preload("Answers").Find(&questions).Error; err != nil {
+	var questions []db.Question
+	if err := db.DB.Preload("Answers", "`check` = ?", 1).Where("`check` = ?", 1).Find(&questions).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
diff --git a/sh4ll0t/api/user/sort_by_like.go b/sh4ll0t/api/user/sort_by_like.go
@@ -3,8 +3,9 @@ package user
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"hduhelp_text/db"
+	"gorm.io/gorm"
 	"net/http"
+	"sh4ll0t/db"
 )
 
 func Like_sort(c *gin.Context) {
@@ -15,7 +16,9 @@ func Like_sort(c *gin.Context) {
 	}
 
 	var questions []db.Question
-	if err := db.DB.Preload("Answers", "check = 1").Where("check = 1").Order("likes_count DESC").Find(&questions).Error; err != nil {
+	if err := db.DB.Preload("Answers", func(db *gorm.DB) *gorm.DB {
+		return db.Where("`check` = 1").Order("likes_count DESC")
+	}).Where("`check` = 1").Order("total_likes DESC").Find(&questions).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
diff --git a/sh4ll0t/db/db.go b/sh4ll0t/db/db.go
@@ -8,15 +8,13 @@ import (
 )
 
 type Answer struct {
-	ID          uint     `gorm:"column:id;primaryKey;autoIncrement"`
-	AnswerText  string   `gorm:"column:answer_text"`
-	Respondent  string   `gorm:"column:respondent"`
-	LikesCount  int      `gorm:"column:likes_count"`
-	QuestionID  uint     `gorm:"column:question_id;"`
-	CheckStatus int      `gorm:"column:check"`
-	Question    Question `gorm:"foreignKey:QuestionID"`
+	ID          uint   `gorm:"column:id;primaryKey;autoIncrement"`
+	AnswerText  string `gorm:"column:answer_text"`
+	Respondent  string `gorm:"column:respondent"`
+	LikesCount  int    `gorm:"column:likes_count"`
+	QuestionID  uint   `gorm:"column:question_id"`
+	CheckStatus int    `gorm:"column:check"`
 }
-
 type User struct {
 	Username string `gorm:"column:username"`
 	Password string `gorm:"column:password"`
@@ -27,11 +25,11 @@ type Question struct {
 	TotalLikes   int      `gorm:"column:total_likes"`
 	Questioner   string   `gorm:"column:questioner"`
 	CheckStatus  int      `gorm:"column:check"`
-	Answers      []Answer `gorm:"foreignKey:QuestionID"`
+	Answers      []Answer `gorm:"foreignKey:question_id;references:id"`
 }
 
 var (
-	dbHost = "127.0.0.1"
+	dbHost = "192.168.31.27"
 	dbPort = "8888"
 	dbUser = "root"
 	dbName = "users"
diff --git a/sh4ll0t/go.mod b/sh4ll0t/go.mod
diff --git a/sh4ll0t/go.sum b/sh4ll0t/go.sum
diff --git a/sh4ll0t/main.go b/sh4ll0t/main.go
diff --git a/sh4ll0t/router/router.go b/sh4ll0t/router/router.go

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"github.com/gin-contrib/sessions"`
`5`	`5`	`"github.com/gin-gonic/gin"`
`6`	`6`	`"gorm.io/gorm"`
`7`		`- "hduhelp_text/db"`
`8`	`7`	`"net/http"`
	`8`	`+ "sh4ll0t/db"`
`9`	`9`	`"strconv"`
`10`	`10`	`)`
`11`	`11`
`@@ -37,9 +37,7 @@ func CheckAnswer(c *gin.Context) {`
`37`	`37`	`}`
`38`	`38`	`return`
`39`	`39`	`}`
`40`		`-`
`41`		`- // 更新审核状态`
`42`		`- answer.CheckStatus = checkStatus // 假设你在 Answer 结构体中添加了 CheckStatus 字段`
	`40`	`+ answer.CheckStatus = checkStatus`
`43`	`41`	`if err := db.DB.Save(&answer).Error; err != nil {`
`44`	`42`	`c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})`
`45`	`43`	`return`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package answer`
`3`	`3`	`import (`
`4`	`4`	`"github.com/gin-contrib/sessions"`
`5`	`5`	`"github.com/gin-gonic/gin"`
`6`		`- "hduhelp_text/db"`
`7`	`6`	`"net/http"`
	`7`	`+ "sh4ll0t/db"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func ChangeAnswer(c *gin.Context) {`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ package question`
`3`	`3`	`import (`
`4`	`4`	`"github.com/gin-contrib/sessions"`
`5`	`5`	`"github.com/gin-gonic/gin"`
`6`		`- "hduhelp_text/db"`
`7`		`- "hduhelp_text/utils"`
`8`	`6`	`"net/http"`
	`7`	`+ "sh4ll0t/db"`
	`8`	`+ "sh4ll0t/utils"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func Ask(c *gin.Context) {`
`@@ -44,7 +44,7 @@ func Ask(c *gin.Context) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`answer := db.Answer{`
`47`		`- QuestionID: newQuestion.ID, // 确保这里是 uint 类型`
	`47`	`+ QuestionID: newQuestion.ID,`
`48`	`48`	`AnswerText: answerText,`
`49`	`49`	`Respondent: "ai",`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package question`
`3`	`3`	`import (`
`4`	`4`	`"github.com/gin-contrib/sessions"`
`5`	`5`	`"github.com/gin-gonic/gin"`
`6`		`- "hduhelp_text/db"`
`7`	`6`	`"net/http"`
	`7`	`+ "sh4ll0t/db"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func ChangeQuestion(c *gin.Context) {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package user`
`3`	`3`	`import (`
`4`	`4`	`"github.com/gin-contrib/sessions"`
`5`	`5`	`"github.com/gin-gonic/gin"`
`6`		`- "hduhelp_text/db"`
`7`	`6`	`"net/http"`
	`7`	`+ "sh4ll0t/db"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func Like(c *gin.Context) {`