同步 web_hga 的五项改造

- 移除 买点 (user acquisition tracking) 子系统：dataReport SDK、eventmod
  事件模型、reportdata 定时上报 job、reportser/srv_report 包装层，以及业务
  侧的 ~20 处 Report* 调用点；去掉 proto.ConfigInfo 的 ReportSDKConfig
  字段、DataReport yaml 配置块和 pubdef.TrackerAppId。
- 广告获取改走 versionUrl /api/stat/advitise/v2/get（appId=12），移除
  adcenter(Jt) 调用；新增 POST /api/app/ads/click 异步上报；
  proto.AdvitiseData 别名 proxy.AdvitiseData，AList/BList 改名
  AppInfoAList/AppInfoBList。
- web 后台登录取消谷歌验证码（srv_mwacc.AccLogin 去掉 code 参数），密码
  正确即发放 token。
- app 端取消注册/登录/找回密码/游客登录接口及密码、token 相关代码；鉴权
  中间件按 X-User-Agent 中的 devID 识别用户，首次访问自动建号，Redis 缓存
  10 分钟；修改资料不再支持改密码。
- app m3u8 ticket 校验失败不再降级到 fallback 路径，仍按原 m3u8Name 返回。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

app/service/appser/cache.go

@@ -124,7 +124,7 @@ func UpdateAppListCache(ctx context.Context) {
 		}
 		// 广告位 A（code=12）
 		if category.Code == 12 {
-			for _, ad := range advitise.AList {
+			for _, ad := range advitise.AppInfoAList {
 				apps = append(apps, proto.AppInfoData{
 					AdvitiseId: ad.Id,
 					CategoryId: category.Id,
@@ -137,7 +137,7 @@ func UpdateAppListCache(ctx context.Context) {
 		}
 		// 广告位 B（code=13）
 		if category.Code == 13 {
-			for _, ad := range advitise.BList {
+			for _, ad := range advitise.AppInfoBList {
 				apps = append(apps, proto.AppInfoData{
 					AdvitiseId: ad.Id,
 					CategoryId: category.Id,

app/service/authser/auth.go

@@ -4,23 +4,16 @@ import (
 	"context"
 	"strings"
 	"time"
-	"videoweb/app/appg"
-	"videoweb/app/service/reportser"
-	"videoweb/pub/common/enum/consts"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/srvdef"
 	"videoweb/pub/common/useragent"
 	"videoweb/pub/common/utils"
 	"videoweb/pub/models/usermod"
-	"videoweb/pub/mongos"
 	"videoweb/pub/pubdef"
 
 	"go.mongodb.org/mongo-driver/bson"
-	"golang.org/x/crypto/bcrypt"
 )
 
-var tokener = utils.NewTokenRedis()
-
 var defaultAvatars = []string{
 	"v3/image/bo/ty/1016/girl1.jpeg",
 	"v3/image/re/9y/1016/girl2.jpeg",
@@ -48,9 +41,8 @@ func generateUniqueInviteCode(ctx context.Context) string {
 	return strings.ToUpper(utils.GetRandomLetters(12))
 }
 
-// LoginResp 登录/注册成功后的响应数据
+// LoginResp 用户信息
 type LoginResp struct {
-	Token            string            `json:"token"`
 	UserId           int64             `json:"userId"`
 	AccountNo        string            `json:"accountNo"`
 	Email            string            `json:"email"`
@@ -66,281 +58,28 @@ type LoginResp struct {
 	Type             pubdef.UserType   `json:"type"`        // 身份类型：0游客 1普通用户
 	LoginType        pubdef.LoginType  `json:"loginType"`   // 登陆方式
 	IsRegister       bool              `json:"isRegister"`  // 是否已注册
-	IsNewUser        bool              `json:"isNewUser"`   // 本次是否新建游客
 	PrivacyMode      bool              `json:"privacyMode"` // 隐私模式
 	HasPassword      bool              `json:"hasPassword"` // 是否已设置密码
 	Score            int64             `json:"score"`       // 积分
 	Recharge         int64             `json:"recharge"`    // 金币余额
 }
 
-// hashPassword 使用 bcrypt 对明文密码进行哈希
-func hashPassword(plain string) (string, error) {
-	hash, err := bcrypt.GenerateFromPassword([]byte(plain), bcrypt.DefaultCost)
-	if err != nil {
-		return "", err
-	}
-	return string(hash), nil
-}
-
-// checkPassword 验证明文密码与 bcrypt 哈希是否匹配
-func checkPassword(plain, hash string) bool {
-	return bcrypt.CompareHashAndPassword([]byte(hash), []byte(plain)) == nil
-}
-
-// generateAndSaveToken 生成 JWT 并存入 Redis
-func generateAndSaveToken(userId int64) (string, *srvdef.SrvErr) {
-	token, err := utils.GenerateUserToken(utils.UserClaims{
-		UserID: userId,
-		Expire: consts.UserJwtTokenExpire,
-	}, appg.Conf.JwtKey)
-	if err != nil {
-		return "", srvdef.New(srvdef.GenerateTokenFailed, srvdef.GenerateTokenFailed.Msg(), "")
-	}
-	if err = tokener.Save(userId, token); err != nil {
-		return "", srvdef.New(srvdef.StoreLevel, "token存储失败", "")
-	}
-	return token, nil
-}
-
-// generateCrawlerToken 签发爬虫观看 JWT，不写入 Redis，避免占用真实用户槽位。
-func generateCrawlerToken() (string, *srvdef.SrvErr) {
-	token, err := utils.GenerateUserToken(utils.UserClaims{
-		UserID: pubdef.CrawlerUserId,
-		Expire: consts.UserJwtTokenExpire,
-	}, appg.Conf.JwtKey)
-	if err != nil {
-		return "", srvdef.New(srvdef.GenerateTokenFailed, srvdef.GenerateTokenFailed.Msg(), "")
-	}
-	return token, nil
-}
-
 // CrawlerLoginResp 爬虫虚拟游客资料，不对应任何数据库用户。
-func CrawlerLoginResp(token string) *LoginResp {
+func CrawlerLoginResp() *LoginResp {
 	return &LoginResp{
-		Token:      token,
 		UserId:     pubdef.CrawlerUserId,
 		NickName:   "游客",
 		Status:     pubdef.UserStatusNormal,
 		Type:       pubdef.UserTypeGuest,
 		LoginType:  pubdef.LoginTypeDevice,
 		IsRegister: false,
-		IsNewUser:  false,
 	}
 }
 
-// Register 用户注册
-// guestUserId：请求头 Authorization 解析出的用户ID；若为游客则升级该用户，否则新建
-// agentInviteCode：邀请人的邀请码，可为空
-func Register(ctx context.Context, guestUserId int64, accountNo, email, password, agentInviteCode string, ua useragent.UA, ip, channel string) (*LoginResp, *srvdef.SrvErr) {
-	accountNo = strings.TrimSpace(accountNo)
-	email = strings.TrimSpace(email)
-	password = strings.TrimSpace(password)
-
-	// 检查账号是否已存在
-	exist, _ := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.AccountNo: accountNo})
-	if exist != nil {
-		return nil, srvdef.New(srvdef.ErrDbInputExist, "账号已存在", "")
-	}
-	// 填写邮箱时检查是否已存在
-	if email != "" {
-		exist, _ = usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Email: email})
-		if exist != nil {
-			return nil, srvdef.New(srvdef.ErrDbInputExist, "邮箱已被注册", "")
-		}
-	}
-
-	hashed, err := hashPassword(password)
-	if err != nil {
-		return nil, srvdef.New(srvdef.Failure, "密码处理失败", "")
-	}
-
-	now := time.Now()
-
-	// 请求头带游客 token：升级当前游客为普通用户
-	if guestUserId > 0 {
-		guest, serr := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: guestUserId})
-		if serr == nil && isGuestUser(guest) {
-			setDoc := bson.M{
-				usermod.FN.User.AccountNo:    accountNo,
-				usermod.FN.User.Email:        email,
-				usermod.FN.User.Password:     hashed,
-				usermod.FN.User.Type:         pubdef.UserTypeNormal,
-				usermod.FN.User.IsRegister:   true,
-				usermod.FN.User.LoginType:    pubdef.LoginTypeAccount,
-				usermod.FN.User.RegisterTime: now,
-				usermod.FN.User.LastLoginAt:  now,
-				usermod.FN.User.UpdatedAt:    now,
-				usermod.FN.User.LastIp:       ip,
-			}
-			if agentInviteCode != "" && guest.AgentInviteCode == "" {
-				setDoc[usermod.FN.User.AgentInviteCode] = agentInviteCode
-				setDoc[usermod.FN.User.IsDirect] = false
-				guest.IsDirect = false
-			}
-			if v := strings.TrimSpace(ua.DevID); v != "" {
-				setDoc[usermod.FN.User.DevID] = v
-			}
-			if v := strings.TrimSpace(ua.DevType); v != "" {
-				setDoc[usermod.FN.User.Device] = v
-			}
-			if v := strings.TrimSpace(ua.SysType); v != "" {
-				setDoc[usermod.FN.User.SysType] = v
-			}
-			if v := strings.TrimSpace(ua.Ver); v != "" {
-				setDoc[usermod.FN.User.AppVer] = v
-			}
-			mergeUAExtFieldsToSet(setDoc, guest, ua)
-			if serr = usermod.UpdateOneUser(ctx, bson.M{usermod.FN.User.Id: guest.Id}, bson.M{"$set": setDoc}); serr != nil {
-				return nil, serr
-			}
-			if agentInviteCode != "" && guest.AgentInviteCode == "" {
-				_ = usermod.UpdateOneUser(ctx,
-					bson.M{usermod.FN.User.InviteCode: agentInviteCode},
-					bson.M{
-						"$inc": bson.M{usermod.FN.User.Invites: 1},
-						"$set": bson.M{usermod.FN.User.UpdatedAt: now},
-					},
-				)
-			}
-			guest.AccountNo = accountNo
-			guest.Email = email
-			guest.Type = pubdef.UserTypeNormal
-			guest.IsRegister = true
-			guest.LoginType = pubdef.LoginTypeAccount
-			guest.RegisterTime = now
-			token, serr := generateAndSaveToken(guest.Id)
-			if serr != nil {
-				return nil, serr
-			}
-			reportser.ReportUserRegister(guest, ua, ip, "username")
-			reportser.ReportUserLogin(guest, ua, ip, pubdef.LoginTypeAccount)
-			return toLoginResp(ctx, guest, token, true), nil
-		}
-	}
-
-	user := &usermod.User{
-		Id:              mongos.Lid.User.Get(),
-		AccountNo:       accountNo,
-		Email:           email,
-		Password:        hashed,
-		NickName:        appg.GenerateNickname(),
-		Avatar:          randomAvatar(),
-		InviteCode:      generateUniqueInviteCode(ctx),
-		AgentInviteCode: agentInviteCode,
-		Type:            pubdef.UserTypeNormal,
-		Status:          pubdef.UserStatusNormal,
-		IsRegister:      true,
-		LoginType:       pubdef.LoginTypeAccount,
-		RegIp:           ip,
-		LastIp:          ip,
-		DevID:           ua.DevID,
-		Device:          ua.DevType,
-		SysType:         ua.SysType,
-		AppVer:          ua.Ver,
-		OriVer:          ua.Ver,
-		SessionID:       ua.SessionID,
-		DeviceBrand:     ua.DeviceBrand,
-		DeviceModel:     ua.DeviceModel,
-		SystemName:      ua.SystemName,
-		SystemVersion:   ua.SystemVersion,
-		DistrictCode:    normalizeChannel(channel),
-		IsDirect:        resolveUserDistrict(channel, agentInviteCode, ip, ua.SysType).IsDirect,
-		LastLoginAt:     now,
-		RegisterTime:    now,
-		CreatedAt:       now,
-		UpdatedAt:       now,
-	}
-
-	if serr := usermod.InsertOneUser(ctx, user); serr != nil {
-		return nil, serr
-	}
-
-	// 若填写了邀请码，给对应用户的 invites +1
-	if agentInviteCode != "" {
-		_ = usermod.UpdateOneUser(ctx,
-			bson.M{usermod.FN.User.InviteCode: agentInviteCode},
-			bson.M{
-				"$inc": bson.M{usermod.FN.User.Invites: 1},
-				"$set": bson.M{usermod.FN.User.UpdatedAt: time.Now()},
-			},
-		)
-	}
-
-	token, serr := generateAndSaveToken(user.Id)
-	if serr != nil {
-		return nil, serr
-	}
-	reportser.ReportUserRegister(user, ua, ip, "username")
-	reportser.ReportUserLogin(user, ua, ip, pubdef.LoginTypeAccount)
-	return toLoginResp(ctx, user, token, false), nil
-}
-
-// Login 用户登录（账号或邮箱均可）
-func Login(ctx context.Context, account, password string, ua useragent.UA, ip, channel string) (*LoginResp, *srvdef.SrvErr) {
-	// 账号或邮箱均可登录
-	user, _ := usermod.FindOneUser(ctx, bson.M{
-		"$or": []bson.M{
-			{usermod.FN.User.AccountNo: account},
-			{usermod.FN.User.Email: account},
-		},
-	})
-	if user == nil {
-		return nil, srvdef.New(srvdef.AccountIsNotExists, srvdef.AccountIsNotExists.Msg(), "")
-	}
-
-	if user.Status == pubdef.UserStatusDisable {
-		return nil, srvdef.New(srvdef.AccountErrAccessForbid, srvdef.AccountErrAccessForbid.Msg(), "")
-	}
-
-	if !checkPassword(password, user.Password) {
-		return nil, srvdef.New(srvdef.AccountErrPasswordError, srvdef.AccountErrPasswordError.Msg(), "")
-	}
-
-	token, serr := generateAndSaveToken(user.Id)
-	if serr != nil {
-		return nil, serr
-	}
-
-	now := time.Now()
-	setDoc := bson.M{
-		usermod.FN.User.LastLoginAt: now,
-		usermod.FN.User.UpdatedAt:   now,
-	}
-	if ip != "" {
-		setDoc[usermod.FN.User.LastIp] = ip
-	}
-	if v := strings.TrimSpace(ua.DevID); v != "" {
-		setDoc[usermod.FN.User.DevID] = v
-	}
-	if v := strings.TrimSpace(ua.DevType); v != "" {
-		setDoc[usermod.FN.User.Device] = v
-	}
-	if v := strings.TrimSpace(ua.SysType); v != "" {
-		setDoc[usermod.FN.User.SysType] = v
-	}
-	if v := strings.TrimSpace(ua.Ver); v != "" {
-		setDoc[usermod.FN.User.AppVer] = v
-	}
-	// 已有账号的历史用户统一修正为普通用户
-	if strings.TrimSpace(user.AccountNo) != "" && user.Type != pubdef.UserTypeNormal {
-		setDoc[usermod.FN.User.Type] = pubdef.UserTypeNormal
-		setDoc[usermod.FN.User.IsRegister] = true
-		user.Type = pubdef.UserTypeNormal
-		user.IsRegister = true
-	}
-	mergeUAExtFieldsToSet(setDoc, user, ua)
-	_ = usermod.UpdateOneUser(ctx,
-		bson.M{usermod.FN.User.Id: user.Id},
-		bson.M{"$set": setDoc},
-	)
-	reportser.ReportUserLogin(user, ua, ip, pubdef.LoginTypeAccount)
-	return toLoginResp(ctx, user, token, true), nil
-}
-
-// GetInfo 获取当前登录用户的最新信息（不刷新 token）
+// GetInfo 获取当前用户的最新信息
 func GetInfo(ctx context.Context, userId int64, ua useragent.UA) (*LoginResp, *srvdef.SrvErr) {
 	if pubdef.IsCrawlerUser(userId) {
-		return CrawlerLoginResp(""), nil
+		return CrawlerLoginResp(), nil
 	}
 	user, _ := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: userId})
 	if user == nil {
@@ -371,7 +110,7 @@ func GetInfo(ctx context.Context, userId int64, ua useragent.UA) (*LoginResp, *s
 		setDoc[usermod.FN.User.UpdatedAt] = now
 		_ = usermod.UpdateOneUser(ctx, bson.M{usermod.FN.User.Id: user.Id}, bson.M{"$set": setDoc})
 	}
-	return toLoginResp(ctx, user, "", true), nil
+	return toLoginResp(ctx, user, true), nil
 }
 
 func mergeUAExtFieldsToSet(setDoc bson.M, user *usermod.User, ua useragent.UA) {
@@ -397,16 +136,14 @@ func mergeUAExtFieldsToSet(setDoc bson.M, user *usermod.User, ua useragent.UA) {
 
 // UpdateProfileReq 修改用户资料的参数（所有字段均为可选）
 type UpdateProfileReq struct {
-	UserId       int64   // 用户ID（从 token 中获取）
+	UserId       int64   // 用户ID（按设备ID识别）
 	NickName     *string // 新昵称（可选）
 	Avatar       *string // 新头像 URL（可选）
 	Introduction *string // 简介（可选）
 	PrivacyMode  *bool   // 隐私模式：true-开启，false-关闭（可选）
-	OldPassword  *string // 旧密码明文（已设置密码时修改必传）
-	NewPassword  *string // 新密码明文（设置或修改密码时必传）
 }
 
-// UpdateProfile 修改用户资料：支持修改头像、简介、密码，或组合修改
+// UpdateProfile 修改用户资料：支持修改昵称、头像、简介、隐私模式，或组合修改
 func UpdateProfile(ctx context.Context, req *UpdateProfileReq) *srvdef.SrvErr {
 	user, _ := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: req.UserId})
 	if user == nil {
@@ -428,28 +165,6 @@ func UpdateProfile(ctx context.Context, req *UpdateProfileReq) *srvdef.SrvErr {
 		setDoc[usermod.FN.User.PrivacyMode] = *req.PrivacyMode
 	}
 
-	// 设置或修改密码
-	if req.OldPassword != nil || req.NewPassword != nil {
-		if req.NewPassword == nil || strings.TrimSpace(*req.NewPassword) == "" {
-			return srvdef.New(srvdef.ErrParamError, "新密码不能为空", "")
-		}
-		if strings.TrimSpace(user.Password) != "" {
-			if req.OldPassword == nil || strings.TrimSpace(*req.OldPassword) == "" {
-				return srvdef.New(srvdef.ErrParamError, "修改密码时旧密码和新密码均需提供", "")
-			}
-			if !checkPassword(*req.OldPassword, user.Password) {
-				return srvdef.New(srvdef.AccountErrPasswordError, "旧密码错误", "")
-			}
-		} else if req.OldPassword != nil && strings.TrimSpace(*req.OldPassword) != "" {
-			return srvdef.New(srvdef.ErrParamError, "修改密码时旧密码和新密码均需提供", "")
-		}
-		hashed, err := hashPassword(*req.NewPassword)
-		if err != nil {
-			return srvdef.New(srvdef.Failure, "密码处理失败", "")
-		}
-		setDoc[usermod.FN.User.Password] = hashed
-	}
-
 	// 没有任何需要更新的字段
 	if len(setDoc) == 1 {
 		return srvdef.New(srvdef.ErrParamError, "至少需要修改一项资料", "")
@@ -460,27 +175,3 @@ func UpdateProfile(ctx context.Context, req *UpdateProfileReq) *srvdef.SrvErr {
 		bson.M{"$set": setDoc},
 	)
 }
-
-// ResetPassword 通过账号+邮箱双重校验后重置密码
-func ResetPassword(ctx context.Context, accountNo, email, newPassword string) *srvdef.SrvErr {
-	user, _ := usermod.FindOneUser(ctx, bson.M{
-		usermod.FN.User.AccountNo: accountNo,
-		usermod.FN.User.Email:     email,
-	})
-	if user == nil {
-		return srvdef.New(srvdef.ErrUserNotExsit, "账号或邮箱不匹配", "")
-	}
-
-	hashed, err := hashPassword(newPassword)
-	if err != nil {
-		return srvdef.New(srvdef.Failure, "密码处理失败", "")
-	}
-
-	return usermod.UpdateOneUser(ctx,
-		bson.M{usermod.FN.User.Id: user.Id},
-		bson.M{"$set": bson.M{
-			usermod.FN.User.Password:  hashed,
-			usermod.FN.User.UpdatedAt: time.Now(),
-		}},
-	)
-}

app/service/authser/guest.go

@@ -3,13 +3,12 @@ package authser
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 	"videoweb/app/appg"
-	"videoweb/app/middleware/reptilerecord"
-	"videoweb/app/middleware/visit"
 	"videoweb/app/service/configser"
-	"videoweb/app/service/reportser"
+	"videoweb/pub/common/enum/redisconst"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/netutil"
 	"videoweb/pub/common/srvdef"
@@ -17,76 +16,73 @@ import (
 	"videoweb/pub/models/usermod"
 	"videoweb/pub/mongos"
 	"videoweb/pub/pubdef"
+	"videoweb/pub/redis"
 
-	"github.com/gin-gonic/gin"
 	"go.mongodb.org/mongo-driver/bson"
 )
 
-// GuestLoginReq 游客登录请求
-type GuestLoginReq struct {
-	DevID    string `json:"devID"`    // 设备唯一标示（必填）
-	Mac      string `json:"mac"`      // 设备 Mac（可选）
-	DeviceId string `json:"deviceId"` // 备用设备ID（可选，写入 DevV2）
-	Channel  string `json:"channel"`  // 渠道码（可选，用户无商区码时写入 DistrictCode）
-}
+const (
+	deviceUserLockRetry    = 10
+	deviceUserLockInterval = 100 * time.Millisecond
+)
 
-// isGuestUser 是否为可升级的游客身份
-func isGuestUser(user *usermod.User) bool {
-	if user == nil {
-		return false
+// ResolveDeviceUser 按设备ID识别用户：先查缓存，再查库，都没有则自动创建
+func ResolveDeviceUser(ctx context.Context, ua useragent.UA, ip, channel string) (int64, *srvdef.SrvErr) {
+	devID := strings.TrimSpace(ua.DevID)
+	if devID == "" {
+		return 0, srvdef.New(srvdef.ErrParamError, "devID不能为空", "")
 	}
-	if user.Type == pubdef.UserTypeNormal {
-		return false
-	}
-	return !user.IsRegister && strings.TrimSpace(user.AccountNo) == ""
-}
+	ua.DevID = devID
 
-// GuestLogin 游客登录：按 token / DevID / Mac / DeviceId 查找，不存在则创建游客
-func GuestLogin(ctx context.Context, userId int64, ip string, req *GuestLoginReq, ua useragent.UA) (*LoginResp, *srvdef.SrvErr) {
-	if isBotRequest(ctx) {
-		return crawlerGuestLogin()
-	}
-	if req == nil || strings.TrimSpace(req.DevID) == "" {
-		return nil, srvdef.New(srvdef.ErrParamError, "devID不能为空", "")
-	}
-	ua.DevID = strings.TrimSpace(req.DevID)
-
-	var user *usermod.User
-	var serr *srvdef.SrvErr
-	reuseToken := false
-
-	if userId > 0 {
-		user, serr = usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: userId})
-		if serr != nil {
-			if serr.Code != srvdef.ErrUserNotExsit {
-				return nil, serr
-			}
-			userId = 0
-			user = nil
-		} else {
-			reuseToken = true
+	cacheKey := redisconst.AppDeviceUserKey(devID)
+	if v, err := redis.Get(cacheKey); err == nil && v != nil {
+		if userId, perr := strconv.ParseInt(*v, 10, 64); perr == nil && userId > 0 {
+			return userId, nil
 		}
 	}
 
-	isNewUser := false
-	if userId == 0 {
-		user, serr = findGuestUser(ctx, req)
-		if serr != nil {
-			if serr.Code != srvdef.ErrUserNotExsit {
-				return nil, serr
-			}
-			user, serr = createGuestUser(ctx, ua, req, ip)
-			if serr != nil {
-				return nil, serr
-			}
-			isNewUser = true
-		}
+	user, serr := findOrCreateDeviceUser(ctx, ua, ip, channel)
+	if serr != nil {
+		return 0, serr
 	}
-
 	if user.Status == pubdef.UserStatusDisable {
-		return nil, srvdef.New(srvdef.AccountErrAccessForbid, srvdef.AccountErrAccessForbid.Msg(), "")
+		return 0, srvdef.New(srvdef.AccountErrAccessForbid, srvdef.AccountErrAccessForbid.Msg(), "")
 	}
+	if err := redis.Set(cacheKey, user.Id, redisconst.AppDeviceUserExpire); err != nil {
+		log.Warn("authser:ResolveDeviceUser cache set failed", log.Any("devID", devID), log.E(err))
+	}
+	return user.Id, nil
+}
 
+// findOrCreateDeviceUser 按设备ID查找用户，不存在时加锁创建，避免同一设备并发请求建出多个用户
+func findOrCreateDeviceUser(ctx context.Context, ua useragent.UA, ip, channel string) (*usermod.User, *srvdef.SrvErr) {
+	lockKey := redisconst.AppDeviceUserLockKey(ua.DevID)
+	for i := 0; i < deviceUserLockRetry; i++ {
+		user, serr := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.DevID: ua.DevID})
+		if serr == nil {
+			touchDeviceUser(ctx, user, ua, ip, channel)
+			return user, nil
+		}
+		if serr.Code != srvdef.ErrUserNotExsit {
+			return nil, serr
+		}
+
+		ok, err := redis.Setnx_NewOK(lockKey, 1, redisconst.AppDeviceUserLockExpire)
+		if err != nil {
+			return nil, srvdef.New(srvdef.StoreLevel, "用户创建失败", "")
+		}
+		if ok {
+			defer func() { _ = redis.Del(lockKey) }()
+			return createGuestUser(ctx, ua, ip, channel)
+		}
+		// 其他请求正在为该设备建用户，稍后重查
+		time.Sleep(deviceUserLockInterval)
+	}
+	return nil, srvdef.New(srvdef.StoreLevel, "用户创建失败", "")
+}
+
+// touchDeviceUser 更新最近访问信息（缓存未命中时执行，频率受缓存时长限制）
+func touchDeviceUser(ctx context.Context, user *usermod.User, ua useragent.UA, ip, channel string) {
 	now := time.Now()
 	setDoc := bson.M{
 		usermod.FN.User.LastLoginAt: now,
@@ -94,9 +90,6 @@ func GuestLogin(ctx context.Context, userId int64, ip string, req *GuestLoginReq
 		usermod.FN.User.LastIp:      ip,
 		usermod.FN.User.LoginType:   pubdef.LoginTypeDevice,
 	}
-	if v := strings.TrimSpace(ua.DevID); v != "" {
-		setDoc[usermod.FN.User.DevID] = v
-	}
 	if v := strings.TrimSpace(ua.DevType); v != "" {
 		setDoc[usermod.FN.User.Device] = v
 	}
@@ -106,74 +99,15 @@ func GuestLogin(ctx context.Context, userId int64, ip string, req *GuestLoginReq
 	if v := strings.TrimSpace(ua.Ver); v != "" {
 		setDoc[usermod.FN.User.AppVer] = v
 	}
-	if v := strings.TrimSpace(req.Mac); v != "" {
-		setDoc[usermod.FN.User.Mac] = v
-	}
-	if v := strings.TrimSpace(req.DeviceId); v != "" {
-		setDoc[usermod.FN.User.DevV2] = v
-	}
-	// 历史用户 Type 为空/旧值时，未注册则归为游客
-	if isGuestUser(user) && user.Type != pubdef.UserTypeGuest {
-		setDoc[usermod.FN.User.Type] = pubdef.UserTypeGuest
-		user.Type = pubdef.UserTypeGuest
-	}
 	mergeUAExtFieldsToSet(setDoc, user, ua)
+	applyChannelIfMissing(setDoc, user, channel)
 	_ = usermod.UpdateOneUser(ctx, bson.M{usermod.FN.User.Id: user.Id}, bson.M{"$set": setDoc})
-
-	var token string
-	if reuseToken {
-		if old, err := tokener.Get(user.Id); err == nil && len(old) > 0 {
-			token = string(old)
-		}
-	}
-	if token == "" {
-		token, serr = generateAndSaveToken(user.Id)
-		if serr != nil {
-			return nil, serr
-		}
-	}
-
-	resp := toLoginResp(ctx, user, token, true)
-	resp.IsNewUser = isNewUser
-	if isNewUser {
-		visit.RecordDailyVisit(ctx, user.Id, ua, ip)
-		reportser.ReportUserRegister(user, ua, ip, "deviceid")
-	}
-	reportser.ReportUserLogin(user, ua, ip, pubdef.LoginTypeDevice)
-	return resp, nil
 }
 
-func findGuestUser(ctx context.Context, req *GuestLoginReq) (*usermod.User, *srvdef.SrvErr) {
-	user, serr := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.DevID: req.DevID})
-	if serr == nil {
-		return user, nil
-	}
-	if serr.Code != srvdef.ErrUserNotExsit {
-		return nil, serr
-	}
-
-	mac := strings.TrimSpace(req.Mac)
-	if mac != "" && !strings.Contains(mac, "00:00:00:00") {
-		user, serr = usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Mac: mac})
-		if serr == nil {
-			return user, nil
-		}
-		if serr.Code != srvdef.ErrUserNotExsit {
-			return nil, serr
-		}
-	}
-
-	deviceId := strings.TrimSpace(req.DeviceId)
-	if deviceId != "" && !strings.Contains(deviceId, "00:00:00:00") {
-		return usermod.FindOneUser(ctx, bson.M{usermod.FN.User.DevV2: deviceId})
-	}
-	return nil, srvdef.New(srvdef.ErrUserNotExsit, "", "")
-}
-
-func createGuestUser(ctx context.Context, ua useragent.UA, req *GuestLoginReq, ip string) (*usermod.User, *srvdef.SrvErr) {
+func createGuestUser(ctx context.Context, ua useragent.UA, ip, channel string) (*usermod.User, *srvdef.SrvErr) {
 	now := time.Now()
 	uid := mongos.Lid.User.Get()
-	districtInfo := resolveUserDistrict(req.Channel, "", ip, ua.SysType)
+	districtInfo := resolveUserDistrict(channel, "", ip, ua.SysType)
 	user := &usermod.User{
 		Id:            uid,
 		Type:          pubdef.UserTypeGuest,
@@ -183,13 +117,11 @@ func createGuestUser(ctx context.Context, ua useragent.UA, req *GuestLoginReq, i
 		NickName:      fmt.Sprintf("游客%d", uid),
 		Avatar:        randomAvatar(),
 		InviteCode:    generateUniqueInviteCode(ctx),
-		DistrictCode:  normalizeChannel(req.Channel),
+		DistrictCode:  normalizeChannel(channel),
 		IsDirect:      districtInfo.IsDirect,
 		RegIp:         ip,
 		LastIp:        ip,
 		DevID:         ua.DevID,
-		Mac:           strings.TrimSpace(req.Mac),
-		DevV2:         strings.TrimSpace(req.DeviceId),
 		Device:        ua.DevType,
 		SysType:       ua.SysType,
 		AppVer:        ua.Ver,
@@ -213,14 +145,13 @@ func createGuestUser(ctx context.Context, ua useragent.UA, req *GuestLoginReq, i
 	return user, nil
 }
 
-func toLoginResp(ctx context.Context, user *usermod.User, token string, withCDN bool) *LoginResp {
+func toLoginResp(ctx context.Context, user *usermod.User, withCDN bool) *LoginResp {
 	avatar := user.Avatar
 	if withCDN {
 		cdn := configser.GetAppImageCdn(configser.ClientIPFromCtx(ctx))
 		avatar = netutil.MergeURL(cdn, user.Avatar)
 	}
 	return &LoginResp{
-		Token:            token,
 		UserId:           user.Id,
 		AccountNo:        user.AccountNo,
 		Email:            user.Email,
@@ -247,16 +178,16 @@ func normalizeChannel(channel string) string {
 	return strings.TrimSpace(channel)
 }
 
-func isBotRequest(ctx context.Context) bool {
-	gc, ok := ctx.(*gin.Context)
-	return ok && reptilerecord.IsBot(gc)
+func hasDistrictCode(code string) bool {
+	return strings.TrimSpace(code) != ""
 }
 
-// crawlerGuestLogin 给爬虫签发可观看的虚拟游客 token，不建用户、不写日活、不上报。
-func crawlerGuestLogin() (*LoginResp, *srvdef.SrvErr) {
-	token, serr := generateCrawlerToken()
-	if serr != nil {
-		return nil, serr
+func applyChannelIfMissing(setDoc bson.M, user *usermod.User, channel string) {
+	if user == nil || hasDistrictCode(user.DistrictCode) {
+		return
+	}
+	if ch := normalizeChannel(channel); ch != "" {
+		setDoc[usermod.FN.User.DistrictCode] = ch
+		user.DistrictCode = ch
 	}
-	return CrawlerLoginResp(token), nil
 }

app/service/coinser/coin_buy.go

@@ -2,19 +2,12 @@ package coinser
 
 import (
 	"context"
-	"crypto/md5"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"strconv"
 	"strings"
 	"time"
 	"videoweb/app/service/rechargeser"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/srvdef"
 	"videoweb/pub/common/useragent"
-	"videoweb/pub/dataReport"
-	"videoweb/pub/models/eventmod"
 	"videoweb/pub/models/rechargepackagemod"
 	"videoweb/pub/models/usermod"
 	"videoweb/pub/models/vipordermod"
@@ -116,8 +109,6 @@ func CreateCoinOrder(ctx context.Context,
 		return nil, serr
 	}
 
-	go reportCoinOrderCreated(order, pkg, ip)
-
 	return &BuyCoinResp{
 		TradeNo:          tradeNo,
 		PayUrl:           payInfo.PayUrl,
@@ -126,65 +117,6 @@ func CreateCoinOrder(ctx context.Context,
 	}, nil
 }
 
-func reportCoinOrderCreated(order *vipordermod.VipOrder, pkg *rechargepackagemod.RechargePackage, ip string) {
-	ctx := context.Background()
-	user, _ := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: order.UserId})
-	districtCode := order.DistrictCode
-	if user != nil && strings.TrimSpace(user.DistrictCode) != "" {
-		districtCode = user.DistrictCode
-	}
-
-	sourceKey, sourceName := orderSource(order)
-	ua := order.Client.UA(order.SysType)
-	eventId := newEventId(pubdef.TrackerAppId(), order.UserId, order.TradeNo, order.CreatedAt.Unix())
-	commonField := dataReport.NewCommonField(eventId, dataReport.EventTypeOrderCreated, districtCode, ua, strconv.FormatInt(order.UserId, 10), ip)
-	commonField.Payload = dataReport.JsonRawMessage(&dataReport.OrderCreatedEvent{
-		OrderID:        order.TradeNo,
-		OrderType:      "coin_purchase",
-		ProductID:      strconv.FormatInt(pkg.Id, 10),
-		ProductName:    pkg.Name,
-		Amount:         dataReport.JsonNumber(order.Amount),
-		Currency:       "CNY",
-		CoinQuantity:   dataReport.JsonNumber(order.Coin),
-		SourcePageKey:  sourceKey,
-		SourcePageName: sourceName,
-		CreateTime:     dataReport.JsonNumber(order.CreatedAt.Unix()),
-	})
-
-	eventData, _ := json.Marshal(commonField)
-	if err := eventmod.InsertOneEvent(ctx, &eventmod.Event{
-		EventId:   commonField.EventID,
-		EventType: commonField.Event,
-		Data:      string(eventData),
-		Status:    eventmod.Default,
-		CreatedAt: time.Now(),
-		UpdatedAt: time.Now(),
-	}); err != nil {
-		log.Error("reportCoinOrderCreated InsertOneEvent failed",
-			log.Any("tradeNo", order.TradeNo), log.E(err))
-	}
-}
-
-func orderSource(order *vipordermod.VipOrder) (string, string) {
-	key, name := "deposit", "金币充值"
-	if order != nil && order.Client != nil {
-		if value := strings.TrimSpace(order.Client.SourcePageKey); value != "" {
-			key = value
-		}
-		if value := strings.TrimSpace(order.Client.SourcePageName); value != "" {
-			name = value
-		}
-	}
-	return key, name
-}
-
-func newEventId(appId string, uid int64, orderId interface{}, createTime int64) string {
-	input := fmt.Sprintf("%v%v%v%v", appId, uid, orderId, createTime)
-	h := md5.New()
-	h.Write([]byte(input))
-	return hex.EncodeToString(h.Sum(nil))
-}
-
 // GetCoinOrderHistory 查询用户金币购买记录
 func GetCoinOrderHistory(ctx context.Context, userId int64, page, pageSize int64) (vipordermod.VipOrderList, int64, *srvdef.SrvErr) {
 	filter := bson.M{

app/service/commentser/comment.go

@@ -8,7 +8,6 @@ import (
 	"unicode/utf8"
 	"videoweb/app/api/proto"
 	"videoweb/app/service/configser"
-	"videoweb/app/service/reportser"
 	"videoweb/pub/common/enum/redisconst"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/netutil"
@@ -126,13 +125,6 @@ func SendComment(ctx context.Context, userId int64, ip string, req *proto.Commen
 			log.Error("评论发布后更新短剧热度失败", log.Any("短剧ID", playletId), log.Any("评论信息", info), log.E(err))
 			return err
 		}
-		chapterId := int64(0)
-		if req.ObjectType == ObjectTypePlayletChapter {
-			chapterId = req.ObjectId
-		}
-		reportser.ReportPlayletComment(ctx, user, playletId, chapterId, text)
-	} else if req.ObjectType == ObjectTypeVideo {
-		reportser.ReportVideoComment(ctx, user, req.ObjectId, text)
 	}
 	// app端发布评论先进入待审核状态，不立即增加业务对象评论数；后台审核通过时再统一同步 countComment
 	return nil

app/service/configser/advertise_click.go

@@ -0,0 +1,66 @@
+package configser
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+
+	"videoweb/app/appg"
+	"videoweb/pub/common/godef"
+	"videoweb/pub/common/httputil"
+	"videoweb/pub/common/log"
+)
+
+type advertiseClickReq struct {
+	Id    int64 `json:"id"`
+	AppId int32 `json:"appId"`
+}
+
+type advertiseClickResp struct {
+	Code int64 `json:"code"`
+}
+
+// resolveAdvertiseAppId 请求带了 AppId 用请求的，否则回落到默认 advertiseAppId
+func resolveAdvertiseAppId(reqAppId int32) int32 {
+	if reqAppId > 0 {
+		return reqAppId
+	}
+	return advertiseAppId
+}
+
+// AdvertiseClickCenter 同步上报单条广告点击到广告中心。
+// appId<=0 时回落到默认 advertiseAppId。
+func AdvertiseClickCenter(advertiseId int64, appId int32) error {
+	versionUrl := strings.TrimRight(strings.TrimSpace(appg.Conf.VersionUrl), "/")
+	if versionUrl == "" {
+		return fmt.Errorf("versionUrl 未配置")
+	}
+	url := versionUrl + "/api/stat/advitise/v2/click"
+	body, _ := json.Marshal(advertiseClickReq{Id: advertiseId, AppId: resolveAdvertiseAppId(appId)})
+	var resp advertiseClickResp
+	code, err := httputil.Client().POSTJsonWithJResp(&resp, url, map[string]string{"Content-Type": "application/json"}, body)
+	if err != nil {
+		log.Error("AdvertiseClickCenter POST fail", log.Any("url", url), log.Any("id", advertiseId), log.E(err))
+		return err
+	}
+	if code != http.StatusOK {
+		log.Error("AdvertiseClickCenter response status", log.Any("code", code), log.Any("id", advertiseId))
+		return fmt.Errorf("response status %d", code)
+	}
+	return nil
+}
+
+// AsyncAdvertiseClick 异步上报广告点击，非数字 id 忽略。
+// appId<=0 时回落到默认 advertiseAppId。
+func AsyncAdvertiseClick(id string, appId int32) {
+	advertiseId, err := strconv.ParseInt(strings.TrimSpace(id), 10, 64)
+	if err != nil {
+		log.Warn("AsyncAdvertiseClick invalid id", log.Any("id", id))
+		return
+	}
+	godef.Go(func() {
+		_ = AdvertiseClickCenter(advertiseId, appId)
+	})
+}

app/service/configser/announcement.go

@@ -1,97 +1,113 @@
 package configser
 
 import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"sort"
 	"strconv"
-	"videoweb/app/api/proto"
+	"strings"
 	"videoweb/app/appg"
-	"videoweb/pub/adcenter"
+	"videoweb/pub/common/httputil"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/netutil"
 	"videoweb/pub/storage/proxy"
 )
 
-// UpdateAdvitiseDataFromJt 从广告中心拉取福利页广告
-func UpdateAdvitiseDataFromJt() {
-	config := GetConfigInfo()
-	var resp proto.AdvitiseData
-	jtAds, err := adcenter.JtAdvertiseThreeServer(appg.Conf.AdCenter.ApiDomain, appg.Conf.AdCenter.MerchantCode, appg.Conf.AdCenter.AppCode, appg.Conf.AdCenter.AesKey)
+// 广告中心应用ID（本站专用）
+const advertiseAppId int32 = 12
+
+// advertiseInfo 广告中心 /api/stat/advitise/v2/get 的广告条目
+type advertiseInfo struct {
+	Id       int64  `json:"id"`       // 广告id
+	Title    string `json:"title"`    // 广告标题
+	CoverImg string `json:"coverImg"` // 封面
+	LocId    int32  `json:"locId"`    // 位置id
+	JumpType int32  `json:"jumpType"` // 跳转方式
+	Link     string `json:"link"`     // 链接地址
+	Sort     int64  `json:"sort"`     // 排序
+	Tags     string `json:"tags"`     // 标签
+	Remark   string `json:"remark"`   // 备注描述
+}
+
+type advertiseReq struct {
+	AppId int32 `json:"appId"`
+}
+
+type advertiseRes struct {
+	AdvertiseList []advertiseInfo `json:"advertiseList"`
+}
+
+// fetchAdvertiseList 请求广告中心 /api/stat/advitise/v2/get
+func fetchAdvertiseList() (*advertiseRes, error) {
+	versionUrl := strings.TrimRight(strings.TrimSpace(appg.Conf.VersionUrl), "/")
+	if versionUrl == "" {
+		return nil, fmt.Errorf("versionUrl 未配置")
+	}
+	url := versionUrl + "/api/stat/advitise/v2/get"
+	body, _ := json.Marshal(advertiseReq{AppId: advertiseAppId})
+	var resp advertiseRes
+	code, err := httputil.Client().POSTJsonWithJResp(&resp, url, map[string]string{"Content-Type": "application/json"}, body)
 	if err != nil {
-		log.Error("JtAdvertiseThreeServer error occur", log.E(err))
+		return nil, err
+	}
+	if code != http.StatusOK {
+		return nil, fmt.Errorf("response status %d", code)
+	}
+	return &resp, nil
+}
+
+// UpdateAdvitiseData 从广告中心拉取广告并更新内存缓存，列表为空时重试一次
+func UpdateAdvitiseData(ctx context.Context) {
+	resp, err := fetchAdvertiseList()
+	if err != nil {
+		log.Error("UpdateAdvitiseData fetchAdvertiseList fail", log.E(err))
 		return
 	}
-	adMap := make(map[string]adcenter.AdCacheInfo)
-	for _, loc := range jtAds {
-		pos, err := strconv.Atoi(loc.AdvertiseLocationCode)
+	if len(resp.AdvertiseList) == 0 {
+		resp, err = fetchAdvertiseList()
 		if err != nil {
-			log.Error("广告位置代码错误，必须为数字", log.Any("code", loc.AdvertiseLocationCode))
-			continue
+			log.Error("UpdateAdvitiseData fetchAdvertiseList retry fail", log.E(err))
+			return
 		}
-		//if pos < 100001 {
-		//	continue
-		//}
-		ads := make([]proxy.AdvitiseInfo, 0)
-		for _, ad := range loc.AdDetailInfoList {
-			//extra := ad.GetExtraData()
-			ads = append(ads, proxy.AdvitiseInfo{
-				Id:       ad.AdvertiseCode,
-				Location: int64(pos),
-				Title:    ad.AdvertiseName,
-				Images:   netutil.MergeURL(config.ImgCdn, ad.GetCoverLsj()),
-				Link:     ad.GetRealLink(),
-			})
-			adMap[ad.AdvertiseCode] = adcenter.AdCacheInfo{
-				AdvertiseCode:         ad.AdvertiseCode,
-				CustomerCode:          ad.CustomerCode,
-				AdvertiseName:         ad.AdvertiseName,
-				AdvertiseUrl:          ad.AdvertiseUrl,
-				AdvertiseIcon:         ad.AdvertiseIcon,
-				AdvertiseType:         ad.AdvertiseType,
-				AdMode:                ad.AdMode,
-				AppCode:               ad.AppCode,
-				LocationType:          ad.LocationType,
-				AdvertiseDesc:         ad.AdvertiseDesc,
-				PageType:              ad.PageType,
-				StartTimeStamp:        ad.StartTimeStamp,
-				EndTimeStamp:          ad.EndTimeStamp,
-				Sort:                  ad.Sort,
-				AdExtData:             ad.AdExtData,
-				DeptCode:              loc.DeptCode,
-				MerchantCode:          loc.MerchantCode,
-				AdvertiseLocationCode: loc.AdvertiseLocationCode,
-				AdvertiseLocationName: loc.AdvertiseLocationName,
-				DisplayMode:           loc.DisplayMode,
-				AdvertiseHeight:       loc.AdvertiseHeight,
-				AdvertiseWidth:        loc.AdvertiseWidth,
-				MaterialType:          loc.MaterialType,
-				AdLimit:               loc.AdLimit,
-			}
+	}
+	list := resp.AdvertiseList
+	sort.SliceStable(list, func(i, j int) bool {
+		if list[i].LocId != list[j].LocId {
+			return list[i].LocId < list[j].LocId
+		}
+		return list[i].Sort < list[j].Sort
+	})
+
+	config := GetConfigInfo()
+	data := proxy.AdvitiseData{}
+
+	for _, v := range list {
+		pos := int64(v.LocId)
+		info := proxy.AdvitiseInfo{
+			Id:       strconv.FormatInt(v.Id, 10),
+			Location: pos,
+			Title:    v.Title,
+			Images:   netutil.MergeURL(config.ImgCdn, strings.TrimLeft(v.CoverImg, "/")),
+			Link:     strings.ReplaceAll(v.Link, "inner://yinseinner/", "yinseinner://"),
 		}
 		switch pos {
-		case 1: //弹窗
-			resp.DialogList = ads
-		case 2: // 应用
-
-			resp.NineGridList = ads
-		case 3: // 横幅
-			resp.DetailbannerList = ads
-
+		case 1:
+			data.DialogList = append(data.DialogList, info)
+		case 2:
+			data.NineGridList = append(data.NineGridList, info)
+		case 3:
+			data.VideoTopList = append(data.VideoTopList, info)
+			data.VideoDownList = append(data.VideoDownList, info)
 		case 12:
-			resp.AList = ads
+			data.AppInfoAList = append(data.AppInfoAList, info)
 		case 13:
-			resp.BList = ads
+			data.AppInfoBList = append(data.AppInfoBList, info)
 		}
 	}
+
 	CacheMgr.Lock.Lock()
 	defer CacheMgr.Lock.Unlock()
-	CacheMgr.Advitise = resp
-	CacheMgr.AdvitiseMap = adMap
-}
-
-func GetAdvertiseLocation(adverId string) (res adcenter.AdCacheInfo) {
-	CacheMgr.Lock.RLock()
-	defer CacheMgr.Lock.RUnlock()
-	if ad, ok := CacheMgr.AdvitiseMap[adverId]; ok {
-		res = ad
-	}
-	return
+	CacheMgr.Advitise = data
 }

app/service/configser/catch.go

@@ -12,7 +12,6 @@ import (
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/netutil"
 	"videoweb/pub/common/srvdef"
-	"videoweb/pub/dataReport"
 	"videoweb/pub/models/announcementmod"
 	"videoweb/pub/models/cfg"
 	"videoweb/pub/models/ipblackmod"
@@ -61,16 +60,15 @@ func init() {
 
 func Start() {
 	ctx := context.Background()
-	dataReport.StartSDKConfigCron()
 	UpdateConfigInfo(ctx)
-	UpdateAdvitiseDataFromJt()
+	UpdateAdvitiseData(ctx)
 	updateIpBlack()
 	updateTagsCache()
 	updateAppRichTexts()
 	updateAnnouncements()
 	_, _ = skdCron.AddFunc("0 */5 * * * ?", func() {
 		UpdateConfigInfo(ctx)
-		UpdateAdvitiseDataFromJt()
+		UpdateAdvitiseData(ctx)
 		updateIpBlack()
 		updateTagsCache()
 		updateAppRichTexts()
@@ -155,7 +153,6 @@ func UpdateConfigInfo(ctx context.Context) {
 	config.DHSiteName = sysCfg.DHSiteName
 	config.DHTitle = sysCfg.DHTitle
 	config.ActressBackGround = netutil.MergeURL(sysCfg.ImgAppCdn, sysCfg.ActressBackGround)
-	config.ReportSDKConfig = dataReport.GetSDKDomainConfig()
 	config.WatermarkImage = sysCfg.WatermarkImage
 	config.CustomerServiceHost = sysCfg.CustomerServiceHost
 	config.ChannelCode = sysCfg.ChannelCode
@@ -563,7 +560,6 @@ func GetVideoTagCategoryDataList() []proto.VideoTagCategoryData {
 	return rsl
 }
 func Stop() {
-	dataReport.StopSDKConfigCron()
 	skdCron.Stop()
 }
 

app/service/playletser/playlet.go

@@ -11,7 +11,6 @@ import (
 	"videoweb/app/api/proto"
 	"videoweb/app/service/configser"
 	"videoweb/app/service/playletcache"
-	"videoweb/app/service/reportser"
 	"videoweb/app/service/videoser"
 	"videoweb/pub/common/enum/redisconst"
 	"videoweb/pub/common/log"
@@ -920,9 +919,6 @@ func SetLike(ctx context.Context, userId int64, req *proto.PlayletLikeSetReq) (*
 		IsLike:    operateStatusByFlag(*req.IsLike),
 		CountLike: countLike,
 	}
-	if changed {
-		reportser.ReportPlayletLike(ctx, userId, req.Id, resp.IsLike)
-	}
 	return resp, nil
 }
 
@@ -942,9 +938,6 @@ func SetCollect(ctx context.Context, userId int64, req *proto.PlayletCollectSetR
 		IsCollect:    operateStatusByFlag(*req.IsCollect),
 		CountCollect: countCollect,
 	}
-	if changed {
-		reportser.ReportPlayletCollect(ctx, userId, req.Id, resp.IsCollect)
-	}
 	return resp, nil
 }
 
@@ -994,9 +987,6 @@ func SetChapterLike(ctx context.Context, userId int64, req *proto.PlayletChapter
 		IsLike:    operateStatusByFlag(*req.IsLike),
 		CountLike: countLike,
 	}
-	if changed {
-		reportser.ReportPlayletChapterLike(ctx, userId, chapter.PlayletId, req.ChapterId, resp.IsLike)
-	}
 	return resp, nil
 }
 
@@ -1016,9 +1006,6 @@ func SetChapterCollect(ctx context.Context, userId int64, req *proto.PlayletChap
 		IsCollect:    operateStatusByFlag(*req.IsCollect),
 		CountCollect: countCollect,
 	}
-	if changed {
-		reportser.ReportPlayletChapterCollect(ctx, userId, chapter.PlayletId, req.ChapterId, resp.IsCollect)
-	}
 	return resp, nil
 }
 
@@ -1282,7 +1269,6 @@ func UnlockChapter(ctx context.Context, userId int64, req *proto.PlayletChapterU
 		return nil, srvdef.New(srvdef.DBTransaction, "解锁失败，请稍后重试", "解锁失败，请稍后重试")
 	}
 	updatePlayletChapterUnlockStatsAsync(chapter.PlayletId, chapter.Id)
-	reportser.ReportPlayletUnlock(ctx, user, playlet, chapter, chapter.SingleCoins, user.Recharge, balanceAfter, orderNo)
 	return playletChapterUnlockResp(chapter, balanceAfter, -chapter.SingleCoins), nil
 }
 

app/service/rechargeser/recharge.go

@@ -2,18 +2,11 @@ package rechargeser
 
 import (
 	"context"
-	"crypto/md5"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"strconv"
 	"strings"
 	"time"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/srvdef"
 	"videoweb/pub/common/useragent"
-	"videoweb/pub/dataReport"
-	"videoweb/pub/models/eventmod"
 	"videoweb/pub/models/rechargepackagemod"
 	"videoweb/pub/models/usermod"
 	"videoweb/pub/models/vipordermod"
@@ -104,8 +97,6 @@ func CreateOrder(ctx context.Context,
 		return nil, serr
 	}
 
-	go reportOrderCreated(ctx, order, pkg, userId, ip)
-
 	return &SubmitOrderResp{
 		TradeNo:          tradeNo,
 		PayUrl:           payInfo.PayUrl,
@@ -138,56 +129,3 @@ func GetOrderHistory(ctx context.Context, userId int64, page, pageSize int64) (v
 func GetUserInfo(ctx context.Context, userId int64) (*usermod.User, *srvdef.SrvErr) {
 	return usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: userId})
 }
-
-func reportOrderCreated(ctx context.Context, order *vipordermod.VipOrder, pkg *rechargepackagemod.RechargePackage, userId int64, ip string) {
-	user, _ := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: userId})
-	districtCode := ""
-	if user != nil {
-		districtCode = user.DistrictCode
-	}
-
-	sourceKey, sourceName := "deposit", "金币充值"
-	if order.Client != nil {
-		if value := strings.TrimSpace(order.Client.SourcePageKey); value != "" {
-			sourceKey = value
-		}
-		if value := strings.TrimSpace(order.Client.SourcePageName); value != "" {
-			sourceName = value
-		}
-	}
-	ua := order.Client.UA(order.SysType)
-	eventId := newEventId(pubdef.TrackerAppId(), user.Id, order.TradeNo, order.CreatedAt.Unix())
-	commonField := dataReport.NewCommonField(eventId, dataReport.EventTypeOrderCreated, districtCode, ua, strconv.FormatInt(user.Id, 10), ip)
-
-	commonField.Payload = dataReport.JsonRawMessage(&dataReport.OrderCreatedEvent{
-		OrderID:        order.TradeNo,
-		OrderType:      "vip_subscription",
-		ProductID:      strconv.FormatInt(pkg.Id, 10),
-		ProductName:    pkg.Name,
-		Amount:         dataReport.JsonNumber(order.Amount),
-		Currency:       "CNY",
-		SourcePageKey:  sourceKey,
-		SourcePageName: sourceName,
-		CreateTime:     dataReport.JsonNumber(order.CreatedAt.Unix()),
-	})
-
-	eventData, _ := json.Marshal(commonField)
-	if err := eventmod.InsertOneEvent(ctx, &eventmod.Event{
-		EventId:   commonField.EventID,
-		EventType: commonField.Event,
-		Data:      string(eventData),
-		Status:    eventmod.Default,
-		CreatedAt: time.Now(),
-		UpdatedAt: time.Now(),
-	}); err != nil {
-		log.Error("reportOrderCreated InsertOneEvent failed",
-			log.Any("tradeNo", order.TradeNo), log.E(err))
-	}
-}
-
-func newEventId(appId string, uid int64, orderId interface{}, createTime int64) string {
-	input := fmt.Sprintf("%v%v%v%v", appId, uid, orderId, createTime)
-	h := md5.New()
-	h.Write([]byte(input))
-	return hex.EncodeToString(h.Sum(nil))
-}

app/service/reportser/report.go

@@ -1,559 +0,0 @@
-package reportser
-
-import (
-	"context"
-	"crypto/md5"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-	"videoweb/app/service/playletcache"
-	"videoweb/pub/common"
-	"videoweb/pub/common/enum/consts"
-	"videoweb/pub/common/ipaddr"
-	"videoweb/pub/common/log"
-	"videoweb/pub/common/useragent"
-	"videoweb/pub/dataReport"
-	"videoweb/pub/models/eventmod"
-	"videoweb/pub/models/playletchaptermod"
-	"videoweb/pub/models/playletmod"
-	"videoweb/pub/models/usermod"
-	"videoweb/pub/models/videoinformationmod"
-	"videoweb/pub/pubdef"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-const (
-	videoContentTypeVideo = "video"
-)
-
-// ReportUserRegister 用户注册事件
-func ReportUserRegister(user *usermod.User, ua useragent.UA, ip, registerType string) {
-	if user == nil {
-		return
-	}
-	if registerType == "" {
-		registerType = "deviceid"
-	}
-	ua = fillUserUA(user, ua)
-	createAt := user.CreatedAt
-	if !user.RegisterTime.IsZero() {
-		createAt = user.RegisterTime
-	}
-	eventId := newEventId(pubdef.TrackerAppId(), user.Id, "", createAt.Unix())
-	event := dataReport.NewCommonField(eventId, dataReport.EventTypeUserRegister, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	event.Payload = dataReport.JsonRawMessage(&dataReport.UserRegisterEvent{
-		Type:       registerType,
-		CreateTime: dataReport.JsonNumber(createAt.Unix()),
-	})
-	insertEvent(event)
-}
-
-// ReportUserLogin 用户登录事件
-func ReportUserLogin(user *usermod.User, ua useragent.UA, ip string, loginType pubdef.LoginType) {
-	if user == nil {
-		return
-	}
-	ua = fillUserUA(user, ua)
-	createTime := time.Now().Unix()
-	eventId := newEventId(pubdef.TrackerAppId(), user.Id, "", createTime)
-	event := dataReport.NewCommonField(eventId, dataReport.EventTypeUserLogin, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	event.Payload = dataReport.JsonRawMessage(&dataReport.UserLoginEvent{
-		Type: loginTypeEventValue(loginType),
-	})
-	insertEvent(event)
-}
-
-// ReportPlayletLike 短剧点赞
-func ReportPlayletLike(ctx context.Context, userId, playletId, flag int64) {
-	reportDramaEvent(ctx, userId, playletId, 0, dataReport.EventTypeDramaLike, flag, "")
-}
-
-// ReportVideoLike 视频点赞
-func ReportVideoLike(ctx context.Context, userId, videoId, flag int64) {
-	reportVideoEvent(ctx, userId, videoId, dataReport.EventTypeVideoLike, flag)
-}
-
-// ReportPlayletCollect 短剧收藏
-func ReportPlayletCollect(ctx context.Context, userId, playletId, flag int64) {
-	reportDramaEvent(ctx, userId, playletId, 0, dataReport.EventTypeDramaCollect, flag, "")
-}
-
-// ReportVideoCollect 视频收藏
-func ReportVideoCollect(ctx context.Context, userId, videoId, flag int64) {
-	reportVideoEvent(ctx, userId, videoId, dataReport.EventTypeVideoCollect, flag)
-}
-
-// ReportVideoComment 视频评论
-func ReportVideoComment(ctx context.Context, user *usermod.User, videoId int64, content string) {
-	if user == nil || videoId <= 0 {
-		return
-	}
-	pub := buildVideoPub(ctx, videoId)
-	if pub.VideoID == "" {
-		return
-	}
-	ua, ip := uaAndIPFromCtx(ctx)
-	ua = fillUserUA(user, ua)
-	event := dataReport.NewCommonField(dataReport.GenerateGlobalEventID(), dataReport.EventTypeVideoComment, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	event.Payload = dataReport.JsonRawMessage(&dataReport.VideoCommentEvent{
-		VideoEventPub:  pub,
-		CommentContent: content,
-	})
-	insertEvent(event)
-}
-
-// ReportPlayletChapterLike 短剧剧集点赞
-func ReportPlayletChapterLike(ctx context.Context, userId, playletId, chapterId, flag int64) {
-	reportDramaEvent(ctx, userId, playletId, chapterId, dataReport.EventTypeDramaLike, flag, "")
-}
-
-// ReportPlayletChapterCollect 短剧剧集收藏
-func ReportPlayletChapterCollect(ctx context.Context, userId, playletId, chapterId, flag int64) {
-	reportDramaEvent(ctx, userId, playletId, chapterId, dataReport.EventTypeDramaCollect, flag, "")
-}
-
-// ReportPlayletComment 短剧/剧集评论
-func ReportPlayletComment(ctx context.Context, user *usermod.User, playletId, chapterId int64, content string) {
-	if user == nil || playletId <= 0 {
-		return
-	}
-	pub := buildDramaPub(ctx, playletId, chapterId)
-	if pub.DramaID == "" {
-		return
-	}
-	ua, ip := uaAndIPFromCtx(ctx)
-	ua = fillUserUA(user, ua)
-	event := dataReport.NewCommonField(dataReport.GenerateGlobalEventID(), dataReport.EventTypeDramaComment, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	event.Payload = dataReport.JsonRawMessage(&dataReport.DramaCommentEvent{
-		DramaEventPub:  pub,
-		CommentContent: content,
-	})
-	insertEvent(event)
-}
-
-// ReportPlayletUnlock 短剧剧集金币解锁：同时上报金币消耗和购买
-func ReportPlayletUnlock(ctx context.Context, user *usermod.User, playlet *playletmod.Playlet, chapter *playletchaptermod.PlayletChapter, amount, balanceBefore, balanceAfter int64, orderNo string) {
-	if user == nil || playlet == nil || chapter == nil || amount <= 0 {
-		return
-	}
-	if full, err := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: user.Id}); err == nil && full != nil {
-		user = full
-	}
-	ua, ip := uaAndIPFromCtx(ctx)
-	ua = fillUserUA(user, ua)
-	productId := strconv.FormatInt(chapter.Id, 10)
-	productName := playletUnlockProductName(playlet, chapter)
-	reportCoinConsume(user, ua, ip, productId, productName, amount, balanceBefore, balanceAfter, KeyPlayletUnlock, orderNo)
-	reportDramaPurchase(ctx, user, ua, ip, playlet, chapter, amount, orderNo)
-}
-
-// ReportPlayletStatusChange 短剧上下架，复用 video_status_change
-func ReportPlayletStatusChange(playlet *playletmod.Playlet, flag int64) {
-	if playlet == nil || playlet.Id == 0 || flag == 0 {
-		return
-	}
-	typeID, typeName := resolvePlayletType(playlet)
-	event := dataReport.NewCommonField("", dataReport.EventTypeVideoStatusChange, "", useragent.UA{}, "", "")
-	event.Payload = dataReport.JsonRawMessage(&dataReport.VideoStatusChangeEvent{
-		MediaId:       playletMediaId(playlet),
-		VideoID:       strconv.FormatInt(playlet.Id, 10),
-		VideoTitle:    playlet.Title,
-		VideoTypeID:   typeID,
-		VideoTypeName: typeName,
-		Flag:          dataReport.JsonNumber(flag),
-	})
-	insertEvent(event)
-}
-
-// PlayletStatusFlag 短剧上下架映射上报 flag：1上架 2下架
-func PlayletStatusFlag(status playletmod.Status) int64 {
-	switch status {
-	case playletmod.StatusUp:
-		return 1
-	case playletmod.StatusDown:
-		return 2
-	default:
-		return 0
-	}
-}
-
-func reportDramaEvent(ctx context.Context, userId, playletId, chapterId int64, eventType string, flag int64, content string) {
-	if userId <= 0 || playletId <= 0 {
-		return
-	}
-	user, err := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: userId})
-	if err != nil || user == nil {
-		return
-	}
-	pub := buildDramaPub(ctx, playletId, chapterId)
-	if pub.DramaID == "" {
-		return
-	}
-	ua, ip := uaAndIPFromCtx(ctx)
-	ua = fillUserUA(user, ua)
-	event := dataReport.NewCommonField(dataReport.GenerateGlobalEventID(), eventType, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	switch eventType {
-	case dataReport.EventTypeDramaLike:
-		event.Payload = dataReport.JsonRawMessage(&dataReport.DramaLikeEvent{
-			DramaEventPub: pub,
-			Flag:          dataReport.JsonNumber(flag),
-		})
-	case dataReport.EventTypeDramaCollect:
-		event.Payload = dataReport.JsonRawMessage(&dataReport.DramaCollectEvent{
-			DramaEventPub: pub,
-			Flag:          dataReport.JsonNumber(flag),
-		})
-	case dataReport.EventTypeDramaComment:
-		event.Payload = dataReport.JsonRawMessage(&dataReport.DramaCommentEvent{
-			DramaEventPub:  pub,
-			CommentContent: content,
-		})
-	default:
-		return
-	}
-	insertEvent(event)
-}
-
-func reportVideoEvent(ctx context.Context, userId, videoId int64, eventType string, flag int64) {
-	if userId <= 0 || videoId <= 0 {
-		return
-	}
-	user, err := usermod.FindOneUser(ctx, bson.M{usermod.FN.User.Id: userId})
-	if err != nil || user == nil {
-		return
-	}
-	pub := buildVideoPub(ctx, videoId)
-	if pub.VideoID == "" {
-		return
-	}
-	ua, ip := uaAndIPFromCtx(ctx)
-	ua = fillUserUA(user, ua)
-	event := dataReport.NewCommonField(dataReport.GenerateGlobalEventID(), eventType, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	switch eventType {
-	case dataReport.EventTypeVideoLike:
-		event.Payload = dataReport.JsonRawMessage(&dataReport.VideoLikeEvent{
-			VideoEventPub: pub,
-			Flag:          dataReport.JsonNumber(flag),
-		})
-	case dataReport.EventTypeVideoCollect:
-		event.Payload = dataReport.JsonRawMessage(&dataReport.VideoCollectEvent{
-			VideoEventPub: pub,
-			Flag:          dataReport.JsonNumber(flag),
-		})
-	default:
-		return
-	}
-	insertEvent(event)
-}
-
-func reportCoinConsume(user *usermod.User, ua useragent.UA, ip, productId, productName string, amount, balanceBefore, balanceAfter int64, reason Key, orderId string) {
-	if user == nil || amount == 0 {
-		return
-	}
-	if productId == "" {
-		if productName == "" {
-			productName = "金币消耗"
-		}
-		productId = md5String(productName)
-	}
-	createTime := time.Now().Unix()
-	eventId := newEventId(pubdef.TrackerAppId(), user.Id, orderId, createTime)
-	event := dataReport.NewCommonField(eventId, dataReport.EventTypeCoinConsume, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	event.Payload = dataReport.JsonRawMessage(&dataReport.CoinConsumeEvent{
-		ProductID:         productId,
-		ProductName:       productName,
-		CoinConsumeAmount: dataReport.JsonNumber(amount),
-		CoinBalanceBefore: dataReport.JsonNumber(balanceBefore),
-		CoinBalanceAfter:  dataReport.JsonNumber(balanceAfter),
-		ConsumeReasonKey:  reason.Key(),
-		ConsumeReasonName: reason.Name(),
-		CreateTime:        dataReport.JsonNumber(createTime),
-		OrderId:           orderId,
-	})
-	insertEvent(event)
-}
-
-func reportDramaPurchase(ctx context.Context, user *usermod.User, ua useragent.UA, ip string, playlet *playletmod.Playlet, chapter *playletchaptermod.PlayletChapter, amount int64, orderId string) {
-	pub := dataReport.DramaEventPub{}
-	if playlet != nil && chapter != nil && chapter.Id > 0 {
-		pub = buildDramaPub(ctx, playlet.Id, chapter.Id)
-	}
-	if pub.DramaID == "" {
-		pub = playletToDramaPub(playlet, chapter)
-	}
-	if pub.DramaID == "" {
-		return
-	}
-	event := dataReport.NewCommonField(dataReport.GenerateGlobalEventID(), dataReport.EventTypeDramaPurchase, user.DistrictCode, ua, strconv.FormatInt(user.Id, 10), ip)
-	event.Payload = dataReport.JsonRawMessage(&dataReport.DramaPurchaseEvent{
-		DramaEventPub: pub,
-		CoinQuantity:  dataReport.JsonNumber(amount),
-		OrderID:       orderId,
-		UnlockType:    dataReport.DramaUnlockTypeCoin,
-	})
-	insertEvent(event)
-}
-
-func buildDramaPub(ctx context.Context, playletId, chapterId int64) dataReport.DramaEventPub {
-	playlet, err := playletmod.FindOnePlaylet(ctx, bson.M{playletmod.FN.Playlet.Id: playletId}, options.FindOne().SetProjection(bson.D{
-		{Key: playletmod.FN.Playlet.Id, Value: 1},
-		{Key: playletmod.FN.Playlet.Title, Value: 1},
-		{Key: playletmod.FN.Playlet.ThemeIds, Value: 1},
-		{Key: playletmod.FN.Playlet.TagIds, Value: 1},
-		{Key: playletmod.FN.Playlet.TotalEpisode, Value: 1},
-	}))
-	if err != nil || playlet == nil {
-		return dataReport.DramaEventPub{}
-	}
-	chapter := findDramaReportChapter(ctx, playletId, chapterId)
-	return playletToDramaPub(playlet, chapter)
-}
-
-// findDramaReportChapter 取上报用剧集。指定了剧集就用该集，短剧维度事件用第一集，保证 drama_id、video_id 都来自剧集。
-func findDramaReportChapter(ctx context.Context, playletId, chapterId int64) *playletchaptermod.PlayletChapter {
-	projection := options.FindOne().SetProjection(bson.D{
-		{Key: playletchaptermod.FN.PlayletChapter.Id, Value: 1},
-		{Key: playletchaptermod.FN.PlayletChapter.PlayletId, Value: 1},
-		{Key: playletchaptermod.FN.PlayletChapter.MediaContentId, Value: 1},
-		{Key: playletchaptermod.FN.PlayletChapter.Title, Value: 1},
-		{Key: playletchaptermod.FN.PlayletChapter.CurrentEpisode, Value: 1},
-		{Key: playletchaptermod.FN.PlayletChapter.MediaTime, Value: 1},
-	})
-	if chapterId > 0 {
-		chapter, _ := playletchaptermod.FindOnePlayletChapter(ctx, bson.M{playletchaptermod.FN.PlayletChapter.Id: chapterId}, projection)
-		return chapter
-	}
-	chapter, _ := playletchaptermod.FindOnePlayletChapter(ctx, bson.M{playletchaptermod.FN.PlayletChapter.PlayletId: playletId}, projection.SetSort(bson.D{
-		{Key: playletchaptermod.FN.PlayletChapter.CurrentEpisode, Value: 1},
-		{Key: playletchaptermod.FN.PlayletChapter.Id, Value: 1},
-	}))
-	return chapter
-}
-
-func buildVideoPub(ctx context.Context, videoId int64) dataReport.VideoEventPub {
-	video, err := videoinformationmod.FindOneVideoInformationWithOptions(ctx, bson.M{videoinformationmod.FN.VideoInformation.Id: videoId}, options.FindOne().SetProjection(bson.D{
-		{Key: videoinformationmod.FN.VideoInformation.Id, Value: 1},
-		{Key: videoinformationmod.FN.VideoInformation.Title, Value: 1},
-		{Key: videoinformationmod.FN.VideoInformation.MediaType, Value: 1},
-		{Key: videoinformationmod.FN.VideoInformation.Video.FileId, Value: 1},
-		{Key: videoinformationmod.FN.VideoInformation.Video.TaskId, Value: 1},
-		{Key: videoinformationmod.FN.VideoInformation.SyncId, Value: 1},
-	}))
-	if err != nil || video == nil {
-		return dataReport.VideoEventPub{}
-	}
-	return videoToVideoPub(video)
-}
-
-func videoToVideoPub(video *videoinformationmod.VideoInformation) dataReport.VideoEventPub {
-	if video == nil {
-		return dataReport.VideoEventPub{}
-	}
-	mediaId := video.Video.FileId
-	if mediaId == "" {
-		mediaId = video.Video.TaskId
-	}
-	if mediaId == "" {
-		mediaId = video.SyncId
-	}
-	return dataReport.VideoEventPub{
-		MediaId:          mediaId,
-		VideoID:          strconv.FormatInt(video.Id, 10),
-		VideoTitle:       video.Title,
-		VideoTypeID:      strconv.FormatInt(int64(video.MediaType), 10),
-		VideoTypeName:    videoMediaTypeName(video.MediaType),
-		VideoContentType: videoContentTypeVideo,
-	}
-}
-
-func playletToDramaPub(playlet *playletmod.Playlet, chapter *playletchaptermod.PlayletChapter) dataReport.DramaEventPub {
-	if playlet == nil {
-		return dataReport.DramaEventPub{}
-	}
-	typeID, typeName := resolvePlayletType(playlet)
-	tagKey, tagName := resolvePlayletTags(playlet.TagIds)
-	episode := int64(1)
-	duration := int64(0)
-	dramaID := ""
-	videoID := ""
-	if chapter != nil && chapter.Id > 0 {
-		if chapter.CurrentEpisode > 0 {
-			episode = chapter.CurrentEpisode
-		}
-		duration = chapter.MediaTime
-		dramaID = strconv.FormatInt(chapter.Id, 10)
-		if chapter.MediaContentId > 0 {
-			videoID = strconv.FormatUint(uint64(chapter.MediaContentId), 10)
-		}
-	}
-	return dataReport.DramaEventPub{
-		DramaID:          dramaID,
-		DramaTitle:       playlet.Title,
-		Episode:          dataReport.JsonNumber(episode),
-		VideoID:          videoID,
-		TotalEpisode:     dataReport.JsonNumber(playlet.TotalEpisode),
-		DramaTypeID:      typeID,
-		DramaTypeName:    typeName,
-		DramaContentType: dataReport.DramaContentTypeShortDrama,
-		DramaTagKey:      tagKey,
-		DramaTagName:     tagName,
-		DramaDuration:    dataReport.JsonNumber(duration),
-	}
-}
-
-func videoMediaTypeName(mediaType videoinformationmod.MediaType) string {
-	switch mediaType {
-	case videoinformationmod.MediaType_Video:
-		return "视频"
-	case videoinformationmod.MediaType_Collection:
-		return "合集"
-	case videoinformationmod.MediaType_Advitise:
-		return "广告"
-	case videoinformationmod.MediaType_VideoV2:
-		return "视频"
-	default:
-		return "视频"
-	}
-}
-
-func playletUnlockProductName(playlet *playletmod.Playlet, chapter *playletchaptermod.PlayletChapter) string {
-	title := ""
-	if playlet != nil {
-		title = playlet.Title
-	}
-	if chapter == nil {
-		return title
-	}
-	if chapter.Title != "" {
-		if title == "" {
-			return chapter.Title
-		}
-		return fmt.Sprintf("%s %s", title, chapter.Title)
-	}
-	if chapter.CurrentEpisode > 0 {
-		if title == "" {
-			return fmt.Sprintf("第%d集", chapter.CurrentEpisode)
-		}
-		return fmt.Sprintf("%s 第%d集", title, chapter.CurrentEpisode)
-	}
-	return title
-}
-
-func playletMediaId(playlet *playletmod.Playlet) string {
-	if playlet == nil || playlet.MediaCenterId == 0 {
-		return ""
-	}
-	return strconv.FormatUint(uint64(playlet.MediaCenterId), 10)
-}
-
-func resolvePlayletType(playlet *playletmod.Playlet) (string, string) {
-	if playlet == nil || len(playlet.ThemeIds) == 0 {
-		return "default", "默认分类"
-	}
-	id := playlet.ThemeIds[0]
-	if id <= 0 {
-		return "default", "默认分类"
-	}
-	name := strings.TrimSpace(playletcache.ThemeNameMap([]int64{id})[id])
-	if name == "" {
-		name = "默认分类"
-	}
-	return strconv.FormatInt(id, 10), name
-}
-
-func resolvePlayletTags(ids []int64) (string, string) {
-	keys := make([]string, 0, len(ids))
-	for _, id := range ids {
-		if id > 0 {
-			keys = append(keys, strconv.FormatInt(id, 10))
-		}
-	}
-	if len(keys) == 0 {
-		return "default", "默认标签"
-	}
-	nameMap := playletcache.TagNameMap(ids)
-	names := make([]string, 0, len(keys))
-	for _, id := range ids {
-		if id <= 0 {
-			continue
-		}
-		name := strings.TrimSpace(nameMap[id])
-		if name == "" {
-			name = strconv.FormatInt(id, 10)
-		}
-		names = append(names, name)
-	}
-	return strings.Join(keys, ","), strings.Join(names, ",")
-}
-
-func uaAndIPFromCtx(ctx context.Context) (useragent.UA, string) {
-	gc, ok := ctx.(*gin.Context)
-	if !ok {
-		if v := ctx.Value(consts.CtxUA); v != nil {
-			if ua, ok := v.(useragent.UA); ok {
-				return ua, ""
-			}
-		}
-		return useragent.UA{}, ""
-	}
-	ua, _ := common.GetUA(gc)
-	return ua, ipaddr.ResolveClientIP(gc)
-}
-
-func fillUserUA(user *usermod.User, ua useragent.UA) useragent.UA {
-	if user == nil {
-		return ua
-	}
-	if ua.DevID == "" {
-		ua.DevID = user.DevID
-	}
-	if ua.DevType == "" {
-		ua.DevType = user.Device
-	}
-	if ua.SysType == "" {
-		ua.SysType = user.SysType
-	}
-	return ua
-}
-
-func loginTypeEventValue(loginType pubdef.LoginType) string {
-	switch loginType {
-	case pubdef.LoginTypeAccount:
-		return "username"
-	case pubdef.LoginTypeEmail:
-		return "email"
-	default:
-		return "deviceid"
-	}
-}
-
-func newEventId(appId string, uid int64, orderId interface{}, createTime int64) string {
-	input := fmt.Sprintf("%v%v%v%v", appId, uid, orderId, createTime)
-	return md5String(input)
-}
-
-func md5String(input string) string {
-	h := md5.New()
-	h.Write([]byte(input))
-	return hex.EncodeToString(h.Sum(nil))
-}
-
-func insertEvent(event dataReport.CommonField) {
-	b, _ := json.Marshal(event)
-	if err := eventmod.InsertOneEvent(context.Background(), &eventmod.Event{
-		EventId:   event.EventID,
-		EventType: event.Event,
-		Data:      string(b),
-		Status:    eventmod.Default,
-		CreatedAt: time.Now(),
-		UpdatedAt: time.Now(),
-	}); err != nil {
-		log.Error("reportser insertEvent failed", log.Any("eventType", event.Event), log.Any("eventId", event.EventID), log.E(err))
-	}
-}

app/service/reportser/type.go

@@ -1,21 +0,0 @@
-package reportser
-
-type Key string
-
-const (
-	KeyPlayletUnlock Key = "playlet_unlock" // 短剧剧集解锁
-	KeyCoinConsume   Key = "coin_consume"   // 金币消耗
-)
-
-var keyMap = map[Key]string{
-	KeyPlayletUnlock: "短剧解锁",
-	KeyCoinConsume:   "金币消耗",
-}
-
-func (p Key) Name() string {
-	return keyMap[p]
-}
-
-func (p Key) Key() string {
-	return string(p)
-}

app/service/videoser/m3u8.go

@@ -123,14 +123,14 @@ func GetM3U8Ex(ctx *gin.Context) {
 			mediaID, expireAt, origM3u8Name, ip, ticket,
 		)
 
-		if !ticketOK {
-			m3u8Name = H5M3U8FallbackPath
-			log.Warn("【GetM3U8Ex】H5播放票据无效",
-				log.Any("mediaId", mediaID),
-				log.Any("expireAt", expireAt),
-				log.Any("ip", ip),
-				log.Any("hasTicket", ticket != ""))
-		}
+		// if !ticketOK {
+		// 	m3u8Name = H5M3U8FallbackPath
+		// 	log.Warn("【GetM3U8Ex】H5播放票据无效",
+		// 		log.Any("mediaId", mediaID),
+		// 		log.Any("expireAt", expireAt),
+		// 		log.Any("ip", ip),
+		// 		log.Any("hasTicket", ticket != ""))
+		// }
 
 		countTowardDailyLimit := ticketOK && ticketInfo.Playable && !ticketInfo.Preview
 		if countTowardDailyLimit && appg.Conf.RunMod == string(consts.RunModeProd) {

app/service/videoser/video.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"videoweb/app/api/proto"
 	"videoweb/app/service/configser"
-	"videoweb/app/service/reportser"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/netutil"
 	"videoweb/pub/common/srvdef"
@@ -255,9 +254,6 @@ func SetLike(ctx context.Context, userId int64, req *proto.VideoLikeSetReq) (*pr
 		IsLike:    videoOperateStatusByFlag(*req.IsLike),
 		CountLike: countLike,
 	}
-	if changed {
-		reportser.ReportVideoLike(ctx, userId, req.Id, resp.IsLike)
-	}
 	return resp, nil
 }
 
@@ -277,9 +273,6 @@ func SetCollect(ctx context.Context, userId int64, req *proto.VideoCollectSetReq
 		IsCollect:    videoOperateStatusByFlag(*req.IsCollect),
 		CountCollect: countCollect,
 	}
-	if changed {
-		reportser.ReportVideoCollect(ctx, userId, req.Id, resp.IsCollect)
-	}
 	return resp, nil
 }