feat: Support for modifying host information

ssongliu · ssongliu · commit 6ae764e3e522 · 2025-02-07T16:53:21.000+08:00
diff --git a/core/app/service/host.go b/core/app/service/host.go
@@ -266,8 +266,8 @@ func (u *HostService) Create(req dto.HostOperate) (*dto.HostInfo, error) {
 		req.GroupID = group.ID
 	}
 	var sameHostID uint
-	if req.Addr == "127.0.0.1" {
-		hostSame, _ := hostRepo.Get(hostRepo.WithByAddr(req.Addr))
+	if req.Name == "local" {
+		hostSame, _ := hostRepo.Get(repo.WithByName("local"))
 		sameHostID = hostSame.ID
 	} else {
 		hostSame, _ := hostRepo.Get(hostRepo.WithByAddr(req.Addr), hostRepo.WithByUser(req.User), hostRepo.WithByPort(req.Port))
diff --git a/core/cmd/server/conf/app.yaml b/core/cmd/server/conf/app.yaml
@@ -1,18 +1,20 @@
-system:
-  db_core_file: core.db
-  base_dir: /opt
+base:
+  install_dir: /opt
   mode: dev
-  repo_url: https://resource.fit2cloud.com/1panel/package
-  app_repo: https://apps-assets.fit2cloud.com
   is_demo: false
   is_intl: false
   port: 9999
   username: admin
   password: admin123
+  version: v2.0.0
+
+remote_url:
+  repo_url: https://resource.fit2cloud.com/1panel/package
+  app_repo: https://apps-assets.fit2cloud.com
 
 log:
   level: debug
   time_zone: Asia/Shanghai
   log_name: 1Panel
   log_suffix: .log
-  max_backup: 10
+  max_backup: 10
diff --git a/core/global/config.go b/core/global/config.go
@@ -36,8 +36,7 @@ type ApiInterface struct {
 }
 
 type RemoteURL struct {
-	RepoUrl     string `mapstructure:"repo_url"`
-	ResourceUrl string `mapstructure:"resource_url"`
+	RepoUrl string `mapstructure:"repo_url"`
 }
 
 type LogConfig struct {
diff --git a/core/init/migration/migrate.go b/core/init/migration/migrate.go
@@ -20,6 +20,7 @@ func Init() {
 		migrations.AddTaskDB,
 		migrations.UpdateSettingStatus,
 		migrations.RemoveLocalBackup,
+		migrations.AddMFAInterval,
 	})
 	if err := m.Migrate(); err != nil {
 		global.LOG.Error(err)
diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go
@@ -297,3 +297,13 @@ var RemoveLocalBackup = &gormigrate.Migration{
 		return nil
 	},
 }
+
+var AddMFAInterval = &gormigrate.Migration{
+	ID: "20250207-add-mfa-interval",
+	Migrate: func(tx *gorm.DB) error {
+		if err := tx.Create(&model.Setting{Key: "MFAInterval", Value: "30"}).Error; err != nil {
+			return err
+		}
+		return nil
+	},
+}
diff --git a/frontend/package.json b/frontend/package.json
@@ -21,6 +21,8 @@
     },
     "dependencies": {
         "@codemirror/lang-json": "^6.0.1",
+        "@codemirror/lang-html": "^6.4.9",
+        "@codemirror/lang-php": "^6.0.1",
         "@codemirror/language": "^6.10.2",
         "@codemirror/legacy-modes": "^6.4.0",
         "@codemirror/theme-one-dark": "^6.1.2",
diff --git a/frontend/src/components/group/index.vue b/frontend/src/components/group/index.vue
@@ -2,7 +2,7 @@
     <DrawerPro v-model="open" :header="$t('commons.table.group')" size="large" :back="handleClose">
         <template #content>
             <ComplexTable :data="data" @search="search()">
-                <template #leftToolBar>
+                <template #toolbar>
                     <el-button type="primary" @click="openCreate">{{ $t('website.createGroup') }}</el-button>
                 </template>
                 <el-table-column :label="$t('commons.table.name')" prop="name">
diff --git a/frontend/src/components/upload/index.vue b/frontend/src/components/upload/index.vue
@@ -65,7 +65,7 @@
                         v-model:selects="selects"
                         :data="data"
                     >
-                        <template #leftToolBar>
+                        <template #toolbar>
                             <el-button
                                 class="ml-2.5"
                                 plain
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
@@ -1109,6 +1109,7 @@ const message = {
         },
         ftp: {
             ftp: 'FTP Account',
+            notStart: 'FTP service is currently not running, please start it first!',
             noFtp: 'FTP (pure-ftpd) service not detected, please refer to the official documentation for installation!',
             operation: 'Perform [{0}] operation on FTP service, continue?',
             noPasswdMsg: 'Can not get the current FTP account password, please set the password and try again! ',
diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts
@@ -1050,6 +1050,7 @@ const message = {
         },
         ftp: {
             ftp: 'FTPアカウント|FTPアカウント',
+            notStart: 'FTP Serviceは現在実行されていません。最初に開始してください！',
             noFtp: `FTP（Pure-FTPD）サービスは検出されません。インストールする公式ドキュメントを参照してください。`,
             operation: 'これにより、FTPサービスで「{0}」操作が実行されます。続けたいですか？',
             noPasswdMsg: '現在のFTPアカウントパスワードを取得できません。パスワードを設定して再試行してください！',
diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts
@@ -1041,6 +1041,7 @@ const message = {
         },
         ftp: {
             ftp: 'FTP 계정 | FTP 계정들',
+            notStart: 'FTP 서비스가 현재 실행 중이 아닙니다. 먼저 시작하세요!',
             noFtp: `FTP (pure-ftpd) 서비스가 감지되지 않았습니다. 공식 문서를 참조하여 설치하세요.`,
             operation: 'FTP 서비스에서 "{0}" 작업을 수행합니다. 계속하시겠습니까?',
             noPasswdMsg: '현재 FTP 계정의 비밀번호를 가져올 수 없습니다. 비밀번호를 설정한 후 다시 시도하세요!',
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
@@ -1087,6 +1087,7 @@ const message = {
         },
         ftp: {
             ftp: 'Akaun FTP | Akaun FTP',
+            notStart: 'Perkhidmatan FTP tidak berjalan pada masa ini, sila mulakan dahulu!',
             noFtp: 'Perkhidmatan FTP (pure-ftpd) tidak dikesan. Rujuk dokumen rasmi untuk memasang.',
             operation: 'Ini akan melaksanakan operasi "{0}" pada perkhidmatan FTP. Adakah anda mahu meneruskan?',
             noPasswdMsg:
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
@@ -1075,6 +1075,7 @@ const message = {
     },
     ftp: {
         ftp: 'Conta FTP | Contas FTP',
+        notStart: 'O serviço FTP não está em execução, por favor, inicie-o primeiro!',
         noFtp: `O serviço FTP (pure-ftpd) não foi detectado. Consulte a documentação oficial para instalá-lo.`,
         operation: 'Isso realizará a operação "{0}" no serviço FTP. Deseja continuar?',
         noPasswdMsg: 'Não foi possível obter a senha atual da conta FTP, por favor, defina a senha e tente novamente!',
diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts
@@ -1079,6 +1079,7 @@ const message = {
         },
         ftp: {
             ftp: 'FTP аккаунт | FTP аккаунты',
+            notStart: 'Служба FTP в настоящее время не запущена, пожалуйста, сначала запустите её!',
             noFtp: 'Служба FTP (pure-ftpd) не обнаружена. Обратитесь к официальной документации для установки.',
             operation: 'Это выполнит операцию "{0}" над службой FTP. Хотите продолжить?',
             noPasswdMsg:
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
@@ -1048,6 +1048,7 @@ const message = {
         },
         ftp: {
             ftp: 'FTP 帳戶',
+            notStart: '當前未 FTP 服務，請先開啟！',
             noFtp: '未檢測到 FTP (pure-ftpd) 服務，請參考官方文檔進行安裝！',
             operation: '對 FTP 服務進行 [{0}] 操作，是否繼續？',
             noPasswdMsg: '無法獲取當前 FTP 賬號密碼，請先設置密碼後重試！',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
@@ -1045,6 +1045,7 @@ const message = {
         },
         ftp: {
             ftp: 'FTP 账户',
+            notStart: '当前未开启 FTP 服务，请先开启！',
             noFtp: '未检测到 FTP (pure-ftpd) 服务，请参考官方文档进行安装！',
             operation: '对 FTP 服务进行 [{0}] 操作，是否继续？',
             noPasswdMsg: '无法获取当前 FTP 账号密码，请先设置密码后重试！',
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
@@ -386,7 +386,7 @@ import AppIgnore from './ignore/index.vue';
 import ComposeLogs from '@/components/compose-log/index.vue';
 import { App } from '@/api/interface/app';
 import Status from '@/components/status/index.vue';
-import { getAge, getLanguage } from '@/utils/util';
+import { getAge } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import { MsgSuccess } from '@/utils/message';
 import { toFolder } from '@/global/business';
@@ -432,7 +432,6 @@ const router = useRouter();
 const activeName = ref(i18n.global.t('app.installed'));
 const mode = ref('installed');
 const moreTag = ref('');
-const language = getLanguage();
 const defaultLink = ref('');
 
 const options = {
diff --git a/frontend/src/views/database/redis/setting/persistence/index.vue b/frontend/src/views/database/redis/setting/persistence/index.vue
@@ -80,7 +80,7 @@
         </el-row>
         <el-card style="margin-top: 20px">
             <ComplexTable :pagination-config="paginationConfig" v-model:selects="selects" @search="search" :data="data">
-                <template #leftToolBar>
+                <template #toolbar>
                     <el-button type="primary" @click="onBackup">{{ $t('commons.button.backup') }}</el-button>
                     <el-button type="primary" plain :disabled="selects.length === 0" @click="onBatchDelete(null)">
                         {{ $t('commons.button.delete') }}
diff --git a/frontend/src/views/home/app/index.vue b/frontend/src/views/home/app/index.vue
@@ -185,13 +185,11 @@ import { changeLauncherStatus, loadAppLauncher, loadAppLauncherOption } from '@/
 import i18n from '@/lang';
 import { GlobalStore } from '@/store';
 import { MsgSuccess } from '@/utils/message';
-import { getLanguage } from '@/utils/util';
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { toFolder } from '@/global/business';
 
 const router = useRouter();
-const language = getLanguage();
 const globalStore = GlobalStore();
 
 let loading = ref(false);
diff --git a/frontend/src/views/terminal/command/index.vue b/frontend/src/views/terminal/command/index.vue
@@ -19,8 +19,13 @@
                 <el-select v-model="group" @change="search()" clearable class="p-w-200 mr-2.5">
                     <template #prefix>{{ $t('commons.table.group') }}</template>
                     <el-option :label="$t('commons.table.all')" value=""></el-option>
-                    <div v-for="item in groupList" :key="item.name">
-                        <el-option :value="item.id" :label="item.name" />
+                    <div v-for="item in groupList" :key="item.id">
+                        <el-option
+                            v-if="item.name === 'default'"
+                            :label="$t('commons.table.default')"
+                            :value="item.id"
+                        />
+                        <el-option v-else :label="item.name" :value="item.id" />
                     </div>
                 </el-select>
                 <TableSearch @search="search()" v-model:searchName="info" />
@@ -56,7 +61,23 @@
                         min-width="100"
                         prop="groupBelong"
                         fix
-                    />
+                    >
+                        <template #default="{ row }">
+                            <fu-select-rw-switch v-model="row.groupID" @change="updateGroup(row)">
+                                <template #read>
+                                    {{ row.groupBelong === 'default' ? $t('commons.table.default') : row.groupBelong }}
+                                </template>
+                                <div v-for="item in groupList" :key="item.id">
+                                    <el-option
+                                        v-if="item.name === 'default'"
+                                        :label="$t('commons.table.default')"
+                                        :value="item.id"
+                                    />
+                                    <el-option v-else :label="item.name" :value="item.id" />
+                                </div>
+                            </fu-select-rw-switch>
+                        </template>
+                    </el-table-column>
                     <fu-table-operations width="200px" :buttons="buttons" :label="$t('commons.table.operate')" fix />
                 </ComplexTable>
             </template>
@@ -81,7 +102,12 @@
                 <el-form-item :label="$t('commons.table.group')" prop="name">
                     <el-select filterable v-model="commandInfo.groupID" clearable style="width: 100%">
                         <div v-for="item in groupList" :key="item.id">
-                            <el-option :label="item.name" :value="item.id" />
+                            <el-option
+                                v-if="item.name === 'default'"
+                                :label="$t('commons.table.default')"
+                                :value="item.id"
+                            />
+                            <el-option v-else :label="item.name" :value="item.id" />
                         </div>
                     </el-select>
                 </el-form-item>
@@ -101,14 +127,12 @@
 
         <OpDialog ref="opRef" @search="search" />
         <GroupDialog @search="loadGroups" ref="dialogGroupRef" />
-        <GroupChangeDialog @search="search" @change="onChangeGroup" ref="dialogGroupChangeRef" />
     </div>
 </template>
 
 <script setup lang="ts">
 import { Command } from '@/api/interface/command';
 import GroupDialog from '@/components/group/index.vue';
-import GroupChangeDialog from '@/components/group/change.vue';
 import { addCommand, editCommand, deleteCommand, getCommandPage } from '@/api/modules/command';
 import { reactive, ref } from 'vue';
 import type { ElForm } from 'element-plus';
@@ -131,7 +155,6 @@ const paginationConfig = reactive({
 });
 const info = ref();
 const group = ref<string>('');
-const dialogGroupChangeRef = ref();
 
 const opRef = ref();
 
@@ -203,9 +226,8 @@ const submitAddCommand = (formEl: FormInstance | undefined) => {
     });
 };
 
-const onChangeGroup = async (groupID: number) => {
-    commandInfo.groupID = groupID;
-    await editCommand(commandInfo);
+const updateGroup = async (row: any) => {
+    await editCommand(row);
     search();
     MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
 };
@@ -235,16 +257,6 @@ const batchDelete = async (row: Command.CommandInfo | null) => {
 };
 
 const buttons = [
-    {
-        label: i18n.global.t('terminal.groupChange'),
-        click: (row: any) => {
-            commandInfo = row;
-            dialogGroupChangeRef.value!.acceptParams({
-                group: row.groupBelong,
-                groupType: 'command',
-            });
-        },
-    },
     {
         label: i18n.global.t('commons.button.edit'),
         icon: 'Edit',
diff --git a/frontend/src/views/terminal/host/change-group/index.vue b/frontend/src/views/terminal/host/change-group/index.vue
diff --git a/frontend/src/views/terminal/host/index.vue b/frontend/src/views/terminal/host/index.vue
diff --git a/frontend/src/views/terminal/host/operate/index.vue b/frontend/src/views/terminal/host/operate/index.vue
diff --git a/frontend/src/views/terminal/terminal/host-create.vue b/frontend/src/views/terminal/terminal/host-create.vue
diff --git a/frontend/src/views/terminal/terminal/index.vue b/frontend/src/views/terminal/terminal/index.vue
diff --git a/frontend/src/views/toolbox/clean/index.vue b/frontend/src/views/toolbox/clean/index.vue
diff --git a/frontend/src/views/toolbox/ftp/index.vue b/frontend/src/views/toolbox/ftp/index.vue
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ type ApiInterface struct {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`type RemoteURL struct {`
`39`		- RepoUrl string `mapstructure:"repo_url"`
`40`		- ResourceUrl string `mapstructure:"resource_url"`
	`39`	+ RepoUrl string `mapstructure:"repo_url"`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`type LogConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`v-model:selects="selects"`
`66`	`66`	`:data="data"`
`67`	`67`	`>`
`68`		`- <template #leftToolBar>`
	`68`	`+ <template #toolbar>`
`69`	`69`	`<el-button`
`70`	`70`	`class="ml-2.5"`
`71`	`71`	`plain`