升级中间件版本

config/broker.conf

@@ -7,4 +7,4 @@ brokerRole=ASYNC_MASTER
 flushDiskType=ASYNC_FLUSH
 autoCreateTopicEnable=true
 autoCreateSubscriptionGroup=true
-brokerIP1=192.168.0.116
+brokerIP1=localhost

config/ik/config/IKAnalyzer.cfg.xml

@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
 	<comment>IK Analyzer 扩展配置</comment>
-	<!--用户可以在这里配置远程扩展字典
+	<!--用户可以在这里配置自己的扩展字典 -->
-	<entry key="remote_ext_dict">https://admin-api.pickmall.cn/manager/other/customWords?secretKey=111</entry>
+	<entry key="ext_dict"></entry>
-    -->
+	 <!--用户可以在这里配置自己的扩展停止词字典-->
+	<entry key="ext_stopwords"></entry>
+	<!--用户可以在这里配置远程扩展字典 -->
+	<!-- <entry key="remote_ext_dict">words_location</entry> -->
+	<!--用户可以在这里配置远程扩展停止词字典-->
+	<!-- <entry key="remote_ext_stopwords">words_location</entry> -->
 </properties>

config/ik/plugin-descriptor.properties

@@ -34,7 +34,7 @@
 description=IK Analyzer for Elasticsearch
 #
 # 'version': plugin's version
-version=7.3.0
+version=7.17.6
 #
 # '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.3.0
+elasticsearch.version=7.17.6

config/my.cnf

@@ -1,33 +1,16 @@
 [mysqld]
-
 user=mysql
-
 default-storage-engine=INNODB
-
-#character-set-server=utf8
-
 character-set-client-handshake=FALSE
-
 character-set-server=utf8mb4
-
 collation-server=utf8mb4_unicode_ci
-
 init_connect='SET NAMES utf8mb4'
-
-#group_concat_max_len=1024
-#group_concat_max_len=10240
 group_concat_max_len=4294967295
+log-bin=mysql-bin # 开启 binlog
+binlog-format=ROW # 选择 ROW 模式
 
 [client]
-
 #utf8mb4字符集可以存储emoji表情字符
-
-#default-character-set=utf8
-
 default-character-set=utf8mb4
-
 [mysql]
-
-#default-character-set=utf8
-
 default-character-set=utf8mb4

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services: 
   mysql:
-    image: mysql:8.0.28
+    image: mysql:8.0.30
     restart: always
     container_name: mysql
     volumes:
@@ -17,17 +17,17 @@ services:
       - 3306:3306
 
   redis:
-    image: redis:6.2.5
+    image: redis:7.0.4
     restart: always
     container_name: 'redis'
     ports:
       - 6379:6379
     volumes: 
       - ../volumes/data/redsidata:/data
-    command: redis-server --port 6379 --requirepass lilishop --appendonly yes
+    command: redis-server --port 6379 --requirepass lilishop --appendonly yes --protected-mode no
 
   elasticsearch:
-    image: elasticsearch:7.3.0
+    image: elasticsearch:7.17.6
     restart: always
     container_name: elasticsearch
     volumes:
@@ -40,9 +40,9 @@ services:
       - "9200:9200"
       - "9300:9300"
     environment:
-      cluster.name: elasticsearch
+      - cluster.name=elasticsearch
-      discovery.type: single-node
+      - discovery.type=single-node
-      ES_JAVA_OPTS: -Xms256m -Xmx256m
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     logging:
       driver: "json-file"
       options:
@@ -55,7 +55,7 @@ services:
           hard: 65535
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.3.0
+    image: docker.elastic.co/kibana/kibana:7.17.6
     restart: always
     container_name: kibana
     ports:
@@ -68,7 +68,7 @@ services:
 
 
   logstash:
-    image: logstash:7.3.0
+    image: logstash:7.17.6
     restart: always
     container_name: logstash
     volumes:
@@ -81,32 +81,31 @@ services:
     
  # rocket mq name server
   rmqnamesrv:
-    image: foxiswho/rocketmq:server-4.7.0
+    image: apache/rocketmq:4.9.4
     restart: always
     container_name: rocket-server
-    environment:
+    # environment:
-      JAVA_OPT_EXT: "-server -Xms64m -Xmx64m -Xmn64m"
+    #   JAVA_OPT_EXT: "-server -Xms64m -Xmx64m -Xmn64m"
     volumes:
-      - ../volumes/data/rocket/server/logs:/opt/logs
+      - ../volumes/data/rocket/server/logs:/home/rocketmq/logs
-      - ../volumes/data/rocket/server/store:/opt/rmqstore
     networks:
       - rocketmq
     ports:
       - 9876:9876
+    command: sh mqnamesrv
   # rocket mq broker
   rmqbroker:
-    image: foxiswho/rocketmq:broker-4.7.0
+    image: apache/rocketmq:4.9.4
     restart: always
     container_name: rocket-broker
     volumes:
-      - ../volumes/data/rocket/broker/logs:/opt/logs
+      - ../volumes/data/rocket/broker/logs:/home/rocketmq/logs
-      - ../volumes/data/rocket/broker/store:/opt/rmqstore
+      - ../volumes/data/rocket/broker/store:/home/rocketmq/store
-      - ./config/broker.conf:/etc/rocketmq/broker.conf
+      - ./config/broker.conf:/opt/rocketmq-4.9.4/conf/broker.conf
     environment:
       - NAMESRV_ADDR=rmqnamesrv:9876
