From c9ea6f6c8d6538cc2cf53f57bf5af14cb770bbec Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 7 Aug 2023 11:50:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=9C=89=E8=BF=9C=E7=A8=8B=E5=90=8C=E5=90=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#1861)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/app_utils.go                   |  2 +-
 frontend/src/components/upload/index.vue           |  6 ++----
 frontend/src/utils/util.ts                         | 14 --------------
 .../views/host/file-management/upload/index.vue    |  5 +----
 .../src/views/website/website/create/index.vue     |  1 -
 5 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go
index 1e274bc5e..a9d157035 100644
--- a/backend/app/service/app_utils.go
+++ b/backend/app/service/app_utils.go
@@ -130,7 +130,7 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 		var resourceId uint
 		if dbConfig.DbName != "" && dbConfig.DbUser != "" && dbConfig.Password != "" {
 			iMysqlRepo := repo.NewIMysqlRepo()
-			oldMysqlDb, _ := iMysqlRepo.Get(commonRepo.WithByName(dbConfig.DbName))
+			oldMysqlDb, _ := iMysqlRepo.Get(commonRepo.WithByName(dbConfig.DbName), iMysqlRepo.WithByFrom(constant.ResourceLocal))
 			resourceId = oldMysqlDb.ID
 			if oldMysqlDb.ID > 0 {
 				if oldMysqlDb.Username != dbConfig.DbUser || oldMysqlDb.Password != dbConfig.Password {
diff --git a/frontend/src/components/upload/index.vue b/frontend/src/components/upload/index.vue
index 88f98e6b1..94267da5d 100644
--- a/frontend/src/components/upload/index.vue
+++ b/frontend/src/components/upload/index.vue
@@ -80,7 +80,7 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
-import { checkFileType, computeSize } from '@/utils/util';
+import { computeSize } from '@/utils/util';
 import { useDeleteData } from '@/hooks/use-delete-data';
 import { handleRecoverByUpload } from '@/api/modules/setting';
 import i18n from '@/lang';
@@ -184,9 +184,7 @@ const beforeAvatarUpload = (rawFile) => {
 };
 
 const fileOnChange = (_uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-    if (checkFileType(_uploadFile, uploadFiles)) {
-        uploaderFiles.value = uploadFiles;
-    }
+    uploaderFiles.value = uploadFiles;
 };
 
 const handleClose = () => {
diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.ts
index 18b5c14b0..6db703eb0 100644
--- a/frontend/src/utils/util.ts
+++ b/frontend/src/utils/util.ts
@@ -1,6 +1,4 @@
 import i18n from '@/lang';
-import { UploadFile, UploadFiles } from 'element-plus';
-import { MsgWarning } from './message';
 
 export function deepCopy<T>(obj: any): T {
     let newObj: any;
@@ -307,15 +305,3 @@ export function downloadWithContent(content: string, fileName: string) {
     const event = new MouseEvent('click');
     a.dispatchEvent(event);
 }
-
-export function checkFileType(_uploadFile: UploadFile, uploadFiles: UploadFiles): boolean {
-    if (_uploadFile.raw?.type == '') {
-        const index = uploadFiles.findIndex((file) => file.name === _uploadFile.name && file.raw?.type === '');
-        if (index !== -1) {
-            uploadFiles.splice(index, 1);
-        }
-        MsgWarning(i18n.global.t('file.unsupportType'));
-        return false;
-    }
-    return true;
-}
diff --git a/frontend/src/views/host/file-management/upload/index.vue b/frontend/src/views/host/file-management/upload/index.vue
index c46af8048..f2101192e 100644
--- a/frontend/src/views/host/file-management/upload/index.vue
+++ b/frontend/src/views/host/file-management/upload/index.vue
@@ -48,7 +48,6 @@ import { ChunkUploadFileData, UploadFileData } from '@/api/modules/files';
 import i18n from '@/lang';
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { MsgSuccess } from '@/utils/message';
-import { checkFileType } from '@/utils/util';
 
 interface UploadFileProps {
     path: string;
@@ -71,9 +70,7 @@ const handleClose = () => {
 const uploaderFiles = ref<UploadFiles>([]);
 
 const fileOnChange = (_uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-    if (checkFileType(_uploadFile, uploadFiles)) {
-        uploaderFiles.value = uploadFiles;
-    }
+    uploaderFiles.value = uploadFiles;
 };
 
 const handleExceed: UploadProps['onExceed'] = (files) => {
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index 331355bd3..8691715d8 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -565,7 +565,6 @@ const submit = async (formEl: FormInstance | undefined) => {
                 } else {
                     if (website.value.type === 'proxy') {
                         website.value.proxy = website.value.proxyProtocol + website.value.proxyAddress;
-                        console.log(website.value.proxy);
                     }
                     CreateWebsite(website.value)
                         .then(() => {