Merge branch 'main' of https://github.com/xuxiaowei-cloud/xuxiaowei-c…

…loud-next # Conflicts: # passport-ui/package.json # ui/package.json
xuxiaowei-cloud · Sep 11, 2023 · a7d9904 · a7d9904
2 parents 51e67b1 + 989838e
commit a7d9904
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/passport-ui/package.json b/passport-ui/package.json
@@ -39,31 +39,31 @@
     "@element-plus/icons-vue": "2.1.0",
     "axios": "1.5.0",
     "crypto-js": "4.1.1",
-    "element-plus": "2.3.10",
+    "element-plus": "2.3.12",
     "jsencrypt": "3.3.2",
     "pinia": "2.1.6",
     "vue": "3.3.4",
     "vue-router": "4.2.4"
   },
   "devDependencies": {
-    "@types/crypto-js": "4.1.1",
-    "@types/node": "20.5.6",
-    "@typescript-eslint/eslint-plugin": "6.4.1",
-    "@typescript-eslint/parser": "6.4.1",
-    "@vitejs/plugin-vue": "4.3.3",
-    "eslint": "8.47.0",
+    "@types/crypto-js": "4.1.2",
+    "@types/node": "20.5.9",
+    "@typescript-eslint/eslint-plugin": "6.6.0",
+    "@typescript-eslint/parser": "6.6.0",
+    "@vitejs/plugin-vue": "4.3.4",
+    "eslint": "8.48.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-n": "16.0.2",
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-vue": "9.17.0",
     "lint-staged": "14.0.1",
-    "terser": "5.19.2",
+    "terser": "5.19.4",
     "typescript": "5.2.2",
-    "unocss": "0.55.2",
+    "unocss": "0.55.7",
     "unplugin-auto-import": "0.16.6",
-    "unplugin-vue-components": "0.25.1",
+    "unplugin-vue-components": "0.25.2",
     "vite": "4.4.9",
-    "vue-tsc": "1.8.8"
+    "vue-tsc": "1.8.10"
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <!-- https://mvnrepository.com/artifact/de.codecentric/spring-boot-admin-dependencies -->
         <!-- https://oss.sonatype.org/content/repositories/public/de/codecentric/spring-boot-admin-dependencies -->
         <!-- https://github.com/codecentric/spring-boot-admin -->
-        <spring-boot-admin.version>3.1.5</spring-boot-admin.version>
+        <spring-boot-admin.version>3.1.6</spring-boot-admin.version>
 
         <!-- OAuth 2.1 依赖 -->
         <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-oauth2-authorization-server -->
@@ -132,7 +132,7 @@
         <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
         <!-- https://oss.sonatype.org/content/repositories/public/com/alibaba/fastjson -->
         <!-- https://github.com/alibaba/fastjson -->
-        <fastjson.version>2.0.39</fastjson.version>
+        <fastjson.version>2.0.40</fastjson.version>
 
         <!-- https://mvnrepository.com/artifact/cn.hutool/hutool-all -->
         <!-- https://oss.sonatype.org/content/repositories/public/cn/hutool/hutool-all -->

diff --git a/ui/package.json b/ui/package.json
@@ -68,24 +68,24 @@
   },
   "devDependencies": {
     "@tauri-apps/cli": "1.4.0",
-    "@types/crypto-js": "4.1.1",
-    "@types/node": "20.5.4",
-    "@typescript-eslint/eslint-plugin": "6.4.1",
-    "@typescript-eslint/parser": "6.4.1",
-    "@vitejs/plugin-vue": "4.3.3",
-    "eslint": "8.47.0",
+    "@types/crypto-js": "4.1.2",
+    "@types/node": "20.5.9",
+    "@typescript-eslint/eslint-plugin": "6.6.0",
+    "@typescript-eslint/parser": "6.6.0",
+    "@vitejs/plugin-vue": "4.3.4",
+    "eslint": "8.48.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-n": "16.0.2",
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-vue": "9.17.0",
     "lint-staged": "14.0.1",
-    "terser": "5.19.2",
+    "terser": "5.19.4",
     "typescript": "5.2.2",
-    "unocss": "0.55.2",
+    "unocss": "0.55.7",
     "unplugin-auto-import": "0.16.6",
-    "unplugin-vue-components": "0.25.1",
+    "unplugin-vue-components": "0.25.2",
     "vite": "4.4.9",
-    "vue-tsc": "1.8.8"
+    "vue-tsc": "1.8.10"
   }
 }