Merge branch 'devlop' into yongxu-dev
# Conflicts: # miniprogram/app.js resolved by devlop version # miniprogram/pages/chapters/chapters.js resolved by devlop version # miniprogram/pages/match/match.js resolved by devlop version # miniprogram/pages/member-detail/member-detail.js resolved by devlop version # miniprogram/pages/my/my.js resolved by devlop version # miniprogram/pages/read/read.js resolved by devlop version # miniprogram/pages/referral/referral.js resolved by devlop version # soul-api/internal/model/person.go resolved by devlop version
This commit is contained in:
@@ -118,8 +118,9 @@ func Setup(cfg *config.Config) *gin.Engine {
|
||||
admin.GET("/super-individual/stats", handler.AdminSuperIndividualStats)
|
||||
admin.GET("/user/track", handler.UserTrackGet)
|
||||
admin.GET("/track/stats", handler.AdminTrackStats)
|
||||
admin.GET("/dashboard/leads", handler.AdminDashboardLeads)
|
||||
admin.GET("/ckb/plan-check", handler.AdminCKBPlanCheck)
|
||||
admin.GET("/mbti-avatars", handler.AdminMbtiAvatarsGet)
|
||||
admin.POST("/mbti-avatars", handler.AdminMbtiAvatarsPost)
|
||||
}
|
||||
|
||||
// ----- 鉴权 -----
|
||||
@@ -163,6 +164,8 @@ func Setup(cfg *config.Config) *gin.Engine {
|
||||
{
|
||||
cron.GET("/sync-orders", handler.CronSyncOrders)
|
||||
cron.POST("/sync-orders", handler.CronSyncOrders)
|
||||
cron.GET("/retry-order-webhooks", handler.CronRetryOrderWebhooks)
|
||||
cron.POST("/retry-order-webhooks", handler.CronRetryOrderWebhooks)
|
||||
cron.GET("/sync-vip-ckb-plans", handler.CronSyncVipCkbPlans)
|
||||
cron.POST("/sync-vip-ckb-plans", handler.CronSyncVipCkbPlans)
|
||||
cron.GET("/unbind-expired", handler.CronUnbindExpired)
|
||||
@@ -194,11 +197,14 @@ func Setup(cfg *config.Config) *gin.Engine {
|
||||
db.GET("/users/referrals", handler.DBUsersReferrals)
|
||||
db.GET("/users/rfm", handler.DBUsersRFM)
|
||||
db.GET("/users/journey-stats", handler.DBUsersJourneyStats)
|
||||
db.GET("/users/journey-users", handler.DBUsersJourneyUsers)
|
||||
db.GET("/users/tracks", handler.DBUserTracksList)
|
||||
db.GET("/vip-roles", handler.DBVipRolesList)
|
||||
db.POST("/vip-roles", handler.DBVipRolesAction)
|
||||
db.PUT("/vip-roles", handler.DBVipRolesAction)
|
||||
db.DELETE("/vip-roles", handler.DBVipRolesAction)
|
||||
db.GET("/vip-members", handler.DBVipMembersList)
|
||||
db.PUT("/vip-members/webhook", handler.DBVipMemberWebhookSet)
|
||||
db.GET("/match-records", handler.DBMatchRecordsList)
|
||||
db.GET("/match-pool-counts", handler.DBMatchPoolCounts)
|
||||
db.GET("/mentors", handler.DBMentorsList)
|
||||
@@ -304,6 +310,7 @@ func Setup(cfg *config.Config) *gin.Engine {
|
||||
miniprogram.GET("/config/audit-mode", handler.GetAuditMode)
|
||||
miniprogram.GET("/config/core", handler.GetCoreConfig)
|
||||
miniprogram.GET("/config/read-extras", handler.GetReadExtras)
|
||||
miniprogram.GET("/config/mbti-avatars", handler.MiniprogramMbtiAvatarsGet)
|
||||
// Deprecated: 保留以兼容线上,计划迁移至上述拆分接口
|
||||
miniprogram.GET("/config", handler.GetPublicDBConfig)
|
||||
miniprogram.POST("/login", handler.MiniprogramLogin)
|
||||
@@ -375,8 +382,9 @@ func Setup(cfg *config.Config) *gin.Engine {
|
||||
miniprogram.GET("/persons/pinned", handler.DBPersonPinnedList)
|
||||
// 埋点
|
||||
miniprogram.POST("/track", handler.MiniprogramTrackPost)
|
||||
// 规则引擎(用户旅程引导)
|
||||
// 规则引擎(用户旅程触达)
|
||||
miniprogram.GET("/user-rules", handler.MiniprogramUserRulesGet)
|
||||
miniprogram.POST("/user-rules/complete", handler.MiniprogramUserRuleComplete)
|
||||
// 余额
|
||||
miniprogram.GET("/balance", handler.BalanceGet)
|
||||
miniprogram.GET("/balance/transactions", handler.BalanceTransactionsGet)
|
||||
|
||||
Reference in New Issue
Block a user