This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 7ea373d41 Chinese Notes to English Notes (#1690)
7ea373d41 is described below
commit 7ea373d411882d88fd3778d8e1820122867c3ad7
Author: ChunFu Wu <[email protected]>
AuthorDate: Mon Sep 26 07:14:26 2022 +0800
Chinese Notes to English Notes (#1690)
---
.../base/handler/GlobalExceptionHandler.java | 5 ++--
.../streampark/console/base/util/CommonUtils.java | 2 +-
.../core/service/impl/ProjectServiceImpl.java | 8 +++---
.../console/system/authentication/ShiroRealm.java | 22 ++++++++--------
.../system/service/impl/MenuServiceImpl.java | 8 +++---
.../src/main/resources/db/data-h2.sql | 30 +++++++++++-----------
.../src/main/resources/flink-application.conf | 22 ++++++++--------
7 files changed, 48 insertions(+), 49 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java
index c7593d992..699c27ab2 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java
@@ -77,8 +77,7 @@ public class GlobalExceptionHandler {
}
/**
- * 统一处理请求参数校验(实体对象传参)
- * Unified processing of request parameter verification
+ * Unified processing of request parameter verification (entity object
parameter transfer)
*
* @param e BindException
* @return RestResponse
@@ -96,7 +95,7 @@ public class GlobalExceptionHandler {
}
/**
- * 统一处理请求参数校验(普通传参)
+ * Unified processing of request parameter verification (ordinary
parameter transfer)
*
* @param e ConstraintViolationException
* @return RestResponse
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
index ac34de426..593fc9415 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
@@ -430,7 +430,7 @@ public final class CommonUtils implements Serializable {
}
/**
- * linux内核平台 1 window： 2 其他平台 0
+ * linux kernel platform 1 window: 2 other platforms 0
*/
public static int getPlatform() {
int platform = 0;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index e695c14cb..402242f33 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -102,12 +102,12 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
project.setCreateTime(new Date());
boolean status = save(project);
if (status) {
- return response.message("添加项目成功").data(true);
+ return response.message("Add project successfully").data(true);
} else {
- return response.message("添加项目失败").data(false);
+ return response.message("Add project failed").data(false);
}
} else {
- return response.message("该名称的项目已存在,添加任务失败").data(false);
+ return response.message("A project with this name already exists,
adding a task failed").data(false);
}
}
@@ -129,7 +129,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
project.setBuildState(projectParam.getBuildState());
if
(BuildState.of(projectParam.getBuildState()).equals(BuildState.NEED_REBUILD)) {
List<Application> applications = getApplications(project);
- // 更新部署状态
+ // Update deployment status
FlinkTrackingTask.refreshTracking(() ->
applications.forEach((app) -> {
log.info("update deploy by project: {}, appName:{}",
project.getName(), app.getJobName());
app.setLaunch(LaunchState.NEED_CHECK.get());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
index 8e63f156b..3260de0af 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
@@ -58,10 +58,10 @@ public class ShiroRealm extends AuthorizingRealm {
}
/**
- * ` 授权模块，获取用户角色和权限
+ * Authorization module to get user roles and permissions
*
* @param token token
- * @return AuthorizationInfo 权限信息
+ * @return AuthorizationInfo permission information
*/
@Override
protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection
token) {
@@ -69,32 +69,32 @@ public class ShiroRealm extends AuthorizingRealm {
SimpleAuthorizationInfo simpleAuthorizationInfo = new
SimpleAuthorizationInfo();
- // 获取用户角色集
+ // Get user role set
Set<String> roleSet = roleService.getUserRoleName(username);
simpleAuthorizationInfo.setRoles(roleSet);
- // 获取用户权限集
+ // Get user permission set
Set<String> permissionSet = userService.getPermissions(username);
simpleAuthorizationInfo.setStringPermissions(permissionSet);
return simpleAuthorizationInfo;
}
/**
- * 用户认证
+ * User Authentication
*
- * @param authenticationToken 身份认证 token
- * @return AuthenticationInfo 身份认证信息
- * @throws AuthenticationException 认证相关异常
+ * @param authenticationToken authentication token
+ * @return AuthenticationInfo authentication information
+ * @throws AuthenticationException authentication related exceptions
*/
@Override
protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken
authenticationToken) throws AuthenticationException {
- // 这里的 token是从 JWTFilter 的 executeLogin 方法传递过来的，已经经过了解密
+ // The token here is passed from the executeLogin method of JWTFilter
and has been decrypted
String token = (String) authenticationToken.getCredentials();
String username = JWTUtil.getUsername(token);
if (StringUtils.isBlank(username)) {
throw new AuthenticationException("Token verification failed");
}
- // 通过用户名查询用户信息
+ // Query user information by user name
User user = userService.findByName(username);
if (user == null) {
@@ -102,7 +102,7 @@ public class ShiroRealm extends AuthorizingRealm {
}
if (!JWTUtil.verify(token, username, user.getPassword())) {
- //校验是否属于api的token，权限是否有效
+ // Check whether the token belongs to the api and whether the
permission is valid
String tokenDb = WebUtils.encryptToken(token);
boolean effective =
accessTokenService.checkTokenEffective(user.getUserId(), tokenDb);
if (!effective) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
index 4c616d65c..93eb814c4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -77,7 +77,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper,
Menu> implements Me
}
result.put("total", menus.size());
} catch (NumberFormatException e) {
- log.info("查询菜单失败", e);
+ log.info("Failed to query menu", e);
result.put("rows", null);
result.put("total", 0);
}
@@ -112,9 +112,9 @@ public class MenuServiceImpl extends
ServiceImpl<MenuMapper, Menu> implements Me
@Transactional(rollbackFor = Exception.class)
public void deleteMenus(String[] menuIds) throws Exception {
for (String menuId : menuIds) {
- // 查找与这些菜单/按钮关联的用户
+ // Find users associated with these menus/buttons
this.baseMapper.deleteRoleMenuByMenuId(Long.parseLong(menuId));
- // 递归删除这些菜单/按钮
+ // Recursively delete these menus/buttons
this.baseMapper.deleteById(menuId);
}
}
@@ -122,7 +122,7 @@ public class MenuServiceImpl extends
ServiceImpl<MenuMapper, Menu> implements Me
@Override
public ArrayList<VueRouter<Menu>> getUserRouters(User user) {
List<VueRouter<Menu>> routes = new ArrayList<>();
- // 查询type为菜单类型
+ // The query type is the menu type
List<Menu> menus = this.findUserMenus(user.getUsername());
menus.forEach(menu -> {
VueRouter<Menu> route = new VueRouter<>();
diff --git
a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
index 54a1663b8..d7b97480d 100644
---
a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
+++
b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
@@ -160,21 +160,21 @@ insert into `t_role_menu` values (100062, 100000, 100043);
-- ----------------------------
-- Records of t_setting
-- ----------------------------
-insert into `t_setting` values (1, 'streampark.maven.settings', null, 'Maven
Settings File Path', 'Maven Settings.xml 完整路径', 1);
-insert into `t_setting` values (2, 'streampark.maven.central.repository',
null, 'Maven Central Repository', 'Maven 私服地址', 1);
-insert into `t_setting` values (3, 'streampark.maven.auth.user', null, 'Maven
Central Repository Auth User', 'Maven 私服认证用户名', 1);
-insert into `t_setting` values (4, 'streampark.maven.auth.password', null,
'Maven Central Repository Auth Password', 'Maven 私服认证密码', 1);
-insert into `t_setting` values (5, 'streampark.console.webapp.address', null,
'StreamPark Webapp address', 'StreamPark Console Web 应用程序HTTP URL', 1);
-insert into `t_setting` values (6, 'alert.email.host', null, 'Alert Email Smtp
Host', '告警邮箱Smtp Host', 1);
-insert into `t_setting` values (7, 'alert.email.port', null, 'Alert Email Smtp
Port', '告警邮箱的Smtp Port', 1);
-insert into `t_setting` values (8, 'alert.email.from', null, 'Alert Email
From', '发送告警的邮箱', 1);
-insert into `t_setting` values (9, 'alert.email.userName', null, 'Alert Email
User', '用来发送告警邮箱的认证用户名', 1);
-insert into `t_setting` values (10, 'alert.email.password', null, 'Alert Email
Password', '用来发送告警邮箱的认证密码', 1);
-insert into `t_setting` values (11, 'alert.email.ssl', 'false', 'Alert Email
Is SSL', '发送告警的邮箱是否开启SSL', 2);
-insert into `t_setting` values (12, 'docker.register.address', null, 'Docker
Register Address', 'Docker容器服务地址', 1);
-insert into `t_setting` values (13, 'docker.register.user', null, 'Docker
Register User', 'Docker容器服务认证用户名', 1);
-insert into `t_setting` values (14, 'docker.register.password', null, 'Docker
Register Password', 'Docker容器服务认证密码', 1);
-insert into `t_setting` values (15, 'docker.register.namespace', null,
'Namespace for docker image used in docker building env and target image
register', 'Docker命名空间', 1);
+insert into `t_setting` values (1, 'streampark.maven.settings', null, 'Maven
Settings File Path', 'Maven Settings.xml full path', 1);
+insert into `t_setting` values (2, 'streampark.maven.central.repository',
null, 'Maven Central Repository', 'Maven private server address', 1);
+insert into `t_setting` values (3, 'streampark.maven.auth.user', null, 'Maven
Central Repository Auth User', 'Maven private server authentication username',
1);
+insert into `t_setting` values (4, 'streampark.maven.auth.password', null,
'Maven Central Repository Auth Password', 'Maven private server authentication
password', 1);
+insert into `t_setting` values (5, 'streampark.console.webapp.address', null,
'StreamPark Webapp address', 'StreamPark Console Web Application HTTP URL', 1);
+insert into `t_setting` values (6, 'alert.email.host', null, 'Alert Email Smtp
Host', 'Alert Mailbox Smtp Host', 1);
+insert into `t_setting` values (7, 'alert.email.port', null, 'Alert Email Smtp
Port', 'Smtp Port of the alarm mailbox', 1);
+insert into `t_setting` values (8, 'alert.email.from', null, 'Alert Email
From', 'Email to send alerts', 1);
+insert into `t_setting` values (9, 'alert.email.userName', null, 'Alert Email
User', 'Authentication username used to send alert emails', 1);
+insert into `t_setting` values (10, 'alert.email.password', null, 'Alert Email
Password', 'Authentication password used to send alarm email', 1);
+insert into `t_setting` values (11, 'alert.email.ssl', 'false', 'Alert Email
Is SSL', 'Whether to enable SSL in the mailbox that sends the alert', 2);
+insert into `t_setting` values (12, 'docker.register.address', null, 'Docker
Register Address', 'Docker container service address', 1);
+insert into `t_setting` values (13, 'docker.register.user', null, 'Docker
Register User', 'Docker container service authentication username', 1);
+insert into `t_setting` values (14, 'docker.register.password', null, 'Docker
Register Password', 'Docker container service authentication password', 1);
+insert into `t_setting` values (15, 'docker.register.namespace', null,
'Namespace for docker image used in docker building env and target image
register', 'Docker namespace', 1);
-- ----------------------------
-- Records of t_user
diff --git
a/streampark-console/streampark-console-service/src/main/resources/flink-application.conf
b/streampark-console/streampark-console-service/src/main/resources/flink-application.conf
index 3b90eb423..46e64d151 100644
---
a/streampark-console/streampark-console-service/src/main/resources/flink-application.conf
+++
b/streampark-console/streampark-console-service/src/main/resources/flink-application.conf
@@ -50,24 +50,24 @@ flink:
unaligned: true
watermark:
interval: 10000
- # 状态后端
+ # state backend
state:
- # 注意flink1.12和之后的配置有所不同,要合理选择组合配置
+ # Note that the configurations of flink1.12 and later are different, and
the combined configuration should be selected reasonably
backend: # see
https://ci.apache.org/projects/flink/flink-docs-release-1.12/ops/state/state_backends.html
- value: filesystem # 特别注意: flink1.12可选配置 ('jobmanager', 'filesystem',
'rocksdb'), flink1.12+ 可选配置('hashmap', 'rocksdb'),
- memory: 5242880 # 针对jobmanager有效,最大内存
- async: false # 针对(jobmanager,filesystem)有效,是否开启异步
- incremental: true #针对rocksdb有效,是否开启增量
- #rocksdb 的配置参考
https://ci.apache.org/projects/flink/flink-docs-release-1.12/deployment/config.html#rocksdb-state-backend
- #rocksdb配置key的前缀去掉:state.backend
+ value: filesystem # Special note: flink1.12 optional configuration
('jobmanager', 'filesystem', 'rocksdb'), flink1.12+ optional configuration
('hashmap', 'rocksdb'),
+ memory: 5242880 # Effective for jobmanager, maximum memory
+ async: false # Valid for (jobmanager, filesystem), whether to enable
asynchronous
+ incremental: true # Valid for rocksdb, whether to enable incremental
+ # Configuration reference of rocksdb
https://ci.apache.org/projects/flink/flink-docs-release-1.12/deployment/config.html#rocksdb-state-backend
+ # Remove the prefix of rocksdb configuration key: state.backend
#rocksdb.block.blocksize:
- checkpoint-storage: filesystem #特别注意:该参数只在flink 1.12+
有效,且state.backend.value为hashmap才生效, 可选项:(jobmanager | filesystem)
+ checkpoint-storage: filesystem # Special note: This parameter is only
valid in flink 1.12+, and the state.backend.value is hashmap, optional:
(jobmanager | filesystem)
checkpoints.dir: file:///tmp/chkdir
savepoints.dir: file:///tmp/chkdir
checkpoints.num-retained: 1
- # 重启策略
+ # restart strategy
restart-strategy:
- value: fixed-delay #重启策略[(fixed-delay|failure-rate|none)共3个可配置的策略]
+ value: fixed-delay # Restart strategy [(fixed-delay|failure-rate|none) a
total of 3 configurable strategies]
fixed-delay:
attempts: 3
delay: 5000
