diff --git a/cmd/server/main.go b/cmd/server/main.go index d3df89a..0d3b8c6 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -58,6 +58,7 @@ func newApp( httpServer *http.Server, consumerServer *server.Consumer, wechatNotifyConsumer *server.WechatNotifyConsumer, + cronServer *server.CronServer, ) *kratos.App { return kratos.New( kratos.ID(id), @@ -68,6 +69,7 @@ func newApp( httpServer, consumerServer, wechatNotifyConsumer, + cronServer, ), ) } diff --git a/cmd/server/wire.go b/cmd/server/wire.go index 98acf4a..f03001e 100644 --- a/cmd/server/wire.go +++ b/cmd/server/wire.go @@ -9,6 +9,7 @@ import ( "github.com/go-kratos/kratos/v2" "github.com/go-kratos/kratos/v2/log" "github.com/google/wire" + "github.com/robfig/cron" "voucher/internal/biz" "voucher/internal/biz/cmb" "voucher/internal/conf" @@ -33,6 +34,7 @@ func wireApp(*conf.Bootstrap, log.Logger, *log2.AccessLogger) (*kratos.App, func wechatrepoimpl.ProviderWechatReposImplSet, mixrepoimpl.ProviderMixRepoImplSet, log2.NewLogHelper, + cron.New, newApp, )) } diff --git a/configs/config_test.yaml b/configs/config_test.yaml index 7efd0e8..cad4387 100644 --- a/configs/config_test.yaml +++ b/configs/config_test.yaml @@ -74,6 +74,13 @@ alarm: atMobiles: - "18666173766" +cron: + isOpen: false #是否启动,控制全局 + commandMap: + orderNotice: + isOpen: false #是否启动 true/false + command: "0 1 * * *" # 每天凌晨1点执行一次:0 2 * * * | "0 */10 * * *" #cron表达式,每10分钟执行一次 + #配置日志 logs: business: business.log #业务日志路径:如果不写日志,则不配置或配置为空 diff --git a/internal/pkg/cmb/sm2_test.go b/internal/pkg/cmb/sm2_test.go index 7be6f91..4343e26 100644 --- a/internal/pkg/cmb/sm2_test.go +++ b/internal/pkg/cmb/sm2_test.go @@ -25,9 +25,9 @@ func TestEncrypt(t *testing.T) { } func TestDecrypt(t *testing.T) { - priKey := "9450c673cf801164435b9c164ac1404e87997245bc6f323fde22015875a03f6e" + priKey := "8d39ff3d2559258c163f4510f082727f51531e1953ab203d5ab1ea4a6d94fd73" - content := "BHhdJbBP8hybQ57niOICuPiaNTGYKgLF3Ntf1ShdpHDjS6s3UJOCpSxEj0nWCVGlJMcTBJIBZ0pvPD4/oWKxgmp69MhpR3VWJeDcHhJHALdvzl2CR2GTXB7lgy1eUEBH/HlYxCK2P3kcV2ENKkazQRpT2Gk5WJ0rCV8iSaEqovmjRsTV3V4eLLrcuzK+|NZQ2Ae4McLlpSjBhYWQFmc9g0h/DQHcykGwIproe0AA0HayMun04aalcZmzh4Qp5p1SBZNBfwqtETyEjHYlWTj7/ht+kWsWRkuVx1uipZVIYPkOw5thsjoCdK+q1S76EssDCXOTVf/XAoSgqV+6/a1dGwkQgzXVGkGdAUoOdN0Rry8g8JnTBQZyiQY/fjDTiieJiS9MUmm6JiE/wZGG+LliUKHVsF8ZdrIEyrkSgAWw=" + content := "BKLjXVHHcGfZdbYrW/bERUghLv/hvnuEoYw0yRPWBpO2lysBlRLVg1cEh/TNqEgq3n2vlnDcXeXM2/OqfA0IL6e6CS4Nryu6c/RnlmTMxwYOSvklqUFLkqvIyYFhnhPnC2ABy7Tw36PZ/mzdyz8xgQjy8JMPsP3pgezI219fjFEe18UMUHnrhmd9+HUX|BZDXjwQpcWwYNd07vRnepgYK3WYAMaulhYU/3444JtuKNrHumF0C3P01GTpV3wNodx8CLB/21oabj9aPBySeiqrooVcQYCnfp6z0JEgl5wtk/KDSoom/EX9QdI0NSHLVrPxDk+c0ZjaSbmiQ9inNJlZ1lspBsLlzwcVQc0ibgaLaeaM8Z13+a0MipqFKOyCaGzsaSIt04AIbS9QMddNmA/LqNtR4JW7z04A//iBmv68=" xx, err := Decrypt(priKey, content) if err != nil { diff --git a/internal/server/cron.go b/internal/server/cron.go index 9fe5f17..a7070d4 100644 --- a/internal/server/cron.go +++ b/internal/server/cron.go @@ -3,11 +3,14 @@ package server import ( "context" "github.com/go-kratos/kratos/v2/log" + "github.com/go-kratos/kratos/v2/transport" "github.com/robfig/cron" "voucher/internal/conf" "voucher/internal/service" ) +var _ transport.Server = (*CronServer)(nil) + type CronServer struct { conf *conf.Bootstrap cron *cron.Cron diff --git a/internal/server/provider_set.go b/internal/server/provider_set.go index 0bf9483..13460f0 100644 --- a/internal/server/provider_set.go +++ b/internal/server/provider_set.go @@ -9,4 +9,5 @@ var ProviderSetServer = wire.NewSet( NewHTTPServer, NewConsumer, NewWechatNotifyConsumer, + NewCronServer, )