From 974c3d6fc8fed0d450d5a2e9b715c3b813289207 Mon Sep 17 00:00:00 2001 From: "DESKTOP-4RNDQIC\\29019" <290198252@qq.com> Date: Sat, 23 Feb 2019 14:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/hanlder.go | 184 ++++++++++++------------- controller/mail/mail.go | 23 +++- main.go | 25 +++- model/model.go | 49 ++++++- vendor/golang.org/x/sys/unix/mkpost.go | 98 +++++++++++++ 5 files changed, 268 insertions(+), 111 deletions(-) create mode 100644 vendor/golang.org/x/sys/unix/mkpost.go diff --git a/controller/hanlder.go b/controller/hanlder.go index 012cf77..d4a7296 100644 --- a/controller/hanlder.go +++ b/controller/hanlder.go @@ -1,4 +1,5 @@ package controller + import ( "bytes" "crypto/md5" @@ -10,18 +11,19 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/tommy351/gin-sessions" "io" - "strconv" - "time" - "user/logs" "log" "math/rand" "net/http" "net/smtp" "regexp" + "strconv" "strings" - "user/redis" - "user/model" + "time" + "user/config" "user/db" + "user/logs" + "user/model" + "user/redis" ) type ReqSendEmailCode struct { @@ -117,99 +119,79 @@ func GetUser(c *gin.Context) { // @Param department_id query string false "name search by q" // @Param permission_type query string false "name search by q" // @Router /api/users [get] -func GetUsers(c *gin.Context) { +func Users(c *gin.Context) { var statuscode int var resp RespBase resp.Msg = "获取失败" resp.Status = 0 statuscode = 200 - defer func() { c.JSON(statuscode,resp) }() - //获取用户组信息 - var page int - var pageSize int - var displayname string - var department_id string - var permission_type string - - displayname = c.Query("displayname") - department_id = c.Query("department_id") - permission_type = c.Query("permission_type") - - if c.Query("page") == ""{ - page = 0 - }else { - var err error - page,err = strconv.Atoi(c.Query("page")) - if err != nil{ - logs.Error("error ato i ") - } - } - log.Println(pageSize,page) - if c.Query("pageSize") == ""{ - pageSize = 10 - }else { - var err error - pageSize,err = strconv.Atoi(c.Query("pageSize")) - if err != nil{ - logs.Error("error ato i ") - } - } - session := sessions.Get(c) - userinfo := session.Get("") - var users map[string] interface{} - e := json.Unmarshal([]byte(userinfo.(string)),&users) - if nil != e { + offset := c.Query("offset") + limit := c.Query("limit") + ioffset,e := strconv.Atoi(offset) + if nil != e{ logs.Error(e.Error()) - } - permission,ok := users["PermissionType"] - if !ok{ - logs.Error("error could not find permission_type") return } - // 部门组长只允许查看自己所在部门成员列表，且要过滤超级管理员 - if permission == 1 && department_id != ""{ - d ,_ := users["DepartmentId"] - department_id = d.(string) + ilimit,er := strconv.Atoi(limit) + if nil != er{ + logs.Error(e.Error()) + return } - respdata := make(map[string]interface{},1) - var usersinfo []model.Users - - if permission != 0{ - query := "select * from users " - if displayname != "" || department_id != "" ||permission_type != ""{ - query += " where " - } - if displayname != ""{ - query += fmt.Sprintf("display_name like '%%%s%%'",displayname) - } - if department_id != ""{ - query += fmt.Sprintf("and department_id = %s",department_id) - } - if permission_type != ""{ - query += fmt.Sprintf("and permission_type = %s ",permission_type) - } - query += "order by id ASC " - query += fmt.Sprintf("limit %d ",pageSize) - query += fmt.Sprintf(" offset %d ",pageSize*page) - - e := db.GetMysqlClient().Query2(query,&usersinfo) - if e != nil{ - log.Println(e.Error()) - } - respdata["rows"] = usersinfo - respdata["total"] = len(usersinfo) - respdata["page"] = page - respdata["pageSize"] = pageSize - } + dat := map[string] interface{}{} + users,all := model.GetUsers(int32(ilimit),int32(ioffset),"") + dat["users"] = users + dat["all"] = all resp.Msg = "OK" - resp.Data = respdata + resp.Data = dat } +// GetUsers godoc +// @Summary GetUsers +// @Description Get all user with query +// @Accept json +// @Produce json +// @Param page query int 1 "分页的页数" +// @Param pageSize query int 10 "name search by q" +// @Param displayname query string false "name search by q" +// @Param department_id query string false "name search by q" +// @Param permission_type query string false "name search by q" +// @Router /api/users [get] +func SerarchUsers(c *gin.Context) { + var statuscode int + var resp RespBase + + resp.Msg = "获取失败" + resp.Status = 0 + statuscode = 200 + defer func() { + c.JSON(statuscode,resp) + }() + offset := c.Query("offset") + limit := c.Query("limit") + username := c.PostForm("username") + ioffset,e := strconv.Atoi(offset) + if nil != e{ + logs.Error(e.Error()) + return + } + ilimit,er := strconv.Atoi(limit) + if nil != er{ + logs.Error(e.Error()) + return + } + + dat := map[string] interface{}{} + users,all := model.GetUsers(int32(ilimit),int32(ioffset),username) + dat["users"] = users + dat["all"] = all + resp.Msg = "OK" + resp.Data = dat +} func CreateVerify(length int32) string{ strAry := []byte{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; result := string("") @@ -304,11 +286,9 @@ func Login(c *gin.Context) { log.Println(err.Error()) } if req.RememberMe == 1{ - redis.Set(string(socketTokenMd5),string(sessionInfo),time.Second *2 * 24 * 3600 * 1000 ) - + config.RedisOne().Set(string(socketTokenMd5),string(sessionInfo),time.Second *2 * 24 * 3600 * 1000 ) }else { - redis.Set(string(socketTokenMd5),string(sessionInfo),time.Second *8 * 3600 * 1000 ) - + config.RedisOne().Set(string(socketTokenMd5),string(sessionInfo),time.Second *8 * 3600 * 1000 ) } //存储session session := sessions.Get(c) @@ -331,11 +311,11 @@ func Login(c *gin.Context) { resp.Status = 0 resp.Data = string(sessionInfo) }else { - statusCode = 422 + resp.Status = 422 resp.Msg = "用户密码不正确" } }else { - statusCode = 422 + resp.Status = 422 resp.Msg = "登录账号不存在，请重新输入" } } @@ -365,11 +345,10 @@ func Register(c *gin.Context) { log.Println(e.Error()) return } + userKey := fmt.Sprintf("user_%s_verify",req.EmailAdress) + verify := config.RedisOne().Get(userKey).Val() - session := sessions.Get(c) - email_code := session.Get(req.EmailAdress) - - if email_code != req.EmailCode{ + if verify != req.EmailCode{ resp.Msg = "验证码错误" resp.Status = 20 return @@ -384,13 +363,26 @@ func Register(c *gin.Context) { passwdmd5 := h.Sum(nil) strpassmd5 := ByteSliceToString(passwdmd5) user.UserPwd = strpassmd5 - user.UpdatedDate = time.Now().String() - user.CreatedDate = time.Now().String() + user.UpdatedDate = time.Now().Format("2006-01-02 15:04:05") + user.CreatedDate = time.Now().Format("2006-01-02 15:04:05") - n,er := db.GetMysqlClient().Insert("insert into users(user_name,user_pwd,created_date," + - "updated_date,display_name,email_address) values (?,?,?,?,?,?)", - user.UserName,user.UserPwd,user.CreatedDate,user.UpdatedDate, + var result []model.Users + + er := db.GetMysqlClient().Query2("select * from users where user_name = ?", + &result,req.UserName) + if nil != er{ + log.Println(er.Error()) + return + } + if len(result) > 0{ + resp.Msg = "失败，账号已经存在" + resp.Status = 20 + return + } + query := fmt.Sprintf("insert into users(user_name,user_pwd,created_date," + + "updated_date,display_name,email_address) values ('%s','%s','%s','%s','%s','%s') ",user.UserName,user.UserPwd,user.CreatedDate,user.UpdatedDate, user.DisplayName,user.EmailAddress) + n,er := db.GetMysqlClient().Insert(query) if n == 0 || n < 0{ statusCode = 422 logs.Error(er.Error()) diff --git a/controller/mail/mail.go b/controller/mail/mail.go index cbc8141..b5f5bd4 100644 --- a/controller/mail/mail.go +++ b/controller/mail/mail.go @@ -16,6 +16,7 @@ import ( "time" "user/controller" "user/config" + "user/db" ) type RespJson struct { @@ -62,9 +63,7 @@ type ReqSendEmailTpl struct { Generate bool `json:"generate"` } type ReqSendEmail struct { - Id int `json:"id"` - From string `json:"from"` - To string `json:"to"` + Email string `json:"email_address"` Content string `json:"content"` } func SendToMail(title, user, password, host, to, content string) error { @@ -249,6 +248,20 @@ func OnSendEmailCode(c *gin.Context) { resp.Msg = "ParaErr" return } + if req.Email != ""{ + type Count struct { + Count int32 `json:"count"` + } + cnt := []Count{} + query := fmt.Sprintf("select count(*) as count from users where users.email_address = %s",req.Email) + e := db.GetMysqlClient().Query2(query,&cnt) + if nil !=e { + log.Println(e.Error()) + return + } + }else { + return + } user := "c7458969@163.com" password := "caiyu123" host := "smtp.163.com:25" @@ -257,9 +270,9 @@ func OnSendEmailCode(c *gin.Context) { //发送 verCode := controller.CreateVerify(6) content := "您的验证码是" + verCode - userKey := fmt.Sprintf("user_%d_verify",req.Id) + userKey := fmt.Sprintf("user_%s_verify",req.Email) config.RedisOne().Set(userKey,verCode,time.Hour * 24) - e = SendToMail("后台管理系统验证码", user, password, host, req.To, content) + e = SendToMail("后台管理系统验证码", user, password, host, req.Email, content) if nil != e { log.Println(e.Error()) resp.Msg = "Error" diff --git a/main.go b/main.go index 337cb76..c4eddbe 100644 --- a/main.go +++ b/main.go @@ -7,6 +7,7 @@ import ( "strconv" "user/controller" "user/config" + "user/controller/mail" "user/db" "user/logs" ) @@ -19,6 +20,23 @@ func InitMysql() { db.Init() } } +func CORSMiddleware(c *gin.Context) { + ori := c.Request.Header.Get("Origin") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE") + c.Writer.Header().Set("Access-Control-Allow-Origin",ori) + log.Println(c.Request.Header.Get("Origin")) + c.Writer.Header().Set("Access-Control-Max-Age", "86400") + c.Writer.Header().Set("Access-Control-Allow-Headers", "X-Requested-With, Content-Type, Origin, Authorization, Accept, Client-Security-Token, Accept-Encoding, x-access-token") + c.Writer.Header().Set("Access-Control-Expose-Headers", "Content-Length") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + + if c.Request.Method == "OPTIONS" { + log.Println("OPTIONS") + c.AbortWithStatus(200) + } else { + c.Next() + } +} func main() { e := config.Init("user.yaml") @@ -35,6 +53,7 @@ func main() { r := gin.Default() store := sessions.NewCookieStore([]byte("secret123")) r.Use(sessions.Middleware("my_session", store)) + r.Use(CORSMiddleware) { /** 添加或修改用户 **/ r.POST("/api/user", controller.SetUser) @@ -43,15 +62,15 @@ func main() { /** 获取单独用户详情信息 methods(id) **/ r.GET("/api/user", controller.GetUser) /** 获取所有用户 **/ - r.GET("/api/users", controller.GetUsers) + r.GET("/api/users", controller.Users) + r.POST("/api/search_users", controller.SerarchUsers) /** 用户登录 **/ r.POST("/api/login", controller.Login) /** 用户注册 **/ r.POST("/api/register", controller.Register) /** 用户退出登陆 **/ r.GET("/api/logout", controller.Logout) - - r.POST("/api/email_code",controller.SendEmailCode) + r.POST("/api/verify",mail.OnSendEmailCode) } r.Run(":" + strconv.Itoa(config.GetPort())) } diff --git a/model/model.go b/model/model.go index 1f0eb70..182ee07 100644 --- a/model/model.go +++ b/model/model.go @@ -1,13 +1,48 @@ package model +import ( + "fmt" + "qiniupkg.com/x/log.v7" + "user/db" + "user/logs" +) + type Users struct { ID int64 `sql:"id" json:"id"` - UserName string `sql:"user_name" json:"UserName"` - UserPwd string `sql:"user_pwd" json:"UserPwd"` - CreatedDate string `sql:"created_date" json:"CreatedDate"` - UpdatedDate string `sql:"updated_date" json:"UpdatedDate"` - DisplayName string `sql:"display_name" json:"DisplayName"` - EmailAddress string `sql:"email_address" json:"EmailAddress"` + UserName string `sql:"user_name" json:"user_name"` + UserPwd string `sql:"user_pwd" json:"-"` + CreatedDate string `sql:"created_date" json:"created_date"` + UpdatedDate string `sql:"updated_date" json:"updated_date"` + DisplayName string `sql:"display_name" json:"display_name"` + EmailAddress string `sql:"email_address" json:"email_address"` Tel string `sql:"tel" json:"tel"` - Avatar string `sql:"avatar" json:"Avatar"` + Avatar string `sql:"avatar" json:"avatar"` } + +func GetUsers(limit int32,offsetPage int32,name string) ([]Users,int32){ + users := []Users{} + var query string + if name != ""{ + log.Println(name) + query = fmt.Sprintf("select * from users where user_name like '%s' limit %d offset %d","%%" + name + "%%",limit,offsetPage*limit) + log.Printf(query) + }else { + query = fmt.Sprintf("select * from users limit %d offset %d",limit,offsetPage*limit) + } + err := db.GetMysqlClient().Query2(query,&users) + if nil != err{ + logs.Error(err.Error()) + } + type Count struct { + Count int32 `sql:"count"` + } + cnts := []Count{} + query = fmt.Sprintf("select count(*) as count from users") + err = db.GetMysqlClient().Query2(query,&cnts) + if nil != err{ + logs.Error(err.Error()) + } + return users,cnts[0].Count +} + + diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go new file mode 100644 index 0000000..7e5c22c --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mkpost.go @@ -0,0 +1,98 @@ +// Copyright 2016 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +// mkpost processes the output of cgo -godefs to +// modify the generated types. It is used to clean up +// the sys API in an architecture specific manner. +// +// mkpost is run after cgo -godefs; see README.md. +package main + +import ( + "bytes" + "fmt" + "go/format" + "io/ioutil" + "log" + "os" + "regexp" +) + +func main() { + // Get the OS and architecture (using GOARCH_TARGET if it exists) + goos := os.Getenv("GOOS") + goarch := os.Getenv("GOARCH_TARGET") + if goarch == "" { + goarch = os.Getenv("GOARCH") + } + // Check that we are using the new build system if we should be. + if goos == "linux" && goarch != "sparc64" { + if os.Getenv("GOLANG_SYS_BUILD") != "docker" { + os.Stderr.WriteString("In the new build system, mkpost should not be called directly.\n") + os.Stderr.WriteString("See README.md\n") + os.Exit(1) + } + } + + b, err := ioutil.ReadAll(os.Stdin) + if err != nil { + log.Fatal(err) + } + + // Intentionally export __val fields in Fsid and Sigset_t + valRegex := regexp.MustCompile(`type (Fsid|Sigset_t) struct {(\s+)X__val(\s+\S+\s+)}`) + b = valRegex.ReplaceAll(b, []byte("type $1 struct {${2}Val$3}")) + + // If we have empty Ptrace structs, we should delete them. Only s390x emits + // nonempty Ptrace structs. + ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`) + b = ptraceRexexp.ReplaceAll(b, nil) + + // Replace the control_regs union with a blank identifier for now. + controlRegsRegex := regexp.MustCompile(`(Control_regs)\s+\[0\]uint64`) + b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64")) + + // Remove fields that are added by glibc + // Note that this is unstable as the identifers are private. + removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`) + b = removeFieldsRegex.ReplaceAll(b, []byte("_")) + + // Convert [65]int8 to [65]byte in Utsname members to simplify + // conversion to string; see golang.org/issue/20753 + convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`) + b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) + + // Remove spare fields (e.g. in Statx_t) + spareFieldsRegex := regexp.MustCompile(`X__spare\S*`) + b = spareFieldsRegex.ReplaceAll(b, []byte("_")) + + // Remove cgo padding fields + removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`) + b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_")) + + // Remove padding, hidden, or unused fields + removeFieldsRegex = regexp.MustCompile(`\b(X_\S+|Padding)`) + b = removeFieldsRegex.ReplaceAll(b, []byte("_")) + + // Remove the first line of warning from cgo + b = b[bytes.IndexByte(b, '\n')+1:] + // Modify the command in the header to include: + // mkpost, our own warning, and a build tag. + replacement := fmt.Sprintf(`$1 | go run mkpost.go +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s,%s`, goarch, goos) + cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`) + b = cgoCommandRegex.ReplaceAll(b, []byte(replacement)) + + // gofmt + b, err = format.Source(b) + if err != nil { + log.Fatal(err) + } + + os.Stdout.Write(b) +}