.gitignore

@@ -0,0 +1,36 @@
+# IDE and editor files
+.idea/
+.vscode/
+.claude/
+*.iml
+.DS_Store
+
+# Go environment files
+.envrc
+gopls.mod
+go.work
+go.work.sum
+
+# Log files
+*.log
+logs/
+
+# Build output
+/build
+/pkg
+/bin
+/dist
+
+# Configuration files (local)
+conf/app.conf
+
+# Other
+*.dat
+*.out
+*.pyc
+*.pyo
+.cache/
+
+# Project specific
+pullcoding.sh
+clearlog.sh

go/gopath/pkg/mod/cache/download/github.com/fsnotify/fsnotify/@v/list

@@ -0,0 +1 @@
+v1.4.7

go/gopath/pkg/mod/cache/download/github.com/fsnotify/fsnotify/@v/v1.4.7.info

@@ -0,0 +1 @@
+{"Version":"v1.4.7","Time":"2018-01-10T05:33:47Z"}

go/gopath/pkg/mod/cache/download/github.com/fsnotify/fsnotify/@v/v1.4.7.mod

@@ -0,0 +1 @@
+module github.com/fsnotify/fsnotify

go/gopath/pkg/mod/cache/download/github.com/golang/protobuf/@v/list

@@ -0,0 +1 @@
+v1.2.0

go/gopath/pkg/mod/cache/download/github.com/golang/protobuf/@v/v1.2.0.info

@@ -0,0 +1 @@
+{"Version":"v1.2.0","Time":"2018-08-14T21:14:27Z"}

go/gopath/pkg/mod/cache/download/github.com/golang/protobuf/@v/v1.2.0.mod

@@ -0,0 +1 @@
+module github.com/golang/protobuf

go/gopath/pkg/mod/cache/download/github.com/hpcloud/tail/@v/list

@@ -0,0 +1 @@
+v1.0.0

go/gopath/pkg/mod/cache/download/github.com/hpcloud/tail/@v/v1.0.0.info

@@ -0,0 +1 @@
+{"Version":"v1.0.0","Time":"2016-04-28T00:30:50Z"}

go/gopath/pkg/mod/cache/download/github.com/hpcloud/tail/@v/v1.0.0.mod

@@ -0,0 +1 @@
+module github.com/hpcloud/tail

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/list

@@ -0,0 +1,2 @@
+v1.6.0
+v1.8.0

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/v1.6.0.mod

@@ -0,0 +1 @@
+module github.com/onsi/ginkgo

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/v1.8.0.info

@@ -0,0 +1 @@
+{"Version":"v1.8.0","Time":"2019-03-08T13:28:58Z"}

go/gopath/pkg/mod/cache/download/github.com/onsi/ginkgo/@v/v1.8.0.mod

@@ -0,0 +1 @@
+module github.com/onsi/ginkgo

go/gopath/pkg/mod/cache/download/github.com/onsi/gomega/@v/list

@@ -0,0 +1 @@
+v1.5.0

go/gopath/pkg/mod/cache/download/github.com/onsi/gomega/@v/v1.5.0.info

@@ -0,0 +1 @@
+{"Version":"v1.5.0","Time":"2019-03-12T19:43:52Z"}

go/gopath/pkg/mod/cache/download/github.com/onsi/gomega/@v/v1.5.0.mod

@@ -0,0 +1,15 @@
+module github.com/onsi/gomega
+
+require (
+	github.com/fsnotify/fsnotify v1.4.7 // indirect
+	github.com/golang/protobuf v1.2.0
+	github.com/hpcloud/tail v1.0.0 // indirect
+	github.com/onsi/ginkgo v1.6.0
+	golang.org/x/net v0.0.0-20180906233101-161cd47e91fd
+	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
+	golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e // indirect
+	golang.org/x/text v0.3.0 // indirect
+	gopkg.in/fsnotify.v1 v1.4.7 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.2.1
+)

go/gopath/pkg/mod/cache/download/golang.org/x/net/@v/list

@@ -0,0 +1 @@
+v0.0.0-20180906233101-161cd47e91fd

go/gopath/pkg/mod/cache/download/golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20180906233101-161cd47e91fd","Time":"2018-09-06T23:31:01Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod

@@ -0,0 +1 @@
+module golang.org/x/net

go/gopath/pkg/mod/cache/download/golang.org/x/sync/@v/list

@@ -0,0 +1 @@
+v0.0.0-20180314180146-1d60e4601c6f

go/gopath/pkg/mod/cache/download/golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20180314180146-1d60e4601c6f","Time":"2018-03-14T18:01:46Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod

