init

Add alert_quantity field to li_goods_sku table
Update docker-compose files
2024-03-20 13:22:16 +08:00 · 2024-03-11 20:25:23 +08:00 · 2024-01-15 16:21:21 +08:00 · 2023-10-25 17:15:57 +08:00 · 2023-08-23 15:48:52 +08:00 · 2023-08-16 11:58:25 +08:00
7 changed files with 44627 additions and 45384 deletions
--- a/config/broker.conf
+++ b/config/broker.conf
@ -7,4 +7,4 @@ brokerRole=ASYNC_MASTER
 flushDiskType=ASYNC_FLUSH
 autoCreateTopicEnable=true
 autoCreateSubscriptionGroup=true
-brokerIP1=localhost
+brokerIP1=192.168.1.47
--- a/config/my.cnf
+++ b/config/my.cnf
@ -6,6 +6,7 @@ character-set-server=utf8mb4
 collation-server=utf8mb4_unicode_ci
 init_connect='SET NAMES utf8mb4'
 group_concat_max_len=4294967295
+max_connections=5000
 log-bin=mysql-bin # 开启 binlog
 binlog-format=ROW # 选择 ROW 模式

--- a/docker-compose-application.yml
+++ b/docker-compose-application.yml
@ -1,62 +0,0 @@
-# version: '3'
-# services: 
-#   buyer:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/buyer-api:4.3.0.1
-#     container_name: buyer
-#     network_mode: host
-#     environment:
-#       - TZ=Asia/Shanghai
-#       - JAVA_OPTS=-XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms128m -Xmx256m -Xmn128m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC
-
-#   common:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/common-api:4.3.0.1
-#     container_name: common
-#     environment:
-#       - TZ=Asia/Shanghai
-#       - JAVA_OPTS=-XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms128m -Xmx256m -Xmn128m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC
-#     network_mode: host
-
-#   seller:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/seller-api:4.3.0.1
-#     container_name: seller
-#     environment:
-#       - TZ=Asia/Shanghai
-#       - JAVA_OPTS=-XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms128m -Xmx256m -Xmn128m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC
-#     network_mode: host
-
-#   manager:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/manager-api:4.3.0.1
-#     container_name: manager
-#     environment:
-#       - TZ=Asia/Shanghai
-#       - JAVA_OPTS=-XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms128m -Xmx256m -Xmn128m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC
-#     network_mode: host
-
-#   wap-ui:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/wap-ui:4.3.0.1
-#     container_name: wap-ui
-#     network_mode: host
-
-#   buyer-ui:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.3.0.1
-#     container_name: buyer-ui
-#     network_mode: host
-
-#   seller-ui:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/seller-ui:4.3.0.1
-#     container_name: seller-ui
-#     network_mode: host
-
-#   manager-ui:
-#     restart: always
-#     image: registry.cn-beijing.aliyuncs.com/lili-images/manager-ui:4.3.0.1
-#     container_name: manager-ui
-#     network_mode: host
-
--- a/docker-compose-elk.yml
+++ b/docker-compose-elk.yml
@ -1,257 +0,0 @@
-version: "3"
-
-services:
-  setup:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
-    # volumes:
-      # - certs:/usr/share/elasticsearch/config/certs
-    user: "0"
-    command: >
-      bash -c '
-        if [ x${ELASTIC_PASSWORD} == x ]; then
-          echo "Set the ELASTIC_PASSWORD environment variable in the .env file";
-          exit 1;
-        elif [ x${KIBANA_PASSWORD} == x ]; then
-          echo "Set the KIBANA_PASSWORD environment variable in the .env file";
-          exit 1;
-        fi;
-        if [ ! -f certs/ca.zip ]; then
-          echo "Creating CA";
-          bin/elasticsearch-certutil ca --silent --pem -out config/certs/ca.zip;
-          unzip config/certs/ca.zip -d config/certs;
-        fi;
-        if [ ! -f certs/certs.zip ]; then
-          echo "Creating certs";
-          echo -ne \
-          "instances:\n"\
-          "  - name: es01\n"\
-          "    dns:\n"\
-          "      - es01\n"\
-          "      - localhost\n"\
-          "    ip:\n"\
-          "      - 127.0.0.1\n"\
-          "  - name: es02\n"\
-          "    dns:\n"\
-          "      - es02\n"\
-          "      - localhost\n"\
-          "    ip:\n"\
-          "      - 127.0.0.1\n"\
-          "  - name: es03\n"\
-          "    dns:\n"\
-          "      - es03\n"\
-          "      - localhost\n"\
-          "    ip:\n"\
-          "      - 127.0.0.1\n"\
-          > config/certs/instances.yml;
-          bin/elasticsearch-certutil cert --silent --pem -out config/certs/certs.zip --in config/certs/instances.yml --ca-cert config/certs/ca/ca.crt --ca-key config/certs/ca/ca.key;
-          unzip config/certs/certs.zip -d config/certs;
-        fi;
-        echo "Setting file permissions"
-        chown -R root:root config/certs;
-        find . -type d -exec chmod 750 \{\} \;;
-        find . -type f -exec chmod 640 \{\} \;;
-        echo "Waiting for Elasticsearch availability";
-        until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done;
-        echo "Setting kibana_system password";
-        until curl -s -X POST --cacert config/certs/ca/ca.crt -u elastic:${ELASTIC_PASSWORD} -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done;
-        echo "All done!";
-      '
-    healthcheck:
-      test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"]
-      interval: 1s
-      timeout: 5s
-      retries: 120
-
-  es01:
-    depends_on:
-      setup:
-        condition: service_healthy
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
-    volumes:
-      # - certs:/usr/share/elasticsearch/config/certs
-      - ../volumes/data/es01/logs:/usr/share/es/logs:rw
-      - ../volumes/data/es01/data:/usr/share/es/data:rw
-    ports:
-      - ${ES_PORT}:9200
-    environment:
-      - node.name=es01
-      - cluster.name=${CLUSTER_NAME}
-      - cluster.initial_master_nodes=es01,es02,es03
-      - discovery.seed_hosts=es02,es03
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - bootstrap.memory_lock=true
-      - xpack.security.enabled=true
-      # - xpack.security.http.ssl.enabled=true
-      # - xpack.security.http.ssl.key=certs/es01/es01.key
-      # - xpack.security.http.ssl.certificate=certs/es01/es01.crt
-      # - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt
-      # - xpack.security.http.ssl.verification_mode=certificate
-      # - xpack.security.transport.ssl.enabled=true
-      # - xpack.security.transport.ssl.key=certs/es01/es01.key
-      # - xpack.security.transport.ssl.certificate=certs/es01/es01.crt
-      # - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt
-      # - xpack.security.transport.ssl.verification_mode=certificate
-      - xpack.license.self_generated.type=${LICENSE}
-    mem_limit: ${MEM_LIMIT}
-    networks: 
-      - stack
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'",
-        ]
-      interval: 10s
-      timeout: 10s
-      retries: 120
-
-  es02:
-    depends_on:
-      - es01
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
-    volumes:
-      # - certs:/usr/share/elasticsearch/config/certs
-      - ../volumes/data/es02/logs:/usr/share/es/logs:rw
-      - ../volumes/data/es02/data:/usr/share/es/data:rw
-    environment:
-      - node.name=es02
-      - cluster.name=${CLUSTER_NAME}
-      - cluster.initial_master_nodes=es01,es02,es03
-      - discovery.seed_hosts=es01,es03
-      - bootstrap.memory_lock=true
-      - xpack.security.enabled=true
-      # - xpack.security.http.ssl.enabled=true
-      # - xpack.security.http.ssl.key=certs/es02/es02.key
-      # - xpack.security.http.ssl.certificate=certs/es02/es02.crt
-      # - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt
-      # - xpack.security.http.ssl.verification_mode=certificate
-      # - xpack.security.transport.ssl.enabled=true
-      # - xpack.security.transport.ssl.key=certs/es02/es02.key
-      # - xpack.security.transport.ssl.certificate=certs/es02/es02.crt
-      # - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt
-      # - xpack.security.transport.ssl.verification_mode=certificate
-      - xpack.license.self_generated.type=${LICENSE}
-    mem_limit: ${MEM_LIMIT}
-    networks: 
-      - stack
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'",
-        ]
-      interval: 10s
-      timeout: 10s
-      retries: 120
-
-  es03:
-    depends_on:
-      - es02
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
-    volumes:
-      # - certs:/usr/share/elasticsearch/config/certs
-      - ../volumes/data/es03/logs:/usr/share/es/logs:rw
-      - ../volumes/data/es03/data:/usr/share/es/data:rw
-    environment:
-      - node.name=es03
-      - cluster.name=${CLUSTER_NAME}
-      - cluster.initial_master_nodes=es01,es02,es03
-      - discovery.seed_hosts=es01,es02
-      - bootstrap.memory_lock=true
-      - xpack.security.enabled=true
-      # - xpack.security.http.ssl.enabled=true
-      # - xpack.security.http.ssl.key=certs/es03/es03.key
-      # - xpack.security.http.ssl.certificate=certs/es03/es03.crt
-      # - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt
-      # - xpack.security.http.ssl.verification_mode=certificate
-      # - xpack.security.transport.ssl.enabled=true
-      # - xpack.security.transport.ssl.key=certs/es03/es03.key
-      # - xpack.security.transport.ssl.certificate=certs/es03/es03.crt
-      # - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt
-      # - xpack.security.transport.ssl.verification_mode=certificate
-      - xpack.license.self_generated.type=${LICENSE}
-    mem_limit: ${MEM_LIMIT}
-    networks: 
-      - stack
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'",
-        ]
-      interval: 10s
-      timeout: 10s
-      retries: 120
-
-  kibana:
-    depends_on:
-      es01:
-        condition: service_healthy
-      es02:
-        condition: service_healthy
-      es03:
-        condition: service_healthy
-    image: docker.elastic.co/kibana/kibana:${STACK_VERSION}
-    volumes:
-      # - certs:/usr/share/kibana/config/certs
-      - ../volumes/data/kibanadata:/usr/share/kibana/data:rw
-    ports:
-      - ${KIBANA_PORT}:5601
-    environment:
-      - SERVERNAME=kibana
-      - ELASTICSEARCH_HOSTS=https://es01:9200
-      - ELASTICSEARCH_USERNAME=kibana_system
-      - ELASTICSEARCH_PASSWORD=${KIBANA_PASSWORD}
-      # - ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES=config/certs/ca/ca.crt
-    mem_limit: ${MEM_LIMIT}
-    networks: 
-      - stack
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "curl -s -I http://localhost:5601 | grep -q 'HTTP/1.1 302 Found'",
-        ]
-      interval: 10s
-      timeout: 10s
-      retries: 120
-
-  logstash:
-    image: logstash:8.0.0
-    container_name: logstash
-    volumes:
-      - ./config/logstash-springboot.conf:/usr/share/logstash/pipeline/logstash.conf #挂载logstash的配置文件
-      - ./config/logstash.yml:/usr/share/logstash/config/logstash.yml
-      - ./config/lili_goods.json:/usr/share/logstash/templates/lili_goods.json
-    networks: 
-      - stack
-    depends_on: ['elasticsearch']
-    ports: 
-      - 4560:4560
-
-volumes:
-  certs:
-    driver: local
-  esdata01:
-    driver: local
-  esdata02:
-    driver: local
-  esdata03:
-    driver: local
-  kibanadata:
-    driver: local
-networks: 
-  stack:
-    driver: bridge
--- a/docker-compose-lili-source.yml
+++ b/docker-compose-lili-source.yml
@ -0,0 +1,151 @@
+version: '3'
+services: 
+  mysql:
+    image: service.pickmall.cn:16040/middleware/mysql:8.0.33
+    restart: always
+    container_name: mysql
+    volumes:
+      - ../volumes/data/mysqldata:/var/lib/mysql
+      - ./config/my.cnf:/etc/mysql/conf.d/my.cnf
+      #      数据库还原目录 可将需要还原的sql文件放在这里
+      - ./init/mysql:/docker-entrypoint-initdb.d
+    environment:
+      - "MYSQL_ROOT_PASSWORD=lilishop"
+      - "MYSQL_DATABASE=lilishop"
+      - "TZ=Asia/Shanghai"
+    ports:
+      - 3306:3306
+
+  redis:
+    image: service.pickmall.cn:16040/middleware/redis:7.0.8
+    restart: always
+    container_name: 'redis'
+    ports:
+      - 6379:6379
+    volumes: 
+      - ../volumes/data/redsidata:/data
+    command: redis-server --port 6379 --requirepass lilishop --appendonly yes --protected-mode no
+
+  elasticsearch:
+    image: service.pickmall.cn:16040/middleware/elasticsearch:7.17.9
+    restart: always
+    container_name: elasticsearch
+    volumes:
+      # 映射本地目录权限一定要设置为 777 权限，否则启动不成功
+      # - ../volumes/data/es7/logs:/usr/share/elasticsearch/logs:rw
+      # - ../volumes/data/es7/data:/usr/share/elasticsearch/data:rw
+      - ./config/ik:/usr/share/elasticsearch/plugins/ik
+      #      - "./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
+    ports: 
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      - cluster.name=elasticsearch
+      - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "50m"
+    networks: 
+      - stack
+    ulimits:
+      nofile:
+          soft: 65535
+          hard: 65535
+
+  kibana:
+    image: service.pickmall.cn:16040/middleware/kibana:7.17.9
+    restart: always
+    container_name: kibana
+    ports:
+      - 5601:5601
+    # volumes:
+            #    - "./config/kibana.yml:/usr/share/kibana/config/kibana.yml"
+    networks: 
+      - stack
+    depends_on: ['elasticsearch']  
+
+
+  logstash:
+    image: service.pickmall.cn:16040/middleware/logstash:7.17.9
+    restart: always
+    container_name: logstash
+    volumes:
+      - ./config/logstash-springboot.conf:/usr/share/logstash/pipeline/logstash.conf #挂载logstash的配置文件
+    networks: 
+      - stack
+    depends_on: ['elasticsearch']
+    ports: 
+      - 4560:4560
+    
+ # rocket mq name server
+  rmqnamesrv:
+    image: service.pickmall.cn:16040/middleware/apache/rocketmq:4.9.7
+    restart: always
+    container_name: rocket-server
+    # environment:
+    #   JAVA_OPT_EXT: "-server -Xms64m -Xmx64m -Xmn64m"
+    # volumes:
+      # 映射本地目录权限一定要设置为 777 权限，否则启动不成功
+      # - ../volumes/data/rocket/server/logs:/home/rocketmq/logs
+    networks:
+      - rocketmq
+    ports:
+      - 9876:9876
+    command: sh mqnamesrv
+  # rocket mq broker
+  rmqbroker:
+    image: service.pickmall.cn:16040/middleware/apache/rocketmq:4.9.7
+    restart: always
+    container_name: rocket-broker
+    volumes:
+      # 映射本地目录权限一定要设置为 777 权限，否则启动不成功
+      # - ../volumes/data/rocket/broker/logs:/home/rocketmq/logs
+      # - ../volumes/data/rocket/broker/store:/home/rocketmq/store
+      - ./config/broker.conf:/opt/rocketmq-4.9.7/conf/broker.conf
+    environment:
+      - NAMESRV_ADDR=rmqnamesrv:9876
+      # - JAVA_OPTS:=-Duser.home=/opt
+      - JAVA_OPT_EXT=-server -Xms64m -Xmx64m -Xmn64m
+    depends_on:
+      - rmqnamesrv
+    networks:
+      - rocketmq
+    ports:
+      - 10909:10909
+      - 10911:10911
+    command: sh mqbroker -c /opt/rocketmq-4.9.7/conf/broker.conf
+  # rocket console 这个可以不需要
+  rmqdashboard:
+    image: service.pickmall.cn:16040/middleware/apacherocketmq/rocketmq-dashboard:1.0.0
+    restart: always
+    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
+    depends_on:
+      - rmqnamesrv
+    networks:
+      - rocketmq
+    ports:
+      - 8180:8180
+  # xxl-job 分布式调度中心
+  xxl-job:
+    image: service.pickmall.cn:16040/middleware/xuxueli/xxl-job-admin:2.3.0
+    restart: always
+    container_name: xxl-job
+    environment:
+      - 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:
+      - ../volumes/data/xxl-job:/data/applogs
+    ports:
+      - 9001:9001
+networks: 
+  rocketmq:
+    driver: bridge
+  stack:
+    driver: bridge
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -19,7 +19,7 @@ services:
  redis:
    image: redis:7.0.4
    restart: always
