main/main.go

@@ -21,19 +21,14 @@ func main() {
 	ctx := context.Background()
 	_ctx, cancel := signal.NotifyContext(ctx, os.Kill, os.Interrupt)
 	defer cancel()
-	cfg, err := options.LoadConfig()
-	if err != nil {
-		glog.Fatalf("获取配置失败：%v", err)
-	}
+	cfg, _ := options.LoadConfig()
+
 	db, err := database.InitDatabase(&cfg.DB)
 	if err != nil {
 		glog.Fatalf("初始化数据库失败：%v", err)
 	}
 
 	pool := pools.NewProxyPool(cfg.Proxy.Subscribes)
-
-	go pool.CronUpdate(_ctx, cfg.Proxy.Interval) //定时更新代理
-
 	pusherCtl := pusher.NewController(_ctx, db)
 	ch := make(chan model.PushMsg, 30)
 	pusherCtl.Consume(ch)
@@ -48,7 +43,6 @@ func main() {
 
 	server.NewWatcherController(watcherCtl).RegistryRouter(api)
 	server.NewPusherSvcController(pusherCtl).RegistryRouter(api)
-	server.NewProxySvc(pool).RegistryRouter(api)
 
 	if err = r.Listen(":2280"); err != nil {
 		glog.Warningf("server over: %v", err)

pkg/model/product.go

@@ -13,7 +13,7 @@ type Product struct {
 	UpdateErr bool           `json:"updateErr"` //更新出错了
 
 	Uid                 string      `json:"uid" gorm:"index:,unique"`
-	Pid                 string      `json:"pid" gorm:"index:,not null"` //产品编号
+	Pid                 string      `json:"pid" gorm:"index"` //产品编号
 	Name                string      `json:"name"`
 	Brand               string      `json:"brand"`
 	Website             WebsiteType `json:"website"` //是什么网站

pkg/options/init.go

@@ -11,12 +11,8 @@ type Config struct {
 }
 
 func LoadConfig() (*Config, error) {
-	cfgPath := os.Getenv("CONFIG_PATH")
-	if cfgPath == "" {
-		cfgPath = "/data/cfg.yaml"
-	}
 	var opt Config
-	f, err := os.Open(cfgPath)
+	f, err := os.Open("/data/cfg.yaml")
 	if err != nil {
 		return nil, err
 	}

pkg/options/proxy.go

@@ -1,8 +1,5 @@
 package options
 
-import "time"
-
 type ProxyOption struct {
-	Subscribes []string      `yaml:"subscribes"`
-	Interval   time.Duration `yaml:"interval"`
+	Subscribes []string `yaml:"subscribes"`
 }

pkg/pools/proxy.go

@@ -15,9 +15,8 @@ import (
 
 type ProxyPool struct {
 	m          sync.Mutex
-	proxies    proxy.ProxyList
+	proxys     proxy.ProxyList
 	subscribes []string //订阅url
-	updated    time.Time
 }
 
 func NewProxyPool(subscribes []string) *ProxyPool {
@@ -27,13 +26,9 @@ func NewProxyPool(subscribes []string) *ProxyPool {
 	return p
 }
 
-func (p *ProxyPool) Status() (proxy.ProxyList, time.Time) {
-	return p.proxies, p.updated
-}
-
 // Update 更新代理池
 func (p *ProxyPool) Update() {
-	var list = make(proxy.ProxyList, 0, len(p.proxies))
+	var list = make(proxy.ProxyList, 0, len(p.proxys))
 	for _, url := range p.subscribes {
 		subscribeGetter, err := getter.NewSubscribe(tool.Options{"url": url})
 		if err != nil {
@@ -45,16 +40,12 @@ func (p *ProxyPool) Update() {
 	glog.Infof("代理源共 %d 个: %v", len(p.subscribes), p.subscribes)
 	glog.Infof("获取代理共 %d 个", len(list))
 	p.m.Lock()
-	p.proxies = list
+	p.proxys = list
 	p.m.Unlock()
-	p.updated = time.Now()
 }
 
 // CronUpdate 定时更新
 func (p *ProxyPool) CronUpdate(ctx context.Context, interval time.Duration) {
-	if interval == 0 {
-		interval = time.Minute * 30
-	}
 	ticker := time.NewTicker(interval)
 	defer ticker.Stop()
 	for {
@@ -70,12 +61,12 @@ func (p *ProxyPool) CronUpdate(ctx context.Context, interval time.Duration) {
 // RandomIterator 获取随机代理的迭代器
 func (p *ProxyPool) RandomIterator() func() proxy.Proxy {
 	return func() (proxy proxy.Proxy) {
-		if len(p.proxies) == 0 {
+		if len(p.proxys) == 0 {
 			return nil
 		}
 		p.m.Lock()
 		defer p.m.Unlock()
-		curIndex := rand.Intn(len(p.proxies))
-		return p.proxies[curIndex]
+		curIndex := rand.Intn(len(p.proxys))
+		return p.proxys[curIndex]
 	}
 }

pkg/watcher/coach.go

@@ -84,10 +84,9 @@ func (c *CoachOutlet) Restart() {
 	c.Cancel()
 	go c.Watch()
 }
-
 func (c *CoachOutlet) Watch() {
 	c.ctx, c.cancel = context.WithCancel(c.fCtx)
-	if err := c.db.Model(&model.Product{}).Where("uid", c.Uid()).Updates(map[string]interface{}{"watch": true, "orderable": false}).Error; err != nil {
+	if err := c.db.Model(&model.Product{}).Updates(map[string]interface{}{"watch": true, "orderable": false}).Error; err != nil {
 		glog.Errorf("watch update db err: %v", err)
 		err = nil
 	}

pkg/watcher/controller.go

@@ -73,8 +73,8 @@ func (c *Controller) RunWatcher(opt *options.CoachOutletOption) error {
 	uid := opt.Uid()
 	err := c.db.Clauses(clause.OnConflict{
 		Columns:   []clause.Column{{Name: "uid"}},
-		DoUpdates: clause.AssignmentColumns([]string{"pid", "watch", "remark", "orderable", "pusher_ids", "deleted_at"}),
-	}).Create(&model.Product{Uid: uid, Pid: opt.Pid, Watch: true, Remark: opt.Remark, Orderable: false, PusherIds: opt.PusherIds}).Error
+		DoUpdates: clause.AssignmentColumns([]string{"watch", "remark", "orderable", "pusher_ids", "deleted_at"}),
+	}).Create(&model.Product{Uid: uid, Watch: true, Remark: opt.Remark, Orderable: false, PusherIds: opt.PusherIds}).Error
 
 	if err != nil {
 		return err

server/proxy_svc.go

@@ -1,28 +0,0 @@
-package server
-
-import (
-	"github.com/gofiber/fiber/v3"
-	pool "haitao_watcher/pkg/pools"
-)
-
-type ProxySvc struct {
-	pool *pool.ProxyPool
-}
-
-func NewProxySvc(pool *pool.ProxyPool) *ProxySvc {
-	return &ProxySvc{
-		pool: pool,
-	}
-}
-
-func (s *ProxySvc) RegistryRouter(r fiber.Router) {
-	r.Get("proxies/status", s.GetStatusInfo)
-}
-
-func (s *ProxySvc) GetStatusInfo(ctx fiber.Ctx) error {
-	list, updated := s.pool.Status()
-	return ctx.JSON(map[string]interface{}{
-		"list":    list,
-		"updated": updated,
-	})
-}

wwwroot/src/api/proxies.js

@@ -1,7 +0,0 @@
-import {mande} from "mande";
-
-const pushers = mande('/api/v1/proxies')
-
-export const getProxiesStatus = () => {
-    return pushers.get("/status")
-}

wwwroot/src/views/layout/Header.vue

@@ -1,36 +1,12 @@
 <template>
-<div class="h-[100px] shadow-lg flex items-center justify-between px-12  z-10">
-  <div class="flex space-x-4 items-center">
-    <img class="h-[60px]" src="@/assets/logo.png" alt="">
-    <div class="text-[24px] font-bold">
-      可达鸭海淘蹲货
-    </div>
-  </div>
-  <div>
-    <div>当前代理个数: {{proxiesInfo.list.length}}</div>
-    <div class="text-[14px]">代理更新时间：{{moment(proxiesInfo.updated).format('YYYY-MM-DD HH:mm:ss')}}</div>
+<div class="h-[100px] shadow-lg flex items-center px-12 space-x-4 z-10">
+  <img class="h-[60px]" src="@/assets/logo.png" alt="">
+  <div class="text-[24px] font-bold">
+    可达鸭海淘蹲货
   </div>
 </div>
 </template>
 <script setup>
-import {onMounted, reactive} from "vue";
-import {getProxiesStatus} from "@/api/proxies.js";
-import moment from "moment";
-
-const proxiesInfo = reactive({
-  list:[],
-  updated: ''
-})
-
-onMounted(()=>{
-  loadProxiesInfo()
-})
-const loadProxiesInfo = ()=>{
-  getProxiesStatus().then(res=>{
-    proxiesInfo.list = res.list
-    proxiesInfo.updated = res.updated
-  })
-}
 </script>
 
 <style scoped>