diff --git a/esua-epdc/docker-compose/jinshui/app/admin/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/admin/docker-compose.yml new file mode 100644 index 000000000..6e62ccfea --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/admin/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-admin-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-admin-server:prod + container_name: epdc-admin-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.41 + volumes: + - /mnt/epdc/app/admin/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/api/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/api/docker-compose.yml new file mode 100644 index 000000000..73506b52b --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/api/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-api-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-api-server:prod + container_name: epdc-api-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.42 + volumes: + - /mnt/epdc/app/api/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/auth/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/auth/docker-compose.yml new file mode 100644 index 000000000..f9070bab0 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/auth/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-auth: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-auth:prod + container_name: epdc-auth-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.43 + volumes: + - /mnt/epdc/app/auth/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/events/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/events/docker-compose.yml new file mode 100644 index 000000000..9c244981a --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/events/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-events-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-events-server:prod + container_name: epdc-events-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.44 + volumes: + - /mnt/epdc/app/events/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/gateway/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/gateway/docker-compose.yml new file mode 100644 index 000000000..2828635f8 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/gateway/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-gateway: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-gateway:prod + container_name: epdc-gateway-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.40 + volumes: + - /mnt/epdc/app/gateway/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/group/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/group/docker-compose.yml new file mode 100644 index 000000000..31ad7f03a --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/group/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-group-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-group-server:prod + container_name: epdc-group-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.45 + volumes: + - /mnt/epdc/app/group/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/message/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/message/docker-compose.yml new file mode 100644 index 000000000..a7bf82c9f --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/message/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-message-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-message-server:prod + container_name: epdc-message-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.46 + volumes: + - /mnt/epdc/app/message/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/news/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/news/docker-compose.yml new file mode 100644 index 000000000..3fd1a9dce --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/news/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-news-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-news-server:prod + container_name: epdc-news-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.47 + volumes: + - /mnt/epdc/app/news/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/oss/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/oss/docker-compose.yml new file mode 100644 index 000000000..5bf7b7e50 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/oss/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-oss-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-oss-server:prod + container_name: epdc-oss-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.48 + volumes: + - /mnt/epdc/app/oss/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/user/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/user/docker-compose.yml new file mode 100644 index 000000000..215d7c16f --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/user/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-user-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-user-server:prod + container_name: epdc-user-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.49 + volumes: + - /mnt/epdc/app/user/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/app/websocket/docker-compose.yml b/esua-epdc/docker-compose/jinshui/app/websocket/docker-compose.yml new file mode 100644 index 000000000..1af424db7 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/app/websocket/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + epdc-websocket-server: + image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-websocket-server:prod + container_name: epdc-websocket-server-01 + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.50 + volumes: + - /mnt/epdc/app/websocket/logs:/logs +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node03/1-mysql/conf/mysql.conf.cnf b/esua-epdc/docker-compose/jinshui/node03/1-mysql/conf/mysql.conf.cnf new file mode 100644 index 000000000..36d2ca841 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/1-mysql/conf/mysql.conf.cnf @@ -0,0 +1,45 @@ +[client] + +default-character-set=utf8 + +[mysqld] + +character-set-server=utf8 + +##### 这两部操作可以解决mysql连接很慢的问题 ##### +# 根据官方文档说明，如果你的mysql主机查询DNS很慢或是有很多客户端主机时会导致连接很慢，由于我们的开发机器是不能够连接外网的， +# 所以DNS解析是不可能完成的，从而也就明白了为什么连接那么慢了。同时，请注意在增加该配置参数后，mysql的授权表中的host字段就 +# 不能够使用域名而只能够使用 ip地址了，因为这是禁止了域名解析的结果。 + +# 1.禁止域名解析 +skip-host-cache + +# 2.禁用dns解析，但是，这样不能在mysql的授权表中使用主机名了，只能使用IP。 +skip-name-resolve + +# 数据库编号, 要具有唯一性, 不能跟其他数据库重复, 方便同步区分 +server-id = 21 + +# mysql日志 +log_bin = /var/lib/mysql/mysql-bin.log +log-bin-index=slave-relay-bin.index + +#日志记录的格式 +binlog_format=MIXED + +#单个日志文件最大 +max_binlog_size = 512M　 + +#从库建议开启，有利于数据一致性 +relay_log_recovery = 1 　　 + +#如果从库还会用做主库，建议开启 +log_slave_updates = 1 　　 + +# 中继日志：存储所有主库TP过来的binlog事件主库binlog：记录主库发生过的修改事件 +# relay-log = /var/lib/mysql/mysql-relay-bin.log + +# 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 diff --git a/esua-epdc/docker-compose/jinshui/node03/1-mysql/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node03/1-mysql/docker-compose.yml new file mode 100644 index 000000000..841fff19f --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/1-mysql/docker-compose.yml @@ -0,0 +1,21 @@ +version: "3.7" +services: + mysql-slave: + container_name: mysql-slave + image: mysql:5.7 + environment: + TZ: Asia/Shanghai + MYSQL_ROOT_PASSWORD: epdc!elink1405 + MYSQL_LOWER_CASE_TABLE_NAMES: 1 + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone + - /mnt/epdc/mysql/data:/var/lib/mysql + - /mnt/epdc/mysql/conf/mysql.conf.cnf:/etc/mysql/conf.d/mysql.conf.cnf + restart: always + networks: + epdc_network: + ipv4_address: 172.20.0.3 +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node03/2-nginx/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node03/2-nginx/docker-compose.yml new file mode 100644 index 000000000..5ea8ecf9a --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/2-nginx/docker-compose.yml @@ -0,0 +1,20 @@ +version: "3.7" +services: + web: + image: nginx + ports: + - 80:80 + - 443:443 + volumes: + - /mnt/epdc/nginx/html:/usr/share/nginx/html + - /mnt/epdc/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro + - /mnt/epdc/nginx/conf.d:/etc/nginx/conf.d:ro + - /mnt/epdc/nginx/logs:/var/log/nginx + restart: always + container_name: nginx_master + networks: + epdc_network: + ipv4_address: 172.20.0.4 +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node03/3-nacos/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node03/3-nacos/docker-compose.yml new file mode 100644 index 000000000..329d60e86 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/3-nacos/docker-compose.yml @@ -0,0 +1,27 @@ +version: "3.7" +services: + nacos3: + image: nacos/nacos-server:latest + container_name: nacos3 + networks: + epdc_network: + ipv4_address: 172.20.0.5 + volumes: + - /mnt/epdc/nacos/logs:/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_IP: 172.20.0.5 #多网卡情况下，指定ip或网卡 + NACOS_SERVERS: 172.20.0.5:8848 172.19.0.3:8848 172.19.0.4:8848 #集群中其它节点[ip1:port ip2:port ip3:port] + MYSQL_MASTER_SERVICE_HOST: 172.19.0.2 #mysql配置，Master为主节点，Slave为从节点 + MYSQL_MASTER_SERVICE_PORT: 3306 + MYSQL_MASTER_SERVICE_DB_NAME: epdc_nacos + MYSQL_MASTER_SERVICE_USER: nacos + MYSQL_MASTER_SERVICE_PASSWORD: elink!nacos888 + MYSQL_SLAVE_SERVICE_HOST: 172.20.0.3 + MYSQL_SLAVE_SERVICE_PORT: 3306 + restart: always +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node03/4-redis/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node03/4-redis/docker-compose.yml new file mode 100644 index 000000000..314ce01c5 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/4-redis/docker-compose.yml @@ -0,0 +1,17 @@ +version: '3.7' +services: + slave2: + image: redis + container_name: redis-slave-2 + command: redis-server --slaveof 172.19.0.11 6379 --requirepass epdc!redis@slave1405 --masterauth epdc!redis@master1405 --logfile /data/log/redis-slave2.log + restart: always + volumes: + - /mnt/epdc/redis/log:/data/log + - /mnt/epdc/redis/data:/data + networks: + epdc_network: + ipv4_address: 172.20.0.11 + +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node03/4-redis/sentinel/conf/sentinel1.conf b/esua-epdc/docker-compose/jinshui/node03/4-redis/sentinel/conf/sentinel1.conf new file mode 100644 index 000000000..a19d1e21b --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/4-redis/sentinel/conf/sentinel1.conf @@ -0,0 +1,9 @@ +port 26379 +logfile "/usr/local/redis/sentinel/log/sentinel.log" +dir "/usr/local/redis/sentinel" +sentinel monitor epdcmaster 172.19.0.11 6379 2 +sentinel down-after-milliseconds epdcmaster 30000 +sentinel parallel-syncs epdcmaster 1 +sentinel failover-timeout epdcmaster 180000 +sentinel deny-scripts-reconfig yes +sentinel auth-pass epdcmaster epdc!redis@master1405 diff --git a/esua-epdc/docker-compose/jinshui/node03/4-redis/sentinel/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node03/4-redis/sentinel/docker-compose.yml new file mode 100644 index 000000000..01ac65055 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/4-redis/sentinel/docker-compose.yml @@ -0,0 +1,18 @@ +version: '3.7' +services: + sentinel2: + image: redis + container_name: redis-sentinel-2 + command: redis-sentinel /usr/local/etc/redis/sentinel.conf + volumes: + - /mnt/epdc/redis/sentinel/conf/sentinel1.conf:/usr/local/etc/redis/sentinel.conf + - /mnt/epdc/redis/sentinel/data:/data + - /mnt/epdc/redis/sentinel/log:/usr/local/redis/sentinel/log + - /mnt/epdc/redis/sentinel/dir:/usr/local/redis/sentinel + networks: + epdc_network: + ipv4_address: 172.20.0.12 + +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node03/5-seata/conf/registry.conf b/esua-epdc/docker-compose/jinshui/node03/5-seata/conf/registry.conf new file mode 100644 index 000000000..b54576988 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/5-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/master/application/10.5.34.163-slave/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node03/5-seata/docker-compose.yml similarity index 66% rename from esua-epdc/docker-compose/prod/master/application/10.5.34.163-slave/docker-compose.yml rename to esua-epdc/docker-compose/jinshui/node03/5-seata/docker-compose.yml index a3d22f77c..359354457 100644 --- a/esua-epdc/docker-compose/prod/master/application/10.5.34.163-slave/docker-compose.yml +++ b/esua-epdc/docker-compose/jinshui/node03/5-seata/docker-compose.yml @@ -21,15 +21,20 @@ version: "3.7" services: - seata-server: + seata-server2: + container_name: seata-server2 image: seataio/seata-server:latest - hostname: seata-server - ports: - - 9001:8091 environment: - - SEATA_PORT=8091 - - SEATA_IP= - - STORE_MODE=db - - SERVER_NODE=1 - expose: - - 8091 + SEATA_IP: 172.20.0.21 + SEATA_PORT: 8091 + STORE_MODE: db + SERVER_NODE: 2 + SEATA_CONFIG_NAME: file:/root/seata-config/registry + volumes: + - /mnt/epdc/seata/seata-config:/root/seata-config + networks: + epdc_network: + ipv4_address: 172.20.0.21 +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node03/Readme.md b/esua-epdc/docker-compose/jinshui/node03/Readme.md new file mode 100644 index 000000000..e00b8b109 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node03/Readme.md @@ -0,0 +1,9 @@ +1. 创建网络: + +``` +docker network create -d bridge --subnet 172.20.0.0/24 epdc_network +``` + +2. 执行1-mysql中的docker-compose.yml +3. 执行2-nacos中的docker-compose.yml +https://github.com/alibaba/nacos/blob/master/distribution/conf/nacos-mysql.sql diff --git a/esua-epdc/docker-compose/jinshui/node04/1-mysql/conf/mysql.conf.cnf b/esua-epdc/docker-compose/jinshui/node04/1-mysql/conf/mysql.conf.cnf new file mode 100644 index 000000000..02810e63e --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/1-mysql/conf/mysql.conf.cnf @@ -0,0 +1,36 @@ +[client] + +default-character-set=utf8 + +[mysqld] + +character-set-server=utf8 + +##### 这两部操作可以解决mysql连接很慢的问题 ##### +# 根据官方文档说明，如果你的mysql主机查询DNS很慢或是有很多客户端主机时会导致连接很慢，由于我们的开发机器是不能够连接外网的， +# 所以DNS解析是不可能完成的，从而也就明白了为什么连接那么慢了。同时，请注意在增加该配置参数后，mysql的授权表中的host字段就 +# 不能够使用域名而只能够使用 ip地址了，因为这是禁止了域名解析的结果。 + +# 1.禁止域名解析 +skip-host-cache + +# 2.禁用dns解析，但是，这样不能在mysql的授权表中使用主机名了，只能使用IP。 +skip-name-resolve + +# 数据库编号, 要具有唯一性, 不能跟其他数据库重复, 方便同步区分 +server-id = 11 + +# mysql日志 +log_bin = /var/lib/mysql/master-bin.log +log-bin-index=master-bin.index + +# binlog日志格式，mysql默认采用statement，建议使用 mixed(是statement和row模式的结合) +binlog_format = mixed + +#单个日志文件最大 +max_binlog_size = 512M + +# 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 diff --git a/esua-epdc/docker-compose/jinshui/node04/1-mysql/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/1-mysql/docker-compose.yml new file mode 100644 index 000000000..287533d89 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/1-mysql/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3.7" +services: + mysql-master: + container_name: mysql-master + image: mysql:5.7 + environment: + TZ: Asia/Shanghai + MYSQL_ROOT_PASSWORD: epdc!elink1405 + MYSQL_LOWER_CASE_TABLE_NAMES: 1 + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone + - /mnt/epdc/mysql/data:/var/lib/mysql + - /mnt/epdc/mysql/conf/mysql.conf.cnf:/etc/mysql/conf.d/mysql.conf.cnf + restart: always + networks: + epdc_network: + ipv4_address: 172.19.0.2 +networks: + epdc_network: + external: true + diff --git a/esua-epdc/docker-compose/jinshui/node04/2-nacos/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/2-nacos/docker-compose.yml new file mode 100644 index 000000000..d68fe54a6 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/2-nacos/docker-compose.yml @@ -0,0 +1,50 @@ +version: "3.7" +services: + nacos1: + image: nacos/nacos-server:latest + container_name: nacos1 + networks: + epdc_network: + ipv4_address: 172.19.0.3 + volumes: + - /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_IP: 172.19.0.3 #多网卡情况下，指定ip或网卡 + NACOS_SERVERS: 172.20.0.5:8848 172.19.0.3:8848 172.19.0.4:8848 #集群中其它节点[ip1:port ip2:port ip3:port] + MYSQL_MASTER_SERVICE_HOST: 172.19.0.2 #mysql配置，Master为主节点，Slave为从节点 + MYSQL_MASTER_SERVICE_PORT: 3306 + MYSQL_MASTER_SERVICE_DB_NAME: epdc_nacos + MYSQL_MASTER_SERVICE_USER: nacos + MYSQL_MASTER_SERVICE_PASSWORD: elink!nacos888 + MYSQL_SLAVE_SERVICE_HOST: 172.20.0.3 + MYSQL_SLAVE_SERVICE_PORT: 3306 + restart: on-failure + + nacos2: + image: nacos/nacos-server:latest + container_name: nacos2 + networks: + epdc_network: + ipv4_address: 172.19.0.4 + volumes: + - /mnt/epdc/nacos/logs/nacos2:/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_IP: 172.19.0.4 #多网卡情况下，指定ip或网卡 + NACOS_SERVERS: 172.20.0.5:8848 172.19.0.3:8848 172.19.0.4:8848 #集群中其它节点[ip1:port ip2:port ip3:port] + MYSQL_MASTER_SERVICE_HOST: 172.19.0.2 #mysql配置，Master为主节点，Slave为从节点 + MYSQL_MASTER_SERVICE_PORT: 3306 + MYSQL_MASTER_SERVICE_DB_NAME: epdc_nacos + MYSQL_MASTER_SERVICE_USER: nacos + MYSQL_MASTER_SERVICE_PASSWORD: elink!nacos888 + MYSQL_SLAVE_SERVICE_HOST: 172.20.0.3 + MYSQL_SLAVE_SERVICE_PORT: 3306 + restart: always +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node04/3-seata/conf/registry.conf b/esua-epdc/docker-compose/jinshui/node04/3-seata/conf/registry.conf new file mode 100644 index 000000000..b54576988 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/3-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/master/db/10.5.34.164/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/3-seata/docker-compose.yml similarity index 66% rename from esua-epdc/docker-compose/prod/master/db/10.5.34.164/docker-compose.yml rename to esua-epdc/docker-compose/jinshui/node04/3-seata/docker-compose.yml index b69d7d59c..5eb137479 100644 --- a/esua-epdc/docker-compose/prod/master/db/10.5.34.164/docker-compose.yml +++ b/esua-epdc/docker-compose/jinshui/node04/3-seata/docker-compose.yml @@ -21,15 +21,20 @@ version: "3.7" services: - seata-server: + seata-server1: + container_name: seata-server1 image: seataio/seata-server:latest - hostname: seata-server - ports: - - 9101:8091 environment: - - SEATA_PORT=8091 - - SEATA_IP=10.5.34.164 - - STORE_MODE=db - - SERVER_NODE=1 - expose: - - 8091 + SEATA_IP: 172.19.0.21 + SEATA_PORT: 8091 + STORE_MODE: db + SERVER_NODE: 1 + SEATA_CONFIG_NAME: file:/root/seata-config/registry + volumes: + - /mnt/epdc/seata/seata-config:/root/seata-config + networks: + epdc_network: + ipv4_address: 172.19.0.21 +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node04/3-seata/script/config.txt b/esua-epdc/docker-compose/jinshui/node04/3-seata/script/config.txt new file mode 100644 index 000000000..bbdbaf627 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/3-seata/script/config.txt @@ -0,0 +1,81 @@ +transport.type=TCP +transport.server=NIO +transport.heartbeat=true +transport.enable-client-batch-send-request=false +transport.thread-factory.boss-thread-prefix=NettyBoss +transport.thread-factory.worker-thread-prefix=NettyServerNIOWorker +transport.thread-factory.server-executor-thread-prefix=NettyServerBizHandler +transport.thread-factory.share-boss-worker=false +transport.thread-factory.client-selector-thread-prefix=NettyClientSelector +transport.thread-factory.client-selector-thread-size=1 +transport.thread-factory.client-worker-thread-prefix=NettyClientWorkerThread +transport.thread-factory.boss-thread-size=1 +transport.thread-factory.worker-thread-size=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.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.max-branch-session-size=16384 +store.file.max-global-session-size=512 +store.file.file-write-buffer-cache-size=16384 +store.file.flush-disk-mode=async +store.file.session.reload.read_size=100 +store.db.datasource=dbcp +store.db.db-type=mysql +store.db.driver-class-name=com.mysql.jdbc.Driver +store.db.url=jdbc:mysql://172.19.0.2:3306/seata?useUnicode=true +store.db.user=epdc +store.db.password=Elink@833066 +store.db.min-conn=1 +store.db.max-conn=3 +store.db.global.table=global_table +store.db.branch.table=branch_table +store.db.query-limit=100 +store.db.lock-table=lock_table +server.recovery.committing-retry-period=1000 +server.recovery.asyn-committing-retry-period=1000 +server.recovery.rollbacking-retry-period=1000 +server.recovery.timeout-retry-period=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.registry-type=compact +metrics.exporter-list=prometheus +metrics.exporter-prometheus-port=9898 diff --git a/esua-epdc/docker-compose/jinshui/node04/3-seata/script/nacos-config.sh b/esua-epdc/docker-compose/jinshui/node04/3-seata/script/nacos-config.sh new file mode 100644 index 000000000..15edf8555 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/3-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/jinshui/node04/4-redis/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/4-redis/docker-compose.yml new file mode 100644 index 000000000..05b3cc38d --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/4-redis/docker-compose.yml @@ -0,0 +1,29 @@ +version: '3.7' +services: + master: + image: redis + container_name: redis-master + command: redis-server --requirepass epdc!redis@master1405 --logfile /data/log/redis-master.log + restart: always + volumes: + - /mnt/epdc/redis/log:/data/log + - /mnt/epdc/redis/data:/data + networks: + epdc_network: + ipv4_address: 172.19.0.11 + + slave1: + image: redis + container_name: redis-slave-1 + command: redis-server --slaveof 172.19.0.11 6379 --requirepass epdc!redis@slave1405 --masterauth epdc!redis@master1405 --logfile /data/log/redis-slave1.log + restart: always + volumes: + - /mnt/epdc/redis/log:/data/log + - /mnt/epdc/redis/data:/data + networks: + epdc_network: + ipv4_address: 172.19.0.12 + +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/conf/sentinel1.conf b/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/conf/sentinel1.conf new file mode 100644 index 000000000..a19d1e21b --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/conf/sentinel1.conf @@ -0,0 +1,9 @@ +port 26379 +logfile "/usr/local/redis/sentinel/log/sentinel.log" +dir "/usr/local/redis/sentinel" +sentinel monitor epdcmaster 172.19.0.11 6379 2 +sentinel down-after-milliseconds epdcmaster 30000 +sentinel parallel-syncs epdcmaster 1 +sentinel failover-timeout epdcmaster 180000 +sentinel deny-scripts-reconfig yes +sentinel auth-pass epdcmaster epdc!redis@master1405 diff --git a/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/conf/sentinel2.conf b/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/conf/sentinel2.conf new file mode 100644 index 000000000..a19d1e21b --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/conf/sentinel2.conf @@ -0,0 +1,9 @@ +port 26379 +logfile "/usr/local/redis/sentinel/log/sentinel.log" +dir "/usr/local/redis/sentinel" +sentinel monitor epdcmaster 172.19.0.11 6379 2 +sentinel down-after-milliseconds epdcmaster 30000 +sentinel parallel-syncs epdcmaster 1 +sentinel failover-timeout epdcmaster 180000 +sentinel deny-scripts-reconfig yes +sentinel auth-pass epdcmaster epdc!redis@master1405 diff --git a/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/docker-compose.yml new file mode 100644 index 000000000..855bd32be --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/4-redis/sentinel/docker-compose.yml @@ -0,0 +1,31 @@ +version: '3.7' +services: + sentinel1: + image: redis + container_name: redis-sentinel-1 + command: redis-sentinel /usr/local/etc/redis/sentinel.conf + volumes: + - /mnt/epdc/redis/sentinel/conf/sentinel1.conf:/usr/local/etc/redis/sentinel.conf + - /mnt/epdc/redis/sentinel/data:/data + - /mnt/epdc/redis/sentinel/log:/usr/local/redis/sentinel/log + - /mnt/epdc/redis/sentinel/dir:/usr/local/redis/sentinel + networks: + epdc_network: + ipv4_address: 172.19.0.13 + + sentinel3: + image: redis + container_name: redis-sentinel-3 + command: redis-sentinel /usr/local/etc/redis/sentinel.conf + volumes: + - /mnt/epdc/redis/sentinel/conf/sentinel2.conf:/usr/local/etc/redis/sentinel.conf + - /mnt/epdc/redis/sentinel/data2:/data + - /mnt/epdc/redis/sentinel/log2:/usr/local/redis/sentinel/log + - /mnt/epdc/redis/sentinel/dir2:/usr/local/redis/sentinel + networks: + epdc_network: + ipv4_address: 172.19.0.14 + +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node04/Readme.md b/esua-epdc/docker-compose/jinshui/node04/Readme.md new file mode 100644 index 000000000..a8b2fa7d6 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/Readme.md @@ -0,0 +1,8 @@ +1. 创建网络: + +``` +docker network create -d bridge --subnet 172.19.0.0/24 epdc_network +``` + +2. 执行1-mysql中的docker-compose.yml +3. 执行2-nacos中的docker-compose.yml diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/Dockerfile b/esua-epdc/docker-compose/jinshui/node04/fastdfs/Dockerfile new file mode 100644 index 000000000..8a7bdb353 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/Dockerfile @@ -0,0 +1,39 @@ +# centos 7 +FROM centos:7 +# 添加配置文件 +ADD conf/client.conf /etc/fdfs/ +ADD conf/http.conf /etc/fdfs/ +ADD conf/mime.types /etc/fdfs/ +ADD conf/storage.conf /etc/fdfs/ +ADD conf/tracker.conf /etc/fdfs/ +ADD fastdfs.sh /home +ADD conf/nginx.conf /etc/fdfs/ +ADD conf/mod_fastdfs.conf /etc/fdfs + +# run +RUN yum install git gcc gcc-c++ make automake autoconf libtool pcre pcre-devel zlib zlib-devel openssl-devel wget vim -y \ + && cd /usr/local/src \ + && git clone https://github.com/happyfish100/libfastcommon.git --depth 1 \ + && git clone https://github.com/happyfish100/fastdfs.git --depth 1 \ + && git clone https://github.com/happyfish100/fastdfs-nginx-module.git --depth 1 \ + && wget http://nginx.org/download/nginx-1.15.4.tar.gz \ + && tar -zxvf nginx-1.15.4.tar.gz \ + && mkdir /home/dfs \ + && cd /usr/local/src/ \ + && cd libfastcommon/ \ + && ./make.sh && ./make.sh install \ + && cd ../ \ + && cd fastdfs/ \ + && ./make.sh && ./make.sh install \ + && cd ../ \ + && cd nginx-1.15.4/ \ + && ./configure --add-module=/usr/local/src/fastdfs-nginx-module/src/ \ + && make && make install \ + && chmod +x /home/fastdfs.sh + + +# export config +VOLUME /etc/fdfs + +EXPOSE 22122 23000 8888 80 +ENTRYPOINT ["/home/fastdfs.sh"] diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/README.md b/esua-epdc/docker-compose/jinshui/node04/fastdfs/README.md new file mode 100644 index 000000000..a3570545d --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/README.md @@ -0,0 +1,45 @@ +# FastDFS Dockerfile network (网络版本) + +## 声明 +其实并没什么区别 教程是在上一位huayanYu(小锅盖)和 Wiki的作者 的基础上进行了一些修改，本质上还是huayanYu(小锅盖) 和 Wiki 上的作者写的教程 + + +## 目录介绍 +### conf +Dockerfile 所需要的一些配置文件 +当然你也可以对这些文件进行一些修改 比如 storage.conf 里面的 bast_path 等相关 + +## 使用方法 +需要注意的是 你需要在运行容器的时候制定宿主机的ip 用参数 FASTDFS_IPADDR 来指定 + + + +``` +docker run -d -e FASTDFS_IPADDR=192.168.1.234 -p 8888:8888 -p 22122:22122 -p 23000:23000 -p 8011:80 --name test-fast 镜像id/镜像名称 +``` + + +## 后记 +本质上 local 版本与 network 版本无区别 + + + + +## Statement +In fact, there is no difference between the tutorials written by Huayan Yu and Wiki on the basis of their previous authors. In essence, they are also tutorials written by the authors of Huayan Yu and Wiki. + +## Catalogue introduction +### conf +Dockerfile Some configuration files needed +Of course, you can also make some modifications to these files, such as bast_path in storage. conf, etc. + +## Usage method +Note that you need to specify the host IP when running the container with the parameter FASTDFS_IPADDR +Here's a sample docker run instruction +``` +docker run -d -e FASTDFS_IPADDR=192.168.1.234 -p 8888:8888 -p 22122:22122 -p 23000:23000 -p 8011:80 --name test-fast 镜像id/镜像名称 +``` + +## Epilogue +Essentially, there is no difference between the local version and the network version. + diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/client.conf b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/client.conf new file mode 100644 index 000000000..8ddfc54c1 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/client.conf @@ -0,0 +1,63 @@ +# connect timeout in seconds +# default value is 30s +connect_timeout=30 + +# network timeout in seconds +# default value is 30s +network_timeout=60 + +# the base path to store log files +base_path=/home/dfs + +# tracker_server can ocur more than once, and tracker_server format is +# "host:port", host can be hostname or ip address +tracker_server=172.19.0.30:22122 +tracker_server=172.20.0.30:22122 + +#standard log level as syslog, case insensitive, value list: +### emerg for emergency +### alert +### crit for critical +### error +### warn for warning +### notice +### info +### debug +log_level=info + +# if use connection pool +# default value is false +# since V4.05 +use_connection_pool = false + +# connections whose the idle time exceeds this time will be closed +# unit: second +# default value is 3600 +# since V4.05 +connection_pool_max_idle_time = 3600 + +# if load FastDFS parameters from tracker server +# since V4.05 +# default value is false +load_fdfs_parameters_from_tracker=false + +# if use storage ID instead of IP address +# same as tracker.conf +# valid only when load_fdfs_parameters_from_tracker is false +# default value is false +# since V4.05 +use_storage_id = false + +# specify storage ids filename, can use relative or absolute path +# same as tracker.conf +# valid only when load_fdfs_parameters_from_tracker is false +# since V4.05 +storage_ids_filename = storage_ids.conf + + +#HTTP settings +http.tracker_server_port=80 + +#use "#include" directive to include HTTP other settiongs +##include http.conf + diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/http.conf b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/http.conf new file mode 100644 index 000000000..4d055f983 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/http.conf @@ -0,0 +1,29 @@ +# HTTP default content type +http.default_content_type = application/octet-stream + +# MIME types mapping filename +# MIME types file format: MIME_type extensions +# such as: image/jpeg jpeg jpg jpe +# you can use apache's MIME file: mime.types +http.mime_types_filename=mime.types + +# if use token to anti-steal +# default value is false (0) +http.anti_steal.check_token=false + +# token TTL (time to live), seconds +# default value is 600 +http.anti_steal.token_ttl=900 + +# secret key to generate anti-steal token +# this parameter must be set when http.anti_steal.check_token set to true +# the length of the secret key should not exceed 128 bytes +http.anti_steal.secret_key=FastDFS1234567890 + +# return the content of the file when check token fail +# default value is empty (no file sepecified) +http.anti_steal.token_check_fail=/home/yuqing/fastdfs/conf/anti-steal.jpg + +# if support multi regions for HTTP Range +# default value is true +http.multi_range.enabed = true diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/mime.types b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/mime.types new file mode 100644 index 000000000..07b4465ef --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/mime.types @@ -0,0 +1,1065 @@ +# This is a comment. I love comments. + +# This file controls what Internet media types are sent to the client for +# given file extension(s). Sending the correct media type to the client +# is important so they know how to handle the content of the file. +# Extra types can either be added here or by using an AddType directive +# in your config files. For more information about Internet media types, +# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type +# registry is at . + +# MIME type Extensions +application/activemessage +application/andrew-inset ez +application/applefile +application/atom+xml atom +application/atomcat+xml atomcat +application/atomicmail +application/atomsvc+xml atomsvc +application/auth-policy+xml +application/batch-smtp +application/beep+xml +application/cals-1840 +application/ccxml+xml ccxml +application/cellml+xml +application/cnrp+xml +application/commonground +application/conference-info+xml +application/cpl+xml +application/csta+xml +application/cstadata+xml +application/cybercash +application/davmount+xml davmount +application/dca-rft +application/dec-dx +application/dialog-info+xml +application/dicom +application/dns +application/dvcs +application/ecmascript ecma +application/edi-consent +application/edi-x12 +application/edifact +application/epp+xml +application/eshop +application/fastinfoset +application/fastsoap +application/fits +application/font-tdpfr pfr +application/h224 +application/http +application/hyperstudio stk +application/iges +application/im-iscomposing+xml +application/index +application/index.cmd +application/index.obj +application/index.response +application/index.vnd +application/iotp +application/ipp +application/isup +application/javascript js +application/json json +application/kpml-request+xml +application/kpml-response+xml +application/lost+xml lostxml +application/mac-binhex40 hqx +application/mac-compactpro cpt +application/macwriteii +application/marc mrc +application/mathematica ma nb mb +application/mathml+xml mathml +application/mbms-associated-procedure-description+xml +application/mbms-deregister+xml +application/mbms-envelope+xml +application/mbms-msk+xml +application/mbms-msk-response+xml +application/mbms-protection-description+xml +application/mbms-reception-report+xml +application/mbms-register+xml +application/mbms-register-response+xml +application/mbms-user-service-description+xml +application/mbox mbox +application/media_control+xml +application/mediaservercontrol+xml mscml +application/mikey +application/moss-keys +application/moss-signature +application/mosskey-data +application/mosskey-request +application/mp4 mp4s +application/mpeg4-generic +application/mpeg4-iod +application/mpeg4-iod-xmt +application/msword doc dot +application/mxf mxf +application/nasdata +application/news-transmission +application/nss +application/ocsp-request +application/ocsp-response +application/octet-stream bin dms lha lzh class so iso dmg dist distz pkg bpk dump elc +application/oda oda +application/oebps-package+xml +application/ogg ogx +application/parityfec +application/patch-ops-error+xml xer +application/pdf pdf +application/pgp-encrypted pgp +application/pgp-keys +application/pgp-signature asc sig +application/pics-rules prf +application/pidf+xml +application/pidf-diff+xml +application/pkcs10 p10 +application/pkcs7-mime p7m p7c +application/pkcs7-signature p7s +application/pkix-cert cer +application/pkix-crl crl +application/pkix-pkipath pkipath +application/pkixcmp pki +application/pls+xml pls +application/poc-settings+xml +application/postscript ai eps ps +application/prs.alvestrand.titrax-sheet +application/prs.cww cww +application/prs.nprend +application/prs.plucker +application/qsig +application/rdf+xml rdf +application/reginfo+xml rif +application/relax-ng-compact-syntax rnc +application/remote-printing +application/resource-lists+xml rl +application/resource-lists-diff+xml rld +application/riscos +application/rlmi+xml +application/rls-services+xml rs +application/rsd+xml rsd +application/rss+xml rss +application/rtf rtf +application/rtx +application/samlassertion+xml +application/samlmetadata+xml +application/sbml+xml sbml +application/scvp-cv-request scq +application/scvp-cv-response scs +application/scvp-vp-request spq +application/scvp-vp-response spp +application/sdp sdp +application/set-payment +application/set-payment-initiation setpay +application/set-registration +application/set-registration-initiation setreg +application/sgml +application/sgml-open-catalog +application/shf+xml shf +application/sieve +application/simple-filter+xml +application/simple-message-summary +application/simplesymbolcontainer +application/slate +application/smil +application/smil+xml smi smil +application/soap+fastinfoset +application/soap+xml +application/sparql-query rq +application/sparql-results+xml srx +application/spirits-event+xml +application/srgs gram +application/srgs+xml grxml +application/ssml+xml ssml +application/timestamp-query +application/timestamp-reply +application/tve-trigger +application/ulpfec +application/vemmi +application/vividence.scriptfile +application/vnd.3gpp.bsf+xml +application/vnd.3gpp.pic-bw-large plb +application/vnd.3gpp.pic-bw-small psb +application/vnd.3gpp.pic-bw-var pvb +application/vnd.3gpp.sms +application/vnd.3gpp2.bcmcsinfo+xml +application/vnd.3gpp2.sms +application/vnd.3gpp2.tcap tcap +application/vnd.3m.post-it-notes pwn +application/vnd.accpac.simply.aso aso +application/vnd.accpac.simply.imp imp +application/vnd.acucobol acu +application/vnd.acucorp atc acutc +application/vnd.adobe.xdp+xml xdp +application/vnd.adobe.xfdf xfdf +application/vnd.aether.imp +application/vnd.americandynamics.acc acc +application/vnd.amiga.ami ami +application/vnd.anser-web-certificate-issue-initiation cii +application/vnd.anser-web-funds-transfer-initiation fti +application/vnd.antix.game-component atx +application/vnd.apple.installer+xml mpkg +application/vnd.arastra.swi swi +application/vnd.audiograph aep +application/vnd.autopackage +application/vnd.avistar+xml +application/vnd.blueice.multipass mpm +application/vnd.bmi bmi +application/vnd.businessobjects rep +application/vnd.cab-jscript +application/vnd.canon-cpdl +application/vnd.canon-lips +application/vnd.cendio.thinlinc.clientconf +application/vnd.chemdraw+xml cdxml +application/vnd.chipnuts.karaoke-mmd mmd +application/vnd.cinderella cdy +application/vnd.cirpack.isdn-ext +application/vnd.claymore cla +application/vnd.clonk.c4group c4g c4d c4f c4p c4u +application/vnd.commerce-battelle +application/vnd.commonspace csp cst +application/vnd.contact.cmsg cdbcmsg +application/vnd.cosmocaller cmc +application/vnd.crick.clicker clkx +application/vnd.crick.clicker.keyboard clkk +application/vnd.crick.clicker.palette clkp +application/vnd.crick.clicker.template clkt +application/vnd.crick.clicker.wordbank clkw +application/vnd.criticaltools.wbs+xml wbs +application/vnd.ctc-posml pml +application/vnd.ctct.ws+xml +application/vnd.cups-pdf +application/vnd.cups-postscript +application/vnd.cups-ppd ppd +application/vnd.cups-raster +application/vnd.cups-raw +application/vnd.curl curl +application/vnd.cybank +application/vnd.data-vision.rdz rdz +application/vnd.denovo.fcselayout-link fe_launch +application/vnd.dna dna +application/vnd.dolby.mlp mlp +application/vnd.dpgraph dpg +application/vnd.dreamfactory dfac +application/vnd.dvb.esgcontainer +application/vnd.dvb.ipdcesgaccess +application/vnd.dvb.iptv.alfec-base +application/vnd.dvb.iptv.alfec-enhancement +application/vnd.dxr +application/vnd.ecdis-update +application/vnd.ecowin.chart mag +application/vnd.ecowin.filerequest +application/vnd.ecowin.fileupdate +application/vnd.ecowin.series +application/vnd.ecowin.seriesrequest +application/vnd.ecowin.seriesupdate +application/vnd.enliven nml +application/vnd.epson.esf esf +application/vnd.epson.msf msf +application/vnd.epson.quickanime qam +application/vnd.epson.salt slt +application/vnd.epson.ssf ssf +application/vnd.ericsson.quickcall +application/vnd.eszigno3+xml es3 et3 +application/vnd.eudora.data +application/vnd.ezpix-album ez2 +application/vnd.ezpix-package ez3 +application/vnd.fdf fdf +application/vnd.ffsns +application/vnd.fints +application/vnd.flographit gph +application/vnd.fluxtime.clip ftc +application/vnd.font-fontforge-sfd +application/vnd.framemaker fm frame maker +application/vnd.frogans.fnc fnc +application/vnd.frogans.ltf ltf +application/vnd.fsc.weblaunch fsc +application/vnd.fujitsu.oasys oas +application/vnd.fujitsu.oasys2 oa2 +application/vnd.fujitsu.oasys3 oa3 +application/vnd.fujitsu.oasysgp fg5 +application/vnd.fujitsu.oasysprs bh2 +application/vnd.fujixerox.art-ex +application/vnd.fujixerox.art4 +application/vnd.fujixerox.hbpl +application/vnd.fujixerox.ddd ddd +application/vnd.fujixerox.docuworks xdw +application/vnd.fujixerox.docuworks.binder xbd +application/vnd.fut-misnet +application/vnd.fuzzysheet fzs +application/vnd.genomatix.tuxedo txd +application/vnd.gmx gmx +application/vnd.google-earth.kml+xml kml +application/vnd.google-earth.kmz kmz +application/vnd.grafeq gqf gqs +application/vnd.gridmp +application/vnd.groove-account gac +application/vnd.groove-help ghf +application/vnd.groove-identity-message gim +application/vnd.groove-injector grv +application/vnd.groove-tool-message gtm +application/vnd.groove-tool-template tpl +application/vnd.groove-vcard vcg +application/vnd.handheld-entertainment+xml zmm +application/vnd.hbci hbci +application/vnd.hcl-bireports +application/vnd.hhe.lesson-player les +application/vnd.hp-hpgl hpgl +application/vnd.hp-hpid hpid +application/vnd.hp-hps hps +application/vnd.hp-jlyt jlt +application/vnd.hp-pcl pcl +application/vnd.hp-pclxl pclxl +application/vnd.httphone +application/vnd.hydrostatix.sof-data sfd-hdstx +application/vnd.hzn-3d-crossword x3d +application/vnd.ibm.afplinedata +application/vnd.ibm.electronic-media +application/vnd.ibm.minipay mpy +application/vnd.ibm.modcap afp listafp list3820 +application/vnd.ibm.rights-management irm +application/vnd.ibm.secure-container sc +application/vnd.iccprofile icc icm +application/vnd.igloader igl +application/vnd.immervision-ivp ivp +application/vnd.immervision-ivu ivu +application/vnd.informedcontrol.rms+xml +application/vnd.intercon.formnet xpw xpx +application/vnd.intertrust.digibox +application/vnd.intertrust.nncp +application/vnd.intu.qbo qbo +application/vnd.intu.qfx qfx +application/vnd.iptc.g2.conceptitem+xml +application/vnd.iptc.g2.knowledgeitem+xml +application/vnd.iptc.g2.newsitem+xml +application/vnd.iptc.g2.packageitem+xml +application/vnd.ipunplugged.rcprofile rcprofile +application/vnd.irepository.package+xml irp +application/vnd.is-xpr xpr +application/vnd.jam jam +application/vnd.japannet-directory-service +application/vnd.japannet-jpnstore-wakeup +application/vnd.japannet-payment-wakeup +application/vnd.japannet-registration +application/vnd.japannet-registration-wakeup +application/vnd.japannet-setstore-wakeup +application/vnd.japannet-verification +application/vnd.japannet-verification-wakeup +application/vnd.jcp.javame.midlet-rms rms +application/vnd.jisp jisp +application/vnd.joost.joda-archive joda +application/vnd.kahootz ktz ktr +application/vnd.kde.karbon karbon +application/vnd.kde.kchart chrt +application/vnd.kde.kformula kfo +application/vnd.kde.kivio flw +application/vnd.kde.kontour kon +application/vnd.kde.kpresenter kpr kpt +application/vnd.kde.kspread ksp +application/vnd.kde.kword kwd kwt +application/vnd.kenameaapp htke +application/vnd.kidspiration kia +application/vnd.kinar kne knp +application/vnd.koan skp skd skt skm +application/vnd.kodak-descriptor sse +application/vnd.liberty-request+xml +application/vnd.llamagraphics.life-balance.desktop lbd +application/vnd.llamagraphics.life-balance.exchange+xml lbe +application/vnd.lotus-1-2-3 123 +application/vnd.lotus-approach apr +application/vnd.lotus-freelance pre +application/vnd.lotus-notes nsf +application/vnd.lotus-organizer org +application/vnd.lotus-screencam scm +application/vnd.lotus-wordpro lwp +application/vnd.macports.portpkg portpkg +application/vnd.marlin.drm.actiontoken+xml +application/vnd.marlin.drm.conftoken+xml +application/vnd.marlin.drm.license+xml +application/vnd.marlin.drm.mdcf +application/vnd.mcd mcd +application/vnd.medcalcdata mc1 +application/vnd.mediastation.cdkey cdkey +application/vnd.meridian-slingshot +application/vnd.mfer mwf +application/vnd.mfmp mfm +application/vnd.micrografx.flo flo +application/vnd.micrografx.igx igx +application/vnd.mif mif +application/vnd.minisoft-hp3000-save +application/vnd.mitsubishi.misty-guard.trustweb +application/vnd.mobius.daf daf +application/vnd.mobius.dis dis +application/vnd.mobius.mbk mbk +application/vnd.mobius.mqy mqy +application/vnd.mobius.msl msl +application/vnd.mobius.plc plc +application/vnd.mobius.txf txf +application/vnd.mophun.application mpn +application/vnd.mophun.certificate mpc +application/vnd.motorola.flexsuite +application/vnd.motorola.flexsuite.adsi +application/vnd.motorola.flexsuite.fis +application/vnd.motorola.flexsuite.gotap +application/vnd.motorola.flexsuite.kmr +application/vnd.motorola.flexsuite.ttc +application/vnd.motorola.flexsuite.wem +application/vnd.motorola.iprm +application/vnd.mozilla.xul+xml xul +application/vnd.ms-artgalry cil +application/vnd.ms-asf asf +application/vnd.ms-cab-compressed cab +application/vnd.ms-excel xls xlm xla xlc xlt xlw +application/vnd.ms-fontobject eot +application/vnd.ms-htmlhelp chm +application/vnd.ms-ims ims +application/vnd.ms-lrm lrm +application/vnd.ms-playready.initiator+xml +application/vnd.ms-powerpoint ppt pps pot +application/vnd.ms-project mpp mpt +application/vnd.ms-tnef +application/vnd.ms-wmdrm.lic-chlg-req +application/vnd.ms-wmdrm.lic-resp +application/vnd.ms-wmdrm.meter-chlg-req +application/vnd.ms-wmdrm.meter-resp +application/vnd.ms-works wps wks wcm wdb +application/vnd.ms-wpl wpl +application/vnd.ms-xpsdocument xps +application/vnd.mseq mseq +application/vnd.msign +application/vnd.multiad.creator +application/vnd.multiad.creator.cif +application/vnd.music-niff +application/vnd.musician mus +application/vnd.muvee.style msty +application/vnd.ncd.control +application/vnd.ncd.reference +application/vnd.nervana +application/vnd.netfpx +application/vnd.neurolanguage.nlu nlu +application/vnd.noblenet-directory nnd +application/vnd.noblenet-sealer nns +application/vnd.noblenet-web nnw +application/vnd.nokia.catalogs +application/vnd.nokia.conml+wbxml +application/vnd.nokia.conml+xml +application/vnd.nokia.isds-radio-presets +application/vnd.nokia.iptv.config+xml +application/vnd.nokia.landmark+wbxml +application/vnd.nokia.landmark+xml +application/vnd.nokia.landmarkcollection+xml +application/vnd.nokia.n-gage.ac+xml +application/vnd.nokia.n-gage.data ngdat +application/vnd.nokia.n-gage.symbian.install n-gage +application/vnd.nokia.ncd +application/vnd.nokia.pcd+wbxml +application/vnd.nokia.pcd+xml +application/vnd.nokia.radio-preset rpst +application/vnd.nokia.radio-presets rpss +application/vnd.novadigm.edm edm +application/vnd.novadigm.edx edx +application/vnd.novadigm.ext ext +application/vnd.oasis.opendocument.chart odc +application/vnd.oasis.opendocument.chart-template otc +application/vnd.oasis.opendocument.formula odf +application/vnd.oasis.opendocument.formula-template otf +application/vnd.oasis.opendocument.graphics odg +application/vnd.oasis.opendocument.graphics-template otg +application/vnd.oasis.opendocument.image odi +application/vnd.oasis.opendocument.image-template oti +application/vnd.oasis.opendocument.presentation odp +application/vnd.oasis.opendocument.presentation-template otp +application/vnd.oasis.opendocument.spreadsheet ods +application/vnd.oasis.opendocument.spreadsheet-template ots +application/vnd.oasis.opendocument.text odt +application/vnd.oasis.opendocument.text-master otm +application/vnd.oasis.opendocument.text-template ott +application/vnd.oasis.opendocument.text-web oth +application/vnd.obn +application/vnd.olpc-sugar xo +application/vnd.oma-scws-config +application/vnd.oma-scws-http-request +application/vnd.oma-scws-http-response +application/vnd.oma.bcast.associated-procedure-parameter+xml +application/vnd.oma.bcast.drm-trigger+xml +application/vnd.oma.bcast.imd+xml +application/vnd.oma.bcast.ltkm +application/vnd.oma.bcast.notification+xml +application/vnd.oma.bcast.provisioningtrigger +application/vnd.oma.bcast.sgboot +application/vnd.oma.bcast.sgdd+xml +application/vnd.oma.bcast.sgdu +application/vnd.oma.bcast.simple-symbol-container +application/vnd.oma.bcast.smartcard-trigger+xml +application/vnd.oma.bcast.sprov+xml +application/vnd.oma.bcast.stkm +application/vnd.oma.dcd +application/vnd.oma.dcdc +application/vnd.oma.dd2+xml dd2 +application/vnd.oma.drm.risd+xml +application/vnd.oma.group-usage-list+xml +application/vnd.oma.poc.detailed-progress-report+xml +application/vnd.oma.poc.final-report+xml +application/vnd.oma.poc.groups+xml +application/vnd.oma.poc.invocation-descriptor+xml +application/vnd.oma.poc.optimized-progress-report+xml +application/vnd.oma.xcap-directory+xml +application/vnd.omads-email+xml +application/vnd.omads-file+xml +application/vnd.omads-folder+xml +application/vnd.omaloc-supl-init +application/vnd.openofficeorg.extension oxt +application/vnd.osa.netdeploy +application/vnd.osgi.dp dp +application/vnd.otps.ct-kip+xml +application/vnd.palm prc pdb pqa oprc +application/vnd.paos.xml +application/vnd.pg.format str +application/vnd.pg.osasli ei6 +application/vnd.piaccess.application-licence +application/vnd.picsel efif +application/vnd.poc.group-advertisement+xml +application/vnd.pocketlearn plf +application/vnd.powerbuilder6 pbd +application/vnd.powerbuilder6-s +application/vnd.powerbuilder7 +application/vnd.powerbuilder7-s +application/vnd.powerbuilder75 +application/vnd.powerbuilder75-s +application/vnd.preminet +application/vnd.previewsystems.box box +application/vnd.proteus.magazine mgz +application/vnd.publishare-delta-tree qps +application/vnd.pvi.ptid1 ptid +application/vnd.pwg-multiplexed +application/vnd.pwg-xhtml-print+xml +application/vnd.qualcomm.brew-app-res +application/vnd.quark.quarkxpress qxd qxt qwd qwt qxl qxb +application/vnd.rapid +application/vnd.recordare.musicxml mxl +application/vnd.recordare.musicxml+xml +application/vnd.renlearn.rlprint +application/vnd.rn-realmedia rm +application/vnd.route66.link66+xml link66 +application/vnd.ruckus.download +application/vnd.s3sms +application/vnd.sbm.mid2 +application/vnd.scribus +application/vnd.sealed.3df +application/vnd.sealed.csf +application/vnd.sealed.doc +application/vnd.sealed.eml +application/vnd.sealed.mht +application/vnd.sealed.net +application/vnd.sealed.ppt +application/vnd.sealed.tiff +application/vnd.sealed.xls +application/vnd.sealedmedia.softseal.html +application/vnd.sealedmedia.softseal.pdf +application/vnd.seemail see +application/vnd.sema sema +application/vnd.semd semd +application/vnd.semf semf +application/vnd.shana.informed.formdata ifm +application/vnd.shana.informed.formtemplate itp +application/vnd.shana.informed.interchange iif +application/vnd.shana.informed.package ipk +application/vnd.simtech-mindmapper twd twds +application/vnd.smaf mmf +application/vnd.software602.filler.form+xml +application/vnd.software602.filler.form-xml-zip +application/vnd.solent.sdkm+xml sdkm sdkd +application/vnd.spotfire.dxp dxp +application/vnd.spotfire.sfs sfs +application/vnd.sss-cod +application/vnd.sss-dtf +application/vnd.sss-ntf +application/vnd.street-stream +application/vnd.sun.wadl+xml +application/vnd.sus-calendar sus susp +application/vnd.svd svd +application/vnd.swiftview-ics +application/vnd.syncml+xml xsm +application/vnd.syncml.dm+wbxml bdm +application/vnd.syncml.dm+xml xdm +application/vnd.syncml.ds.notification +application/vnd.tao.intent-module-archive tao +application/vnd.tmobile-livetv tmo +application/vnd.trid.tpt tpt +application/vnd.triscape.mxs mxs +application/vnd.trueapp tra +application/vnd.truedoc +application/vnd.ufdl ufd ufdl +application/vnd.uiq.theme utz +application/vnd.umajin umj +application/vnd.unity unityweb +application/vnd.uoml+xml uoml +application/vnd.uplanet.alert +application/vnd.uplanet.alert-wbxml +application/vnd.uplanet.bearer-choice +application/vnd.uplanet.bearer-choice-wbxml +application/vnd.uplanet.cacheop +application/vnd.uplanet.cacheop-wbxml +application/vnd.uplanet.channel +application/vnd.uplanet.channel-wbxml +application/vnd.uplanet.list +application/vnd.uplanet.list-wbxml +application/vnd.uplanet.listcmd +application/vnd.uplanet.listcmd-wbxml +application/vnd.uplanet.signal +application/vnd.vcx vcx +application/vnd.vd-study +application/vnd.vectorworks +application/vnd.vidsoft.vidconference +application/vnd.visio vsd vst vss vsw +application/vnd.visionary vis +application/vnd.vividence.scriptfile +application/vnd.vsf vsf +application/vnd.wap.sic +application/vnd.wap.slc +application/vnd.wap.wbxml wbxml +application/vnd.wap.wmlc wmlc +application/vnd.wap.wmlscriptc wmlsc +application/vnd.webturbo wtb +application/vnd.wfa.wsc +application/vnd.wmc +application/vnd.wmf.bootstrap +application/vnd.wordperfect wpd +application/vnd.wqd wqd +application/vnd.wrq-hp3000-labelled +application/vnd.wt.stf stf +application/vnd.wv.csp+wbxml +application/vnd.wv.csp+xml +application/vnd.wv.ssp+xml +application/vnd.xara xar +application/vnd.xfdl xfdl +application/vnd.xmi+xml +application/vnd.xmpie.cpkg +application/vnd.xmpie.dpkg +application/vnd.xmpie.plan +application/vnd.xmpie.ppkg +application/vnd.xmpie.xlim +application/vnd.yamaha.hv-dic hvd +application/vnd.yamaha.hv-script hvs +application/vnd.yamaha.hv-voice hvp +application/vnd.yamaha.smaf-audio saf +application/vnd.yamaha.smaf-phrase spf +application/vnd.yellowriver-custom-menu cmp +application/vnd.zzazz.deck+xml zaz +application/voicexml+xml vxml +application/watcherinfo+xml +application/whoispp-query +application/whoispp-response +application/winhlp hlp +application/wita +application/wordperfect5.1 +application/wsdl+xml wsdl +application/wspolicy+xml wspolicy +application/x-ace-compressed ace +application/x-bcpio bcpio +application/x-bittorrent torrent +application/x-bzip bz +application/x-bzip2 bz2 boz +application/x-cdlink vcd +application/x-chat chat +application/x-chess-pgn pgn +application/x-compress +application/x-cpio cpio +application/x-csh csh +application/x-director dcr dir dxr fgd +application/x-dvi dvi +application/x-futuresplash spl +application/x-gtar gtar +application/x-gzip +application/x-hdf hdf +application/x-latex latex +application/x-ms-wmd wmd +application/x-ms-wmz wmz +application/x-msaccess mdb +application/x-msbinder obd +application/x-mscardfile crd +application/x-msclip clp +application/x-msdownload exe dll com bat msi +application/x-msmediaview mvb m13 m14 +application/x-msmetafile wmf +application/x-msmoney mny +application/x-mspublisher pub +application/x-msschedule scd +application/x-msterminal trm +application/x-mswrite wri +application/x-netcdf nc cdf +application/x-pkcs12 p12 pfx +application/x-pkcs7-certificates p7b spc +application/x-pkcs7-certreqresp p7r +application/x-rar-compressed rar +application/x-sh sh +application/x-shar shar +application/x-shockwave-flash swf +application/x-stuffit sit +application/x-stuffitx sitx +application/x-sv4cpio sv4cpio +application/x-sv4crc sv4crc +application/x-tar tar +application/x-tcl tcl +application/x-tex tex +application/x-texinfo texinfo texi +application/x-ustar ustar +application/x-wais-source src +application/x-x509-ca-cert der crt +application/x400-bp +application/xcap-att+xml +application/xcap-caps+xml +application/xcap-el+xml +application/xcap-error+xml +application/xcap-ns+xml +application/xenc+xml xenc +application/xhtml+xml xhtml xht +application/xml xml xsl +application/xml-dtd dtd +application/xml-external-parsed-entity +application/xmpp+xml +application/xop+xml xop +application/xslt+xml xslt +application/xspf+xml xspf +application/xv+xml mxml xhvml xvml xvm +application/zip zip +audio/32kadpcm +audio/3gpp +audio/3gpp2 +audio/ac3 +audio/amr +audio/amr-wb +audio/amr-wb+ +audio/asc +audio/basic au snd +audio/bv16 +audio/bv32 +audio/clearmode +audio/cn +audio/dat12 +audio/dls +audio/dsr-es201108 +audio/dsr-es202050 +audio/dsr-es202211 +audio/dsr-es202212 +audio/dvi4 +audio/eac3 +audio/evrc +audio/evrc-qcp +audio/evrc0 +audio/evrc1 +audio/evrcb +audio/evrcb0 +audio/evrcb1 +audio/evrcwb +audio/evrcwb0 +audio/evrcwb1 +audio/g722 +audio/g7221 +audio/g723 +audio/g726-16 +audio/g726-24 +audio/g726-32 +audio/g726-40 +audio/g728 +audio/g729 +audio/g7291 +audio/g729d +audio/g729e +audio/gsm +audio/gsm-efr +audio/ilbc +audio/l16 +audio/l20 +audio/l24 +audio/l8 +audio/lpc +audio/midi mid midi kar rmi +audio/mobile-xmf +audio/mp4 mp4a +audio/mp4a-latm +audio/mpa +audio/mpa-robust +audio/mpeg mpga mp2 mp2a mp3 m2a m3a +audio/mpeg4-generic +audio/ogg oga ogg spx +audio/parityfec +audio/pcma +audio/pcmu +audio/prs.sid +audio/qcelp +audio/red +audio/rtp-enc-aescm128 +audio/rtp-midi +audio/rtx +audio/smv +audio/smv0 +audio/smv-qcp +audio/sp-midi +audio/t140c +audio/t38 +audio/telephone-event +audio/tone +audio/ulpfec +audio/vdvi +audio/vmr-wb +audio/vnd.3gpp.iufp +audio/vnd.4sb +audio/vnd.audiokoz +audio/vnd.celp +audio/vnd.cisco.nse +audio/vnd.cmles.radio-events +audio/vnd.cns.anp1 +audio/vnd.cns.inf1 +audio/vnd.digital-winds eol +audio/vnd.dlna.adts +audio/vnd.dolby.mlp +audio/vnd.dts dts +audio/vnd.dts.hd dtshd +audio/vnd.everad.plj +audio/vnd.hns.audio +audio/vnd.lucent.voice lvp +audio/vnd.ms-playready.media.pya pya +audio/vnd.nokia.mobile-xmf +audio/vnd.nortel.vbk +audio/vnd.nuera.ecelp4800 ecelp4800 +audio/vnd.nuera.ecelp7470 ecelp7470 +audio/vnd.nuera.ecelp9600 ecelp9600 +audio/vnd.octel.sbc +audio/vnd.qcelp +audio/vnd.rhetorex.32kadpcm +audio/vnd.sealedmedia.softseal.mpeg +audio/vnd.vmx.cvsd +audio/vorbis +audio/vorbis-config +audio/wav wav +audio/x-aiff aif aiff aifc +audio/x-mpegurl m3u +audio/x-ms-wax wax +audio/x-ms-wma wma +audio/x-pn-realaudio ram ra +audio/x-pn-realaudio-plugin rmp +audio/x-wav wav +chemical/x-cdx cdx +chemical/x-cif cif +chemical/x-cmdf cmdf +chemical/x-cml cml +chemical/x-csml csml +chemical/x-pdb pdb +chemical/x-xyz xyz +image/bmp bmp +image/cgm cgm +image/fits +image/g3fax g3 +image/gif gif +image/ief ief +image/jp2 +image/jpeg jpeg jpg jpe +image/jpm +image/jpx +image/naplps +image/png png +image/prs.btif btif +image/prs.pti +image/svg+xml svg svgz +image/t38 +image/tiff tiff tif +image/tiff-fx +image/vnd.adobe.photoshop psd +image/vnd.cns.inf2 +image/vnd.djvu djvu djv +image/vnd.dwg dwg +image/vnd.dxf dxf +image/vnd.fastbidsheet fbs +image/vnd.fpx fpx +image/vnd.fst fst +image/vnd.fujixerox.edmics-mmr mmr +image/vnd.fujixerox.edmics-rlc rlc +image/vnd.globalgraphics.pgb +image/vnd.microsoft.icon +image/vnd.mix +image/vnd.ms-modi mdi +image/vnd.net-fpx npx +image/vnd.sealed.png +image/vnd.sealedmedia.softseal.gif +image/vnd.sealedmedia.softseal.jpg +image/vnd.svf +image/vnd.wap.wbmp wbmp +image/vnd.xiff xif +image/x-cmu-raster ras +image/x-cmx cmx +image/x-icon ico +image/x-pcx pcx +image/x-pict pic pct +image/x-portable-anymap pnm +image/x-portable-bitmap pbm +image/x-portable-graymap pgm +image/x-portable-pixmap ppm +image/x-rgb rgb +image/x-xbitmap xbm +image/x-xpixmap xpm +image/x-xwindowdump xwd +message/cpim +message/delivery-status +message/disposition-notification +message/external-body +message/global +message/global-delivery-status +message/global-disposition-notification +message/global-headers +message/http +message/news +message/partial +message/rfc822 eml mime +message/s-http +message/sip +message/sipfrag +message/tracking-status +message/vnd.si.simp +model/iges igs iges +model/mesh msh mesh silo +model/vnd.dwf dwf +model/vnd.flatland.3dml +model/vnd.gdl gdl +model/vnd.gs.gdl +model/vnd.gtw gtw +model/vnd.moml+xml +model/vnd.mts mts +model/vnd.parasolid.transmit.binary +model/vnd.parasolid.transmit.text +model/vnd.vtu vtu +model/vrml wrl vrml +multipart/alternative +multipart/appledouble +multipart/byteranges +multipart/digest +multipart/encrypted +multipart/form-data +multipart/header-set +multipart/mixed +multipart/parallel +multipart/related +multipart/report +multipart/signed +multipart/voice-message +text/calendar ics ifb +text/css css +text/csv csv +text/directory +text/dns +text/enriched +text/html html htm +text/parityfec +text/plain txt text conf def list log in +text/prs.fallenstein.rst +text/prs.lines.tag dsc +text/red +text/rfc822-headers +text/richtext rtx +text/rtf +text/rtp-enc-aescm128 +text/rtx +text/sgml sgml sgm +text/t140 +text/tab-separated-values tsv +text/troff t tr roff man me ms +text/ulpfec +text/uri-list uri uris urls +text/vnd.abc +text/vnd.curl +text/vnd.dmclientscript +text/vnd.esmertec.theme-descriptor +text/vnd.fly fly +text/vnd.fmi.flexstor flx +text/vnd.graphviz gv +text/vnd.in3d.3dml 3dml +text/vnd.in3d.spot spot +text/vnd.iptc.newsml +text/vnd.iptc.nitf +text/vnd.latex-z +text/vnd.motorola.reflex +text/vnd.ms-mediapackage +text/vnd.net2phone.commcenter.command +text/vnd.si.uricatalogue +text/vnd.sun.j2me.app-descriptor jad +text/vnd.trolltech.linguist +text/vnd.wap.si +text/vnd.wap.sl +text/vnd.wap.wml wml +text/vnd.wap.wmlscript wmls +text/x-asm s asm +text/x-c c cc cxx cpp h hh dic +text/x-fortran f for f77 f90 +text/x-pascal p pas +text/x-java-source java +text/x-setext etx +text/x-uuencode uu +text/x-vcalendar vcs +text/x-vcard vcf +text/xml +text/xml-external-parsed-entity +video/3gpp 3gp +video/3gpp-tt +video/3gpp2 3g2 +video/bmpeg +video/bt656 +video/celb +video/dv +video/h261 h261 +video/h263 h263 +video/h263-1998 +video/h263-2000 +video/h264 h264 +video/jpeg jpgv +video/jpeg2000 +video/jpm jpm jpgm +video/mj2 mj2 mjp2 +video/mp1s +video/mp2p +video/mp2t +video/mp4 mp4 mp4v mpg4 +video/mp4v-es +video/mpeg mpeg mpg mpe m1v m2v +video/mpeg4-generic +video/mpv +video/nv +video/ogg ogv +video/parityfec +video/pointer +video/quicktime qt mov +video/raw +video/rtp-enc-aescm128 +video/rtx +video/smpte292m +video/ulpfec +video/vc1 +video/vnd.cctv +video/vnd.dlna.mpeg-tts +video/vnd.fvt fvt +video/vnd.hns.video +video/vnd.iptvforum.1dparityfec-1010 +video/vnd.iptvforum.1dparityfec-2005 +video/vnd.iptvforum.2dparityfec-1010 +video/vnd.iptvforum.2dparityfec-2005 +video/vnd.iptvforum.ttsavc +video/vnd.iptvforum.ttsmpeg2 +video/vnd.motorola.video +video/vnd.motorola.videop +video/vnd.mpegurl mxu m4u +video/vnd.ms-playready.media.pyv pyv +video/vnd.nokia.interleaved-multimedia +video/vnd.nokia.videovoip +video/vnd.objectvideo +video/vnd.sealed.mpeg1 +video/vnd.sealed.mpeg4 +video/vnd.sealed.swf +video/vnd.sealedmedia.softseal.mov +video/vnd.vivo viv +video/x-fli fli +video/x-ms-asf asf asx +video/x-ms-wm wm +video/x-ms-wmv wmv +video/x-ms-wmx wmx +video/x-ms-wvx wvx +video/x-msvideo avi +video/x-sgi-movie movie +x-conference/x-cooltalk ice diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/mod_fastdfs.conf b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/mod_fastdfs.conf new file mode 100644 index 000000000..9f989bf40 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/mod_fastdfs.conf @@ -0,0 +1,134 @@ +# connect timeout in seconds +# default value is 30s +connect_timeout=2 + +# network recv and send timeout in seconds +# default value is 30s +network_timeout=30 + +# the base path to store log files +base_path=/tmp + +# if load FastDFS parameters from tracker server +# since V1.12 +# default value is false +load_fdfs_parameters_from_tracker=true + +# storage sync file max delay seconds +# same as tracker.conf +# valid only when load_fdfs_parameters_from_tracker is false +# since V1.12 +# default value is 86400 seconds (one day) +storage_sync_file_max_delay = 86400 + +# if use storage ID instead of IP address +# same as tracker.conf +# valid only when load_fdfs_parameters_from_tracker is false +# default value is false +# since V1.13 +use_storage_id = false + +# specify storage ids filename, can use relative or absolute path +# same as tracker.conf +# valid only when load_fdfs_parameters_from_tracker is false +# since V1.13 +storage_ids_filename = storage_ids.conf + +# FastDFS tracker_server can ocur more than once, and tracker_server format is +# "host:port", host can be hostname or ip address +# valid only when load_fdfs_parameters_from_tracker is true +tracker_server=172.19.0.30:22122 +tracker_server=172.20.0.30:22122 + +# the port of the local storage server +# the default value is 23000 +storage_server_port=23000 + +# the group name of the local storage server +group_name=group1 + +# if the url / uri including the group name +# set to false when uri like /M00/00/00/xxx +# set to true when uri like ${group_name}/M00/00/00/xxx, such as group1/M00/xxx +# default value is false +url_have_group_name = true + +# path(disk or mount point) count, default value is 1 +# must same as storage.conf +store_path_count=1 + +# store_path#, based 0, if store_path0 not exists, it's value is base_path +# the paths must be exist +# must same as storage.conf +store_path0=/home/dfs +#store_path1=/home/yuqing/fastdfs1 + +# standard log level as syslog, case insensitive, value list: +### emerg for emergency +### alert +### crit for critical +### error +### warn for warning +### notice +### info +### debug +log_level=info + +# set the log filename, such as /usr/local/apache2/logs/mod_fastdfs.log +# empty for output to stderr (apache and nginx error_log file) +log_filename= + +# response mode when the file not exist in the local file system +## proxy: get the content from other storage server, then send to client +## redirect: redirect to the original storage server (HTTP Header is Location) +response_mode=proxy + +# the NIC alias prefix, such as eth in Linux, you can see it by ifconfig -a +# multi aliases split by comma. empty value means auto set by OS type +# this paramter used to get all ip address of the local host +# default values is empty +if_alias_prefix= + +# use "#include" directive to include HTTP config file +# NOTE: #include is an include directive, do NOT remove the # before include +#include http.conf + + +# if support flv +# default value is false +# since v1.15 +flv_support = true + +# flv file extension name +# default value is flv +# since v1.15 +flv_extension = flv + + +# set the group count +# set to none zero to support multi-group on this storage server +# set to 0 for single group only +# groups settings section as [group1], [group2], ..., [groupN] +# default value is 0 +# since v1.14 +group_count = 0 + +# group settings for group #1 +# since v1.14 +# when support multi-group on this storage server, uncomment following section +#[group1] +#group_name=group1 +#storage_server_port=23000 +#store_path_count=2 +#store_path0=/home/yuqing/fastdfs +#store_path1=/home/yuqing/fastdfs1 + +# group settings for group #2 +# since v1.14 +# when support multi-group, uncomment following section as neccessary +#[group2] +#group_name=group2 +#storage_server_port=23000 +#store_path_count=1 +#store_path0=/home/yuqing/fastdfs + diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/nginx.conf b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/nginx.conf new file mode 100644 index 000000000..62b5d0bf2 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/nginx.conf @@ -0,0 +1,127 @@ + +#user nobody; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +#pid logs/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + + #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + # '$status $body_bytes_sent "$http_referer" ' + # '"$http_user_agent" "$http_x_forwarded_for"'; + + #access_log logs/access.log main; + + sendfile on; + #tcp_nopush on; + + #keepalive_timeout 0; + keepalive_timeout 65; + + #gzip on; + + server { + listen 80; + server_name localhost; + + #charset koi8-r; + + #access_log logs/host.access.log main; + + location / { + root html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} + } + server { + listen 8888; + server_name localhost; + location ~/group[0-9]/ { + ngx_fastdfs_module; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } + + # another virtual host using mix of IP-, name-, and port-based configuration + # + #server { + # listen 8000; + # listen somename:8080; + # server_name somename alias another.alias; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + + + # HTTPS server + # + #server { + # listen 443 ssl; + # server_name localhost; + + # ssl_certificate cert.pem; + # ssl_certificate_key cert.key; + + # ssl_session_cache shared:SSL:1m; + # ssl_session_timeout 5m; + + # ssl_ciphers HIGH:!aNULL:!MD5; + # ssl_prefer_server_ciphers on; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + +} diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/storage.conf b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/storage.conf new file mode 100644 index 000000000..58686b8bb --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/storage.conf @@ -0,0 +1,287 @@ +# is this config file disabled +# false for enabled +# true for disabled +disabled=false + +# the name of the group this storage server belongs to +# +# comment or remove this item for fetching from tracker server, +# in this case, use_storage_id must set to true in tracker.conf, +# and storage_ids.conf must be configed correctly. +group_name=epdcFile + +# bind an address of this host +# empty for bind all addresses of this host +bind_addr= + +# if bind an address of this host when connect to other servers +# (this storage server as a client) +# true for binding the address configed by above parameter: "bind_addr" +# false for binding any address of this host +client_bind=true + +# the storage server port +port=23000 + +# connect timeout in seconds +# default value is 30s +connect_timeout=10 + +# network timeout in seconds +# default value is 30s +network_timeout=60 + +# heart beat interval in seconds +heart_beat_interval=30 + +# disk usage report interval in seconds +stat_report_interval=60 + +# the base path to store data and log files +base_path=/home/dfs + +# max concurrent connections the server supported +# default value is 256 +# more max_connections means more memory will be used +# you should set this parameter larger, eg. 10240 +max_connections=1024 + +# the buff size to recv / send data +# this parameter must more than 8KB +# default value is 64KB +# since V2.00 +buff_size = 256KB + +# accept thread count +# default value is 1 +# since V4.07 +accept_threads=1 + +# work thread count, should <= max_connections +# work thread deal network io +# default value is 4 +# since V2.00 +work_threads=4 + +# if disk read / write separated +## false for mixed read and write +## true for separated read and write +# default value is true +# since V2.00 +disk_rw_separated = true + +# disk reader thread count per store base path +# for mixed read / write, this parameter can be 0 +# default value is 1 +# since V2.00 +disk_reader_threads = 1 + +# disk writer thread count per store base path +# for mixed read / write, this parameter can be 0 +# default value is 1 +# since V2.00 +disk_writer_threads = 1 + +# when no entry to sync, try read binlog again after X milliseconds +# must > 0, default value is 200ms +sync_wait_msec=50 + +# after sync a file, usleep milliseconds +# 0 for sync successively (never call usleep) +sync_interval=0 + +# storage sync start time of a day, time format: Hour:Minute +# Hour from 0 to 23, Minute from 0 to 59 +sync_start_time=00:00 + +# storage sync end time of a day, time format: Hour:Minute +# Hour from 0 to 23, Minute from 0 to 59 +sync_end_time=23:59 + +# write to the mark file after sync N files +# default value is 500 +write_mark_file_freq=500 + +# path(disk or mount point) count, default value is 1 +store_path_count=1 + +# store_path#, based 0, if store_path0 not exists, it's value is base_path +# the paths must be exist +store_path0=/home/dfs +#store_path1=/home/dfs2 + +# subdir_count * subdir_count directories will be auto created under each +# store_path (disk), value can be 1 to 256, default value is 256 +subdir_count_per_path=256 + +# tracker_server can ocur more than once, and tracker_server format is +# "host:port", host can be hostname or ip address +tracker_server=172.19.0.30:22122 +tracker_server=172.20.0.30:22122 + +#standard log level as syslog, case insensitive, value list: +### emerg for emergency +### alert +### crit for critical +### error +### warn for warning +### notice +### info +### debug +log_level=info + +#unix group name to run this program, +#not set (empty) means run by the group of current user +run_by_group= + +#unix username to run this program, +#not set (empty) means run by current user +run_by_user= + +# allow_hosts can ocur more than once, host can be hostname or ip address, +# "*" (only one asterisk) means match all ip addresses +# we can use CIDR ips like 192.168.5.64/26 +# and also use range like these: 10.0.1.[0-254] and host[01-08,20-25].domain.com +# for example: +# allow_hosts=10.0.1.[1-15,20] +# allow_hosts=host[01-08,20-25].domain.com +# allow_hosts=192.168.5.64/26 +allow_hosts=* + +# the mode of the files distributed to the data path +# 0: round robin(default) +# 1: random, distributted by hash code +file_distribute_path_mode=0 + +# valid when file_distribute_to_path is set to 0 (round robin), +# when the written file count reaches this number, then rotate to next path +# default value is 100 +file_distribute_rotate_count=100 + +# call fsync to disk when write big file +# 0: never call fsync +# other: call fsync when written bytes >= this bytes +# default value is 0 (never call fsync) +fsync_after_written_bytes=0 + +# sync log buff to disk every interval seconds +# must > 0, default value is 10 seconds +sync_log_buff_interval=10 + +# sync binlog buff / cache to disk every interval seconds +# default value is 60 seconds +sync_binlog_buff_interval=10 + +# sync storage stat info to disk every interval seconds +# default value is 300 seconds +sync_stat_file_interval=300 + +# thread stack size, should >= 512KB +# default value is 512KB +thread_stack_size=512KB + +# the priority as a source server for uploading file. +# the lower this value, the higher its uploading priority. +# default value is 10 +upload_priority=10 + +# the NIC alias prefix, such as eth in Linux, you can see it by ifconfig -a +# multi aliases split by comma. empty value means auto set by OS type +# default values is empty +if_alias_prefix= + +# if check file duplicate, when set to true, use FastDHT to store file indexes +# 1 or yes: need check +# 0 or no: do not check +# default value is 0 +check_file_duplicate=0 + +# file signature method for check file duplicate +## hash: four 32 bits hash code +## md5: MD5 signature +# default value is hash +# since V4.01 +file_signature_method=hash + +# namespace for storing file indexes (key-value pairs) +# this item must be set when check_file_duplicate is true / on +key_namespace=FastDFS + +# set keep_alive to 1 to enable persistent connection with FastDHT servers +# default value is 0 (short connection) +keep_alive=0 + +# you can use "#include filename" (not include double quotes) directive to +# load FastDHT server list, when the filename is a relative path such as +# pure filename, the base path is the base path of current/this config file. +# must set FastDHT server list when check_file_duplicate is true / on +# please see INSTALL of FastDHT for detail +##include /home/yuqing/fastdht/conf/fdht_servers.conf + +# if log to access log +# default value is false +# since V4.00 +use_access_log = false + +# if rotate the access log every day +# default value is false +# since V4.00 +rotate_access_log = false + +# rotate access log time base, time format: Hour:Minute +# Hour from 0 to 23, Minute from 0 to 59 +# default value is 00:00 +# since V4.00 +access_log_rotate_time=00:00 + +# if rotate the error log every day +# default value is false +# since V4.02 +rotate_error_log = false + +# rotate error log time base, time format: Hour:Minute +# Hour from 0 to 23, Minute from 0 to 59 +# default value is 00:00 +# since V4.02 +error_log_rotate_time=00:00 + +# rotate access log when the log file exceeds this size +# 0 means never rotates log file by log file size +# default value is 0 +# since V4.02 +rotate_access_log_size = 0 + +# rotate error log when the log file exceeds this size +# 0 means never rotates log file by log file size +# default value is 0 +# since V4.02 +rotate_error_log_size = 0 + +# keep days of the log files +# 0 means do not delete old log files +# default value is 0 +log_file_keep_days = 0 + +# if skip the invalid record when sync file +# default value is false +# since V4.02 +file_sync_skip_invalid_record=false + +# if use connection pool +# default value is false +# since V4.05 +use_connection_pool = false + +# connections whose the idle time exceeds this time will be closed +# unit: second +# default value is 3600 +# since V4.05 +connection_pool_max_idle_time = 3600 + +# use the ip address of this storage server if domain_name is empty, +# else this domain name will ocur in the url redirected by the tracker server +http.domain_name= + +# the port of the web server on this storage server +http.server_port=8888 + diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/tracker.conf b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/tracker.conf new file mode 100644 index 000000000..22e191560 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/conf/tracker.conf @@ -0,0 +1,278 @@ +# is this config file disabled +# false for enabled +# true for disabled +disabled=false + +# bind an address of this host +# empty for bind all addresses of this host +bind_addr= + +# the tracker server port +port=22122 + +# connect timeout in seconds +# default value is 30s +connect_timeout=10 + +# network timeout in seconds +# default value is 30s +network_timeout=60 + +# the base path to store data and log files +base_path=/home/dfs + +# max concurrent connections this server supported +# you should set this parameter larger, eg. 102400 +max_connections=1024 + +# accept thread count +# default value is 1 +# since V4.07 +accept_threads=1 + +# work thread count, should <= max_connections +# default value is 4 +# since V2.00 +work_threads=4 + +# min buff size +# default value 8KB +min_buff_size = 8KB + +# max buff size +# default value 128KB +max_buff_size = 128KB + +# the method of selecting group to upload files +# 0: round robin +# 1: specify group +# 2: load balance, select the max free space group to upload file +store_lookup=2 + +# which group to upload file +# when store_lookup set to 1, must set store_group to the group name +store_group=group2 + +# which storage server to upload file +# 0: round robin (default) +# 1: the first server order by ip address +# 2: the first server order by priority (the minimal) +# Note: if use_trunk_file set to true, must set store_server to 1 or 2 +store_server=0 + +# which path(means disk or mount point) of the storage server to upload file +# 0: round robin +# 2: load balance, select the max free space path to upload file +store_path=0 + +# which storage server to download file +# 0: round robin (default) +# 1: the source storage server which the current file uploaded to +download_server=0 + +# reserved storage space for system or other applications. +# if the free(available) space of any stoarge server in +# a group <= reserved_storage_space, +# no file can be uploaded to this group. +# bytes unit can be one of follows: +### G or g for gigabyte(GB) +### M or m for megabyte(MB) +### K or k for kilobyte(KB) +### no unit for byte(B) +### XX.XX% as ratio such as reserved_storage_space = 10% +reserved_storage_space = 1% + +#standard log level as syslog, case insensitive, value list: +### emerg for emergency +### alert +### crit for critical +### error +### warn for warning +### notice +### info +### debug +log_level=info + +#unix group name to run this program, +#not set (empty) means run by the group of current user +run_by_group= + +#unix username to run this program, +#not set (empty) means run by current user +run_by_user= + +# allow_hosts can ocur more than once, host can be hostname or ip address, +# "*" (only one asterisk) means match all ip addresses +# we can use CIDR ips like 192.168.5.64/26 +# and also use range like these: 10.0.1.[0-254] and host[01-08,20-25].domain.com +# for example: +# allow_hosts=10.0.1.[1-15,20] +# allow_hosts=host[01-08,20-25].domain.com +# allow_hosts=192.168.5.64/26 +allow_hosts=* + +# sync log buff to disk every interval seconds +# default value is 10 seconds +sync_log_buff_interval = 10 + +# check storage server alive interval seconds +check_active_interval = 120 + +# thread stack size, should >= 64KB +# default value is 64KB +thread_stack_size = 64KB + +# auto adjust when the ip address of the storage server changed +# default value is true +storage_ip_changed_auto_adjust = true + +# storage sync file max delay seconds +# default value is 86400 seconds (one day) +# since V2.00 +storage_sync_file_max_delay = 86400 + +# the max time of storage sync a file +# default value is 300 seconds +# since V2.00 +storage_sync_file_max_time = 300 + +# if use a trunk file to store several small files +# default value is false +# since V3.00 +use_trunk_file = false + +# the min slot size, should <= 4KB +# default value is 256 bytes +# since V3.00 +slot_min_size = 256 + +# the max slot size, should > slot_min_size +# store the upload file to trunk file when it's size <= this value +# default value is 16MB +# since V3.00 +slot_max_size = 16MB + +# the trunk file size, should >= 4MB +# default value is 64MB +# since V3.00 +trunk_file_size = 64MB + +# if create trunk file advancely +# default value is false +# since V3.06 +trunk_create_file_advance = false + +# the time base to create trunk file +# the time format: HH:MM +# default value is 02:00 +# since V3.06 +trunk_create_file_time_base = 02:00 + +# the interval of create trunk file, unit: second +# default value is 38400 (one day) +# since V3.06 +trunk_create_file_interval = 86400 + +# the threshold to create trunk file +# when the free trunk file size less than the threshold, will create +# the trunk files +# default value is 0 +# since V3.06 +trunk_create_file_space_threshold = 20G + +# if check trunk space occupying when loading trunk free spaces +# the occupied spaces will be ignored +# default value is false +# since V3.09 +# NOTICE: set this parameter to true will slow the loading of trunk spaces +# when startup. you should set this parameter to true when neccessary. +trunk_init_check_occupying = false + +# if ignore storage_trunk.dat, reload from trunk binlog +# default value is false +# since V3.10 +# set to true once for version upgrade when your version less than V3.10 +trunk_init_reload_from_binlog = false + +# the min interval for compressing the trunk binlog file +# unit: second +# default value is 0, 0 means never compress +# FastDFS compress the trunk binlog when trunk init and trunk destroy +# recommand to set this parameter to 86400 (one day) +# since V5.01 +trunk_compress_binlog_min_interval = 0 + +# if use storage ID instead of IP address +# default value is false +# since V4.00 +use_storage_id = false + +# specify storage ids filename, can use relative or absolute path +# since V4.00 +storage_ids_filename = storage_ids.conf + +# id type of the storage server in the filename, values are: +## ip: the ip address of the storage server +## id: the server id of the storage server +# this paramter is valid only when use_storage_id set to true +# default value is ip +# since V4.03 +id_type_in_filename = ip + +# if store slave file use symbol link +# default value is false +# since V4.01 +store_slave_file_use_link = false + +# if rotate the error log every day +# default value is false +# since V4.02 +rotate_error_log = false + +# rotate error log time base, time format: Hour:Minute +# Hour from 0 to 23, Minute from 0 to 59 +# default value is 00:00 +# since V4.02 +error_log_rotate_time=00:00 + +# rotate error log when the log file exceeds this size +# 0 means never rotates log file by log file size +# default value is 0 +# since V4.02 +rotate_error_log_size = 0 + +# keep days of the log files +# 0 means do not delete old log files +# default value is 0 +log_file_keep_days = 0 + +# if use connection pool +# default value is false +# since V4.05 +use_connection_pool = false + +# connections whose the idle time exceeds this time will be closed +# unit: second +# default value is 3600 +# since V4.05 +connection_pool_max_idle_time = 3600 + +# HTTP port on this tracker server +http.server_port=8080 + +# check storage HTTP server alive interval seconds +# <= 0 for never check +# default value is 30 +http.check_alive_interval=30 + +# check storage HTTP server alive type, values are: +# tcp : connect to the storge server with HTTP port only, +# do not request and get response +# http: storage check alive url must return http status 200 +# default value is tcp +http.check_alive_type=tcp + +# check storage HTTP server alive uri/url +# NOTE: storage embed HTTP server support uri: /status.html +http.check_alive_uri=/status.html + diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/fastdfs.sh b/esua-epdc/docker-compose/jinshui/node04/fastdfs/fastdfs.sh new file mode 100644 index 000000000..7234b8c05 --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/fastdfs.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +new_val=$FASTDFS_IPADDR +old="com.ikingtech.ch116221" + +sed -i "s/$old/$new_val/g" /etc/fdfs/client.conf +sed -i "s/$old/$new_val/g" /etc/fdfs/storage.conf +sed -i "s/$old/$new_val/g" /etc/fdfs/mod_fastdfs.conf + +cat /etc/fdfs/client.conf > /etc/fdfs/client.txt +cat /etc/fdfs/storage.conf > /etc/fdfs/storage.txt +cat /etc/fdfs/mod_fastdfs.conf > /etc/fdfs/mod_fastdfs.txt + +mv /usr/local/nginx/conf/nginx.conf /usr/local/nginx/conf/nginx.conf.t +cp /etc/fdfs/nginx.conf /usr/local/nginx/conf + +echo "start trackerd" +/etc/init.d/fdfs_trackerd start + +echo "start storage" +/etc/init.d/fdfs_storaged start + +echo "start nginx" +/usr/local/nginx/sbin/nginx + +tail -f /dev/null \ No newline at end of file diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/nginx/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/fastdfs/nginx/docker-compose.yml new file mode 100644 index 000000000..01f88947d --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/nginx/docker-compose.yml @@ -0,0 +1,47 @@ +version: '3.7' +services: + fastdfs-tracker: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/tracker_data:/fastdfs/tracker/data + command: tracker + networks: + epdc_network: + ipv4_address: 172.19.0.30 + + fastdfs-storage: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/storage_data:/fastdfs/storage/data + - /mnt/epdc/fdfs/store_path:/fastdfs/store_path + environment: + TRACKER_SERVER: 172.19.0.30:22122 + command: storage + networks: + epdc_network: + ipv4_address: 172.19.0.31 + + fastdfs-nginx: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/nginx/nginx.conf:/etc/nginx/conf/nginx.conf + - /mnt/epdc/fdfs/store_path:/fastdfs/store_path + environment: + TRACKER_SERVER: 172.19.0.30:22122 + command: nginx + networks: + epdc_network: + ipv4_address: 172.19.0.32 + +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/storage/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/fastdfs/storage/docker-compose.yml new file mode 100644 index 000000000..01f88947d --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/storage/docker-compose.yml @@ -0,0 +1,47 @@ +version: '3.7' +services: + fastdfs-tracker: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/tracker_data:/fastdfs/tracker/data + command: tracker + networks: + epdc_network: + ipv4_address: 172.19.0.30 + + fastdfs-storage: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/storage_data:/fastdfs/storage/data + - /mnt/epdc/fdfs/store_path:/fastdfs/store_path + environment: + TRACKER_SERVER: 172.19.0.30:22122 + command: storage + networks: + epdc_network: + ipv4_address: 172.19.0.31 + + fastdfs-nginx: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/nginx/nginx.conf:/etc/nginx/conf/nginx.conf + - /mnt/epdc/fdfs/store_path:/fastdfs/store_path + environment: + TRACKER_SERVER: 172.19.0.30:22122 + command: nginx + networks: + epdc_network: + ipv4_address: 172.19.0.32 + +networks: + epdc_network: + external: true diff --git a/esua-epdc/docker-compose/jinshui/node04/fastdfs/tracker/docker-compose.yml b/esua-epdc/docker-compose/jinshui/node04/fastdfs/tracker/docker-compose.yml new file mode 100644 index 000000000..01f88947d --- /dev/null +++ b/esua-epdc/docker-compose/jinshui/node04/fastdfs/tracker/docker-compose.yml @@ -0,0 +1,47 @@ +version: '3.7' +services: + fastdfs-tracker: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/tracker_data:/fastdfs/tracker/data + command: tracker + networks: + epdc_network: + ipv4_address: 172.19.0.30 + + fastdfs-storage: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/storage_data:/fastdfs/storage/data + - /mnt/epdc/fdfs/store_path:/fastdfs/store_path + environment: + TRACKER_SERVER: 172.19.0.30:22122 + command: storage + networks: + epdc_network: + ipv4_address: 172.19.0.31 + + fastdfs-nginx: + image: season/fastdfs + restart: always + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /mnt/epdc/fdfs/nginx/nginx.conf:/etc/nginx/conf/nginx.conf + - /mnt/epdc/fdfs/store_path:/fastdfs/store_path + environment: + TRACKER_SERVER: 172.19.0.30:22122 + command: nginx + networks: + epdc_network: + ipv4_address: 172.19.0.32 + +networks: + epdc_network: + external: true 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 020aa2d1b..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 - - /mnt/nginx/conf.d:/etc/nginx/conf.d - - /mnt/nginx/logs:/var/log/nginx - restart: always - container_name: nginx_master - diff --git a/esua-epdc/docker-compose/prod/master/db/10.5.34.166/docker-compose.yml b/esua-epdc/docker-compose/prod/master/db/10.5.34.166/docker-compose.yml deleted file mode 100644 index 8a28de264..000000000 --- a/esua-epdc/docker-compose/prod/master/db/10.5.34.166/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -#环境变量 -#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-server: - image: seataio/seata-server:latest - hostname: seata-server - ports: - - 9101:8091 - environment: - - SEATA_PORT=8091 - - SEATA_IP=10.5.34.166 - - STORE_MODE=db - - SERVER_NODE=1 - expose: - - 8091 diff --git a/esua-epdc/docker-compose/prod/master/picture/10.5.34.166/docker-compose.yml b/esua-epdc/docker-compose/prod/master/picture/10.5.34.166/docker-compose.yml deleted file mode 100644 index 0f0a6d956..000000000 --- a/esua-epdc/docker-compose/prod/master/picture/10.5.34.166/docker-compose.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: '3.7' -services: - epdc-events-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-events-server:prod - ports: - - "9066:9066" - epdc-gateway: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-gateway:prod - ports: - - "9094:9094" - epdc-auth: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-auth:prod - ports: - - "9056:9056" - epdc-admin-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-admin-server:prod - ports: - - "9055:9055" - epdc-oss-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-oss-server:prod - ports: - - "9065:9065" - epdc-api-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-api-server:prod - ports: - - "9040:9040" - epdc-news-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-news-server:prod - prort: - - "9064:9064" - epdc-user-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-user-server:prod - prort: - - "9068:9068" - epdc-websocket-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-websocket-server:prod - prort: - - "9988:9988" - epdc-kpi-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-kpi-server:prod - prort: - - "9987:9987" - epdc-group-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-group-server:prod - prort: - - "9063:9063" - epdc-message-server: - image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-message-server:prod - prort: - - "9062:9062" diff --git a/esua-epdc/docker-compose/test/application/docker-compose.yml b/esua-epdc/docker-compose/test/application/docker-compose.yml deleted file mode 100644 index 0c5ef3f55..000000000 --- a/esua-epdc/docker-compose/test/application/docker-compose.yml +++ /dev/null @@ -1,87 +0,0 @@ -version: '3.7' -services: - epdc-events-server: - image: epdc-events-server:test - ports: - - "9066:9066" -# renren-register: -# image: renren-cloud/renren-register -# ports: -# - "8761:8761" -# environment: -# - spring.profiles.active=dev -# renren-monitor: -# image: renren-cloud/renren-monitor -# ports: -# - "8100:8100" -# environment: -# - spring.profiles.active=dev -# renren-gateway: -# image: renren-cloud/renren-gateway -# ports: -# - "8080:8080" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-auth: -# image: renren-cloud/renren-auth -# ports: -# - "8081:8081" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# extra_hosts: -# - "redis:192.168.10.10" -# renren-admin: -# image: renren-cloud/renren-admin-server -# ports: -# - "8082:8082" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# extra_hosts: -# - "mysql:192.168.10.10" -# - "redis:192.168.10.10" -# renren-oss: -# image: renren-cloud/renren-oss -# ports: -# - "8083:8083" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-job: -# image: renren-cloud/renren-job -# ports: -# - "8084:8084" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-message: -# image: renren-cloud/renren-message -# ports: -# - "8085:8085" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-activiti: -# image: renren-cloud/renren-activiti -# ports: -# - "8086:8086" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-api: -# image: renren-cloud/renren-api -# ports: -# - "8087:8087" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka diff --git a/esua-epdc/docker-compose/test/db/docker-compose.yml b/esua-epdc/docker-compose/test/db/docker-compose.yml deleted file mode 100644 index 80f754cbe..000000000 --- a/esua-epdc/docker-compose/test/db/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3.7' -services: - mysqldb: - image: epdc-events-server:test - ports: diff --git a/esua-epdc/docker-compose/test/middleware/docker-compose.yml b/esua-epdc/docker-compose/test/middleware/docker-compose.yml deleted file mode 100644 index 5a8576d47..000000000 --- a/esua-epdc/docker-compose/test/middleware/docker-compose.yml +++ /dev/null @@ -1,39 +0,0 @@ -#seata环境变量 -#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-server: - image: seataio/seata-server:latest - hostname: seata-server - ports: - - 9004:8091 - environment: - - SEATA_PORT=8091 - - SEATA_IP=47.104.85.99 - - STORE_MODE=db - - SERVER_NODE=1 - - SEATA_CONFIG_NAME=file:/root/seata-config/registry - expose: - - 8091 - tty: true - volumes: - - /mnt/docker/config/seata:/root/seata-config diff --git a/esua-epdc/docker-compose/test/picture/docker-compose.yml b/esua-epdc/docker-compose/test/picture/docker-compose.yml deleted file mode 100644 index 0c5ef3f55..000000000 --- a/esua-epdc/docker-compose/test/picture/docker-compose.yml +++ /dev/null @@ -1,87 +0,0 @@ -version: '3.7' -services: - epdc-events-server: - image: epdc-events-server:test - ports: - - "9066:9066" -# renren-register: -# image: renren-cloud/renren-register -# ports: -# - "8761:8761" -# environment: -# - spring.profiles.active=dev -# renren-monitor: -# image: renren-cloud/renren-monitor -# ports: -# - "8100:8100" -# environment: -# - spring.profiles.active=dev -# renren-gateway: -# image: renren-cloud/renren-gateway -# ports: -# - "8080:8080" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-auth: -# image: renren-cloud/renren-auth -# ports: -# - "8081:8081" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# extra_hosts: -# - "redis:192.168.10.10" -# renren-admin: -# image: renren-cloud/renren-admin-server -# ports: -# - "8082:8082" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# extra_hosts: -# - "mysql:192.168.10.10" -# - "redis:192.168.10.10" -# renren-oss: -# image: renren-cloud/renren-oss -# ports: -# - "8083:8083" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-job: -# image: renren-cloud/renren-job -# ports: -# - "8084:8084" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-message: -# image: renren-cloud/renren-message -# ports: -# - "8085:8085" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-activiti: -# image: renren-cloud/renren-activiti -# ports: -# - "8086:8086" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka -# renren-api: -# image: renren-cloud/renren-api -# ports: -# - "8087:8087" -# environment: -# - spring.profiles.active=dev -# links: -# - renren-register:eureka diff --git a/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile b/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile +++ b/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index fcf9f2a23..7dc60def5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -263,5 +263,38 @@ Elink@833066 + + + prod_jinshui + + 9100 + prod + prod + + + true + 172.20.0.4:80 + + http://172.31.171.61:9411 + + wx6dcf544cdae7d4ec + 9e0882274ad3821400370312a56a8470 + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + + + + epdc + Elink@833066 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml index eadc4e16c..3fa19ae98 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-auth/Dockerfile b/esua-epdc/epdc-auth/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-auth/Dockerfile +++ b/esua-epdc/epdc-auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml index 68f4e75d8..a7f5f638d 100644 --- a/esua-epdc/epdc-auth/pom.xml +++ b/esua-epdc/epdc-auth/pom.xml @@ -197,6 +197,26 @@ true 172.16.1.238:8848 + http://172.31.171.61:9411 + + + + prod_jinshui + + 9110 + prod + prod + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + http://172.31.171.61:9411 diff --git a/esua-epdc/epdc-auth/src/main/resources/logback-spring.xml b/esua-epdc/epdc-auth/src/main/resources/logback-spring.xml index 148187e70..328698a0c 100644 --- a/esua-epdc/epdc-auth/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-auth/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-gateway/Dockerfile b/esua-epdc/epdc-gateway/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-gateway/Dockerfile +++ b/esua-epdc/epdc-gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index 4ccdd4f1b..0fe420328 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -299,6 +299,46 @@ http://localhost:9411 + + + prod_jinshui + + 9104 + prod + + + lb://epdc-auth-server + lb://epdc-admin-server + lb://epdc-activiti-server + lb://epdc-api-server + lb://epdc-app-server + lb://epdc-heart-server + lb://epdc-job-server + lb://epdc-message-server + lb://epdc-news-server + lb://epdc-oss-server + lb://epdc-events-server + lb://epdc-services-server + lb://epdc-user-server + lb://epdc-demo-server + lb://epdc-group-server + lb://epdc-websocket-server + lb://epdc-kpi-server + lb://epdc-custom-server + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + http://localhost:9411 + + diff --git a/esua-epdc/epdc-gateway/src/main/resources/logback-spring.xml b/esua-epdc/epdc-gateway/src/main/resources/logback-spring.xml index 7cd751660..96e2a175c 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-gateway/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/Dockerfile b/esua-epdc/epdc-module/epdc-api/epdc-api-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 31a3c42d9..3784c6626 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -323,6 +323,46 @@ dc13065f79429979d9f687d249eb5c4e + + + prod_jinshui + + prod + prod + + 9040 + + + wx3ef8f2cd12a19fcb + 948aa2f21dbaa3943288ea5b119ac6f2 + 111 + 111 + + + wx6dcf544cdae7d4ec + 9e0882274ad3821400370312a56a8470 + + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml index 44493e410..9e01e480e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/Dockerfile b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/Dockerfile new file mode 100755 index 000000000..712051027 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM openjdk:8u242-jre-buster +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/Dockerfile b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/Dockerfile index b81c24d7a..655f22474 100755 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile b/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 00fed7324..e1d8f43ae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -303,6 +303,41 @@ dc13065f79429979d9f687d249eb5c4e + + + prod_jinshui + + prod + + 9066 + + prod + + + wx6dcf544cdae7d4ec + 9e0882274ad3821400370312a56a8470 + + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index 353ba573d..430a530d5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -33,7 +33,7 @@ spring: tx-service-group: epdc-events-server-fescar-service-group datasource: druid: - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml index 88e9cdde6..fd43813fe 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml @@ -147,10 +147,10 @@ - - - - + + + + diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/Dockerfile b/esua-epdc/epdc-module/epdc-group/epdc-group-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index fd32da726..f0069c977 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -229,6 +229,32 @@ 172.16.0.52:8848 + + + prod_jinshui + + prod + prod + + 9063 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile new file mode 100755 index 000000000..712051027 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM openjdk:8u242-jre-buster +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile b/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile new file mode 100755 index 000000000..712051027 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM openjdk:8u242-jre-buster +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index b5e3eb9bc..286988abc 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -256,6 +256,32 @@ 172.16.0.52:8848 + + + prod_jinshui + + prod + prod + + 9061 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml index fd3a1fbfa..d97ef6653 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/Dockerfile b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/Dockerfile b/esua-epdc/epdc-module/epdc-message/epdc-message-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml index fb3654e64..c2efefadf 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml @@ -256,6 +256,32 @@ 172.16.0.52:8848 + + + prod_jinshui + + prod + prod + + 9062 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/logback-spring.xml index 6afa5c97e..1d5077d24 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml deleted file mode 100644 index cb0fce014..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - epdc-neighbor - com.esua.epdc - 1.0.0 - - 4.0.0 - - epdc-neighbor-client - jar - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml deleted file mode 100644 index 3abbeb50c..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - epdc-neighbor - com.esua.epdc - 1.0.0 - - 4.0.0 - - epdc-neighbor-server - jar - - - - com.esua.epdc - epdc-neighbor-client - 1.0.0 - - - com.esua.epdc - epdc-commons-tools - 1.0.0 - - - com.esua.epdc - epdc-commons-mybatis - 1.0.0 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework - spring-context-support - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - de.codecentric - spring-boot-admin-starter-client - ${spring.boot.admin.version} - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - com.spotify - dockerfile-maven-plugin - - - - - - - - dev - - true - - - dev - - 9063 - - 2 - 47.104.224.45 - 6379 - elink@888 - - - - - epdc - elink888 - - false - 47.104.224.45:8848 - - - - - test - - test - - 9063 - - 2 - 47.104.224.45 - 6379 - elink@888 - - - - - epdc - elink888 - - false - 47.104.224.45:8848 - - - - - prod - - prod - - 9063 - - 2 - 47.104.224.45 - 6379 - elink@888 - - - - - epdc - elink888 - - false - 47.104.224.45:8848 - - - - - diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java deleted file mode 100644 index 9e021c6ee..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.elink.esua.epdc; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * 友邻社群模块 - * - * @author Mark sunlightcs@gmail.com - * @since 1.1.0 - */ -@SpringBootApplication -@EnableDiscoveryClient -@EnableFeignClients -public class NeighborApplication { - - public static void main(String[] args) { - SpringApplication.run(NeighborApplication.class, args); - } - -} diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java deleted file mode 100644 index 2d13dec56..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - *

