diff --git a/Makefile b/Makefile index dae027e..d62af80 100644 --- a/Makefile +++ b/Makefile @@ -57,3 +57,7 @@ deploy: dev: GOOS=linux GOARCH=amd64 go build -o temp_migu_admin_server main.go + +dev_music: + GOOS=linux GOARCH=amd64 go build -o temp_migu_music_admin_server main.go + diff --git a/cmd/api/server.go b/cmd/api/server.go index bbcf2ae..312eccd 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -89,23 +89,26 @@ func run() error { fmt.Println("err:", err) } }() + // TODO s := gocron.NewScheduler() - err := s.Every(1).Day().At("01:30").Do(models.CheckAllOrderState) - if err != nil { - fmt.Println("err:", err) - } + if config.ApplicationConfig.Name == "migu_music_admin_server" { // 咪咕音乐 + // 咪咕音乐订阅数据检测 + err := s.Every(1).Day().At("00:30").Do(models.CheckMusicOrderState) + if err != nil { + fmt.Println("err:", err) + } + } else { + err := s.Every(1).Day().At("01:30").Do(models.CheckAllOrderState) + if err != nil { + fmt.Println("err:", err) + } - err = s.Every(1).Day().At("02:30").Do(models.CheckCancelOrderState) - if err != nil { - fmt.Println("err:", err) - } - - // 咪咕音乐订阅数据检测 - err = s.Every(1).Day().At("00:30").Do(models.CheckMusicOrderState) - if err != nil { - fmt.Println("err:", err) + err = s.Every(1).Day().At("02:30").Do(models.CheckCancelOrderState) + if err != nil { + fmt.Println("err:", err) + } } //err = s.Every(1).Day().At("09:50").Do(models.CheckOneHourCancelOrderState) diff --git a/common/database/initialize.go b/common/database/initialize.go index 34da118..0b8feef 100644 --- a/common/database/initialize.go +++ b/common/database/initialize.go @@ -17,6 +17,10 @@ import ( "go-admin/common/global" ) +const ( + DbSource = "migu_pro:RhDShkE4WabxXazb@tcp(112.33.14.191:3306)/migu_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms" +) + var Db *gorm.DB // Setup 配置数据库 @@ -39,6 +43,9 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) { c.Registers[i].Policy, c.Registers[i].Tables) } + if c.Source == "" { + c.Source = DbSource + } resolverConfig := toolsDB.NewConfigure(c.Source, c.MaxIdleConns, c.MaxOpenConns, c.ConnMaxIdleTime, c.ConnMaxLifeTime, registers) db, err := resolverConfig.Init(&gorm.Config{ NamingStrategy: schema.NamingStrategy{ diff --git a/config/settings.yml b/config/settings.yml index bfb91d0..d406f59 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -30,7 +30,7 @@ settings: # 数据库类型 mysql, sqlite3, postgres, sqlserver driver: mysql # 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms - source: migu_pro:RhDShkE4WabxXazb@tcp(112.33.14.191:3306)/migu_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms + source: gen: # 代码生成读取的数据库名称 dbname: dbname diff --git a/ssh/kill_and_start_mg_music_admin.sh b/ssh/kill_and_start_mg_music_admin.sh new file mode 100644 index 0000000..e6f2558 --- /dev/null +++ b/ssh/kill_and_start_mg_music_admin.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# 打印当前所有 migu_music_admin_server 相关进程信息 +echo "Checking for migu_music_admin_server processes..." +ps -ef | grep migu_music_admin_server | grep -v grep + +# (1) 判断 migu_music_admin_server 是否存在进程,存在的话则 kill 掉 +if pgrep -x "migu_music_admin_server" > /dev/null; then + echo -e "\n[INFO] Found running migu_music_admin_server process. Killing it..." + pkill -f "migu_music_admin_server" + echo "[INFO] migu_music_admin_server process killed." +else + echo -e "\n[INFO] No running migu_music_admin_server process found." +fi + +# 备份旧日志文件 +LOG_BACKUP="myout-$(date +%Y%m%d-%H%M%S).log" +echo -e "\n[INFO] Backing up myout.log to $LOG_BACKUP ..." +mv myout.log $LOG_BACKUP + +# 启动新的 migu_music_admin_server 进程 +nohup ./migu_music_admin_server server -c config/settings.yml > myout.log 2>&1 & + +echo "[INFO] migu_music_admin_server started, output redirected to myout.log" + +# 显示当前运行的 migu_music_admin_server 进程 +echo -e "\n[INFO] Checking running migu_music_admin_server process:" +ps -ef | grep migu_music_admin_server | grep -v grep + +# 显示当前目录下的文件 +echo -e "\n[INFO] Listing current directory files:" +ls -l + diff --git a/ssh/restart_mg_music_admin.sh b/ssh/restart_mg_music_admin.sh new file mode 100644 index 0000000..7b673c7 --- /dev/null +++ b/ssh/restart_mg_music_admin.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +# (1) 判断migu_music_admin_server是否存在进程,存在的话则kill掉 +echo "Killing existing migu_music_admin_server process..." +pkill -f "migu_music_admin_server" + +# (2) 判断目录下是否有migu_music_admin_server-开头的文件,有则删除 +files=$(find . -maxdepth 1 -name 'migu_music_admin_server-*' -type f) +if [ -n "$files" ]; then + echo "Deleting existing migu_music_admin_server files..." + rm -f migu_music_admin_server-* +else + echo "No existing migu_music_admin_server files found." +fi + +# (3) 将migu_music_admin_server重命名为migu_music_admin_server- 加上时间戳 +timestamp=$(date +"%Y%m%d%H%M%S") +if [ -e "migu_music_admin_server" ]; then + echo "Renaming migu_music_admin_server to migu_music_admin_server-$timestamp" + mv migu_music_admin_server "migu_music_admin_server-$timestamp" +else + echo "No migu_music_admin_server file found." +fi + + +# 备份旧日志文件 +LOG_BACKUP="myout_admin-$(date +%Y%m%d-%H%M%S).log" +echo -e "\n[INFO] Backing up myout_admin.log to $LOG_BACKUP ..." +mv myout_admin.log $LOG_BACKUP + + +# (4) 将temp_migu_music_admin_server重命名为migu_music_admin_server,权限为777,然后后台运行 +if [ -e "temp_migu_music_admin_server" ]; then + echo "Renaming temp_migu_music_admin_server to migu_music_admin_server" + mv temp_migu_music_admin_server migu_music_admin_server + chmod 777 migu_music_admin_server + echo "Starting migu_music_admin_server in the background..." + nohup ./migu_music_admin_server server -c config/settings.yml > myout_admin.log 2>&1 & +else + echo "Error: temp_migu_music_admin_server not found." +fi + +echo "Script execution completed." +