@@ -0,0 +1 @@
+module golang.org/x/sync

go/gopath/pkg/mod/cache/download/golang.org/x/sys/@v/list

@@ -0,0 +1 @@
+v0.0.0-20180909124046-d0be0721c37e

go/gopath/pkg/mod/cache/download/golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20180909124046-d0be0721c37e","Time":"2018-09-09T12:40:46Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod

@@ -0,0 +1 @@
+module golang.org/x/sys

go/gopath/pkg/mod/cache/download/golang.org/x/text/@v/list

@@ -0,0 +1 @@
+v0.3.0

go/gopath/pkg/mod/cache/download/golang.org/x/text/@v/v0.3.0.info

@@ -0,0 +1 @@
+{"Version":"v0.3.0","Time":"2017-12-14T13:08:43Z"}

go/gopath/pkg/mod/cache/download/golang.org/x/text/@v/v0.3.0.mod

@@ -0,0 +1 @@
+module golang.org/x/text

go/gopath/pkg/mod/cache/download/gopkg.in/check.v1/@v/list

@@ -0,0 +1 @@
+v0.0.0-20161208181325-20d25e280405

go/gopath/pkg/mod/cache/download/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.info

@@ -0,0 +1 @@
+{"Version":"v0.0.0-20161208181325-20d25e280405","Time":"2016-12-08T18:13:25Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod

@@ -0,0 +1 @@
+module gopkg.in/check.v1

go/gopath/pkg/mod/cache/download/gopkg.in/fsnotify.v1/@v/list

@@ -0,0 +1 @@
+v1.4.7

go/gopath/pkg/mod/cache/download/gopkg.in/fsnotify.v1/@v/v1.4.7.info

@@ -0,0 +1 @@
+{"Version":"v1.4.7","Time":"2018-01-10T05:33:47Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/fsnotify.v1/@v/v1.4.7.mod

@@ -0,0 +1 @@
+module gopkg.in/fsnotify.v1

go/gopath/pkg/mod/cache/download/gopkg.in/tomb.v1/@v/list

@@ -0,0 +1 @@
+v1.0.0-20141024135613-dd632973f1e7

go/gopath/pkg/mod/cache/download/gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.info

@@ -0,0 +1 @@
+{"Version":"v1.0.0-20141024135613-dd632973f1e7","Time":"2014-10-24T13:56:13Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod

@@ -0,0 +1 @@
+module gopkg.in/tomb.v1

go/gopath/pkg/mod/cache/download/gopkg.in/yaml.v2/@v/list

@@ -0,0 +1 @@
+v2.2.1

go/gopath/pkg/mod/cache/download/gopkg.in/yaml.v2/@v/v2.2.1.info

@@ -0,0 +1 @@
+{"Version":"v2.2.1","Time":"2018-03-28T19:50:20Z"}

go/gopath/pkg/mod/cache/download/gopkg.in/yaml.v2/@v/v2.2.1.mod

@@ -0,0 +1,5 @@
+module "gopkg.in/yaml.v2"
+
+require (
+	"gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405
+)

go/gopath/src/fohow.com/.gitignore

@@ -1,7 +1,10 @@
 .idea
 .cache
 .DS_Store
-
+/.claude
+/.vscode
+/.envrc
+gopls.mod
 *.iml
 *.log
 *.dat

go/gopath/src/fohow.com/apps/controllers/tool_controller/qrcode_controller.go

@@ -3,10 +3,11 @@ package tool_controller
 import (
 	"context"
 	"fmt"
-	"github.com/chromedp/chromedp"
 	"log"
 	"time"
 
+	"github.com/chromedp/chromedp"
+
 	// "os"
 	"net/url"
 	// "strings"
@@ -82,7 +83,8 @@ func (self *ToolController) GetHaibaoWithGoogle() {
 		//chromedp.WaitReady("body", chromedp.ByQuery), // 等待页面的 <body> 元素加载完成
 		chromedp.WaitReady("#overload", chromedp.ByID),
 		//chromedp.Sleep(5*time.Second),
-		chromedp.FullScreenshot(&buf, 90), // 调整质量参数
+		// chromedp.FullScreenshot(&buf, 90), // 调整质量参数
+		chromedp.FullScreenshot(&buf, 60), // 调整质量参数
 	)
 	if err != nil {
 		fmt.Println("error occured!")

go/gopath/src/fohow.com/libs/wx_mp/pay.go

@@ -4,6 +4,7 @@ import (
 	// "encoding/json"
 	"encoding/xml"
 	"fmt"
+
 	"fohow.com/apps/models/order_model"
 
 	// "io/ioutil"
@@ -14,6 +15,7 @@ import (
 
 	"github.com/astaxie/beego"
 	"github.com/uuid"
+
 	// "github.com/astaxie/beego/context"
 	"github.com/chanxuehong/wechat/mch"
 	// "github.com/chanxuehong/wechat/mch/mmpaymkttransfers"
@@ -113,24 +115,27 @@ type PayResult struct {
 	FeeType            string   `xml:"fee_type"`             //货币种类
 	CashFee            string   `xml:"cash_fee"`             //cash_fee
 	CashFeeType        string   `xml:"cash_fee_type"`        //现金支付货币类型
-	CouponFee          string   `xml:"coupon_fee"`           //提货券或立减优惠金额
-	CouponCount        string   `xml:"coupon_count"`         //提货券或立减优惠使用数量
+	CouponFee          string   `xml:"coupon_fee"`           //代金券或立减优惠金额
+	CouponCount        string   `xml:"coupon_count"`         //代金券或立减优惠使用数量
 
 	TransactionId string `xml:"transaction_id"` //微信支付订单号
 	OutTradeNO    string `xml:"out_trade_no"`   //商户订单号
 	Attach        string `xml:"attach"`         // 商家数据包
 	TimeEnd       string `xml:"time_end"`       // 支付完成时间 yyyyMMddHHmmss
-	//coupon_id_$n
-	//coupon_fee_$na
-	//新增 coupon_fee
-	CouponFee0 string `xml:"coupon_fee_0"` //单个提货券支付金额,$n为下标，从0开始编号
-	CouponId0  string `xml:"coupon_id_0"`  //提货券ID,$n为下标，从0开始编号
-	CouponFee1 string `xml:"coupon_fee_1"` //单个提货券支付金额,$n为下标，从0开始编号
-	CouponId1  string `xml:"coupon_id_1"`  //提货券ID,$n为下标，从0开始编号
-	CouponFee2 string `xml:"coupon_fee_2"` //单个提货券支付金额,$n为下标，从0开始编号
-	CouponId2  string `xml:"coupon_id_2"`  //提货券ID,$n为下标，从0开始编号
-	CouponFee3 string `xml:"coupon_fee_3"` //单个提货券支付金额,$n为下标，从0开始编号
-	CouponId3  string `xml:"coupon_id_3"`  //提货券ID,$n为下标，从0开始编号
+
+	// 代金券相关字段
+	CouponFee0 string `xml:"coupon_fee_0"` //单个代金券支付金额,$n为下标，从0开始编号
+	CouponId0  string `xml:"coupon_id_0"`  //代金券ID,$n为下标，从0开始编号
+	CouponFee1 string `xml:"coupon_fee_1"` //单个代金券支付金额,$n为下标，从0开始编号
+	CouponId1  string `xml:"coupon_id_1"`  //代金券ID,$n为下标，从0开始编号
+	CouponFee2 string `xml:"coupon_fee_2"` //单个代金券支付金额,$n为下标，从0开始编号
+	CouponId2  string `xml:"coupon_id_2"`  //代金券ID,$n为下标，从0开始编号
+	CouponFee3 string `xml:"coupon_fee_3"` //单个代金券支付金额,$n为下标，从0开始编号
+	CouponId3  string `xml:"coupon_id_3"`  //代金券ID,$n为下标，从0开始编号
+	CouponFee4 string `xml:"coupon_fee_4"` //单个代金券支付金额,$n为下标，从0开始编号
+	CouponId4  string `xml:"coupon_id_4"`  //代金券ID,$n为下标，从0开始编号
+	CouponFee5 string `xml:"coupon_fee_5"` //单个代金券支付金额,$n为下标，从0开始编号
+	CouponId5  string `xml:"coupon_id_5"`  //代金券ID,$n为下标，从0开始编号
 }
 
 // 获取jsSDK微信支付需要的数据

go/gopath/src/fohow.com/nginx/ngx_test_config

@@ -44,6 +44,16 @@ server {
        proxy_pass http://gva-server; # 设置代理服务器的协议和地址
     }
 
+    location /xcx_api/ {
+        proxy_next_upstream off;
+        proxy_set_header    X-Real-IP           $remote_addr;
+        proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+        proxy_set_header    Host                $host;
+        proxy_http_version  1.1;
+        proxy_set_header    Connection  "";
+        proxy_pass          http://127.0.0.1:25565/;
+    }
+
     location / {
         proxy_next_upstream off;
         proxy_set_header    X-Real-IP           $remote_addr;
@@ -89,4 +99,3 @@ server {
 
 
 
-