-      - JAVA_OPTS:=-Duser.home=/opt
+      # - JAVA_OPTS:=-Duser.home=/opt
       - JAVA_OPT_EXT=-server -Xms64m -Xmx64m -Xmn64m
-    command: mqbroker -c /etc/rocketmq/broker.conf
     depends_on:
       - rmqnamesrv
     networks:
@@ -114,14 +113,15 @@ services:
     ports:
       - 10909:10909
       - 10911:10911
+    command: sh mqbroker -c /opt/rocketmq-4.9.4/conf/broker.conf
   # rocket console 这个可以不需要
-  rmqconsole:
+  rmqdashboard:
-    image: styletang/rocketmq-console-ng:latest
+    image: apacherocketmq/rocketmq-dashboard:1.0.0
     restart: always
-    container_name: rocket-console
+    container_name: rocket-dashboard
     environment:
       - JAVA_OPTS=-Drocketmq.config.namesrvAddr=rmqnamesrv:9876 -Dserver.port=8180 -Drocketmq.config.isVIPChannel=false
-      - JAVA_OPT_EXT=-Xms128m -Xmx128m -Xmn128m
+      # - JAVA_OPT_EXT=-Xms128m -Xmx128m -Xmn128m
     depends_on:
       - rmqnamesrv
     networks:
@@ -133,9 +133,8 @@ services:
     image: xuxueli/xxl-job-admin:2.3.0
     restart: always
     container_name: xxl-job
-    network_mode: host
     environment:
-      - PARAMS=--spring.datasource.url=jdbc:mysql://127.0.0.1:3306/lilishop?Unicode=true&characterEncoding=UTF-8  --spring.datasource.username=root --spring.datasource.password=lilishop --server.port=9001
+      - PARAMS=--spring.datasource.url=jdbc:mysql://mysql:3306/lilishop?Unicode=true&characterEncoding=UTF-8  --spring.datasource.username=root --spring.datasource.password=lilishop --server.port=9001
     depends_on:
       - mysql
     volumes:

init/mysql/lilishop.sql

@@ -53767,7 +53767,7 @@ CREATE TABLE `li_setting` (
 -- ----------------------------
 BEGIN;
 INSERT INTO `li_setting` VALUES ('ALIPAY_PAYMENT', 'admin', '2021-02-27 07:20:11.914000', b'0', 'admin', '2021-09-15 11:57:38.683000', '{\"privateKey\":\"privateKey\",\"alipayPublicCertPath\":\"/home/crt/lili-alipay/alipayCertPublicKey_RSA2.crt\",\"certPath\":\"/home/crt/lili-alipay/appCertPublicKey_2021002107649773.crt\",\"appId\":\"appId\",\"rootCertPath\":\"/home/crt/lili-alipay/alipayRootCert.crt\"}');
-INSERT INTO `li_setting` VALUES ('BASE_SETTING', 'admin', '2021-01-21 13:46:35.348000', b'0', 'admin', '2021-04-27 09:41:35.401000', '{\"siteName\":\"123\",\"icp\":\"icp\",\"domainLogo\":\"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/16e598149a9247b2a84b05eaf6225261.png\",\"buyerSideLogo\":\"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/af12901ada124ccab6dd34e89102bf7e.png\",\"storeSideLogo\":null,\"staticPageAddress\":\"https://pickmall.cn/\",\"staticPageWapAddress\":\"https://m.pickmall.cn/\"}');
+INSERT INTO `li_setting` VALUES ('BASE_SETTING', 'admin', '2021-01-21 13:46:35.348000', b'0', 'admin', '2021-04-27 09:41:35.401000', '{\"siteName\":\"shop\",\"icp\":\"icp\",\"domainLogo\":\"https://cdn.pickmall.cn/cdn/logo/logo2.png\",\"buyerSideLogo\":\"https://cdn.pickmall.cn/cdn/logo/logo2.png\",\"storeSideLogo\":https://cdn.pickmall.cn/cdn/logo/logo2.png,\"staticPageAddress\":\"https://pickmall.cn/\",\"staticPageWapAddress\":\"https://m.pickmall.cn/\"}');
 INSERT INTO `li_setting` VALUES ('DISTRIBUTION_SETTING', 'admin', '2021-01-22 02:56:44.099000', b'0', 'admin', '2021-09-24 15:39:46.245000', '{\"distributionDay\":94,\"isOpen\":true,\"cashDay\":1}');
 INSERT INTO `li_setting` VALUES ('GOODS_SETTING', 'admin', '2020-12-14 10:48:04.000000', b'0', 'admin', '2021-03-25 20:44:38.514000', '{\"goodsCheck\":\"true\",\"smallPictureWidth\":\"200\",\"smallPictureHeight\":\"200\",\"abbreviationPictureWidth\":\"400\",\"abbreviationPictureHeight\":\"400\",\"originalPictureWidth\":\"800\",\"originalPictureHeight\":\"800\"}');
 INSERT INTO `li_setting` VALUES ('IM_SETTING', 'admin', '2021-09-17 12:00:41.085000', b'0', NULL, NULL, '{\"httpUrl\":\"http://baidu.com\",\"tenantId\":\"123\"}');