From 5ec678fa2801285e7ac44e56a2bc92f718efd637 Mon Sep 17 00:00:00 2001
From: Gucheng Wang <nomeguy@qq.com>
Date: Sun, 7 Nov 2021 17:20:15 +0800
Subject: [PATCH] Improve record's User field.

---
 controllers/auth.go | 6 +++---
 object/record.go    | 4 ++--
 routers/record.go   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/controllers/auth.go b/controllers/auth.go
index 99fc01e3..675d7dc2 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -197,7 +197,7 @@ func (c *ApiController) Login() {
 
 			record := object.NewRecord(c.Ctx)
 			record.Organization = application.Organization
-			record.Username = user.Name
+			record.User = user.Name
 			object.AddRecord(record)
 		}
 	} else if form.Provider != "" {
@@ -261,7 +261,7 @@ func (c *ApiController) Login() {
 
 				record := object.NewRecord(c.Ctx)
 				record.Organization = application.Organization
-				record.Username = user.Name
+				record.User = user.Name
 				object.AddRecord(record)
 			} else {
 				// Sign up via OAuth
@@ -306,7 +306,7 @@ func (c *ApiController) Login() {
 
 				record := object.NewRecord(c.Ctx)
 				record.Organization = application.Organization
-				record.Username = user.Name
+				record.User = user.Name
 				object.AddRecord(record)
 			}
 			//resp = &Response{Status: "ok", Msg: "", Data: res}
diff --git a/object/record.go b/object/record.go
index dc27015b..bc9ada48 100644
--- a/object/record.go
+++ b/object/record.go
@@ -27,7 +27,7 @@ type Record struct {
 	ClientIp     string `xorm:"varchar(100)" json:"clientIp"`
 	Timestamp    string `xorm:"varchar(100)" json:"timestamp"`
 	Organization string `xorm:"varchar(100)" json:"organization"`
-	Username     string `xorm:"varchar(100)" json:"username"`
+	User         string `xorm:"varchar(100)" json:"user"`
 	RequestUri   string `xorm:"varchar(1000)" json:"requestUri"`
 	Action       string `xorm:"varchar(1000)" json:"action"`
 }
@@ -40,7 +40,7 @@ func NewRecord(ctx *context.Context) *Record {
 		ClientIp:     ip,
 		Timestamp:    util.GetCurrentTime(),
 		RequestUri:   ctx.Request.RequestURI,
-		Username:     "",
+		User:         "",
 		Organization: "",
 		Action:       action,
 	}
diff --git a/routers/record.go b/routers/record.go
index 1e9ad2f5..09beb19d 100644
--- a/routers/record.go
+++ b/routers/record.go
@@ -62,7 +62,7 @@ func RecordMessage(ctx *context.Context) {
 
 	userId := getUser(ctx)
 	if userId != "" {
-		record.Organization, record.Username = util.GetOwnerAndNameFromId(userId)
+		record.Organization, record.User = util.GetOwnerAndNameFromId(userId)
 	}
 
 	object.AddRecord(record)