app/mix/cmd_offline/main.go

@@ -3,10 +3,12 @@ package main
 import (
 	"fmt"
 	"net"
+	"net/http"
 	"os"
 	"runtime"
 	"service/api/consts"
 	"service/app/mix/conf"
+	"service/app/mix/controller"
 	"service/app/mix/mediafiller"
 	"service/app/mix/service"
 	"service/library/apollo"
@@ -15,9 +17,12 @@ import (
 	"service/library/contentaudit/textaudit"
 	videomoderation "service/library/contentaudit/video_moderation"
 	"service/library/dingtalk"
+	"service/library/httpengine"
+	"service/library/httpserver"
 	"service/library/logger"
 	"service/library/redis"
 	"service/library/sms"
+	"service/library/validator"
 	"strings"
 	"time"
 )
@@ -52,7 +57,7 @@ func main() {
 	}
 
 	// 初始化日志
-	logger.InitLogger(cfg.Log)
+	logger.InitLogger(cfg.OfflineServer.Log)
 
 	// 初始化短信服务
 	err = sms.Init(cfg.Dysmsapi)
@@ -100,7 +105,16 @@ func main() {
 	// 初始化媒体填充服务
 	mediafiller.Init(cfg.ServerInfo)
 
-	exec.Run()
+	// 初始化http server
+	go exec.Run()
+	router := httpengine.NewRouter()
+	validator.InitDefaultNotNullValidator()
+	controller.InitOffline(router)
+	srv := &http.Server{
+		Addr:    fmt.Sprintf("%s:%d", GetIp(), cfg.App.Port),
+		Handler: router,
+	}
+	httpserver.StartHttpServer(srv, cfg.OfflineServer)
 }
 
 func PrintAndExit(msg string) {

app/mix/conf/cfg.go

@@ -22,4 +22,5 @@ type ConfigSt struct {
 	DingTalkRobot               *configcenter.DingTalkRobotConfig   `json:"ding_talk_robot" yaml:"ding_talk_robot"`   // 钉钉机器人
 	VideoModeration             *configcenter.VideoModerationConfig `json:"video_moderation" yaml:"video_moderation"` // 视频审核
 	ElasticSearch               *configcenter.ElasticSearchConfig   `json:"elastic_search" yaml:"elastic_search"`     // es
+	OfflineServer               *configcenter.DefaultConfig         `json:"offline_server" yaml:"offline_server"`
 }

app/mix/controller/init.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	imageaudittaskproto "service/api/proto/imageaudittask/proto"
 	mediaproto "service/api/proto/media/proto"
-	video_moderation_proto "service/api/proto/video_moderation/proto"
 	zonesessionproto "service/api/proto/zonesession/proto"
 	"service/library/logger"
 	"service/library/middleware"
@@ -523,10 +522,6 @@ func Init(r *gin.Engine) {
 	// 空间相关每日报表
 	opDailyStatementZoneInfoGroup := r.Group("/op/daily_statement_zone_info", PrepareOp())
 	opDailyStatementZoneInfoGroup.POST("list", middleware.JSONParamValidator(daily_statement_zone_info_proto.OpListReq{}), middleware.JwtAuthenticator(), OpGetDailyStatementZoneInfoList)
-
-	// 视频审核callback
-	extVideoModerationGroup := r.Group("/ext/video_moderation")
-	extVideoModerationGroup.POST("callback", middleware.FORMParamValidator(video_moderation_proto.ExtVideoModerationReq{}), VideoModerationCallback)
 }
 
 func ServeFile(ctx *gin.Context) {

app/mix/controller/init_offline.go

@@ -0,0 +1,20 @@
+package controller
+
+import (
+	video_moderation_proto "service/api/proto/video_moderation/proto"
+	"service/library/middleware"
+
+	"github.com/gin-gonic/gin"
+)
+
+func InitOffline(r *gin.Engine) {
+	r.HandleMethodNotAllowed = true
+
+	// websocket长链接
+	r.GET("/", ServeFile)
+	r.GET("/ws", HandleWs)
+
+	// 视频审核callback
+	extVideoModerationGroup := r.Group("/offline_ext/video_moderation")
+	extVideoModerationGroup.POST("callback", middleware.FORMParamValidator(video_moderation_proto.ExtVideoModerationReq{}), VideoModerationCallback)
+}

etc/mix/mix-prod.yaml

@@ -104,7 +104,7 @@ textaudit:
 video_moderation:
   access_key_id: "LTAI5tQBGFS9BNiTHdbAAM74"
   access_key_secret: "vsV42N0ZCtJTQNwFLheCaV8oQn69hQ"
-  notify_url: "https://api.tiefen.fun/ext/video_moderation/callback"
+  notify_url: "https://offlineserver.wishpal.cn/offline_ext/video_moderation/callback"
   ali_acct_id: "1501583627133461"
   seed: "23XSkaZsMTz3xdnKtTmx229ZaJ3VS7e"
 
@@ -129,7 +129,7 @@ server_info:
 xxl_job:
   server_addr: "http://172.16.0.186:9800/xxl-job-admin"
   access_token: "default_token"
-  executor_ip: "172.16.0.185"
+  executor_ip: "172.31.37.66"
   executor_port: "9801"
   registry_key: "golang-jobs-executor"
   log_path: "/app/ironfan/log/xxl_job/"
@@ -142,4 +142,17 @@ elastic_search:
   uri: "http://172.31.37.67:9200"
   username: "elastic"
   password: "Wishpal@2024"
-  sniff: false
+  sniff: false
+
+offline_server:
+  log:
+    stdout_enable: true
+    stdout_level: "trace"
+    file_enable: true
+    file_level: "trace"
+    file_abs_path: "/app/ironfan/log/offline-server/"
+
+  app:
+    app_name: "offline-server"
+    ip: "127.0.0.1"
+    port: 9998

etc/mix/mix-test.yaml

@@ -105,7 +105,7 @@ textaudit:
 video_moderation:
   access_key_id: "LTAI5tQBGFS9BNiTHdbAAM74"
   access_key_secret: "vsV42N0ZCtJTQNwFLheCaV8oQn69hQ"
-  notify_url: "https://api.wishpal.cn/ext/video_moderation/callback"
+  notify_url: "https://api.wishpal.cn/offline_ext/video_moderation/callback"
   ali_acct_id: "1501583627133461"
   seed: "23XSkaZsMTz3xdnKtTmx229ZaJ3VS7e"
 
@@ -143,4 +143,17 @@ elastic_search:
   uri: "http://127.0.0.1:9200"
   username: "elastic"
   password: "Wishpal@2024"
-  sniff: false
+  sniff: false
+
+offline_server:
+  log:
+    stdout_enable: true
+    stdout_level: "trace"
+    file_enable: true
+    file_level: "trace"
+    file_abs_path: "/app/ironfan/log/offline-server/"
+
+  app:
+    app_name: "offline-server"
+    ip: "127.0.0.1"
+    port: 9998