Skip to content

Commit b219d5f

Browse files
authored
[Optimization] Replace chinese punctuation with english punctuation marks and fix typo (#4494)
1 parent 752212f commit b219d5f

File tree

8 files changed

+60
-60
lines changed

8 files changed

+60
-60
lines changed

dinky-web/src/locales/zh-CN/welcome.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
'welcome.finish.title': '初始化完成!',
3434
'welcome.finish': '立即开始你的Dinky之旅吧!',
3535

36-
'welcome.goLogin': '去登陆!',
36+
'welcome.goLogin': '去登录!',
3737
'welcome.base.config.title': '基本配置',
3838
'welcome.base.config.dinky.url.title': 'Dinky地址:',
3939
'welcome.base.config.dinky.url':

docs/docs/practical_guide/Integration_practice/dinky_integration_datasophon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ vim prometheus.yml 检查是否有dinky配置文件 如果没有则添加
426426

427427
### 5.2 Grafana 配置
428428

429-
通过下图展示的url进去grafana配置图表,默认登陆账户密码:admin :admin
429+
通过下图展示的url进去grafana配置图表,默认登录账户密码:admin :admin
430430
![bbbb](https://github.com/user-attachments/assets/9f8478ad-3a64-4d3a-bf26-e97036e2d3c0)
431431

432432
### 5.3 创建Grafana 模板文件

script/bin/init_check_network.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ echo -e "${YELLOW}Checking whether your network can connect to the Internet prop
66
if ! ping -c 1 ${EXTERNAL_CONNECTIVITY_CHECK_URL} &> /dev/null; then
77
echo -e "${RED}Your network cannot connect to the Internet using ping mode, please check whether your network environment is normal, and the program will try to use curl mode to detect the network connection again...${RESET}"
88
if ! curl -I -s --connect-timeout 5 ${EXTERNAL_CONNECTIVITY_CHECK_URL} -w '%{http_code}' | tail -n1 | grep "200" &> /dev/null; then
9-
echo -e "${RED}Your network cannot be connected to the Internet using curl mode, please check whether your network environment is normal${RESET}"
9+
echo -e "${RED}Your network cannot be connected to the Internet using curl mode, please check whether your network environment is normal.${RESET}"
1010
echo -e "${YELLOW}Note that in some network environments, firewalls or security policies may block ICMP requests (i.e., pings). If this happens, you can use curl to detect the network connection.${RESET}"
1111
exit 1
1212
else
1313
echo -e "${GREEN}Your network can use curl to connect to the Internet and proceed to the next step...${RESET}"
1414
fi
1515
else
1616
echo -e "${GREEN}Your network can use ping to connect to the Internet and proceed to the next step...${RESET}"
17-
fi
17+
fi

script/bin/init_db.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ if [ -z "$DINKY_HOME_PARAMS" ]; then
1111
fi
1212

1313
while true; do
14-
read -e -p "Please select a database type (1.MySQL 2.PostgresSQL)" db_type
14+
read -e -p "Please select a database type (1.MySQL 2.PostgresSQL): " db_type
1515
while [ -z "$db_type" ]; do
16-
read -e -p "Please select a database type (1.MySQL 2.PostgresSQL)" db_type
16+
read -e -p "Please select a database type (1.MySQL 2.PostgresSQL): " db_type
1717
done
1818
read -e -p "Please enter the database address (hostname or IP, default localhost): " -i "localhost" db_host
1919
read -p "Please enter the database port : " db_port
@@ -39,7 +39,7 @@ while true; do
3939
1)
4040
echo -e "${YELLOW}Configuring MySQL database related information...${RESET}"
4141
config_file="${DINKY_HOME_PARAMS}/config/application-mysql.yml"
42-
echo -e "${GREEN} The automatic initialization script uses the export environment variable method to support the loading of environment variables of the data source. The configuration file is${config_file} ${RESET}"
42+
echo -e "${GREEN} The automatic initialization script uses the export environment variable method to support the loading of environment variables of the data source. The configuration file is: ${config_file} ${RESET}"
4343

4444
add_to_env "DB_ACTIVE" "mysql" "$DB_ENV_FILE"
4545
add_to_env "MYSQL_ADDR" "${db_host}:${db_port}" "$DB_ENV_FILE"
@@ -51,15 +51,15 @@ while true; do
5151
sleep 2
5252
source "$DB_ENV_FILE"
5353

54-
echo -e "${GREEN}MySQLThe configuration of database related information is completed. Please confirm whether the following configuration is correct${RESET}"
54+
echo -e "${GREEN}MySQLThe configuration of database related information is completed. Please confirm whether the following configuration is correct: ${RESET}"
5555
grep -E '^(export DB_ACTIVE|export MYSQL_ADDR|export MYSQL_DATABASE|export MYSQL_USERNAME|export MYSQL_PASSWORD)' $DB_ENV_FILE | grep -v "^#" | grep -v "^$"
5656
break
5757
;;
5858
2)
5959
echo -e "${YELLOW}Configuring PostgresSQL database related information...${RESET}"
6060
config_file="${DINKY_HOME_PARAMS}/config/application-postgresql.yml"
6161

