liulei/jx-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-17 17:44:34 +08:00
parent 22d9045562
commit 5806a9fad8
8 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/app/wx_login.go
View File

@@ -39,7 +39,6 @@ func (a *Auth2Controller) Login(c *gin.Context) {
} }
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) { controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
globals.SugarLogger.Debugf("userParam =============params:%s", utils.Format4Output(params, false))
user, err := service.WxLogin(c, params) user, err := service.WxLogin(c, params)
if err != nil { if err != nil {
return nil, "", err return nil, "", err

2
controllers/app/wx_print.go
View File

@@ -3,7 +3,6 @@ package app
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/controllers" "git.rosy.net.cn/jx-print/controllers"
"git.rosy.net.cn/jx-print/globals" "git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model" "git.rosy.net.cn/jx-print/model"
@@ -157,7 +156,6 @@ func (p *Print) GetPrintIsUse(c *gin.Context) {
result["phone"] = phone result["phone"] = phone
result["err"] = err result["err"] = err
retVal = result retVal = result
globals.SugarLogger.Debugf("=====%s", utils.Format4Output(result, false))
return retVal, "", nil return retVal, "", nil
}) })
} }

2
controllers/app_controller.go
View File

@@ -43,7 +43,6 @@ func AddApp(c *gin.Context) {
Code: model.ErrCodeNormal, Code: model.ErrCodeNormal,
Desc: err.Error(), Desc: err.Error(),
}) })
globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
return return
} }
if tokenInfo = CheckToken(c); tokenInfo == nil { if tokenInfo = CheckToken(c); tokenInfo == nil {
@@ -72,7 +71,6 @@ func DelApp(c *gin.Context) {
Code: model.ErrCodeNormal, Code: model.ErrCodeNormal,
Desc: err.Error(), Desc: err.Error(),
}) })
globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
return return
} }
if tokenInfo = CheckToken(c); tokenInfo == nil { if tokenInfo = CheckToken(c); tokenInfo == nil {

1
controllers/callback_controller.go
View File

@@ -22,7 +22,6 @@ func (t *CallbackController) Msg(c *gin.Context) {
func (t *CallbackController) TlPayCallback(c *gin.Context) { func (t *CallbackController) TlPayCallback(c *gin.Context) {
data, _ := ioutil.ReadAll(c.Request.Body) data, _ := ioutil.ReadAll(c.Request.Body)
globals.SugarLogger.Debugf("TlPayCallback msg: %v", string(data))
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data)) c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
if call, err := api.TLpayAPI.GetCallbackMsg(c.Request); err == nil { if call, err := api.TLpayAPI.GetCallbackMsg(c.Request); err == nil {
globals.SugarLogger.Debugf("tonglianapi callback callbackResponse:%s", utils.Format4Output(call, true)) globals.SugarLogger.Debugf("tonglianapi callback callbackResponse:%s", utils.Format4Output(call, true))

8
routers/v2_router.go
View File

@@ -46,8 +46,8 @@ func InitV2System(v2 *gin.RouterGroup) {
edition.POST("/selectEditionAddress", appCont.PrintEditionController.SelectEditionAddress) edition.POST("/selectEditionAddress", appCont.PrintEditionController.SelectEditionAddress)
// notice 广告和通知消息 // notice 广告和通知消息
notice := v2.Group("/notice") notice := v2.Group("/notice")
notice.POST("/addEditionAddress", appCont.PrintNoticeController.AddNoticeAddress) notice.POST("/addNoticeAddress", appCont.PrintNoticeController.AddNoticeAddress)
notice.POST("/updateEditionAddress", appCont.PrintNoticeController.UpdateNoticeAddress) notice.POST("/updateNoticeAddress", appCont.PrintNoticeController.UpdateNoticeAddress)
notice.POST("/deleteEditionAddress", appCont.PrintNoticeController.DeleteNoticeAddress) notice.POST("/deleteNoticeAddress", appCont.PrintNoticeController.DeleteNoticeAddress)
notice.POST("/selectEditionAddress", appCont.PrintNoticeController.SelectNoticeAddress) notice.POST("/selectNoticeAddress", appCont.PrintNoticeController.SelectNoticeAddress)
} }

2
services/print_server/app_server/wx_login.go
View File

@@ -28,7 +28,6 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, param *wxLogin.WxLoginReq) (*model
if err != nil { if err != nil {
return nil, err return nil, err
} }
globals.SugarLogger.Debugf("userParam =============:%s", utils.Format4Output(param, false))
// 检查用户是否存在 // 检查用户是否存在
users, err := dao.GetUsers(globals.GetDB(), "", "", param.Phone, "") users, err := dao.GetUsers(globals.GetDB(), "", "", param.Phone, "")
@@ -82,7 +81,6 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, param *wxLogin.WxLoginReq) (*model
users[0].LastOperator = users[0].Name users[0].LastOperator = users[0].Name
users[0].LastLoginIP = ctx.ClientIP() users[0].LastLoginIP = ctx.ClientIP()
if err := dao.UpdateUserWx(users[0], []string{"updated_at", "last_operator", "name", "avatar", "last_login_ip", "open_id", "union_id"}); err != nil { if err := dao.UpdateUserWx(users[0], []string{"updated_at", "last_operator", "name", "avatar", "last_login_ip", "open_id", "union_id"}); err != nil {
globals.SugarLogger.Debugf("====err:%s", err.Error())
return nil, err return nil, err
} }
} else { } else {

10
services/print_server/app_server/wx_print.go
View File

@@ -132,7 +132,6 @@ func GetPrintIsUse(printNo string) (bool, string, error) {
func DelPrinters(appID int, tokenInfo *model.TokenInfo, printNos string) (err error) { func DelPrinters(appID int, tokenInfo *model.TokenInfo, printNos string) (err error) {
var ( var (
db = globals.GetDB() db = globals.GetDB()
errs []error
now = time.Now() now = time.Now()
) )
if len(printNos) > 50 { if len(printNos) > 50 {
@@ -143,20 +142,17 @@ func DelPrinters(appID int, tokenInfo *model.TokenInfo, printNos string) (err er
} }
printers, _ := dao.GetPrinters(db, appID, printNos, 0, 0, 0) printers, _ := dao.GetPrinters(db, appID, printNos, 0, 0, 0)
if len(printers) == 0 { if len(printers) == 0 {
errs = append(errs, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNos)) return fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNos)
} }
if printers[0].UserId != tokenInfo.User.UserID { if printers[0].UserId != tokenInfo.User.UserID {
errs = append(errs, fmt.Errorf("该打印机不属于此用户 :%s 。", printNos)) return fmt.Errorf("该打印机不属于此用户 :%s 。", printNos)
} }
printer := printers[0] printer := printers[0]
printer.DeletedAt = &now printer.DeletedAt = &now
printer.LastOperator = tokenInfo.User.Name printer.LastOperator = tokenInfo.User.Name
if err = dao.Update(db, printer, model.FieldLastOperator, model.FieldDeletedAt); err != nil { if err = dao.Update(db, printer, model.FieldLastOperator, model.FieldDeletedAt); err != nil {
errs = append(errs, err) return err
}
if len(errs) > 0 {
err = putils.BuildErr(errs)
} }
return err return err
} }

22
services/print_server/print.go
View File

@@ -153,17 +153,17 @@ func TestPrint(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printNo st
now = time.Now() now = time.Now()
) )
msgID = now.Format("20060102150405") + "_" + putils.RandStringBytesWithNumber(8) msgID = now.Format("20060102150405") + "_" + putils.RandStringBytesWithNumber(8)
apps, err := dao.GetApps(db, appID, tokenInfo.User.UserID, "") //apps, err := dao.GetApps(db, appID, tokenInfo.User.UserID, "")
if err != nil { //if err != nil {
return "", err // return "", err
} //}
if len(apps) == 0 { //if len(apps) == 0 {
return "", fmt.Errorf("未查询到此应用！app_id:%d", appID) // return "", fmt.Errorf("未查询到此应用！app_id:%d", appID)
} //}
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0) //printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
if len(printers) == 0 { //if len(printers) == 0 {
return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo) // return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
} //}
printMsg := &model.PrintMsg{ printMsg := &model.PrintMsg{
CreatedAt: &now, CreatedAt: &now,
UpdatedAt: &now, UpdatedAt: &now,