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

支付

Browse Source
This commit is contained in:
suyl
2021-07-23 14:11:59 +08:00
parent 215bf52530
commit 5d6e5582aa
16 changed files with 166 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/callback_controller.go
View File

@@ -1,8 +1,10 @@
package controllers
import (
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/services"
"github.com/gin-gonic/gin"
"io/ioutil"
)
type CallbackController struct {
@@ -15,3 +17,8 @@ func (t *CallbackController) Msg(c *gin.Context) {
})
}
}
func (t *CallbackController) TlPayCallback(c *gin.Context) {
data, _ := ioutil.ReadAll(c.Request.Body)
globals.SugarLogger.Debugf("TlPayCallback msg: %v", string(data))
}

10
controllers/controller.go
View File

@@ -5,8 +5,8 @@ import (
"fmt"
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/putils"
"git.rosy.net.cn/jx-print/services"
"git.rosy.net.cn/jx-print/utils"
"github.com/dchest/captcha"
"github.com/gin-gonic/gin"
"net/http"
@@ -44,7 +44,7 @@ func checkToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
tokenInfo.Token = cookie.Value
}
globals.SugarLogger.Debugf("checkToken token: %v", tokenInfo.Token)
if tokenMap = utils.GetKey(tokenInfo.Token).(map[string]interface{}); tokenMap == nil {
if tokenMap = putils.GetKey(tokenInfo.Token).(map[string]interface{}); tokenMap == nil {
err = fmt.Errorf("token过期或无效，请重新登录！")
c.JSON(http.StatusOK, &CallBack{
Desc: err.Error(),
@@ -63,7 +63,7 @@ func checkToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
})
return nil
}
globals.SugarLogger.Debugf("checkToken user: %v", utils.Format4Output(user, true))
globals.SugarLogger.Debugf("checkToken user: %v", putils.Format4Output(user, true))
}
return tokenInfo
}
@@ -106,8 +106,8 @@ func callFunc(c *gin.Context, worker func() (retVal interface{}, errCode string,
func captchaVerify(c *gin.Context, code string) bool {
//session := sessions.Default(c)
if captchaId := utils.GetKey(c.ClientIP() + model.SessionKey).(string); captchaId != "" {
utils.DelKey(c.ClientIP() + model.SessionKey)
if captchaId := putils.GetKey(c.ClientIP() + model.SessionKey).(string); captchaId != "" {
putils.DelKey(c.ClientIP() + model.SessionKey)
if captcha.VerifyString(captchaId, code) {
return true
} else {

3
controllers/order_controller.go
View File

@@ -2,6 +2,7 @@ package controllers
import (
"git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/services"
"github.com/gin-gonic/gin"
)
@@ -24,6 +25,7 @@ func CreateOrder(c *gin.Context) {
return
}
if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = services.CreateOrder(tokenInfo, param.OrderType, param.Origin, param.ThingID, param.TypeID)
return retVal, "", err
}) {
return
@@ -48,6 +50,7 @@ func Pay(c *gin.Context) {
return
}
if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = services.Pay(tokenInfo, param.OrderID, param.PayType, param.VendorPayType)
return retVal, "", err
}) {
return

6
controllers/print_controller.go
View File

@@ -2,8 +2,8 @@ package controllers
import (
"git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/putils"
"git.rosy.net.cn/jx-print/services"
"git.rosy.net.cn/jx-print/utils"
"github.com/gin-gonic/gin"
)
@@ -25,7 +25,7 @@ func AddPrinters(c *gin.Context) {
if tokenInfo = checkToken(c); tokenInfo == nil {
return
}
if err = utils.UnmarshalUseNumber([]byte(param.Prints), &printInfos); err != nil {
if err = putils.UnmarshalUseNumber([]byte(param.Prints), &printInfos); err != nil {
buildErrJson(c, err)
return
}
@@ -87,7 +87,7 @@ func DelPrinters(c *gin.Context) {
if tokenInfo = checkToken(c); tokenInfo == nil {
return
}
if err = utils.UnmarshalUseNumber([]byte(param.PrintNos), &printNos); err != nil {
if err = putils.UnmarshalUseNumber([]byte(param.PrintNos), &printNos); err != nil {
buildErrJson(c, err)
return
}

4
controllers/user_controller.go
View File

@@ -4,15 +4,15 @@ import (
"encoding/json"
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/putils"
"git.rosy.net.cn/jx-print/services"
"git.rosy.net.cn/jx-print/utils"
"github.com/gin-gonic/gin"
"net/http"
)
//刷新验证码 POST
func RefreshCode(c *gin.Context) {
utils.Captcha(c, 4)
putils.Captcha(c, 4)
}
type UserParam struct {