|
@@ -9,6 +9,7 @@ import (
|
|
|
"eta/eta_mini_ht_api/common/exception"
|
|
|
"eta/eta_mini_ht_api/common/http"
|
|
|
"eta/eta_mini_ht_api/common/utils/auth"
|
|
|
+ "fmt"
|
|
|
"github.com/beego/beego/v2/server/web"
|
|
|
"net/url"
|
|
|
)
|
|
@@ -47,15 +48,7 @@ func (b *BaseController) FailResponse(errInfo error, msg string) {
|
|
|
ErrMsg: etaError.ErrorMsg,
|
|
|
ErrCode: etaError.ErrorCode,
|
|
|
Data: nil}
|
|
|
- content, err := json.Marshal(retData)
|
|
|
- if err != nil {
|
|
|
- logger.Error("加密失败")
|
|
|
- } else {
|
|
|
- if htConfig.NeedEncode() {
|
|
|
- content = auth.DesBase64Encrypt(content, htConfig.GetDesCode())
|
|
|
- }
|
|
|
- }
|
|
|
- b.Data["json"] = content
|
|
|
+ b.Data["json"] = retData
|
|
|
b.ServeJSON()
|
|
|
}
|
|
|
|
|
@@ -70,15 +63,8 @@ func (b *BaseController) JsonResult(status int, errCode int, errMsg string, msg
|
|
|
Success: success}
|
|
|
|
|
|
b.Ctx.Output.SetStatus(status)
|
|
|
- content, err := json.Marshal(retData)
|
|
|
- if err != nil {
|
|
|
- logger.Error("加密失败")
|
|
|
- } else {
|
|
|
- if htConfig.NeedEncode() {
|
|
|
- content = auth.DesBase64Encrypt(content, htConfig.GetDesCode())
|
|
|
- }
|
|
|
- }
|
|
|
- b.Data["json"] = content
|
|
|
+
|
|
|
+ b.Data["json"] = retData
|
|
|
b.ServeJSON()
|
|
|
}
|
|
|
|
|
@@ -142,7 +128,16 @@ func (b *BaseController) Finish() {
|
|
|
logger.Info("apiRequest:[uri:%s, resData:%s, ip:%s]", b.Ctx.Input.URI(), baseRes.Data)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ content, err := json.Marshal(baseRes)
|
|
|
+ if err != nil {
|
|
|
+ logger.Error("加密失败")
|
|
|
+ } else {
|
|
|
+ if htConfig.NeedEncode() {
|
|
|
+ content = auth.DesBase64Encrypt(content, htConfig.GetDesCode())
|
|
|
+ }
|
|
|
+ }
|
|
|
+ fmt.Printf("%s", content)
|
|
|
+ b.Data["json"] = content
|
|
|
}
|
|
|
|
|
|
type RequestInfo struct {
|