new

.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"
 # 运行时的参数

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
+COPY app/main/api/etc /app/etc
-RUN go build -ldflags="-s -w" -o /app/user app/user/cmd/api/main.go
+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"]

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"

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/main/api/internal/logic/auth"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/notification"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/common/result"
 )
 

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/main/api/internal/logic/pay"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/common/result"
 )
 

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/main/api/internal/logic/pay"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/pay"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/pay"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/common/result"
 )
 

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/main/api/internal/logic/pay"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/common/result"
 )
 

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/main/api/internal/logic/product"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/product"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/product"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 
 	"github.com/zeromicro/go-zero/rest/httpx"

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/query"
-	"tyc-server/app/user/cmd/api/internal/logic/query"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/cmd/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 {

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"
+	auth "tyc-server/app/main/api/internal/handler/auth"
-	notification "tyc-server/app/user/cmd/api/internal/handler/notification"
+	notification "tyc-server/app/main/api/internal/handler/notification"
-	pay "tyc-server/app/user/cmd/api/internal/handler/pay"
+	pay "tyc-server/app/main/api/internal/handler/pay"
-	product "tyc-server/app/user/cmd/api/internal/handler/product"
+	product "tyc-server/app/main/api/internal/handler/product"
-	query "tyc-server/app/user/cmd/api/internal/handler/query"
+	query "tyc-server/app/main/api/internal/handler/query"
-	user "tyc-server/app/user/cmd/api/internal/handler/user"
+	user "tyc-server/app/main/api/internal/handler/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 
 	"github.com/zeromicro/go-zero/rest"
 )

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/common/result"
 )
 

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/common/result"
 )
 

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/common/result"
 )
 

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/logic/user"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"tyc-server/app/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/result"
 	"tyc-server/pkg/lzkit/validator"
 

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"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"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/xerr"
 	"tyc-server/pkg/lzkit/lzUtils"
 

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	"tyc-server/common/ctxdata"
 	"tyc-server/common/xerr"
 

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"
 )

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"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	"tyc-server/common/xerr"
 
 	"github.com/Masterminds/squirrel"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/xerr"
 	"tyc-server/pkg/lzkit/crypto"
 

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/ctxdata"
 	"tyc-server/common/xerr"
 

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 	"tyc-server/common/ctxdata"
 	"tyc-server/common/xerr"
 	"tyc-server/pkg/lzkit/crypto"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"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,

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	"tyc-server/common/xerr"
 	"tyc-server/pkg/lzkit/crypto"
 

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"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	"tyc-server/common/ctxdata"
 	"tyc-server/common/xerr"
 	"tyc-server/pkg/lzkit/crypto"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	jwtx "tyc-server/common/jwt"
 	"tyc-server/common/xerr"
 	"tyc-server/pkg/lzkit/crypto"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	jwtx "tyc-server/common/jwt"
 	"tyc-server/common/tool"
 	"tyc-server/common/xerr"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	jwtx "tyc-server/common/jwt"
 	"tyc-server/common/xerr"
 

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"
 )

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"

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	"tyc-server/pkg/lzkit/crypto"
 	"tyc-server/pkg/lzkit/lzUtils"
 

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/main/api/internal/svc"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/hibiken/asynq"
 )

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"

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/main/api/internal/config"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	"tyc-server/pkg/lzkit/crypto"
 	"tyc-server/pkg/lzkit/lzUtils"
 

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"
 )

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/main/api/internal/config"
-	"tyc-server/app/user/cmd/api/internal/types"
+	"tyc-server/app/main/api/internal/types"
 
 	"github.com/hibiken/asynq"
 	"github.com/zeromicro/go-zero/core/logx"

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"
 )

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"

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/main/api/internal/config"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 	"tyc-server/common/ctxdata"
 	"tyc-server/pkg/lzkit/lzUtils"
 

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"

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"
 )

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/main/api/internal/config"
-	"tyc-server/app/user/cmd/api/internal/middleware"
+	"tyc-server/app/main/api/internal/middleware"
-	"tyc-server/app/user/cmd/api/internal/service"
+	"tyc-server/app/main/api/internal/service"
-	"tyc-server/app/user/model"
+	"tyc-server/app/main/model"
 
 	"github.com/hibiken/asynq"
 	"github.com/zeromicro/go-zero/core/logx"

app/main/api/main.go

@@ -5,10 +5,10 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"tyc-server/app/user/cmd/api/internal/config"
+	"tyc-server/app/main/api/internal/config"
-	"tyc-server/app/user/cmd/api/internal/handler"
+	"tyc-server/app/main/api/internal/handler"
-	"tyc-server/app/user/cmd/api/internal/queue"
+	"tyc-server/app/main/api/internal/queue"
-	"tyc-server/app/user/cmd/api/internal/svc"
+	"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" // 生产环境配置
 	}