From d44bbddbcb0b83a679c094b37432718cfe8f75ac Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 8 Jun 2021 14:52:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=80=90UI=E3=80=91=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/ExtractDataService.java | 46 ++++++++++--------- frontend/src/lang/en.js | 18 ++++---- frontend/src/lang/tw.js | 34 +++++++------- frontend/src/lang/zh.js | 38 +++++++-------- 4 files changed, 70 insertions(+), 66 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 228bc27373..cf9ef8b2bd 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -27,6 +27,9 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -34,6 +37,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.pentaho.di.cluster.SlaveServer; import org.pentaho.di.core.database.DatabaseMeta; import org.pentaho.di.core.row.ValueMetaInterface; +import org.pentaho.di.core.util.HttpClientManager; import org.pentaho.di.job.Job; import org.pentaho.di.job.JobExecutionConfiguration; import org.pentaho.di.job.JobHopMeta; @@ -66,6 +70,7 @@ import javax.annotation.Resource; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.net.InetAddress; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -707,27 +712,26 @@ public class ExtractDataService { } public boolean isKettleRunning() { - return true; -// try { -// if (!InetAddress.getByName(carte).isReachable(1000)) { -// return false; -// } -// HttpClient httpClient; -// HttpGet getMethod = new HttpGet("http://" + carte + ":" + port); -// HttpClientManager.HttpClientBuilderFacade clientBuilder = HttpClientManager.getInstance().createBuilder(); -// clientBuilder.setConnectionTimeout(1); -// clientBuilder.setCredentials(user, passwd); -// httpClient = clientBuilder.build(); -// HttpResponse httpResponse = httpClient.execute(getMethod); -// int statusCode = httpResponse.getStatusLine().getStatusCode(); -// if (statusCode != -1 && statusCode < 400) { -// return true; -// } else { -// return false; -// } -// } catch (Exception e) { -// return false; -// } + try { + if (!InetAddress.getByName(carte).isReachable(1000)) { + return false; + } + HttpClient httpClient; + HttpGet getMethod = new HttpGet("http://" + carte + ":" + port); + HttpClientManager.HttpClientBuilderFacade clientBuilder = HttpClientManager.getInstance().createBuilder(); + clientBuilder.setConnectionTimeout(1); + clientBuilder.setCredentials(user, passwd); + httpClient = clientBuilder.build(); + HttpResponse httpResponse = httpClient.execute(getMethod); + int statusCode = httpResponse.getStatusLine().getStatusCode(); + if (statusCode != -1 && statusCode < 400) { + return true; + } else { + return false; + } + } catch (Exception e) { + return false; + } } private static String alterColumnTypeCode = " if(\"FILED\".equalsIgnoreCase(filed)){\n" + diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 6ca12bd0d0..6de6261846 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -455,7 +455,7 @@ export default { admin: 'Administrator', org_admin: 'Organization Administrator', org_member: 'Organization Member', - add: 'Add Role', + add: 'Create Role', delete: 'Delete Role', modify: 'Modify Role', tips: 'Tips', @@ -532,15 +532,15 @@ export default { cancel: 'Cancel', search: 'Search', back: 'Back', - add_table: 'Add Table', + add_table: 'Add Dataset', process: 'Speed of progress', add_chart: 'Add Chart', - db_data: 'Database Table', + db_data: 'Database Dataset', sql_data: 'SQL data set', excel_data: 'Excel data set', custom_data: 'Custom data set', pls_slc_tbl_left: 'Please select the chart from the left', - add_db_table: 'Add database table', + add_db_table: 'Add Database Dataset', pls_slc_data_source: 'Please select data source', table: 'Table', edit: 'Edit', @@ -737,12 +737,12 @@ export default { add_table: 'Add Table', process: 'Speed of progress', update: 'update', - db_data: 'Database Table', + db_data: 'Database Dataset', sql_data: 'SQL data set', excel_data: 'Excel data set', custom_data: 'Custom data set', pls_slc_tbl_left: 'Please select the chart from the left', - add_db_table: 'Add database table', + add_db_table: 'Add Database Dataset', pls_slc_data_source: 'Please select data source', table: 'Table', edit: 'Edit', @@ -785,7 +785,7 @@ export default { close: 'Close', required: 'Required', input_content: 'Please input the content', - add_sql_table: 'Add SQL', + add_sql_table: 'Add SQL Dataset', preview: 'Preview', pls_input_name: 'Please enter a name', connect_mode: 'Connection Mode', @@ -795,7 +795,7 @@ export default { last_update_time: 'Last update time', current_update_time: 'Current update time', param: 'Parameter', - edit_sql: 'Edit SQL', + edit_sql: 'Edit SQL Dataset', showRow: 'Display line', add_excel_table: 'Add excel dataset', add_custom_table: 'Add self help dataset', @@ -844,7 +844,7 @@ export default { data_base: 'Database name', user_name: 'User Name', password: 'Password', - host: 'Host', + host: 'Host name / IP address', port: 'Port', please_input_data_base: 'Please enter the database name', please_input_user_name: 'Please enter user name', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 755f7438db..bda209374a 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -425,7 +425,7 @@ export default { no_such_user: '无此用戶信息, 請輸入正确的用戶 ID 或者 用戶郵箱！' }, user: { - create: '創建用戶', + create: '新建用戶', modify: '修改用戶', input_name: '請輸入用戶姓名', input_id: '請輸入ID', @@ -455,7 +455,7 @@ export default { admin: '系統管理員', org_admin: '組織管理员', org_member: '組織成員', - add: '添加角色', + add: '新建角色', delete: '删除角色', modify: '修改角色', tips: '提示', @@ -489,7 +489,7 @@ export default { sort: '組織排序', sub_organizations: '下屬組織數', create_time: '創建日期', - create: '創建組織', + create: '新建組織', modify: '修改組織', delete: '删除組織', delete_confirm: '删除該組織會關聯刪除該組織的下屬組織，確定要删除吗?', @@ -532,13 +532,13 @@ export default { cancel: '取消', search: '搜索', back: '返回', - add_table: '添加表', + add_table: '添加數據集', process: '進度', add_chart: '添加視圖', - db_data: '數據庫表', + db_data: '數據庫數據集', sql_data: 'SQL數據集', excel_data: 'Excel數據集', - custom_data: '自助數據集', + custom_data: '自定義數據集', pls_slc_tbl_left: '請從左側選擇視圖', add_db_table: '添加數據庫表', pls_slc_data_source: '請選擇數據源', @@ -734,15 +734,15 @@ export default { cancel: '取消', search: '搜索', back: '返回', - add_table: '添加表', + add_table: '添加數據集', process: '進度', update: '更新', - db_data: '數據庫表', - sql_data: 'SQL數據集', - excel_data: 'Excel數據集', - custom_data: '自助數據集', + db_data: '數據庫數據集', + sql_data: 'SQL 數據集', + excel_data: 'Excel 數據集', + custom_data: '自定義數據集', pls_slc_tbl_left: '請從左側選擇表', - add_db_table: '添加數據庫表', + add_db_table: '添加數據庫數據集', pls_slc_data_source: '請選擇數據源', table: '表', edit: '編輯', @@ -785,7 +785,7 @@ export default { close: '關閉', required: '必填', input_content: '請輸入內容', - add_sql_table: '添加 SQL', + add_sql_table: '添加 SQL 數據集', preview: '預覽', pls_input_name: '請輸入名稱', connect_mode: '鏈接模式', @@ -795,10 +795,10 @@ export default { last_update_time: '上次更新時間', current_update_time: '當前更新時間', param: '參數', - edit_sql: '編輯 SQL', + edit_sql: '編輯 SQL 數據集', showRow: '顯示行', - add_excel_table: ' 添加Excel數據集', - add_custom_table: '添加自助數據集', + add_excel_table: ' 添加 Excel 數據集', + add_custom_table: '添加自定義數據集', upload_file: '上傳文件', detail: '詳情', type: '類型', @@ -844,7 +844,7 @@ export default { data_base: '數據庫名稱', user_name: '用戶名', password: '密碼', - host: '主機', + host: '主機名/IP地址', port: '端口', please_input_data_base: '請輸入數據庫名稱', please_input_user_name: '請輸入用戶名', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 977e1530bb..47d6e30a7d 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -425,7 +425,7 @@ export default { no_such_user: '无此用户信息, 请输入正确的用户 ID 或者 用户邮箱！' }, user: { - create: '创建用户', + create: '新建用户', modify: '修改用户', input_name: '请输入用户姓名', input_id: '请输入ID', @@ -455,7 +455,7 @@ export default { admin: '系统管理员', org_admin: '组织管理员', org_member: '组织成员', - add: '添加角色', + add: '新建角色', delete: '删除角色', modify: '修改角色', tips: '提示', @@ -489,7 +489,7 @@ export default { sort: '组织排序', sub_organizations: '下属组织数', create_time: '创建日期', - create: '创建组织', + create: '新建组织', modify: '修改组织', delete: '删除组织', delete_confirm: '删除该组织会关联删除该组织的下属组织，确定要删除吗?', @@ -532,15 +532,15 @@ export default { cancel: '取消', search: '搜索', back: '返回', - add_table: '添加表', + add_table: '添加数据集', process: '进度', add_chart: '添加视图', - db_data: '数据库表', + db_data: '数据库数据集', sql_data: 'SQL数据集', excel_data: 'Excel数据集', - custom_data: '自助数据集', + custom_data: '自定义数据集', pls_slc_tbl_left: '请从左侧选视图', - add_db_table: '添加数据库表', + add_db_table: '添加数据库数据集', pls_slc_data_source: '请选择数据源', table: '表', edit: '编辑', @@ -718,7 +718,7 @@ export default { chart_error_tips: '如有疑问请联系管理员' }, dataset: { - sheet_warn: '有多个Sheet页，默认抽取第一个', + sheet_warn: '有多个 Sheet 页，默认抽取第一个', datalist: '数据集', add_group: '添加分组', add_scene: '添加场景', @@ -734,15 +734,15 @@ export default { cancel: '取消', search: '搜索', back: '返回', - add_table: '添加表', + add_table: '添加数据集', process: '进度', update: '更新', - db_data: '数据库表', - sql_data: 'SQL数据集', - excel_data: 'Excel数据集', - custom_data: '自助数据集', + db_data: '数据库数据集', + sql_data: 'SQL 数据集', + excel_data: 'Excel 数据集', + custom_data: '自定义数据集', pls_slc_tbl_left: '请从左侧选择表', - add_db_table: '添加数据库表', + add_db_table: '添加数据库数据集', pls_slc_data_source: '请选择数据源', table: '表', edit: '编辑', @@ -785,7 +785,7 @@ export default { close: '关闭', required: '必填', input_content: '请输入内容', - add_sql_table: '添加SQL', + add_sql_table: '添加 SQL 数据集', preview: '预览', pls_input_name: '请输入名称', connect_mode: '连接模式', @@ -795,10 +795,10 @@ export default { last_update_time: '上次更新时间', current_update_time: '当前更新时间', param: '参数', - edit_sql: '编辑SQL', + edit_sql: '编辑 SQL 数据集', showRow: '显示行', add_excel_table: '添加Excel数据集', - add_custom_table: '添加自助数据集', + add_custom_table: '添加自定义数据集', upload_file: '上传文件', detail: '详情', type: '类型', @@ -825,7 +825,7 @@ export default { check_all: '全选', can_not_union_self: '被关联表不能与关联表相同', float: '小数', - edit_custom_table: '编辑自助数据集', + edit_custom_table: '编辑自定义数据集', edit_field: '编辑字段', preview_100_data: '显示前100行数据', invalid_table_check: '非直连数据集请先完成数据同步', @@ -844,7 +844,7 @@ export default { data_base: '数据库名称', user_name: '用户名', password: '密码', - host: '主机', + host: '主机名/IP地址', port: '端口', please_input_data_base: '请输入数据库名称', please_input_user_name: '请输入用户名',