feat: 应用商店增加minio应用

apps/list.json

@@ -109,6 +109,19 @@
       "limit": 1,
       "crossVersionUpdate": true,
       "source": "https://github.com/joeferner/redis-commander"
+    },
+    {
+      "key": "minio",
+      "name": "MinIO",
+      "tags": ["Tool"],
+      "versions": ["RELEASE.2022-08-13T21-54-44Z"],
+      "short_desc": "开源的对象存储服务器",
+      "author": "minio",
+      "type": "tool",
+      "required": [],
+      "limit": 1,
+      "crossVersionUpdate": true,
+      "source": "https://github.com/minio/minio"
     }
   ]
 }

apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/config.json

@@ -0,0 +1,28 @@
+{
+  "formFields": [
+    {
+      "type": "text",
+      "labelZh": "Root 用户",
+      "labelEn": "User",
+      "required": true,
+      "default": "random",
+      "envKey": "MINIO_ROOT_USER"
+    },
+    {
+      "type": "text",
+      "labelZh": "密码",
+      "labelEn": "Password",
+      "required": true,
+      "default": "Password@123",
+      "envKey": "MINIO_ROOT_PASSWORD"
+    },
+    {
+      "type": "number",
+      "labelZh": "端口",
+      "labelEn": "Port",
+      "required": true,
+      "default": 9000,
+      "envKey": "PANEL_APP_PORT_HTTP"
+    }
+  ]
+}

apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml

@@ -0,0 +1,26 @@
+version: '3'
+services:
+    1panel_minio:
+      image: minio/minio:RELEASE.2022-08-13T21-54-44Z
+      container_name: 1panel_minio
+      ports:
+        - ${PANEL_APP_PORT_HTTP}:9000
+        - "9001:9001"
+      restart: always
+      command: server /data --console-address ":9001"
+      environment:
+        MINIO_ROOT_USER: ${MINIO_ROOT_USER}
+        MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
+      logging:
+        options:
+          max-size: "5M"
+          max-file: "10"
+        driver: json-file
+      networks:
+        - 1panel
+      volumes:
+        - ./data:/data
+
+networks:
+  1panel:
+    external: true

apps/redis/versions/7.0.5/conf/redis.conf

@@ -108,7 +108,7 @@
 # By default protected mode is enabled. You should disable it only if
 # you are sure you want clients from other hosts to connect to Redis
 # even if no authentication is configured.
-protected-mode no
+protected-mode yes
 
 # Redis uses default hardened security configuration directives to reduce the
 # attack surface on innocent users. Therefore, several sensitive configuration
@@ -338,7 +338,7 @@ daemonize no
 #
 # Note that on modern Linux systems "/run/redis.pid" is more conforming
 # and should be used instead.
-pidfile "/var/run/redis_6379.pid"
+pidfile /var/run/redis_6379.pid
 
 # Specify the server verbosity level.
 # This can be one of:
@@ -430,7 +430,7 @@ proc-title-template "{title} {listen-addr} {server-mode}"
 #
 # You can set these explicitly by uncommenting the following line.
 #
-# save 3600 1 300 100 60 10000
+save 3600 1 300 100 60 10000
 
 # By default Redis will stop accepting writes if RDB snapshots are enabled
 # (at least one save point) and the latest background save failed.
@@ -478,7 +478,7 @@ rdbchecksum yes
 # sanitize-dump-payload no
 
 # The filename where to dump the DB
-dbfilename "dump.rdb"
+dbfilename dump.rdb
 
 # Remove RDB files used by replication in instances without persistence
 # enabled. By default this option is disabled, however there are environments
@@ -501,7 +501,7 @@ rdb-del-sync-files no
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.
-dir "/data"
+dir ./
 
 ################################# REPLICATION #################################
 
@@ -1343,6 +1343,7 @@ oom-score-adj no
 # oom-score-adj-values to positive values will always succeed.
 oom-score-adj-values 0 200 800
 
+
 #################### KERNEL transparent hugepage CONTROL ######################
 
 # Usually the kernel Transparent Huge Pages control is set to "madvise" or
@@ -1815,7 +1816,7 @@ slowlog-log-slower-than 10000
 
 # There is no limit to this length. Just be aware that it will consume memory.
 # You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 10086
+slowlog-max-len 128
 
 ################################ LATENCY MONITOR ##############################
 
@@ -1978,7 +1979,7 @@ hll-sparse-max-bytes 3000
 # zero, the limit is ignored, so for instance it is possible to set just a
 # max entries limit by setting max-bytes to 0 and max-entries to the desired
 # value.
-stream-node-max-bytes 4kb
+stream-node-max-bytes 4096
 stream-node-max-entries 100
 
 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
@@ -2273,10 +2274,3 @@ jemalloc-bg-thread yes
 # to suppress
 #
 # ignore-warnings ARM64-COW-BUG
-
-# Generated by CONFIG REWRITE
-save 3600 1
-save 300 100
-save 60 10000
-latency-tracking-info-percentiles 50 99 99.9
-user default on nopass ~* &* +@all

apps/redis/versions/7.0.5/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - 1panel
     ports:
       - ${PANEL_APP_PORT_HTTP}:6379
-    command: redis-server  /etc/redis/redis.conf --save 20 1 --loglevel warning --requirepass ${PANEL_DB_ROOT_PASSWORD}
+    command: redis-server  /etc/redis/redis.conf --requirepass ${PANEL_DB_ROOT_PASSWORD}
     volumes:
       - ./data:/data
       - ./conf/redis.conf:/etc/redis/redis.conf

frontend/src/styles/common.scss

@@ -182,7 +182,7 @@
 .mask-prompt {
     position: absolute;
     z-index: 9999;
-    top: 20%;
+    top: 25%;
     left: 50%;
     transform: translate(-50%, -50%);
 }

frontend/src/views/app-store/installed/index.vue

@@ -31,8 +31,8 @@
                     <el-tag round effect="dark" v-if="row.canUpdate">{{ $t('app.canUpdate') }}</el-tag>
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('app.app')" prop="app.name"></el-table-column>
+            <el-table-column :label="$t('app.app')" prop="app.name" show-overflow-tooltip></el-table-column>
-            <el-table-column :label="$t('app.version')" prop="version"></el-table-column>
+            <el-table-column :label="$t('app.version')" prop="version" show-overflow-tooltip></el-table-column>
             <el-table-column :label="$t('website.port')" prop="httpPort"></el-table-column>
             <el-table-column :label="$t('app.backup')">
                 <template #default="{ row }">

frontend/src/views/website/website/index.vue

@@ -62,9 +62,15 @@
                 <BackupRecords ref="dialogBackupRef" />
             </LayoutContent>
         </div>
-        <el-card width="30%" v-if="nginxStatus != 'Running'" class="mask-prompt">
+        <div v-if="nginxIsExist">
-            <span style="font-size: 14px">当前未启动 OpenResty 服务</span>
+            <el-card width="30%" v-if="nginxStatus == 'Stopped'" class="mask-prompt">
-        </el-card>
+                <span style="font-size: 14px">当前未启动 OpenResty 服务</span>
+            </el-card>
+            <el-card width="30%" v-else-if="nginxStatus !== 'Running'" class="mask-prompt">
+                <span style="font-size: 14px">OpenResty 服务状态异常</span>
+            </el-card>
+        </div>
+
         <el-card v-if="openNginxConfig">
             <NginxConfig :containerName="containerName" :status="nginxStatus"></NginxConfig>
         </el-card>