- * https://www.renren.io - *

- * 版权所有，侵权必究！ - */ - -package com.elink.esua.epdc.config; - -import com.elink.esua.epdc.commons.tools.config.ModuleConfig; -import org.springframework.stereotype.Service; - -/** - * 模块配置信息-爱心互助模块 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Service -public class ModuleConfigImpl implements ModuleConfig { - @Override - public String getName() { - return "neighbor"; - } -} diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml deleted file mode 100644 index 1e4d7fd0e..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml +++ /dev/null @@ -1,68 +0,0 @@ -server: - port: @server.port@ - servlet: - context-path: /neighbor - -spring: - application: - name: epdc-neighbor-server - # 环境 dev|test|prod - profiles: - active: @spring.profiles.active@ - messages: - encoding: UTF-8 - basename: i18n/messages,i18n/messages_common - jackson: - time-zone: GMT+8 - date-format: yyyy-MM-dd HH:mm:ss - redis: - database: @spring.redis.index@ - host: @spring.redis.host@ - timeout: 30s - port: @spring.redis.port@ - password: @spring.redis.password@ - cloud: - nacos: - discovery: - server-addr: @nacos.server-addr@ - register-enabled: @nacos.register-enabled@ - alibaba: - seata: - tx-service-group: epdc-neighbor-server-fescar-service-group - datasource: - druid: - driver-class-name: com.mysql.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - - -management: - endpoints: - web: - exposure: - include: "*" - endpoint: - health: - show-details: ALWAYS - -mybatis-plus: - mapper-locations: classpath:/mapper/**/*.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity - global-config: - #数据库相关配置 - db-config: - #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; - id-type: ID_WORKER - #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" - field-strategy: NOT_NULL - #驼峰下划线转换 - column-underline: true - banner: false - #原生配置 - configuration: - map-underscore-to-camel-case: true - cache-enabled: false - call-setters-on-nulls: true - jdbc-type-for-null: 'null' diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_en_US.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_CN.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_TW.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_en_US.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_CN.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_TW.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml deleted file mode 100644 index b6a877871..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - debug - - - ${CONSOLE_LOG_PATTERN} - - UTF-8 - - - - - - - - ${log.path}/debug.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/debug-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - debug - ACCEPT - DENY - - - - - - - ${log.path}/info.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/info-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - info - ACCEPT - DENY - - - - - - - ${log.path}/warn.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/warn-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - warn - ACCEPT - DENY - - - - - - - ${log.path}/error.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/error-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - ERROR - ACCEPT - DENY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/registry.conf deleted file mode 100644 index 9cfedf9cc..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/registry.conf +++ /dev/null @@ -1,21 +0,0 @@ -registry { - # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa - type = "nacos" - - nacos { - serverAddr = "47.104.224.45" - namespace = "public" - cluster = "default" - } -} - -config { - # file、nacos 、apollo、zk、consul、etcd3 - type = "nacos" - - nacos { - serverAddr = "47.104.224.45" - namespace = "public" - cluster = "default" - } -} diff --git a/esua-epdc/epdc-module/epdc-neighbor/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/pom.xml deleted file mode 100644 index 744cca83b..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - epdc-module - com.esua.epdc - 1.0.0 - - 4.0.0 - - epdc-neighbor - pom - - epdc-neighbor-client - epdc-neighbor-server - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/Dockerfile b/esua-epdc/epdc-module/epdc-news/epdc-news-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index e3877629b..149eaded5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -222,6 +222,32 @@ 172.16.0.52:8848 + + + prod_jinshui + + prod + prod + + 9064 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml index 999a92997..1d5cdf4ad 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/Dockerfile b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index dca5df69a..9bef04de2 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -278,5 +278,34 @@ 172.16.0.51:22122 + + + prod_jinshui + + prod + prod + + 9065 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + + 172.16.1.239:22122 + + diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml index c6b9811fe..87e751588 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile b/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile new file mode 100755 index 000000000..712051027 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM openjdk:8u242-jre-buster +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/Dockerfile b/esua-epdc/epdc-module/epdc-user/epdc-user-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index c7004cb56..0d99e4883 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -229,6 +229,32 @@ 172.16.0.52:8848 + + + prod_jinshui + + prod + prod + + 9068 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml index 43b52215c..342e9b6c5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-webservice/Dockerfile b/esua-epdc/epdc-module/epdc-webservice/Dockerfile new file mode 100755 index 000000000..712051027 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-webservice/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM openjdk:8u242-jre-buster +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml index b2fdb2ff4..e5e2e50eb 100644 --- a/esua-epdc/epdc-module/epdc-webservice/pom.xml +++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml @@ -228,5 +228,29 @@ 172.16.0.52:8848 + + + prod_jinshui + + 9075 + prod + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/Dockerfile b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index 1d99d06de..b1285f143 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -299,6 +299,41 @@ + + + prod_jinshui + + prod + prod + + 9988 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + + wx3ef8f2cd12a19fcb + 948aa2f21dbaa3943288ea5b119ac6f2 + 111 + 111 + + wx6dcf544cdae7d4ec + 9e0882274ad3821400370312a56a8470 + + diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/logback-spring.xml index 5deef2105..255556f1e 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/logback-spring.xml @@ -1,21 +1,159 @@ - - - + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + - - + + + + + + + + + - - - + + + + + + + + + + - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml index ec076c9e2..fe2f56c8b 100644 --- a/esua-epdc/epdc-module/pom.xml +++ b/esua-epdc/epdc-module/pom.xml @@ -22,7 +22,6 @@ epdc-heart epdc-news epdc-events - epdc-neighbor epdc-services epdc-user epdc-demo