62-
echo -e "${GREEN}The automatic initialization script uses the export environment variable method to support the loading of environment variables from the data source configuration file. The configuration file is${config_file} ${RESET}"
62+
echo -e "${GREEN}The automatic initialization script uses the export environment variable method to support the loading of environment variables from the data source configuration file. The configuration file is: ${config_file} ${RESET}"
6363

6464
add_to_env "DB_ACTIVE" "postgresql" "$DB_ENV_FILE"
6565
add_to_env "POSTGRES_ADDR" "${db_host}:${db_port}" "$DB_ENV_FILE"
@@ -69,7 +69,7 @@ while true; do
6969
sleep 2
7070
source $DB_ENV_FILE
7171

72-
echo -e "${GREEN}PostgresSQL The configuration of database related information is completed. Please confirm whether the following configuration is correct${RESET}"
72+
echo -e "${GREEN}PostgresSQL The configuration of database related information is completed. Please confirm whether the following configuration is correct: ${RESET}"
7373
grep -E '^(export DB_ACTIVE|export POSTGRES_ADDR|export POSTGRES_DB|export POSTGRES_USER|export POSTGRES_PASSWORD)' $DB_ENV_FILE | grep -v "^#" | grep -v "^$"
7474

7575
break
@@ -78,4 +78,4 @@ while true; do
7878
echo -e "${RED}The entered database type is incorrect, please select the correct database type again.${RESET}"
7979
;;
8080
esac
81-
done
81+
done

script/bin/init_env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ while true; do
2020
add_to_env "PATH" "\$DINKY_HOME/bin:\$PATH" "$ENV_FILE"
2121
sleep 2
2222
source $ENV_FILE
23-
echo -e "${GREEN}DINKY_HOME environment variable configuration completed. Please confirm whether the following configuration is correct${RESET}"
23+
echo -e "${GREEN}DINKY_HOME environment variable configuration completed. Please confirm whether the following configuration is correct: ${RESET}"
2424
grep -E '^(export DINKY_HOME)' $ENV_FILE | grep -v "^#" | grep -v "^$"
2525
break
2626
;;
@@ -36,7 +36,7 @@ while true; do
3636
add_to_env "PATH" "\$DINKY_HOME/bin:\$PATH" "$ENV_FILE"
3737
sleep 2
3838
source $ENV_FILE
39-
echo -e "${GREEN}DINKY_HOME environment variable configuration completed. Please confirm whether the following configuration is correct${RESET}"
39+
echo -e "${GREEN}DINKY_HOME environment variable configuration completed. Please confirm whether the following configuration is correct: ${RESET}"
4040
grep -E '^(export DINKY_HOME)' $ENV_FILE | grep -v "^#" | grep -v "^$"
4141
fi
4242
break
@@ -49,4 +49,4 @@ while true; do
4949
echo -e "${RED}Invalid input, please re-run the script to select the correct option.${RESET}"
5050
;;
5151
esac
52-
done
52+
done

script/bin/init_flink_dependences.sh

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DINKY_HOME=$5
88

99
echo -e "${GREEN}====================== Flink dependency initialization ======================${RESET}"
1010

11-
echo -e "${BLUE}Parameters: The current Flink version is${CURRENT_FLINK_FULL_VERSION}The scanned Flink version is${FLINK_VERSION_SCAN} The temporary directory is${DINKY_TMP_DIR} The expansion package directory is${EXTENDS_HOME} Dinky The root directory is${DINKY_HOME}${RESET}"
11+
echo -e "${BLUE}Parameters: The current Flink version is: ${CURRENT_FLINK_FULL_VERSION}, The scanned Flink version is: ${FLINK_VERSION_SCAN} , The temporary directory is: ${DINKY_TMP_DIR} , The expansion package directory is: ${EXTENDS_HOME} , Dinky The root directory is: ${DINKY_HOME}${RESET}"
1212

1313
if [ -z "$CURRENT_FLINK_FULL_VERSION" ] || [ -z "$FLINK_VERSION_SCAN" ] || [ -z "$DINKY_TMP_DIR" ] || [ -z "$EXTENDS_HOME" ] || [ -z "$DINKY_HOME" ]; then
1414
echo -e "${RED}Parameter error, please check!${RESET}"
@@ -20,7 +20,7 @@ FLINK_STORE_DIR=${DINKY_TMP_DIR}/flink-download
2020
mkdir -p ${FLINK_STORE_DIR}
2121

