From b2b393054febac7b3100499a7758930facb6c71b Mon Sep 17 00:00:00 2001 From: "1340691923@qq.com" <1340691923@qq.com> Date: Mon, 7 Feb 2022 15:52:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=9B=91=E5=90=AC=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85=E4=BD=93=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/app.go | 30 ------------------------------ build_all_linux.bat | 2 +- build_all_win.bat | 2 +- build_init_app_linux.bat | 2 +- build_manager_linux.bat | 2 +- build_report_linux.bat | 2 +- build_sinker_linux.bat | 2 +- cmd/init_app/main.go | 1 - cmd/manager/main.go | 1 - cmd/report_server/main.go | 2 +- 10 files changed, 7 insertions(+), 39 deletions(-) diff --git a/application/app.go b/application/app.go index 96d21cc..2bd7770 100644 --- a/application/app.go +++ b/application/app.go @@ -6,7 +6,6 @@ import ( "github.com/1340691923/xwl_bi/model" "github.com/1340691923/xwl_bi/platform-basic-libs/util" "github.com/1340691923/xwl_bi/router" - "github.com/fsnotify/fsnotify" "go.uber.org/zap" "log" "os" @@ -29,7 +28,6 @@ type App struct { configFileExt, appName string cmdName string - monitorConfigChange bool InitFnObservers []InitFnObserver err error deferFuncs []func() @@ -84,11 +82,6 @@ func NewApp(cmdName string, opts ...NewAppOptions) *App { return app } -func (this *App) MonitorConfigChange() *App { - this.monitorConfigChange = true - return this -} - // 初始化配置 func (this *App) InitConfig() *App { config := viper.New() @@ -108,29 +101,6 @@ func (this *App) InitConfig() *App { model.CmdName = this.cmdName - if this.monitorConfigChange { - config.OnConfigChange(func(e fsnotify.Event) { - log.Println("检测配置文件更新，应用配置修改中...") - if err := config.ReadInConfig(); err != nil { - log.Println("应用配置修改失败", err) - return - } - if err := config.Unmarshal(&model.GlobConfig); err != nil { - log.Println("应用配置修改失败", err) - return - } - - this.Close() - - if err := this.NotifyInitFnObservers().Error(); err != nil { - log.Println("应用配置修改失败", err) - return - } - log.Println("应用配置修改完成！") - }) - } - - config.WatchConfig() return this } diff --git a/build_all_linux.bat b/build_all_linux.bat index ee22dc7..4f93390 100644 --- a/build_all_linux.bat +++ b/build_all_linux.bat @@ -1,2 +1,2 @@ -cmd /k "cd vue && npm run build:prod && cd .. && set goos=linux&&go build -o bin/linux/manager cmd/manager/main.go && go build -o bin/linux/report_server cmd/report_server/main.go && go build -o bin/linux/sinker cmd/sinker/main.go && go build -o bin/linux/init_app cmd/init_app/main.go" + cd vue && npm run build:prod && cd .. && set goos=linux&&go build -ldflags="-w -s" -o bin/linux/manager cmd/manager/main.go && go build -ldflags="-w -s" -o bin/linux/report_server cmd/report_server/main.go && go build -ldflags="-w -s" -o bin/linux/sinker cmd/sinker/main.go && go build -ldflags="-w -s" -o bin/linux/init_app cmd/init_app/main.go echo "build success" \ No newline at end of file diff --git a/build_all_win.bat b/build_all_win.bat index f8e6a8e..5ad1379 100644 --- a/build_all_win.bat +++ b/build_all_win.bat @@ -1,2 +1,2 @@ -cmd /k "cd vue && npm run build:prod && cd .. && go build -o bin/win/manager.exe cmd/manager/main.go && go build -o bin/win/report_server.exe cmd/report_server/main.go && go build -o bin/win/sinker.exe cmd/sinker/main.go && go build -o bin/win/init_app.exe cmd/init_app/main.go" +cd vue && npm run build:prod && cd .. && go build -ldflags="-w -s" -o bin/win/manager.exe cmd/manager/main.go && go build -ldflags="-w -s" -o bin/win/report_server.exe cmd/report_server/main.go && go build -ldflags="-w -s" -o bin/win/sinker.exe cmd/sinker/main.go && go build -ldflags="-w -s" -o bin/win/init_app.exe cmd/init_app/main.go echo "build success" \ No newline at end of file diff --git a/build_init_app_linux.bat b/build_init_app_linux.bat index 091594e..1d9a31e 100644 --- a/build_init_app_linux.bat +++ b/build_init_app_linux.bat @@ -1,2 +1,2 @@ -cmd /k " set goos=linux&& go build -o bin/linux/init_app cmd/init_app/main.go" + set goos=linux&& go build -ldflags="-w -s" -o bin/linux/init_app cmd/init_app/main.go echo "build success" diff --git a/build_manager_linux.bat b/build_manager_linux.bat index 1171f96..c7e4e24 100644 --- a/build_manager_linux.bat +++ b/build_manager_linux.bat @@ -1,2 +1,2 @@ -cmd /k "cd vue && npm run build:stage && cd .. && set goos=linux&&go build -o bin/linux/manager cmd/manager/main.go " +cd vue && npm run build:stage && cd .. && set goos=linux&&go build -ldflags="-w -s" -o bin/linux/manager cmd/manager/main.go echo "build success" diff --git a/build_report_linux.bat b/build_report_linux.bat index ec27835..f8b75ad 100644 --- a/build_report_linux.bat +++ b/build_report_linux.bat @@ -1,2 +1,2 @@ -cmd /k " set goos=linux&& go build -o bin/linux/report_server cmd/report_server/main.go" + set goos=linux&& go build -ldflags="-w -s" -o bin/linux/report_server cmd/report_server/main.go echo "build success" diff --git a/build_sinker_linux.bat b/build_sinker_linux.bat index 28f1237..96af043 100644 --- a/build_sinker_linux.bat +++ b/build_sinker_linux.bat @@ -1,2 +1,2 @@ -cmd /k " set goos=linux&& go build -o bin/linux/sinker cmd/sinker/main.go " +set goos=linux&& go build -ldflags="-w -s" -o bin/linux/sinker cmd/sinker/main.go echo "build success" diff --git a/cmd/init_app/main.go b/cmd/init_app/main.go index 1a93b99..b5a4643 100644 --- a/cmd/init_app/main.go +++ b/cmd/init_app/main.go @@ -41,7 +41,6 @@ func main() { err := app.InitConfig(). NotifyInitFnObservers(). - MonitorConfigChange(). Error() if err != nil { diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 1be7969..874e179 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -45,7 +45,6 @@ func main() { err := app. InitConfig(). NotifyInitFnObservers(). - MonitorConfigChange(). Error() if err != nil { diff --git a/cmd/report_server/main.go b/cmd/report_server/main.go index e10024f..b67ead9 100644 --- a/cmd/report_server/main.go +++ b/cmd/report_server/main.go @@ -53,7 +53,7 @@ func main() { application.RegisterInitFnObserver(application.RefreshTableId), ) - err := app.InitConfig().NotifyInitFnObservers().MonitorConfigChange().Error() + err := app.InitConfig().NotifyInitFnObservers().Error() if err != nil { logs.Logger.Error("数据系统 初始化失败", zap.Error(err))