This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch sync
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/sync by this push:
new eadf38377 [Improve] token FE page improvement
eadf38377 is described below
commit eadf38377f182299cd8540b8465afdd8549c3dc1
Author: benjobs <[email protected]>
AuthorDate: Fri May 31 23:54:32 2024 +0800
[Improve] token FE page improvement
---
.../streampark/console/core/service/AccessTokenServiceTest.java | 2 +-
.../streampark-console-webapp/src/api/system/model/tokenModel.ts | 2 --
.../streampark-console-webapp/src/locales/lang/en/system/token.ts | 1 -
.../src/locales/lang/zh-CN/system/token.ts | 1 -
.../streampark-console-webapp/src/views/system/token/token.data.ts | 5 -----
.../main/scala/org/apache/streampark/flink/client/FlinkClient.scala | 6 +++---
.../{FlinkClientEndpoint.scala => FlinkClientEntrypoint.scala} | 2 +-
7 files changed, 5 insertions(+), 14 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
index 735cb1c23..3793de6ef 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
@@ -43,7 +43,7 @@ public class AccessTokenServiceTest extends
SpringUnitTestBase {
void testCrudToken() throws Exception {
Long mockUserId = 100000L;
String expireTime = "9999-01-01 00:00:00";
- RestResponse restResponse = accessTokenService.generateToken(mockUserId,
expireTime, "");
+ RestResponse restResponse = accessTokenService.create(mockUserId, "");
Assertions.assertNotNull(restResponse);
Assertions.assertInstanceOf(AccessToken.class,
restResponse.get(RestResponse.DATA_KEY));
diff --git
a/streampark-console/streampark-console-webapp/src/api/system/model/tokenModel.ts
b/streampark-console/streampark-console-webapp/src/api/system/model/tokenModel.ts
index 6997d8e30..7805e6592 100644
---
a/streampark-console/streampark-console-webapp/src/api/system/model/tokenModel.ts
+++
b/streampark-console/streampark-console-webapp/src/api/system/model/tokenModel.ts
@@ -20,7 +20,6 @@ export interface TokenListRecord {
userId: string;
token: string;
status: number;
- expireTime: string;
description: string;
createTime: string;
modifyTime: string;
@@ -32,6 +31,5 @@ export interface TokenListRecord {
export interface TokenCreateParam {
userId: number;
description: string;
- expireTime: string;
teamId: string;
}
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts
index 175de6a58..9cff6b27f 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts
@@ -24,7 +24,6 @@ export default {
title: 'Token List',
userName: 'User Name',
token: 'Token',
- expireTime: 'Expire Time',
status: 'Status',
},
operation: {
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts
index 863711168..8e332a64d 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts
@@ -24,7 +24,6 @@ export default {
title: 'Token 列表',
userName: '用户名',
token: 'Token',
- expireTime: '过期时间',
status: '状态',
},
operation: {
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts
b/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts
index a75719dce..125546b93 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts
@@ -51,11 +51,6 @@ export const columns: BasicColumn[] = [
title: t('common.createTime'),
dataIndex: 'createTime',
},
- {
- title: t('system.token.table.expireTime'),
- dataIndex: 'expireTime',
- sorter: true,
- },
{
title: t('system.token.table.status'),
dataIndex: 'userStatus',
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala
index 7bc69db05..8f32085d5 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala
@@ -29,8 +29,8 @@ import scala.reflect.ClassTag
object FlinkClient extends Logger {
- private[this] val FLINK_CLIENT_ENDPOINT_CLASS =
- "org.apache.streampark.flink.client.FlinkClientEndpoint"
+ private[this] val FLINK_CLIENT_ENTRYPOINT_CLASS =
+ "org.apache.streampark.flink.client.FlinkClientEntrypoint"
private[this] val SUBMIT_REQUEST =
"org.apache.streampark.flink.client.bean.SubmitRequest" -> "submit"
@@ -81,7 +81,7 @@ object FlinkClient extends Logger {
FlinkShimsProxy.proxy(
flinkVersion,
(classLoader: ClassLoader) => {
- val submitClass = classLoader.loadClass(FLINK_CLIENT_ENDPOINT_CLASS)
+ val submitClass = classLoader.loadClass(FLINK_CLIENT_ENTRYPOINT_CLASS)
val requestClass = classLoader.loadClass(requestBody._1)
val method = submitClass.getDeclaredMethod(requestBody._2,
requestClass)
method.setAccessible(true)
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEndpoint.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEntrypoint.scala
similarity index 99%
rename from
streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEndpoint.scala
rename to
streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEntrypoint.scala
index 609d5cf66..eea26d4f4 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEndpoint.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEntrypoint.scala
@@ -24,7 +24,7 @@ import
org.apache.streampark.flink.client.`trait`.FlinkClientTrait
import org.apache.streampark.flink.client.bean._
import org.apache.streampark.flink.client.impl._
-object FlinkClientEndpoint {
+object FlinkClientEntrypoint {
private[this] val clients: Map[FlinkExecutionMode, FlinkClientTrait] = Map(
LOCAL -> LocalClient,
