From b71a5c518923eb1d373a301a34ecb54f1fd1d2fc Mon Sep 17 00:00:00 2001 From: taoshihan1991 <630892807@qq.com> Date: Wed, 1 Jul 2020 19:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=9C=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/kefu.go | 8 +++++ models/models.go | 8 ++++- models/users.go | 16 +++++---- models/visitors.go | 4 +-- server.go | 1 + static/html/setting_bottom.html | 56 ++++++++++++++++++------------ static/html/setting_kefu_list.html | 28 ++++++++++++++- 7 files changed, 87 insertions(+), 34 deletions(-) diff --git a/controller/kefu.go b/controller/kefu.go index 0b54f13..a06417e 100644 --- a/controller/kefu.go +++ b/controller/kefu.go @@ -18,3 +18,11 @@ func GetKefuInfo(c *gin.Context){ "result":info, }) } +func GetKefuList(c *gin.Context){ + users:=models.FindUsers() + c.JSON(200, gin.H{ + "code": 200, + "msg": "获取成功", + "result":users, + }) +} diff --git a/models/models.go b/models/models.go index 516e882..d510eca 100644 --- a/models/models.go +++ b/models/models.go @@ -4,9 +4,15 @@ import ( "fmt" "github.com/jinzhu/gorm" "github.com/taoshihan1991/imaptool/config" + "time" ) var DB *gorm.DB - +type Model struct { + ID uint `gorm:"primary_key" json:"id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + DeletedAt *time.Time `sql:"index" json:"deleted_at"` +} func init(){ mysqlInfo:=config.GetMysql() dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=True&loc=Local", mysqlInfo["Username"], mysqlInfo["Password"], mysqlInfo["Server"], mysqlInfo["Port"], mysqlInfo["Database"]) diff --git a/models/users.go b/models/users.go index af1fb4c..72fa747 100644 --- a/models/users.go +++ b/models/users.go @@ -1,15 +1,14 @@ package models import ( - "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/mysql" ) type User struct { - gorm.Model - Name string - Password string - Nickname string - Avator string + Model + Name string `json:"name"` + Password string `json:"password"` + Nickname string `json:"nickname"` + Avator string `json:"avator"` } func CreateUser(name string,password string){ user:=&User{ @@ -27,4 +26,9 @@ func FindUserById(id interface{})User{ var user User DB.Where("id = ?", id).First(&user) return user +} +func FindUsers()[]User{ + var users []User + DB.Order("id desc").Find(&users) + return users } \ No newline at end of file diff --git a/models/visitors.go b/models/visitors.go index 3945533..38fa4be 100644 --- a/models/visitors.go +++ b/models/visitors.go @@ -1,9 +1,7 @@ package models -import "github.com/jinzhu/gorm" - type Visitor struct { - gorm.Model + Model Name string `json:"name"` Avator string `json:"avator"` SourceIp string `json:"source_ip"` diff --git a/server.go b/server.go index 8b6249e..3b55722 100644 --- a/server.go +++ b/server.go @@ -43,6 +43,7 @@ func main() { engine.GET("/chat_server", controller.NewChatServer) //获取客服信息 engine.GET("/kefuinfo",middleware.JwtApiMiddleware, controller.GetKefuInfo) + engine.GET("/kefulist",middleware.JwtApiMiddleware, controller.GetKefuList) //设置页 engine.GET("/setting", tmpl.PageSetting) //设置mysql diff --git a/static/html/setting_bottom.html b/static/html/setting_bottom.html index 1de3d66..8451445 100644 --- a/static/html/setting_bottom.html +++ b/static/html/setting_bottom.html @@ -37,7 +37,7 @@ { required: true, message: '请输入密码', trigger: 'blur' }, ], }, - + kefuList:[], }, methods: { //提交表单 @@ -117,32 +117,42 @@ initInfo(){ let _this=this; if(ACTION=="setting_mysql"){ - $.ajax({ - type:"get", - url:"/mysql", - headers:{ - "token":localStorage.getItem("token") - }, - success: function(data) { - if(data.result!=null){ - _this.mysql.username=data.result.Username; - _this.mysql.password=data.result.Password; - _this.mysql.database=data.result.Database; - _this.mysql.server=data.result.Server; - _this.mysql.port=data.result.Port; - } - if(data.code!=200){ - _this.$message({ - message: data.msg, - type: 'error' - }); - } - _this.fullscreenLoading=false; - } + this.getAjax("/mysql",{},function(result){ + _this.mysql.username=result.Username; + _this.mysql.password=result.Password; + _this.mysql.database=result.Database; + _this.mysql.server=result.Server; + _this.mysql.port=result.Port; + }); + } + if(ACTION=="setting_kefu_list"){ + this.getAjax("/kefulist",{},function(result){ + _this.kefuList=result; }); } + }, + getAjax(url,params,callback){ + let _this=this; + $.ajax({ + type: "get", + url: url, + headers: { + "token": localStorage.getItem("token") + }, + success: function(data) { + if(data.code!=200){ + _this.$message({ + message: data.msg, + type: 'error' + }); + }else if(data.result!=null){ + callback(data.result); + } + _this.fullscreenLoading=false + } + }); } }, created: function () { diff --git a/static/html/setting_kefu_list.html b/static/html/setting_kefu_list.html index f7e1643..6cdb4f4 100644 --- a/static/html/setting_kefu_list.html +++ b/static/html/setting_kefu_list.html @@ -7,7 +7,33 @@ - ss + + + + + + + + + + + +