MaxKey 1 周之前
父節點
當前提交
fb6e9d9424

+ 1 - 0
.gitignore

@@ -56,3 +56,4 @@ maxkey-web-frontend/maxkey-web-app/dist
 
 **/out/*
 /.sonarlint
+**/**/package-lock.json

+ 10 - 7
maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java

@@ -40,22 +40,25 @@ public class InMemoryMomentaryService implements MomentaryService{
 
     @Override
     public  void put(String sessionId , String name, Object value){
-    	 _logger.trace("key {}, value {}",getSessionKey(sessionId , name),value);
-    	momentaryStore.put(getSessionKey(sessionId,name), value);
+    	String sessionKey = getSessionKey(sessionId , name);
+    	 _logger.trace("key {}, value {}",sessionKey,value);
+    	momentaryStore.put(sessionKey, value);
 	}
 
 	@Override
 	public Object remove(String sessionId , String name) {
-		Object value = momentaryStore.getIfPresent(getSessionKey(sessionId,name));	
-		momentaryStore.invalidate(getSessionKey(sessionId,name));
-		 _logger.trace("key {}, value {}",getSessionKey(sessionId , name),value);
+		String sessionKey = getSessionKey(sessionId , name);
+		Object value = momentaryStore.getIfPresent(sessionKey);	
+		momentaryStore.invalidate(sessionKey);
+		 _logger.trace("key {}, value {}",sessionKey,value);
 		return value;
 	}
 
     @Override
     public Object get(String sessionId , String name) {
-    	 _logger.trace("key {}",getSessionKey(sessionId , name));
-    	return momentaryStore.getIfPresent(getSessionKey(sessionId,name));
+    	String sessionKey = getSessionKey(sessionId , name);
+    	 _logger.trace("key {}",sessionKey);
+    	return momentaryStore.getIfPresent(sessionKey);
     }
 
 

+ 11 - 11
maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java

@@ -30,7 +30,8 @@ public class RedisMomentaryService implements MomentaryService {
 	
 	RedisConnectionFactory connectionFactory;
 	
-	public static String PREFIX="MXK_MOMENTARY_";
+	public static  final String PREFIX = "mxk:momentary:";
+	
 	/**
 	 * @param connectionFactory
 	 */
@@ -54,16 +55,18 @@ public class RedisMomentaryService implements MomentaryService {
 	@Override
 	public  void put(String sessionId , String name, Object value){
 		RedisConnection conn = connectionFactory.getConnection();
-		conn.setexObject(getSessionKey(sessionId , name), validitySeconds, value);
-		_logger.trace("key {}, validitySeconds {}, value {}",getSessionKey(sessionId , name),validitySeconds,value);
+		String sessionKey = getSessionKey(sessionId , name); 
+		conn.setexObject(sessionKey, validitySeconds, value);
+		_logger.trace("key {}, validitySeconds {}, value {}",sessionKey,validitySeconds,value);
 		conn.close();
 	}
 
     @Override
     public Object get(String sessionId , String name) {
         RedisConnection conn = connectionFactory.getConnection();
-        Object value = conn.getObject(getSessionKey(sessionId , name));
-        _logger.trace("key {}, value {}",getSessionKey(sessionId , name),value);
+        String sessionKey = getSessionKey(sessionId , name); 
+        Object value = conn.getObject(sessionKey);
+        _logger.trace("key {}, value {}",sessionKey,value);
         conn.close();
         return value;
     }
@@ -71,19 +74,16 @@ public class RedisMomentaryService implements MomentaryService {
 	@Override
 	public Object remove(String sessionId, String name) {
 		RedisConnection conn = connectionFactory.getConnection();
-        Object value = conn.getObject(getSessionKey(sessionId , name));
+		String sessionKey = getSessionKey(sessionId , name); 
+        Object value = conn.getObject(sessionKey);
         conn.delete(getSessionKey(sessionId , name));
         conn.close();
-        _logger.trace("key {}, value {}",getSessionKey(sessionId , name),value);
+        _logger.trace("key {}, value {}",sessionKey,value);
         return value;
 	}
 	
-
     private String getSessionKey(String sessionId , String name) {
     	return PREFIX + sessionId + name;
     }
 
-
-
-	
 }

+ 9 - 9
maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java

@@ -31,41 +31,41 @@ public class RedisConnectionFactory {
         /**
          * Redis默认服务器IP
          */
-        public static String DEFAULT_ADDRESS = "127.0.0.1";
+        public static final String DEFAULT_ADDRESS = "127.0.0.1";
         /**
          * Redis默认端口号
          */
-        public static int DEFAULT_PORT = 6379;
+        public static final int DEFAULT_PORT = 6379;
         /**
          * 访问密码
          */
-        public static String DEFAULT_AUTH = "admin";
+        public static final String DEFAULT_AUTH = "admin";
         /**
          * 可用连接实例的最大数目,默认值为8;<br>
          * 如果赋值为-1,则表示不限制;如果pool已经分配了maxActive个jedis实例,则此时pool的状态为exhausted(耗尽)。
          **/
-        public static int DEFAULT_MAX_ACTIVE = 5000;
+        public static final int DEFAULT_MAX_ACTIVE = 5000;
 
         /**
          * 控制一个pool最多有多少个状态为idle(空闲的)的jedis实例,默认值也是8。
          */
-        public static int DEFAULT_MAX_IDLE = 5000;
+        public static final int DEFAULT_MAX_IDLE = 5000;
 
         /**
          * 等待可用连接的最大时间,单位毫秒,默认值为-1,表示永不超时。如果超过等待时间,则直接抛出JedisConnectionException;
          */
-        public static int DEFAULT_MAX_WAIT_MILLIS = 10000;
+        public static final int DEFAULT_MAX_WAIT_MILLIS = 10000;
 
-        public static int DEFAULT_TIMEOUT = 10000;
+        public static final int DEFAULT_TIMEOUT = 10000;
 
         /**
          * 在borrow一个jedis实例时,是否提前进行validate操作;如果为true,则得到的jedis实例均是可用的;
          */
-        public static boolean DEFAULT_TEST_ON_BORROW = true;
+        public static final boolean DEFAULT_TEST_ON_BORROW = true;
         /**
          * 默认过期时间
          */
-        public static long DEFAULT_LIFETIME = 600;
+        public static final long DEFAULT_LIFETIME = 600;
     }
 
     JedisPoolConfig poolConfig;

+ 120 - 0
maxkey-web-frontend/maxkey-web-app/package-lock.json

@@ -15069,6 +15069,8 @@
     },
     "node_modules/npm/node_modules/@npmcli/move-file": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -15155,6 +15157,8 @@
     },
     "node_modules/npm/node_modules/agentkeepalive": {
       "version": "4.2.1",
+      "resolved": "https://registry.npmmirror.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -15232,6 +15236,8 @@
     },
     "node_modules/npm/node_modules/are-we-there-yet": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz",
+      "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -15300,6 +15306,8 @@
     },
     "node_modules/npm/node_modules/cacache": {
       "version": "16.0.2",
+      "resolved": "https://registry.npmmirror.com/cacache/-/cacache-16.0.2.tgz",
+      "integrity": "sha512-Q17j7s8X81i/QYVrKVQ/qwWGT+pYLfpTcZ+X+p/Qw9FULy9JEfb2FECYTTt6mPV6A/vk92nRZ80ncpKxiGTrIA==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -15536,6 +15544,8 @@
     },
     "node_modules/npm/node_modules/defaults": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -15551,6 +15561,8 @@
     },
     "node_modules/npm/node_modules/depd": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "inBundle": true,
       "license": "MIT",
       "engines": {
@@ -15611,6 +15623,8 @@
     },
     "node_modules/npm/node_modules/fastest-levenshtein": {
       "version": "1.0.12",
+      "resolved": "https://registry.npmmirror.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
       "inBundle": true,
       "license": "MIT"
     },