-    container_name: 'redis'
+    container_name: 'lili-redis'
    ports:
      - 6379:6379
    volumes:
@ -29,7 +29,7 @@ services:
  elasticsearch:
    image: elasticsearch:7.17.6
    restart: always
-    container_name: elasticsearch
+    container_name: lili-elasticsearch
    volumes:
      # 映射本地目录权限一定要设置为 777 权限，否则启动不成功
      # - ../volumes/data/es7/logs:/usr/share/elasticsearch/logs:rw
@ -57,7 +57,7 @@ services:
  kibana:
    image: docker.elastic.co/kibana/kibana:7.17.6
    restart: always
-    container_name: kibana
+    container_name: lili-kibana
    ports:
      - 5601:5601
      # volumes:
@ -66,11 +66,10 @@ services:
      - stack
    depends_on: [ 'elasticsearch' ]

-
  logstash:
    image: logstash:7.17.6
    restart: always
-    container_name: logstash
+    container_name: lili-logstash
    volumes:
      - ./config/logstash-springboot.conf:/usr/share/logstash/pipeline/logstash.conf #挂载logstash的配置文件
    networks:
@ -81,7 +80,7 @@ services:

  # rocket mq name server
  rmqnamesrv:
-    image: apache/rocketmq:4.9.4
+    image: apache/rocketmq:4.9.6
    restart: always
    container_name: rocket-server
    # environment:
