Skip to content

Commit

Permalink
修复滚动条无法滚动的bug
Browse files Browse the repository at this point in the history
  • Loading branch information
1340691923 committed Dec 29, 2024
1 parent 4c0f1f5 commit 34c639c
Show file tree
Hide file tree
Showing 259 changed files with 96 additions and 284 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
resources/vue/node_moudules
/logs/
/resources/dist
/ev.exe
/cmd/test/main.go
/ev_store/data/es_view.db
/ev_store/logs/ev/debug.log.20241228
/ev_store/logs/ev/err.log.20241228
/ev_store/logs/ev/info.log.20241228
/ev_store/logs/ev/warn.log.20241228
/ev_store/plugin_logs/ev-tools.log
/ev_store/plugins_store/ev-tools-test.db
2 changes: 1 addition & 1 deletion config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mysql: # dbType为mysql时填
port: "3306"
dbName: "test"
esPwdSecret: "concat_mail!!->1340691923@qq.com" # 数据源认证密码的加密密钥 加密方式为 AES
version: "0.0.9" # EV 版本号
version: "0.0.10" # EV 版本号
checkForevUpdates: true #是否自动检测ev更新
checkForPluginUpdates: true #是否自动检测ev插件更新
evKey: #evKey 需要到插件者后台注册获取
Expand Down
4 changes: 2 additions & 2 deletions config_dev/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ sqlite: # dbType为sqlite3时填 dbPath为数据保存文件地址
dbName: "es_view.db"
mysql: # dbType为mysql时填
username: "root"
pwd: "Ww5201314!"
pwd: ""
ip: "127.0.0.1"
port: "3306"
dbName: "test"
esPwdSecret: "concat_mail!!->1340691923@qq.com" # es密码加密密钥 加密方式为 AES
version: "0.0.9" # EV 版本号
version: "0.0.10" # EV 版本号
deBug: true # 是否为测试模式 如果为 false则打开默认浏览器直接访问地址
checkForevUpdates: true #是否自动检测ev更新
checkForPluginUpdates: true #是否自动检测ev插件更新
Expand Down
14 changes: 9 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,42 @@ require (
github.com/elastic/go-elasticsearch/v8 v8.10.0
github.com/gin-contrib/cors v1.4.0
github.com/gin-gonic/gin v1.10.0
github.com/glebarez/go-sqlite v1.21.2
github.com/go-gormigrate/gormigrate/v2 v2.1.1
github.com/go-redis/redis/v8 v8.11.5
github.com/goccy/go-json v0.10.3
github.com/golang-jwt/jwt/v5 v5.0.0
github.com/google/uuid v1.6.0
github.com/google/wire v0.5.0
github.com/gorilla/websocket v1.4.2
github.com/hashicorp/go-hclog v1.2.0
github.com/hashicorp/go-plugin v1.6.1
github.com/hashicorp/go-version v1.7.0
github.com/imroc/req/v2 v2.1.0
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
github.com/nalgeon/redka v0.5.3
github.com/pkg/errors v0.9.1
github.com/qiniu/api.v7/v7 v7.8.2
github.com/shirou/gopsutil/v3 v3.23.8
github.com/spf13/cast v1.7.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.9.0
github.com/swaggo/files v1.0.1
github.com/swaggo/gin-swagger v1.6.0
github.com/swaggo/swag v1.16.2
github.com/tidwall/gjson v1.17.3
go.mongodb.org/mongo-driver v1.11.4
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.27.0
golang.org/x/oauth2 v0.17.0
golang.org/x/sync v0.8.0
golang.org/x/text v0.18.0
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.34.1
gorm.io/driver/clickhouse v0.6.0
gorm.io/driver/mysql v1.5.4
gorm.io/driver/postgres v1.5.0
gorm.io/gorm v1.25.7
modernc.org/sqlite v1.23.1
)

