Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
1ff2af1
add: vue-i18n file
foroughi1380 Oct 27, 2022
a2db446
creade client ip db model
hossinasaadi Oct 29, 2022
d864d20
add email and ip limit to vmess ui
hossinasaadi Oct 29, 2022
20e7b9e
add client ip limit job
hossinasaadi Oct 29, 2022
07c53bc
update: remove vue i18n
foroughi1380 Oct 29, 2022
eae4ca6
update: add .chache folder to gitignore
foroughi1380 Oct 29, 2022
057491d
update: user i18n to show title
foroughi1380 Oct 29, 2022
0685387
update: add pages title
foroughi1380 Oct 29, 2022
1bb9cd5
update: translate page header title with i18n
foroughi1380 Oct 29, 2022
35652d2
updatE: ignore
foroughi1380 Oct 29, 2022
01970cf
update: read localizer from cookies
foroughi1380 Oct 29, 2022
90cb773
update: create supoorted lanquage array
foroughi1380 Oct 29, 2022
74b5dcd
update: relocate the langs.js
foroughi1380 Oct 29, 2022
214a2e3
update: load langs file
foroughi1380 Oct 29, 2022
d4a32a2
update: add required function for set and get current lang
foroughi1380 Oct 29, 2022
bf34f23
update: add a select box to select lang
foroughi1380 Oct 29, 2022
da1f161
update: add language button to setting
foroughi1380 Oct 29, 2022
1f87c1f
update: translate common sider
foroughi1380 Oct 29, 2022
2d2d13a
pass i18n to next level
foroughi1380 Oct 30, 2022
1811783
update: add a function to translate
foroughi1380 Oct 30, 2022
d2544e7
update: pass name to i18n function
foroughi1380 Oct 30, 2022
25e818e
update: translate login page toasts
foroughi1380 Oct 30, 2022
d28da19
update: translate panel config in setting page
foroughi1380 Oct 30, 2022
3289658
update: translate tabs
foroughi1380 Oct 30, 2022
7c72aac
translate user
foroughi1380 Oct 30, 2022
f3d394a
update: translate xray configuration in setting page
foroughi1380 Oct 30, 2022
41023ef
update: translate tg panel
foroughi1380 Oct 30, 2022
ab0a7f9
update: translate other setting
foroughi1380 Oct 30, 2022
9289ce6
update: translate dashboard
foroughi1380 Oct 30, 2022
fa62f8e
update: translate dashboard
foroughi1380 Oct 30, 2022
5e4c8b4
update: translate inbound table titles
foroughi1380 Oct 30, 2022
33aa572
update: translate table
foroughi1380 Oct 30, 2022
cdd96ee
update: translate operate menu
foroughi1380 Oct 30, 2022
7c2471d
update: translate dialogs
foroughi1380 Oct 30, 2022
b7233a9
update: translate buttons and title of details dialog
foroughi1380 Oct 30, 2022
2722d29
restart xray service after disable inbound
hossinasaadi Oct 30, 2022
e0abaf5
add ip log, clear ip log button in edit modal
hossinasaadi Oct 30, 2022
6863c2b
update: translate restart panel dialog
foroughi1380 Oct 30, 2022
606b741
update: translate dialog
foroughi1380 Oct 30, 2022
beacad3
remove merging new ips and old ones in ip log
hossinasaadi Oct 30, 2022
41e7201
update: translate inbound_info
foroughi1380 Oct 30, 2022
6f97a5c
update: translate inbound modal
foroughi1380 Oct 30, 2022
17b9057
update: translate dokodemo porotocol
foroughi1380 Oct 30, 2022
58327d5
replace text and add condtion to field
hossinasaadi Oct 30, 2022
441ae56
update: fix target address
foroughi1380 Oct 30, 2022
60b649b
bugs fix
hossinasaadi Oct 30, 2022
061e005
update: translate protocol
foroughi1380 Oct 31, 2022
114af22
update: translate inbound modal
foroughi1380 Oct 31, 2022
2b5fd5c
update: util controller translate
foroughi1380 Oct 31, 2022
d6f8c9d
update :translate base cotroller
foroughi1380 Oct 31, 2022
2cea3d0
update: translate inbound component
foroughi1380 Oct 31, 2022
66d21fa
update: translate setting and server controller
foroughi1380 Oct 31, 2022
9235ef5
update: remove always return true in debug mode
foroughi1380 Oct 31, 2022
f8bddd4
add vless limit ip
proshir Nov 1, 2022
375835e
clear ip log for clients after 1 min with bulk add
proshir Nov 2, 2022
91e416b
set default limitIp value
hossinasaadi Nov 2, 2022
74f7af6
fix funny bug in line 49 check_clinet_ip_job
proshir Nov 2, 2022
b5a6882
Merge pull request #1 from proshir/main
hossinasaadi Nov 2, 2022
3d0f25b
add connection limit inbound
hossinasaadi Nov 4, 2022
87b301c
fix run schedule run time
hossinasaadi Nov 4, 2022
d564956
ip sort and fix bug
hossinasaadi Nov 4, 2022
131a9ae
change job run time
hossinasaadi Nov 4, 2022
b95a8ec
Merge pull request #6 from hossinasaadi/limit-connection
hossinasaadi Nov 4, 2022
44ca9cc
fix IP Restrict bug
hossinasaadi Nov 5, 2022
10613bd
Merge pull request #11 from hossinasaadi/limit-connection
hossinasaadi Nov 5, 2022
91c891c
Update README.md
hossinasaadi Nov 5, 2022
8282a3b
Update install.sh
hossinasaadi Nov 5, 2022
7327f26
Update x-ui.sh
hossinasaadi Nov 5, 2022
675c211
fix getting server IP
hossinasaadi Nov 5, 2022
5e2c12b
Merge pull request #12 from hossinasaadi/limit-connection
hossinasaadi Nov 5, 2022
253f5dc
sort Log Ips
hossinasaadi Nov 5, 2022
b9f1dcc
Merge pull request #13 from hossinasaadi/limit-connection
hossinasaadi Nov 5, 2022
3f03070
lower schedule time
hossinasaadi Nov 5, 2022
3bac66c
Merge pull request #16 from hossinasaadi/limit-connection
hossinasaadi Nov 5, 2022
ec56af4
revert schedule time
hossinasaadi Nov 5, 2022
be55e44
Merge pull request #18 from hossinasaadi/limit-connection
hossinasaadi Nov 5, 2022
3c5ddad
fix clean all Ip database
hossinasaadi Nov 6, 2022
e2150c3
add func
hossinasaadi Nov 6, 2022
cb4f02c
Merge pull request #22 from hossinasaadi/limit-connection
hossinasaadi Nov 6, 2022
62d8c47
add Environment & update sh files
hossinasaadi Nov 7, 2022
979eccf
Update release.yml
hossinasaadi Nov 7, 2022
5705948
Merge pull request #25 from hossinasaadi/limit-connection
hossinasaadi Nov 7, 2022
a73f20e
Merge branch 'main' into main
hossinasaadi Nov 8, 2022
749be4a
Merge pull request #26 from foroughi1380/main
hossinasaadi Nov 8, 2022
4262ec2
Update README.md
hossinasaadi Nov 8, 2022
904ae3c
add vmess Aead Force to false for ios connections
hossinasaadi Nov 8, 2022
6a08d75
Merge pull request #28 from hossinasaadi/limit-connection
hossinasaadi Nov 8, 2022
2d063a7
add restrictedIPsPath arg to xray
hossinasaadi Nov 8, 2022
e3cc1f7
Merge pull request #29 from hossinasaadi/limit-connection
hossinasaadi Nov 8, 2022
1cc1497
Update README.md
hossinasaadi Nov 9, 2022
ddd1b71
merge multi user with IP Limit
hossinasaadi Nov 9, 2022
5de1ea7
fix multi user bugs
hossinasaadi Nov 9, 2022
b833174
add custom xray core repo
hossinasaadi Nov 9, 2022
e3952c0
fix translation bugs
hossinasaadi Nov 9, 2022
e93b80a
remove duplicate QR
hossinasaadi Nov 9, 2022
5aa2777
add IP limit for all Inbound Clients
hossinasaadi Nov 9, 2022
0dec09a
fix qr style
hossinasaadi Nov 9, 2022
3faf7bb
change translation
hossinasaadi Nov 9, 2022
94adcf7
Merge pull request #32 from hossinasaadi/Multi-User-with-Connection-l…
hossinasaadi Nov 9, 2022
a5f6e07
Update README.md
hossinasaadi Nov 9, 2022
7fbd7c2
add API
hossinasaadi Nov 10, 2022
6ba052b
add meta data to model
hossinasaadi Nov 11, 2022
e4f5da5
untrack files
hossinasaadi Nov 11, 2022
2384bd6
add TotalGb and expireDate to vless and Vmess
hossinasaadi Nov 11, 2022
6755b86
add TotalGb and expireDate to Vmess.html
hossinasaadi Nov 11, 2022
dd83130
add isExpiry
hossinasaadi Nov 11, 2022
f9819fa
remove extra data
hossinasaadi Nov 11, 2022
a4d4344
fix ClientStats model
hossinasaadi Nov 11, 2022
dc8e00f
add ClientTraffic struct
hossinasaadi Nov 11, 2022
8deffb1
enable store each Email Traffic
hossinasaadi Nov 11, 2022
77d24fb
add clientStats to view
hossinasaadi Nov 11, 2022
47a4831
add fully function Multi User With ExpireDate & Traffic
hossinasaadi Nov 12, 2022
5939a38
The language of the Telegram bot has been changed to English (#36)
Nov 12, 2022
c52bdc7
Update README.md
hossinasaadi Nov 13, 2022
f440bc6
update ClientStats data onAdd,onUpdate
hossinasaadi Nov 13, 2022
7adae2a
fix traffic store
hossinasaadi Nov 13, 2022
89a7d93
add xray custom
hossinasaadi Nov 13, 2022
bc38dd0
fix add bug
hossinasaadi Nov 13, 2022
8640499
fix traffic and date condition bug
hossinasaadi Nov 13, 2022
43bb16b
add TotalGb and expireDate to Vless.html
hossinasaadi Nov 13, 2022
01f063e
fix vless methods , fix config editor
hossinasaadi Nov 13, 2022
2ef3ef3
set vless limitIp min to 0
hossinasaadi Nov 15, 2022
796a2bd
set vmess limitIP min to 0
hossinasaadi Nov 15, 2022
845409f
add API (#51)
hossinasaadi Nov 15, 2022
dfef2b4
change logger text
hossinasaadi Nov 15, 2022
e80c666
Merge branch 'main' into multi-user-meta-data
hossinasaadi Nov 15, 2022
18d5e82
Merge pull request #52 from hossinasaadi/multi-user-meta-data
hossinasaadi Nov 15, 2022
dd81cb8
update repo link
hossinasaadi Nov 15, 2022
2e9c061
Update README.md
hossinasaadi Nov 15, 2022
1bcf946
upgrade x-ui version
hossinasaadi Nov 15, 2022
3e43aaa
Update README.md
hossinasaadi Nov 15, 2022
2c5f63e
fix add traffic bug
hossinasaadi Nov 15, 2022
c06577a
Update README.md
hossinasaadi Nov 15, 2022
4d30aec
Translated into English
arashmehrani Nov 16, 2022
da1fc93
Merge pull request #56 from arashmehrani/main
hossinasaadi Nov 16, 2022
f08d81c
Translate x-ui.sh into English (#57)
arashmehrani Nov 16, 2022
87962df
Create docker.yml
hossinasaadi Nov 16, 2022
e568853
Update docker.yml
hossinasaadi Nov 16, 2022
ed0f6e7
Update docker.yml
hossinasaadi Nov 16, 2022
449a4b7
Update docker.yml
hossinasaadi Nov 16, 2022
5ae0b3b
Update docker.yml
hossinasaadi Nov 16, 2022
d43296f
Update docker.yml
hossinasaadi Nov 16, 2022
b800f12
Update docker.yml
hossinasaadi Nov 16, 2022
e78b493
Update docker.yml
hossinasaadi Nov 16, 2022
bb41997
Update docker.yml
hossinasaadi Nov 16, 2022
abc67e8
Add Docker (#58)
hossinasaadi Nov 16, 2022
e904f1f
add user stats to config
hossinasaadi Nov 16, 2022
cb7bdb1
Update version
hossinasaadi Nov 16, 2022
e0776c5
Update issue templates
hossinasaadi Nov 19, 2022
aa76dd8
Update issue templates
hossinasaadi Nov 19, 2022
4e49d9a
Create bug_report.yml (#82)
hossinasaadi Nov 19, 2022
7fc1597
Update issue templates
hossinasaadi Nov 19, 2022
603f061
fix user traffic bug
hossinasaadi Nov 19, 2022
5166f4c
added translations for streams [WIP] (#62)
nshayanfar Nov 19, 2022
53aa8fd
Update README.md
hossinasaadi Nov 20, 2022
5509f94
fix traffic bug
hossinasaadi Nov 20, 2022
41cba88
[bug] fix parse config at starting xray
hossinasaadi Nov 21, 2022
f109991
Random Email (#97)
proshir Nov 21, 2022
217d9aa
fix GLIBC_2.28
hossinasaadi Nov 21, 2022
8c88644
upgrade x-ui version
hossinasaadi Nov 21, 2022
0f58d59
fix bugs (#102)
hossinasaadi Nov 21, 2022
5bd865a
Update README.md
hossinasaadi Nov 21, 2022
4421fec
Dev patch 2 (#107)
hossinasaadi Nov 22, 2022
ad7b954
[tgBot] TG bot command to get client info by user (#110)
hossinasaadi Nov 22, 2022
697748d
Update README.md
hossinasaadi Nov 22, 2022
ba6d4e7
Update README.md
hossinasaadi Nov 25, 2022
117de52
Update README.md
Jan 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/------.md

This file was deleted.

57 changes: 57 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Issue Report
description: "Create a report to help us improve."
body:
- type: checkboxes
id: terms
attributes:
label: Welcome
options:
- label: Yes, I'm using the latest major release. Only such installations are supported.
required: true
- label: Yes, I'm using the supported system. Only such systems are supported.
required: true
- label: Yes, I have read all WIKI document,nothing can help me in my problem.
required: true
- label: Yes, I've searched similar issues on GitHub and didn't find any.
required: true
- label: Yes, I've included all information below (version, config, log, etc).
required: true

- type: textarea
id: problem
attributes:
label: Description of the problem,screencshot would be good
placeholder: Your problem description
validations:
required: true

- type: textarea
id: version
attributes:
label: Version of x-ui
value: |-
<details>

```console
$ x-ui version
# Paste output here
```

</details>
validations:
required: true

- type: textarea
id: log
attributes:
label: x-ui log or xray log
value: |-
<details>

```console
# paste log here
```

</details>
validations:
required: true
49 changes: 49 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Docker Image CI
on:
push:
branches: [ master ]
workflow_dispatch:
inputs:
project:
description: 'Project'
required: true
default:

jobs:

build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v1


- name: Docker Hub login
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
run: |
echo "${DOCKERHUB_TOKEN}" | docker login --username ${DOCKERHUB_USERNAME} --password-stdin

- name: Set up Docker Buildx
id: buildx
uses: crazy-max/ghaction-docker-buildx@v1
with:
buildx-version: latest

- name: Build Dockerfile
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
DOCKERHUB_REPO: ${{ secrets.DOCKER_HUB_REPOSITORY }}
run: |
docker buildx build \
--platform=linux/amd64,linux/arm64 \
--output "type=image,push=true" \
--file ./Dockerfile ./ \
--tag $(echo "${DOCKERHUB_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ github.event.inputs.project }}:latest
19 changes: 9 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ name: Release X-ui
on:
push:
tags:
- 0.*
- "*"
workflow_dispatch:

jobs:
release:
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
steps:
Expand All @@ -24,7 +23,7 @@ jobs:
linuxamd64build:
name: build x-ui amd64 version
needs: release
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Set up Go
Expand All @@ -42,7 +41,7 @@ jobs:
mv xui-release x-ui
mkdir bin
cd bin
wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-64.zip
wget https://github.com/hossinasaadi/Xray-core/releases/latest/download/Xray-linux-64.zip
unzip Xray-linux-64.zip
rm -f Xray-linux-64.zip geoip.dat geosite.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
Expand All @@ -64,7 +63,7 @@ jobs:
linuxarm64build:
name: build x-ui arm64 version
needs: release
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Set up Go
Expand All @@ -84,7 +83,7 @@ jobs:
mv xui-release x-ui
mkdir bin
cd bin
wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip
wget https://github.com/hossinasaadi/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip
unzip Xray-linux-arm64-v8a.zip
rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
Expand All @@ -106,7 +105,7 @@ jobs:
linuxs390xbuild:
name: build x-ui s390x version
needs: release
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Set up Go
Expand All @@ -126,7 +125,7 @@ jobs:
mv xui-release x-ui
mkdir bin
cd bin
wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-s390x.zip
wget https://github.com/hossinasaadi/Xray-core/releases/latest/download/Xray-linux-s390x.zip
unzip Xray-linux-s390x.zip
rm -f Xray-linux-s390x.zip geoip.dat geosite.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
Expand All @@ -144,4 +143,4 @@ jobs:
upload_url: ${{ needs.release.outputs.upload_url }}
asset_path: x-ui-linux-s390x.tar.gz
asset_name: x-ui-linux-s390x.tar.gz
asset_content_type: application/gzip
asset_content_type: application/gzip
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ x-ui-*.tar.gz
/release.sh
.sync*
main
release/
access.log
.cache
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ RUN go build main.go


FROM debian:11-slim
LABEL org.opencontainers.image.authors="[email protected]"
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends -y ca-certificates \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV TZ=Asia/Shanghai
WORKDIR /root
COPY --from=builder /root/main /root/x-ui
COPY bin/. /root/bin/.
COPY ./bin/. /root/bin/.
VOLUME [ "/etc/x-ui" ]
CMD [ "./x-ui" ]
Loading