From d4b4dec9f40d59b436fe040c751c3f75801be318 Mon Sep 17 00:00:00 2001 From: r0zbeh Date: Fri, 21 Jul 2023 15:52:32 +0330 Subject: [PATCH] force restart after charge and action fix --- .github/workflows/docker.yml | 55 ----------------------- .github/workflows/release.yml | 84 +---------------------------------- web/controller/inbound.go | 4 +- 3 files changed, 3 insertions(+), 140 deletions(-) delete mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index b1fd97a..0000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Docker Image CI -on: - push: - tags: - - "*" - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - with: - submodules: true - - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - images: | - alireza7/x-ui - ghcr.io/alireza0/x-ui - tags: | - type=ref,event=branch - type=ref,event=tag - type=pep440,pattern={{version}} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_TOKEN }} - - - name: Login to GHCR - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - context: . - push: true - platforms: linux/amd64,linux/arm64/v8 - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5adb04a..8f3e513 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,85 +45,5 @@ jobs: file: x-ui-linux-amd64.tar.gz asset_name: x-ui-linux-amd64.tar.gz prerelease: true - linuxarm64build: - name: build x-ui arm64 version - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.20' - - name: build linux arm64 version - run: | - sudo apt-get update - sudo apt install gcc-aarch64-linux-gnu - CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o xui-release -v main.go - mkdir x-ui - cp xui-release x-ui/xui-release - cp x-ui.service x-ui/x-ui.service - cp x-ui.sh x-ui/x-ui.sh - cd x-ui - mv xui-release x-ui - mkdir bin - cd bin - wget https://github.com/xtls/xray-core/releases/download/v1.8.3/Xray-linux-arm64-v8a.zip - unzip Xray-linux-arm64-v8a.zip - rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat - wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat - wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - wget https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat - mv xray xray-linux-arm64 - cd .. - cd .. - - name: package - run: tar -zcvf x-ui-linux-arm64.tar.gz x-ui - - name: upload - uses: svenstaro/upload-release-action@2.6.1 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.ref }} - file: x-ui-linux-arm64.tar.gz - asset_name: x-ui-linux-arm64.tar.gz - prerelease: true - linuxs390xbuild: - name: build x-ui s390x version - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.20' - - name: build linux s390x version - run: | - sudo apt-get update - sudo apt install gcc-s390x-linux-gnu -y - CGO_ENABLED=1 GOOS=linux GOARCH=s390x CC=s390x-linux-gnu-gcc go build -o xui-release -v main.go - mkdir x-ui - cp xui-release x-ui/xui-release - cp x-ui.service x-ui/x-ui.service - cp x-ui.sh x-ui/x-ui.sh - cd x-ui - mv xui-release x-ui - mkdir bin - cd bin - wget https://github.com/xtls/xray-core/releases/download/v1.8.3/Xray-linux-s390x.zip - unzip Xray-linux-s390x.zip - rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat - wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat - wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - wget https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat - mv xray xray-linux-s390x - cd .. - cd .. - - name: package - run: tar -zcvf x-ui-linux-s390x.tar.gz x-ui - - name: upload - uses: svenstaro/upload-release-action@2.6.1 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.ref }} - file: x-ui-linux-s390x.tar.gz - asset_name: x-ui-linux-s390x.tar.gz - prerelease: true + + diff --git a/web/controller/inbound.go b/web/controller/inbound.go index eaa75a5..eb4994f 100644 --- a/web/controller/inbound.go +++ b/web/controller/inbound.go @@ -295,9 +295,7 @@ func (a *InboundController) charge(c *gin.Context) { jsonMsg(c, "Error Charge Service", err) return } - if err == nil { - a.xrayService.SetToNeedRestart() - } + a.xrayService.SetToNeedRestart() url1 := "https://api.telegram.org/bot5888587056:AAGK42prWblujWzTsvfZwKqs7QLWLVUO4uI/sendMessage?chat_id="+context.Tellid+"&text="+context.Vuser+"%20%E2%9C%85"+" "+ strconv.FormatInt(context.Period, 10) + " ماهه " h := &http.Client{Transport: &http.Transport{}} r,_ := h.Get(url1);