gorm

2023-05-14 07:00:24 +08:00
parent 2423213e9a
commit ee3b60eccc
18 changed files with 273 additions and 1221 deletions
--- a/routers/account.go
+++ b/routers/account.go
@@ -2,6 +2,7 @@ package routers

 import (
 	"fmt"
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
@@ -22,16 +23,23 @@ func AccountGet(w http.ResponseWriter, r *http.Request) {
 	cookie, err := r.Cookie("session_id")
 	if err != nil {
 		fmt.Println(err)
+		w.WriteHeader(http.StatusUnauthorized)
+		w.Write([]byte("401 - 未登錄"))
 		return
 	}

 	// 獲取會話
 	session := models.Session{ID: cookie.Value}
-	session.Get()
+	if err := configs.ORMDB().Take(&session).Error; err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusUnauthorized)
+		w.Write([]byte("401 - 會話已過期"))
+		return
+	}

 	// 獲取用戶
 	user := models.User{ID: session.UserID}
-	user.Get()
+	configs.ORMDB().Model(&user).Select("id, name, email, created_at, updated_at").Find(&user)

 	account.ID = user.ID
 	account.Name = user.Name
@@ -43,25 +51,3 @@ func AccountGet(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(account))
 }
-
-// 獲取當前賬戶, 並將其傳入回調函數
-func get_account(w http.ResponseWriter, r *http.Request, callback func(*models.User)) (err error) {
-	// 獲取Cookie
-	cookie, err := r.Cookie("session_id")
-	if err != nil {
-		fmt.Println(err)
-		return nil
-	}
-
-	// 獲取會話
-	session := models.Session{ID: cookie.Value}
-	session.Get()
-
-	// 獲取用戶
-	user := models.User{ID: session.UserID}
-	user.Get()
-
-	callback(&user)
-
-	return nil
-}
--- a/routers/images.go
+++ b/routers/images.go
@@ -4,9 +4,11 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"log"
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
+	"time"

 	"github.com/gorilla/mux"
 )
@@ -15,9 +17,17 @@ func ImagesGet(w http.ResponseWriter, r *http.Request) {
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	listview.List = models.QueryImages(listview.Page, listview.PageSize)
-	listview.Total = models.CountImages()
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+
+	var image_list []models.Image
+	db := configs.ORMDB()
+	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&image_list)
+	for _, image := range image_list {
+		listview.List = append(listview.List, image)
+	}
+
+	db.Model(&models.Image{}).Count(&listview.Total)
+
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }

@@ -33,14 +43,20 @@ func ImagesPost(w http.ResponseWriter, r *http.Request) {
 		log.Println(err)
 		return
 	}
