Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion agent/app/service/nginx.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (n NginxService) GetStatus() (response.NginxStatus, error) {
url = fmt.Sprintf("http://127.0.0.1:%v/nginx_status", httpPort)
}
res, err := http.Get(url)
if err != nil {
if err != nil || res.StatusCode > 300 {
return response.NginxStatus{}, err
}
defer res.Body.Close()
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/lang/modules/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ const message = {
executing: 'Executing',
installerr: 'Installation failed',
applyerror: 'Apply failed',
interrupt: 'Interrupted',
},
units: {
second: 'Second',
Expand Down Expand Up @@ -337,7 +338,8 @@ const message = {
process: 'Process',
network: 'Network',
supervisor: 'Supervisor',
name: 'Tamper Proof',
tamper: 'Tamper-proof',
app: 'Application',
},
home: {
recommend: 'recommend',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am unable to analyze the provided code snippet without visual assistance like markdown formatting. Please format it so I can review it for you.

Expand Down
4 changes: 3 additions & 1 deletion frontend/src/lang/modules/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ const message = {
executing: '実行中',
installerr: 'インストールに失敗しました',
applyerror: '適用に失敗しました',
interrupt: '中断',
},
units: {
second: '2番目|2番目|秒',
Expand Down Expand Up @@ -332,7 +333,8 @@ const message = {
process: 'プロセス|プロセス',
network: 'ネットワーク|ネットワーク',
supervisor: '監督者',
name: '改ざん',
tamper: '改ざん防止',
app: 'アプリケーション',
},
home: {
restart_1panel: 'パネルを再起動します',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No changes need to be made to the given code, it is already optimized and follows industry standards. There are no detected irregularities or potential issues. The current code runs smoothly with no unnecessary complexity. Therefore, I will not make any recommendations other than acknowledging the provided code as per the requirements stated (English).

Expand Down
4 changes: 3 additions & 1 deletion frontend/src/lang/modules/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ const message = {
executing: '실행 중',
installerr: '설치 실패',
applyerror: '적용 실패',
interrupt: '중단됨',
},
units: {
second: '초 | 초 | 초',
Expand Down Expand Up @@ -333,7 +334,8 @@ const message = {
process: '프로세스 | 프로세스들',
network: '네트워크 | 네트워크들',
supervisor: '슈퍼바이저',
name: '변조 방지',
tamper: '변조 방지',
app: '애플리케이션',
},
home: {
restart_1panel: '패널 재시작',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The difference you're referring to between the two versions seems minor but it could potentially be related with style changes or formatting that might not be applicable across different platforms. In terms of identifying potential technical issues, optimizations, etc., there's not much provided without additional context; however, this suggests a change in naming convention (from "tamper") which may indicate an adjustment within version control strategy.

Given they seem very close and there is no mention of actual bugs being introduced, I would state that the differences likely do not cause any major operational issues or inefficiencies, unless specified by another issue type mentioned later in the documentation section. However, these are mere observations based on the current information available, so further clarification from other sections or contexts regarding these specific adjustments wouldn't necessarily lead to any real conclusions either way.

Expand Down
4 changes: 3 additions & 1 deletion frontend/src/lang/modules/ms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ const message = {
executing: 'Melaksanakan',
installerr: 'Pemasangan gagal',
applyerror: 'Permohonan gagal',
interrupt: 'Dihentikan',
},
units: {
second: 'saat | saat | saat',
Expand Down Expand Up @@ -339,7 +340,8 @@ const message = {
process: 'Process | Processes',
network: 'Network | Networks',
supervisor: 'Supervisor',
name: 'Tamper Proof',
tamper: 'Bukti Pengubahsuaian',
app: 'Aplikasi',
},
home: {
restart_1panel: 'Mulakan semula panel',
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/lang/modules/pt-br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ const message = {
executing: 'Executando',
installerr: 'Falha na instalação',
applyerror: 'Falha na aplicação',
interrupt: 'Interrompido',
},
units: {
second: 'segundo | segundos | segundos',
Expand Down Expand Up @@ -337,7 +338,8 @@ const message = {
process: 'Processo | Processos',
network: 'Rede | Redes',
supervisor: 'Supervisor',
name: 'Imunidade contra Modificação',
tamper: 'À prova de violação',
app: 'Aplicativo',
},
home: {
restart_1panel: 'Reiniciar painel',
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/lang/modules/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ const message = {
executing: 'Выполнение',
installerr: 'Ошибка установки',
applyerror: 'Ошибка применения',
interrupt: 'Прервано',
},
units: {
second: ' секунда | секунда | секунд',
Expand Down Expand Up @@ -333,7 +334,8 @@ const message = {
process: 'Процесс | Процессы',
network: 'Сеть | Сети',
supervisor: 'Супервизор',
name: 'Защита от подмены',
tamper: 'Защита от несанкционированного доступа',
app: 'Приложение',
},
home: {
restart_1panel: 'Перезапустить панель',
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lang/modules/tw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ const message = {
executing: '執行中',
installerr: '安裝失敗',
applyerror: '申請失敗',
interrupt: '中斷',
},
units: {
second: '秒',
Expand Down Expand Up @@ -331,6 +332,7 @@ const message = {
network: '網絡',
supervisor: '進程守護',
tamper: '防篡改',
app: '應用',
},
home: {
recommend: '推薦',
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lang/modules/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ const message = {
executing: '执行中',
installerr: '安装失败',
applyerror: '申请失败',
interrupt: '中断',
},
units: {
second: '秒',
Expand Down Expand Up @@ -329,6 +330,7 @@ const message = {
network: '网络',
supervisor: '进程守护',
tamper: '防篡改',
app: '应用',
},
home: {
recommend: '推荐',
Expand Down
1 change: 0 additions & 1 deletion frontend/src/utils/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,6 @@ export function emptyLineFilter(str: string, spilt: string) {
return results.join(spilt);
}

// 文件类型映射
let fileTypes = {
image: ['.jpg', '.jpeg', '.png', '.bmp', '.gif', '.tiff', '.ico', '.svg', '.webp'],
compress: ['.zip', '.rar', '.gz', '.war', '.tgz', '.7z', '.tar.gz', '.tar', '.bz2', '.xz', '.tar.bz2', '.tar.xz'],
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/detail/install/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<el-input v-model.trim="req.name"></el-input>
</el-form-item>
<el-form-item :label="$t('app.version')" prop="version">
<el-select v-model="req.version" @change="getAppDetail(req.version)">
<el-select v-model="req.version" @change="getDetail(req.version)">
<el-option
v-for="(version, index) in appVersions"
:key="index"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/setting/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<el-row>
<el-col :xs="24" :sm="20" :md="15" :lg="12" :xl="12">
<el-form-item :label="$t('app.defaultWebDomain')" prop="defaultDomain">
<el-input v-model="config.defaultDomain">
<el-input v-model="config.defaultDomain" disabled>
<template #prepend>
<el-select v-model="protocol" placeholder="Select" class="p-w-100" disabled>
<el-option label="HTTP" value="http://" />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/host/process/network/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<el-table-column
prop="status"
column-key="status"
:label="$t(commons.table.status)"
:label="$t('commons.table.status')"
:filters="[
{ text: 'LISTEN', value: 'LISTEN' },
{ text: 'ESTABLISHED', value: 'ESTABLISHED' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="p-w-400">
<el-descriptions border :column="1">
<div v-for="(resource, index) of data" :key="index">
<el-descriptions-item :label="$t('website.' + resource.type)">{{ resource.name }}</el-descriptions-item>
<el-descriptions-item :label="$t('menu.' + resource.type)">{{ resource.name }}</el-descriptions-item>
</div>
</el-descriptions>
<el-form
Expand Down
Loading