diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 066963ea..744b8ad4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,5 @@ jobs: cp panel-example.conf .env echo "DB_FILE=$(pwd)/storage/panel.db" >> .env go run . artisan key:generate - go run . artisan migrate - name: Run tests run: go test ./... diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a81f27c5..c3c3c99c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,6 @@ unit_test: - cp panel-example.conf .env - echo "DB_FILE=$(pwd)/storage/panel.db" >> .env - go run . artisan key:generate - - go run . artisan migrate - go test -v -coverprofile=coverage.txt -covermode=atomic ./... build: diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go index e85f7ee0..a5168e1c 100644 --- a/pkg/tools/tools.go +++ b/pkg/tools/tools.go @@ -476,10 +476,6 @@ func UpdatePanel(panelInfo PanelInfo) error { _, _ = Exec("chmod -R 700 /usr/bin/panel") color.Green().Printfln("设置完成") - if _, err = Exec("/www/panel/panel --env=panel.conf artisan migrate"); err != nil { - color.Red().Printfln("运行面板数据库迁移失败") - return err - } if _, err = Exec("bash /www/panel/scripts/update_panel.sh"); err != nil { color.Red().Printfln("执行面板升级后脚本失败") return err diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh index 399c2a89..335842d1 100644 --- a/scripts/install_panel.sh +++ b/scripts/install_panel.sh @@ -269,7 +269,6 @@ Init_Panel() { sed -i "s!APP_ENTRANCE=.*!APP_ENTRANCE=/${entrance}!g" panel.conf ${setup_Path}/panel/panel --env="panel.conf" artisan key:generate ${setup_Path}/panel/panel --env="panel.conf" artisan jwt:secret - ${setup_Path}/panel/panel --env="panel.conf" artisan migrate openssl req -x509 -nodes -days 36500 -newkey ec:<(openssl ecparam -name secp384r1) -keyout ${setup_Path}/panel/storage/ssl.key -out ${setup_Path}/panel/storage/ssl.crt -subj "/C=CN/ST=Tianjin/L=Tianjin/O=HaoZi Technology Co., Ltd./OU=HaoZi Panel/CN=Panel" chmod -R 700 ${setup_Path}/panel cp -f scripts/panel.sh /usr/bin/panel