Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

models/sbyj.go

@@ -314,6 +314,7 @@ func (r *MyTradegoodsdeliveryoffline) buildSql() string {
 	sqlId.FormatParam(r.USERID)
 	// sqlId.AndEx("t.DELIVERYSTATUS", r.DELIVERYSTATUS, r.DELIVERYSTATUS > 0)
 	sqlId.JoinEx(r.Status != "", fmt.Sprintf(" AND t.DELIVERYSTATUS IN (%v)", r.Status))
+	sqlId.OrderByDesc("t.deliveryorderid")
 
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()

token/token.go

@@ -83,7 +83,7 @@ func Auth() gin.HandlerFunc {
 		token := c.GetHeader("Authorization")
 		if token == "" {
 			// Token缺失
-			code = e.ERROR_AUTH_CHECK_TOKEN_MISSING
+			code = e.ERROR_AUTH_CHECK_TOKEN_FAIL
 		} else {
 			// 判断是否新接入Token
 			newLoginID := c.GetHeader("LoginID")
@@ -156,7 +156,7 @@ func AuthByHsby() gin.HandlerFunc {
 		token := c.GetHeader("Authorization")
 		if token == "" {
 			// Token缺失
-			code = e.ERROR_AUTH_CHECK_TOKEN_MISSING
+			code = e.ERROR_AUTH_CHECK_TOKEN_FAIL
 		} else {
 			// Token带下划线的走正常鉴权
 			if strings.Contains(token, "_") {
@@ -200,7 +200,7 @@ func realToken(c *gin.Context) {
 	token := c.GetHeader("Authorization")
 	if token == "" {
 		// Token缺失
-		code = e.ERROR_AUTH_CHECK_TOKEN_MISSING
+		code = e.ERROR_AUTH_CHECK_TOKEN_FAIL
 	} else {
 		// 获取loginid
 		s := strings.Split(token, "_")