aa

controllers/user_controller.go

@@ -15,38 +15,6 @@ func RefreshCode(c *gin.Context) {
 	utils.Captcha(c, 4)
 }
 
-type GetUsersParam struct {
-	Name   string `json:"name" uri:"name"`       //用户名
-	UserID string `json:"user_id" uri:"user_id"` //用户名
-	Mobile string `json:"mobile" uri:"mobile"`   //用户名
-}
-
-//查询用户 GET
-func GetUsers(c *gin.Context) {
-	var (
-		err  error
-		user = &GetUsersParam{}
-	)
-	globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP())
-	if err = c.ShouldBindUri(&user); err != nil {
-		c.JSON(http.StatusOK, &CallBack{
-			Code: model.ErrCodeNormal,
-			Desc: err.Error(),
-		})
-		return
-	}
-	if tokenInfo := checkToken(c); tokenInfo == nil {
-		return
-	}
-	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetUsers(c, user.UserID, user.Name, user.Mobile)
-		return retVal, "", err
-	}) {
-		return
-	}
-	return
-}
-
 type UserParam struct {
 	Name     string `json:"name" form:"name" binding:"required"`         //用户名
 	Password string `json:"password" form:"password" binding:"required"` //密码，md5后的

dao/app_dao.go

@@ -1,17 +1,18 @@
 package dao
 
 import (
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-print/model"
 	"github.com/jmoiron/sqlx"
 )
 
 func GetApps(db *sqlx.DB, id int, userID, mobile string) (apps []*model.Apps, err error) {
-	var sqlParams []interface{}
 	sql := `
 		SELECT * 
 		  FROM apps 
-         WHERE 1 = 1
+         WHERE 1 = 1 AND deleted_at = ?
 	`
+	sqlParams := []interface{}{utils.DefaultTimeValue}
 	if id != 0 {
 		sql += " AND id = ?"
 		sqlParams = append(sqlParams, id)

dao/print_dao.go

@@ -34,7 +34,7 @@ func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnl
 		count    int
 	)
 	sqlCount := `
-		SELECT COUNT(*) count
+		SELECT COUNT(id) count
 	`
 	sql := `
 		SELECT *
@@ -97,7 +97,7 @@ func GetPrintMessagesPage(db *sqlx.DB, printNo, msgID, beginAt, endAt string, of
 		endTime = utils.Str2Time(endAt)
 	}
 	sqlCount := `
-		SELECT COUNT(*) count
+		SELECT COUNT(id) count
 	`
 	sql := `
 		SELECT *

dao/user_dao.go

@@ -1,17 +1,18 @@
 package dao
 
 import (
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-print/model"
 	"github.com/jmoiron/sqlx"
 )
 
 func GetUsers(db *sqlx.DB, userID, name, mobile string) (users []*model.User, err error) {
-	var sqlParams []interface{}
 	sql := `
 		SELECT * 
 		  FROM user 
-         WHERE 1 = 1
+         WHERE 1 = 1 AND deleted_at = ?
 	`
+	sqlParams := []interface{}{utils.DefaultTimeValue}
 	if name != "" {
 		sql += " AND name LIKE ?"
 		sqlParams = append(sqlParams, "%"+name+"%")
@@ -49,9 +50,9 @@ func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err
 	sql := `
 		SELECT * 
 		  FROM user 
-         WHERE name = ? AND password = ?
+         WHERE name = ? AND password = ? AND deleted_at = ?
 	`
-	sqlParams := []interface{}{name, password}
+	sqlParams := []interface{}{name, password, utils.DefaultTimeValue}
 	if err = db.Select(&users, sql, sqlParams...); err == nil {
 		return users[0], err
 	}
@@ -59,12 +60,12 @@ func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err
 }
 
 func GetMenus(db *sqlx.DB) (menus []*model.Menu, err error) {
-	var sqlParams []interface{}
 	sql := `
 		SELECT * 
 		  FROM menu 
-         WHERE 1 = 1
+         WHERE 1 = 1 AND delete_at = ?
 	`
+	sqlParams := []interface{}{utils.DefaultTimeValue}
 	if err = db.Select(&menus, sql, sqlParams...); err == nil {
 		return menus, err
 	}

routers/router.go

@@ -9,29 +9,28 @@ func Init(r *gin.Engine) {
 	v2 := r.Group("/v2")
 	//user
 	user := v2.Group("/user")
-	user.GET("/getUsers", controllers.GetUsers)
 	user.GET("/getTokenInfo", controllers.GetTokenInfo)
-	user.GET("/logout", controllers.Logout)
+	user.POST("/logout", controllers.Logout)
-	user.GET("/updateUser", controllers.UpdateUser)
+	user.POST("/updateUser", controllers.UpdateUser)
 	//app
 	app := v2.Group("/app")
 	app.GET("/getApps", controllers.GetApps)
-	app.GET("/addApp", controllers.AddApp)
+	app.POST("/addApp", controllers.AddApp)
-	app.GET("/delApp", controllers.DelApp)
+	app.POST("/delApp", controllers.DelApp)
 	//print
 	print := v2.Group("/print")
-	print.GET("/addPrinters", controllers.AddPrinters)
+	print.POST("/addPrinters", controllers.AddPrinters)
 	print.GET("/getPrinters", controllers.GetPrinters)
-	print.GET("/delPrinters", controllers.DelPrinters)
+	print.POST("/delPrinters", controllers.DelPrinters)
-	print.GET("/updatePrinter", controllers.UpdatePrinter)
+	print.POST("/updatePrinter", controllers.UpdatePrinter)
-	print.GET("/testPrint", controllers.TestPrint)
+	print.POST("/testPrint", controllers.TestPrint)
 	print.GET("/getPrintMessages", controllers.GetPrintMessages)
 
 	//v1是不需要token的
 	v1 := r.Group("v1")
 	userw := v1.Group("/user")
-	userw.GET("/login", controllers.Login)
+	userw.POST("/login", controllers.Login)
 	userw.GET("/refreshCode", controllers.RefreshCode)
-	userw.GET("/register", controllers.RegisterUser)
+	userw.POST("/register", controllers.RegisterUser)
 	userw.GET("/getMenu", controllers.GetMenu)
 }

services/print.go

@@ -24,6 +24,10 @@ func AddPrinters(c *gin.Context, tokenInfo *model.TokenInfo, appID int, printInf
 		return fmt.Errorf("未查询到此应用！app_id:%d", appID)
 	}
 	for _, v := range printInfos {
+		if v.PrintNo == "" {
+			errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v.PrintNo))
+			continue
+		}
 		printers, _ := dao.GetPrinters(db, appID, v.PrintNo)
 		if len(printers) > 0 {
 			errs = append(errs, fmt.Errorf("此打印机已被其他应用绑定！print_no :%s 。", v.PrintNo))
@@ -68,6 +72,10 @@ func DelPrinters(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printNos
 		return fmt.Errorf("未查询到此应用！app_id:%d", appID)
 	}
 	for _, v := range printNos {
+		if v == "" {
+			errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v))
+			continue
+		}
 		printers, _ := dao.GetPrinters(db, appID, v)
 		if len(printers) == 0 {
 			errs = append(errs, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, v))