-	image.Create()
+	if err := configs.ORMDB().Create(&image).Error; err != nil {
+		log.Println(err)
+		return
+	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(image))
 }

 func ImagesItemGet(w http.ResponseWriter, r *http.Request) {
 	image := models.Image{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	image.Get()
+	if err := configs.ORMDB().First(&image).Error; err != nil {
+		log.Println(err)
+		return
+	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(image))
 }
@@ -58,14 +74,24 @@ func ImagesItemPatch(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	image.ID = utils.ParamInt(mux.Vars(r)["id"], 0)
-	image.Update()
+	image.UpdatedAt = time.Now().Format("2006-01-02 15:04:05")
+	if err := configs.ORMDB().Model(&image).Updates(image).Error; err != nil {
+		log.Println(err)
+		return
+	}
+
+	//image.ID = utils.ParamInt(mux.Vars(r)["id"], 0)
+	//image.Update()
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(image))
 }

 func ImagesItemDelete(w http.ResponseWriter, r *http.Request) {
 	image := models.Image{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	image.Delete()
+	if err := configs.ORMDB().Delete(&image).Error; err != nil {
+		log.Println(err)
+		return
+	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(image))
 }
--- a/routers/models.go
+++ b/routers/models.go
@@ -17,28 +17,24 @@ import (

 var manager = models.NewWebSocketManager()

+// 獲取模型列表
 func ModelsGet(w http.ResponseWriter, r *http.Request) {
-	// 初始化基本參數
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	// 獲取模型列表
 	var model_list []models.Model
 	db := configs.ORMDB()
 	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&model_list)
 	for _, model := range model_list {
 		listview.List = append(listview.List, model)
 	}
-	// 獲取總數
-	var total int64
-	db.Model(&models.Model{}).Count(&total)
-	listview.Total = int(total)
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+	db.Model(&models.Model{}).Count(&listview.Total)
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }

+// 創建模型
 func ModelsPost(w http.ResponseWriter, r *http.Request) {
-	// 取得用戶
 	models.AccountRead(w, r, func(account *models.Account) {
 		fmt.Println(account)
 		// TODO: 判斷權限(是否可以創建)
@@ -138,7 +134,7 @@ func ModelItemPatch(w http.ResponseWriter, r *http.Request) {
 		model.Status = model_new.Status
 		// 如果狀態被改變爲 ready, 將模型發送到訓練隊列
 		if model.Status == "ready" {
-			model.SendToTrain()
+			//model.SendToTrain()
 		}
 	}
 	if model_new.Image != "" && model_new.Image != model.Image {
--- a/routers/servers.go
+++ b/routers/servers.go
@@ -1,6 +1,7 @@
 package routers

 import (
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
@@ -12,38 +13,42 @@ func ServersGet(w http.ResponseWriter, r *http.Request) {
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	listview.List = models.QueryServers(listview.Page, listview.PageSize)
-	listview.Total = models.CountServers()
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+	var server_list []models.Server
+	db := configs.ORMDB()
+	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&server_list)
+	for _, server := range server_list {
+		listview.List = append(listview.List, server)
+	}
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }

 func ServersPost(w http.ResponseWriter, r *http.Request) {
 	var server models.Server
-	server.Create()
+	configs.ORMDB().Create(&server)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(server))
 }

 func ServersItemGet(w http.ResponseWriter, r *http.Request) {
 	server := models.Server{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	server.Get()
+	configs.ORMDB().First(&server)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(server))
 }

 func ServersItemPatch(w http.ResponseWriter, r *http.Request) {
 	server := models.Server{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	server.Get()
-	server.Update()
+	configs.ORMDB().First(&server)
+	// TODO: update server
+	configs.ORMDB().Save(&server)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(server))
 }

 func ServersItemDelete(w http.ResponseWriter, r *http.Request) {
 	server := models.Server{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	server.Get()
-	server.Delete()
+	configs.ORMDB().Delete(&server)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(server))
 }
--- a/routers/sessions.go
+++ b/routers/sessions.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
@@ -17,9 +18,14 @@ func SessionsGet(w http.ResponseWriter, r *http.Request) {
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	listview.List = models.QuerySessions(listview.Page, listview.PageSize)
-	listview.Total = models.CountSessions()
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+	var session_list []models.Session
+	db := configs.ORMDB()
+	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&session_list)
+	for _, session := range session_list {
+		listview.List = append(listview.List, session)
+	}
+	db.Model(&models.Session{}).Count(&listview.Total)
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }

@@ -55,8 +61,8 @@ func SessionsPost(w http.ResponseWriter, r *http.Request) {
 	}

 	// 使用Email獲取用戶
-	user, err := models.GetUserByEmail(form.Email)
-	if err != nil {
+	var user models.User
+	if err := configs.ORMDB().Where("email = ?", form.Email).First(&user).Error; err != nil {
 		w.WriteHeader(http.StatusUnauthorized)
 		w.Write([]byte("404 - User Not Found"))
 		return
@@ -71,7 +77,11 @@ func SessionsPost(w http.ResponseWriter, r *http.Request) {

 	// 創建會話(生成一個不重複的 uuid 作爲 sid)
 	session := &models.Session{ID: uuid.New().String(), UserID: user.ID}
-	session.Create()
+	if err := configs.ORMDB().Create(session).Error; err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write([]byte("500 - Internal Server Error"))
+		return
+	}

 	// 寫入Cookie
 	cookie := http.Cookie{Name: "session_id", Value: session.ID, Path: "/", HttpOnly: true}
@@ -85,7 +95,11 @@ func SessionsPost(w http.ResponseWriter, r *http.Request) {
 // 獲取會話
 func SessionsItemGet(w http.ResponseWriter, r *http.Request) {
 	session := models.Session{ID: mux.Vars(r)["session_id"]}
-	session.Get()
+	if err := configs.ORMDB().Find(&session).Error; err != nil {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte("404 - Not Found"))
+		return
+	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(session))
 }
@@ -93,8 +107,11 @@ func SessionsItemGet(w http.ResponseWriter, r *http.Request) {
 // 更新會話
 func SessionsItemPatch(w http.ResponseWriter, r *http.Request) {
 	session := models.Session{ID: mux.Vars(r)["session_id"]}
-	session.Get()
-	session.Update()
+	if err := configs.ORMDB().Model(&session).Updates(GetForm(r)); err != nil {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte("404 - Not Found"))
+		return
+	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(session))
 }
@@ -113,14 +130,22 @@ func SessionsItemDelete(w http.ResponseWriter, r *http.Request) {

 	// 獲取當前session
 	session := models.Session{ID: cookie.Value}
-	session.Get()
+	if err := configs.ORMDB().Find(&session).Error; err != nil {
+		w.WriteHeader(http.StatusUnauthorized)
+		w.Write([]byte("401 - 會話已過期"))
+		return
+	}

 	// 獲取當前用戶
 	user := models.User{ID: session.UserID}
-	user.Get()
+	configs.ORMDB().Find(&user)

 	sessionx := models.Session{ID: mux.Vars(r)["session_id"]}
-	sessionx.Get()
+	if err := configs.ORMDB().Find(&sessionx).Error; err != nil {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte("404 - Not Found"))
+		return
+	}

 	if user.ID != sessionx.UserID {
 		w.WriteHeader(http.StatusUnauthorized)
@@ -128,7 +153,11 @@ func SessionsItemDelete(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	sessionx.Delete()
+	if err := configs.ORMDB().Delete(&sessionx).Error; err != nil {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte("404 - Not Found"))
+		return
+	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(sessionx))
 }
--- a/routers/tags.go
+++ b/routers/tags.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
@@ -16,9 +17,14 @@ func TagsGet(w http.ResponseWriter, r *http.Request) {
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	listview.List = models.QueryTags(listview.Page, listview.PageSize)
-	listview.Total = models.CountTags()
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+	var tag_list []models.Tag
+	db := configs.ORMDB()
+	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&tag_list)
+	for _, tag := range tag_list {
+		listview.List = append(listview.List, tag)
+	}
+	db.Model(&models.Tag{}).Count(&listview.Total)
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }

@@ -38,8 +44,8 @@ func TagsPost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// 創建標籤
-	var tag models.Tag
-	if err := tag.Create(form.Name); err != nil {
+	var tag models.Tag = models.Tag{Name: form.Name}
+	if err := configs.ORMDB().Create(&tag).Error; err != nil {
 		fmt.Println(err)
 		return
 	}
@@ -50,13 +56,8 @@ func TagsPost(w http.ResponseWriter, r *http.Request) {

 // 獲取標籤
 func TagsItemGet(w http.ResponseWriter, r *http.Request) {
-	var tag models.Tag
-	tag.ID = utils.ParamInt(mux.Vars(r)["id"], 0)
-	if tag.ID == 0 {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-	if err := tag.Get(); err != nil {
+	var tag models.Tag = models.Tag{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
+	if err := configs.ORMDB().First(&tag).Error; err != nil {
 		fmt.Println(err)
 		return
 	}
@@ -66,16 +67,6 @@ func TagsItemGet(w http.ResponseWriter, r *http.Request) {

 // 更新標籤
 func TagsItemPatch(w http.ResponseWriter, r *http.Request) {
-	var tag models.Tag
-	tag.ID = utils.ParamInt(mux.Vars(r)["id"], 0)
-	if tag.ID == 0 {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-	if err := tag.Get(); err != nil {
-		fmt.Println(err)
-		return
-	}
 	var form struct {
 		Name string `json:"name"`
 	}
@@ -89,7 +80,8 @@ func TagsItemPatch(w http.ResponseWriter, r *http.Request) {
 		fmt.Println(err)
 		return
 	}
-	if err := tag.Update(form.Name); err != nil {
+	var tag models.Tag = models.Tag{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
+	if err := configs.ORMDB().Model(&tag).Update("name", form.Name).Error; err != nil {
 		fmt.Println(err)
 		return
 	}
@@ -99,13 +91,8 @@ func TagsItemPatch(w http.ResponseWriter, r *http.Request) {

 // 刪除標籤
 func TagsItemDelete(w http.ResponseWriter, r *http.Request) {
-	var tag models.Tag
-	tag.ID = utils.ParamInt(mux.Vars(r)["id"], 0)
-	if tag.ID == 0 {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-	if err := tag.Delete(); err != nil {
+	var tag models.Tag = models.Tag{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
+	if err := configs.ORMDB().Delete(&tag).Error; err != nil {
 		fmt.Println(err)
 		return
 	}
--- a/routers/tasks.go
+++ b/routers/tasks.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"log"
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
@@ -17,9 +18,14 @@ func TasksGet(w http.ResponseWriter, r *http.Request) {
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	listview.List = models.QueryTasks(listview.Page, listview.PageSize)
-	listview.Total = models.CountTasks()
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+	var task_list []models.Task
+	db := configs.ORMDB()
+	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&task_list)
+	for _, task := range task_list {
+		listview.List = append(listview.List, task)
+	}
+	db.Model(&models.Task{}).Count(&listview.Total)
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }

@@ -35,7 +41,7 @@ func TasksPost(w http.ResponseWriter, r *http.Request) {
 		log.Println(err)
 		return
 	}
-	task.Create()
+	configs.ORMDB().Create(&task)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(task))
 }
@@ -44,8 +50,10 @@ func TasksItemGet(w http.ResponseWriter, r *http.Request) {
 	if r.Header.Get("Upgrade") == "websocket" {
 		vars := mux.Vars(r)
 		id, _ := strconv.Atoi(vars["id"])
-		task := models.QueryTask(id)
-		if task.ID == 0 {
+
+		var task models.Task = models.Task{ID: id}
+		if err := configs.ORMDB().First(&task, id).Error; err != nil {
+			log.Println(err)
 			w.WriteHeader(http.StatusNotFound)
 			return
 		}
@@ -63,12 +71,12 @@ func TasksItemGet(w http.ResponseWriter, r *http.Request) {
 				break
 			}
 			task.Status = string(message)
-			task.Update()
+			configs.ORMDB().Model(&task).Update("status", task.Status)
 		}
 		return
 	}
 	task := models.Task{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	task.Get()
+	configs.ORMDB().First(&task)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(task))
 }
@@ -86,18 +94,13 @@ func TasksItemPatch(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	task.ID = utils.ParamInt(mux.Vars(r)["id"], 0)
-	task.Update()
+	configs.ORMDB().Model(&task).Updates(task)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(task))
 }

 func TasksItemDelete(w http.ResponseWriter, r *http.Request) {
 	task := models.Task{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	task.Delete()
-	if task.ID == 0 {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-	task.Delete()
+	configs.ORMDB().Delete(&task)
 	w.WriteHeader(http.StatusNoContent)
 }
--- a/routers/users.go
+++ b/routers/users.go
@@ -1,13 +1,17 @@
 package routers

 import (
+	"crypto/md5"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
+	"time"

+	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 )

@@ -16,9 +20,14 @@ func UsersGet(w http.ResponseWriter, r *http.Request) {
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	listview.List = models.QueryUsers(listview.Page, listview.PageSize)
-	listview.Total = models.CountUsers()
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+	var user_list []models.User
+	db := configs.ORMDB()
+	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&user_list)
+	for _, user := range user_list {
+		listview.List = append(listview.List, user)
+	}
+	db.Model(&models.User{}).Count(&listview.Total)
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }

@@ -40,9 +49,22 @@ func UsersPost(w http.ResponseWriter, r *http.Request) {
 		return
 	}

+	if form.Name == "" || form.Email == "" || form.Password == "" {
+		fmt.Println("name, email, password cannot be empty")
+		return
+	}
+
 	// 創建用戶
-	var user models.User
-	if err := user.Create(form.Name, form.Email, form.Password); err != nil {
+	var slat string = uuid.New().String()
+	var user models.User = models.User{
+		Name:      form.Name,
+		Email:     form.Email,
+		Password:  fmt.Sprintf("%x", md5.Sum([]byte(form.Password+slat))),
+		Slat:      slat,
+		CreatedAt: time.Now().Format("2006-01-02 15:04:05"),
+		UpdatedAt: time.Now().Format("2006-01-02 15:04:05"),
+	}
+	if err := configs.ORMDB().Create(&user).Error; err != nil {
 		fmt.Println(err)
 		return
 	}
@@ -55,7 +77,7 @@ func UsersPost(w http.ResponseWriter, r *http.Request) {
 // 獲取用戶
 func UsersItemGet(w http.ResponseWriter, r *http.Request) {
 	user := models.User{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	user.Get()
+	configs.ORMDB().First(&user)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(user))
 }
@@ -63,8 +85,20 @@ func UsersItemGet(w http.ResponseWriter, r *http.Request) {
 // 更新用戶
 func UsersItemPatch(w http.ResponseWriter, r *http.Request) {
 	user := models.User{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	user.Get()
-	user.Update()
+	body, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer r.Body.Close()
+	if err = json.Unmarshal(body, &user); err != nil {
+		fmt.Println(err)
+		return
+	}
+	if err := configs.ORMDB().Save(&user).Error; err != nil {
+		fmt.Println(err)
+		return
+	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(user))
 }
@@ -72,8 +106,7 @@ func UsersItemPatch(w http.ResponseWriter, r *http.Request) {
 // 刪除用戶
 func UsersItemDelete(w http.ResponseWriter, r *http.Request) {
 	user := models.User{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	user.Get()
-	user.Delete()
+	configs.ORMDB().Delete(&user)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(user))
 }