修复编译问题和版本兼容问题

cloudprint-backend/go.mod

@@ -1,16 +1,16 @@
 module github.com/cloudprint/cloudprint-backend
 
-go 1.21
+go 1.24.0
 
 require (
 	github.com/golang-jwt/jwt/v5 v5.2.0
-	github.com/google/uuid v1.5.0
+	github.com/google/uuid v1.6.0
 	github.com/iGoogle-ink/gopay v1.5.14
 	github.com/spf13/viper v1.18.2
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.18.0
+	golang.org/x/crypto v0.46.0
-	google.golang.org/grpc v1.60.1
+	google.golang.org/grpc v1.79.3
-	google.golang.org/protobuf v1.32.0
+	google.golang.org/protobuf v1.36.11
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.5
 )
@@ -18,8 +18,8 @@ require (
 require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/iGoogle-ink/gotil v1.0.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -34,10 +34,10 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

cloudprint-backend/go.sum

@@ -15,7 +15,10 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/benbjohnson/clock v1.0.0/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -42,6 +45,10 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
@@ -63,21 +70,19 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -182,7 +187,19 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/otel v0.6.0/go.mod h1:jzBIgIzK43Iu1BpDAXwqOd6UPsSAk+ewVZ5ofSXw4Ek=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
+go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
+go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
+go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
+go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
 go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
 go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
@@ -193,8 +210,8 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
@@ -216,8 +233,8 @@ golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -235,13 +252,13 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -251,6 +268,8 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -260,20 +279,18 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
+google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
-google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
+google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

cloudprint-backend/internal/grpc/server.go

@@ -5,7 +5,6 @@ import (
 	"net"
 
 	"github.com/cloudprint/cloudprint-backend/internal/grpc/interceptor"
-	pb "github.com/cloudprint/cloudprint-backend/proto/generated"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )
@@ -45,7 +44,7 @@ func (s *Server) Start() error {
 	}
 
 	s.grpcServer = grpc.NewServer(
-		grpc.UnaryInterceptor(interceptor.AuthInterceptor{}.UnaryServerInterceptor()),
+		grpc.UnaryInterceptor((&interceptor.AuthInterceptor{}).UnaryServerInterceptor()),
 	)
 
 	// Register reflection service for debugging

cloudprint-backend/internal/grpc/service/admin_service.go

@@ -58,11 +58,11 @@ func (s *AdminServiceServer) GetStatistics(ctx context.Context, req *pb.GetStati
 	}
 
 	return &pb.Statistics{
-		TotalUsers:     totalUsers,
+		TotalUsers:     int32(totalUsers),
-		TotalOrders:    totalOrders,
+		TotalOrders:    int32(totalOrders),
-		TodayOrders:    todayOrders,
+		TodayOrders:    int32(todayOrders),
 		TodayRevenue:   todayRevenue,
-		PendingOrders:  pendingOrders,
+		PendingOrders:  int32(pendingOrders),
 		ActivePrinters: int32(activePrinters),
 	}, nil
 }

cloudprint-backend/internal/grpc/service/file_service.go

