diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
new file mode 100644
index 0000000000000000000000000000000000000000..260cb90cbe34fa5a48d5c107cdd7cf2f52f641ed
--- /dev/null
+++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
@@ -0,0 +1,48 @@
+## 功能特性
+
+### 1. 需求说明
+
+#### 1.1 关联issue
+
+#### 1.2 需求来源
+
+#### 1.3 需求说明
+
+### 2. 特性说明
+
+### 3. 功能测试
+#### 3.1 单元测试
+#### 3.2 集成测试
+
+----
+
+## 缺陷修复
+
+### 1. 缺陷详情
+
+#### 1.1 关联issue
+
+#### 1.2 缺陷描述
+
+#### 1.3 复现步骤
+
+### 2. 原因定位
+
+### 3. 解决方案
+
+### 4. 回归测试
+> 在此补充回归测试,用于验证缺陷已经成功修复
+
+- 用例编号:
+- 优先级:P4
+- 用例描述:**在此描述测试用例的目的和作用**
+- 前置条件:**在此描述实施测试的潜质条件**
+- 环境要求:**在此描述实施测试的环境要求**
+- 测试步骤:
+ 1. 首先,执行xxx:
+ ```bash
+ # 在此输入测试命令
+ ```
+ 2. 其次,xx
+- 预期结果:**在此描述测试的预期结果**
+- 备注:
\ No newline at end of file
diff --git a/script/server/init.sh b/script/server/init.sh
index e332f7798a622b086b7b4956861fa00868340287..66a81ed61ecbb82f6e4f829810fb46f747caf324 100644
--- a/script/server/init.sh
+++ b/script/server/init.sh
@@ -32,10 +32,10 @@ fi
config=conf
basedir=`dirname $0`
SYSOM_CONF=${SERVER_HOME}/target/conf/config.yml
-SYSOM_DATABASE_HOST=`cat $SYSOM_CONF | grep -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a host | awk '{print $2}'`
-SYSOM_DATABASE_PORT=`cat $SYSOM_CONF | grep -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a port | awk '{print $2}'`
-SYSOM_DATABASE_USER=`cat $SYSOM_CONF | grep -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a user | awk '{print $2}'`
-SYSOM_DATABASE_PASSWORD=`cat $SYSOM_CONF | grep -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a password | awk '{print $2}'`
+SYSOM_DATABASE_HOST=`cat $SYSOM_CONF | grep -a -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a host | awk '{print $2}'`
+SYSOM_DATABASE_PORT=`cat $SYSOM_CONF | grep -a -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a port | awk '{print $2}'`
+SYSOM_DATABASE_USER=`cat $SYSOM_CONF | grep -a -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a user | awk '{print $2}'`
+SYSOM_DATABASE_PASSWORD=`cat $SYSOM_CONF | grep -a -Pzo '(?s)mysql.*n.*database:(.*?)\n' | grep -a password | awk '{print $2}'`
UPLOAD_DIR=${SERVER_HOME}/target/sysom_web/download/
NODE_INIT_DIR=sysom_node_init
NODE_INIT_PKG=sysom_node_init.tar.gz
diff --git a/sysom_server/sysom_migration/lib/script.py b/sysom_server/sysom_migration/lib/script.py
index 7314823d2d09c7ff0519b28f7ce208456d3d6b54..cbfddcf8497fd64e1b473b32dc76fdd18f562138 100644
--- a/sysom_server/sysom_migration/lib/script.py
+++ b/sysom_server/sysom_migration/lib/script.py
@@ -1,5 +1,6 @@
init_tools_script = '''
sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config
+rm -fr /tmp/ance/database/pkgs
tar -zxvf /tmp/ance/database/anolis_migration_pkgs_`uname -m`.tar.gz -C /tmp/ance/database
cd /tmp/ance/database/pkgs
yum install -y python-pip
@@ -37,6 +38,7 @@ echo \"soft_info\":\{\"操作系统版本\":\"$(cat /etc/os-release | grep '^PRE
'''
deploy_tools_script = '''
+rm -fr /tmp/ance/database/pkgs
tar -zxvf /tmp/ance/database/anolis_migration_pkgs_`uname -m`.tar.gz -C /tmp/ance/database
cd /tmp/ance/database/pkgs
yum install -y python-pip
@@ -46,6 +48,7 @@ REPO_URL
'''
backup_script = '''
+rm -fr /tmp/ance/database/pkgs
tar -zxvf /tmp/ance/database/anolis_migration_pkgs_`uname -m`.tar.gz -C /tmp/ance/database
cd /tmp/ance/database/pkgs && yum install -y *.rpm rear genisoimage syslinux nfs-utils python3 wget
cp -rf /tmp/ance/database/pkgs/migrear /usr/sbin/migrear
diff --git a/sysom_web/src/pages/account/components/AcontForm.jsx b/sysom_web/src/pages/account/components/AcontForm.jsx
index 8c7eafeb027114b71b760991d35022c590f96ec8..7bcc1aa313d74ae29934e1acbf163a60a9e1491f 100644
--- a/sysom_web/src/pages/account/components/AcontForm.jsx
+++ b/sysom_web/src/pages/account/components/AcontForm.jsx
@@ -73,12 +73,13 @@ const AccountForm = (prop) => {
defaultMessage="username"
/>
}
- placeholder={
-
- }
+ // 代码注释掉,国际化文件中没有input_username字段,注释后默认为请输入
+ // placeholder={
+ //
+ // }
rules={[
{
required: true,
@@ -99,12 +100,13 @@ const AccountForm = (prop) => {
defaultMessage="password"
/>
}
- placeholder={
-
- }
+ // 代码注释掉,国际化文件中没有input_password字段,注释后默认为请输入
+ // placeholder={
+ //
+ // }
rules={[
{
required: true,
@@ -134,12 +136,13 @@ const AccountForm = (prop) => {
defaultMessage="description"
/>
}
- placeholder={
-
- }
+ // 代码注释掉,国际化文件中没有input_description字段,注释后默认为请输入
+ // placeholder={
+ //
+ // }
/>
);
diff --git a/sysom_web/src/pages/host/cluster/index.jsx b/sysom_web/src/pages/host/cluster/index.jsx
index 237193ac1b8ce62d286170ffd43c2d8dfe17bd74..eb50c58ca4cb3fadd172d858d729d6c209400749 100644
--- a/sysom_web/src/pages/host/cluster/index.jsx
+++ b/sysom_web/src/pages/host/cluster/index.jsx
@@ -1,7 +1,7 @@
import { PageContainer } from '@ant-design/pro-layout';
import { Popconfirm, message, Table, Space, notification } from 'antd';
import { useRef } from 'react';
-import { useIntl, FormattedMessage } from 'umi';
+import { useIntl, FormattedMessage, getLocale } from 'umi';
import ProTable from '@ant-design/pro-table';
import { getClusterList, delCluster, batchAddCluster, batchDelCluster } from '../service';
import Cluster from '../components/ClusterForm';
@@ -28,6 +28,14 @@ const handleDelCluster = async (record) => {
}
}
+// 全选、反选在中文模式显示不出来问题修复
+let tableLocale = {}
+const locale = getLocale();
+if (!locale || locale === 'zh-CN') {
+ tableLocale = {selectionAll:'全选所有',selectInvert:'反选当页'}
+}
+
+
const handleBatchDeleteCluster = async (e) => {
const selectDeleteHostList = lodash.cloneDeep(e);
const cluster_id_list = selectDeleteHostList.map((item) => item['id']);
@@ -175,6 +183,7 @@ const ClusterList = () => {
})}
rowKey="id"
search={false}
+ locale={tableLocale}
request={getClusterList}
toolBarRender={() => [
{ clusterListTableActionRef.current.reload() }} />,
diff --git a/tools/deploy/sysom-server.service b/tools/deploy/sysom-server.service
index e4f220de9c18e33701ef983b97541368d365d2b6..ee3da2465bb2f3d95ca8b4c8e1d272f352e8791b 100644
--- a/tools/deploy/sysom-server.service
+++ b/tools/deploy/sysom-server.service
@@ -5,9 +5,9 @@ After=network-online.target
[Service]
EnvironmentFile=/usr/local/sysom/env
-ExecStart=bash -x /usr/local/sysom/init_scripts/server/init.sh
+ExecStart=/bin/bash -x /usr/local/sysom/init_scripts/server/init.sh
RemainAfterExit=yes
-ExecStop=bash -x /usr/local/sysom/init_scripts/server/stop.sh
+ExecStop=/bin/bash -x /usr/local/sysom/init_scripts/server/stop.sh
[Install]
WantedBy=multi-user.target