Skip to content

feat(appstore): Add Synchronization of Main Node Application Store Pa… #7612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Dec 31, 2024
Merged

feat(appstore): Add Synchronization of Main Node Application Store Pa… #7612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions agent/app/task/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,22 +251,22 @@ func (t *Task) Logf(format string, v ...any) {
}

func (t *Task) LogFailed(msg string) {
t.Logger.Printf(msg + i18n.GetMsgByKey("Failed"))
t.Logger.Println(msg + i18n.GetMsgByKey("Failed"))
}

func (t *Task) LogFailedWithErr(msg string, err error) {
t.Logger.Printf(fmt.Sprintf("%s %s : %s", msg, i18n.GetMsgByKey("Failed"), err.Error()))
t.Logger.Println(fmt.Sprintf("%s %s : %s", msg, i18n.GetMsgByKey("Failed"), err.Error()))
}

func (t *Task) LogSuccess(msg string) {
t.Logger.Printf(msg + i18n.GetMsgByKey("Success"))
t.Logger.Println(msg + i18n.GetMsgByKey("Success"))
}
func (t *Task) LogSuccessF(format string, v ...any) {
t.Logger.Printf(fmt.Sprintf(format, v...) + i18n.GetMsgByKey("Success"))
t.Logger.Println(fmt.Sprintf(format, v...) + i18n.GetMsgByKey("Success"))
}

func (t *Task) LogStart(msg string) {
t.Logger.Printf(fmt.Sprintf("%s%s", i18n.GetMsgByKey("Start"), msg))
t.Logger.Println(fmt.Sprintf("%s%s", i18n.GetMsgByKey("Start"), msg))
}

func (t *Task) LogWithOps(operate, msg string) {
Expand Down
11 changes: 11 additions & 0 deletions core/buserr/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,14 @@ func WithMap(Key string, maps map[string]interface{}, err error) BusinessError {
Err: err,
}
}

func WithName(Key string, name string) BusinessError {
paramMap := map[string]interface{}{}
if name != "" {
paramMap["name"] = name
}
return BusinessError{
Msg: Key,
Map: paramMap,
}
}
8 changes: 8 additions & 0 deletions core/utils/files/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,11 @@ func DownloadFileWithProxy(url, dst string) error {
}
return nil
}

func Stat(path string) bool {
_, err := os.Stat(path)
if err != nil && os.IsNotExist(err) {
return false
}
return true
}
5 changes: 5 additions & 0 deletions frontend/src/api/interface/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,9 @@ export namespace App {
export interface AppStoreConfig {
defaultDomain: string;
}

export interface CustomAppStoreConfig {
status: string;
imagePrefix: string;
}
}
4 changes: 4 additions & 0 deletions frontend/src/api/modules/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,7 @@ export const UpdateAppStoreConfig = (req: App.AppStoreConfig) => {
export const SyncCutomAppStore = (req: App.AppStoreSync) => {
return http.post(`/custom/app/sync`, req);
};

export const getCurrentNodeCustomAppConfig = () => {
return http.get<App.CustomAppStoreConfig>(`/custom/app/config`);
};
4 changes: 3 additions & 1 deletion frontend/src/components/backup/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ import { Backup } from '@/api/interface/backup';
import router from '@/routers';
import { MsgSuccess } from '@/utils/message';
import TaskLog from '@/components/task-log/index.vue';
import { GlobalStore } from '@/store';
const globalStore = GlobalStore();

const selects = ref<any>([]);
const loading = ref();
Expand Down Expand Up @@ -306,7 +308,7 @@ const onDownload = async (row: Backup.RecordInfo) => {
fileName: row.fileName,
};
await downloadBackupRecord(params).then(async (res) => {
downloadFile(res.data);
downloadFile(res.data, globalStore.currentNode);
});
};

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/dialog-pro/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<script lang="ts" setup>
import { computed, useSlots } from 'vue';
defineOptions({ name: 'DrawerPro' });
defineOptions({ name: 'DialogPro' });

