diff --git a/.air.toml b/.air.toml index 083a149..ce4e1ec 100644 --- a/.air.toml +++ b/.air.toml @@ -4,7 +4,7 @@ tmp_dir = "tmp" [build] # 入口文件 -cmd = "go build -o ./tmp/main.exe ./app/user/cmd/api/main.go" +cmd = "go build -o ./tmp/main.exe ./app/main/api/main.go" # 二进制文件 bin = "$env:ENV = 'development' && ./tmp/main.exe" # 运行时的参数 diff --git a/app/user/cmd/api/Dockerfile b/app/main/api/Dockerfile similarity index 76% rename from app/user/cmd/api/Dockerfile rename to app/main/api/Dockerfile index 5cf7de0..361e1c4 100644 --- a/app/user/cmd/api/Dockerfile +++ b/app/main/api/Dockerfile @@ -14,8 +14,8 @@ ADD go.mod . ADD go.sum . RUN go mod download COPY . . -COPY app/user/cmd/api/etc /app/etc -RUN go build -ldflags="-s -w" -o /app/user app/user/cmd/api/main.go +COPY app/main/api/etc /app/etc +RUN go build -ldflags="-s -w" -o /app/main app/main/api/main.go FROM scratch @@ -25,7 +25,7 @@ COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /usr/share/zoneinfo/Asia/S ENV TZ Asia/Shanghai WORKDIR /app -COPY --from=builder /app/user /app/user +COPY --from=builder /app/main /app/main COPY --from=builder /app/etc /app/etc -CMD ["./user", "-f", "etc/main.yaml"] +CMD ["./main", "-f", "etc/main.yaml"] diff --git a/app/main/api/__debug_bin796033340.exe b/app/main/api/__debug_bin796033340.exe new file mode 100644 index 0000000..2da219d Binary files /dev/null and b/app/main/api/__debug_bin796033340.exe differ diff --git a/app/user/cmd/api/desc/auth/auth.api b/app/main/api/desc/front/auth/auth.api similarity index 100% rename from app/user/cmd/api/desc/auth/auth.api rename to app/main/api/desc/front/auth/auth.api diff --git a/app/user/cmd/api/desc/pay.api b/app/main/api/desc/front/pay.api similarity index 100% rename from app/user/cmd/api/desc/pay.api rename to app/main/api/desc/front/pay.api diff --git a/app/user/cmd/api/desc/pay/pay.api b/app/main/api/desc/front/pay/pay.api similarity index 100% rename from app/user/cmd/api/desc/pay/pay.api rename to app/main/api/desc/front/pay/pay.api diff --git a/app/user/cmd/api/desc/product.api b/app/main/api/desc/front/product.api similarity index 100% rename from app/user/cmd/api/desc/product.api rename to app/main/api/desc/front/product.api diff --git a/app/user/cmd/api/desc/product/product.api b/app/main/api/desc/front/product/product.api similarity index 100% rename from app/user/cmd/api/desc/product/product.api rename to app/main/api/desc/front/product/product.api diff --git a/app/user/cmd/api/desc/query.api b/app/main/api/desc/front/query.api similarity index 100% rename from app/user/cmd/api/desc/query.api rename to app/main/api/desc/front/query.api diff --git a/app/user/cmd/api/desc/query/query.api b/app/main/api/desc/front/query/query.api similarity index 100% rename from app/user/cmd/api/desc/query/query.api rename to app/main/api/desc/front/query/query.api diff --git a/app/user/cmd/api/desc/user.api b/app/main/api/desc/front/user.api similarity index 100% rename from app/user/cmd/api/desc/user.api rename to app/main/api/desc/front/user.api diff --git a/app/user/cmd/api/desc/user/user.api b/app/main/api/desc/front/user/user.api similarity index 100% rename from app/user/cmd/api/desc/user/user.api rename to app/main/api/desc/front/user/user.api diff --git a/app/main/api/desc/main.api b/app/main/api/desc/main.api new file mode 100644 index 0000000..7cc9da4 --- /dev/null +++ b/app/main/api/desc/main.api @@ -0,0 +1,14 @@ +syntax = "v1" + +info ( + title: "Main Service" + desc: "Main Service" + author: "Liangzai" + email: "2440983361@qq.com" + version: "v1" +) + +import "./front/user.api" +import "./front/query.api" +import "./front/pay.api" +import "./front/product.api" \ No newline at end of file diff --git a/app/user/cmd/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml similarity index 100% rename from app/user/cmd/api/etc/main.dev.yaml rename to app/main/api/etc/main.dev.yaml diff --git a/app/user/cmd/api/etc/main.yaml b/app/main/api/etc/main.yaml similarity index 100% rename from app/user/cmd/api/etc/main.yaml rename to app/main/api/etc/main.yaml diff --git a/app/user/cmd/api/etc/merchant/AuthKey_LAY65829DQ.p8 b/app/main/api/etc/merchant/AuthKey_LAY65829DQ.p8 similarity index 100% rename from app/user/cmd/api/etc/merchant/AuthKey_LAY65829DQ.p8 rename to app/main/api/etc/merchant/AuthKey_LAY65829DQ.p8 diff --git a/app/user/cmd/api/etc/merchant/apiclient_key.pem b/app/main/api/etc/merchant/apiclient_key.pem similarity index 100% rename from app/user/cmd/api/etc/merchant/apiclient_key.pem rename to app/main/api/etc/merchant/apiclient_key.pem diff --git a/app/user/cmd/api/internal/config/config.go b/app/main/api/internal/config/config.go similarity index 100% rename from app/user/cmd/api/internal/config/config.go rename to app/main/api/internal/config/config.go diff --git a/app/user/cmd/api/internal/handler/auth/sendsmshandler.go b/app/main/api/internal/handler/auth/sendsmshandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/auth/sendsmshandler.go rename to app/main/api/internal/handler/auth/sendsmshandler.go index 0bdccc2..c38db45 100644 --- a/app/user/cmd/api/internal/handler/auth/sendsmshandler.go +++ b/app/main/api/internal/handler/auth/sendsmshandler.go @@ -3,9 +3,9 @@ package auth import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/auth" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/auth" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/notification/getnotificationshandler.go b/app/main/api/internal/handler/notification/getnotificationshandler.go similarity index 77% rename from app/user/cmd/api/internal/handler/notification/getnotificationshandler.go rename to app/main/api/internal/handler/notification/getnotificationshandler.go index 1d7e335..228f402 100644 --- a/app/user/cmd/api/internal/handler/notification/getnotificationshandler.go +++ b/app/main/api/internal/handler/notification/getnotificationshandler.go @@ -3,8 +3,8 @@ package notification import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/notification" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/logic/notification" + "tyc-server/app/main/api/internal/svc" "tyc-server/common/result" ) diff --git a/app/user/cmd/api/internal/handler/pay/alipaycallbackhandler.go b/app/main/api/internal/handler/pay/alipaycallbackhandler.go similarity index 77% rename from app/user/cmd/api/internal/handler/pay/alipaycallbackhandler.go rename to app/main/api/internal/handler/pay/alipaycallbackhandler.go index 2256922..ae6207d 100644 --- a/app/user/cmd/api/internal/handler/pay/alipaycallbackhandler.go +++ b/app/main/api/internal/handler/pay/alipaycallbackhandler.go @@ -3,8 +3,8 @@ package pay import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/pay" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/logic/pay" + "tyc-server/app/main/api/internal/svc" "tyc-server/common/result" ) diff --git a/app/user/cmd/api/internal/handler/pay/iapcallbackhandler.go b/app/main/api/internal/handler/pay/iapcallbackhandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/pay/iapcallbackhandler.go rename to app/main/api/internal/handler/pay/iapcallbackhandler.go index 2d274c0..768f00c 100644 --- a/app/user/cmd/api/internal/handler/pay/iapcallbackhandler.go +++ b/app/main/api/internal/handler/pay/iapcallbackhandler.go @@ -3,9 +3,9 @@ package pay import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/pay" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/pay" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/pay/paymenthandler.go b/app/main/api/internal/handler/pay/paymenthandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/pay/paymenthandler.go rename to app/main/api/internal/handler/pay/paymenthandler.go index 35f1ccb..885b111 100644 --- a/app/user/cmd/api/internal/handler/pay/paymenthandler.go +++ b/app/main/api/internal/handler/pay/paymenthandler.go @@ -3,9 +3,9 @@ package pay import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/pay" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/pay" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/pay/wechatpaycallbackhandler.go b/app/main/api/internal/handler/pay/wechatpaycallbackhandler.go similarity index 77% rename from app/user/cmd/api/internal/handler/pay/wechatpaycallbackhandler.go rename to app/main/api/internal/handler/pay/wechatpaycallbackhandler.go index 420eb8c..7687a12 100644 --- a/app/user/cmd/api/internal/handler/pay/wechatpaycallbackhandler.go +++ b/app/main/api/internal/handler/pay/wechatpaycallbackhandler.go @@ -3,8 +3,8 @@ package pay import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/pay" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/logic/pay" + "tyc-server/app/main/api/internal/svc" "tyc-server/common/result" ) diff --git a/app/user/cmd/api/internal/handler/pay/wechatpayrefundcallbackhandler.go b/app/main/api/internal/handler/pay/wechatpayrefundcallbackhandler.go similarity index 78% rename from app/user/cmd/api/internal/handler/pay/wechatpayrefundcallbackhandler.go rename to app/main/api/internal/handler/pay/wechatpayrefundcallbackhandler.go index 2cdc4d5..ee8bd9c 100644 --- a/app/user/cmd/api/internal/handler/pay/wechatpayrefundcallbackhandler.go +++ b/app/main/api/internal/handler/pay/wechatpayrefundcallbackhandler.go @@ -3,8 +3,8 @@ package pay import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/pay" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/logic/pay" + "tyc-server/app/main/api/internal/svc" "tyc-server/common/result" ) diff --git a/app/user/cmd/api/internal/handler/product/getproductbyenhandler.go b/app/main/api/internal/handler/product/getproductbyenhandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/product/getproductbyenhandler.go rename to app/main/api/internal/handler/product/getproductbyenhandler.go index 31ecda6..917c77f 100644 --- a/app/user/cmd/api/internal/handler/product/getproductbyenhandler.go +++ b/app/main/api/internal/handler/product/getproductbyenhandler.go @@ -3,9 +3,9 @@ package product import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/product" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/product" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/product/getproductbyidhandler.go b/app/main/api/internal/handler/product/getproductbyidhandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/product/getproductbyidhandler.go rename to app/main/api/internal/handler/product/getproductbyidhandler.go index f556fdd..f75605c 100644 --- a/app/user/cmd/api/internal/handler/product/getproductbyidhandler.go +++ b/app/main/api/internal/handler/product/getproductbyidhandler.go @@ -3,9 +3,9 @@ package product import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/product" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/product" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/product/getproductrenderlisthandler.go b/app/main/api/internal/handler/product/getproductrenderlisthandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/product/getproductrenderlisthandler.go rename to app/main/api/internal/handler/product/getproductrenderlisthandler.go index 0dc038d..d60e491 100644 --- a/app/user/cmd/api/internal/handler/product/getproductrenderlisthandler.go +++ b/app/main/api/internal/handler/product/getproductrenderlisthandler.go @@ -3,9 +3,9 @@ package product import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/product" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/product" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/querydetailbyorderidhandler.go b/app/main/api/internal/handler/query/querydetailbyorderidhandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/query/querydetailbyorderidhandler.go rename to app/main/api/internal/handler/query/querydetailbyorderidhandler.go index 147be36..dcfc2e3 100644 --- a/app/user/cmd/api/internal/handler/query/querydetailbyorderidhandler.go +++ b/app/main/api/internal/handler/query/querydetailbyorderidhandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/querydetailbyordernohandler.go b/app/main/api/internal/handler/query/querydetailbyordernohandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/query/querydetailbyordernohandler.go rename to app/main/api/internal/handler/query/querydetailbyordernohandler.go index d23ebc8..9d01fbe 100644 --- a/app/user/cmd/api/internal/handler/query/querydetailbyordernohandler.go +++ b/app/main/api/internal/handler/query/querydetailbyordernohandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/querydetailhandler.go b/app/main/api/internal/handler/query/querydetailhandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/query/querydetailhandler.go rename to app/main/api/internal/handler/query/querydetailhandler.go index 0d45bea..daaeda9 100644 --- a/app/user/cmd/api/internal/handler/query/querydetailhandler.go +++ b/app/main/api/internal/handler/query/querydetailhandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/queryexamplehandler.go b/app/main/api/internal/handler/query/queryexamplehandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/query/queryexamplehandler.go rename to app/main/api/internal/handler/query/queryexamplehandler.go index 13ee035..1253610 100644 --- a/app/user/cmd/api/internal/handler/query/queryexamplehandler.go +++ b/app/main/api/internal/handler/query/queryexamplehandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/querylisthandler.go b/app/main/api/internal/handler/query/querylisthandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/query/querylisthandler.go rename to app/main/api/internal/handler/query/querylisthandler.go index 539e07e..36e959f 100644 --- a/app/user/cmd/api/internal/handler/query/querylisthandler.go +++ b/app/main/api/internal/handler/query/querylisthandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/queryprovisionalorderhandler.go b/app/main/api/internal/handler/query/queryprovisionalorderhandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/query/queryprovisionalorderhandler.go rename to app/main/api/internal/handler/query/queryprovisionalorderhandler.go index a22e990..308925a 100644 --- a/app/user/cmd/api/internal/handler/query/queryprovisionalorderhandler.go +++ b/app/main/api/internal/handler/query/queryprovisionalorderhandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/queryretryhandler.go b/app/main/api/internal/handler/query/queryretryhandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/query/queryretryhandler.go rename to app/main/api/internal/handler/query/queryretryhandler.go index 3bf2cd4..783536c 100644 --- a/app/user/cmd/api/internal/handler/query/queryretryhandler.go +++ b/app/main/api/internal/handler/query/queryretryhandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/queryservicehandler.go b/app/main/api/internal/handler/query/queryservicehandler.go similarity index 77% rename from app/user/cmd/api/internal/handler/query/queryservicehandler.go rename to app/main/api/internal/handler/query/queryservicehandler.go index f2e042c..e969ee7 100644 --- a/app/user/cmd/api/internal/handler/query/queryservicehandler.go +++ b/app/main/api/internal/handler/query/queryservicehandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/app/user/cmd/api/internal/handler/query/querysingletesthandler.go b/app/main/api/internal/handler/query/querysingletesthandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/query/querysingletesthandler.go rename to app/main/api/internal/handler/query/querysingletesthandler.go index e846b72..5555ce6 100644 --- a/app/user/cmd/api/internal/handler/query/querysingletesthandler.go +++ b/app/main/api/internal/handler/query/querysingletesthandler.go @@ -3,9 +3,9 @@ package query import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/query/updatequerydatahandler.go b/app/main/api/internal/handler/query/updatequerydatahandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/query/updatequerydatahandler.go rename to app/main/api/internal/handler/query/updatequerydatahandler.go index 1758a10..c3131c1 100644 --- a/app/user/cmd/api/internal/handler/query/updatequerydatahandler.go +++ b/app/main/api/internal/handler/query/updatequerydatahandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" - "github.com/zeromicro/go-zero/rest/httpx" - "tyc-server/app/user/cmd/api/internal/logic/query" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/query" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" + + "github.com/zeromicro/go-zero/rest/httpx" ) func UpdateQueryDataHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/routes.go b/app/main/api/internal/handler/routes.go similarity index 92% rename from app/user/cmd/api/internal/handler/routes.go rename to app/main/api/internal/handler/routes.go index d1429a3..abfb1c0 100644 --- a/app/user/cmd/api/internal/handler/routes.go +++ b/app/main/api/internal/handler/routes.go @@ -4,13 +4,13 @@ package handler import ( "net/http" - auth "tyc-server/app/user/cmd/api/internal/handler/auth" - notification "tyc-server/app/user/cmd/api/internal/handler/notification" - pay "tyc-server/app/user/cmd/api/internal/handler/pay" - product "tyc-server/app/user/cmd/api/internal/handler/product" - query "tyc-server/app/user/cmd/api/internal/handler/query" - user "tyc-server/app/user/cmd/api/internal/handler/user" - "tyc-server/app/user/cmd/api/internal/svc" + auth "tyc-server/app/main/api/internal/handler/auth" + notification "tyc-server/app/main/api/internal/handler/notification" + pay "tyc-server/app/main/api/internal/handler/pay" + product "tyc-server/app/main/api/internal/handler/product" + query "tyc-server/app/main/api/internal/handler/query" + user "tyc-server/app/main/api/internal/handler/user" + "tyc-server/app/main/api/internal/svc" "github.com/zeromicro/go-zero/rest" ) diff --git a/app/user/cmd/api/internal/handler/user/decryptmobilehandler.go b/app/main/api/internal/handler/user/decryptmobilehandler.go similarity index 76% rename from app/user/cmd/api/internal/handler/user/decryptmobilehandler.go rename to app/main/api/internal/handler/user/decryptmobilehandler.go index 08ae769..7a67b9d 100644 --- a/app/user/cmd/api/internal/handler/user/decryptmobilehandler.go +++ b/app/main/api/internal/handler/user/decryptmobilehandler.go @@ -2,8 +2,8 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" "tyc-server/common/result" ) diff --git a/app/user/cmd/api/internal/handler/user/detailhandler.go b/app/main/api/internal/handler/user/detailhandler.go similarity index 76% rename from app/user/cmd/api/internal/handler/user/detailhandler.go rename to app/main/api/internal/handler/user/detailhandler.go index 51bcbbf..27f1cfc 100644 --- a/app/user/cmd/api/internal/handler/user/detailhandler.go +++ b/app/main/api/internal/handler/user/detailhandler.go @@ -3,8 +3,8 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" "tyc-server/common/result" ) diff --git a/app/user/cmd/api/internal/handler/user/gettokenhandler.go b/app/main/api/internal/handler/user/gettokenhandler.go similarity index 76% rename from app/user/cmd/api/internal/handler/user/gettokenhandler.go rename to app/main/api/internal/handler/user/gettokenhandler.go index b6ded03..f24906f 100644 --- a/app/user/cmd/api/internal/handler/user/gettokenhandler.go +++ b/app/main/api/internal/handler/user/gettokenhandler.go @@ -3,8 +3,8 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" "tyc-server/common/result" ) diff --git a/app/user/cmd/api/internal/handler/user/mobilecodeloginhandler.go b/app/main/api/internal/handler/user/mobilecodeloginhandler.go similarity index 82% rename from app/user/cmd/api/internal/handler/user/mobilecodeloginhandler.go rename to app/main/api/internal/handler/user/mobilecodeloginhandler.go index faa71e8..dda11ef 100644 --- a/app/user/cmd/api/internal/handler/user/mobilecodeloginhandler.go +++ b/app/main/api/internal/handler/user/mobilecodeloginhandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/user/mobileloginhandler.go b/app/main/api/internal/handler/user/mobileloginhandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/user/mobileloginhandler.go rename to app/main/api/internal/handler/user/mobileloginhandler.go index 23c873e..6ca4a0d 100644 --- a/app/user/cmd/api/internal/handler/user/mobileloginhandler.go +++ b/app/main/api/internal/handler/user/mobileloginhandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/user/registerhandler.go b/app/main/api/internal/handler/user/registerhandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/user/registerhandler.go rename to app/main/api/internal/handler/user/registerhandler.go index 4441cbe..9d45b6d 100644 --- a/app/user/cmd/api/internal/handler/user/registerhandler.go +++ b/app/main/api/internal/handler/user/registerhandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/user/wxh5authhandler.go b/app/main/api/internal/handler/user/wxh5authhandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/user/wxh5authhandler.go rename to app/main/api/internal/handler/user/wxh5authhandler.go index 05de7e9..3605489 100644 --- a/app/user/cmd/api/internal/handler/user/wxh5authhandler.go +++ b/app/main/api/internal/handler/user/wxh5authhandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/handler/user/wxminiauthhandler.go b/app/main/api/internal/handler/user/wxminiauthhandler.go similarity index 81% rename from app/user/cmd/api/internal/handler/user/wxminiauthhandler.go rename to app/main/api/internal/handler/user/wxminiauthhandler.go index 88c6da4..025887a 100644 --- a/app/user/cmd/api/internal/handler/user/wxminiauthhandler.go +++ b/app/main/api/internal/handler/user/wxminiauthhandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tyc-server/app/user/cmd/api/internal/logic/user" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/logic/user" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/result" "tyc-server/pkg/lzkit/validator" diff --git a/app/user/cmd/api/internal/logic/auth/sendsmslogic.go b/app/main/api/internal/logic/auth/sendsmslogic.go similarity index 97% rename from app/user/cmd/api/internal/logic/auth/sendsmslogic.go rename to app/main/api/internal/logic/auth/sendsmslogic.go index de63946..d670dde 100644 --- a/app/user/cmd/api/internal/logic/auth/sendsmslogic.go +++ b/app/main/api/internal/logic/auth/sendsmslogic.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" dysmsapi "github.com/alibabacloud-go/dysmsapi-20170525/v3/client" diff --git a/app/user/cmd/api/internal/logic/notification/getnotificationslogic.go b/app/main/api/internal/logic/notification/getnotificationslogic.go similarity index 95% rename from app/user/cmd/api/internal/logic/notification/getnotificationslogic.go rename to app/main/api/internal/logic/notification/getnotificationslogic.go index fedc113..948bc21 100644 --- a/app/user/cmd/api/internal/logic/notification/getnotificationslogic.go +++ b/app/main/api/internal/logic/notification/getnotificationslogic.go @@ -8,8 +8,8 @@ import ( "github.com/jinzhu/copier" "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go b/app/main/api/internal/logic/pay/alipaycallbacklogic.go similarity index 97% rename from app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go rename to app/main/api/internal/logic/pay/alipaycallbacklogic.go index e137fbf..fc96d53 100644 --- a/app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go +++ b/app/main/api/internal/logic/pay/alipaycallbacklogic.go @@ -8,7 +8,7 @@ import ( "github.com/smartwalle/alipay/v3" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/pay/iapcallbacklogic.go b/app/main/api/internal/logic/pay/iapcallbacklogic.go similarity index 96% rename from app/user/cmd/api/internal/logic/pay/iapcallbacklogic.go rename to app/main/api/internal/logic/pay/iapcallbacklogic.go index 788ddde..b2b21de 100644 --- a/app/user/cmd/api/internal/logic/pay/iapcallbacklogic.go +++ b/app/main/api/internal/logic/pay/iapcallbacklogic.go @@ -3,8 +3,8 @@ package pay import ( "context" "time" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/xerr" "tyc-server/pkg/lzkit/lzUtils" diff --git a/app/user/cmd/api/internal/logic/pay/paymentlogic.go b/app/main/api/internal/logic/pay/paymentlogic.go similarity index 96% rename from app/user/cmd/api/internal/logic/pay/paymentlogic.go rename to app/main/api/internal/logic/pay/paymentlogic.go index e12a0e7..22bbc7a 100644 --- a/app/user/cmd/api/internal/logic/pay/paymentlogic.go +++ b/app/main/api/internal/logic/pay/paymentlogic.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" "tyc-server/common/ctxdata" "tyc-server/common/xerr" diff --git a/app/user/cmd/api/internal/logic/pay/wechatpaycallbacklogic.go b/app/main/api/internal/logic/pay/wechatpaycallbacklogic.go similarity index 95% rename from app/user/cmd/api/internal/logic/pay/wechatpaycallbacklogic.go rename to app/main/api/internal/logic/pay/wechatpaycallbacklogic.go index 6fbdcaa..5edc755 100644 --- a/app/user/cmd/api/internal/logic/pay/wechatpaycallbacklogic.go +++ b/app/main/api/internal/logic/pay/wechatpaycallbacklogic.go @@ -4,10 +4,10 @@ import ( "context" "net/http" "time" - "tyc-server/app/user/cmd/api/internal/service" + "tyc-server/app/main/api/internal/service" "tyc-server/pkg/lzkit/lzUtils" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/pay/wechatpayrefundcallbacklogic.go b/app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go similarity index 97% rename from app/user/cmd/api/internal/logic/pay/wechatpayrefundcallbacklogic.go rename to app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go index bfc91b9..74b0750 100644 --- a/app/user/cmd/api/internal/logic/pay/wechatpayrefundcallbacklogic.go +++ b/app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go @@ -3,7 +3,7 @@ package pay import ( "context" "net/http" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/svc" "github.com/wechatpay-apiv3/wechatpay-go/services/refunddomestic" "github.com/zeromicro/go-zero/core/logx" diff --git a/app/user/cmd/api/internal/logic/product/getproductbyenlogic.go b/app/main/api/internal/logic/product/getproductbyenlogic.go similarity index 94% rename from app/user/cmd/api/internal/logic/product/getproductbyenlogic.go rename to app/main/api/internal/logic/product/getproductbyenlogic.go index eecf23e..83a3bae 100644 --- a/app/user/cmd/api/internal/logic/product/getproductbyenlogic.go +++ b/app/main/api/internal/logic/product/getproductbyenlogic.go @@ -2,7 +2,7 @@ package product import ( "context" - "tyc-server/app/user/model" + "tyc-server/app/main/model" "tyc-server/common/xerr" "github.com/Masterminds/squirrel" @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/mr" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/product/getproductbyidlogic.go b/app/main/api/internal/logic/product/getproductbyidlogic.go similarity index 86% rename from app/user/cmd/api/internal/logic/product/getproductbyidlogic.go rename to app/main/api/internal/logic/product/getproductbyidlogic.go index 55a548d..4e94e67 100644 --- a/app/user/cmd/api/internal/logic/product/getproductbyidlogic.go +++ b/app/main/api/internal/logic/product/getproductbyidlogic.go @@ -3,8 +3,8 @@ package product import ( "context" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/product/getproductrenderlistlogic.go b/app/main/api/internal/logic/product/getproductrenderlistlogic.go similarity index 95% rename from app/user/cmd/api/internal/logic/product/getproductrenderlistlogic.go rename to app/main/api/internal/logic/product/getproductrenderlistlogic.go index 931eb28..5bc8d08 100644 --- a/app/user/cmd/api/internal/logic/product/getproductrenderlistlogic.go +++ b/app/main/api/internal/logic/product/getproductrenderlistlogic.go @@ -2,9 +2,9 @@ package product import ( "context" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" "tyc-server/common/xerr" "github.com/Masterminds/squirrel" diff --git a/app/user/cmd/api/internal/logic/query/querydetailbyorderidlogic.go b/app/main/api/internal/logic/query/querydetailbyorderidlogic.go similarity index 98% rename from app/user/cmd/api/internal/logic/query/querydetailbyorderidlogic.go rename to app/main/api/internal/logic/query/querydetailbyorderidlogic.go index ebaec94..7caf3df 100644 --- a/app/user/cmd/api/internal/logic/query/querydetailbyorderidlogic.go +++ b/app/main/api/internal/logic/query/querydetailbyorderidlogic.go @@ -15,9 +15,9 @@ import ( "github.com/jinzhu/copier" "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/querydetailbyordernologic.go b/app/main/api/internal/logic/query/querydetailbyordernologic.go similarity index 98% rename from app/user/cmd/api/internal/logic/query/querydetailbyordernologic.go rename to app/main/api/internal/logic/query/querydetailbyordernologic.go index c34fa26..74e7403 100644 --- a/app/user/cmd/api/internal/logic/query/querydetailbyordernologic.go +++ b/app/main/api/internal/logic/query/querydetailbyordernologic.go @@ -12,9 +12,9 @@ import ( "github.com/jinzhu/copier" "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/querydetaillogic.go b/app/main/api/internal/logic/query/querydetaillogic.go similarity index 96% rename from app/user/cmd/api/internal/logic/query/querydetaillogic.go rename to app/main/api/internal/logic/query/querydetaillogic.go index 5b4abf6..94fd3ec 100644 --- a/app/user/cmd/api/internal/logic/query/querydetaillogic.go +++ b/app/main/api/internal/logic/query/querydetaillogic.go @@ -11,8 +11,8 @@ import ( "github.com/jinzhu/copier" "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/queryexamplelogic.go b/app/main/api/internal/logic/query/queryexamplelogic.go similarity index 97% rename from app/user/cmd/api/internal/logic/query/queryexamplelogic.go rename to app/main/api/internal/logic/query/queryexamplelogic.go index bea3874..9d9c592 100644 --- a/app/user/cmd/api/internal/logic/query/queryexamplelogic.go +++ b/app/main/api/internal/logic/query/queryexamplelogic.go @@ -3,8 +3,8 @@ package query import ( "context" "encoding/hex" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/xerr" "tyc-server/pkg/lzkit/crypto" diff --git a/app/user/cmd/api/internal/logic/query/querylistlogic.go b/app/main/api/internal/logic/query/querylistlogic.go similarity index 95% rename from app/user/cmd/api/internal/logic/query/querylistlogic.go rename to app/main/api/internal/logic/query/querylistlogic.go index 1da73da..51318bd 100644 --- a/app/user/cmd/api/internal/logic/query/querylistlogic.go +++ b/app/main/api/internal/logic/query/querylistlogic.go @@ -2,8 +2,8 @@ package query import ( "context" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/ctxdata" "tyc-server/common/xerr" diff --git a/app/user/cmd/api/internal/logic/query/queryprovisionalorderlogic.go b/app/main/api/internal/logic/query/queryprovisionalorderlogic.go similarity index 96% rename from app/user/cmd/api/internal/logic/query/queryprovisionalorderlogic.go rename to app/main/api/internal/logic/query/queryprovisionalorderlogic.go index 2bd246d..f3bb3a5 100644 --- a/app/user/cmd/api/internal/logic/query/queryprovisionalorderlogic.go +++ b/app/main/api/internal/logic/query/queryprovisionalorderlogic.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "encoding/json" "fmt" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "tyc-server/common/ctxdata" "tyc-server/common/xerr" "tyc-server/pkg/lzkit/crypto" diff --git a/app/user/cmd/api/internal/logic/query/queryretrylogic.go b/app/main/api/internal/logic/query/queryretrylogic.go similarity index 92% rename from app/user/cmd/api/internal/logic/query/queryretrylogic.go rename to app/main/api/internal/logic/query/queryretrylogic.go index 6efbbb0..31dedee 100644 --- a/app/user/cmd/api/internal/logic/query/queryretrylogic.go +++ b/app/main/api/internal/logic/query/queryretrylogic.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/queryservicelogic.go b/app/main/api/internal/logic/query/queryservicelogic.go similarity index 99% rename from app/user/cmd/api/internal/logic/query/queryservicelogic.go rename to app/main/api/internal/logic/query/queryservicelogic.go index a3f9454..4faac17 100644 --- a/app/user/cmd/api/internal/logic/query/queryservicelogic.go +++ b/app/main/api/internal/logic/query/queryservicelogic.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" "time" - "tyc-server/app/user/cmd/api/internal/service" + "tyc-server/app/main/api/internal/service" "tyc-server/common/ctxdata" "tyc-server/common/xerr" "tyc-server/pkg/lzkit/crypto" @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/redis" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) @@ -1221,6 +1221,16 @@ func (l *QueryServiceLogic) ProcessTocDualMarriageLogic(req *types.QueryServiceR return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr) } + // 验证男方二要素 + if verifyErrMan := l.VerifyTwoFactors(data.NameMan, data.IDCardMan); verifyErrMan != nil { + return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, "男方"+verifyErrMan.Error()), "查询服务, 男方二要素验证失败: %+v", verifyErrMan) + } + + // 验证女方二要素 + if verifyErrWoman := l.VerifyTwoFactors(data.NameWoman, data.IDCardWoman); verifyErrWoman != nil { + return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, "女方"+verifyErrWoman.Error()), "查询服务, 女方二要素验证失败: %+v", verifyErrWoman) + } + params := map[string]interface{}{ "nameMan": data.NameMan, "idCardMan": data.IDCardMan, diff --git a/app/user/cmd/api/internal/logic/query/querysingletestlogic.go b/app/main/api/internal/logic/query/querysingletestlogic.go similarity index 95% rename from app/user/cmd/api/internal/logic/query/querysingletestlogic.go rename to app/main/api/internal/logic/query/querysingletestlogic.go index 8cdecc6..a942bdf 100644 --- a/app/user/cmd/api/internal/logic/query/querysingletestlogic.go +++ b/app/main/api/internal/logic/query/querysingletestlogic.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/updatequerydatalogic.go b/app/main/api/internal/logic/query/updatequerydatalogic.go similarity index 94% rename from app/user/cmd/api/internal/logic/query/updatequerydatalogic.go rename to app/main/api/internal/logic/query/updatequerydatalogic.go index 3ba1589..10d536a 100644 --- a/app/user/cmd/api/internal/logic/query/updatequerydatalogic.go +++ b/app/main/api/internal/logic/query/updatequerydatalogic.go @@ -5,9 +5,9 @@ import ( "database/sql" "encoding/hex" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" "tyc-server/common/xerr" "tyc-server/pkg/lzkit/crypto" diff --git a/app/user/cmd/api/internal/logic/user/decryptmobilelogic.go b/app/main/api/internal/logic/user/decryptmobilelogic.go similarity index 91% rename from app/user/cmd/api/internal/logic/user/decryptmobilelogic.go rename to app/main/api/internal/logic/user/decryptmobilelogic.go index 77b7323..7f40ad6 100644 --- a/app/user/cmd/api/internal/logic/user/decryptmobilelogic.go +++ b/app/main/api/internal/logic/user/decryptmobilelogic.go @@ -3,7 +3,7 @@ package user import ( "context" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/detaillogic.go b/app/main/api/internal/logic/user/detaillogic.go similarity index 93% rename from app/user/cmd/api/internal/logic/user/detaillogic.go rename to app/main/api/internal/logic/user/detaillogic.go index 8f25116..f765bab 100644 --- a/app/user/cmd/api/internal/logic/user/detaillogic.go +++ b/app/main/api/internal/logic/user/detaillogic.go @@ -2,9 +2,9 @@ package user import ( "context" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" "tyc-server/common/ctxdata" "tyc-server/common/xerr" "tyc-server/pkg/lzkit/crypto" diff --git a/app/user/cmd/api/internal/logic/user/gettokenlogic.go b/app/main/api/internal/logic/user/gettokenlogic.go similarity index 93% rename from app/user/cmd/api/internal/logic/user/gettokenlogic.go rename to app/main/api/internal/logic/user/gettokenlogic.go index babe275..a523867 100644 --- a/app/user/cmd/api/internal/logic/user/gettokenlogic.go +++ b/app/main/api/internal/logic/user/gettokenlogic.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/mobilecodeloginlogic.go b/app/main/api/internal/logic/user/mobilecodeloginlogic.go similarity index 96% rename from app/user/cmd/api/internal/logic/user/mobilecodeloginlogic.go rename to app/main/api/internal/logic/user/mobilecodeloginlogic.go index fdfbed6..e5fa21b 100644 --- a/app/user/cmd/api/internal/logic/user/mobilecodeloginlogic.go +++ b/app/main/api/internal/logic/user/mobilecodeloginlogic.go @@ -5,9 +5,9 @@ import ( "database/sql" "fmt" "time" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" jwtx "tyc-server/common/jwt" "tyc-server/common/xerr" "tyc-server/pkg/lzkit/crypto" diff --git a/app/user/cmd/api/internal/logic/user/mobileloginlogic.go b/app/main/api/internal/logic/user/mobileloginlogic.go similarity index 94% rename from app/user/cmd/api/internal/logic/user/mobileloginlogic.go rename to app/main/api/internal/logic/user/mobileloginlogic.go index d5a7dd6..b427411 100644 --- a/app/user/cmd/api/internal/logic/user/mobileloginlogic.go +++ b/app/main/api/internal/logic/user/mobileloginlogic.go @@ -3,7 +3,7 @@ package user import ( "context" "time" - "tyc-server/app/user/model" + "tyc-server/app/main/model" jwtx "tyc-server/common/jwt" "tyc-server/common/tool" "tyc-server/common/xerr" @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/registerlogic.go b/app/main/api/internal/logic/user/registerlogic.go similarity index 97% rename from app/user/cmd/api/internal/logic/user/registerlogic.go rename to app/main/api/internal/logic/user/registerlogic.go index 9459543..cd850d2 100644 --- a/app/user/cmd/api/internal/logic/user/registerlogic.go +++ b/app/main/api/internal/logic/user/registerlogic.go @@ -5,9 +5,9 @@ import ( "database/sql" "fmt" "time" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" jwtx "tyc-server/common/jwt" "tyc-server/common/tool" "tyc-server/common/xerr" diff --git a/app/user/cmd/api/internal/logic/user/wxh5authlogic.go b/app/main/api/internal/logic/user/wxh5authlogic.go similarity index 97% rename from app/user/cmd/api/internal/logic/user/wxh5authlogic.go rename to app/main/api/internal/logic/user/wxh5authlogic.go index 089140c..d2ec324 100644 --- a/app/user/cmd/api/internal/logic/user/wxh5authlogic.go +++ b/app/main/api/internal/logic/user/wxh5authlogic.go @@ -7,14 +7,14 @@ import ( "io" "net/http" "time" - "tyc-server/app/user/model" + "tyc-server/app/main/model" jwtx "tyc-server/common/jwt" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/sqlx" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/wxminiauthlogic.go b/app/main/api/internal/logic/user/wxminiauthlogic.go similarity index 97% rename from app/user/cmd/api/internal/logic/user/wxminiauthlogic.go rename to app/main/api/internal/logic/user/wxminiauthlogic.go index fa667d9..547ece8 100644 --- a/app/user/cmd/api/internal/logic/user/wxminiauthlogic.go +++ b/app/main/api/internal/logic/user/wxminiauthlogic.go @@ -8,9 +8,9 @@ import ( "net/http" "net/url" "time" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" jwtx "tyc-server/common/jwt" "tyc-server/common/xerr" diff --git a/app/user/cmd/api/internal/middleware/sourceinterceptormiddleware.go b/app/main/api/internal/middleware/sourceinterceptormiddleware.go similarity index 100% rename from app/user/cmd/api/internal/middleware/sourceinterceptormiddleware.go rename to app/main/api/internal/middleware/sourceinterceptormiddleware.go diff --git a/app/user/cmd/api/internal/queue/carMaintenanceQuery.go b/app/main/api/internal/queue/carMaintenanceQuery.go similarity index 99% rename from app/user/cmd/api/internal/queue/carMaintenanceQuery.go rename to app/main/api/internal/queue/carMaintenanceQuery.go index 3b363eb..2bc84b1 100644 --- a/app/user/cmd/api/internal/queue/carMaintenanceQuery.go +++ b/app/main/api/internal/queue/carMaintenanceQuery.go @@ -2,7 +2,7 @@ package queue import ( "context" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/svc" "github.com/hibiken/asynq" ) diff --git a/app/user/cmd/api/internal/queue/cleanQueryData.go b/app/main/api/internal/queue/cleanQueryData.go similarity index 96% rename from app/user/cmd/api/internal/queue/cleanQueryData.go rename to app/main/api/internal/queue/cleanQueryData.go index df47b0f..1ae2440 100644 --- a/app/user/cmd/api/internal/queue/cleanQueryData.go +++ b/app/main/api/internal/queue/cleanQueryData.go @@ -3,7 +3,7 @@ package queue import ( "context" "time" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/svc" "github.com/hibiken/asynq" "github.com/zeromicro/go-zero/core/logx" diff --git a/app/user/cmd/api/internal/queue/paySuccessNotify.go b/app/main/api/internal/queue/paySuccessNotify.go similarity index 98% rename from app/user/cmd/api/internal/queue/paySuccessNotify.go rename to app/main/api/internal/queue/paySuccessNotify.go index 95a59f9..b2fea18 100644 --- a/app/user/cmd/api/internal/queue/paySuccessNotify.go +++ b/app/main/api/internal/queue/paySuccessNotify.go @@ -7,9 +7,9 @@ import ( "fmt" "regexp" "strings" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" + "tyc-server/app/main/model" "tyc-server/pkg/lzkit/crypto" "tyc-server/pkg/lzkit/lzUtils" diff --git a/app/user/cmd/api/internal/queue/routes.go b/app/main/api/internal/queue/routes.go similarity index 92% rename from app/user/cmd/api/internal/queue/routes.go rename to app/main/api/internal/queue/routes.go index d8f5a13..8a57317 100644 --- a/app/user/cmd/api/internal/queue/routes.go +++ b/app/main/api/internal/queue/routes.go @@ -3,8 +3,8 @@ package queue import ( "context" "fmt" - "tyc-server/app/user/cmd/api/internal/svc" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/svc" + "tyc-server/app/main/api/internal/types" "github.com/hibiken/asynq" ) diff --git a/app/user/cmd/api/internal/service/alipayService.go b/app/main/api/internal/service/alipayService.go similarity index 99% rename from app/user/cmd/api/internal/service/alipayService.go rename to app/main/api/internal/service/alipayService.go index 32620fa..7290bd5 100644 --- a/app/user/cmd/api/internal/service/alipayService.go +++ b/app/main/api/internal/service/alipayService.go @@ -9,7 +9,7 @@ import ( "strconv" "sync/atomic" "time" - "tyc-server/app/user/cmd/api/internal/config" + "tyc-server/app/main/api/internal/config" "tyc-server/pkg/lzkit/lzUtils" "github.com/smartwalle/alipay/v3" diff --git a/app/user/cmd/api/internal/service/apirequestService.go b/app/main/api/internal/service/apirequestService.go similarity index 99% rename from app/user/cmd/api/internal/service/apirequestService.go rename to app/main/api/internal/service/apirequestService.go index f72bc1a..27c6525 100644 --- a/app/user/cmd/api/internal/service/apirequestService.go +++ b/app/main/api/internal/service/apirequestService.go @@ -13,8 +13,8 @@ import ( "sync" "sync/atomic" "time" - "tyc-server/app/user/cmd/api/internal/config" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/config" + "tyc-server/app/main/model" "tyc-server/pkg/lzkit/crypto" "tyc-server/pkg/lzkit/lzUtils" diff --git a/app/user/cmd/api/internal/service/applepayService.go b/app/main/api/internal/service/applepayService.go similarity index 98% rename from app/user/cmd/api/internal/service/applepayService.go rename to app/main/api/internal/service/applepayService.go index 81d0114..1301c96 100644 --- a/app/user/cmd/api/internal/service/applepayService.go +++ b/app/main/api/internal/service/applepayService.go @@ -11,7 +11,7 @@ import ( "net/http" "strconv" "time" - "tyc-server/app/user/cmd/api/internal/config" + "tyc-server/app/main/api/internal/config" "github.com/golang-jwt/jwt/v4" ) diff --git a/app/user/cmd/api/internal/service/asynqService.go b/app/main/api/internal/service/asynqService.go similarity index 97% rename from app/user/cmd/api/internal/service/asynqService.go rename to app/main/api/internal/service/asynqService.go index bf4b8dc..6957ca9 100644 --- a/app/user/cmd/api/internal/service/asynqService.go +++ b/app/main/api/internal/service/asynqService.go @@ -5,8 +5,8 @@ package service import ( "encoding/json" "time" - "tyc-server/app/user/cmd/api/internal/config" - "tyc-server/app/user/cmd/api/internal/types" + "tyc-server/app/main/api/internal/config" + "tyc-server/app/main/api/internal/types" "github.com/hibiken/asynq" "github.com/zeromicro/go-zero/core/logx" diff --git a/app/user/cmd/api/internal/service/tianjuService.go b/app/main/api/internal/service/tianjuService.go similarity index 97% rename from app/user/cmd/api/internal/service/tianjuService.go rename to app/main/api/internal/service/tianjuService.go index ea76996..06385cc 100644 --- a/app/user/cmd/api/internal/service/tianjuService.go +++ b/app/main/api/internal/service/tianjuService.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" "strings" - "tyc-server/app/user/cmd/api/internal/config" + "tyc-server/app/main/api/internal/config" "github.com/tidwall/gjson" ) diff --git a/app/user/cmd/api/internal/service/verificationService.go b/app/main/api/internal/service/verificationService.go similarity index 99% rename from app/user/cmd/api/internal/service/verificationService.go rename to app/main/api/internal/service/verificationService.go index a439a70..2f5bf92 100644 --- a/app/user/cmd/api/internal/service/verificationService.go +++ b/app/main/api/internal/service/verificationService.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" "strings" - "tyc-server/app/user/cmd/api/internal/config" + "tyc-server/app/main/api/internal/config" "tyc-server/pkg/lzkit/crypto" "github.com/tidwall/gjson" diff --git a/app/user/cmd/api/internal/service/wechatpayService.go b/app/main/api/internal/service/wechatpayService.go similarity index 99% rename from app/user/cmd/api/internal/service/wechatpayService.go rename to app/main/api/internal/service/wechatpayService.go index be6c3df..98a57b3 100644 --- a/app/user/cmd/api/internal/service/wechatpayService.go +++ b/app/main/api/internal/service/wechatpayService.go @@ -6,8 +6,8 @@ import ( "net/http" "strconv" "time" - "tyc-server/app/user/cmd/api/internal/config" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/config" + "tyc-server/app/main/model" "tyc-server/common/ctxdata" "tyc-server/pkg/lzkit/lzUtils" diff --git a/app/user/cmd/api/internal/service/westdexService.go b/app/main/api/internal/service/westdexService.go similarity index 99% rename from app/user/cmd/api/internal/service/westdexService.go rename to app/main/api/internal/service/westdexService.go index ae5298d..a221fe1 100644 --- a/app/user/cmd/api/internal/service/westdexService.go +++ b/app/main/api/internal/service/westdexService.go @@ -9,7 +9,7 @@ import ( "net/http" "strconv" "time" - "tyc-server/app/user/cmd/api/internal/config" + "tyc-server/app/main/api/internal/config" "tyc-server/pkg/lzkit/crypto" "github.com/pkg/errors" diff --git a/app/user/cmd/api/internal/service/yushanService.go b/app/main/api/internal/service/yushanService.go similarity index 99% rename from app/user/cmd/api/internal/service/yushanService.go rename to app/main/api/internal/service/yushanService.go index 669825a..b001f4f 100644 --- a/app/user/cmd/api/internal/service/yushanService.go +++ b/app/main/api/internal/service/yushanService.go @@ -14,7 +14,7 @@ import ( "net/http" "strings" "time" - "tyc-server/app/user/cmd/api/internal/config" + "tyc-server/app/main/api/internal/config" "github.com/tidwall/gjson" ) diff --git a/app/user/cmd/api/internal/svc/servicecontext.go b/app/main/api/internal/svc/servicecontext.go similarity index 95% rename from app/user/cmd/api/internal/svc/servicecontext.go rename to app/main/api/internal/svc/servicecontext.go index 42d659c..aad67aa 100644 --- a/app/user/cmd/api/internal/svc/servicecontext.go +++ b/app/main/api/internal/svc/servicecontext.go @@ -1,10 +1,10 @@ package svc import ( - "tyc-server/app/user/cmd/api/internal/config" - "tyc-server/app/user/cmd/api/internal/middleware" - "tyc-server/app/user/cmd/api/internal/service" - "tyc-server/app/user/model" + "tyc-server/app/main/api/internal/config" + "tyc-server/app/main/api/internal/middleware" + "tyc-server/app/main/api/internal/service" + "tyc-server/app/main/model" "github.com/hibiken/asynq" "github.com/zeromicro/go-zero/core/logx" diff --git a/app/user/cmd/api/internal/types/cache.go b/app/main/api/internal/types/cache.go similarity index 100% rename from app/user/cmd/api/internal/types/cache.go rename to app/main/api/internal/types/cache.go diff --git a/app/user/cmd/api/internal/types/payload.go b/app/main/api/internal/types/payload.go similarity index 100% rename from app/user/cmd/api/internal/types/payload.go rename to app/main/api/internal/types/payload.go diff --git a/app/user/cmd/api/internal/types/query.go b/app/main/api/internal/types/query.go similarity index 100% rename from app/user/cmd/api/internal/types/query.go rename to app/main/api/internal/types/query.go diff --git a/app/user/cmd/api/internal/types/queryMap.go b/app/main/api/internal/types/queryMap.go similarity index 100% rename from app/user/cmd/api/internal/types/queryMap.go rename to app/main/api/internal/types/queryMap.go diff --git a/app/user/cmd/api/internal/types/queryParams.go b/app/main/api/internal/types/queryParams.go similarity index 100% rename from app/user/cmd/api/internal/types/queryParams.go rename to app/main/api/internal/types/queryParams.go diff --git a/app/user/cmd/api/internal/types/taskname.go b/app/main/api/internal/types/taskname.go similarity index 100% rename from app/user/cmd/api/internal/types/taskname.go rename to app/main/api/internal/types/taskname.go diff --git a/app/user/cmd/api/internal/types/types.go b/app/main/api/internal/types/types.go similarity index 100% rename from app/user/cmd/api/internal/types/types.go rename to app/main/api/internal/types/types.go diff --git a/app/user/cmd/api/main.go b/app/main/api/main.go similarity index 84% rename from app/user/cmd/api/main.go rename to app/main/api/main.go index f482167..95ffd2d 100644 --- a/app/user/cmd/api/main.go +++ b/app/main/api/main.go @@ -5,10 +5,10 @@ import ( "flag" "fmt" "os" - "tyc-server/app/user/cmd/api/internal/config" - "tyc-server/app/user/cmd/api/internal/handler" - "tyc-server/app/user/cmd/api/internal/queue" - "tyc-server/app/user/cmd/api/internal/svc" + "tyc-server/app/main/api/internal/config" + "tyc-server/app/main/api/internal/handler" + "tyc-server/app/main/api/internal/queue" + "tyc-server/app/main/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" @@ -26,7 +26,7 @@ func main() { // 根据 ENV 加载不同的配置文件 var defaultConfigFile string if env == "development" { - defaultConfigFile = "app/user/cmd/api/etc/main.dev.yaml" + defaultConfigFile = "app/main/api/etc/main.dev.yaml" } else { defaultConfigFile = "etc/main.yaml" // 生产环境配置 } diff --git a/app/user/model/exampleModel.go b/app/main/model/exampleModel.go similarity index 100% rename from app/user/model/exampleModel.go rename to app/main/model/exampleModel.go diff --git a/app/user/model/exampleModel_gen.go b/app/main/model/exampleModel_gen.go similarity index 100% rename from app/user/model/exampleModel_gen.go rename to app/main/model/exampleModel_gen.go diff --git a/app/user/model/exampleParamsModel.go b/app/main/model/exampleParamsModel.go similarity index 100% rename from app/user/model/exampleParamsModel.go rename to app/main/model/exampleParamsModel.go diff --git a/app/user/model/exampleParamsModel_gen.go b/app/main/model/exampleParamsModel_gen.go similarity index 100% rename from app/user/model/exampleParamsModel_gen.go rename to app/main/model/exampleParamsModel_gen.go diff --git a/app/user/model/featureModel.go b/app/main/model/featureModel.go similarity index 100% rename from app/user/model/featureModel.go rename to app/main/model/featureModel.go diff --git a/app/user/model/featureModel_gen.go b/app/main/model/featureModel_gen.go similarity index 100% rename from app/user/model/featureModel_gen.go rename to app/main/model/featureModel_gen.go diff --git a/app/user/model/globalNotificationsModel.go b/app/main/model/globalNotificationsModel.go similarity index 100% rename from app/user/model/globalNotificationsModel.go rename to app/main/model/globalNotificationsModel.go diff --git a/app/user/model/globalNotificationsModel_gen.go b/app/main/model/globalNotificationsModel_gen.go similarity index 100% rename from app/user/model/globalNotificationsModel_gen.go rename to app/main/model/globalNotificationsModel_gen.go diff --git a/app/user/model/orderModel.go b/app/main/model/orderModel.go similarity index 100% rename from app/user/model/orderModel.go rename to app/main/model/orderModel.go diff --git a/app/user/model/orderModel_gen.go b/app/main/model/orderModel_gen.go similarity index 100% rename from app/user/model/orderModel_gen.go rename to app/main/model/orderModel_gen.go diff --git a/app/user/model/productFeatureModel.go b/app/main/model/productFeatureModel.go similarity index 100% rename from app/user/model/productFeatureModel.go rename to app/main/model/productFeatureModel.go diff --git a/app/user/model/productFeatureModel_gen.go b/app/main/model/productFeatureModel_gen.go similarity index 100% rename from app/user/model/productFeatureModel_gen.go rename to app/main/model/productFeatureModel_gen.go diff --git a/app/user/model/productModel.go b/app/main/model/productModel.go similarity index 100% rename from app/user/model/productModel.go rename to app/main/model/productModel.go diff --git a/app/user/model/productModel_gen.go b/app/main/model/productModel_gen.go similarity index 100% rename from app/user/model/productModel_gen.go rename to app/main/model/productModel_gen.go diff --git a/app/user/model/productRenderModel.go b/app/main/model/productRenderModel.go similarity index 100% rename from app/user/model/productRenderModel.go rename to app/main/model/productRenderModel.go diff --git a/app/user/model/productRenderModel_gen.go b/app/main/model/productRenderModel_gen.go similarity index 100% rename from app/user/model/productRenderModel_gen.go rename to app/main/model/productRenderModel_gen.go diff --git a/app/user/model/queryModel.go b/app/main/model/queryModel.go similarity index 100% rename from app/user/model/queryModel.go rename to app/main/model/queryModel.go diff --git a/app/user/model/queryModel_gen.go b/app/main/model/queryModel_gen.go similarity index 100% rename from app/user/model/queryModel_gen.go rename to app/main/model/queryModel_gen.go diff --git a/app/user/model/userAuthModel.go b/app/main/model/userAuthModel.go similarity index 100% rename from app/user/model/userAuthModel.go rename to app/main/model/userAuthModel.go diff --git a/app/user/model/userAuthModel_gen.go b/app/main/model/userAuthModel_gen.go similarity index 100% rename from app/user/model/userAuthModel_gen.go rename to app/main/model/userAuthModel_gen.go diff --git a/app/user/model/userModel.go b/app/main/model/userModel.go similarity index 100% rename from app/user/model/userModel.go rename to app/main/model/userModel.go diff --git a/app/user/model/userModel_gen.go b/app/main/model/userModel_gen.go similarity index 100% rename from app/user/model/userModel_gen.go rename to app/main/model/userModel_gen.go diff --git a/app/user/model/vars.go b/app/main/model/vars.go similarity index 100% rename from app/user/model/vars.go rename to app/main/model/vars.go diff --git a/app/user/cmd/api/desc/main.api b/app/user/cmd/api/desc/main.api deleted file mode 100644 index b735f1d..0000000 --- a/app/user/cmd/api/desc/main.api +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "v1" - -info ( - title: "单体服务中心" - desc: "单体服务中心" - author: "Liangzai" - email: "2440983361@qq.com" - version: "v1" -) - -import "user.api" -import "query.api" -import "pay.api" -import "product.api" diff --git a/deploy/sql/admin_rbac.sql b/deploy/sql/admin_rbac.sql new file mode 100644 index 0000000..b41ff0c --- /dev/null +++ b/deploy/sql/admin_rbac.sql @@ -0,0 +1,152 @@ +-- 用户表 +CREATE TABLE `admin_user` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + `username` varchar(50) NOT NULL DEFAULT '' COMMENT '用户名', + `password` varchar(255) NOT NULL DEFAULT '' COMMENT '密码', + `status` tinyint NOT NULL DEFAULT '1' COMMENT '状态：0-禁用，1-启用', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + UNIQUE KEY `uk_username` (`username`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='管理员用户表'; + +-- 角色表 +CREATE TABLE `admin_role` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + `role_name` varchar(50) NOT NULL DEFAULT '' COMMENT '角色名称', + `role_code` varchar(50) NOT NULL DEFAULT '' COMMENT '角色编码', + `description` varchar(255) NOT NULL DEFAULT '' COMMENT '角色描述', + `status` tinyint NOT NULL DEFAULT '1' COMMENT '状态：0-禁用，1-启用', + `sort` int NOT NULL DEFAULT '0' COMMENT '排序', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + UNIQUE KEY `uk_role_code` (`role_code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='角色表'; + +-- 菜单表 +CREATE TABLE `admin_menu` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + `parent_id` bigint NOT NULL DEFAULT '0' COMMENT '父菜单ID', + `menu_name` varchar(50) NOT NULL DEFAULT '' COMMENT '菜单名称', + `menu_code` varchar(100) NOT NULL DEFAULT '' COMMENT '菜单编码', + `path` varchar(255) NOT NULL DEFAULT '' COMMENT '路由路径', + `component` varchar(255) NOT NULL DEFAULT '' COMMENT '组件路径', + `icon` varchar(100) NOT NULL DEFAULT '' COMMENT '图标', + `sort` int NOT NULL DEFAULT '0' COMMENT '排序', + `visible` tinyint NOT NULL DEFAULT '1' COMMENT '是否可见：0-隐藏，1-显示', + `status` tinyint NOT NULL DEFAULT '1' COMMENT '状态：0-禁用，1-启用', + `is_cache` tinyint NOT NULL DEFAULT '0' COMMENT '是否缓存：0-不缓存，1-缓存', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + UNIQUE KEY `uk_menu_code` (`menu_code`), + KEY `idx_parent_id` (`parent_id`) COMMENT '优化层级查询' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='菜单表'; + +-- 接口表 +CREATE TABLE `admin_api` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + `api_name` varchar(100) NOT NULL DEFAULT '' COMMENT '接口名称', + `api_code` varchar(100) NOT NULL DEFAULT '' COMMENT '接口编码', + `method` varchar(10) NOT NULL DEFAULT '' COMMENT '请求方法：GET、POST等', + `url` varchar(255) NOT NULL DEFAULT '' COMMENT '接口URL', + `status` tinyint NOT NULL DEFAULT '1' COMMENT '状态：0-禁用，1-启用', + `description` varchar(255) NOT NULL DEFAULT '' COMMENT '接口描述', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + UNIQUE KEY `uk_api_code` (`api_code`), + KEY `idx_url_method` (`url`, `method`) COMMENT '优化接口查询' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='接口表'; + +-- 用户角色关联表 +CREATE TABLE `admin_user_role` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + /* 关联字段 - 软关联 */ + `user_id` bigint NOT NULL DEFAULT '0' COMMENT '关联到用户表的id', + `role_id` bigint NOT NULL DEFAULT '0' COMMENT '关联到角色表的id', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + UNIQUE KEY `uk_user_role` (`user_id`, `role_id`), + KEY `idx_user_id` (`user_id`) COMMENT '优化用户查询', + KEY `idx_role_id` (`role_id`) COMMENT '优化角色查询' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户角色关联表'; + +-- 角色菜单关联表 +CREATE TABLE `admin_role_menu` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + /* 关联字段 - 软关联 */ + `role_id` bigint NOT NULL DEFAULT '0' COMMENT '关联到角色表的id', + `menu_id` bigint NOT NULL DEFAULT '0' COMMENT '关联到菜单表的id', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + UNIQUE KEY `uk_role_menu` (`role_id`, `menu_id`), + KEY `idx_role_id` (`role_id`) COMMENT '优化角色查询', + KEY `idx_menu_id` (`menu_id`) COMMENT '优化菜单查询' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='角色菜单关联表'; + +-- 角色接口关联表 +CREATE TABLE `admin_role_api` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + /* 关联字段 - 软关联 */ + `role_id` bigint NOT NULL DEFAULT '0' COMMENT '关联到角色表的id', + `api_id` bigint NOT NULL DEFAULT '0' COMMENT '关联到接口表的id', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + UNIQUE KEY `uk_role_api` (`role_id`, `api_id`), + KEY `idx_role_id` (`role_id`) COMMENT '优化角色查询', + KEY `idx_api_id` (`api_id`) COMMENT '优化接口查询' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='角色接口关联表'; \ No newline at end of file diff --git a/deploy/sql/template.sql b/deploy/sql/template.sql new file mode 100644 index 0000000..1e732f4 --- /dev/null +++ b/deploy/sql/template.sql @@ -0,0 +1,20 @@ +CREATE TABLE `表名` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `delete_time` datetime DEFAULT NULL COMMENT '删除时间', + `del_state` tinyint NOT NULL DEFAULT '0', + `version` bigint NOT NULL DEFAULT '0' COMMENT '版本号', + + /* 业务字段开始 */ + `字段1` 数据类型 [约束条件] [DEFAULT 默认值] [COMMENT '字段说明'], + `字段2` 数据类型 [约束条件] [DEFAULT 默认值] [COMMENT '字段说明'], + /* 关联字段 - 软关联 */ + `关联表id` bigint [NOT NULL] [DEFAULT '0'] COMMENT '关联到XX表的id', + /* 业务字段结束 */ + + PRIMARY KEY (`id`), + /* 索引定义 */ + UNIQUE KEY `索引名称` (`字段名`), + KEY `idx_关联字段` (`关联表id`) COMMENT '优化关联查询' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表说明'; \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b50a810..d675403 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -69,7 +69,7 @@ services: container_name: tyc_main build: context: . - dockerfile: ./app/user/cmd/api/Dockerfile + dockerfile: ./app/main/api/Dockerfile ports: - "20004:8888" environment: diff --git a/gen_api.ps1 b/gen_api.ps1 index 32eca87..d571f8e 100644 --- a/gen_api.ps1 +++ b/gen_api.ps1 @@ -1,2 +1,2 @@ # API生成脚本 -goctl api go --api ./app/user/cmd/api/desc/main.api --dir ./app/user/cmd/api --home ./deploy/template \ No newline at end of file +goctl api go --api ./app/main/api/desc/main.api --dir ./app/main/api --home ./deploy/template \ No newline at end of file diff --git a/go.mod b/go.mod index 70fe7ae..699bf31 100644 --- a/go.mod +++ b/go.mod @@ -8,13 +8,16 @@ require ( github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6 github.com/alibabacloud-go/tea v1.2.2 github.com/alibabacloud-go/tea-utils/v2 v2.0.7 + github.com/bytedance/sonic v1.13.1 github.com/go-playground/validator/v10 v10.22.1 github.com/golang-jwt/jwt/v4 v4.5.0 + github.com/hibiken/asynq v0.25.0 github.com/jinzhu/copier v0.4.0 github.com/pkg/errors v0.9.1 github.com/shopspring/decimal v1.4.0 github.com/smartwalle/alipay/v3 v3.2.23 github.com/sony/sonyflake v1.2.0 + github.com/tidwall/gjson v1.18.0 github.com/wechatpay-apiv3/wechatpay-go v0.2.20 github.com/zeromicro/go-zero v1.7.3 google.golang.org/grpc v1.67.1 @@ -30,7 +33,6 @@ require ( github.com/alibabacloud-go/tea-xml v1.1.3 // indirect github.com/aliyun/credentials-go v1.3.10 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bytedance/sonic v1.13.1 // indirect github.com/bytedance/sonic/loader v0.2.4 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -46,7 +48,6 @@ require ( github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect - github.com/hibiken/asynq v0.25.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect @@ -59,7 +60,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect - github.com/panjf2000/ants/v2 v2.10.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect @@ -67,14 +67,12 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect github.com/redis/go-redis/v9 v9.7.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect - github.com/samber/lo v1.49.1 // indirect - github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/smartwalle/ncrypto v1.0.4 // indirect github.com/smartwalle/ngx v1.0.9 // indirect github.com/smartwalle/nsign v1.0.9 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/cast v1.7.0 // indirect - github.com/tidwall/gjson v1.18.0 // indirect + github.com/stretchr/testify v1.10.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect @@ -94,7 +92,6 @@ require ( golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect golang.org/x/crypto v0.28.0 // indirect golang.org/x/net v0.30.0 // indirect - golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect diff --git a/go.sum b/go.sum index a2952c3..d6f593b 100644 --- a/go.sum +++ b/go.sum @@ -99,6 +99,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -176,6 +178,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -188,8 +192,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg= github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c= -github.com/panjf2000/ants/v2 v2.10.0 h1:zhRg1pQUtkyRiOFo2Sbqwjp0GfBNo9cUY2/Grpx1p+8= -github.com/panjf2000/ants/v2 v2.10.0/go.mod h1:7ZxyxsqE4vvW0M7LSD8aI3cKwgFhBHbxnlN8mDqHa1I= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -209,14 +211,12 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew= -github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o= -github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= -github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/smartwalle/alipay/v3 v3.2.23 h1:i1VwJeu70EmwpsXXz6GZZnMAtRx5MTfn2dPoql/L3zE= @@ -249,11 +249,10 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -351,11 +350,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= -golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -392,8 +386,6 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= @@ -437,6 +429,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= +gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=