[Improve] Front-end module code optimization, typo fixed (#2265)
* remove teamid parameter
* typo fixed
* checkstyle fixed
* remove maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index bf82ff0..0000000
--- a/.mvn/wrapper/maven-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/streampark-console/streampark-console-webapp/public/resource/fonts/devanagari-3.woff2 b/streampark-console/streampark-console-webapp/public/resource/fonts/devanagari-3.woff2
index 742e144..a5a873e 100644
--- a/streampark-console/streampark-console-webapp/public/resource/fonts/devanagari-3.woff2
+++ b/streampark-console/streampark-console-webapp/public/resource/fonts/devanagari-3.woff2
Binary files differ
diff --git a/streampark-console/streampark-console-webapp/src/api/system/member.ts b/streampark-console/streampark-console-webapp/src/api/system/member.ts
index a630094..9cb2dd7 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/member.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/member.ts
@@ -19,7 +19,7 @@
import { Result } from '/#/axios';
import { AxiosResponse } from 'axios';
import { AddMemberParams, MemberListRecord, UpdateMemberParams } from './model/memberModel';
-import { UserListItem } from "/@/api/base/model/systemModel";
+import { UserListItem } from '/@/api/base/model/systemModel';
enum MEMBER_API {
POST = '/member/post',
@@ -36,7 +36,9 @@
* @param params
* @returns
*/
-export function fetchCandidateUsers(params?: { teamId: string | number }): Promise<Array<UserListItem>> {
+export function fetchCandidateUsers(params?: {
+ teamId: string | number;
+}): Promise<Array<UserListItem>> {
return defHttp.post({ url: MEMBER_API.CANDIDATE_USERS, params });
}
@@ -51,7 +53,6 @@
/**
* add member
- * @param {String} teamId organization id
* @param {String} userName username
* @param {Number} roleId role id
* @returns {Promise<boolean>}
diff --git a/streampark-console/streampark-console-webapp/src/api/system/model/memberModel.ts b/streampark-console/streampark-console-webapp/src/api/system/model/memberModel.ts
index 9ec7831..19a762d 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/model/memberModel.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/model/memberModel.ts
@@ -29,16 +29,10 @@
createTimeTo?: string;
}
export interface AddMemberParams {
- teamId: string;
userName: string;
roleId: number;
}
-export interface TeamMemberResp {
- id: string;
- teamName: string;
-}
-
export interface UpdateMemberParams extends AddMemberParams {
id: string;
userId: string;
diff --git a/streampark-console/streampark-console-webapp/src/api/system/model/notifyModel.ts b/streampark-console/streampark-console-webapp/src/api/system/model/notifyModel.ts
index e146371..58688ab 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/model/notifyModel.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/model/notifyModel.ts
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-export interface NoticyList {
- records: NoticyItem[];
+export interface NotifyList {
+ records: NotifyItem[];
total: string;
}
-export interface NoticyItem {
+export interface NotifyItem {
id: string;
appId: string;
userId: string;
diff --git a/streampark-console/streampark-console-webapp/src/api/system/notify.ts b/streampark-console/streampark-console-webapp/src/api/system/notify.ts
index e4b1f55..3b98338 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/notify.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/notify.ts
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { NoticyList } from './model/notifyModel';
+import { NotifyList } from './model/notifyModel';
import { defHttp } from '/@/utils/http/axios';
interface NotifyParam {
@@ -32,18 +32,18 @@
/**
* Get notification list
* @param {NotifyParam} data
- * @returns {Promise<NoticyList>}
+ * @returns {Promise<NotifyList>}
*/
-export function fetchNotify(data: NotifyParam): Promise<NoticyList> {
+export function fetchNotify(data: NotifyParam): Promise<NotifyList> {
return defHttp.post({ url: NOTIFY_API.NOTICE, data });
}
/**
* delete notification
* @param {number} id notification id,
- * @returns {Promise<NoticyList>}
+ * @returns {Promise<NotifyList>}
*/
-export function fetchNotifyDelete(id: string): Promise<NoticyList> {
+export function fetchNotifyDelete(id: string): Promise<NotifyList> {
return defHttp.post({
url: NOTIFY_API.DEL,
data: { id },
diff --git a/streampark-console/streampark-console-webapp/src/api/system/role.ts b/streampark-console/streampark-console-webapp/src/api/system/role.ts
index dd54177..a361e9d 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/role.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/role.ts
@@ -18,16 +18,12 @@
import { RoleParam } from './model/roleModel';
enum Api {
- RoleUserList = '/role/listByUser',
AddRole = '/role/post',
UpdateRole = '/role/update',
DeleteRole = '/role/delete',
CHECK_NAME = '/role/check/name',
}
-export function getRoleListByUser(params?) {
- return defHttp.post({ url: Api.RoleUserList, params });
-}
/**
*
* @param {RoleParam} data role param
@@ -56,8 +52,8 @@
}
/**
* Check if the role name exists
- * @param params
* @returns {Promise<boolean>}
+ * @param data
*/
export function fetchCheckName(data: { roleName: string }): Promise<boolean> {
return defHttp.post({ url: Api.CHECK_NAME, data });
diff --git a/streampark-console/streampark-console-webapp/src/api/system/team.ts b/streampark-console/streampark-console-webapp/src/api/system/team.ts
index f7b859e..b43b3fb 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/team.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/team.ts
@@ -21,18 +21,12 @@
import { TeamListRecord, TeamParam } from './model/teamModel';
enum Api {
- TeamListByUser = '/team/listByUser',
POST = '/team/post',
UPDATE = '/team/update',
LIST = '/team/list',
- CHECK_NAME = '/team/check/name',
DELETE = '/team/delete',
}
-export function getTeamListByUser(params?) {
- return defHttp.post({ url: Api.TeamListByUser, params });
-}
-
/**
* get team list
* @param {BasicTableParams} data
@@ -60,8 +54,8 @@
}
/**
* delete organization
- * @param {String} id organization id
* @returns {Promise<AxiosResponse<Result>>}
+ * @param params
*/
export function fetchTeamDelete(params: { id: string }): Promise<AxiosResponse<Result>> {
return defHttp.delete(
diff --git a/streampark-console/streampark-console-webapp/src/api/system/token.ts b/streampark-console/streampark-console-webapp/src/api/system/token.ts
index 9f8f128..a94fc96 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/token.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/token.ts
@@ -45,8 +45,8 @@
/**
* change token status
- * @param {String} tokenId
* @returns {Promise<boolean>}
+ * @param data
*/
export function fetTokenStatusToggle(data: { tokenId: string }) {
return defHttp.post<boolean>({ url: Api.ToggleTokenStatus, data });
@@ -54,8 +54,8 @@
/**
* delete token
- * @param {string} tokenId
* @returns {Promise<boolean>}
+ * @param data
*/
export function fetchTokenDelete(data?: { tokenId: string }) {
return defHttp.delete<boolean>({ url: Api.DeleteToken, data });
diff --git a/streampark-console/streampark-console-webapp/src/api/system/user.ts b/streampark-console/streampark-console-webapp/src/api/system/user.ts
index 2d6e3bc..032425c 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/user.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/user.ts
@@ -34,7 +34,6 @@
Logout = '/passport/signout',
GetUserInfo = '/getUserInfo',
GetPermCode = '/getPermCode',
- TestRetry = '/testRetry',
UserList = '/user/list',
NoTokenUsers = '/user/getNoTokenUser',
UserUpdate = '/user/update',
@@ -66,7 +65,7 @@
* @description: user login api (ldap)
* @return {Promise<AxiosResponse<Result<LoginResultModel>>>}
*/
-export function loginLadpApi(
+export function loginLdapApi(
data: LoginParams,
mode: ErrorMessageMode = 'modal',
): Promise<AxiosResponse<Result<LoginResultModel>>> {
@@ -142,8 +141,7 @@
}
/**
* User change password
- * @param {String} username username
- * @param {String} password password
+ * @param data
*/
export function fetchUserPasswordUpdate(data: {
userId: string | number;
diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/NoticeList.vue b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/NoticeList.vue
index 38e8c04..6129e9d 100644
--- a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/NoticeList.vue
+++ b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/NoticeList.vue
@@ -17,7 +17,7 @@
<template>
<a-list :class="prefixCls" bordered :pagination="getPagination">
<template v-for="item in getData" :key="item.id">
- <a-list-item class="list-item" @click="handleNoticyClick(item)">
+ <a-list-item class="list-item" @click="handleNotifyClick(item)">
<template #extra>
<delete-outlined
v-if="item.readed === 0"
@@ -81,7 +81,7 @@
import { useDesign } from '/@/hooks/web/useDesign';
import { List, Avatar, Tag, Typography } from 'ant-design-vue';
import { isNumber } from '/@/utils/is';
- import { NoticyItem } from '/@/api/system/model/notifyModel';
+ import { NotifyItem } from '/@/api/system/model/notifyModel';
export default defineComponent({
components: {
[Avatar.name]: Avatar,
@@ -95,10 +95,10 @@
},
props: {
list: {
- type: Array as PropType<NoticyItem[]>,
+ type: Array as PropType<NotifyItem[]>,
default: () => [],
},
- noticyType: {
+ notifyType: {
type: Number,
default: 1,
},
@@ -118,10 +118,10 @@
type: Number,
default: 2,
},
- onNoticyClick: {
+ onNotifyClick: {
type: Function as PropType<(Recordable) => void>,
},
- onNoticyDel: {
+ onNotifyDel: {
type: Function as PropType<(Recordable) => void>,
},
},
@@ -159,18 +159,18 @@
}
});
- function handleNoticyClick(item: NoticyItem) {
- props.onNoticyClick && props.onNoticyClick(item);
+ function handleNotifyClick(item: NotifyItem) {
+ props.onNotifyClick && props.onNotifyClick(item);
}
/* delete */
- async function handleDelete(item: NoticyItem) {
- props.onNoticyClick && props.onNoticyClick(item);
+ async function handleDelete(item: NotifyItem) {
+ props.onNotifyClick && props.onNotifyClick(item);
}
return {
prefixCls,
getPagination,
getData,
- handleNoticyClick,
+ handleNotifyClick,
handleDelete,
};
},
diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue
index 0565030..b2bea1b 100644
--- a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue
+++ b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue
@@ -20,25 +20,25 @@
title=""
trigger="click"
:overlayClassName="`${prefixCls}__overlay`"
- v-model:visible="noticyVisible"
+ v-model:visible="notifyVisible"
>
<Badge :count="count" :numberStyle="numberStyle" :offset="[-5, 10]">
<BellOutlined />
</Badge>
<template #content>
- <Tabs v-model:activeKey="noticyType">
+ <Tabs v-model:activeKey="notifyType">
<template v-for="item in listData" :key="item.key">
<TabPane>
<template #tab>
{{ item.name }}
<span v-if="item.list.length !== 0">({{ item.list.length }})</span>
</template>
- <Spin :spinning="noticyLoading">
+ <Spin :spinning="notifyLoading">
<NoticeList
- :noticyType="item.key"
+ :notifyType="item.key"
:list="item.list"
- @noticy-reload="getNoticyList"
- @noticy-click="handleNoticyInfo"
+ @notify-reload="getNotifyList"
+ @notify-click="handleNotifyInfo"
/>
</Spin>
</TabPane>
@@ -56,7 +56,7 @@
import NoticeList from './NoticeList.vue';
import { useDesign } from '/@/hooks/web/useDesign';
import { fetchNotify, fetchNotifyDelete } from '/@/api/system/notify';
- import { NoticyItem } from '/@/api/system/model/notifyModel';
+ import { NotifyItem } from '/@/api/system/model/notifyModel';
import { useWebSocket } from '@vueuse/core';
import { useUserStoreWithOut } from '/@/store/modules/user';
import { useMessage } from '/@/hooks/web/useMessage';
@@ -66,24 +66,24 @@
export interface TabItem {
key: number;
name: string;
- list: NoticyItem[];
+ list: NotifyItem[];
}
export default defineComponent({
- name: 'Noticy',
+ name: 'Notify',
components: { Popover, BellOutlined, Tabs, TabPane: Tabs.TabPane, Badge, NoticeList, Spin },
setup() {
const { prefixCls } = useDesign('header-notify');
const userStore = useUserStoreWithOut();
const { createMessage, createConfirm } = useMessage();
- const noticyType = ref(1);
+ const notifyType = ref(1);
const currentPage = ref(1);
- const noticyVisible = ref(false);
+ const notifyVisible = ref(false);
const listData = ref<TabItem[]>([
{ key: 1, name: t('routes.basic.notice.exception'), list: [] },
{ key: 2, name: t('routes.basic.notice.message'), list: [] },
]);
- const noticyLoading = ref(false);
+ const notifyLoading = ref(false);
const count = computed(() => {
let count = 0;
for (let i = 0; i < unref(listData).length; i++) {
@@ -92,10 +92,10 @@
return count;
});
/* View notification messages */
- async function handleNoticyInfo(record: NoticyItem) {
- noticyVisible.value = false;
+ async function handleNotifyInfo(record: NotifyItem) {
+ notifyVisible.value = false;
createConfirm({
- iconType: unref(noticyType) == 1 ? 'error' : 'info',
+ iconType: unref(notifyType) == 1 ? 'error' : 'info',
title: record.title,
content: h('div', {}, record.context),
okText: t('common.delText'),
@@ -107,29 +107,29 @@
/* delete */
async function handleDelete(id: string) {
try {
- noticyLoading.value = true;
+ notifyLoading.value = true;
await fetchNotifyDelete(id);
- getNoticyList(unref(noticyType));
+ getNotifyList(unref(notifyType));
} catch (error) {
console.error(error);
} finally {
- noticyLoading.value = false;
+ notifyLoading.value = false;
}
}
/* Get a list of notifications */
- async function getNoticyList(type: number) {
+ async function getNotifyList(type: number) {
try {
- noticyLoading.value = true;
+ notifyLoading.value = true;
const res = await fetchNotify({ type, pageNum: 1, pageSize: 40 });
- handleNoticyMessage(type, res.records);
+ handleNotifyMessage(type, res.records);
} catch (error) {
console.error(error);
} finally {
- noticyLoading.value = false;
+ notifyLoading.value = false;
}
}
/* Process notification message data */
- function handleNoticyMessage(type: number, data: NoticyItem[]) {
+ function handleNotifyMessage(type: number, data: NotifyItem[]) {
/* The abnormal alarm */
if (type === 1) {
listData.value[0].list = [...data];
@@ -150,33 +150,33 @@
},
},
});
- watch([data, currentPage], ([newData]: [NoticyItem], [newPage]) => {
+ watch([data, currentPage], ([newData]: [NotifyItem], [newPage]) => {
if (newData && isObject(newData)) {
/* The abnormal alarm */
- if (unref(noticyType) === 1) {
+ if (unref(notifyType) === 1) {
listData.value[0].list.push(newData);
} else {
listData.value[1].list.push(newData);
}
- handleNoticyInfo(newData);
+ handleNotifyInfo(newData);
}
if (newPage) {
- getNoticyList(unref(noticyType));
+ getNotifyList(unref(notifyType));
}
});
- getNoticyList(1);
- getNoticyList(2);
+ getNotifyList(1);
+ getNotifyList(2);
return {
prefixCls,
listData,
- noticyType,
+ notifyType,
count,
- handleNoticyInfo,
- noticyVisible,
+ handleNotifyInfo,
+ notifyVisible,
currentPage,
numberStyle: {},
- noticyLoading,
- getNoticyList,
+ notifyLoading,
+ getNotifyList,
handleDelete,
};
},
diff --git a/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue b/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
index 9dd4f57..58b3f60 100644
--- a/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
+++ b/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
@@ -89,7 +89,7 @@
LoginTypeEnum,
} from './useLogin';
import { useDesign } from '/@/hooks/web/useDesign';
- import { loginApi, loginLadpApi } from '/@/api/system/user';
+ import { loginApi, loginLdapApi } from '/@/api/system/user';
import { APP_TEAMID_KEY_ } from '/@/enums/cacheEnum';
import TeamModal from './teamModal.vue';
import { fetchUserTeam } from '/@/api/system/member';
@@ -150,7 +150,7 @@
);
return data;
}
- const { data } = await loginLadpApi(
+ const { data } = await loginLdapApi(
{ password: loginFormValue.password, username: loginFormValue.account },
'none',
);
@@ -161,8 +161,7 @@
loading.value = true;
try {
const { code, data } = await handleLoginRequest(loginFormValue);
-
- if (code != null && code != undefined) {
+ if (code != null) {
if (code == 0 || code == 1) {
const message =
'SignIn failed,' +
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/Add.vue b/streampark-console/streampark-console-webapp/src/views/flink/project/Add.vue
index a3d4c09..6c3ff84 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/project/Add.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/project/Add.vue
@@ -29,7 +29,6 @@
import { PageWrapper } from '/@/components/Page';
import { useI18n } from '/@/hooks/web/useI18n';
import { useMessage } from '/@/hooks/web/useMessage';
- import { getUserTeamId } from '/@/utils';
const { getLoading, registerForm, submit, handleSubmit } = useProject();
const { Swal, createMessage } = useMessage();
@@ -40,7 +39,6 @@
async function handleCreateAction(values: Recordable) {
try {
const res = await createProject({
- teamId: getUserTeamId(),
name: values.name,
gitCredential: values.gitCredential,
url: values.url,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
index fcbbb33..6c2ebc2 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
@@ -137,7 +137,6 @@
...queryParams,
pageNum: pageInfo.currentPage,
pageSize: pageInfo.pageSize,
- teamId: userStore.getTeamId,
}).then((res) => {
loading.value = false;
pageInfo.total = Number(res.total);
@@ -164,7 +163,7 @@
function handleViewLog(value: Recordable) {
openLogModal(true, { project: value });
}
- // teamid update
+ // teamId update
watch(
() => userStore.getTeamId,
(val) => {
diff --git a/streampark-console/streampark-console-webapp/src/views/system/member/MemberDrawer.vue b/streampark-console/streampark-console-webapp/src/views/system/member/MemberDrawer.vue
index bb8cdfc..827c25b 100644
--- a/streampark-console/streampark-console-webapp/src/views/system/member/MemberDrawer.vue
+++ b/streampark-console/streampark-console-webapp/src/views/system/member/MemberDrawer.vue
@@ -43,7 +43,12 @@
import { useUserStoreWithOut } from '/@/store/modules/user';
import { RuleObject } from 'ant-design-vue/lib/form';
import { StoreValue } from 'ant-design-vue/lib/form/interface';
- import { fetchAddMember, fetchCandidateUsers, fetchCheckUserName, fetchUpdateMember } from '/@/api/system/member';
+ import {
+ fetchAddMember,
+ fetchCandidateUsers,
+ fetchCheckUserName,
+ fetchUpdateMember,
+ } from '/@/api/system/member';
import { useFormValidate } from '/@/hooks/web/useFormValidate';
const { t } = useI18n();
@@ -105,11 +110,10 @@
componentProps: {
disabled: unref(isUpdate),
api: fetchCandidateUsers,
- params: { teamId: userStore.getTeamId},
labelField: 'username',
valueField: 'username',
showSearch: true,
- optionFilterGroup: "username",
+ optionFilterGroup: 'username',
},
itemProps: getItemProp.value,
rules: unref(isUpdate)
@@ -171,7 +175,7 @@
setDrawerProps({ confirmLoading: true });
await (isUpdate.value
? fetchUpdateMember({ ...editParams, ...values })
- : fetchAddMember({ teamId: userStore.getTeamId, ...values }));
+ : fetchAddMember({ ...values }));
closeDrawer();
emit('success', isUpdate.value);
} catch (e) {
