diff --git a/configure/etc/conf/i18n/messages_en.properties b/configure/etc/conf/i18n/messages_en.properties index d4ff1de7..4b701391 100644 --- a/configure/etc/conf/i18n/messages_en.properties +++ b/configure/etc/conf/i18n/messages_en.properties @@ -430,6 +430,7 @@ common.releasedTime=Released Time common.install=Install common.uninstall=Uninstall common.installTime=Install Time +common.installVersion=Install Version common.plugin.version=Plugin Version common.plugin.systemVersion=Current system version: common.plugin.list.name=Plugin List diff --git a/configure/etc/conf/i18n/messages_zh-cn.properties b/configure/etc/conf/i18n/messages_zh-cn.properties index 248ae148..01b9798e 100644 --- a/configure/etc/conf/i18n/messages_zh-cn.properties +++ b/configure/etc/conf/i18n/messages_zh-cn.properties @@ -430,6 +430,7 @@ common.releasedTime=发布时间 common.install=安装 common.uninstall=卸载 common.installTime=安装时间 +common.installVersion=安装版本 common.plugin.version=插件版本 common.plugin.systemVersion=当前系统版本: common.plugin.list.name=插件列表 diff --git a/configure/metadata.json b/configure/metadata.json index e73b6b4e..59260ac1 100644 --- a/configure/metadata.json +++ b/configure/metadata.json @@ -10,14 +10,15 @@ "description": "Integrate MySQL data sources", "i18nFormat": true, "type": "JDBC", - "version": "2024.4.0", + "version": "2024.4.0-SNAPSHOT", "author": "datacap-community", "logo": "https://www.vectorlogo.zone/logos/mysql/mysql-icon.svg", - "released": "2024-01-01", + "released": "2024-11-21 23:11:15", "supportVersion": [ "8.0", "5.7" - ] + ], + "url": "https://cdn.north.devlive.org/applications/datacap/plugins/2024.4.0-SNAPSHOT/plugin/datacap-plugin-mysql-bin.tar.gz" } ] } \ No newline at end of file diff --git a/configure/publish/publish-newVersion.sh b/configure/publish/publish-newVersion.sh index e45a4166..f4ac95fd 100644 --- a/configure/publish/publish-newVersion.sh +++ b/configure/publish/publish-newVersion.sh @@ -1,6 +1,7 @@ #!/bin/sh VERSION=$1 HOME=$(pwd) +CURRENT_DATE=$(date '+%Y-%m-%d %H:%M:%S') job_before_echo_basic() { printf "\n\tJob before echo basic \n" @@ -39,6 +40,12 @@ job_runner_apply() { echo "Apply new version for plugin ..." perl -pi -e 's/VERSION=.*/VERSION='"$VERSION"'/g' configure/etc/bin/install-plugin.sh + echo "Apply new version for metadata ..." + # Update version and URL in metadata.json using perl + perl -i -pe 's/"version": "[^"]*"/"version": "'"$VERSION"'"/' "$HOME/configure/metadata.json" + perl -i -pe 's|/plugins/[^/]+/|/plugins/'"$VERSION"'/|g' "$HOME/configure/metadata.json" + perl -i -pe 's/"released": "[^"]*"/"released": "'"$CURRENT_DATE"'"/' "$HOME/configure/metadata.json" + printf "Apply new version for web ...\n" # shellcheck disable=SC2164 cd "$HOME"/core/datacap-ui @@ -55,4 +62,4 @@ job_runner_apply() { job_before_echo_basic job_before_checked -job_runner_apply +job_runner_apply \ No newline at end of file diff --git a/core/datacap-ui/src/views/pages/store/StoreHome.vue b/core/datacap-ui/src/views/pages/store/StoreHome.vue index 03a66a0c..8ce5cf23 100644 --- a/core/datacap-ui/src/views/pages/store/StoreHome.vue +++ b/core/datacap-ui/src/views/pages/store/StoreHome.vue @@ -30,7 +30,7 @@ -
+
{{ child.i18nFormat ? $t(child.description) : child.description }} @@ -48,11 +48,32 @@
-
+
{{ $t('common.plugin.version') }} : + {{ child.version }}
- {{ child.version }} + + +
+ {{ $t('common.installVersion') }}: + {{ child.installVersion }} +
+
+ + +
+
+ {{ $t('common.releasedTime') }}: + {{ child.released }} +
+ + + +
+ {{ $t('common.installTime') }}: + {{ child.installTime }} +
@@ -67,20 +88,6 @@ {{ $t('common.type') }}: {{ child.type }}
- - - -
- {{ $t('common.releasedTime') }}: - {{ child.released }} -
- - - -
- {{ $t('common.installTime') }}: - {{ child.installTime }} -
@@ -88,7 +95,7 @@
- + @@ -125,6 +132,8 @@ interface MetadataItem author: string installed: boolean installTime: string + installVersion: string + url: string } interface Metadata @@ -173,10 +182,11 @@ const loadMetadata = async () => { // 绑定安装信息 // Bind installation information metadata.value.children.map(item => { - installResponse.data.some((installedPlugin: { name: string, loadTime: string }) => { + installResponse.data.some((installedPlugin: { name: string, loadTime: string, version: string }) => { if (installedPlugin.name === item.label) { item.installed = true item.installTime = installedPlugin.loadTime + item.installVersion = installedPlugin.version } }) })