diff --git a/cmd/worker/enterprise-worker.go b/cmd/worker/enterprise-worker.go index cc2e17d..df02582 100644 --- a/cmd/worker/enterprise-worker.go +++ b/cmd/worker/enterprise-worker.go @@ -3,7 +3,6 @@ package main import ( "enterprise/common/config" "enterprise/common/global" - "enterprise/common/model" _ "enterprise/service/salary_calculator" "enterprise/worker" ) @@ -16,10 +15,5 @@ func main() { worker.InitCorp() - approve := worker.NewApproval(1002) - approve.Sync("202503", model.ApprovalTypeCheckin) - approve.Sync("202503", model.ApprovalTypeVacation) - approve.Sync("202503", model.ApprovalTypeRefund) - approve.Sync("202503", model.ApprovalTypePayment) select {} } diff --git a/common/global/db.go b/common/global/db.go index 01c2e28..eb7c426 100644 --- a/common/global/db.go +++ b/common/global/db.go @@ -83,6 +83,9 @@ func initDB() error { db.Logger = &DBLogger{threshold: int64(2000)} dao.SetDB(db) + if !config.IsProdEnv() { + return nil + } //unify unifyDsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s", cfg.UnifyMysql.User, cfg.UnifyMysql.Pass, cfg.UnifyMysql.Host, cfg.UnifyMysql.Port, cfg.UnifyMysql.Db) @@ -104,6 +107,7 @@ func initDB() error { } db.Logger = &DBLogger{threshold: int64(2000)} dao.SetCorpDB(db) + return nil } diff --git a/common/global/message.go b/common/global/message.go index 1bcb3ce..b979c77 100644 --- a/common/global/message.go +++ b/common/global/message.go @@ -20,6 +20,10 @@ var ( corpEnterpriseMutex sync.Mutex ) +func init() { + corpEnterprise = make(map[int64]*work.Work) +} + func initWxWork() (*work.Work, error) { cfg := config.GetConfig() client, err := work.NewWork(&work.UserConfig{ @@ -55,8 +59,8 @@ func getWxWork(corpId int64) (*work.Work, error) { cfg := corp.GetConfig() client, err := work.NewWork(&work.UserConfig{ CorpID: cfg.CorpId, - AgentID: cast.ToInt(cfg.PayAgent), - Secret: cfg.PaySecret, + AgentID: cast.ToInt(cfg.EnterpriseAgent), + Secret: cfg.EnterpriseSecret, OAuth: work.OAuth{ Callback: "https://wecom.artisan-cloud.com/callback", Scopes: nil, @@ -107,7 +111,7 @@ func SendCorpMessage(corpId int64, user []string, content string) error { message := &request.RequestMessageSendText{} message.ToUser = strings.Join(receivers, "|") message.MsgType = "text" - message.AgentID = cast.ToInt(corp.GetConfig().PayAgent) + message.AgentID = cast.ToInt(corp.GetConfig().EnterpriseAgent) message.Text = &request.RequestText{Content: content} if _, err := client.Message.SendText(context.Background(), message); err != nil { diff --git a/conf/server.conf.dev b/conf/server.conf.dev index e8c8586..97136ae 100644 --- a/conf/server.conf.dev +++ b/conf/server.conf.dev @@ -11,7 +11,7 @@ pass = "fffasda#@2error" db = "enterprise" [unify_mysql] -host = "192.168.2.50" +host = "" port = 23307 user = "unify" pass = "MDE2LCJIYXNoSWQiOjY" @@ -19,7 +19,7 @@ db = "unify" threshold = 5000 [corp_mysql] -host = "192.168.2.50" +host = "" port = 13307 user = "corp" pass = "UvFwai9N_Nx2zgny" diff --git a/worker/worker.go b/worker/worker.go index 4547bd3..a74fe29 100644 --- a/worker/worker.go +++ b/worker/worker.go @@ -52,7 +52,7 @@ func InitCorp1002(cron *gocron.Scheduler) { }) //10号晚上8点发送工资单 - cron.Every(1).Month(4).At("00:50").Do(func() { + cron.Every(1).Month(4).At("09:40").Do(func() { go staff.SendStaffSalaryBill(corpId, time.Now().AddDate(0, -1, 0).Format("200601")) go staff.PayStaffSalary(corpId, time.Now().AddDate(0, -1, 0).Format("200601")) }) @@ -93,7 +93,7 @@ func InitCorp1000(cron *gocron.Scheduler) { }) //10号晚上8点发送工资单 - cron.Every(1).Month(4).At("00:55").Do(func() { + cron.Every(1).Month(4).At("09:40").Do(func() { go NewStaff().SendStaffSalaryBill(corpId, time.Now().AddDate(0, -1, 0).Format("200601")) go NewStaff().PayStaffSalary(corpId, time.Now().AddDate(0, -1, 0).Format("200601")) })