更换包名

controller/auth.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
+	"eta/mysteel_watch/controller/resp"
 	"github.com/gin-gonic/gin"
-	"hongze/mysteel_watch/controller/resp"
 )
 
 type AuthController struct {
@@ -11,4 +11,4 @@ type AuthController struct {
 func (a *AuthController) Login(c *gin.Context) {
 	resp.OkData("登录成功", nil, c)
 	return
-}
+}

controller/index/index.go

@@ -6,10 +6,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
 	"github.com/xuri/excelize/v2"
-	"hongze/mysteel_watch/controller/resp"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/models/index"
-	"hongze/mysteel_watch/services"
+	"eta/mysteel_watch/controller/resp"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/models/index"
+	"eta/mysteel_watch/services"
 	"os"
 	"time"
 )

controller/resp/base.go

@@ -2,10 +2,10 @@ package resp
 
 import (
 	"encoding/json"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/utils"
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/utils"
 	"strings"
 )
 

core/log.go

@@ -5,9 +5,9 @@ import (
 	"github.com/gin-gonic/gin"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	oplogging "github.com/op/go-logging"
-	"hongze/mysteel_watch/config"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/config"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/utils"
 	"io"
 	"os"
 	"strings"

core/run_server.go

@@ -2,8 +2,8 @@ package core
 
 import (
 	"fmt"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/init_serve"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/init_serve"
 )
 
 func RunServe() {

global/global.go

@@ -8,8 +8,8 @@ import (
 	"github.com/rdlucklib/rdluck_tools/cache"
 	"github.com/spf13/viper"
 	"gorm.io/gorm"
-	"hongze/mysteel_watch/config"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/config"
+	"eta/mysteel_watch/utils"
 )
 
 var (

go.mod

@@ -1,26 +1,79 @@
-module hongze/mysteel_watch
+module eta/mysteel_watch
 
-go 1.16
+go 1.19
 
 require (
-	github.com/fsnotify/fsnotify v1.5.4
-	github.com/gin-gonic/gin v1.8.1
-	github.com/go-playground/locales v0.14.0
-	github.com/go-playground/universal-translator v0.18.0
-	github.com/go-playground/validator/v10 v10.10.0
+	github.com/fsnotify/fsnotify v1.6.0
+	github.com/gin-gonic/gin v1.9.1
+	github.com/go-playground/locales v0.14.1
+	github.com/go-playground/universal-translator v0.18.1
+	github.com/go-playground/validator/v10 v10.14.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jonboulle/clockwork v0.3.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
-	github.com/lestrrat-go/strftime v1.0.6 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/rdlucklib/rdluck_tools v1.0.3
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/spf13/viper v1.13.0
-	github.com/swaggo/swag v1.8.6
+	github.com/spf13/viper v1.16.0
+	github.com/swaggo/swag v1.16.2
 	github.com/xuri/excelize/v2 v2.6.1
-	golang.org/x/image v0.0.0-20220902085622-e7cb96979f69
-	gorm.io/gorm v1.23.10
+	golang.org/x/image v0.12.0
+	gorm.io/gorm v1.25.4
+)
+
+require (
+	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/garyburd/redigo v1.6.3 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.6 // indirect
+	github.com/go-openapi/spec v0.20.4 // indirect
+	github.com/go-openapi/swag v0.19.15 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/jonboulle/clockwork v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/lestrrat-go/strftime v1.0.6 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/richardlehane/mscfb v1.0.4 // indirect
+	github.com/richardlehane/msoleps v1.0.3 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/xuri/efp v0.0.0-20230802181842-ad255f2331ca // indirect
+	github.com/xuri/nfp v0.0.0-20230819163627-dc951e3ffe1a // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

init_serve/redis.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/go-redis/redis/v8"
-	"hongze/mysteel_watch/global"
+	"eta/mysteel_watch/global"
 
 	"github.com/rdlucklib/rdluck_tools/cache"
 )
@@ -32,7 +32,7 @@ func RedisTool() {
 	redisConf := global.CONFIG.Redis
 	fmt.Println(redisConf)
 	REDIS_CACHE := fmt.Sprintf(`{"key":"redis","conn":"%s","password":"%s"}`, redisConf.Address, redisConf.Password)
-	fmt.Println("REDIS_CACHE:"+REDIS_CACHE)
+	fmt.Println("REDIS_CACHE:" + REDIS_CACHE)
 	global.Rc, global.Re = cache.NewCache(REDIS_CACHE) //初始化缓存
 	if global.Re != nil {
 		fmt.Println(global.Re)

init_serve/router.go

@@ -1,11 +1,11 @@
 package init_serve
 
 import (
+	_ "eta/mysteel_watch/docs"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/middleware"
+	"eta/mysteel_watch/routers"
 	"github.com/gin-gonic/gin"
-	_ "hongze/mysteel_watch/docs"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/middleware"
-	"hongze/mysteel_watch/routers"
 )
 
 // InitRouter 初始化路由

init_serve/task.go

@@ -1,15 +1,15 @@
 package init_serve
 
 import (
+	"eta/mysteel_watch/services"
+	"eta/mysteel_watch/utils"
+	"eta/mysteel_watch/watch"
 	"fmt"
 	"github.com/robfig/cron/v3"
-	"hongze/mysteel_watch/services"
-	"hongze/mysteel_watch/utils"
-	"hongze/mysteel_watch/watch"
 	"time"
 
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/services/alarm_msg"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/services/alarm_msg"
 )
 
 func InitTask() {

main.go

@@ -1,21 +1,20 @@
 package main
 
 import (
+	"eta/mysteel_watch/core"
 	"fmt"
-	"hongze/mysteel_watch/core"
 	"os"
 	"path/filepath"
 	"strings"
 	"sync"
 )
 
-
 // @BasePath /
 func main() {
 	core.RunServe()
 }
 
-//检测指标文件
+// 检测指标文件
 func TestFileName(filePath string) {
 	fmt.Println("filePath:", filePath)
 	var newFilePath string

middleware/recover.go

@@ -3,10 +3,10 @@ package middleware
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"hongze/mysteel_watch/controller/resp"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/services/alarm_msg"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/controller/resp"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/services/alarm_msg"
+	"eta/mysteel_watch/utils"
 	"net/http"
 	"runtime"
 	"time"

middleware/token.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"hongze/mysteel_watch/controller/resp"
+	"eta/mysteel_watch/controller/resp"
 )
 
 func Token() gin.HandlerFunc {

middleware/token_no_login.go

@@ -2,7 +2,7 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"hongze/mysteel_watch/controller/resp"
+	"eta/mysteel_watch/controller/resp"
 )
 
 func TokenNoLogin() gin.HandlerFunc {

routers/auth.go

@@ -2,7 +2,7 @@ package routers
 
 import (
 	"github.com/gin-gonic/gin"
-	"hongze/mysteel_watch/controller"
+	"eta/mysteel_watch/controller"
 )
 
 func InitAuth(baseGroup *gin.RouterGroup) {

routers/index.go

@@ -2,14 +2,14 @@ package routers
 
 import (
 	"github.com/gin-gonic/gin"
-	"hongze/mysteel_watch/controller/index"
+	"eta/mysteel_watch/controller/index"
 )
 
 func InitIndex(group *gin.RouterGroup) {
 	//指标
 	indexController := new(index.IndexController)
-	group.GET("server_check",indexController.ServerCheck)
-	group.GET("test",indexController.Test)
+	group.GET("server_check", indexController.ServerCheck)
+	group.GET("test", indexController.Test)
 	group.POST("create", indexController.Create)
 	group.POST("delete", indexController.Delete)
 	group.POST("refresh", indexController.Refresh)

services/alarm_msg/alarm_msg.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/utils"
 )
 
 var (

services/index.go

@@ -2,12 +2,12 @@ package services
 
 import (
 	"encoding/json"
+	"eta/mysteel_watch/cache"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/services/alarm_msg"
+	"eta/mysteel_watch/utils"
+	"eta/mysteel_watch/watch"
 	"fmt"
-	"hongze/mysteel_watch/cache"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/services/alarm_msg"
-	"hongze/mysteel_watch/utils"
-	"hongze/mysteel_watch/watch"
 	"os"
 	"strconv"
 	"strings"
@@ -375,75 +375,6 @@ func IndexRefreshWeek() {
 	return
 }
 
-// 修改指标备注指标
-func UpdateComment(filePath string) (err error) {
-	templateFile, err := excelize.OpenFile(filePath)
-	if err != nil {
-		fmt.Println("OpenFile Err:" + err.Error())
-		return
-	}
-	defer func() {
-		templateFile.Close()
-	}()
-
-	commentArr := templateFile.GetComments()
-	for k, v := range commentArr {
-		fmt.Println(k, v)
-		for _, sv := range v {
-			fmt.Println("text:", sv.Text)
-			if strings.Contains(sv.Text, `"UpdateMode":0`) {
-				newText := strings.Replace(sv.Text, `"UpdateMode":0`, `"UpdateMode":1`, -1)
-				newText = strings.Trim(newText, "{")
-
-				commentMap := make(map[string]interface{})
-				commentMap["author"] = "{"
-				commentMap["text"] = newText
-
-				commentJson, err := json.Marshal(commentMap)
-				if err != nil {
-					fmt.Println("json.Marshal err:" + err.Error())
-				}
-				fmt.Println("add text:" + string(commentJson))
-				templateFile.DeleteComment("Sheet1", "A1")
-				err = templateFile.AddComment("Sheet1", "A1", string(commentJson))
-				if err != nil {
-					fmt.Println("AddComment Err:" + err.Error())
-					return err
-				}
-			}
-		}
-	}
-	if err := templateFile.SaveAs(filePath); err != nil {
-		fmt.Println("templateFile.SaveAs Err:", err)
-		return err
-	}
-	return
-}
-
-// 获取指标备注指标
-func GetComment(filePath string) string {
-	excelFile, err := excelize.OpenFile(filePath)
-	if err != nil {
-		fmt.Println("OpenFile Err:" + err.Error())
-		return ""
-	}
-	defer func() {
-		excelFile.Close()
-	}()
-
-	commentArr := excelFile.GetComments()
-	for _, v := range commentArr {
-		//fmt.Println(k, v)
-		for _, sv := range v {
-			//fmt.Println("text:", sv.Text)
-			if sv.Text != "" {
-				return sv.Text
-			}
-		}
-	}
-	return ""
-}
-
 var pushLock sync.RWMutex
 
 // AddIndexRefreshToLpush 添加到指标刷新

services/index_merge.go

@@ -3,10 +3,10 @@ package services
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/models/index"
-	"hongze/mysteel_watch/utils"
-	"hongze/mysteel_watch/watch"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/models/index"
+	"eta/mysteel_watch/utils"
+	"eta/mysteel_watch/watch"
 	"os"
 	"strconv"
 	"strings"

services/index_merge_v2.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/xuri/excelize/v2"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/utils"
-	"hongze/mysteel_watch/watch"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/utils"
+	"eta/mysteel_watch/watch"
 	"os"
 	"strconv"
 	"time"

services/index_queue.go

@@ -2,7 +2,7 @@ package services
 
 import (
 	"fmt"
-	"hongze/mysteel_watch/cache"
+	"eta/mysteel_watch/cache"
 	"time"
 )
 

task/task.go

@@ -2,9 +2,9 @@ package task
 
 import (
 	"fmt"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/services/alarm_msg"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/services/alarm_msg"
+	"eta/mysteel_watch/utils"
 	"os"
 	"runtime"
 	"sync"
@@ -13,9 +13,10 @@ import (
 
 type TaskFunc func(params ...interface{})
 
-var taskList chan *Executor  //任务列表
+var taskList chan *Executor //任务列表
 
 var once sync.Once
+
 func GetTaskList() chan *Executor {
 	once.Do(func() {
 		taskList = make(chan *Executor, 1000)
@@ -24,14 +25,14 @@ func GetTaskList() chan *Executor {
 }
 
 type Executor struct {
-	f TaskFunc
+	f      TaskFunc
 	params []interface{}
 }
 
-func (e *Executor) Exec()  {       //执行任务
+func (e *Executor) Exec() { //执行任务
 	go func() {
 		defer func() {
-			if err := recover(); err !=nil {
+			if err := recover(); err != nil {
 				stack := ""
 				msg := fmt.Sprintf("当前进程pid：%d; 父进程ppid：%d", os.Getpid(), os.Getppid())
 				stack += msg + "</br>"
@@ -66,6 +67,6 @@ func NewExecutor(f TaskFunc, params []interface{}) *Executor {
 	return &Executor{f: f, params: params}
 }
 
-func Task(f TaskFunc, params ...interface{})  {
+func Task(f TaskFunc, params ...interface{}) {
 	taskList <- NewExecutor(f, params)
 }

utils/index_files.go

@@ -6,5 +6,5 @@ package utils
 //
 //	//IndexSaveDir       = "/Users/hyc/Documents/rdluck/mysteel_data/"
 //	//IndexMergeSaveDir = "/Users/hyc/Documents/rdluck/mysteel_data/merge/"
-//	//IndexMergeSaveDir = "/Users/roc/go/src/hongze/mysteel_watch"
+//	//IndexMergeSaveDir = "/Users/roc/go/src/eta/mysteel_watch"
 //)

watch/edb_lib.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/models/index"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/models/index"
+	"eta/mysteel_watch/utils"
 	"io/ioutil"
 	"net/http"
 	"strings"

watch/index_v2.go

@@ -3,8 +3,8 @@ package watch
 import (
 	"encoding/json"
 	"errors"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/models/index"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/models/index"
 )
 
 // GetNoMergeIndexByFrequencyCount 获取未合并的指标总数量

watch/watch.go

@@ -2,8 +2,8 @@ package watch
 
 import (
 	"fmt"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/utils"
 	"log"
 	"os"
 	"strings"

watch/watch_v2.go

@@ -2,8 +2,8 @@ package watch
 
 import (
 	"fmt"
-	"hongze/mysteel_watch/global"
-	"hongze/mysteel_watch/utils"
+	"eta/mysteel_watch/global"
+	"eta/mysteel_watch/utils"
 	"log"
 	"os"
 	"strings"