Merge remote-tracking branch 'fred/main'

Author: Yiffyi

api.go

@@ -227,7 +227,7 @@ func (s *ApiServer) handleCodepayCreateHelper(sessionId string, w http.ResponseW
 	if err != nil {
 		// print error
 		slog.Error("failed to generate qr code", "error", err)
-		resBuf, err := json.MarshalIndent(map[string]interface{}{
+		resBuf, err := json.MarshalIndent(map[string]any{
 			"success": false,
 			"message": "failed to generate qr code: server internal error",
 		}, "", "    ")
@@ -319,12 +319,12 @@ func (s *ApiServer) handleCodepayQueryHelper(sessionId string, w http.ResponseWr
 		return
 	}
 
-	var response map[string]interface{}
+	var response map[string]any
 	// check if monDealCur exists
 	if _, ok := res["monDealCur"]; ok {
 		// monDealCur exists, it's a completed deal
 		delete(codepayInstances, code)
-		response = map[string]interface{}{
+		response = map[string]any{
 			"status":  1,
 			"message": "payment completed",
 			"money":   res["monDealCur"],
@@ -335,13 +335,13 @@ func (s *ApiServer) handleCodepayQueryHelper(sessionId string, w http.ResponseWr
 		if time.Now().Unix()-codepay.Creation > 30 {
 			// 30s limit exceeded, remove the codepay instance
 			delete(codepayInstances, code)
-			response = map[string]interface{}{
+			response = map[string]any{
 				"status":  2,
 				"message": "payment code expired",
 			}
 		} else {
 			// 30s limit not exceeded, keep the codepay instance
-			response = map[string]interface{}{
+			response = map[string]any{
 				"status":  0,
 				"message": "pending",
 			}
@@ -388,6 +388,63 @@ func (s *ApiServer) handleCodepayQueryPath(w http.ResponseWriter, r *http.Reques
 	s.handleCodepayQueryHelper(sessionId, w, r)
 }
 
+func (s *ApiServer) handleRecentTransactions(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	if r.Method == http.MethodOptions {
+		return
+	}
+
+	vars := mux.Vars(r)
+	sessionId := vars["sessionId"]
+	if sessionId == "" {
+		http.Error(w, "sessionId required in path", http.StatusBadRequest)
+		return
+	}
+
+	user := s.cfg.SelectUserFromSessionId(sessionId)
+	if user == nil {
+		http.Error(w, "user with sessionId="+sessionId+" not found", http.StatusNotFound)
+		return
+	}
+
+	_, transactions, err := xfb.CardQuerynoPage(user.SessionId, user.YmUserId, time.Now())
+	if err != nil {
+		http.Error(w, "unable to fetch recent transactions: "+err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Limit to at most 3 transactions
+	if len(transactions) > 3 {
+		transactions = transactions[len(transactions)-3:]
+	}
+
+	resBuf, err := json.MarshalIndent(transactions, "", "    ")
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	w.Write(resBuf)
+}
+
+func (s *ApiServer) handleRecentTransactionsPath(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	if r.Method == http.MethodOptions {
+		return
+	}
+
+	vars := mux.Vars(r)
+	sessionId := vars["sessionId"]
+	if sessionId == "" {
+		http.Error(w, "sessionId required in path", http.StatusBadRequest)
+		return
+	}
+
+	s.handleRecentTransactions(w, r)
+}
+
 func CreateApiServer(cfg *Config) *mux.Router {
 	r := mux.NewRouter()
 	s := &ApiServer{
@@ -405,10 +462,12 @@ func CreateApiServer(cfg *Config) *mux.Router {
 	// Codepay endpoints
 	r.HandleFunc("/api/v1/codepay/create", s.handleCodepayCreate).Methods(http.MethodPost, http.MethodOptions)
 	r.HandleFunc("/api/v1/codepay/query", s.handleCodepayQuery).Methods(http.MethodGet, http.MethodOptions)
+	r.HandleFunc("/api/v1/codepay/recentTransactions", s.handleRecentTransactions).Methods(http.MethodGet, http.MethodOptions)
 
 	// Codepay endpoints with sessionId embedded in path
 	r.HandleFunc("/api/v1/codepay/{sessionId}/create", s.handleCodepayCreatePath).Methods(http.MethodGet, http.MethodPost, http.MethodOptions)
 	r.HandleFunc("/api/v1/codepay/{sessionId}/query", s.handleCodepayQueryPath).Methods(http.MethodGet, http.MethodOptions)
+	r.HandleFunc("/api/v1/codepay/{sessionId}/recentTransactions", s.handleRecentTransactionsPath).Methods(http.MethodGet, http.MethodOptions)
 
 	r.Use(mux.CORSMethodMiddleware(r))
 	return r

cmd/main/hello.go

@@ -80,18 +80,18 @@ func sendNotify(key string, t *xfb.Trans) error {
 		return nil
 	}
 	bot := notification.WeComBot{Key: key}
-	msg := map[string]interface{}{
+	msg := map[string]any{
 		"msgtype": "template_card",
-		"template_card": map[string]interface{}{
+		"template_card": map[string]any{
 			"card_type": "text_notice",
-			"source": map[string]interface{}{
+			"source": map[string]any{
 				"desc": "校园卡账单",
 			},
-			"main_title": map[string]interface{}{
+			"main_title": map[string]any{
 				"title": t.Address,
 				"desc":  t.FeeName,
 			},
-			"emphasis_content": map[string]interface{}{
+			"emphasis_content": map[string]any{
 				"title": formatExpense(t.Money),
 			},
 			"horizontal_content_list": []map[string]string{
@@ -112,7 +112,7 @@ func sendNotify(key string, t *xfb.Trans) error {
 					"value":   t.Time,
 				},
 			},
-			"card_action": map[string]interface{}{
+			"card_action": map[string]any{
 				"type": 1,
 				"url":  cfg.AuthLocalUrl,
 			},
@@ -126,14 +126,14 @@ func sendError(key string, err error, u *xfbbroker.User) error {
 		return nil
 	}
 	bot := notification.WeComBot{Key: key}
-	msg := map[string]interface{}{
+	msg := map[string]any{
 		"msgtype": "template_card",
-		"template_card": map[string]interface{}{
+		"template_card": map[string]any{
 			"card_type": "text_notice",
-			"source": map[string]interface{}{
+			"source": map[string]any{
 				"desc": "校园卡账单",
 			},
-			"main_title": map[string]interface{}{
+			"main_title": map[string]any{
 				"title": "请求错误",
 				"desc":  u.Name,
 			},
@@ -144,7 +144,7 @@ func sendError(key string, err error, u *xfbbroker.User) error {
 					"value":   u.YmUserId,
 				},
 			},
-			"card_action": map[string]interface{}{
+			"card_action": map[string]any{
 				"type": 1,
 				"url":  cfg.AuthLocalUrl,
 			},

xfb/app.go

@@ -1,7 +1,7 @@
 package xfb
 
 // func GetThirdUserAuthorize(ymToken, ymUserId string) {
-// 	PostJSON(XfbApp+"/app/login/getThirdUserAuthorize", "", map[string]interface{}{
+// 	PostJSON(XfbApp+"/app/login/getThirdUserAuthorize", "", map[string]any{
 // 		"schoolCode": "20090820",
 // 		"platform":   "WECHAT_H5",
 // 		"ymToken":    ymToken,

xfb/codepay.go

@@ -1,15 +1,10 @@
 package xfb
 
 import (
-	"crypto/tls"
-	"encoding/json"
 	"fmt"
 	"image/png"
-	"io"
-	"net/http"
 	"net/url"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/skip2/go-qrcode"
@@ -23,57 +18,29 @@ const (
 type QrPayCode struct {
 	QRCode    string
 	SessionID string
-	client    *http.Client
 	Creation  int64
 }
 
 func GenerateQrPayCode(sessionId string) (*QrPayCode, error) {
-	client := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		},
-	}
-
 	form := url.Values{
 		"platform":   []string{"WECHAT_H5"},
 		"schoolCode": []string{"20090820"}}
 
-	req, err := http.NewRequest("POST", XfbWebApp+qrCodeEndpointUrl, strings.NewReader(form.Encode()))
-	if err != nil {
-		return nil, err
-	}
+	var result XfbResponse
 
-	req.AddCookie(&http.Cookie{Name: "shiroJID", Value: sessionId})
-	resp, err := client.Do(req)
+	_, err := PostForm(XfbWebApp+qrCodeEndpointUrl, sessionId, form, &result)
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
 
-	if resp.StatusCode != http.StatusOK {
-		bodyCnt, _ := io.ReadAll(resp.Body)
-		return nil, fmt.Errorf("unexpected status code: %d; response body: %s", resp.StatusCode, string(bodyCnt))
-	}
-
-	var result struct {
-		Success    bool   `json:"success"`
-		StatusCode int    `json:"statusCode"`
-		Data       string `json:"data"`
-	}
-
-	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
-		return nil, err
-	}
-
-	if !result.Success || result.StatusCode != 0 {
-		return nil, fmt.Errorf("API error: success=%v, statusCode=%d",
-			result.Success, result.StatusCode)
+	if result.StatusCode != 0 {
+		return nil, fmt.Errorf("API error: statusCode=%d, statusCode=%d",
+			result.StatusCode, result.StatusCode)
 	}
 
 	return &QrPayCode{
-		QRCode:    result.Data,
+		QRCode:    result.Data.(string),
 		SessionID: sessionId,
-		client:    client,
 		Creation:  time.Now().Unix(),
 	}, nil
 }
@@ -102,30 +69,18 @@ func (q *QrPayCode) GetQrPngBuf(size int) ([]byte, error) {
 	return qr.PNG(size)
 }
 
-func (q *QrPayCode) GetResult() (map[string]interface{}, error) {
+func (q *QrPayCode) GetResult() (map[string]any, error) {
 	form := url.Values{}
 	form.Add("qrCode", q.QRCode)
 
-	req, err := http.NewRequest("POST", XfbWebApp+qrResultEndpointUrl, strings.NewReader(form.Encode()))
-	if err != nil {
-		return nil, err
-	}
+	var result XfbResponse
 
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.AddCookie(&http.Cookie{Name: "shiroJID", Value: q.SessionID})
-
-	resp, err := q.client.Do(req)
+	_, err := PostForm(XfbWebApp+qrResultEndpointUrl, q.SessionID, form, &result)
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
-
-	var result map[string]interface{}
-	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
-		return nil, err
-	}
 
-	return result, nil
+	return result.Data.(map[string]any), nil
 }
 
 // func main() {

xfb/http.go

@@ -1,9 +1,12 @@
 package xfb
 
 import (
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"net/http"
+	"net/url"
+	"strings"
 	"time"
 
 	"github.com/yiffyi/gorad/radhttp"
@@ -16,6 +19,9 @@ const XfbApp = "https://application.xiaofubao.com"
 var client = &http.Client{
 	Timeout:       time.Second * 30,
 	CheckRedirect: func(req *http.Request, via []*http.Request) error { return http.ErrUseLastResponse },
+	Transport: &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	},
 }
 
 // func Get(url string, sessionId string, v XfbBaseResponse) (newSessionId string, err error) {
@@ -54,7 +60,43 @@ var client = &http.Client{
 // 	}
 // }
 
-func Post(url string, sessionId string, payload map[string]interface{}, v XfbBaseResponse) (newSessionId string, err error) {
+func PostForm(url string, sessionId string, form url.Values, v XfbBaseResponse) (newSessionId string, err error) {
+	req, err := http.NewRequest(http.MethodPost, url, strings.NewReader(form.Encode()))
+	if err != nil {
+		return
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	if len(sessionId) > 0 {
+		req.AddCookie(&http.Cookie{Name: "shiroJID", Value: sessionId})
+	}
+
+	resp, b, err := radhttp.JSONDo(client, req, v)
+	if resp == nil {
+		return
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		err = fmt.Errorf("bad HTTP Status: %s\n\t%s", resp.Status, string(b))
+		return
+	}
+
+	newSessionId = ""
+	for _, v := range resp.Cookies() {
+		if v.Name == "shiroJID" {
+			newSessionId = v.Value
+		}
+	}
+
+	if code := v.GetStatusCode(); code == 0 {
+		err = nil
+		return
+	} else {
+		err = fmt.Errorf("bad statusCode from xfb: %d", code)
+		return
+	}
+}
+
+func Post(url string, sessionId string, payload map[string]any, v XfbBaseResponse) (newSessionId string, err error) {
 	req, err := radhttp.NewJSONPostRequest(url, payload)
 	if err != nil {
 		return

xfb/model.go

@@ -4,10 +4,10 @@ type XfbBaseResponse interface {
 	GetStatusCode() int
 }
 type XfbResponse struct {
-	StatusCode int         `json:"statusCode"`
-	Message    string      `json:"message"`
-	Data       interface{} `json:"data"`
-	SessionId  string      `json:"-"`
+	StatusCode int    `json:"statusCode"`
+	Message    string `json:"message"`
+	Data       any    `json:"data"`
+	SessionId  string `json:"-"`
 }
 
 func (r *XfbResponse) GetStatusCode() int {