nacos、seata、rocketmq、spring cloud、 spring boot、elasticsearch 版本更新到最新的稳定版

README.md

@@ -57,7 +57,7 @@ H5端：https://h5.mall4j.com/cloud
 
 我们也有自己的目录结构
 
-![img](https://gitee.com/gz-yami/mall4cloud/raw/master/doc/img/%E7%9B%AE%E5%BD%95%E7%BB%93%E6%9E%84%E5%92%8C%E8%A7%84%E8%8C%83/%E5%BA%94%E7%94%A8%E5%88%86%E5%B1%82.png)
+![img](./doc/img/%E7%9B%AE%E5%BD%95%E7%BB%93%E6%9E%84%E5%92%8C%E8%A7%84%E8%8C%83/%E5%BA%94%E7%94%A8%E5%88%86%E5%B1%82.png)
 
 - VO（View Object）：显示层对象，通常是 Web 向模板渲染引擎层传输的对象。
 - DTO（Data Transfer Object）：数据传输对象，前端像后台进行传输的对象，类似于param。

doc/中间件docker-compse一键安装/README.md

@@ -33,7 +33,7 @@ docker-compose up -d --build
  - redis: 端口6379，没有密码
  - nacos: http://192.168.1.46:8848/nacos 账号及密码 nacos/nacos
  - kibana: http://192.168.1.46:5601
- - rocketmq-console：http://192.168.1.46:8180
+ - rocketmq-dashboard：http://192.168.1.46:8180
 
 
 6.访问minio管理页面，右下角有个加号，创建存储区域(create bucker) 名为`mall4cloud`

doc/中间件docker-compse一键安装/docker-compose.yaml

@@ -11,9 +11,8 @@ services:
       - 3306:3306
     volumes:
       - ./mysql/data:/var/lib/mysql
-      - ./mysql/my.cnf:/etc/mysql/my.cnf
+      - ./mysql/conf.d:/etc/mysql/conf.d
       - ./mysql/initdb:/docker-entrypoint-initdb.d
-      - ./mysql/mysql-files:/var/lib/mysql-files
 
   mall4cloud-minio:
     image: minio/minio:RELEASE.2021-06-17T00-10-46Z
@@ -35,8 +34,9 @@ services:
     ports:
       - 6379:6379
 
+
   mall4cloud-nacos:
-    image: nacos/nacos-server:2.0.2
+    image: nacos/nacos-server:v2.2.0-slim
     container_name: mall4cloud-nacos
     restart: always
     depends_on:
@@ -60,22 +60,22 @@ services:
 
 
   mall4cloud-seata:
-    image: seataio/seata-server:1.4.2
+    image: seataio/seata-server:1.6.1
     container_name: mall4cloud-seata
     restart: always
     depends_on:
       - mall4cloud-mysql
       - mall4cloud-nacos
     ports:
       - 8091:8091
+      - 7091:7091
     environment:
-      - SEATA_IP=192.168.1.46
-      - SEATA_CONFIG_NAME=file:/root/seata-config/registry
+      - SEATA_IP=192.168.1.41
     volumes:
-      - ./seata:/root/seata-config
+      - ./seata/application.yml:/seata-server/resources/application.yml
 
   mall4cloud-elasticsearch:
-    image: elasticsearch:7.13.2
+    image: elasticsearch:7.17.5
     container_name: mall4cloud-elasticsearch
     restart: always
     ports:
@@ -90,7 +90,7 @@ services:
       - ./elasticsearch/plugins:/usr/share/elasticsearch/plugins
 
   mall4cloud-kibana:
-    image: kibana:7.13.2
+    image: kibana:7.17.5
     container_name: mall4cloud-kibana
     restart: always
     ports:
@@ -101,23 +101,19 @@ services:
       - mall4cloud-elasticsearch
 
   mall4cloud-canal:
-    image: canal/canal-server:v1.1.5
+    image: canal/canal-server:v1.1.6
     container_name: mall4cloud-canal
     restart: always
     ports:
       - 11111:11111
-    environment:
-      - SEATA_IP=192.168.1.46
     volumes:
       - ./canal/conf/example:/home/admin/canal-server/conf/example
       - ./canal/conf/canal.properties:/home/admin/canal-server/conf/canal.properties
       - ./canal/logs:/home/admin/canal-server/logs
 
 
-
-
   mall4cloud-rocketmq-namesrv:
-    image: foxiswho/rocketmq:4.8.0
+    image: apache/rocketmq:4.9.4
     container_name: mall4cloud-rocketmq-namesrv
     restart: always
     ports:
@@ -126,16 +122,15 @@ services:
       - ./rocketmq/namesrv/logs:/home/rocketmq/logs
       - ./rocketmq/namesrv/store:/home/rocketmq/store
     environment:
-      JAVA_OPT_EXT: "-Duser.home=/home/rocketmq -Xms512M -Xmx512M -Xmn128m"
+      JAVA_OPT_EXT: "-Duser.home=/home/rocketmq -Xms512M -Xmx512M -Xmn128M"
     command: ["sh","mqnamesrv"]
     networks:
       rocketmq:
         aliases:
           - mall4cloud-rocketmq-namesrv
 
-
   mall4cloud-rocketmq-broker:
-    image: foxiswho/rocketmq:4.8.0
+    image: apache/rocketmq:4.9.4
     container_name: mall4cloud-rocketmq-broker
     restart: always
     ports:
@@ -146,7 +141,7 @@ services:
       - ./rocketmq/broker/store:/home/rocketmq/store
       - ./rocketmq/broker/conf/broker.conf:/etc/rocketmq/broker.conf
     environment:
-      JAVA_OPT_EXT: "-Duser.home=/home/rocketmq -Xms512M -Xmx512M -Xmn128m"
+      JAVA_OPT_EXT: "-Duser.home=/home/rocketmq -Xms512M -Xmx512M -Xmn128M -XX:-AssumeMP"
     command: ["sh","mqbroker","-c","/etc/rocketmq/broker.conf","-n","mall4cloud-rocketmq-namesrv:9876","autoCreateTopicEnable=true"]
     depends_on:
       - mall4cloud-rocketmq-namesrv
@@ -156,9 +151,9 @@ services:
           - mall4cloud-rocketmq-broker
 
 
-  mall4cloud-rocketmq-console:
-    image: styletang/rocketmq-console-ng
-    container_name: mall4cloud-rocketmq-console
+  mall4cloud-rocketmq-dashboard:
+    image: apacherocketmq/rocketmq-dashboard:1.0.0
+    container_name: mall4cloud-rocketmq-dashboard
     restart: always
     ports:
       - 8180:8080

doc/中间件docker-compse一键安装/elasticsearch/plugins/analysis-ik/plugin-descriptor.properties

@@ -34,7 +34,7 @@
 description=IK Analyzer for Elasticsearch
 #
 # 'version': plugin's version
-version=7.13.2
+version=7.17.5
 #
 # 'name': the plugin name
 name=analysis-ik
@@ -53,4 +53,4 @@ java.version=1.8
 # elasticsearch release. This version is checked when the plugin
 # is loaded so Elasticsearch will refuse to start in the presence of
 # plugins with the incorrect elasticsearch.version.
-elasticsearch.version=7.13.2
+elasticsearch.version=7.17.5

doc/中间件docker-compse一键安装/mysql/conf.d/docker.cnf

@@ -0,0 +1,20 @@
+[client]
+default-character-set=utf8mb4
+[mysql]
+default-character-set=utf8mb4
+[mysqld]
+skip-host-cache
+skip-name-resolve
+default-authentication-plugin=mysql_native_password
+sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
+table_open_cache=512
+character-set-server=utf8mb4
+collation-server=utf8mb4_general_ci
+default-time-zone='+8:00'
+log-bin=mysql-binlog
+binlog-format=ROW
+server_id=1
+max_connections=1000
+max_user_connections=1000
+mysqlx_max_connections=1000
+thread_cache_size=64

doc/中间件docker-compse一键安装/seata/application.yml

@@ -0,0 +1,36 @@
+server:
+  port: 7091
+
+console:
+  user:
+    username: seata
+    password: seata
+
+seata:
+  config:
+    # support: nacos, consul, apollo, zk, etcd3
+    type: nacos
+    nacos:
+      server-addr: 192.168.1.46:8848
+      namespace: 4b70485d-72dd-44df-a76a-7a3f578a3001
+      group: SEATA_GROUP
+      username: nacos
+      password: nacos
+  registry:
+    # support: nacos, eureka, redis, zk, consul, etcd3, sofa
+    type: nacos
+    nacos:
+      application: seata-server
+      server-addr: 192.168.1.46:8848
+      group: SEATA_GROUP
+      cluster: default
+      namespace: 4b70485d-72dd-44df-a76a-7a3f578a3001
+      username: nacos
+      password: nacos
+  #  server:
+  #    service-port: 8091 #If not configured, the default is '${server.port} + 1000'
+  security:
+    secretKey: SeataSecretKey0c382ef121d778043159209298fd40bf3850a017
+    tokenValidityInMilliseconds: 1800000
+    ignore:
+      urls: /,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/api/v1/auth/login

doc/基本开发文档/常见问题.md

@@ -44,7 +44,7 @@ canal.instance.dbPassword=canal
 
 ```properties
 # 填写RocketMQ地址
-rocketmq.namesrv.addr = 192.168.1.41:9876
+rocketmq.namesrv.addr = 192.168.1.46:9876
 ```
 
 

mall4cloud-search/src/main/java/com/mall4j/cloud/search/listener/OrderCanalListener.java

@@ -17,7 +17,7 @@
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mall4cloud-search/src/main/java/com/mall4j/cloud/search/listener/SpuCanalListener.java

@@ -17,7 +17,7 @@
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mall4cloud-search/src/main/java/com/mall4j/cloud/search/listener/SpuExtensionCanalListener.java

@@ -14,7 +14,7 @@
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mall4cloud-search/src/main/java/com/mall4j/cloud/search/manager/ProductUpdateManager.java

@@ -9,7 +9,7 @@
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

pom.xml

@@ -33,25 +33,26 @@
         <java.version>1.8</java.version>
 
         <!-- 核心依赖 -->
-        <spring-boot.version>2.4.2</spring-boot.version>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+        <spring-boot.version>2.7.7</spring-boot.version>
+        <spring-cloud.version>2021.0.5</spring-cloud.version>
+        <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
 
         <!--分离出这两个东西，是为了能够在 spring cloud alibaba不更新的时候，及时更新-->
-        <seata.version>1.4.2</seata.version>
-        <nacos.version>2.0.1</nacos.version>
+        <seata.version>1.6.1</seata.version>
+        <nacos.version>2.2.0</nacos.version>
 
         <!-- 次要依赖 -->
-        <hutool-version>5.5.8</hutool-version>
-        <mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
-        <pagehelper-spring-boot-starter.version>1.3.0</pagehelper-spring-boot-starter.version>
+        <hutool-version>5.8.11</hutool-version>
+        <mybatis-spring-boot-starter.version>2.3.0</mybatis-spring-boot-starter.version>
+        <pagehelper-spring-boot-starter.version>1.4.3</pagehelper-spring-boot-starter.version>
+        <orika.version>1.5.4</orika.version>
         <jsoup.version>1.13.1</jsoup.version>
         <orika.version>1.5.4</orika.version>
         <captcha.version>1.2.5</captcha.version>
         <knife4j.version>3.0.2</knife4j.version>
-        <elasticsearch.version>7.9.1</elasticsearch.version>
-        <minio.version>8.0.3</minio.version>
-        <rocketmq-springboot.version>2.2.0</rocketmq-springboot.version>
+        <elasticsearch.version>7.17.5</elasticsearch.version>
+        <minio.version>8.2.2</minio.version>
+        <rocketmq-springboot.version>2.2.2</rocketmq-springboot.version>
         <weixin.version>4.0.0</weixin.version>
         <spring-javaformat.version>0.0.22</spring-javaformat.version>
     </properties>
@@ -237,6 +238,7 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>${maven-resources-plugin.version}</version>
                 <configuration>