Skip to content

Commit

Permalink
Merge pull request #120 from xianyunleo/dev
Browse files Browse the repository at this point in the history
Dev
xianyunleo authored Jun 26, 2024
2 parents 96756b0 + e8d5040 commit 40b004f
Showing 6 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eserver",
"productName": "EServer",
"version": "3.9.1",
"version": "3.9.3",
"description": "EServer",
"main": "./out/main/index.js",
"author": "xianyunleo",
2 changes: 1 addition & 1 deletion src/main/utils/TcpProcess.js
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ export default class TcpProcess {
const name = await hmc.getProcessName2(pid)
const path = await hmc.getProcessFilePath2(pid)
const icon = path ? (await app.getFileIcon(path))?.toDataURL() : null
result.push({ pid, ip, port, name, path, icon })
result.push({ pid, ip, port, name, path, status: 'Listen', icon })
}

return result
3 changes: 0 additions & 3 deletions src/renderer/views/About.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<template>
<div class="content-container color-text">
<p style="text-align: center; font-size: 18px; margin-top: 50px">{{ APP_NAME }}</p>
<p style="text-align: center; font-size: 18px; font-weight: bold">
{{ t('integratedServiceEnvironment') }}
</p>
<p style="text-align: center">{{ $t('Version') }}:{{ version }}</p>
<p style="text-align: center">
{{ t('OfficialSite') }}:<a @click="openUrl('http://www.eserver.app')">www.eserver.app</a>
1 change: 0 additions & 1 deletion src/shared/i18n/en.js
Original file line number Diff line number Diff line change
@@ -142,7 +142,6 @@ export default {
softwareUninstallErrorTip: 'Please open the file manager and manually delete the {0} directory',
mysqlResetRootAccountPwd: 'MySQL reset password for root account',
afterOpenAppStartServer: 'After opening the app, start the server',
integratedServiceEnvironment: 'Integrated Service Environment',
pleaseChoose: 'Please choose',
'MySQL Is a Relational Database': 'MySQL is a relational database',
'Web Server': 'Web Server',
1 change: 0 additions & 1 deletion src/shared/i18n/fr.js
Original file line number Diff line number Diff line change
@@ -142,7 +142,6 @@ export default {
softwareUninstallErrorTip: 'Veuillez ouvrir le gestionnaire de fichiers et supprimer manuellement le répertoire {0}.',
mysqlResetRootAccountPwd: 'Réinitialiser le mot de passe du compte root MySQL.',
afterOpenAppStartServer: "Démarrez le service après avoir ouvert l'application.",
integratedServiceEnvironment: 'Environnement de services intégrés',
pleaseChoose: "Choisissez s'il vous plaît",
'MySQL Is a Relational Database': 'MySQL is a relational database',
'Web Server': 'Serveur Web',
1 change: 0 additions & 1 deletion src/shared/i18n/zh.js
Original file line number Diff line number Diff line change
@@ -143,7 +143,6 @@ export default {
softwareUninstallErrorTip: '请打开文件管理器,手动删除{0}目录',
mysqlResetRootAccountPwd: 'MySQL 重置 root 账户的密码',
afterOpenAppStartServer: '打开软件后,启动服务',
integratedServiceEnvironment: '打开软件后,启动服务',
pleaseChoose: '请选择',
'MySQL Is a Relational Database': 'MySQL是一种关系数据库',
'Web Server': 'Web服务器',

0 comments on commit 40b004f

Please sign in to comment.