diff --git a/esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml b/esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml deleted file mode 100644 index d0b0da8af..000000000 --- a/esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3.7' -services: - web: - image: nginx - ports: - - 443:443 - volumes: - - /mnt/nginx/html:/usr/share/nginx/html - - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro - - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro - - /mnt/nginx/logs:/var/log/nginx - restart: always - container_name: nginx_master - diff --git a/esua-epdc/docker-compose/prod/nginx/docker-compose.yml b/esua-epdc/docker-compose/prod/nginx/docker-compose.yml deleted file mode 100644 index d0b0da8af..000000000 --- a/esua-epdc/docker-compose/prod/nginx/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3.7' -services: - web: - image: nginx - ports: - - 443:443 - volumes: - - /mnt/nginx/html:/usr/share/nginx/html - - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro - - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro - - /mnt/nginx/logs:/var/log/nginx - restart: always - container_name: nginx_master - diff --git a/esua-epdc/docker-compose/prod/node01/3-nacos/docker-compose.yml b/esua-epdc/docker-compose/prod/node01/3-nacos/docker-compose.yml new file mode 100644 index 000000000..7e87c51d2 --- /dev/null +++ b/esua-epdc/docker-compose/prod/node01/3-nacos/docker-compose.yml @@ -0,0 +1,25 @@ +version: "3.7" +services: + nacos1: + image: nacos/nacos-server:latest + container_name: nacos1 + ports: + - 10001:10001 + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - /mnt/epdc/nacos/logs/nacos1:/home/nacos/logs + - /mnt/epdc/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties + environment: + PREFER_HOST_MODE: ip #如果支持主机名可以使用hostname,否则使用ip，默认也是ip + SPRING_DATASOURCE_PLATFORM: mysql #数据源平台 仅支持mysql或不保存empty + NACOS_SERVER_PORT: 10001 + NACOS_SERVER_IP: 172.16.0.53 #多网卡情况下，指定ip或网卡 + NACOS_SERVERS: 172.16.0.53:10001 172.16.0.51:10001 172.16.0.51:10002 #集群中其它节点[ip1:port ip2:port ip3:port] + MYSQL_SERVICE_HOST: 172.16.0.52 #mysql配置，Master为主节点，Slave为从节点 + MYSQL_SERVICE_PORT: 3306 + MYSQL_SERVICE_DB_NAME: esua_epdc_nacos + MYSQL_SERVICE_USER: epdc + MYSQL_SERVICE_PASSWORD: Elink@833066 + MYSQL_DATABASE_NUM: 2 + restart: always diff --git a/esua-epdc/docker-compose/prod/node01/4-seata/conf/registry.conf b/esua-epdc/docker-compose/prod/node01/4-seata/conf/registry.conf new file mode 100644 index 000000000..b54576988 --- /dev/null +++ b/esua-epdc/docker-compose/prod/node01/4-seata/conf/registry.conf @@ -0,0 +1,73 @@ +registry { + # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa + type = "nacos" + + nacos { + serverAddr = "47.104.208.104:80" + namespace = "" + cluster = "default" + } + eureka { + serviceUrl = "http://localhost:8761/eureka" + application = "default" + weight = "1" + } + redis { + serverAddr = "localhost:6379" + db = "0" + } + zk { + cluster = "default" + serverAddr = "127.0.0.1:2181" + session.timeout = 6000 + connect.timeout = 2000 + } + consul { + cluster = "default" + serverAddr = "127.0.0.1:8500" + } + etcd3 { + cluster = "default" + serverAddr = "http://localhost:2379" + } + sofa { + serverAddr = "127.0.0.1:9603" + application = "default" + region = "DEFAULT_ZONE" + datacenter = "DefaultDataCenter" + cluster = "default" + group = "SEATA_GROUP" + addressWaitTime = "3000" + } + file { + name = "file.conf" + } +} + +config { + # file、nacos 、apollo、zk、consul、etcd3 + type = "nacos" + + nacos { + serverAddr = "47.104.208.104:80" + namespace = "" + } + consul { + serverAddr = "127.0.0.1:8500" + } + apollo { + app.id = "seata-server" + apollo.meta = "http://192.168.1.204:8801" + } + zk { + serverAddr = "127.0.0.1:2181" + session.timeout = 6000 + connect.timeout = 2000 + } + etcd3 { + serverAddr = "http://localhost:2379" + } + file { + name = "file.conf" + } +} diff --git a/esua-epdc/docker-compose/prod/node01/4-seata/docker-compose.yml b/esua-epdc/docker-compose/prod/node01/4-seata/docker-compose.yml new file mode 100644 index 000000000..dbe74a026 --- /dev/null +++ b/esua-epdc/docker-compose/prod/node01/4-seata/docker-compose.yml @@ -0,0 +1,39 @@ +#环境变量 +#seata-server 支持以下环境变量： +# +#SEATA_IP +#可选, 指定seata-server启动的IP, 该IP用于向注册中心注册时使用, 如eureka等 +# +#SEATA_PORT +#可选, 指定seata-server启动的端口, 默认为 8091 +# +#STORE_MODE +#可选, 指定seata-server的事务日志存储方式, 支持db 和 file, 默认是 file +# +#SERVER_NODE +#可选, 用于指定seata-server节点ID, 如 1,2,3..., 默认为 1 +# +#SEATA_ENV +#可选, 指定 seata-server 运行环境, 如 dev, test 等, 服务启动时会使用 registry-dev.conf 这样的配置 +# +#SEATA_CONFIG_NAME +#可选, 指定配置文件位置, 如 file:/root/registry, 将会加载 /root/registry.conf 作为配置文件 +version: "3.7" + +services: + seata-server1: + container_name: seata-server1 + image: seataio/seata-server:latest + ports: + - 9608:9608 + environment: + SEATA_IP: 47.104.85.99 + SEATA_PORT: 9608 + STORE_MODE: db + SERVER_NODE: 1 + SEATA_CONFIG_NAME: file:/root/seata-config/registry + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - /opt/epdc/seata/seata-config:/root/seata-config + - /opt/epdc/seata/logs:/root/logs/seata diff --git a/esua-epdc/docker-compose/prod/node01/4-seata/script/config.txt b/esua-epdc/docker-compose/prod/node01/4-seata/script/config.txt new file mode 100644 index 000000000..859bc2ffd --- /dev/null +++ b/esua-epdc/docker-compose/prod/node01/4-seata/script/config.txt @@ -0,0 +1,84 @@ +transport.type=TCP +transport.server=NIO +transport.heartbeat=true +transport.enableClientBatchSendRequest=false +transport.threadFactory.bossThreadPrefix=NettyBoss +transport.threadFactory.workerThreadPrefix=NettyServerNIOWorker +transport.threadFactory.serverExecutorThreadPrefix=NettyServerBizHandler +transport.threadFactory.shareBossWorker=false +transport.threadFactory.clientSelectorThreadPrefix=NettyClientSelector +transport.threadFactory.clientSelectorThread-size=1 +transport.threadFactory.clientWorkerThreadPrefix=NettyClientWorkerThread +transport.threadFactory.bossThreadSize=1 +transport.threadFactory.workerThreadSize=8 +transport.shutdown.wait=3 +service.vgroup_mapping.my_test_tx_group=default +service.vgroup_mapping.epdc-api-server-fescar-service-group=default +service.vgroup_mapping.epdc-demo-server-fescar-service-group=default +service.vgroup_mapping.epdc-user-server-fescar-service-group=default +service.vgroup_mapping.epdc-services-server-fescar-service-group=default +service.vgroup_mapping.epdc-party-server-fescar-service-group=default +service.vgroup_mapping.epdc-heart-server-fescar-service-group=default +service.vgroup_mapping.epdc-neighbor-server-fescar-service-group=default +service.vgroup_mapping.epdc-oss-server-fescar-service-group=default +service.vgroup_mapping.epdc-message-server-fescar-service-group=default +service.vgroup_mapping.epdc-news-server-fescar-service-group=default +service.vgroup_mapping.epdc-job-server-fescar-service-group=default +service.vgroup_mapping.epdc-admin-server-fescar-service-group=default +service.vgroup_mapping.epdc-activiti-server-fescar-service-group=default +service.vgroup_mapping.epdc-kpi-server-fescar-service-group=default +service.vgroup_mapping.epdc-points-server-fescar-service-group=default +service.vgroup_mapping.epdc-webservice-server-fescar-service-group=default +service.vgroup_mapping.epdc-events-server-fescar-service-group=default +service.vgroup_mapping.epdc-custom-server-fescar-service-group=default +service.vgroup_mapping.epdc-analysis-server-fescar-service-group=default +service.vgroup_mapping.epdc-group-server-fescar-service-group=default +service.enableDegrade=false +service.disableGlobalTransaction=false +client.rm.async.commit.buffer.limit=10000 +client.rm.lock.retry.internal=10 +client.rm.lock.retry.times=30 +client.rm.report.retry.count=5 +client.rm.lock.retry.policy.branch-rollback-on-conflict=true +client.rm.table.meta.check.enable=false +client.rm.report.success.enable=true +client.tm.commit.retry.count=5 +client.tm.rollback.retry.count=5 +store.mode=db +store.file.dir=file_store/data +store.file.maxBranchSessionSize=16384 +store.file.maxGlobalSessionSize=512 +store.file.fileWriteBufferCacheSize=16384 +store.file.flushDiskMode=async +store.file.session.reload.read_size=100 +store.db.datasource=dbcp +store.db.dbType=mysql +store.db.driverClassName=com.mysql.jdbc.Driver +store.db.url=jdbc:mysql://172.31.171.61:9600/epdc_seata?useUnicode=true +store.db.user=seata +store.db.password=elink888 +store.db.minConn=1 +store.db.maxConn=3 +store.db.global.table=global_table +store.db.branch.table=branch_table +store.db.queryLimit=100 +store.db.lockTable=lock_table +server.recovery.committingRetryPeriod=1000 +server.recovery.asynCommittingRetryPeriod=1000 +server.recovery.rollbackingRetryPeriod=1000 +server.recovery.timeoutRetryPeriod=1000 +server.max.commit.retry.timeout=-1 +server.max.rollback.retry.timeout=-1 +server.rollback.retry.timeout.unlock.enable=false +client.undo.data.validation=true +client.undo.log.serialization=jackson +server.undo.log.save.days=7 +server.undo.log.delete.period=86400000 +client.undo.log.table=undo_log +client.log.exceptionRate=100 +transport.serialization=seata +transport.compressor=none +metrics.enabled=false +metrics.registryType=compact +metrics.exporterList=prometheus +metrics.exporterPrometheusPort=9898 diff --git a/esua-epdc/docker-compose/prod/node01/4-seata/script/nacos-config.sh b/esua-epdc/docker-compose/prod/node01/4-seata/script/nacos-config.sh new file mode 100644 index 000000000..15edf8555 --- /dev/null +++ b/esua-epdc/docker-compose/prod/node01/4-seata/script/nacos-config.sh @@ -0,0 +1,89 @@ +#!/usr/bin/env bash +# Copyright 1999-2019 Seata.io Group. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at、 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +while getopts ":h:p:g:t:" opt +do + case $opt in + h) + host=$OPTARG + ;; + p) + port=$OPTARG + ;; + g) + group=$OPTARG + ;; + t) + tenant=$OPTARG + ;; + ?) + echo "\033[31m USAGE OPTION: $0 [-h host] [-p port] [-g group] [-t tenant] \033[0m" + exit 1 + ;; + esac +done + +if [[ -z ${host} ]]; then + host=localhost +fi +if [[ -z ${port} ]]; then + port=8848 +fi +if [[ -z ${group} ]]; then + group="SEATA_GROUP" +fi +if [[ -z ${tenant} ]]; then + tenant="" +fi + +nacosAddr=$host:$port +contentType="content-type:application/json;charset=UTF-8" + +echo "set nacosAddr=$nacosAddr" +echo "set group=$group" + +failCount=0 +tempLog=$(mktemp -u) +function addConfig() { + curl -X POST -H "${1}" "http://$2/nacos/v1/cs/configs?dataId=$3&group=$group&content=$4&tenant=$tenant" >"${tempLog}" 2>/dev/null + if [[ -z $(cat "${tempLog}") ]]; then + echo "\033[31m Please check the cluster status. \033[0m" + exit 1 + fi + if [[ $(cat "${tempLog}") =~ "true" ]]; then + echo "Set $3=$4\033[32m successfully \033[0m" + else + echo "Set $3=$4\033[31m failure \033[0m" + (( failCount++ )) + fi +} + +count=0 +for line in $(cat $(dirname "$PWD")/config.txt); do + (( count++ )) + key=${line%%=*} + value=${line#*=} + addConfig "${contentType}" "${nacosAddr}" "${key}" "${value}" +done + +echo "=========================================================================" +echo " Complete initialization parameters, \033[32m total-count:$count \033[0m, \033[31m failure-count:$failCount \033[0m" +echo "=========================================================================" + +if [[ ${failCount} -eq 0 ]]; then + echo "\033[32m Init nacos config finished, please start seata-server. \033[0m" +else + echo "\033[31m init nacos config fail. \033[0m" +fi diff --git a/esua-epdc/docker-compose/prod/node02/2-nacos/docker-compose.yml b/esua-epdc/docker-compose/prod/node02/2-nacos/docker-compose.yml new file mode 100644 index 000000000..532e76ee2 --- /dev/null +++ b/esua-epdc/docker-compose/prod/node02/2-nacos/docker-compose.yml @@ -0,0 +1,48 @@ +version: "3.7" +services: + nacos2: + image: nacos/nacos-server:latest + container_name: nacos2 + ports: + - 10001:10001 + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - /opt/epdc/nacos/logs/nacos2:/home/nacos/logs + - /opt/epdc/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties + environment: + PREFER_HOST_MODE: ip #如果支持主机名可以使用hostname,否则使用ip，默认也是ip + SPRING_DATASOURCE_PLATFORM: mysql #数据源平台 仅支持mysql或不保存empty + NACOS_SERVER_PORT: 9602 + NACOS_SERVER_IP: 172.31.171.61 #多网卡情况下，指定ip或网卡 + NACOS_SERVERS: 172.31.171.61:9601 172.31.171.61:9602 172.31.171.62:9601 #集群中其它节点[ip1:port ip2:port ip3:port] + MYSQL_SERVICE_HOST: 172.31.171.61 #mysql配置，Master为主节点，Slave为从节点 + MYSQL_SERVICE_PORT: 9600 + MYSQL_SERVICE_DB_NAME: epdc_nacos + MYSQL_SERVICE_USER: nacos + MYSQL_SERVICE_PASSWORD: elink888 + MYSQL_DATABASE_NUM: 2 + restart: always + nacos3: + image: nacos/nacos-server:latest + container_name: nacos3 + ports: + - 9601:9601 + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - /opt/epdc/nacos/logs:/home/nacos/logs + - /opt/epdc/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties + environment: + PREFER_HOST_MODE: ip #如果支持主机名可以使用hostname,否则使用ip，默认也是ip + SPRING_DATASOURCE_PLATFORM: mysql #数据源平台 仅支持mysql或不保存empty + NACOS_SERVER_PORT: 9601 + NACOS_SERVER_IP: 172.31.171.62 #多网卡情况下，指定ip或网卡 + NACOS_SERVERS: 172.31.171.61:9601 172.31.171.61:9602 172.31.171.62:9601 #集群中其它节点[ip1:port ip2:port ip3:port] + MYSQL_SERVICE_HOST: 172.31.171.61 #mysql配置，Master为主节点，Slave为从节点 + MYSQL_SERVICE_PORT: 9600 + MYSQL_SERVICE_DB_NAME: epdc_nacos + MYSQL_SERVICE_USER: nacos + MYSQL_SERVICE_PASSWORD: elink888 + MYSQL_DATABASE_NUM: 2 + restart: always diff --git a/esua-epdc/docker-compose/prod/node02/5-seata/conf/registry.conf b/esua-epdc/docker-compose/prod/node02/5-seata/conf/registry.conf new file mode 100644 index 000000000..c5c111f63 --- /dev/null +++ b/esua-epdc/docker-compose/prod/node02/5-seata/conf/registry.conf @@ -0,0 +1,73 @@ +registry { + # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa + type = "nacos" + + nacos { + serverAddr = "172.31.171.61:80" + namespace = "" + cluster = "default" + } + eureka { + serviceUrl = "http://localhost:8761/eureka" + application = "default" + weight = "1" + } + redis { + serverAddr = "localhost:6379" + db = "0" + } + zk { + cluster = "default" + serverAddr = "127.0.0.1:2181" + session.timeout = 6000 + connect.timeout = 2000 + } + consul { + cluster = "default" + serverAddr = "127.0.0.1:8500" + } + etcd3 { + cluster = "default" + serverAddr = "http://localhost:2379" + } + sofa { + serverAddr = "127.0.0.1:9603" + application = "default" + region = "DEFAULT_ZONE" + datacenter = "DefaultDataCenter" + cluster = "default" + group = "SEATA_GROUP" + addressWaitTime = "3000" + } + file { + name = "file.conf" + } +} + +config { + # file、nacos 、apollo、zk、consul、etcd3 + type = "nacos" + + nacos { + serverAddr = "172.31.171.61:80" + namespace = "" + } + consul { + serverAddr = "127.0.0.1:8500" + } + apollo { + app.id = "seata-server" + apollo.meta = "http://192.168.1.204:8801" + } + zk { + serverAddr = "127.0.0.1:2181" + session.timeout = 6000 + connect.timeout = 2000 + } + etcd3 { + serverAddr = "http://localhost:2379" + } + file { + name = "file.conf" + } +} diff --git a/esua-epdc/docker-compose/prod/node02/5-seata/docker-compose.yml b/esua-epdc/docker-compose/prod/node02/5-seata/docker-compose.yml new file mode 100644 index 000000000..0629cda2d --- /dev/null +++ b/esua-epdc/docker-compose/prod/node02/5-seata/docker-compose.yml @@ -0,0 +1,38 @@ +#环境变量 +#seata-server 支持以下环境变量： +# +#SEATA_IP +#可选, 指定seata-server启动的IP, 该IP用于向注册中心注册时使用, 如eureka等 +# +#SEATA_PORT +#可选, 指定seata-server启动的端口, 默认为 8091 +# +#STORE_MODE +#可选, 指定seata-server的事务日志存储方式, 支持db 和 file, 默认是 file +# +#SERVER_NODE +#可选, 用于指定seata-server节点ID, 如 1,2,3..., 默认为 1 +# +#SEATA_ENV +#可选, 指定 seata-server 运行环境, 如 dev, test 等, 服务启动时会使用 registry-dev.conf 这样的配置 +# +#SEATA_CONFIG_NAME +#可选, 指定配置文件位置, 如 file:/root/registry, 将会加载 /root/registry.conf 作为配置文件 +version: "3.7" + +services: + seata-server2: + container_name: seata-server2 + image: seataio/seata-server:latest + ports: + - 9608:9608 + environment: + SEATA_IP: 114.215.125.123 + SEATA_PORT: 9608 + STORE_MODE: db + SERVER_NODE: 2 + SEATA_CONFIG_NAME: file:/root/seata-config/registry + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - /opt/epdc/seata/seata-config:/root/seata-config diff --git a/esua-epdc/docker-compose/test/node01/1-mysql/conf/mysql.conf.cnf b/esua-epdc/docker-compose/test/node01/1-mysql/conf/mysql.conf.cnf index 281bd42b5..42c62c8e8 100644 --- a/esua-epdc/docker-compose/test/node01/1-mysql/conf/mysql.conf.cnf +++ b/esua-epdc/docker-compose/test/node01/1-mysql/conf/mysql.conf.cnf @@ -18,28 +18,53 @@ skip-host-cache skip-name-resolve # 数据库编号, 要具有唯一性, 不能跟其他数据库重复, 方便同步区分 -server-id = 21 +server-id = 2 # mysql日志 log_bin = /var/lib/mysql/mysql-bin.log -log-bin-index=slave-relay-bin.index +log-bin-index=/var/lib/mysql/slave-relay-bin.index #日志记录的格式 -binlog_format=MIXED +binlog_format=mixed #单个日志文件最大 -max_binlog_size = 100M　 +max_binlog_size=100M　 #从库建议开启，有利于数据一致性 -relay_log_recovery = 1 　　 +relay_log_recovery=1 　　 #如果从库还会用做主库，建议开启 -log_slave_updates = 1 　　 +log_slave_updates=1 　　 # 中继日志：存储所有主库TP过来的binlog事件主库binlog：记录主库发生过的修改事件 -# relay-log = /var/lib/mysql/mysql-relay-bin.log +relay-log=/var/lib/mysql/mysql-relay-bin.log +relay-log-index=relay-log.index # Disabling symbolic-links is recommended to prevent assorted security risks symbolic-links=0 sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION + +# 慢查询 +slow_query_log=on +long_query_time=3 +slow_query_log_file=/var/lib/mysql/mysql-slow.log + +# GTID +gtid_mode=on +enforce_gtid_consistency=on + +# 此参数设置为ON时，新创建的InnoDB 数据表的数据会存储于一个单独的文件中，而不是存储于共享的ibdata表空间。 +innodb-file-per-table=1 +innodb_flush_log_at_trx_commit=2 +log_warnings=1 + +# 只读配置 +read_only=1 + +[mysqld_safe] +log-error=/var/lib/mysql/mysqld.log +pid-file=/var/lib/mysql/mysqld.pid + + +INSERT INTO esua_epdc_events.epdc_events VALUES ('78e89fe1d35170ed3b159a5abdf6eaf0','a897d6b6d8b97bfaaafbb031d9a3d7a2','郭口路3号-马女士','https://wx.qlogo.cn/mmopen/vi_32/q5bEiaAeUgBDj5VbESXLicsic9CSpOeqCGCQLBWXic4lLCf5ayqib5e3DRAeNBc7zCzRMxFyuE5ZhwbyYtuJyTHQZdg/132','1','13156396355','春江水暖鸭先知','青啤社区第四网格',1222016013611073538,'山东省青岛市市北区丹山路88号',36.0762400000,120.3402690000,4,'生机勃勃',0,0,0,0,'0',0,'APP_USER','2020-04-09 15:41:56','1222040755663568897','2020-04-09 18:35:45','0','','','','1175270520603930625,1202809196967714817,1202809398139117570','市北区党委-登州路街道-青啤社区','13','13','其它','1175270520603930625,1202809196967714817,1202809398139117570,1222016013611073538','市北区党委-登州路街道-青啤社区-青啤社区第四网格'); diff --git a/esua-epdc/docker-compose/test/node02/1-mysql/conf/mysql.conf.cnf b/esua-epdc/docker-compose/test/node02/1-mysql/conf/mysql.conf.cnf index 3acffaa32..9680a4543 100644 --- a/esua-epdc/docker-compose/test/node02/1-mysql/conf/mysql.conf.cnf +++ b/esua-epdc/docker-compose/test/node02/1-mysql/conf/mysql.conf.cnf @@ -18,19 +18,44 @@ skip-host-cache skip-name-resolve # 数据库编号, 要具有唯一性, 不能跟其他数据库重复, 方便同步区分 -server-id = 11 +server-id=1 + +#如果从库还会用做主库，建议开启 +log_slave_updates=1 # mysql日志 -log_bin = /var/lib/mysql/master-bin.log -log-bin-index=master-bin.index +log_bin=/var/lib/mysql/master-bin.log +log-bin-index=/var/lib/mysql/master-bin.index # binlog日志格式，mysql默认采用statement，建议使用 mixed(是statement和row模式的结合) -binlog_format = mixed +binlog_format=mixed + +# 中继日志：存储所有主库TP过来的binlog事件主库binlog：记录主库发生过的修改事件 +relay-log=/var/lib/mysql/relay-log +relay-log-index=/var/lib/mysql/relay-log.index #单个日志文件最大 -max_binlog_size = 100M +max_binlog_size=100M # Disabling symbolic-links is recommended to prevent assorted security risks symbolic-links=0 sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION + +# 慢查询 +slow_query_log=on +long_query_time=1 +slow_query_log_file=/data/mysql/mysql-slow.log + +# GTID +gtid_mode=on +enforce_gtid_consistency=on + +# 此参数设置为ON时，新创建的InnoDB 数据表的数据会存储于一个单独的文件中，而不是存储于共享的ibdata表空间。 +innodb-file-per-table=1 +innodb_flush_log_at_trx_commit=2 +log_warnings=1 + +[mysqld_safe] +log-error=/var/lib/mysql/mysqld.log +pid-file=/var/lib/mysql/mysqld.pid diff --git a/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml b/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml index 3ab10d545..c0dd9f1ce 100644 --- a/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml +++ b/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml @@ -15,3 +15,6 @@ services: - /opt/epdc/mysql/data:/var/lib/mysql - /opt/epdc/mysql/conf/mysql.conf.cnf:/etc/mysql/conf.d/mysql.conf.cnf restart: always + + + mysql -e "show databases;" -uroot -p| grep -Ev "Database|information_schema|mysql|performance_schema" |xargs mysqldump -uroot -p --single-transaction --master-data=2 --no-autocommit --databases --default-character-set=utf8 > mysql_dump.sql diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml index cdd6e505f..c7e66f664 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml @@ -63,6 +63,11 @@ orika-spring-boot-starter 1.8.0 + + + org.flywaydb + flyway-core + diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml index 0b9d84ec4..72bd5fcc8 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml @@ -15,17 +15,11 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss - redis: - database: 0 - host: 47.104.224.45 - timeout: 30s - port: 6379 - password: elink@888 datasource: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/epdc_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://47.104.224.45:3308/esua_epdc_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC username: root password: shibei@888 cloud: @@ -33,6 +27,7 @@ spring: discovery: server-addr: 47.104.224.45:8848 register-enabled: true + namespace: 6a3577b4-7b79-43f6-aebb-9c3f31263f6a alibaba: seata: tx-service-group: epdc-demo-server-fescar-service-group diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/db/migration/V1_1__INIT_DATABASE.sql b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/db/migration/V1_1__INIT_DATABASE.sql new file mode 100644 index 000000000..98c3f580c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/db/migration/V1_1__INIT_DATABASE.sql @@ -0,0 +1,12 @@ +CREATE TABLE person ( + id int(11) NOT NULL AUTO_INCREMENT, + first varchar(100) NOT NULL, + last varchar(100) NOT NULL, + dateofbirth DATE DEFAULT null, + placeofbirth varchar(100) not null, + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +insert into person (first,last,dateofbirth,placeofbirth) values('Dursun','KOC', STR_TO_DATE('02/10/1982', '%m/%d/%Y'),'Erzincan'); + +insert into person (first,last,dateofbirth,placeofbirth) values('Durseeun','KeeOC', STR_TO_DATE('05/10/1982', '%m/%d/%Y'),'Erzeeincan'); diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/registry.conf index 9cfedf9cc..c455f48c9 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/registry.conf @@ -4,7 +4,7 @@ registry { nacos { serverAddr = "47.104.224.45" - namespace = "public" + namespace = "6a3577b4-7b79-43f6-aebb-9c3f31263f6a" cluster = "default" } } @@ -15,7 +15,7 @@ config { nacos { serverAddr = "47.104.224.45" - namespace = "public" + namespace = "6a3577b4-7b79-43f6-aebb-9c3f31263f6a" cluster = "default" } } diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index 94e8f0d08..f3cc78c50 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -24,21 +24,23 @@ - UTF-8 - UTF-8 - 1.8 - Greenwich.RELEASE - 2.1.0.RELEASE - 2.7.0 1.1.1 - 2.0.3 - 0.8.0 47.104.85.99:9002 1.4.13 prod registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/ + 5.2.4 + 1.8 + UTF-8 + UTF-8 + 0.8.0 9508 - 2.1.1.RELEASE + 2.0.3 + 2.1.1.RELEASE + + Greenwich.RELEASE + 2.1.0.RELEASE + 2.7.0 @@ -78,6 +80,12 @@ spring-cloud-starter-alibaba-nacos-config 2.1.1.RELEASE + + + org.flywaydb + flyway-core + ${flyway-core.version} +