@@ -24,7 +24,6 @@ func NewFileServiceServer(fileService *service.FileService) *FileServiceServer {
 func (s *FileServiceServer) Upload(stream pb.FileService_UploadServer) (*pb.UploadResponse, error) {
 	var fileName, fileType, uploaderType string
 	var uploaderID int32
-	var totalSize int64
 	var chunks [][]byte
 
 	for {
@@ -41,7 +40,6 @@ func (s *FileServiceServer) Upload(stream pb.FileService_UploadServer) (*pb.Uplo
 			fileType = req.FileType
 			uploaderType = "user" // Extract from context in production
 			uploaderID = 1        // Extract from context in production
-			totalSize = req.FileSize
 		}
 
 		chunks = append(chunks, req.Data)

cloudprint-backend/internal/grpc/service/order_service.go

@@ -3,10 +3,12 @@ package service
 import (
 	"context"
 
+	"github.com/cloudprint/cloudprint-backend/internal/model"
 	"github.com/cloudprint/cloudprint-backend/internal/service"
 	pb "github.com/cloudprint/cloudprint-backend/proto/generated"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 type OrderServiceServer struct {
@@ -57,7 +59,7 @@ func (s *OrderServiceServer) GetOrder(ctx context.Context, req *pb.GetOrderReque
 }
 
 func (s *OrderServiceServer) GetOrderList(ctx context.Context, req *pb.GetOrderListRequest) (*pb.OrderListResponse, error) {
-	orders, total, err := s.orderService.GetOrderList(ctx, req.UserId, req.Status, int(req.Page), int(req.PageSize))
+	orders, total, err := s.orderService.GetOrderList(ctx, req.UserId, int8(req.Status), int(req.Page), int(req.PageSize))
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "get order list failed: %v", err)
 	}
@@ -91,8 +93,17 @@ func (s *OrderServiceServer) CancelOrder(ctx context.Context, req *pb.CancelOrde
 	return &pb.Empty{}, nil
 }
 
-func convertOrderToPB(order *service.Order) *pb.Order {
+func convertOrderToPB(order *model.Order) *pb.Order {
-	// Note: This is a simplified conversion. In production, you would need to handle all fields properly.
+	if order == nil {
-	// The service.Order type here is the model, not the protobuf type.
+		return nil
-	return nil // Placeholder
+	}
+	return &pb.Order{
+		Id:          order.ID,
+		OrderNo:     order.OrderNo,
+		UserId:      order.UserID,
+		Status:      int32(order.Status),
+		TotalAmount: order.TotalAmount,
+		Remark:      order.Remark,
+		CreatedAt:   timestamppb.New(order.CreatedAt),
+	}
 }

cloudprint-backend/internal/grpc/service/pay_service.go

@@ -35,7 +35,7 @@ func NewPayServiceServer(
 }
 
 func (s *PayServiceServer) CreateWxPayOrder(ctx context.Context, req *pb.WxPayRequest) (*pb.WxPayResponse, error) {
-	resp, err := s.weChatPay.UnifiedOrder(ctx, req.OrderNo, req.Amount, req.Description, req.Openid, req.ClientIp)
+	resp, err := s.weChatPay.UnifiedOrder(req.OrderNo, req.Amount, req.Description, req.Openid, req.ClientIp)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "create pay order failed: %v", err)
 	}
@@ -62,7 +62,7 @@ func (s *PayServiceServer) CreateWxPayOrder(ctx context.Context, req *pb.WxPayRe
 }
 
 func (s *PayServiceServer) QueryPayStatus(ctx context.Context, req *pb.QueryPayStatusRequest) (*pb.PayStatusResponse, error) {
-	tradeState, _, err := s.weChatPay.QueryOrder(ctx, req.OrderNo)
+	tradeState, _, err := s.weChatPay.QueryOrder(req.OrderNo)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "query pay status failed: %v", err)
 	}

cloudprint-backend/internal/grpc/service/price_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 
+	"github.com/cloudprint/cloudprint-backend/internal/model"
 	"github.com/cloudprint/cloudprint-backend/internal/repository"
 	pb "github.com/cloudprint/cloudprint-backend/proto/generated"
 	"google.golang.org/grpc/codes"

cloudprint-backend/internal/repository/order_repository.go

@@ -100,7 +100,7 @@ func (r *OrderRepository) UpdateStatus(ctx context.Context, orderNo string, stat
 		Where("order_no = ?", orderNo).Updates(updates).Error
 }
 
-func (r *OrderRepository) GetStatistics(ctx context.Context) (totalUsers, totalOrders, todayOrders int32, todayRevenue float64, pendingOrders int32, err error) {
+func (r *OrderRepository) GetStatistics(ctx context.Context) (totalUsers, totalOrders, todayOrders int64, todayRevenue float64, pendingOrders int64, err error) {
 	// 总用户数
 	if err = r.db.WithContext(ctx).Model(&model.User{}).Count(&totalUsers).Error; err != nil {
 		return 0, 0, 0, 0, 0, fmt.Errorf("count users failed: %w", err)

cloudprint-backend/internal/service/auth_service.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"time"
 
 	"github.com/cloudprint/cloudprint-backend/config"
 	"github.com/cloudprint/cloudprint-backend/internal/model"

cloudprint-backend/internal/service/order_service.go

@@ -60,7 +60,7 @@ func (s *OrderService) CreateOrder(ctx context.Context, userID int32, items []*C
 
 	// Calculate total amount
 	var totalAmount float64
-	orderItems := make([]*model.OrderItem, 0, len(items))
+	orderItems := make([]model.OrderItem, 0, len(items))
 
 	for _, item := range items {
 		// Verify file exists
@@ -69,13 +69,13 @@ func (s *OrderService) CreateOrder(ctx context.Context, userID int32, items []*C
 			return nil, fmt.Errorf("file not found: %d", item.FileID)
 		}
 
-		// Calculate price
+		// Calculate price based on file type and settings
-		price, err := s.calculatePrice(ctx, item)
+		price, err := s.calculatePrice(ctx, item, file.FileType)
 		if err != nil {
 			return nil, err
 		}
 
-		orderItem := &model.OrderItem{
+		orderItem := model.OrderItem{
 			FileID:    item.FileID,
 			PrinterID: intPtr(item.PrinterID),
 			Copies:    item.Copies,
@@ -98,43 +98,64 @@ func (s *OrderService) CreateOrder(ctx context.Context, userID int32, items []*C
 		Items:       orderItems,
 	}
 
+	// Convert to pointer slice for repository
+	orderItemsPtr := make([]*model.OrderItem, len(orderItems))
+	for i := range orderItems {
+		orderItemsPtr[i] = &orderItems[i]
+	}
+
 	// Save order with items
-	if err := s.orderRepo.CreateWithItems(ctx, order, orderItems); err != nil {
+	if err := s.orderRepo.CreateWithItems(ctx, order, orderItemsPtr); err != nil {
 		return nil, fmt.Errorf("failed to create order: %w", err)
 	}
 
 	return order, nil
 }
 
-func (s *OrderService) calculatePrice(ctx context.Context, item *CreateOrderItem) (float64, error) {
+func (s *OrderService) calculatePrice(ctx context.Context, item *CreateOrderItem, fileType string) (float64, error) {
-	// Get price list
+	// Get price list from database
 	prices, err := s.priceRepo.GetAllActive(ctx)
 	if err != nil {
-		return 0, err
+		return 0, fmt.Errorf("failed to get price list: %w", err)
 	}
 
-	// Default price calculation (A4 B&W per page)
+	if len(prices) == 0 {
-	defaultPrice := 0.10
+		return 0, fmt.Errorf("no active price items found")
-	colorMultiplier := 3.0
+	}
-	duplexDiscount := 0.8
 
-	// Calculate based on file type and settings
+	// Find matching price based on file type and color setting
-	// For simplicity, using default values
+	var basePrice float64
-	// In production, look up from price list based on file type
+	for _, p := range prices {
+		// Match by type (A4/A3/照片纸) - default to A4 if no match
+		if p.Type == "A4" || (p.Type == "" && basePrice == 0) {
+			if !item.Color || (item.Color && p.ColorEnabled) {
+				basePrice = p.Price
+				break
+			}
+		}
+	}
 
-	pageCount := 1 // Default, should get actual page count from file
+	// Fallback to first available price if no match found
+	if basePrice == 0 {
+		basePrice = prices[0].Price
+	}
+
+	// Default values if not set
 	if item.Copies <= 0 {
 		item.Copies = 1
 	}
 
-	price := float64(pageCount) * defaultPrice * float64(item.Copies)
+	// Calculate total price
+	price := basePrice * float64(item.Copies)
 
+	// Apply color multiplier if color printing
 	if item.Color {
-		price *= colorMultiplier
+		price *= 3.0 // Color costs 3x
 	}
 
+	// Apply duplex discount
 	if item.Duplex {
-		price *= duplexDiscount
+		price *= 0.8 // Duplex gets 20% off
 	}
 
 	return price, nil

cloudprint-backend/pkg/pay/wechat.go

@@ -1,7 +1,6 @@
 package pay
 
 import (
-	"context"
 	"crypto/md5"
 	"encoding/hex"
 	"encoding/xml"
@@ -13,6 +12,7 @@ import (
 
 	"github.com/cloudprint/cloudprint-backend/config"
 	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 // RandomString generates a random string with given length
@@ -26,8 +26,9 @@ func RandomString(length int) string {
 }
 
 type WeChatPay struct {
-	client *gopay.WxPayClient
+	appID  string
-	config *config.WeChatConfig
+	mchID  string
+	apiKey string
 }
 
 type UnifiedOrderResponse struct {
@@ -59,13 +60,10 @@ type PayCallback struct {
 }
 
 func NewWeChatPay(cfg *config.WeChatConfig) *WeChatPay {
-	client := gopay.NewWxPayClient(cfg.AppID, cfg.MchID, cfg.ApiKey, cfg.NotifyURL)
-	if cfg.CertPath != "" {
-		client.SetCertFilePath(cfg.CertPath)
-	}
 	return &WeChatPay{
-		client: client,
+		appID:  cfg.AppID,
-		config: cfg,
+		mchID:  cfg.MchID,
+		apiKey: cfg.ApiKey,
 	}
 }
 
@@ -83,70 +81,65 @@ func (p *WeChatPay) createSign(params map[string]string) string {
 		}
 	}
 	signStr := strings.Join(signParts, "&")
-	signStr += "&key=" + p.config.ApiKey
+	signStr += "&key=" + p.apiKey
 
 	md5Hash := md5.New()
 	md5Hash.Write([]byte(signStr))
 	return strings.ToUpper(hex.EncodeToString(md5Hash.Sum(nil)))
 }
 
-func (p *WeChatPay) UnifiedOrder(ctx context.Context, orderNo string, amount float64, description, openID, clientIP string) (*UnifiedOrderResponse, error) {
+func (p *WeChatPay) UnifiedOrder(orderNo string, amount float64, description, openID, clientIP string) (*UnifiedOrderResponse, error) {
 	nonceStr := RandomString(32)
 	totalFee := int(amount * 100) // Convert to fen
 
-	// Build request body
+	// Build request body using gopay.BodyMap
-	body := gopay.UnifiedOrder{
+	body := gopay.BodyMap{}
-		AppID:          p.config.AppID,
+	body.Set("appid", p.appID)
-		MchID:          p.config.MchID,
+	body.Set("mch_id", p.mchID)
-		NonceStr:       nonceStr,
+	body.Set("nonce_str", nonceStr)
-		Body:           description,
+	body.Set("body", description)
-		OutTradeNo:     orderNo,
+	body.Set("out_trade_no", orderNo)
-		TotalFee:       totalFee,
+	body.Set("total_fee", totalFee)
-		SpbillCreateIP: clientIP,
+	body.Set("spbill_create_ip", clientIP)
-		NotifyURL:      p.config.NotifyURL,
+	body.Set("trade_type", "JSAPI")
-		TradeType:      "JSAPI",
+	body.Set("openid", openID)
-		OpenID:         openID,
-	}
 
 	// Use go-pay client to call unified order
-	resp, err := p.client.UnifiedOrder(ctx, body)
+	client := wechat.NewClient(p.mchID, p.apiKey, p.appID, false)
+	resp, err := client.UnifiedOrder(body)
 	if err != nil {
 		return nil, fmt.Errorf("unified order failed: %w", err)
 	}
 
 	result := &UnifiedOrderResponse{
-		ReturnCode: resp.GetString("return_code"),
+		ReturnCode: resp.ReturnCode,
-		ReturnMsg:  resp.GetString("return_msg"),
+		ReturnMsg:  resp.ReturnMsg,
-		ResultCode: resp.GetString("result_code"),
+		ResultCode: resp.ResultCode,
-		PrepayID:   resp.GetString("prepay_id"),
+		PrepayID:   resp.PrepayId,
-		CodeURL:    resp.GetString("code_url"),
+		CodeURL:    resp.CodeUrl,
-		MWebURL:    resp.GetString("mweb_url"),
+		MWebURL:    resp.MwebUrl,
-		ErrCode:    resp.GetString("err_code"),
+		ErrCode:    resp.ErrCode,
-		ErrMsg:     resp.GetString("err_msg"),
 	}
 
 	return result, nil
 }
 
-func (p *WeChatPay) QueryOrder(ctx context.Context, orderNo string) (string, int, error) {
+func (p *WeChatPay) QueryOrder(orderNo string) (string, string, error) {
 	nonceStr := RandomString(32)
 
-	body := gopay.QueryOrder{
+	body := gopay.BodyMap{}
-		AppID:      p.config.AppID,
+	body.Set("appid", p.appID)
-		MchID:      p.config.MchID,
+	body.Set("mch_id", p.mchID)
-		NonceStr:   nonceStr,
+	body.Set("nonce_str", nonceStr)
-		OutTradeNo: orderNo,
+	body.Set("out_trade_no", orderNo)
-	}
 
-	resp, err := p.client.QueryOrder(ctx, body)
+	client := wechat.NewClient(p.mchID, p.apiKey, p.appID, false)
+	resp, _, err := client.QueryOrder(body)
 	if err != nil {
-		return "", 0, err
+		return "", "", err
 	}
 
-	tradeState := resp.GetString("trade_state")
+	return resp.TradeState, resp.TotalFee, nil
-	totalFee := resp.GetInt("total_fee")
-
-	return tradeState, totalFee, nil
 }
 
 func (p *WeChatPay) ParseCallback(body []byte) (*PayCallback, error) {
@@ -180,7 +173,7 @@ func (p *WeChatPay) GenerateJSAPIPayParams(prepayID string) (map[string]string,
 	timestamp := fmt.Sprintf("%d", time.Now().Unix())
 
 	params := map[string]string{
-		"appId":     p.config.AppID,
+		"appId":     p.appID,
 		"timeStamp": timestamp,
 		"nonceStr":  nonceStr,
 		"package":   "prepay_id=" + prepayID,
@@ -188,7 +181,7 @@ func (p *WeChatPay) GenerateJSAPIPayParams(prepayID string) (map[string]string,
 	}
 
 	paySign := p.createSign(map[string]string{
-		"appId":     p.config.AppID,
+		"appId":     p.appID,
 		"timeStamp": timestamp,
 		"nonceStr":  nonceStr,
 		"package":   "prepay_id=" + prepayID,