!22 v2.5.5.0

Merge pull request !22 from 码匠君/develop

.jpb/jpb-settings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaPluginProjectSettings">
+    <option name="lastSelectedLanguage" value="Java" />
+  </component>
+</project>

README.md

@@ -6,13 +6,13 @@
 
 <p align="center">
     <a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank"><img src="https://img.shields.io/badge/JDK-1.8%2B-green" alt="JDK 1.8+"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-2.5.4-blue" alt="Spring Boot 2.5.4"></a>
-    <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.3-blue" alt="Spring Cloud 2020.0.3"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-2.5.5-blue" alt="Spring Boot 2.5.5"></a>
+    <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.4-blue" alt="Spring Cloud 2020.0.4"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2021.1-blue" alt="Spring Cloud Alibaba 2021.1"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.0.3-brightgreen" alt="Nacos 2.0.3"></a>
     <a href="./LICENSE"><img src="https://img.shields.io/badge/License-Apache--2.0-blue" alt="License Apache 2.0"></a>
     <a href="https://blog.csdn.net/Pointer_v" target="_blank"><img src="https://img.shields.io/badge/Author-%E7%A0%81%E5%8C%A0%E5%90%9B-orange" alt="码匠君"></a>
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-2.5.4.140-red" alt="Version 2.5.4.140"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-2.5.5.0-red" alt="Version 2.5.5.0"></a>
     <a href="https://gitee.com/herodotus/eurynome-cloud"><img src="https://gitee.com/herodotus/eurynome-cloud/badge/star.svg?theme=dark" alt="Gitee star"></a>
     <a href="https://gitee.com/herodotus/eurynome-cloud"><img src="https://gitee.com/herodotus/eurynome-cloud/badge/fork.svg?theme=dark" alt="Gitee fork"></a>
 </p>

configurations/docker/docker-compose/herodotus/.env

@@ -1,4 +1,4 @@
-VERSION=2.5.4.140
+VERSION=2.5.5.0
 GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=eurynome-cloud-uaa

configurations/docker/docker-compose/herodotus/env.skywalking.yml

@@ -21,4 +21,4 @@ services:
     ports:
       - "8878:8080"
     environment:
-      SW_OAP_ADDRESS: oap:12800
+      SW_OAP_ADDRESS: http://oap:12800

dependencies/pom.xml

@@ -29,13 +29,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.4</version>
+        <version>2.5.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>cn.herodotus.eurynome</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.5.4.140</version>
+    <version>2.5.5.0</version>
     <packaging>pom</packaging>
 
     <name>eurynome-cloud-dependencies</name>
@@ -59,8 +59,8 @@
 
     <properties>
         <!--Spring 家族-->
-        <spring-boot-dependencies.version>2.5.4</spring-boot-dependencies.version>
-        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
+        <spring-boot-dependencies.version>2.5.5</spring-boot-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.4</spring-cloud-dependencies.version>
         <spring-cloud-alibaba-dependencies.version>2021.1</spring-cloud-alibaba-dependencies.version>
         <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
 
@@ -89,17 +89,17 @@
         <alibaba-nacos.version>2.0.3</alibaba-nacos.version>
 
         <!-- 国内开源通用组件 -->
-        <hutool.version>5.7.10</hutool.version>
-        <okhttps.version>3.1.4</okhttps.version>
-        <just-auth.verison>1.16.3</just-auth.verison>
+        <hutool.version>5.7.13</hutool.version>
+        <okhttps.version>3.1.5</okhttps.version>
+        <just-auth.verison>1.16.4</just-auth.verison>
         <knife4j.version>3.0.3</knife4j.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <easy-captcha.version>1.6.2</easy-captcha.version>
 
         <!--第三方starter-->
-        <starter-jasypt.version>3.0.3</starter-jasypt.version>
+        <starter-jasypt.version>3.0.4</starter-jasypt.version>
         <starter-camunda.version>7.15.0</starter-camunda.version>
-        <starter-mybatis-plus.version>3.4.3.2</starter-mybatis-plus.version>
+        <starter-mybatis-plus.version>3.4.3.4</starter-mybatis-plus.version>
         <mybatis-plus-generator.version>3.5.0</mybatis-plus-generator.version>
         <velocity.version>2.3</velocity.version>
     </properties>

documents/guides/404.html

@@ -11,11 +11,11 @@
                 var s = document.getElementsByTagName("script")[0];
                 s.parentNode.insertBefore(hm, s);
             })();</script><title>Eurynome Cloud</title><meta name="description" content="Eurynome Cloud, 在线文档, 微服务, 微服务架构, Spring Boot，Spring Cloud，Spring Cloud Alibaba, Spring Security, OAuth 2, Skywalking, Nacos">
-    <link rel="preload" href="/eurynome-cloud/assets/js/runtime~app.af71715b.js" as="script"><link rel="preload" href="/eurynome-cloud/assets/css/styles.03bfbc71.css" as="style"><link rel="preload" href="/eurynome-cloud/assets/js/567.0e0ffb96.js" as="script"><link rel="preload" href="/eurynome-cloud/assets/js/app.11046e0a.js" as="script">
+    <link rel="preload" href="/eurynome-cloud/assets/js/runtime~app.e1e21d6f.js" as="script"><link rel="preload" href="/eurynome-cloud/assets/css/styles.03bfbc71.css" as="style"><link rel="preload" href="/eurynome-cloud/assets/js/567.0e0ffb96.js" as="script"><link rel="preload" href="/eurynome-cloud/assets/js/app.dfa17cae.js" as="script">
     <link rel="stylesheet" href="/eurynome-cloud/assets/css/styles.03bfbc71.css">
   </head>
   <body>
-    <div id="app"><!--[--><div class="theme-container"><div class="theme-default-content"><h1>404</h1><blockquote>There&#39;s nothing here.</blockquote><a href="/eurynome-cloud/" class="">Take me home</a></div></div><!----><!--]--></div>
-    <script src="/eurynome-cloud/assets/js/runtime~app.af71715b.js" defer></script><script src="/eurynome-cloud/assets/js/567.0e0ffb96.js" defer></script><script src="/eurynome-cloud/assets/js/app.11046e0a.js" defer></script>
+    <div id="app"><!--[--><div class="theme-container"><div class="theme-default-content"><h1>404</h1><blockquote>That&#39;s a Four-Oh-Four.</blockquote><a href="/eurynome-cloud/" class="">Take me home</a></div></div><!----><!--]--></div>
+    <script src="/eurynome-cloud/assets/js/runtime~app.e1e21d6f.js" defer></script><script src="/eurynome-cloud/assets/js/567.0e0ffb96.js" defer></script><script src="/eurynome-cloud/assets/js/app.dfa17cae.js" defer></script>
   </body>
 </html>