Merge remote-tracking branch 'origin/xy' into xy_data

controller/xiangyu/user.go

@@ -22,6 +22,7 @@ func (xc *XiangyuController) SyncUser(c *gin.Context) {
 		return
 	}
 	resp.Ok("同步成功", c)
+	
 	return
 }
 
@@ -38,5 +39,6 @@ func (xc *XiangyuController) PullUser(c *gin.Context) {
 		return
 	}
 	resp.Ok("同步成功", c)
+
 	return
 }

init_serve/task.go

@@ -2,7 +2,6 @@ package init_serve
 
 import (
 	"eta/eta_bridge/global"
-	"eta/eta_bridge/logic/xiangyu"
 	"eta/eta_bridge/services"
 	"github.com/robfig/cron/v3"
 )
@@ -25,13 +24,5 @@ func InitTask() {
 	// 开始定时任务
 	c := cron.New(cron.WithSeconds())
 
-	//每1小时检测一次，增量用户生成
-	if global.CONFIG.Xiangyu.UserSyncHost != `` {
-		_, err := c.AddFunc("0 0 * * * *", xiangyu.TaskPullUser)
-		if err != nil {
-			global.LOG.Error("CheckIndexCreateMerge err" + err.Error())
-		}
-	}
-
 	c.Start()
 }

routers/xiangyu.go

@@ -9,9 +9,9 @@ import (
 // InitXiangyu 获取象屿
 func InitXiangyu(r *gin.RouterGroup) {
 	control := new(xiangyu.XiangyuController)
-	//group := r.Group("xy/").Use(middleware.InternalToken())
-	r.GET("user/sync", control.SyncUser)
-	r.GET("user/pull", control.PullUser)
+	group := r.Group("xy/")
+	group.GET("user/sync", control.SyncUser)
+	group.GET("user/pull", control.PullUser)
 
 	// 需要内部鉴权的接口
 	initAuthXiangyu(r)