diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java index 1b64883913..a084251744 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java @@ -29,13 +29,20 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; import static org.apache.dolphinscheduler.api.enums.Status.*; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UiPluginService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UiPluginService.java index 61abbeb5fe..7b843c017f 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UiPluginService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UiPluginService.java @@ -18,7 +18,6 @@ package org.apache.dolphinscheduler.api.service; import org.apache.dolphinscheduler.api.dto.ProductInfoDto; -import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.common.enums.PluginType; import org.apache.dolphinscheduler.dao.entity.User; diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UiPluginControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UiPluginControllerTest.java index 6944668b9d..68562abde6 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UiPluginControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UiPluginControllerTest.java @@ -106,8 +106,6 @@ public class UiPluginControllerTest extends AbstractControllerTest { @Test public void testQueryProductInfo() throws Exception { -// Map mockResult = new HashMap<>(); -// mockResult.put(Constants.STATUS, Status.SUCCESS); ProductInfoDto mockResult = new ProductInfoDto(); Mockito.when(uiPluginService.queryProductInfo(Mockito.any(), Mockito.anyInt())).thenReturn(mockResult); diff --git a/dolphinscheduler-ui/src/layouts/content/components/user/use-dropdown.ts b/dolphinscheduler-ui/src/layouts/content/components/user/use-dropdown.ts index 77dba80e7f..e31be03250 100644 --- a/dolphinscheduler-ui/src/layouts/content/components/user/use-dropdown.ts +++ b/dolphinscheduler-ui/src/layouts/content/components/user/use-dropdown.ts @@ -31,8 +31,8 @@ export function useDropDown() { useLogout() } else if (key === 'password') { router.push({ path: '/password' }) - } else if (key === 'product') { - router.push({ path: '/product' }) + } else if (key === 'about') { + router.push({ path: '/about' }) } else if (key === 'profile') { router.push({ path: '/profile' }) } diff --git a/dolphinscheduler-ui/src/layouts/content/use-dataList.ts b/dolphinscheduler-ui/src/layouts/content/use-dataList.ts index 5590395ebe..e050ebd2aa 100644 --- a/dolphinscheduler-ui/src/layouts/content/use-dataList.ts +++ b/dolphinscheduler-ui/src/layouts/content/use-dataList.ts @@ -374,8 +374,8 @@ export function useDataList() { disabled: userStore.getSecurityConfigType !== 'PASSWORD' }, { - label: t('user_dropdown.product'), - key: 'product', + label: t('user_dropdown.about'), + key: 'about', icon: renderIcon(SelectOutlined), }, { diff --git a/dolphinscheduler-ui/src/locales/en_US/product.ts b/dolphinscheduler-ui/src/locales/en_US/about.ts similarity index 92% rename from dolphinscheduler-ui/src/locales/en_US/product.ts rename to dolphinscheduler-ui/src/locales/en_US/about.ts index 4724ca1f97..4d8a8569e0 100644 --- a/dolphinscheduler-ui/src/locales/en_US/product.ts +++ b/dolphinscheduler-ui/src/locales/en_US/about.ts @@ -16,6 +16,6 @@ */ export default { - product: 'Product Info', - product_version: 'Product Version' + about: 'About', + about_version: 'Product Version' } \ No newline at end of file diff --git a/dolphinscheduler-ui/src/locales/en_US/index.ts b/dolphinscheduler-ui/src/locales/en_US/index.ts index c0e88ce9da..f6296d4274 100644 --- a/dolphinscheduler-ui/src/locales/en_US/index.ts +++ b/dolphinscheduler-ui/src/locales/en_US/index.ts @@ -32,7 +32,7 @@ import security from '@/locales/en_US/security' import theme from '@/locales/en_US/theme' import user_dropdown from '@/locales/en_US/user-dropdown' import ui_setting from '@/locales/en_US/ui_setting' -import product from "@/locales/en_US/product"; +import about from "@/locales/en_US/about"; export default { login, @@ -42,7 +42,7 @@ export default { menu, home, password, - product, + about, profile, monitor, resource, diff --git a/dolphinscheduler-ui/src/locales/en_US/user-dropdown.ts b/dolphinscheduler-ui/src/locales/en_US/user-dropdown.ts index 1d1bbeb3eb..5ee8ed91c3 100644 --- a/dolphinscheduler-ui/src/locales/en_US/user-dropdown.ts +++ b/dolphinscheduler-ui/src/locales/en_US/user-dropdown.ts @@ -18,6 +18,6 @@ export default { profile: 'Profile', password: 'Password', - product: 'Product', + about: 'About', logout: 'Logout' } diff --git a/dolphinscheduler-ui/src/locales/zh_CN/product.ts b/dolphinscheduler-ui/src/locales/zh_CN/about.ts similarity index 93% rename from dolphinscheduler-ui/src/locales/zh_CN/product.ts rename to dolphinscheduler-ui/src/locales/zh_CN/about.ts index c98034c73c..8db2472168 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/product.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/about.ts @@ -16,6 +16,6 @@ */ export default { - product: '产品信息', - product_version: '产品版本' + about: '关于产品', + about_version: '产品版本' } diff --git a/dolphinscheduler-ui/src/locales/zh_CN/index.ts b/dolphinscheduler-ui/src/locales/zh_CN/index.ts index 89c2ce7a7c..55209876b0 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/index.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/index.ts @@ -32,7 +32,7 @@ import security from '@/locales/zh_CN/security' import theme from '@/locales/zh_CN/theme' import user_dropdown from '@/locales/zh_CN/user-dropdown' import ui_setting from '@/locales/zh_CN/ui_setting' -import product from "@/locales/zh_CN/product"; +import about from "@/locales/zh_CN/about"; export default { login, @@ -42,7 +42,7 @@ export default { menu, home, password, - product, + about, profile, monitor, resource, diff --git a/dolphinscheduler-ui/src/locales/zh_CN/user-dropdown.ts b/dolphinscheduler-ui/src/locales/zh_CN/user-dropdown.ts index c2708235fe..75688eb84a 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/user-dropdown.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/user-dropdown.ts @@ -18,6 +18,6 @@ export default { profile: '用户信息', password: '密码管理', - product: '产品信息', + about: '产品信息', logout: '退出登录' } diff --git a/dolphinscheduler-ui/src/router/routes.ts b/dolphinscheduler-ui/src/router/routes.ts index 118c26fe3f..e17c7e1b93 100644 --- a/dolphinscheduler-ui/src/router/routes.ts +++ b/dolphinscheduler-ui/src/router/routes.ts @@ -70,9 +70,9 @@ const basePage: RouteRecordRaw[] = [ } }, { - path: '/product', - name: 'product', - component: components['product'], + path: '/about', + name: 'about', + component: components['about'], meta: { title: '产品信息', auth: [] diff --git a/dolphinscheduler-ui/src/views/product/index.tsx b/dolphinscheduler-ui/src/views/about/index.tsx similarity index 91% rename from dolphinscheduler-ui/src/views/product/index.tsx rename to dolphinscheduler-ui/src/views/about/index.tsx index 5388497ae1..e9fb62542e 100644 --- a/dolphinscheduler-ui/src/views/product/index.tsx +++ b/dolphinscheduler-ui/src/views/about/index.tsx @@ -23,8 +23,8 @@ import { useUserStore } from '@/store/user/user' import { queryProductInfo } from '@/service/modules/ui-plugins' const userStore = useUserStore() -const product = defineComponent({ - name: 'product', +const about = defineComponent({ + name: 'about', setup() { const info: any = ref('') const queryProduct = async (userId: number) => { @@ -45,11 +45,11 @@ const product = defineComponent({ return (
- {t('product.product_version')} + {t('about.about_version')}
{ info }
@@ -58,4 +58,4 @@ const product = defineComponent({ ) } }) -export default product +export default about