From 4dc1b516f4f7fd72dfb7d0422f532eeaa56ae8aa Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Mon, 5 Dec 2022 16:04:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9redis=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/phpmyadmin/versions/5.2.0/config.json | 2 +- .../versions/0.8.0/config.json | 2 +- apps/redis/versions/6.0.16/conf/redis.conf | 22 ++++++++++++------- apps/redis/versions/7.0.5/conf/redis.conf | 22 ++++++++++++------- frontend/src/lang/modules/zh.ts | 1 + 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/apps/phpmyadmin/versions/5.2.0/config.json b/apps/phpmyadmin/versions/5.2.0/config.json index 909103187..42e5ed557 100644 --- a/apps/phpmyadmin/versions/5.2.0/config.json +++ b/apps/phpmyadmin/versions/5.2.0/config.json @@ -14,7 +14,7 @@ "labelZh": "端口", "labelEn": "Port", "required": true, - "default": 8080, + "default": 8089, "envKey": "PANEL_APP_PORT_HTTP" } ] diff --git a/apps/redis-commander/versions/0.8.0/config.json b/apps/redis-commander/versions/0.8.0/config.json index 50d4784c6..07e960da1 100644 --- a/apps/redis-commander/versions/0.8.0/config.json +++ b/apps/redis-commander/versions/0.8.0/config.json @@ -22,7 +22,7 @@ "labelZh": "端口", "labelEn": "Port", "required": true, - "default": 8081, + "default": 8089, "envKey": "PANEL_APP_PORT_HTTP" } ] diff --git a/apps/redis/versions/6.0.16/conf/redis.conf b/apps/redis/versions/6.0.16/conf/redis.conf index 1e94d6edb..6486692d5 100644 --- a/apps/redis/versions/6.0.16/conf/redis.conf +++ b/apps/redis/versions/6.0.16/conf/redis.conf @@ -84,7 +84,7 @@ # You will also need to set a password unless you explicitly disable protected # mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -bind 127.0.0.1 -::1 +# bind 127.0.0.1 -::1 # By default, outgoing connections (from replica to master, from Sentinel to # instances, cluster bus, etc.) are not bound to a specific local address. In @@ -108,7 +108,7 @@ bind 127.0.0.1 -::1 # 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 yes +protected-mode no # 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: @@ -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 ./ +dir "/data" ################################# REPLICATION ################################# @@ -1343,7 +1343,6 @@ 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 @@ -1816,7 +1815,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 128 +slowlog-max-len 10086 ################################ LATENCY MONITOR ############################## @@ -1979,7 +1978,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 4096 +stream-node-max-bytes 4kb stream-node-max-entries 100 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in @@ -2274,3 +2273,10 @@ 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 diff --git a/apps/redis/versions/7.0.5/conf/redis.conf b/apps/redis/versions/7.0.5/conf/redis.conf index 1e94d6edb..6486692d5 100644 --- a/apps/redis/versions/7.0.5/conf/redis.conf +++ b/apps/redis/versions/7.0.5/conf/redis.conf @@ -84,7 +84,7 @@ # You will also need to set a password unless you explicitly disable protected # mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -bind 127.0.0.1 -::1 +# bind 127.0.0.1 -::1 # By default, outgoing connections (from replica to master, from Sentinel to # instances, cluster bus, etc.) are not bound to a specific local address. In @@ -108,7 +108,7 @@ bind 127.0.0.1 -::1 # 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 yes +protected-mode no # 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: @@ -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 ./ +dir "/data" ################################# REPLICATION ################################# @@ -1343,7 +1343,6 @@ 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 @@ -1816,7 +1815,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 128 +slowlog-max-len 10086 ################################ LATENCY MONITOR ############################## @@ -1979,7 +1978,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 4096 +stream-node-max-bytes 4kb stream-node-max-entries 100 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in @@ -2274,3 +2273,10 @@ 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 diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 9eec75da5..0d9c86ef1 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -139,6 +139,7 @@ export default { removing: '迁移中', paused: '暂停', exited: '停止', + installing: '安装中', }, }, menu: {