Merge pull request #152 from Ada0317/main-dev

fix PaySuccessNotify in cronJob

Author: Mikaelemmmm

README.md

@@ -16,7 +16,7 @@ I may have contacted go zero earlier. I have been using go zero since about 1000
 
 
 
-##### Tips : If you are not familiar with many of the technology stack here, do not be afraid, as long as you will mysql, redis can start these two middleware in the start of the project first run up the project, the other can slowly learn.
+##### Tips : If you are unfamiliar with the technologies in the current stack, don't worry. Simply start by mastering MySQL and Redis. Begin your project by running these two middleware components, and gradually expand your knowledge of the remaining technologies as you progress.
 
 
 

app/mqueue/cmd/job/internal/logic/routes.go

@@ -7,7 +7,6 @@ import (
 	"looklook/app/mqueue/cmd/job/jobtype"
 )
 
-
 type CronJob struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
@@ -26,15 +25,15 @@ func (l *CronJob) Register() *asynq.ServeMux {
 	mux := asynq.NewServeMux()
 
 	//scheduler job
-	mux.Handle(jobtype.ScheduleSettleRecord,NewSettleRecordHandler(l.svcCtx))
+	mux.Handle(jobtype.ScheduleSettleRecord, NewSettleRecordHandler(l.svcCtx))
 
 	//defer job
-	mux.Handle(jobtype.DeferCloseHomestayOrder,NewCloseHomestayOrderHandler(l.svcCtx))
+	mux.Handle(jobtype.DeferCloseHomestayOrder, NewCloseHomestayOrderHandler(l.svcCtx))
 
+	//SuccessNotifyUser job
+	mux.Handle(jobtype.MsgPaySuccessNotifyUser, NewPaySuccessNotifyUserHandler(l.svcCtx))
 	//queue job , asynq support queue job
 	// wait you fill..
 
 	return mux
 }
-
-

app/payment/cmd/api/internal/logic/thirdPayment/thirdPaymentwxPayLogic.go

@@ -54,7 +54,7 @@ func (l *ThirdPaymentwxPayLogic) ThirdPaymentwxPay(req types.ThirdPaymentWxPayRe
 		return nil, errors.Wrapf(xerr.NewErrMsg("Payment for this business type is not supported"), "Payment for this business type is not supported req: %+v", req)
 	}
 
