wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'by Robin at 20240103; fix' (#38) from feat-20230102-001-Robin into test 

Reviewed-on: #38
This commit is contained in:
chenhao 2024-01-03 22:56:32 +08:00
parent eaed3195e6 82985d051c
commit 8dd36740ce
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mix/controller/init.go
View File

@ -360,7 +360,7 @@ func Init(r *gin.Engine) {
// 每日报表表 // 每日报表表
opDailyStatementGroup := r.Group("/op/daily_statement", PrepareOp()) opDailyStatementGroup := r.Group("/op/daily_statement", PrepareOp())
opDailyStatementGroup.POST("list", middleware.JSONParamValidator(daily_statementproto.OpListReq{}), OpGetDailyStatementList) opDailyStatementGroup.POST("list", middleware.JSONParamValidator(daily_statementproto.OpListReq{}), middleware.JwtAuthenticator(), OpGetDailyStatementList)
// 账号相关 // 账号相关
//accountGroup := r.Group("/account") //accountGroup := r.Group("/account")

2
app/mix/service/cronservice.go
View File

@ -114,7 +114,7 @@ func (s *CronService) CreateDailyStatement() {
loc, _ := time.LoadLocation("Asia/Shanghai") loc, _ := time.LoadLocation("Asia/Shanghai")
scheduler := gocron.NewScheduler(loc) scheduler := gocron.NewScheduler(loc)
scheduler.CronWithSeconds("0 0 * * * *").Do(func() { scheduler.CronWithSeconds("0 * * * * *").Do(func() {
//拿到现在的时间戳 //拿到现在的时间戳
nowTimeStamp := util.GetHourStartTimeStamp(time.Now()) nowTimeStamp := util.GetHourStartTimeStamp(time.Now())

4
app/mix/service/scripts_service.go
View File

@ -1,7 +1,6 @@
package service package service
import ( import (
"fmt"
"os/exec" "os/exec"
"service/library/logger" "service/library/logger"
"strconv" "strconv"
@ -20,8 +19,7 @@ func NewScriptsService() *ScriptsService {
// 放置一些执行服务器脚本的service // 放置一些执行服务器脚本的service
func (s *ScriptsService) QueryCallCount(url string, logpath string) (count int, err error) { func (s *ScriptsService) QueryCallCount(url string, logpath string) (count int, err error) {
cmdStr := fmt.Sprintf("grep -c %v %v", url, logpath) cmd := exec.Command("grep", "-c", url, logpath)
cmd := exec.Command(cmdStr)
out, err := cmd.Output() out, err := cmd.Output()
if err != nil { if err != nil {
logger.Error("could not run command: %v", err) logger.Error("could not run command: %v", err)