require (
Expand All @@ -66,7 +72,6 @@ require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/glebarez/go-sqlite v1.21.2 // indirect
github.com/glebarez/sqlite v1.9.0 // indirect
github.com/go-faster/city v1.0.1 // indirect
github.com/go-faster/errors v0.6.1 // indirect
Expand All @@ -83,6 +88,7 @@ require (
github.com/golang-sql/sqlexp v0.1.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gookit/color v1.3.6 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -118,6 +124,7 @@ require (
github.com/paulmach/orb v0.10.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
Expand Down Expand Up @@ -148,10 +155,8 @@ require (
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
Expand All @@ -163,5 +168,4 @@ require (
modernc.org/libc v1.22.5 // indirect
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.5.0 // indirect
modernc.org/sqlite v1.23.1 // indirect
)
9 changes: 5 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1345,6 +1345,8 @@ github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2c
github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gookit/color v1.3.6 h1:Rgbazd4JO5AgSTVGS3o0nvaSdwdrS8bzvIXwtK6OiMk=
github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
Expand All @@ -1357,6 +1359,7 @@ github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/z
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
Expand Down Expand Up @@ -1568,8 +1571,6 @@ github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
Expand Down Expand Up @@ -1637,8 +1638,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/nalgeon/redka v0.5.3 h1:smESVCAVxdJXvSTOrwP2oH8xqA+FE2F41hcRLANRtHw=
github.com/nalgeon/redka v0.5.3/go.mod h1:vLxjY3XS9IwBID2YEFWeeMiN4Ar/DtKd4JW62JTAxuU=
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
Expand Down Expand Up @@ -1819,6 +1818,8 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/qiniu/api.v7/v7 v7.8.2 h1:f08kI0MmsJNzK4sUS8bG3HDH67ktwd/ji23Gkiy2ra4=
github.com/qiniu/api.v7/v7 v7.8.2/go.mod h1:FPsIqxh1Ym3X01sANE5ZwXfLZSWoCUp5+jNI8cLo3l0=
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
Expand Down
2 changes: 1 addition & 1 deletion pkg/infrastructure/config/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package config

const Version = "v0.0.8"
const Version = "v0.0.10"

4 changes: 0 additions & 4 deletions pkg/web/no_verification.go
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
package web

func (this *WebServer) runNoVerificationRouter() {

}
13 changes: 5 additions & 8 deletions pkg/web/web_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type WebServer struct {
esLinkController *api.EsLinkController
managerUserController *api.ManagerUserController
esController *api.EsController
aiController *api.AiController
aiController *api.AiController
//wsController *api.WsController
indexController *api.IndexController
pluginController *api.PluginController
Expand All @@ -46,7 +46,6 @@ func NewWebServer(engine *web_engine.WebEngine, log *logger.AppLogger, cfg *conf
return &WebServer{engine: engine, log: log, cfg: cfg, rbac: rbac, middleWareService: middleWareService, gmOperaterController: gmOperaterController, managerRoleController: managerRoleController, esLinkController: esLinkController, managerUserController: managerUserController, esController: esController, aiController: aiController, indexController: indexController, pluginController: pluginController}
}


type Config struct {
Name string
}
Expand Down Expand Up @@ -121,17 +120,15 @@ func (this *WebServer) runRouter() {
this.engine.GetGinEngine().Any("/api/call_plugin_views/:plugin_id/*action",
this.pluginController.CallPluginViews)

this.engine.GetGinEngine().Use(
this.middleWareService.CheckVersion,
)

this.engine.GetGinEngine().POST("/api/gm_user/login", this.managerUserController.Login)

this.runNoVerificationRouter()

this.engine.GetGinEngine().Any("/api/call_plugin/:plugin_id/*action",
this.pluginController.CallPlugin)

this.engine.GetGinEngine().Use(
this.middleWareService.CheckVersion,
)

this.engine.GetGinEngine().Use(
this.middleWareService.JwtMiddleware,
this.middleWareService.Rbac,
Expand Down
1 change: 0 additions & 1 deletion resources/views/dist/css/EsHeader.DxYu6_fD.css

This file was deleted.

1 change: 0 additions & 1 deletion resources/views/dist/css/apifox.DQAG05N_.css

This file was deleted.

1 change: 0 additions & 1 deletion resources/views/dist/css/auth.Ch64Sp5X.css

This file was deleted.

Loading

0 comments on commit 34c639c

Please sign in to comment.