diff --git a/.gitignore b/.gitignore index a49bfc19f..5e6f2189d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,14 +22,12 @@ build/1panel *.iml *.ipr - # Test binary, built with `go test -c` *.test # Output of the go coverage tool, specifically when used with LiteIDE *.out - # Dependency directories /pkg/ backend/__debug_bin @@ -42,7 +40,6 @@ frontend/components.d.ts frontend/src/xpack backend/xpack *_xpack.go - .history/ dist/ 1pctl diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ca4ecfe12..e3c781fa1 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -6,8 +6,8 @@ before: hooks: # - export NODE_OPTIONS="--max-old-space-size=8192" # - make build_web - - chmod +x ./script.sh - - ./script.sh + - chmod +x ./ci/script.sh + - ./ci/script.sh - sed -i 's@ORIGINAL_VERSION=.*@ORIGINAL_VERSION=v{{ .Version }}@g' 1pctl - go mod tidy @@ -42,6 +42,7 @@ archives: - install.sh - README.md - LICENSE + - GeoIP.mmdb checksum: name_template: 'checksums.txt' diff --git a/.idea/icon.png b/.idea/icon.png index 6f82a12d5..4e2448e0b 100644 Binary files a/.idea/icon.png and b/.idea/icon.png differ diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f95d69073..18c914718 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -125,4 +125,4 @@ enforcement ladder](https://github.com/mozilla/diversity). For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. \ No newline at end of file +https://www.contributor-covenant.org/translations. diff --git a/Makefile b/Makefile index 441f164d8..4ae84517e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ GOCMD=go GOBUILD=$(GOCMD) build GOCLEAN=$(GOCMD) clean GOARCH=$(shell go env GOARCH) -GOOS=$(shell go env GOOS ) +GOOS=$(shell go env GOOS) BASE_PAH := $(shell pwd) BUILD_PATH = $(BASE_PAH)/build diff --git a/SECURITY.md b/SECURITY.md index ea3a05589..a3a120a2e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,11 +1,3 @@ -# 安全说明 - -如果您发现安全问题,请直接联系我们: - -- wanghe@fit2cloud.com - -感谢您的支持! - # Security Policy All security bugs should be reported to the contact as below: diff --git a/script.sh b/ci/script.sh similarity index 79% rename from script.sh rename to ci/script.sh index b6261f199..edb142fba 100755 --- a/script.sh +++ b/ci/script.sh @@ -17,4 +17,8 @@ if [ ! -f "install.sh" ]; then wget https://github.com/1Panel-dev/installer/raw/main/install.sh fi -chmod 755 1pctl install.sh \ No newline at end of file +if [ ! -f "GeoIP.mmdb" ]; then + wget https://resource.1panel.hk/geo/GeoIP.mmdb +fi + +chmod 755 1pctl install.sh