const props = defineProps({
title: String,
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/log-file/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import { nextTick, onMounted, onUnmounted, reactive, ref } from 'vue';
import { downloadFile } from '@/utils/util';
import { ReadByLine } from '@/api/modules/files';
import { GlobalStore } from '@/store';
const globalStore = GlobalStore();

interface LogProps {
id?: number;
Expand Down Expand Up @@ -146,7 +148,7 @@ const changeLoading = () => {

const onDownload = async () => {
changeLoading();
downloadFile(logPath.value);
downloadFile(logPath.value, globalStore.currentNode);
changeLoading();
};

Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/zh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1859,6 +1859,7 @@ const message = {
defaultWebDomainHepler: '默认访问用于应用端口跳转，例如应用端口为 8080 则跳转地址为http(s)://默认访问地址:8080',
webUIConfig: '请在应用参数或者应用商店设置处添加访问地址',
toLink: '跳转',
customAppHelper: '当前使用的是主节点应用商店包，修改配置请在主节点操作',
},
website: {
website: '网站',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/store/modules/global.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const GlobalStore = defineStore({
state.themeConfig.isGold ||
(state.themeConfig.theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches),
isDarkGoldTheme: (state) => state.themeConfig.isGold && state.isMasterProductPro,
isMaster: (state) => state.currentNode === 'local',
},
actions: {
setOpenMenuTabs(openMenuTabs: boolean) {
Expand Down
31 changes: 27 additions & 4 deletions frontend/src/utils/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,10 +519,33 @@ export function toLowerCase(str: string) {
return str.toLowerCase();
}

export function downloadFile(filePath: string) {
let url = `${import.meta.env.VITE_API_URL as string}/files/download?`;
let path = encodeURIComponent(filePath);
window.open(url + 'path=' + path, '_blank');
export function downloadFile(filePath: string, currentNode: string) {
const url = `${import.meta.env.VITE_API_URL as string}/files/download`;
const path = encodeURIComponent(filePath);

fetch(`${url}?path=${path}`, {
method: 'GET',
headers: {
CurrentNode: currentNode,
},
})
.then((response) => {
if (!response.ok) {
throw new Error('Network response was not ok');
}
return response.blob();
})
.then((blob) => {
const downloadUrl = window.URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = downloadUrl;
a.download = filePath.split('/').pop() || 'downloaded-file';
document.body.appendChild(a);
a.click();
a.remove();
window.URL.revokeObjectURL(downloadUrl);
})
.catch(() => {});
}

export function downloadWithContent(content: string, fileName: string) {
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Dec 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I apologize, but I'm unable to assist without more context or specific code examples from both versions of the code. You'll need to post either current code or some relevant snippets showing what you want checked against a previous version.

Expand Down
12 changes: 9 additions & 3 deletions frontend/src/views/app-store/apps/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,14 @@
<script lang="ts" setup>
import { App } from '@/api/interface/app';
import { onMounted, reactive, ref, computed } from 'vue';
import { GetAppTags, SearchApp, SyncApp, SyncCutomAppStore, SyncLocalApp } from '@/api/modules/app';
import {
GetAppTags,
SearchApp,
SyncApp,
SyncCutomAppStore,
SyncLocalApp,
getCurrentNodeCustomAppConfig,
} from '@/api/modules/app';
import Install from '../detail/install/index.vue';
import router from '@/routers';
import { MsgSuccess } from '@/utils/message';
Expand All @@ -184,7 +191,6 @@ import { getLanguage, newUUID } from '@/utils/util';
import Detail from '../detail/index.vue';
import TaskLog from '@/components/task-log/index.vue';
import { storeToRefs } from 'pinia';
import { GetCustomAppStoreConfig } from '@/xpack/api/modules/app';

const globalStore = GlobalStore();
const { isProductPro } = storeToRefs(globalStore);
Expand Down Expand Up @@ -350,7 +356,7 @@ onMounted(async () => {
}
search(req);
if (isProductPro.value) {
const res = await GetCustomAppStoreConfig();
const res = await getCurrentNodeCustomAppConfig();
if (res && res.data) {
syncCustomAppstore.value = res.data.status === 'enable';
}
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Dec 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There don't seem to be any syntax errors or unusual coding practices that would indicate an issue with the provided code snippet. However, it should be noted that this is not a typical Vue.js application; the code snippets you've shared do not appear to fit within a normal Vue project context.

For optimization considerations:

  1. Ensure all required imports are included at the top of the file, rather than scattered throughout multiple places.
  2. If there's more than one function doing the same task, consider using async/await for promises.
  3. Use local storage instead of cookies for sensitive data like app tags, since cookies can be easily removed or manipulated upon logout in modern browsers and servers.

As stated earlier, I believe these code samples aren’t relevant to a regular Vue project and could potentially cause confusion without specific context about their purpose and use cases.

Expand Down
19 changes: 17 additions & 2 deletions frontend/src/views/app-store/setting/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
</el-input>
<span class="input-help">{{ $t('app.defaultWebDomainHepler') }}</span>
</el-form-item>
<CustomSetting v-if="isProductPro" />
<CustomSetting v-if="isProductPro && globalStore.isMaster" />
<el-form-item v-if="!globalStore.isMaster && useCustomApp">
<el-text type="warning">{{ $t('app.customAppHelper') }}</el-text>
</el-form-item>
</el-col>
</el-row>
</el-form>
Expand All @@ -38,7 +41,7 @@
</template>

<script setup lang="ts">
import { GetAppStoreConfig } from '@/api/modules/app';
import { GetAppStoreConfig, getCurrentNodeCustomAppConfig } from '@/api/modules/app';
import { Rules } from '@/global/form-rules';
import { FormRules } from 'element-plus';
import CustomSetting from '@/xpack/views/appstore/index.vue';
Expand All @@ -59,6 +62,7 @@ const loading = ref(false);
const configForm = ref();
const protocol = ref('http://');
const domainRef = ref();
const useCustomApp = ref(false);

function getUrl(url: string) {
const regex = /^(https?:\/\/)(.*)/;
Expand Down Expand Up @@ -99,7 +103,18 @@ const setDefaultDomain = () => {
});
};

const getNodeConfig = async () => {
if (globalStore.isMaster) {
return;
}
const res = await getCurrentNodeCustomAppConfig();
if (res && res.data) {
useCustomApp.value = res.data.status === 'enable';
}
};

onMounted(() => {
search();
getNodeConfig();
});
</script>
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Dec 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code does not contain any clear violations of standards or potential issues. It doesn't seem to have significant design flaws in terms of layout, coding format or functionality. Any optimizations would mostly need context about how it's being used elsewhere in the app or system.

However, minor tweaks like removing extra space around </div>, improving naming conventions, checking that <el-button> always has an icon, etc., should be possible with minimal effort. If you're unsure what specific improvements could work best at this stage for the current task, I'd encourage you to review comments or guidelines provided by developers in similar projects.

4 changes: 3 additions & 1 deletion frontend/src/views/cronjob/backup/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ import i18n from '@/lang';
import { downloadBackupRecord, searchBackupRecordsByCronjob } from '@/api/modules/backup';
import { Backup } from '@/api/interface/backup';
import { MsgError } from '@/utils/message';
import { GlobalStore } from '@/store';
const globalStore = GlobalStore();

const selects = ref<any>([]);
const loading = ref();
Expand Down Expand Up @@ -116,7 +118,7 @@ const onDownload = async (row: Backup.RecordInfo) => {
await downloadBackupRecord(params)
.then(async (res) => {
loading.value = false;
downloadFile(res.data);
downloadFile(res.data, globalStore.currentNode);
})
.catch(() => {
loading.value = false;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/host/file-management/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ import {
RemoveFavorite,
SearchFavorite,
} from '@/api/modules/files';
import { computeSize, copyText, dateFormat, downloadFile, getFileType, getIcon, getRandomStr } from '@/utils/util';
import { computeSize, copyText, dateFormat, getFileType, getIcon, getRandomStr, downloadFile } from '@/utils/util';
import { StarFilled, Star, Top, Right, Close } from '@element-plus/icons-vue';
import { File } from '@/api/interface/file';
import { Mimetypes, Languages } from '@/global/mimetype';
Expand Down Expand Up @@ -810,7 +810,7 @@ const openPaste = () => {
};

const openDownload = (file: File.File) => {
downloadFile(file.path);
downloadFile(file.path, globalStore.currentNode);
};

const openDetail = (row: File.File) => {
Expand Down
Loading