Merge branch 'main' of https://gitee.com/dromara/MaxKey

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml

@@ -118,7 +118,7 @@
 			mxk_userinfo u
 		where
 			u.id not in(
-       			 select rm.memberid 
+       			 select gm.memberid 
        			 from 	mxk_groups g,mxk_group_member gm
 			     where  1  =  1
 			     <if test="groupId != null and groupId != ''">

maxkey-web-frontend/maxkey-web-app/package.json

@@ -21,6 +21,7 @@
     "scaffold"
   ],
   "scripts": {
+    "npm:pre": "npm install --ignore-scripts --registry https://registry.npmmirror.com || npm install --ignore-scripts --registry https://registry.npmjs.org",
     "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
     "ng": "ng",
     "start": "ng s -o  --serve-path=/maxkey/ --port=8527",

maxkey-web-frontend/maxkey-web-mgt-app/package.json

@@ -21,6 +21,7 @@
     "scaffold"
   ],
   "scripts": {
+    "npm:pre": "npm install --ignore-scripts --registry https://registry.npmmirror.com || npm install --ignore-scripts --registry https://registry.npmjs.org",
     "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
     "ng": "ng",
     "start": "ng s -o  --serve-path=/maxkey-mgt/ --port=8526",