@@ -15636,11 +15650,15 @@
     },
     "node_modules/npm/node_modules/function-bind": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/gauge": {
       "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/gauge/-/gauge-4.0.3.tgz",
+      "integrity": "sha512-ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -15659,6 +15677,8 @@
     },
     "node_modules/npm/node_modules/glob": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -15678,11 +15698,15 @@
     },
     "node_modules/npm/node_modules/graceful-fs": {
       "version": "4.2.9",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.9.tgz",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
       "inBundle": true,
       "license": "ISC"
     },
     "node_modules/npm/node_modules/has": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -15722,6 +15746,8 @@
     },
     "node_modules/npm/node_modules/http-cache-semantics": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
       "inBundle": true,
       "license": "BSD-2-Clause"
     },
@@ -15742,6 +15768,8 @@
     },
     "node_modules/npm/node_modules/https-proxy-agent": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -15861,6 +15889,8 @@
     },
     "node_modules/npm/node_modules/ip": {
       "version": "1.1.5",
+      "resolved": "https://registry.npmmirror.com/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA==",
       "inBundle": true,
       "license": "MIT"
     },
@@ -15889,6 +15919,8 @@
     },
     "node_modules/npm/node_modules/is-core-module": {
       "version": "2.8.1",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -16164,6 +16196,8 @@
     },
     "node_modules/npm/node_modules/minipass": {
       "version": "3.1.6",
+      "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.1.6.tgz",
+      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -16188,6 +16222,8 @@
     },
     "node_modules/npm/node_modules/minipass-fetch": {
       "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/minipass-fetch/-/minipass-fetch-2.0.3.tgz",
+      "integrity": "sha512-VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -16217,6 +16253,8 @@
     },
     "node_modules/npm/node_modules/minipass-json-stream": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -16308,6 +16346,8 @@
     },
     "node_modules/npm/node_modules/negotiator": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "inBundle": true,
       "license": "MIT",
       "engines": {
@@ -16490,6 +16530,8 @@
     },
     "node_modules/npm/node_modules/npmlog": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmmirror.com/npmlog/-/npmlog-6.0.1.tgz",
