gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-14 05:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1356 from MHSanaei/main

Browse Source 
some changes
This commit is contained in:
Alireza Ahmadi
2024-07-10 22:02:17 +02:00
committed by GitHub
parent ac2429bbbf 19a7a8574c
commit a443d3187e
13 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@@ -73,7 +73,7 @@ install_dependencies() {
esac esac
} }
#This function will be called when user installed x-ui out of sercurity #This function will be called when user installed x-ui out of security
config_after_install() { config_after_install() {
echo -e "${yellow}Install/update finished! For security it's recommended to modify panel settings ${plain}" echo -e "${yellow}Install/update finished! For security it's recommended to modify panel settings ${plain}"
read -p "Do you want to continue with the modification [y/n]? ": config_confirm read -p "Do you want to continue with the modification [y/n]? ": config_confirm

2
web/assets/js/model/xray.js
View File

@@ -477,7 +477,7 @@ class HttpUpgradeStreamSettings extends XrayCommonClass {
} }
} }
class SplitHTTPStreamSettings extends XrayCommonClass { class SplitHTTPStreamSettings extends XrayCommonClass {
constructor(path='/', host='', headers=[] , maxUploadSize= 1, maxConcurrentUploads= 10) { constructor(path='/', host='', headers=[] , maxUploadSize= 1000000, maxConcurrentUploads= 10) {
super(); super();
this.path = path; this.path = path;
this.host = host; this.host = host;

10
web/controller/inbound.go
View File

@@ -214,7 +214,7 @@ func (a *InboundController) resetClientTraffic(c *gin.Context) {
jsonMsg(c, "Something went wrong!", err) jsonMsg(c, "Something went wrong!", err)
return return
} }
jsonMsg(c, "traffic reseted", nil) jsonMsg(c, "traffic has been reset", nil)
if needRestart { if needRestart {
a.xrayService.SetToNeedRestart() a.xrayService.SetToNeedRestart()
} }
@@ -228,7 +228,7 @@ func (a *InboundController) resetAllTraffics(c *gin.Context) {
} else { } else {
a.xrayService.SetToNeedRestart() a.xrayService.SetToNeedRestart()
} }
jsonMsg(c, "All traffics reseted", nil) jsonMsg(c, "All traffics has been reset", nil)
} }
func (a *InboundController) resetAllClientTraffics(c *gin.Context) { func (a *InboundController) resetAllClientTraffics(c *gin.Context) {
@@ -245,7 +245,7 @@ func (a *InboundController) resetAllClientTraffics(c *gin.Context) {
} else { } else {
a.xrayService.SetToNeedRestart() a.xrayService.SetToNeedRestart()
} }
jsonMsg(c, "All traffics of client reseted", nil) jsonMsg(c, "All traffics of client has been reset", nil)
} }
func (a *InboundController) delDepletedClients(c *gin.Context) { func (a *InboundController) delDepletedClients(c *gin.Context) {
@@ -259,7 +259,7 @@ func (a *InboundController) delDepletedClients(c *gin.Context) {
jsonMsg(c, "Something went wrong!", err) jsonMsg(c, "Something went wrong!", err)
return return
} }
jsonMsg(c, "All delpeted clients are deleted", nil) jsonMsg(c, "All depleted clients are deleted", nil)
} }
func (a *InboundController) importInbound(c *gin.Context) { func (a *InboundController) importInbound(c *gin.Context) {
@@ -292,5 +292,5 @@ func (a *InboundController) importInbound(c *gin.Context) {
} }
func (a *InboundController) onlines(c *gin.Context) { func (a *InboundController) onlines(c *gin.Context) {
jsonObj(c, a.inboundService.GetOnlineClinets(), nil) jsonObj(c, a.inboundService.GetOnlineClients(), nil)
} }

10
web/controller/index.go
View File

@@ -68,31 +68,31 @@ func (a *IndexController) login(c *gin.Context) {
pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.wrongUsernameOrPassword")) pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.wrongUsernameOrPassword"))
return return
} else { } else {
logger.Infof("%s login success ,Ip Address: %s\n", form.Username, getRemoteIp(c)) logger.Infof("%s Successful Login ,Ip Address: %s\n", form.Username, getRemoteIp(c))
a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 1) a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 1)
} }
sessionMaxAge, err := a.settingService.GetSessionMaxAge() sessionMaxAge, err := a.settingService.GetSessionMaxAge()
if err != nil { if err != nil {
logger.Infof("Unable to get session's max age from DB") logger.Info("Unable to get session's max age from DB")
} }
if sessionMaxAge > 0 { if sessionMaxAge > 0 {
err = session.SetMaxAge(c, sessionMaxAge*60) err = session.SetMaxAge(c, sessionMaxAge*60)
if err != nil { if err != nil {
logger.Infof("Unable to set session's max age") logger.Info("Unable to set session's max age")
} }
} }
err = session.SetLoginUser(c, user) err = session.SetLoginUser(c, user)
logger.Info("user", user.Id, "login success") logger.Infof("%s logged in successfully", user.Username)
jsonMsg(c, I18nWeb(c, "pages.login.toasts.successLogin"), err) jsonMsg(c, I18nWeb(c, "pages.login.toasts.successLogin"), err)
} }
func (a *IndexController) logout(c *gin.Context) { func (a *IndexController) logout(c *gin.Context) {
user := session.GetLoginUser(c) user := session.GetLoginUser(c)
if user != nil { if user != nil {
logger.Info("user", user.Id, "logout") logger.Infof("%s logged out successfully", user.Username)
} }
session.ClearSession(c) session.ClearSession(c)
c.Redirect(http.StatusTemporaryRedirect, c.GetString("base_path")) c.Redirect(http.StatusTemporaryRedirect, c.GetString("base_path"))

2
web/controller/server.go
View File

@@ -105,7 +105,7 @@ func (a *ServerController) stopXrayService(c *gin.Context) {
jsonMsg(c, "", err) jsonMsg(c, "", err)
return return
} }
jsonMsg(c, "Xray stoped", err) jsonMsg(c, "Xray stopped", err)
} }
func (a *ServerController) restartXrayService(c *gin.Context) { func (a *ServerController) restartXrayService(c *gin.Context) {

2
web/controller/xray_setting.go
View File

@@ -78,7 +78,7 @@ func (a *XraySettingController) warp(c *gin.Context) {
resp, err = a.XraySettingService.RegWarp(skey, pkey) resp, err = a.XraySettingService.RegWarp(skey, pkey)
case "license": case "license":
license := c.PostForm("license") license := c.PostForm("license")
resp, err = a.XraySettingService.SetWarpLicence(license) resp, err = a.XraySettingService.SetWarpLicense(license)
} }
jsonObj(c, resp, err) jsonObj(c, resp, err)

8
web/html/common/qrcode_modal.html
View File

@@ -71,8 +71,8 @@
qrModal: qrModal, qrModal: qrModal,
}, },
methods: { methods: {
copyToClipboard(elmentId, content) { copyToClipboard(elementId, content) {
this.qrModal.clipboard = new ClipboardJS('#' + elmentId, { this.qrModal.clipboard = new ClipboardJS('#' + elementId, {
text: () => content, text: () => content,
}); });
this.qrModal.clipboard.on('success', () => { this.qrModal.clipboard.on('success', () => {
@@ -80,9 +80,9 @@
this.qrModal.clipboard.destroy(); this.qrModal.clipboard.destroy();
}); });
}, },
setQrCode(elmentId, content) { setQrCode(elementId, content) {
new QRious({ new QRious({
element: document.querySelector('#' + elmentId), element: document.querySelector('#' + elementId),
size: 260, size: 260,
value: content, value: content,
}); });

4
web/html/xui/inbound_info_modal.html
View File

@@ -412,8 +412,8 @@
}, },
}, },
methods: { methods: {
copyToClipboard(elmentId,content) { copyToClipboard(elementId,content) {
this.infoModal.clipboard = new ClipboardJS('#' + elmentId, { this.infoModal.clipboard = new ClipboardJS('#' + elementId, {
text: () => content, text: () => content,
}); });
this.infoModal.clipboard.on('success', () => { this.infoModal.clipboard.on('success', () => {

6
web/service/inbound.go
View File

@@ -574,7 +574,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
return false, err return false, err
} }
inerfaceClients := settings["clients"].([]interface{}) interfaceClients := settings["clients"].([]interface{})
oldInbound, err := s.GetInbound(data.Id) oldInbound, err := s.GetInbound(data.Id)
if err != nil { if err != nil {
@@ -629,7 +629,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
return false, err return false, err
} }
settingsClients := oldSettings["clients"].([]interface{}) settingsClients := oldSettings["clients"].([]interface{})
settingsClients[clientIndex] = inerfaceClients[0] settingsClients[clientIndex] = interfaceClients[0]
oldSettings["clients"] = settingsClients oldSettings["clients"] = settingsClients
newSettings, err := json.MarshalIndent(oldSettings, "", " ") newSettings, err := json.MarshalIndent(oldSettings, "", " ")
@@ -1468,6 +1468,6 @@ func (s *InboundService) MigrateDB() {
s.MigrationRemoveOrphanedTraffics() s.MigrationRemoveOrphanedTraffics()
} }
func (s *InboundService) GetOnlineClinets() []string { func (s *InboundService) GetOnlineClients() []string {
return p.GetOnlineClients() return p.GetOnlineClients()
} }

10
web/service/server.go
View File

@@ -286,6 +286,16 @@ func (s *ServerService) downloadXRay(version string) (string, error) {
arch = "64" arch = "64"
case "arm64": case "arm64":
arch = "arm64-v8a" arch = "arm64-v8a"
case "armv7":
arch = "arm32-v7a"
case "armv6":
arch = "arm32-v6"
case "armv5":
arch = "arm32-v5"
case "386":
arch = "32"
case "s390x":
arch = "s390x"
} }
fileName := fmt.Sprintf("Xray-%s-%s.zip", osName, arch) fileName := fmt.Sprintf("Xray-%s-%s.zip", osName, arch)

14
web/service/tgbot.go
View File

@@ -135,7 +135,7 @@ func (t *Tgbot) OnReceive() {
isAdmin := checkAdmin(tgId) isAdmin := checkAdmin(tgId)
if update.Message == nil { if update.Message == nil {
if update.CallbackQuery != nil { if update.CallbackQuery != nil {
t.asnwerCallback(update.CallbackQuery) t.answerCallback(update.CallbackQuery)
} }
} else { } else {
if update.Message.IsCommand() { if update.Message.IsCommand() {
@@ -196,7 +196,7 @@ func (t *Tgbot) answerCommand(message *tgbotapi.Message, chatId int64, isAdmin b
t.SendAnswer(chatId, msg, isAdmin) t.SendAnswer(chatId, msg, isAdmin)
} }
func (t *Tgbot) asnwerCallback(callbackQuery *tgbotapi.CallbackQuery) { func (t *Tgbot) answerCallback(callbackQuery *tgbotapi.CallbackQuery) {
// Respond to the callback query, telling Telegram to show the user // Respond to the callback query, telling Telegram to show the user
// a message with the data received. // a message with the data received.
callback := tgbotapi.NewCallback(callbackQuery.ID, callbackQuery.Data) callback := tgbotapi.NewCallback(callbackQuery.ID, callbackQuery.Data)
@@ -424,14 +424,14 @@ func (t *Tgbot) UserLoginNotify(username string, ip string, time string, status
func (t *Tgbot) getInboundUsages() string { func (t *Tgbot) getInboundUsages() string {
info := "" info := ""
// get traffic // get traffic
inbouds, err := t.inboundService.GetAllInbounds() inbounds, err := t.inboundService.GetAllInbounds()
if err != nil { if err != nil {
logger.Warning("GetAllInbounds run failed:", err) logger.Warning("GetAllInbounds run failed:", err)
info += t.I18nBot("tgbot.answers.getInboundsFailed") info += t.I18nBot("tgbot.answers.getInboundsFailed")
} else { } else {
// NOTE:If there no any sessions here,need to notify here // NOTE:If there no any sessions here,need to notify here
// TODO:Sub-node push, automatic conversion format // TODO:Sub-node push, automatic conversion format
for _, inbound := range inbouds { for _, inbound := range inbounds {
info += t.I18nBot("tgbot.messages.inbound", "Remark=="+inbound.Remark) info += t.I18nBot("tgbot.messages.inbound", "Remark=="+inbound.Remark)
info += t.I18nBot("tgbot.messages.port", "Port=="+strconv.Itoa(inbound.Port)) info += t.I18nBot("tgbot.messages.port", "Port=="+strconv.Itoa(inbound.Port))
info += t.I18nBot("tgbot.messages.traffic", "Total=="+common.FormatTraffic((inbound.Up+inbound.Down)), "Upload=="+common.FormatTraffic(inbound.Up), "Download=="+common.FormatTraffic(inbound.Down)) info += t.I18nBot("tgbot.messages.traffic", "Total=="+common.FormatTraffic((inbound.Up+inbound.Down)), "Upload=="+common.FormatTraffic(inbound.Up), "Download=="+common.FormatTraffic(inbound.Down))
@@ -539,7 +539,7 @@ func (t *Tgbot) searchClient(chatId int64, email string) {
} }
func (t *Tgbot) searchInbound(chatId int64, remark string) { func (t *Tgbot) searchInbound(chatId int64, remark string) {
inbouds, err := t.inboundService.SearchInbounds(remark) inbounds, err := t.inboundService.SearchInbounds(remark)
if err != nil { if err != nil {
logger.Warning(err) logger.Warning(err)
msg := t.I18nBot("tgbot.wentWrong") msg := t.I18nBot("tgbot.wentWrong")
@@ -547,13 +547,13 @@ func (t *Tgbot) searchInbound(chatId int64, remark string) {
return return
} }
if len(inbouds) == 0 { if len(inbounds) == 0 {
msg := t.I18nBot("tgbot.noInbounds") msg := t.I18nBot("tgbot.noInbounds")
t.SendMsgToTgbot(chatId, msg) t.SendMsgToTgbot(chatId, msg)
return return
} }
for _, inbound := range inbouds { for _, inbound := range inbounds {
info := "" info := ""
info += t.I18nBot("tgbot.messages.inbound", "Remark=="+inbound.Remark) info += t.I18nBot("tgbot.messages.inbound", "Remark=="+inbound.Remark)
info += t.I18nBot("tgbot.messages.port", "Port=="+strconv.Itoa(inbound.Port)) info += t.I18nBot("tgbot.messages.port", "Port=="+strconv.Itoa(inbound.Port))

2
web/service/xray_setting.go
View File

@@ -128,7 +128,7 @@ func (s *XraySettingService) RegWarp(secretKey string, publicKey string) (string
return result, nil return result, nil
} }
func (s *XraySettingService) SetWarpLicence(license string) (string, error) { func (s *XraySettingService) SetWarpLicense(license string) (string, error) {
var warpData map[string]string var warpData map[string]string
warp, err := s.SettingService.GetWarp() warp, err := s.SettingService.GetWarp()
if err != nil { if err != nil {

2
web/translation/translate.en_US.toml
View File

@@ -44,7 +44,7 @@
"monitor" = "Listen IP" "monitor" = "Listen IP"
"certificate" = "Certificate" "certificate" = "Certificate"
"fail" = " Failed" "fail" = " Failed"
"success" = " Successful" "success" = " Successfully"
"getVersion" = "Get Version" "getVersion" = "Get Version"
"install" = "Install" "install" = "Install"
"clients" = "Clients" "clients" = "Clients"