-	// Create microsoft pre-processing orders
+	// Create WechatPay pre-processing orders
 	wechatPrepayRsp, err := l.createWxPrePayOrder(req.ServiceType, req.OrderSn, totalPrice, description)
 	if err != nil {
 		return nil, err

app/travel/cmd/api/etc/travel.yaml

@@ -29,7 +29,7 @@ Cache:
 #rpc
 UsercenterRpcConf:
   Endpoints:
-    - 12.0.0.1:2004
+    - 127.0.0.1:2004
   NonBlock: true
 
 TravelRpcConf:

deploy/goctl/1.5.3.zip

@@ -13,10 +13,10 @@ modeldir=./genModel
 
 # 数据库配置
 host=127.0.0.1
-port=3306
+port=33069
 dbname=looklook_$1
 username=root
-passwd=
+passwd=PXDN93VRKUm8TeE7
 
 
 echo "开始创建库：$dbname 的表：$2"

deploy/script/mysql/genModel.sh

@@ -145,7 +145,7 @@ $ docker exec -it kafka /bin/sh
 $ cd /opt/kafka/bin/
 ```
 
-创建3个topic
+创建2个topic
 
 ```shell
 $ ./kafka-topics.sh --create --zookeeper zookeeper:2181 --replication-factor 1 -partitions 1 --topic looklook-log
@@ -235,7 +235,7 @@ Kafka:  （发布、订阅｜pub、sub）自行客户端工具查看
 直接docker-compose去启动可以，但是考虑依赖可能会比较大，会影响启动项目，所以最好先把这个镜像拉取下来再去启动项目
 
 ```shell
-$ docker pull lyumikael/gomodd:v1.0.0 #这个是app下所有的api+rpc启动服务使用的，如果你是 "mac m1" : lyumikael/go-modd-env:v1.0.0
+$ docker pull lyumikael/gomodd:v1.20.3 #这个是app下所有的api+rpc启动服务使用的，如果你是 "mac m1" : lyumikael/go-modd-env:v1.0.0
 ```
 
 【注】后续如果app下新增业务，要记得在项目根目录下的modd.conf复制添加一份就可以了
@@ -413,14 +413,16 @@ goctl >= 1.3 进入"服务/cmd/rpc/pb"目录下，执行下面命令
 
 ```shell
 $ goctl rpc protoc *.proto --go_out=../ --go-grpc_out=../  --zrpc_out=../
-$ sed -i "" 's/,omitempty//g' *.pb.go
+$ sed -i 's/,omitempty//g' *.pb.go #linux
+$ sed -i "" 's/,omitempty//g' *.pb.go #mac
 ```
 
 goctl < 1.3 进入"服务/cmd"目录下，执行下面命令
 
 ```shell
 $  goctl rpc proto -src rpc/pb/*.proto -dir ./rpc -style=goZero
-$  sed -i "" 's/,omitempty//g'  ./rpc/pb/*.pb.go
+$  sed -i 's/,omitempty//g'  ./rpc/pb/*.pb.go #linux
+$  sed -i "" 's/,omitempty//g'  ./rpc/pb/*.pb.go #mac
 ```
 
 【注】建议在生成rpc文件时候，在多执行一次下面那个命令，把protobuf生成的omitempty给删除掉，不然字段为nil就不返回了

doc/chinese/01-开发环境搭建.md

@@ -42,7 +42,7 @@ package handler
 
 ```
 
-我们可以看到在路由中给我们使用了rest.WithJwt , 就是针对一组路由使用了jwt鉴权，具体实现可以去看一下rest.WithJwt源码，go-zero jwt还实现了自动刷新token功能，这个留给大家自己去查看源码发现一下。
+我们可以看到在路由中给我们使用了rest.WithJwt , 就是针对一组路由使用了jwt鉴权，具体实现可以去看一下rest.WithJwt源码。
 
 
 

doc/chinese/03-鉴权服务.md

@@ -332,7 +332,7 @@ func (l *RegisterLogic) Register(req types.RegisterReq) (*types.RegisterResp, er
 
 ​	1）api服务想把rpc返回给前端友好的错误提示信息，我们想直接返回给前端不做任何处理（比如rpc已经返回了“用户已存在”，api不想做什么处理，就想把这个错误信息直接返回给前端）
 
-​		  针对这种情况，直接就像上图这种写就可以了，将rpc调用处的err直接作为errors.Wrapf 第一个参数扔出去，但是第二个参数最好记录一下自己需要的详细日志方便后续在api中国呢查看
+​		  针对这种情况，直接就像上图这种写就可以了，将rpc调用处的err直接作为errors.Wrapf 第一个参数扔出去，但是第二个参数最好记录一下自己需要的详细日志方便后续在api中查看
 
 ​    2）api服务不管rpc返回的是什么错误信息，我就想自己在重新定义给前端返回错误信息（比如rpc已经返回了“用户已存在”，api想调用rpc时只要有错误我就返回给前端“用户注册失败”）
 
@@ -433,7 +433,7 @@ errcode ： 返回给前端的错误码
 
 errmsg ：返回给前端的友好的错误提示信息
 
-成功直接返回，如果遇到错误了，也是使用github.com/pkg/errors这个包老判断错误，是不是我们自己定义的错误（api中定义的错误直接使用我们自己定义的xerr），还是grpc错误（rpc业务抛出来的），如果是grpc错误在通过uint32转成我们自己错误码，根据错误码再去我们自己定义错误信息中找到定义的错误信息返回给前端，如果是api错误直接返回给前端我们自己定义的错误信息，都找不到那就返回默认错误“服务器开小差了” , 
+成功直接返回，如果遇到错误了，也是使用github.com/pkg/errors这个包来判断错误，是不是我们自己定义的错误（api中定义的错误直接使用我们自己定义的xerr），还是grpc错误（rpc业务抛出来的），如果是grpc错误在通过uint32转成我们自己错误码，根据错误码再去我们自己定义错误信息中找到定义的错误信息返回给前端，如果是api错误直接返回给前端我们自己定义的错误信息，都找不到那就返回默认错误“服务器开小差了” , 
 
 
 

doc/chinese/10-错误处理.md

@@ -3,7 +3,7 @@
 - [I. Development environment](#i-development-environment)
   - [1. Project Profile](#1-project-profile)
   - [2. Use to technology stack](#2-use-to-technology-stack)
-        - [Tips : If you are not familiar with many of the technology stack here, do not be afraid, as long as you will mysql, redis can start these two middleware in the start of the project first run up the project, the other can slowly learn.](#tips--if-you-are-not-familiar-with-many-of-the-technology-stack-here-do-not-be-afraid-as-long-as-you-will-mysql-redis-can-start-these-two-middleware-in-the-start-of-the-project-first-run-up-the-project-the-other-can-slowly-learn)
+        - [Tips : If you are unfamiliar with the technologies in the current stack, don't worry. Simply start by mastering MySQL and Redis. Begin your project by running these two middleware components, and gradually expand your knowledge of the remaining technologies as you progress.](#tips--if-you-are-not-familiar-with-many-of-the-technology-stack-here-do-not-be-afraid-as-long-as-you-will-mysql-redis-can-start-these-two-middleware-in-the-start-of-the-project-first-run-up-the-project-the-other-can-slowly-learn)
   - [3. Project Architecture Diagram](#3-project-architecture-diagram)
   - [4. Business Architecture Diagram](#4-business-architecture-diagram)
   - [5. Project Environment Setup](#5-project-environment-setup)
@@ -65,7 +65,7 @@ The project directory structure is as follows:
 
 
 
-##### Tips : If you are not familiar with many of the technology stack here, do not be afraid, as long as you will mysql, redis can start these two middleware in the start of the project first run up the project, the other can slowly learn.
+##### Tips : If you are unfamiliar with the technologies in the current stack, don't worry. Simply start by mastering MySQL and Redis. Begin your project by running these two middleware components, and gradually expand your knowledge of the remaining technologies as you progress.
 
 
 
@@ -224,7 +224,7 @@ All API + RPC services under frontend app use modd + golang
 Direct docker-compose to start can, but consider the dependencies may be relatively large, will affect the start of the project, so it is best to pull down this image before starting the project
 
 ```shell
-docker pull lyumikael/gomodd:v1.0.0 #This is used by all API+RPC startup services under the app, if you are "mac m1" : lyumikael/go-modd-env:v1.0.0
+docker pull lyumikael/gomodd:v1.20.3 #This is used by all API+RPC startup services under the app, if you are "mac m1" : lyumikael/go-modd-env:v1.0.0
 ```
 
 Note: If you add new services under the app, remember to add a copy of modd.conf in the root directory of the project.

doc/english/01-Development-environment-setup.md

@@ -325,7 +325,7 @@ There are 2 points to note here
 
 1) api service wants to return the rpc to the front-end friendly error message, we want to return directly to the front-end without any processing (for example, the rpc has returned "user already exists", api does not want to do any processing, you want to return this error message directly to the front-end)
 
-Wrapf the first parameter, but the second parameter is best to record the detailed logs you need to facilitate the follow-up in api China it view
+Wrapf the first parameter, but the second parameter is best to record the detailed logs you need to facilitate the follow-up in api view
 
 (2) api service regardless of what error information is returned by the rpc, I would like to redefine the error information returned to the front-end (for example, the rpc has returned "user already exists", api want to call the rpc as long as there is an error I will return to the front-end "User registration failed")