update nacos 2.1.2 => 2.2.0 适配升级

2026-05-11 06:12:09 +08:00 · 2022-12-19 14:19:42 +08:00
parent efc4bf5a0a
commit 78985f076b
25 changed files with 638 additions and 102 deletions
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
@@ -31,8 +31,9 @@ server.error.include-message=ON_PARAM

 spring.application.name=ruoyi-nacos
 #*************** Config Module Related Configurations ***************#
-### If use MySQL as datasource:
-spring.datasource.platform=mysql
+### Deprecated configuration property, it is recommended to use `spring.sql.init.platform` replaced.
+spring.sql.init.platform=mysql
+nacos.plugin.datasource.log.enabled=true

 ### Count of DB:
 db.num=1
@@ -139,6 +140,8 @@ nacos.core.auth.plugin.nacos.token.secret.key=SecretKey0123456789012345678901234
 #nacos.core.auth.ldap.userDn=cn=admin,${nacos.core.auth.ldap.basedc}
 #nacos.core.auth.ldap.password=admin
 #nacos.core.auth.ldap.userdn=cn={0},dc=example,dc=org
+#nacos.core.auth.ldap.filter.prefix=uid
+#nacos.core.auth.ldap.case.sensitive=true


 #*************** Istio Related Configurations ***************#
@@ -189,4 +192,5 @@ nacos.istio.mcp.server.enabled=false
 # nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe
 ### rpc request timeout, default 5 seconds
 # nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000
-
+### enable to support prometheus service discovery
+#nacos.prometheus.metrics.enabled=true
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.1.2.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.1.2.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-contrl-plugin-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-contrl-plugin-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.1.2.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.1.2.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-plugin-default-impl-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-plugin-default-impl-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.2.0.jar
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.2.0.jar
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/index.html
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?1309f9b6b4e9f81858cb" rel="stylesheet"></head>
+<link href="./css/main.css?c18229e4d79449526734" rel="stylesheet"></head>

 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?1309f9b6b4e9f81858cb"></script></body>
+<script type="text/javascript" src="./js/main.js?c18229e4d79449526734"></script></body>

 </html>
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/js/main.js
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/static/js/main.js