2222
if [ -f "${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz" ]; then
23-
echo -e "${YELLOW}${FLINK_STORE_DIR} ALREADY EXISTS flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz fileTo ensure completeness, delete first ${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz Download the file again${RESET}"
23+
echo -e "${YELLOW}${FLINK_STORE_DIR} ALREADY EXISTS flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz file, To ensure completeness, delete first ${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz Download the file again${RESET}"
2424
rm -rf ${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz
2525
if [ -d "${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}" ]; then
2626
echo -e "${YELLOW}The flink directory already exists, delete it ${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}"
@@ -36,23 +36,23 @@ try_mirrors_download_file() {
3636

3737
exec_tsinghua_result=$(download_file "$tsinghua_url" "${FLINK_STORE_DIR}")
3838
if [ ! "$exec_tsinghua_result" ]; then
39-
echo -e "${BLUE}The tsinghua address of the currently downloaded Flink installation package is${tsinghua_url}${RESET}"
39+
echo -e "${BLUE}The tsinghua address of the currently downloaded Flink installation package is: ${tsinghua_url}${RESET}"
4040
return 0
4141
else
4242
echo -e "${YELLOW}Failed to download from Tsinghua mirror, try downloading from Aliyun mirror...${RESET}"
4343
exec_aliyun_result=$(download_file "$aliyun_url" "${FLINK_STORE_DIR}")
4444
if [ "$exec_aliyun_result" ]; then
45-
echo -e "${BLUE}The aliyun address of the currently downloaded Flink installation package is${aliyun_url}${RESET}"
45+
echo -e "${BLUE}The aliyun address of the currently downloaded Flink installation package is: ${aliyun_url}${RESET}"
4646
return 0
4747
else
4848
echo -e "${YELLOW}Failed to download from Aliyun mirror too, try downloading from Apache official source...${RESET}"
4949

5050
exec_apache_result=$(download_file "$apache_url" "${FLINK_STORE_DIR}")
5151
if [ "$exec_apache_result" ]; then
52-
echo -e "${RED}Downloading from Apache official source also failed, please check the network or download manually${RESET}"
52+
echo -e "${RED}Downloading from Apache official source also failed, please check the network or download manually.${RESET}"
5353
return 1
5454
else
55-
echo -e "${BLUE}The apache address of the currently downloaded Flink installation package is${apache_url}${RESET}"
55+
echo -e "${BLUE}The apache address of the currently downloaded Flink installation package is: ${apache_url}${RESET}"
5656
return 0
5757
fi
5858
fi
@@ -64,62 +64,62 @@ if ! try_mirrors_download_file; then
6464
fi
6565

6666

67-
echo -e "${GREEN}Flink installation package download completed${RESET}"
67+
echo -e "${GREEN}Flink installation package download completed.${RESET}"
6868
echo -e "\n${GREEN}===============================================================${RESET}\n"
6969
echo -e "${GREEN}Start decompressing the Flink installation package...${RESET}"
7070
tar -zxvf ${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz -C ${FLINK_STORE_DIR}/
7171
if [ $? -eq 0 ]; then
72-
echo -e "${GREEN}Flink installation package decompression completed${RESET}"
72+
echo -e "${GREEN}Flink installation package decompression completed.${RESET}"
7373
else
74-
echo -e "${RED}Flink installation package failed to decompress, please check${RESET}"
74+
echo -e "${RED}Flink installation package failed to decompress, please check.${RESET}"
7575
exit 1
7676
fi
7777

7878
echo -e "\n${GREEN}===============================================================${RESET}\n"
7979

8080
flink_dir_tmp=$(ls -n ${FLINK_STORE_DIR} | grep '^d' | grep flink | awk '{print $9}')
8181
full_flink_dir_tmp="${FLINK_STORE_DIR}/${flink_dir_tmp}"
82-
echo -e "${BLUE}Unzipped directory name${full_flink_dir_tmp}${RESET}"
82+
echo -e "${BLUE}Unzipped directory name: ${full_flink_dir_tmp}${RESET}"
8383

8484

8585

8686
echo -e "${GREEN}Process ${full_flink_dir_tmp}/lib/flink-table-planner-loader* file...${RESET}"
8787
rm -rf ${full_flink_dir_tmp}/lib/flink-table-planner-loader*
88-
echo -e "${GREEN}Processing completed${RESET}"
88+
echo -e "${GREEN}Processing completed.${RESET}"
8989

9090
echo -e "${GREEN}Process ${full_flink_dir_tmp}/opt/flink-table-planner_2.12-*.jar file...${RESET}"
9191
mv ${full_flink_dir_tmp}/opt/flink-table-planner_2.12-*.jar ${full_flink_dir_tmp}/lib/
92-
echo -e "${GREEN}Processing completed${RESET}"
92+
echo -e "${GREEN}Processing completed.${RESET}"
9393

9494
echo -e "${GREEN}Process flink jar dependencies into dinky...${RESET}"
9595
cp -r ${full_flink_dir_tmp}/lib/*.jar ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/
96-
echo -e "${GREEN}jar dependency processing completed${RESET}"
96+
echo -e "${GREEN}jar dependency processing completed.${RESET}"
9797

9898
echo -e "${GREEN}Process flink-sql-client ...${RESET}"
9999
cp -r ${full_flink_dir_tmp}/opt/flink-sql-client-*.jar ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/
100-
echo -e "${GREEN}Processing completed${RESET}"
100+
echo -e "${GREEN}Processing completed.${RESET}"
101101

102102
echo -e "${GREEN}Process flink-cep-scala ...${RESET}"
103103
cp -r ${full_flink_dir_tmp}/opt/flink-cep-scala*.jar ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/
104-
echo -e "${GREEN}Processing completed${RESET}"
104+
echo -e "${GREEN}Processing completed.${RESET}"
105105

106106
echo -e "${GREEN}Process flink-queryable-state-runtime ...${RESET}"
107107
cp -r ${full_flink_dir_tmp}/opt/flink-queryable-state-runtime*.jar ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/
108-
echo -e "${GREEN}Processing completed${RESET}"
108+
echo -e "${GREEN}Processing completed.${RESET}"
109109

110110
echo -e "${GREEN}Process flink-state-processor-api ...${RESET}"
111111
cp -r ${full_flink_dir_tmp}/opt/flink-state-processor-api*.jar ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/
112-
echo -e "${GREEN}Processing completed${RESET}"
112+
echo -e "${GREEN}Processing completed.${RESET}"
113113

114114
echo -e "${GREEN}Process flink-s3-fs-presto ...${RESET}"
115115
cp -r ${full_flink_dir_tmp}/opt/flink-s3-fs-presto*.jar ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/
116-
echo -e "${GREEN}Processing completed${RESET}"
116+
echo -e "${GREEN}Processing completed.${RESET}"
117117

118118
echo -e "${GREEN} ================= List files in the ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/ directory ==============${RESET}"
119119
ls -l ${EXTENDS_HOME}/flink${FLINK_VERSION_SCAN}/
120120

121-
echo -e "${YELLOW}Please check the above dependent files${RESET}"
121+
echo -e "${YELLOW}Please check the above dependent files.${RESET}"
122122

123123
rm -rf ${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}*
124124

125-
echo -e "${GREEN}The basic dependency processing is completed, please perform subsequent operations according to the actual situation.${RESET}"
125+
echo -e "${GREEN}The basic dependency processing is completed, please perform subsequent operations according to the actual situation.${RESET}"

script/bin/init_jdbc_driver.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ echo -e "${GREEN}Start downloading the mysql driver package...${RESET}"
66
# Run the command to check whether the file exists
77
exec_result=$(ll "${DINKY_LIB_DIR}"/mysql-connector-j-8.4.0.jar)
88
if [ "$exec_result" ]; then
9-
echo -e "${YELLOW}The mysql driver package already exists, no need to download it again. Skip this step${RESET}"
9+
echo -e "${YELLOW}The mysql driver package already exists, no need to download it again. Skip this step.${RESET}"
1010
else
1111
download_file https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.4.0/mysql-connector-j-8.4.0.jar "${DINKY_LIB_DIR}"
12-
echo -e "${GREEN}Download is complete, please verify. The downloaded file storage address is ${DINKY_LIB_DIR}/mysql-connector-j-8.4.0.jar${RESET}"
12+
echo -e "${GREEN}Download is complete, please verify. The downloaded file storage address is: ${DINKY_LIB_DIR}/mysql-connector-j-8.4.0.jar${RESET}"
1313
if [ -f "${DINKY_LIB_DIR}/mysql-connector-j-8.4.0.jar" ]; then
14-
echo -e "${GREEN}mysql driver package downloaded successfully${RESET}"
14+
echo -e "${GREEN}mysql driver package downloaded successfully.${RESET}"
1515
else
16-
echo -e "${RED}Mysql driver package download failed, please check the network or download manually${RESET}"
16+
echo -e "${RED}Mysql driver package download failed, please check the network or download manually.${RESET}"
1717
exit 1
1818
fi
19-
echo -e "${GREEN}After the verification is completed, subsequent installation and configuration operations can be performed as needed.${RESET}"
20-
fi
19+
echo -e "${GREEN}After the verification is completed, subsequent installation and configuration operations can be performed as needed.${RESET}"
20+
fi

0 commit comments

Comments
 (0)