diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd3a90b6..f170f496 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,11 +47,11 @@ jobs: # Download dependencies if [ "${{ matrix.platform }}" == "amd64" ]; then - wget https://github.com/mhsanaei/Xray-core/releases/latest/download/Xray-linux-64.zip + wget https://github.com/masoudkhz/Xray-core/releases/latest/download/Xray-linux-64.zip unzip Xray-linux-64.zip rm -f Xray-linux-64.zip else - wget https://github.com/mhsanaei/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip + wget https://github.com/masoudkhz/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip unzip Xray-linux-arm64-v8a.zip rm -f Xray-linux-arm64-v8a.zip fi diff --git a/DockerInit.sh b/DockerInit.sh index d1a5e40a..dca25767 100755 --- a/DockerInit.sh +++ b/DockerInit.sh @@ -18,7 +18,7 @@ esac mkdir -p build/bin cd build/bin -wget "https://github.com/mhsanaei/xray-core/releases/latest/download/Xray-linux-${ARCH}.zip" +wget "https://github.com/masoudkhz/xray-core/releases/latest/download/Xray-linux-${ARCH}.zip" unzip "Xray-linux-${ARCH}.zip" rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat iran.dat mv xray "xray-linux-${FNAME}" diff --git a/README.md b/README.md index 9f6325ed..c6c868ee 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ > **Disclaimer: This project is only for personal learning and communication, please do not use it for illegal purposes, please do not use it in a production environment** -[![](https://img.shields.io/github/v/release/mhsanaei/3x-ui.svg)](https://github.com/MHSanaei/3x-ui/releases) -[![](https://img.shields.io/github/actions/workflow/status/mhsanaei/3x-ui/release.yml.svg)](#) -[![GO Version](https://img.shields.io/github/go-mod/go-version/mhsanaei/3x-ui.svg)](#) -[![Downloads](https://img.shields.io/github/downloads/mhsanaei/3x-ui/total.svg)](#) +[![](https://img.shields.io/github/v/release/masoudkhz/3x-ui.svg)](https://github.com/MHSanaei/3x-ui/releases) +[![](https://img.shields.io/github/actions/workflow/status/masoudkhz/3x-ui/release.yml.svg)](#) +[![GO Version](https://img.shields.io/github/go-mod/go-version/masoudkhz/3x-ui.svg)](#) +[![Downloads](https://img.shields.io/github/downloads/masoudkhz/3x-ui/total.svg)](#) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0.en.html) 3x-ui panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese,Russian)** @@ -18,7 +18,7 @@ # Install & Upgrade ``` -bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/masoudkhz/3x-ui/master/install.sh) ``` # Install custom version @@ -26,7 +26,7 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install. To install your desired version you can add the version to the end of install command. Example for ver `v1.6.1`: ``` -bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.6.1 +bash <(curl -Ls https://raw.githubusercontent.com/masoudkhz/3x-ui/master/install.sh) v1.6.1 ``` # SSL @@ -122,7 +122,7 @@ systemctl restart x-ui --network=host \ --restart=unless-stopped \ --name 3x-ui \ - ghcr.io/mhsanaei/3x-ui:latest + ghcr.io/masoudkhz/3x-ui:latest ``` diff --git a/docker-compose.yml b/docker-compose.yml index 47e60491..f8953029 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.9" services: 3x-ui: - image: ghcr.io/mhsanaei/3x-ui:latest + image: ghcr.io/masoudkhz/3x-ui:latest container_name: 3x-ui hostname: yourhostname volumes: diff --git a/install.sh b/install.sh index 653fe979..42ab27e4 100644 --- a/install.sh +++ b/install.sh @@ -139,7 +139,7 @@ install_x-ui() { cd x-ui chmod +x x-ui bin/xray-linux-$(arch3xui) cp -f x-ui.service /etc/systemd/system/ - wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh + wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/MasoudKhz/3x-ui/main/x-ui.sh chmod +x /usr/local/x-ui/x-ui.sh chmod +x /usr/bin/x-ui config_after_install diff --git a/web/controller/inbound.go b/web/controller/inbound.go index d0e9cc03..a9699bbb 100644 --- a/web/controller/inbound.go +++ b/web/controller/inbound.go @@ -3,7 +3,6 @@ package controller import ( "fmt" "strconv" - "x-ui/database/model" "x-ui/logger" "x-ui/web/global" @@ -41,6 +40,7 @@ func (a *InboundController) initRouter(g *gin.RouterGroup) { g.POST("/resetAllTraffics", a.resetAllTraffics) g.POST("/resetAllClientTraffics/:id", a.resetAllClientTraffics) g.POST("/delDepletedClients/:id", a.delDepletedClients) + } func (a *InboundController) startTask() { @@ -79,7 +79,6 @@ func (a *InboundController) getInbound(c *gin.Context) { } jsonObj(c, inbound, nil) } - func (a *InboundController) getClientTraffics(c *gin.Context) { email := c.Param("email") clientTraffics, err := a.inboundService.GetClientTrafficByEmail(email) diff --git a/web/html/login.html b/web/html/login.html index 61381a61..74039b7c 100644 --- a/web/html/login.html +++ b/web/html/login.html @@ -1,163 +1,159 @@ + -{{template "head" .}} - - - - - - - -

{{ i18n "pages.login.title" }}

- - - - - - - - - - - - - - - - - - - - - - - [[ loading ? '' : '{{ i18n "login" }}' ]] - - - - - - - - - -    - - - - - - - - - - - - - - - - -{{template "js" .}} -{{template "component/themeSwitcher" .}} -{{template "component/password" .}} - + + + {{template "js" .}} + {{template "component/themeSwitcher" .}} + {{template "component/password" .}} + + + + + + + + + + + + \ No newline at end of file diff --git a/web/html/xui/form/protocol/shadowsocks.html b/web/html/xui/form/protocol/shadowsocks.html index 7af96373..e9b01ea5 100644 --- a/web/html/xui/form/protocol/shadowsocks.html +++ b/web/html/xui/form/protocol/shadowsocks.html @@ -96,12 +96,10 @@ - - + - - +
{{ i18n "pages.inbounds.email" }}Password[[ col ]]
[[ client.email ]][[ client.password ]][[ col ]]
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html index 46ae5e32..f494adb9 100644 --- a/web/html/xui/form/protocol/trojan.html +++ b/web/html/xui/form/protocol/trojan.html @@ -102,12 +102,10 @@ - - + - - +
{{ i18n "pages.inbounds.email" }}Password[[ col ]]
[[ client.email ]][[ client.password ]][[ col ]]
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html index 12729eff..f661a839 100644 --- a/web/html/xui/form/protocol/vless.html +++ b/web/html/xui/form/protocol/vless.html @@ -108,14 +108,10 @@ - - - + - - - +
{{ i18n "pages.inbounds.email" }}FlowID[[ col ]]
[[ client.email ]][[ client.flow ]][[ client.id ]][[ col ]]
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html index a37f8468..b58ecaee 100644 --- a/web/html/xui/form/protocol/vmess.html +++ b/web/html/xui/form/protocol/vmess.html @@ -97,12 +97,10 @@ - - + - - +
{{ i18n "pages.inbounds.email" }}ID[[ col ]]
[[ client.email ]][[ client.id ]][[ col ]]
diff --git a/web/html/xui/inbound_client_table.html b/web/html/xui/inbound_client_table.html index 138c91c3..bb825437 100644 --- a/web/html/xui/inbound_client_table.html +++ b/web/html/xui/inbound_client_table.html @@ -29,27 +29,11 @@ {{ i18n "depleted" }}