Modify the install script

* feat: Move current status to first position in MySQL and Redis settings and set as default tab

backend/app/service/website.go

@@ -427,7 +427,9 @@ func (w WebsiteService) UpdateWebsite(req request.WebsiteUpdate) error {
 		}
 	}
 	website.PrimaryDomain = req.PrimaryDomain
-	website.WebsiteGroupID = req.WebsiteGroupID
+	if req.WebsiteGroupID > 0 {
+		website.WebsiteGroupID = req.WebsiteGroupID
+	}
 	website.Remark = req.Remark
 	website.IPV6 = req.IPV6
 
@@ -1768,11 +1770,22 @@ func (w WebsiteService) GetProxies(id uint) (res []request.WebsiteProxyConfig, e
 		}
 		directives := config.GetDirectives()
 
-		location, ok := directives[0].(*components.Location)
+		var (
-		if !ok {
+			location *components.Location
-			err = errors.New("error")
+			ok       bool
-			return
+		)
+		for _, directive := range directives {
+			if directive.GetName() == "location" {
+				location, ok = directive.(*components.Location)
+				if ok {
+					break
+				}
+			}
 		}
+		if location == nil {
+			return nil, buserr.New("ErrConfigParse")
+		}
+
 		proxyConfig.ProxyPass = location.ProxyPass
 		proxyConfig.Cache = location.Cache
 		if location.CacheTime > 0 {

backend/utils/mysql/client/local.go

@@ -188,19 +188,18 @@ func (r *Local) ChangeAccess(info AccessChangeInfo) error {
 		info.Name = "*"
 		info.Password = r.Password
 	}
-	if info.Permission == info.OldPermission {
+	if info.Permission != info.OldPermission {
-		return nil
+		if err := r.Delete(DeleteInfo{
-	}
+			Version:     info.Version,
-	if err := r.Delete(DeleteInfo{
+			Username:    info.Username,
-		Version:     info.Version,
+			Permission:  info.OldPermission,
-		Username:    info.Username,
+			ForceDelete: true,
-		Permission:  info.OldPermission,
+			Timeout:     300}); err != nil {
-		ForceDelete: true,
+			return err
-		Timeout:     300}); err != nil {
+		}
-		return err
+		if info.Username == "root" {
-	}
+			return nil
-	if info.Username == "root" {
+		}
-		return nil
 	}
 	if err := r.CreateUser(CreateInfo{
 		Name:       info.Name,

backend/utils/mysql/client/remote.go

@@ -199,19 +199,18 @@ func (r *Remote) ChangeAccess(info AccessChangeInfo) error {
 		info.Name = "*"
 		info.Password = r.Password
 	}
-	if info.Permission == info.OldPermission {
+	if info.Permission != info.OldPermission {
-		return nil
+		if err := r.Delete(DeleteInfo{
-	}
+			Version:     info.Version,
-	if err := r.Delete(DeleteInfo{
+			Username:    info.Username,
-		Version:     info.Version,
+			Permission:  info.OldPermission,
-		Username:    info.Username,
+			ForceDelete: true,
-		Permission:  info.OldPermission,
+			Timeout:     300}); err != nil {
-		ForceDelete: true,
+			return err
-		Timeout:     300}); err != nil {
+		}
-		return err
+		if info.Username == "root" {
-	}
+			return nil
-	if info.Username == "root" {
+		}
-		return nil
 	}
 	if err := r.CreateUser(CreateInfo{
 		Name:       info.Name,

ci/script.sh

@@ -6,15 +6,15 @@ command -v wget >/dev/null || {
 }
 
 if [ ! -f "1pctl" ]; then 
-  wget https://github.com/1Panel-dev/installer/raw/main/1pctl
+  wget https://github.com/1Panel-dev/installer/raw/dev/1pctl
 fi
 
 if [ ! -f "1panel.service" ]; then 
-  wget https://github.com/1Panel-dev/installer/raw/main/1panel.service
+  wget https://github.com/1Panel-dev/installer/raw/dev/1panel.service
 fi
 
 if [ ! -f "install.sh" ]; then 
-  wget https://github.com/1Panel-dev/installer/raw/main/install.sh
+  wget https://github.com/1Panel-dev/installer/raw/dev/install.sh
 fi
 
 if [ ! -f "GeoIP.mmdb" ]; then 

cmd/server/nginx_conf/proxy.conf

@@ -7,6 +7,7 @@ location ^~ /test {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $http_connection;
     proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Port $server_port;
     proxy_http_version 1.1;
     add_header X-Cache $upstream_cache_status;
     add_header Cache-Control no-cache; 

frontend/src/global/mimetype.ts

@@ -95,6 +95,10 @@ export const Languages = [
         label: 'css',
         value: ['css'],
     },
+    {
+        label: 'ini',
+        value: ['ini'],
+    },
 ];
 
 export const Rewrites = [

frontend/src/lang/modules/en.ts

@@ -2621,7 +2621,7 @@ const message = {
         domain: 'Default Access Address',
         domainHelper: 'For example: 192.168.1.1 or example.com',
         bindDomain: 'Bind Website',
-        commandPlaceHolder: 'Currently only supports npx startup commands',
+        commandPlaceHolder: 'Currently only supports npx and binary startup commands',
         importMcpJson: 'Import MCP Server Configuration',
         importMcpJsonError: 'mcpServers structure is incorrect',
         bindDomainHelper:

frontend/src/lang/modules/ja.ts

@@ -2591,7 +2591,7 @@ const message = {
         domain: 'デフォルトアクセスアドレス',
         domainHelper: '例: 192.168.1.1 または example.com',
         bindDomain: 'ウェブサイトをバインド',
-        commandPlaceHolder: '現在、npx スタートアップコマンドのみをサポートしています',
+        commandPlaceHolder: '現在、npx およびバイナリスタートアップコマンドのみをサポートしています',
         importMcpJson: 'MCP サーバー設定をインポート',
         importMcpJsonError: 'mcpServers 構造が正しくありません',
         bindDomainHelper:

frontend/src/lang/modules/ko.ts

@@ -2550,7 +2550,7 @@ const message = {
         domain: 'デフォルトアクセスアドレス',
         domainHelper: '例: 192.168.1.1 または example.com',
         bindDomain: 'ウェブサイトをバインド',
-        commandPlaceHolder: '현재 npx 시작 명령만 지원합니다',
+        commandPlaceHolder: '현재 npx 및 바이너리 시작 명령만 지원합니다',
         importMcpJson: 'MCP サーバー設定をインポート',
         importMcpJsonError: 'mcpServers 構造が正しくありません',
         bindDomainHelper:

frontend/src/lang/modules/ms.ts

@@ -2649,7 +2649,7 @@ const message = {
         domain: 'Alamat Akses Lalai',
         domainHelper: 'Contoh: 192.168.1.1 atau example.com',
         bindDomain: 'Sematkan Laman Web',
-        commandPlaceHolder: 'Kini hanya menyokong perintah pelancaran npx',
+        commandPlaceHolder: 'Kini hanya menyokong perintah pelancaran npx dan binari',
         importMcpJson: 'Import Konfigurasi Pelayan MCP',
         importMcpJsonError: 'Struktur mcpServers tidak betul',
         bindDomainHelper:

frontend/src/lang/modules/pt-br.ts

@@ -2647,7 +2647,7 @@ const message = {
         domain: 'Endereço de Acesso Padrão',
         domainHelper: 'Por exemplo: 192.168.1.1 ou example.com',
         bindDomain: 'Vincular Site',
-        commandPlaceHolder: 'Atualmente, apenas comandos de inicialização npx são suportados',
+        commandPlaceHolder: 'Atualmente, apenas comandos de inicialização npx e binários são suportados',
         importMcpJson: 'Importar Configuração do Servidor MCP',
         importMcpJsonError: 'A estrutura mcpServers está incorreta',
         bindDomainHelper:

frontend/src/lang/modules/ru.ts

@@ -2643,7 +2643,7 @@ const message = {
         domain: 'Адрес доступа по умолчанию',
         domainHelper: 'Например: 192.168.1.1 или example.com',
         bindDomain: 'Привязать сайт',
-        commandPlaceHolder: 'В настоящее время поддерживаются только команды запуска npx',
+        commandPlaceHolder: 'В настоящее время поддерживаются только команды запуска npx и двоичных файлов',
         importMcpJson: 'Импортировать конфигурацию сервера MCP',
         importMcpJsonError: 'Структура mcpServers некорректна',
         bindDomainHelper:

frontend/src/lang/modules/tw.ts

@@ -2456,7 +2456,7 @@ const message = {
         domain: '默認訪問地址',
         domainHelper: '例如：192.168.1.1 或者 example.com',
         bindDomain: '綁定網站',
-        commandPlaceHolder: '當前僅支持 npx 啟動命令',
+        commandPlaceHolder: '當前僅支持 npx 和 二進制啟動的命令',
         importMcpJson: '導入 MCP Server配置',
         importMcpJsonError: 'mcpServers 結構不正確',
         bindDomainHelper: '綁定網站之後會修改所有已安裝 MCP Server 的訪問地址，並關閉端口的外部訪問',

frontend/src/lang/modules/zh.ts

@@ -2458,7 +2458,7 @@ const message = {
         domain: '默认访问地址',
         domainHelper: '例如：192.168.1.1 或者 example.com',
         bindDomain: '绑定网站',
-        commandPlaceHolder: '当前仅支持 npx 启动命令',
+        commandPlaceHolder: '当前仅支持 npx 和 二进制启动的命令',
         importMcpJson: '导入 MCP Server 配置',
         importMcpJsonError: 'mcpServers 结构不正确',
         bindDomainHelper: '绑定网站之后会修改所有已安装 MCP Server 的访问地址，并关闭端口的外部访问',

frontend/src/store/modules/global.ts

@@ -49,7 +49,7 @@ const GlobalStore = defineStore({
             state.themeConfig.theme === 'dark' ||
             (state.themeConfig.theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches),
         isDarkGoldTheme: (state) => state.themeConfig.primary === '#F0BE96' && state.isProductPro,
-        docsUrl: (state) => (state.isIntl ? 'https://docs.1panel.pro' : 'https://1panel.cn/docs'),
+        docsUrl: (state) => (state.isIntl ? 'https://docs.1panel.pro' : 'https://1panel.cn/docs/v1'),
     },
     actions: {
         setOpenMenuTabs(openMenuTabs: boolean) {

frontend/src/views/container/image/prune/index.vue

@@ -70,9 +70,10 @@ const acceptParams = async (): Promise<void> => {
     unUsedList.value = [];
     for (const item of list) {
         if (
-            !item.tags ||
+            (!item.tags ||
-            item.tags.length === 0 ||
+                item.tags.length === 0 ||
-            (item.tags.length === 1 && item.tags[0].indexOf('<none>') !== -1 && !item.isUsed)
+                (item.tags.length === 1 && item.tags[0].indexOf('<none>') !== -1)) &&
+            !item.isUsed
         ) {
             unTagList.value.push(item);
         }

frontend/src/views/cronjob/record/index.vue

@@ -395,6 +395,7 @@ const search = async () => {
     if (!currentRecord.value) {
         currentRecord.value = records.value[0];
     } else {
+        let oldRecordID = currentRecord.value.id;
         let beDelete = true;
         for (const item of records.value) {
             if (item.id === currentRecord.value.id) {
@@ -406,6 +407,9 @@ const search = async () => {
         if (beDelete) {
             currentRecord.value = records.value[0];
         }
+        if (oldRecordID === currentRecord.value.id && currentRecord.value.status !== 'Waiting') {
+            return;
+        }
     }
     if (currentRecord.value?.records) {
         loadRecord(currentRecord.value);
@@ -419,7 +423,7 @@ const forDetail = async (row: Cronjob.Record) => {
 const loadRecord = async (row: Cronjob.Record) => {
     if (row.records) {
         const res = await getRecordLog(row.id);
-        let log = res.data.replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, '');
+        let log = res.data.replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, '').replace(/\r/g, '');
         if (currentRecordDetail.value === log) {
             return;
         }

frontend/src/views/database/mysql/password/index.vue

@@ -74,6 +74,8 @@ const changeVisible = ref(false);
 type FormInstance = InstanceType<typeof ElForm>;
 const changeFormRef = ref<FormInstance>();
 const title = ref();
+const oldPrivilege = ref();
+const oldPrivilegeIPs = ref();
 const changeForm = reactive({
     id: 0,
     from: '',
@@ -124,6 +126,8 @@ const acceptParams = (params: DialogProps): void => {
     changeForm.privilegeIPs = params.privilegeIPs;
     changeForm.value = params.value;
     changeVisible.value = true;
+    oldPrivilege.value = params.privilege;
+    oldPrivilegeIPs.value = params.privilegeIPs;
 };
 const emit = defineEmits<{ (e: 'search'): void }>();
 
@@ -167,6 +171,10 @@ const submitChangeInfo = async (formEl: FormInstance | undefined) => {
             }
             return;
         }
+        if (changeForm.privilege === oldPrivilege.value && changeForm.privilegeIPs === oldPrivilegeIPs.value) {
+            changeVisible.value = false;
+            return;
+        }
         if (changeForm.privilege !== 'ip') {
             param.value = changeForm.privilege;
         } else {

frontend/src/views/database/mysql/setting/index.vue

@@ -4,9 +4,6 @@
             <template #title>
                 <back-button name="MySQL" :header="props.database + ' ' + $t('commons.button.set')">
                     <template #buttons>
-                        <el-button type="primary" :plain="activeName !== 'conf'" @click="jumpToConf">
-                            {{ $t('database.confChange') }}
-                        </el-button>
                         <el-button
                             type="primary"
                             :disabled="mysqlStatus !== 'Running'"
@@ -15,6 +12,9 @@
                         >
                             {{ $t('database.currentStatus') }}
                         </el-button>
+                        <el-button type="primary" :plain="activeName !== 'conf'" @click="jumpToConf">
+                            {{ $t('database.confChange') }}
+                        </el-button>
                         <el-button
                             type="primary"
                             :disabled="mysqlStatus !== 'Running'"
@@ -159,7 +159,7 @@ const globalStore = GlobalStore();
 const loading = ref(false);
 
 const extensions = [javascript(), oneDark];
-const activeName = ref('conf');
+const activeName = ref('status');
 
 const baseInfo = reactive({
     name: '',

frontend/src/views/database/redis/setting/index.vue

@@ -2,9 +2,6 @@
     <div v-show="settingShow" v-loading="loading">
         <LayoutContent :title="database + ' ' + $t('commons.button.set')" :reload="true">
             <template #buttons>
-                <el-button type="primary" :plain="activeName !== 'conf'" @click="changeTab('conf')">
-                    {{ $t('database.confChange') }}
-                </el-button>
                 <el-button
                     type="primary"
                     :disabled="redisStatus !== 'Running'"
@@ -13,6 +10,9 @@
                 >
                     {{ $t('database.currentStatus') }}
                 </el-button>
+                <el-button type="primary" :plain="activeName !== 'conf'" @click="changeTab('conf')">
+                    {{ $t('database.confChange') }}
+                </el-button>
                 <el-button
                     type="primary"
                     :disabled="redisStatus !== 'Running'"
@@ -170,7 +170,7 @@ const rules = reactive({
     maxmemory: [Rules.number, checkNumberRange(0, 999999)],
 });
 
-const activeName = ref('conf');
+const activeName = ref('status');
 const statusRef = ref();
 const persistenceRef = ref();
 
@@ -217,7 +217,7 @@ const acceptParams = (prop: DialogProps): void => {
     redisStatus.value = prop.status;
     database.value = prop.database;
     settingShow.value = true;
-    loadConfFile();
+    changeTab('status');
 };
 
 const portRef = ref();

frontend/src/views/host/file-management/code-editor/index.vue

@@ -328,6 +328,7 @@ const handleClose = () => {
                 saveContent();
             })
             .finally(() => {
+                isEdit.value = false;
                 closeEditor();
             });
     } else {

frontend/src/views/login/components/login-form.vue

@@ -72,6 +72,7 @@
                     </div>
                     <el-form-item prop="name" class="no-border">
                         <el-input
+                            name="username"
                             v-model.trim="loginForm.name"
                             :placeholder="$t('commons.login.username')"
                             class="form-input"
@@ -85,6 +86,7 @@
                     </el-form-item>
                     <el-form-item prop="password" class="no-border">
                         <el-input
+                            name="password"
                             type="password"
                             clearable
                             v-model.trim="loginForm.password"