@ -96,14 +95,14 @@ services:
    command: sh mqnamesrv
  # rocket mq broker
  rmqbroker:
-    image: apache/rocketmq:4.9.4
+    image: apache/rocketmq:4.9.6
    restart: always
    container_name: rocket-broker
    volumes:
      # 映射本地目录权限一定要设置为 777 权限，否则启动不成功
      # - ../volumes/data/rocket/broker/logs:/home/rocketmq/logs
      # - ../volumes/data/rocket/broker/store:/home/rocketmq/store
-      - ./config/broker.conf:/opt/rocketmq-4.9.4/conf/broker.conf
+      - ./config/broker.conf:/opt/rocketmq-4.9.6/conf/broker.conf
    environment:
      - NAMESRV_ADDR=rmqnamesrv:9876
      # - JAVA_OPTS:=-Duser.home=/opt
@ -115,7 +114,7 @@ services:
    ports:
      - 10909:10909
      - 10911:10911
-    command: sh mqbroker -c /opt/rocketmq-4.9.4/conf/broker.conf
+    command: sh mqbroker -c /opt/rocketmq-4.9.6/conf/broker.conf
  # rocket console 这个可以不需要
  rmqdashboard:
    image: apacherocketmq/rocketmq-dashboard:1.0.0
@ -148,4 +147,3 @@ networks:
    driver: bridge
  stack:
    driver: bridge
-
--- a/init/mysql/lilishop.sql
+++ b/init/mysql/lilishop.sql
Author	SHA1	Message	Date
zhuce	d62fa4ae04	init	2024-03-20 13:22:16 +08:00
misworga831	d37778a386	Add alert_quantity field to li_goods_sku table	2024-03-11 20:25:23 +08:00
misworga831	b81a84fb0b	Update docker-compose files	2024-01-15 16:21:21 +08:00
misworga831	88407fe96d	补充缺失sql	2023-10-25 17:15:57 +08:00
chc	1104ec404b	initSql	2023-08-23 15:48:52 +08:00
misworga831	94a51cb4d6	update double to decimal	2023-08-16 11:58:25 +08:00
misworga831	5ec1a9e2bc	update double to decimal	2023-08-16 11:34:42 +08:00
Admin	6b35f56e11	upgrade rocektmq version to 4.9.6	2023-06-07 06:19:26 +00:00
misworga831	d439365073	更新resion数据	2023-06-05 16:34:01 +08:00
misworga831	c5838deec5	add mysql max connections	2023-05-08 10:27:19 +08:00