+      "integrity": "sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -16709,6 +16751,8 @@
     },
     "node_modules/npm/node_modules/readable-stream": {
       "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -16790,6 +16834,8 @@
     },
     "node_modules/npm/node_modules/semver": {
       "version": "7.3.5",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -16842,6 +16888,8 @@
     },
     "node_modules/npm/node_modules/socks": {
       "version": "2.6.2",
+      "resolved": "https://registry.npmmirror.com/socks/-/socks-2.6.2.tgz",
+      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -16855,6 +16903,8 @@
     },
     "node_modules/npm/node_modules/socks-proxy-agent": {
       "version": "6.1.1",
+      "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz",
+      "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -16868,6 +16918,8 @@
     },
     "node_modules/npm/node_modules/spdx-correct": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
       "inBundle": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -16877,6 +16929,8 @@
     },
     "node_modules/npm/node_modules/spdx-exceptions": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
       "inBundle": true,
       "license": "CC-BY-3.0"
     },
@@ -16893,6 +16947,8 @@
     },
     "node_modules/npm/node_modules/spdx-license-ids": {
       "version": "3.0.11",
+      "resolved": "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
       "inBundle": true,
       "license": "CC0-1.0"
     },
@@ -16967,6 +17023,8 @@
     },
     "node_modules/npm/node_modules/tar": {
       "version": "6.1.11",
+      "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -17100,6 +17158,8 @@
     },
     "node_modules/npm/node_modules/write-file-atomic": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -35301,6 +35361,8 @@
         },
         "@npmcli/move-file": {
           "version": "1.1.2",
+          "resolved": "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz",
+          "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
           "bundled": true,
           "requires": {
             "mkdirp": "^1.0.4",
@@ -35366,6 +35428,8 @@
         },
         "agentkeepalive": {
           "version": "4.2.1",
+          "resolved": "https://registry.npmmirror.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+          "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
           "bundled": true,
           "requires": {
             "debug": "^4.1.0",
@@ -35420,6 +35484,8 @@
         },
         "are-we-there-yet": {
           "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz",
+          "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==",
           "bundled": true,
           "requires": {
             "delegates": "^1.0.0",
@@ -35472,6 +35538,8 @@
         },
         "cacache": {
           "version": "16.0.2",
+          "resolved": "https://registry.npmmirror.com/cacache/-/cacache-16.0.2.tgz",
+          "integrity": "sha512-Q17j7s8X81i/QYVrKVQ/qwWGT+pYLfpTcZ+X+p/Qw9FULy9JEfb2FECYTTt6mPV6A/vk92nRZ80ncpKxiGTrIA==",
           "bundled": true,
           "requires": {
             "@npmcli/fs": "^1.0.0",
@@ -35635,6 +35703,8 @@
         },
         "defaults": {
           "version": "1.0.3",
+          "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.3.tgz",
+          "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==",
           "bundled": true,
           "requires": {
             "clone": "^1.0.2"
@@ -35648,6 +35718,8 @@
         },
         "depd": {
           "version": "1.1.2",
+          "resolved": "https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
           "bundled": true
         },
         "dezalgo": {
@@ -35692,6 +35764,8 @@
         },
         "fastest-levenshtein": {
           "version": "1.0.12",
+          "resolved": "https://registry.npmmirror.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+          "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
           "bundled": true
         },
         "fs-minipass": {
@@ -35711,10 +35785,14 @@
         },
         "function-bind": {
           "version": "1.1.1",
+          "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
+          "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
           "bundled": true
         },
         "gauge": {
           "version": "4.0.3",
+          "resolved": "https://registry.npmmirror.com/gauge/-/gauge-4.0.3.tgz",
+          "integrity": "sha512-ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw==",
           "bundled": true,
           "requires": {
             "aproba": "^1.0.3 || ^2.0.0",
@@ -35729,6 +35807,8 @@
         },
         "glob": {
           "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
           "bundled": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -35741,10 +35821,14 @@
         },
         "graceful-fs": {
           "version": "4.2.9",
+          "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.9.tgz",
+          "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
           "bundled": true
         },
         "has": {
           "version": "1.0.3",
+          "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
+          "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
           "bundled": true,
           "requires": {
             "function-bind": "^1.1.1"
@@ -35771,6 +35855,8 @@
         },
         "http-cache-semantics": {
           "version": "4.1.0",
+          "resolved": "https://registry.npmmirror.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+          "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
           "bundled": true
         },
         "http-proxy-agent": {
@@ -35786,6 +35872,8 @@
         },
         "https-proxy-agent": {
           "version": "5.0.0",
+          "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
           "bundled": true,
           "requires": {
             "agent-base": "6",
@@ -35873,6 +35961,8 @@
         },
         "ip": {
           "version": "1.1.5",
+          "resolved": "https://registry.npmmirror.com/ip/-/ip-1.1.5.tgz",
+          "integrity": "sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA==",
           "bundled": true
         },
         "ip-regex": {
@@ -35892,6 +35982,8 @@
         },
         "is-core-module": {
           "version": "2.8.1",
+          "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz",
+          "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
           "bundled": true,
           "requires": {
             "has": "^1.0.3"
@@ -36090,6 +36182,8 @@
         },
         "minipass": {
           "version": "3.1.6",
+          "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.1.6.tgz",
+          "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
           "bundled": true,
           "requires": {
             "yallist": "^4.0.0"
@@ -36106,6 +36200,8 @@
         },
         "minipass-fetch": {
           "version": "2.0.3",
+          "resolved": "https://registry.npmmirror.com/minipass-fetch/-/minipass-fetch-2.0.3.tgz",
+          "integrity": "sha512-VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ==",
           "bundled": true,
           "requires": {
             "encoding": "^0.1.13",
@@ -36125,6 +36221,8 @@
         },
         "minipass-json-stream": {
           "version": "1.0.1",
+          "resolved": "https://registry.npmmirror.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+          "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
           "bundled": true,
           "requires": {
             "jsonparse": "^1.3.1",
@@ -36190,6 +36288,8 @@
         },
         "negotiator": {
           "version": "0.6.3",
+          "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
           "bundled": true
         },
         "node-gyp": {
@@ -36316,6 +36416,8 @@
         },
         "npmlog": {
           "version": "6.0.1",
+          "resolved": "https://registry.npmmirror.com/npmlog/-/npmlog-6.0.1.tgz",
+          "integrity": "sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==",
           "bundled": true,
           "requires": {
             "are-we-there-yet": "^3.0.0",
@@ -36470,6 +36572,8 @@
         },
         "readable-stream": {
           "version": "3.6.0",
+          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "bundled": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -36519,6 +36623,8 @@
         },
         "semver": {
           "version": "7.3.5",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "bundled": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -36555,6 +36661,8 @@
         },
         "socks": {
           "version": "2.6.2",
+          "resolved": "https://registry.npmmirror.com/socks/-/socks-2.6.2.tgz",
+          "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
           "bundled": true,
           "requires": {
             "ip": "^1.1.5",
@@ -36563,6 +36671,8 @@
         },
         "socks-proxy-agent": {
           "version": "6.1.1",
+          "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz",
+          "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==",
           "bundled": true,
           "requires": {
             "agent-base": "^6.0.2",
@@ -36572,6 +36682,8 @@
         },
         "spdx-correct": {
           "version": "3.1.1",
+          "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.1.1.tgz",
+          "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
           "bundled": true,
           "requires": {
             "spdx-expression-parse": "^3.0.0",
@@ -36580,6 +36692,8 @@
         },
         "spdx-exceptions": {
           "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+          "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
           "bundled": true
         },
         "spdx-expression-parse": {
@@ -36594,6 +36708,8 @@
         },
         "spdx-license-ids": {
           "version": "3.0.11",
+          "resolved": "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+          "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
           "bundled": true
         },
         "ssri": {
@@ -36649,6 +36765,8 @@
         },
         "tar": {
           "version": "6.1.11",
+          "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.11.tgz",
+          "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
           "bundled": true,
           "requires": {
             "chownr": "^2.0.0",
@@ -36759,6 +36877,8 @@
         },
         "write-file-atomic": {
           "version": "4.0.1",
+          "resolved": "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+          "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
           "bundled": true,
           "requires": {
             "imurmurhash": "^0.1.4",

+ 1 - 1
maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json

@@ -53,7 +53,7 @@
 			"audit": {
 				"": "Audits",
 				"logins": "Logins",
-				"loginapps": "LoginApps"
+				"loginapps": "AccessApps"
 			},
 			"mgt": "Management"
 		},

+ 2 - 2
maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json

@@ -52,8 +52,8 @@
 			},
 			"audit": {
 				"": "审计",
-				"logins": "系统登录日志",
-				"loginapps": "应用访问日志",
+				"logins": "登录日志",
+				"loginapps": "访问日志",
 				"synchronizer": "同步器日志",
 				"connector": "连接器日志",
 				"operate": "管理日志"

+ 2 - 2
maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json

@@ -52,8 +52,8 @@
 			},
 			"audit": {
 				"": "審計",
-				"logins": "系統登錄日誌",
-				"loginapps": "應用訪問日誌",
+				"logins": "登錄日誌",
+				"loginapps": "訪問日誌",
 				"synchronizer": "同步器日誌",
 				"connector": "連接器日誌",
 				"operate": "管理日誌"