From 1583767d3b64b8f5cc27ddc4dbc4881c7d831ef2 Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Fri, 26 Apr 2019 13:04:40 +0800 Subject: [PATCH 1/9] :whale: Work about Docker. add minio dockerfile --- docker-compose.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 09f83db6b..2a60ac717 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,19 @@ services: restart: always container_name: pigx-redis + pigx-minio: + image: minio/minio + command: server /export + ports: + - "9000:9000" + volumes: + - ./data:/data + - ./config:/root/.minio + environment: + - "MINIO_DOMAIN=pigx-minio" + - "MINIO_ACCESS_KEY=pigxdata" + - "MINIO_SECRET_KEY=pigxdata" + pigx-eureka: build: context: ./ From d964e50ba7a04f37808383c4b021cc876462cb4b Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Fri, 26 Apr 2019 13:09:01 +0800 Subject: [PATCH 2/9] :whale: Work about Docker. upgrade redis 5.0.4 --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2a60ac717..292e32c8a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,9 +23,11 @@ services: restart: always pigx-redis: - image: redis:4.0.10 + image: redis:5.0.4 restart: always container_name: pigx-redis + ports: + - 6379:6379 pigx-minio: image: minio/minio From 195122d1fc5ec54e2f103586c8a04ad8502daa55 Mon Sep 17 00:00:00 2001 From: lisb Date: Fri, 26 Apr 2019 13:26:54 +0800 Subject: [PATCH 3/9] :bug: Fixing a bug. fix minio execute command --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 292e32c8a..b63bbf8fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: pigx-minio: image: minio/minio - command: server /export + command: server /data ports: - "9000:9000" volumes: From 2bdc8305bb7b8374438f200b579b2406bb306292 Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Fri, 26 Apr 2019 13:41:33 +0800 Subject: [PATCH 4/9] :bug: Fixing a bug. fix minio access key --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b63bbf8fd..ed7ac950c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,8 +39,8 @@ services: - ./config:/root/.minio environment: - "MINIO_DOMAIN=pigx-minio" - - "MINIO_ACCESS_KEY=pigxdata" - - "MINIO_SECRET_KEY=pigxdata" + - "MINIO_ACCESS_KEY=lengleng" + - "MINIO_SECRET_KEY=lengleng" pigx-eureka: build: From 9ecac6342972c33207e482186f43e49a8bbd553f Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Sat, 27 Apr 2019 16:38:24 +0800 Subject: [PATCH 5/9] :whale: Work about Docker. add redis cluster dockerfile --- pigx-redis/docker-compose.yml | 37 +++++++++++++++++++++++++++++++++++ pigx-redis/slave1/Dockerfile | 15 ++++++++++++++ pigx-redis/slave1/redis.conf | 16 +++++++++++++++ pigx-redis/slave2/Dockerfile | 15 ++++++++++++++ pigx-redis/slave2/redis.conf | 16 +++++++++++++++ pigx-redis/slave3/Dockerfile | 15 ++++++++++++++ pigx-redis/slave3/redis.conf | 16 +++++++++++++++ pigx-redis/slave4/Dockerfile | 15 ++++++++++++++ pigx-redis/slave4/redis.conf | 16 +++++++++++++++ pigx-redis/slave5/Dockerfile | 15 ++++++++++++++ pigx-redis/slave5/redis.conf | 16 +++++++++++++++ pigx-redis/slave6/Dockerfile | 15 ++++++++++++++ pigx-redis/slave6/redis.conf | 16 +++++++++++++++ 13 files changed, 223 insertions(+) create mode 100644 pigx-redis/docker-compose.yml create mode 100644 pigx-redis/slave1/Dockerfile create mode 100644 pigx-redis/slave1/redis.conf create mode 100644 pigx-redis/slave2/Dockerfile create mode 100644 pigx-redis/slave2/redis.conf create mode 100644 pigx-redis/slave3/Dockerfile create mode 100644 pigx-redis/slave3/redis.conf create mode 100644 pigx-redis/slave4/Dockerfile create mode 100644 pigx-redis/slave4/redis.conf create mode 100644 pigx-redis/slave5/Dockerfile create mode 100644 pigx-redis/slave5/redis.conf create mode 100644 pigx-redis/slave6/Dockerfile create mode 100644 pigx-redis/slave6/redis.conf diff --git a/pigx-redis/docker-compose.yml b/pigx-redis/docker-compose.yml new file mode 100644 index 000000000..981155519 --- /dev/null +++ b/pigx-redis/docker-compose.yml @@ -0,0 +1,37 @@ +# 运行：docker-compose up -d +# 运行(推荐)：docker-compose up --build +# 查看：docker ps -a +# 集群：docker run --rm -it zvelo/redis-trib create --replicas 1 ip:6061 ip:6062 ip:6063 ip:6064 ip:6065 ip:6066 + +version: '2' +services: + redis-slave1: + build: ./slave1 + ports: + - 6061:6061 + - 16061:16061 + redis-slave2: + build: ./slave2 + ports: + - 6062:6062 + - 16062:16062 + redis-slave3: + build: ./slave3 + ports: + - 6063:6063 + - 16063:16063 + redis-slave4: + build: ./slave4 + ports: + - 6064:6064 + - 16064:16064 + redis-slave5: + build: ./slave5 + ports: + - 6065:6065 + - 16065:16065 + redis-slave6: + build: ./slave6 + ports: + - 6066:6066 + - 16066:16066 \ No newline at end of file diff --git a/pigx-redis/slave1/Dockerfile b/pigx-redis/slave1/Dockerfile new file mode 100644 index 000000000..9070952d6 --- /dev/null +++ b/pigx-redis/slave1/Dockerfile @@ -0,0 +1,15 @@ +FROM redis + +MAINTAINER huangbosbos@gmail.com + +COPY redis.conf /usr/local/etc/redis/redis.conf + +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' >/etc/timezone + +RUN chmod 777 /usr/local/etc/redis/redis.conf + +EXPOSE 6061 +EXPOSE 16061 + +CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave1/redis.conf b/pigx-redis/slave1/redis.conf new file mode 100644 index 000000000..e65769891 --- /dev/null +++ b/pigx-redis/slave1/redis.conf @@ -0,0 +1,16 @@ +# 加上注释# +# bind 127.0.0.1 +# 阿里云CentOS7安装redis后不能远程访问解决方案 +# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 +bind 0.0.0.0 ::1 +# 关闭保护模式 +protected-mode no +# 绑定自定义端口 +port 6061 +# 禁止redis后台运行 +#daemonize yes +pidfile /var/run/redis_6061.pid +# 开启集群 把注释#去掉 +cluster-enabled yes +# 集群的配置 配置文件首次启动自动生成 +cluster-config-file nodes_6061.conf \ No newline at end of file diff --git a/pigx-redis/slave2/Dockerfile b/pigx-redis/slave2/Dockerfile new file mode 100644 index 000000000..2876c8cbc --- /dev/null +++ b/pigx-redis/slave2/Dockerfile @@ -0,0 +1,15 @@ +FROM redis + +MAINTAINER huangbosbos@gmail.com + +COPY redis.conf /usr/local/etc/redis/redis.conf + +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' >/etc/timezone + +RUN chmod 777 /usr/local/etc/redis/redis.conf + +EXPOSE 6062 +EXPOSE 16062 + +CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave2/redis.conf b/pigx-redis/slave2/redis.conf new file mode 100644 index 000000000..4dc1af5aa --- /dev/null +++ b/pigx-redis/slave2/redis.conf @@ -0,0 +1,16 @@ +# 加上注释# +# bind 127.0.0.1 +# 阿里云CentOS7安装redis后不能远程访问解决方案 +# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 +bind 0.0.0.0 ::1 +# 关闭保护模式 +protected-mode no +# 绑定自定义端口 +port 6062 +# 禁止redis后台运行 +#daemonize yes +pidfile /var/run/redis_6062.pid +# 开启集群 把注释#去掉 +cluster-enabled yes +# 集群的配置 配置文件首次启动自动生成 +cluster-config-file nodes_6062.conf \ No newline at end of file diff --git a/pigx-redis/slave3/Dockerfile b/pigx-redis/slave3/Dockerfile new file mode 100644 index 000000000..ff946b2f2 --- /dev/null +++ b/pigx-redis/slave3/Dockerfile @@ -0,0 +1,15 @@ +FROM redis + +MAINTAINER huangbosbos@gmail.com + +COPY redis.conf /usr/local/etc/redis/redis.conf + +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' >/etc/timezone + +RUN chmod 777 /usr/local/etc/redis/redis.conf + +EXPOSE 6063 +EXPOSE 16063 + +CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave3/redis.conf b/pigx-redis/slave3/redis.conf new file mode 100644 index 000000000..c0794ad2b --- /dev/null +++ b/pigx-redis/slave3/redis.conf @@ -0,0 +1,16 @@ +# 加上注释# +# bind 127.0.0.1 +# 阿里云CentOS7安装redis后不能远程访问解决方案 +# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 +bind 0.0.0.0 ::1 +# 关闭保护模式 +protected-mode no +# 绑定自定义端口 +port 6063 +# 禁止redis后台运行 +#daemonize yes +pidfile /var/run/redis_6063.pid +# 开启集群 把注释#去掉 +cluster-enabled yes +# 集群的配置 配置文件首次启动自动生成 +cluster-config-file nodes_6063.conf \ No newline at end of file diff --git a/pigx-redis/slave4/Dockerfile b/pigx-redis/slave4/Dockerfile new file mode 100644 index 000000000..a27766fae --- /dev/null +++ b/pigx-redis/slave4/Dockerfile @@ -0,0 +1,15 @@ +FROM redis + +MAINTAINER huangbosbos@gmail.com + +COPY redis.conf /usr/local/etc/redis/redis.conf + +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' >/etc/timezone + +RUN chmod 777 /usr/local/etc/redis/redis.conf + +EXPOSE 6064 +EXPOSE 16064 + +CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave4/redis.conf b/pigx-redis/slave4/redis.conf new file mode 100644 index 000000000..fe2f654dc --- /dev/null +++ b/pigx-redis/slave4/redis.conf @@ -0,0 +1,16 @@ +# 加上注释# +# bind 127.0.0.1 +# 阿里云CentOS7安装redis后不能远程访问解决方案 +# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 +bind 0.0.0.0 ::1 +# 关闭保护模式 +protected-mode no +# 绑定自定义端口 +port 6064 +# 禁止redis后台运行 +#daemonize yes +pidfile /var/run/redis_6064.pid +# 开启集群 把注释#去掉 +cluster-enabled yes +# 集群的配置 配置文件首次启动自动生成 +cluster-config-file nodes_6064.conf \ No newline at end of file diff --git a/pigx-redis/slave5/Dockerfile b/pigx-redis/slave5/Dockerfile new file mode 100644 index 000000000..1f4622efa --- /dev/null +++ b/pigx-redis/slave5/Dockerfile @@ -0,0 +1,15 @@ +FROM redis + +MAINTAINER huangbosbos@gmail.com + +COPY redis.conf /usr/local/etc/redis/redis.conf + +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' >/etc/timezone + +RUN chmod 777 /usr/local/etc/redis/redis.conf + +EXPOSE 6065 +EXPOSE 16065 + +CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave5/redis.conf b/pigx-redis/slave5/redis.conf new file mode 100644 index 000000000..ad445b625 --- /dev/null +++ b/pigx-redis/slave5/redis.conf @@ -0,0 +1,16 @@ +# 加上注释# +# bind 127.0.0.1 +# 阿里云CentOS7安装redis后不能远程访问解决方案 +# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 +bind 0.0.0.0 ::1 +# 关闭保护模式 +protected-mode no +# 绑定自定义端口 +port 6065 +# 禁止redis后台运行 +#daemonize yes +pidfile /var/run/redis_6065.pid +# 开启集群 把注释#去掉 +cluster-enabled yes +# 集群的配置 配置文件首次启动自动生成 +cluster-config-file nodes_6065.conf \ No newline at end of file diff --git a/pigx-redis/slave6/Dockerfile b/pigx-redis/slave6/Dockerfile new file mode 100644 index 000000000..cff235b10 --- /dev/null +++ b/pigx-redis/slave6/Dockerfile @@ -0,0 +1,15 @@ +FROM redis + +MAINTAINER huangbosbos@gmail.com + +COPY redis.conf /usr/local/etc/redis/redis.conf + +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' >/etc/timezone + +RUN chmod 777 /usr/local/etc/redis/redis.conf + +EXPOSE 6066 +EXPOSE 16066 + +CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave6/redis.conf b/pigx-redis/slave6/redis.conf new file mode 100644 index 000000000..c6834e9e1 --- /dev/null +++ b/pigx-redis/slave6/redis.conf @@ -0,0 +1,16 @@ +# 加上注释# +# bind 127.0.0.1 +# 阿里云CentOS7安装redis后不能远程访问解决方案 +# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 +bind 0.0.0.0 ::1 +# 关闭保护模式 +protected-mode no +# 绑定自定义端口 +port 6066 +# 禁止redis后台运行 +#daemonize yes +pidfile /var/run/redis_6066.pid +# 开启集群 把注释#去掉 +cluster-enabled yes +# 集群的配置 配置文件首次启动自动生成 +cluster-config-file nodes_6066.conf \ No newline at end of file From 61518aac7288cf71f50aa9666289e4ffff10b864 Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Sat, 27 Apr 2019 16:41:52 +0800 Subject: [PATCH 6/9] :bug: Fixing a bug. fix minio keep pace with --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ed7ac950c..449c40119 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,14 +33,14 @@ services: image: minio/minio command: server /data ports: - - "9000:9000" + - 9000:9000 volumes: - ./data:/data - ./config:/root/.minio environment: - - "MINIO_DOMAIN=pigx-minio" - - "MINIO_ACCESS_KEY=lengleng" - - "MINIO_SECRET_KEY=lengleng" + - MINIO_DOMAIN=pigx-minio + - MINIO_ACCESS_KEY=lengleng + - MINIO_SECRET_KEY=lengleng pigx-eureka: build: From 60ec381f4bf94dd10397d62d7cedfa73db4759fc Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Sat, 27 Apr 2019 16:56:52 +0800 Subject: [PATCH 7/9] :bug: Fixing a bug. fix remove --- pigx-redis/docker-compose.yml | 37 ----------------------------------- pigx-redis/slave1/Dockerfile | 15 -------------- pigx-redis/slave1/redis.conf | 16 --------------- pigx-redis/slave2/Dockerfile | 15 -------------- pigx-redis/slave2/redis.conf | 16 --------------- pigx-redis/slave3/Dockerfile | 15 -------------- pigx-redis/slave3/redis.conf | 16 --------------- pigx-redis/slave4/Dockerfile | 15 -------------- pigx-redis/slave4/redis.conf | 16 --------------- pigx-redis/slave5/Dockerfile | 15 -------------- pigx-redis/slave5/redis.conf | 16 --------------- pigx-redis/slave6/Dockerfile | 15 -------------- pigx-redis/slave6/redis.conf | 16 --------------- 13 files changed, 223 deletions(-) delete mode 100644 pigx-redis/docker-compose.yml delete mode 100644 pigx-redis/slave1/Dockerfile delete mode 100644 pigx-redis/slave1/redis.conf delete mode 100644 pigx-redis/slave2/Dockerfile delete mode 100644 pigx-redis/slave2/redis.conf delete mode 100644 pigx-redis/slave3/Dockerfile delete mode 100644 pigx-redis/slave3/redis.conf delete mode 100644 pigx-redis/slave4/Dockerfile delete mode 100644 pigx-redis/slave4/redis.conf delete mode 100644 pigx-redis/slave5/Dockerfile delete mode 100644 pigx-redis/slave5/redis.conf delete mode 100644 pigx-redis/slave6/Dockerfile delete mode 100644 pigx-redis/slave6/redis.conf diff --git a/pigx-redis/docker-compose.yml b/pigx-redis/docker-compose.yml deleted file mode 100644 index 981155519..000000000 --- a/pigx-redis/docker-compose.yml +++ /dev/null @@ -1,37 +0,0 @@ -# 运行：docker-compose up -d -# 运行(推荐)：docker-compose up --build -# 查看：docker ps -a -# 集群：docker run --rm -it zvelo/redis-trib create --replicas 1 ip:6061 ip:6062 ip:6063 ip:6064 ip:6065 ip:6066 - -version: '2' -services: - redis-slave1: - build: ./slave1 - ports: - - 6061:6061 - - 16061:16061 - redis-slave2: - build: ./slave2 - ports: - - 6062:6062 - - 16062:16062 - redis-slave3: - build: ./slave3 - ports: - - 6063:6063 - - 16063:16063 - redis-slave4: - build: ./slave4 - ports: - - 6064:6064 - - 16064:16064 - redis-slave5: - build: ./slave5 - ports: - - 6065:6065 - - 16065:16065 - redis-slave6: - build: ./slave6 - ports: - - 6066:6066 - - 16066:16066 \ No newline at end of file diff --git a/pigx-redis/slave1/Dockerfile b/pigx-redis/slave1/Dockerfile deleted file mode 100644 index 9070952d6..000000000 --- a/pigx-redis/slave1/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM redis - -MAINTAINER huangbosbos@gmail.com - -COPY redis.conf /usr/local/etc/redis/redis.conf - -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' >/etc/timezone - -RUN chmod 777 /usr/local/etc/redis/redis.conf - -EXPOSE 6061 -EXPOSE 16061 - -CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave1/redis.conf b/pigx-redis/slave1/redis.conf deleted file mode 100644 index e65769891..000000000 --- a/pigx-redis/slave1/redis.conf +++ /dev/null @@ -1,16 +0,0 @@ -# 加上注释# -# bind 127.0.0.1 -# 阿里云CentOS7安装redis后不能远程访问解决方案 -# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 -bind 0.0.0.0 ::1 -# 关闭保护模式 -protected-mode no -# 绑定自定义端口 -port 6061 -# 禁止redis后台运行 -#daemonize yes -pidfile /var/run/redis_6061.pid -# 开启集群 把注释#去掉 -cluster-enabled yes -# 集群的配置 配置文件首次启动自动生成 -cluster-config-file nodes_6061.conf \ No newline at end of file diff --git a/pigx-redis/slave2/Dockerfile b/pigx-redis/slave2/Dockerfile deleted file mode 100644 index 2876c8cbc..000000000 --- a/pigx-redis/slave2/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM redis - -MAINTAINER huangbosbos@gmail.com - -COPY redis.conf /usr/local/etc/redis/redis.conf - -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' >/etc/timezone - -RUN chmod 777 /usr/local/etc/redis/redis.conf - -EXPOSE 6062 -EXPOSE 16062 - -CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave2/redis.conf b/pigx-redis/slave2/redis.conf deleted file mode 100644 index 4dc1af5aa..000000000 --- a/pigx-redis/slave2/redis.conf +++ /dev/null @@ -1,16 +0,0 @@ -# 加上注释# -# bind 127.0.0.1 -# 阿里云CentOS7安装redis后不能远程访问解决方案 -# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 -bind 0.0.0.0 ::1 -# 关闭保护模式 -protected-mode no -# 绑定自定义端口 -port 6062 -# 禁止redis后台运行 -#daemonize yes -pidfile /var/run/redis_6062.pid -# 开启集群 把注释#去掉 -cluster-enabled yes -# 集群的配置 配置文件首次启动自动生成 -cluster-config-file nodes_6062.conf \ No newline at end of file diff --git a/pigx-redis/slave3/Dockerfile b/pigx-redis/slave3/Dockerfile deleted file mode 100644 index ff946b2f2..000000000 --- a/pigx-redis/slave3/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM redis - -MAINTAINER huangbosbos@gmail.com - -COPY redis.conf /usr/local/etc/redis/redis.conf - -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' >/etc/timezone - -RUN chmod 777 /usr/local/etc/redis/redis.conf - -EXPOSE 6063 -EXPOSE 16063 - -CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave3/redis.conf b/pigx-redis/slave3/redis.conf deleted file mode 100644 index c0794ad2b..000000000 --- a/pigx-redis/slave3/redis.conf +++ /dev/null @@ -1,16 +0,0 @@ -# 加上注释# -# bind 127.0.0.1 -# 阿里云CentOS7安装redis后不能远程访问解决方案 -# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 -bind 0.0.0.0 ::1 -# 关闭保护模式 -protected-mode no -# 绑定自定义端口 -port 6063 -# 禁止redis后台运行 -#daemonize yes -pidfile /var/run/redis_6063.pid -# 开启集群 把注释#去掉 -cluster-enabled yes -# 集群的配置 配置文件首次启动自动生成 -cluster-config-file nodes_6063.conf \ No newline at end of file diff --git a/pigx-redis/slave4/Dockerfile b/pigx-redis/slave4/Dockerfile deleted file mode 100644 index a27766fae..000000000 --- a/pigx-redis/slave4/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM redis - -MAINTAINER huangbosbos@gmail.com - -COPY redis.conf /usr/local/etc/redis/redis.conf - -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' >/etc/timezone - -RUN chmod 777 /usr/local/etc/redis/redis.conf - -EXPOSE 6064 -EXPOSE 16064 - -CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave4/redis.conf b/pigx-redis/slave4/redis.conf deleted file mode 100644 index fe2f654dc..000000000 --- a/pigx-redis/slave4/redis.conf +++ /dev/null @@ -1,16 +0,0 @@ -# 加上注释# -# bind 127.0.0.1 -# 阿里云CentOS7安装redis后不能远程访问解决方案 -# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 -bind 0.0.0.0 ::1 -# 关闭保护模式 -protected-mode no -# 绑定自定义端口 -port 6064 -# 禁止redis后台运行 -#daemonize yes -pidfile /var/run/redis_6064.pid -# 开启集群 把注释#去掉 -cluster-enabled yes -# 集群的配置 配置文件首次启动自动生成 -cluster-config-file nodes_6064.conf \ No newline at end of file diff --git a/pigx-redis/slave5/Dockerfile b/pigx-redis/slave5/Dockerfile deleted file mode 100644 index 1f4622efa..000000000 --- a/pigx-redis/slave5/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM redis - -MAINTAINER huangbosbos@gmail.com - -COPY redis.conf /usr/local/etc/redis/redis.conf - -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' >/etc/timezone - -RUN chmod 777 /usr/local/etc/redis/redis.conf - -EXPOSE 6065 -EXPOSE 16065 - -CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave5/redis.conf b/pigx-redis/slave5/redis.conf deleted file mode 100644 index ad445b625..000000000 --- a/pigx-redis/slave5/redis.conf +++ /dev/null @@ -1,16 +0,0 @@ -# 加上注释# -# bind 127.0.0.1 -# 阿里云CentOS7安装redis后不能远程访问解决方案 -# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 -bind 0.0.0.0 ::1 -# 关闭保护模式 -protected-mode no -# 绑定自定义端口 -port 6065 -# 禁止redis后台运行 -#daemonize yes -pidfile /var/run/redis_6065.pid -# 开启集群 把注释#去掉 -cluster-enabled yes -# 集群的配置 配置文件首次启动自动生成 -cluster-config-file nodes_6065.conf \ No newline at end of file diff --git a/pigx-redis/slave6/Dockerfile b/pigx-redis/slave6/Dockerfile deleted file mode 100644 index cff235b10..000000000 --- a/pigx-redis/slave6/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM redis - -MAINTAINER huangbosbos@gmail.com - -COPY redis.conf /usr/local/etc/redis/redis.conf - -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' >/etc/timezone - -RUN chmod 777 /usr/local/etc/redis/redis.conf - -EXPOSE 6066 -EXPOSE 16066 - -CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ] \ No newline at end of file diff --git a/pigx-redis/slave6/redis.conf b/pigx-redis/slave6/redis.conf deleted file mode 100644 index c6834e9e1..000000000 --- a/pigx-redis/slave6/redis.conf +++ /dev/null @@ -1,16 +0,0 @@ -# 加上注释# -# bind 127.0.0.1 -# 阿里云CentOS7安装redis后不能远程访问解决方案 -# 修改安装redis服务时的配置文件中把127.0.0.1 改为0.0.0.0，然后重启服务即可 -bind 0.0.0.0 ::1 -# 关闭保护模式 -protected-mode no -# 绑定自定义端口 -port 6066 -# 禁止redis后台运行 -#daemonize yes -pidfile /var/run/redis_6066.pid -# 开启集群 把注释#去掉 -cluster-enabled yes -# 集群的配置 配置文件首次启动自动生成 -cluster-config-file nodes_6066.conf \ No newline at end of file From ec084d9f34a07e62ff5deaa06b9afcc3bc942eff Mon Sep 17 00:00:00 2001 From: Lucky <641787296@qq.com> Date: Sat, 27 Apr 2019 22:27:45 +0800 Subject: [PATCH 8/9] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82=20=E6=94=AF=E6=8C=81=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AF=B4=E6=98=8E=E5=92=8C=E5=9C=A8=E7=BA=BF=E8=B0=83?= =?UTF-8?q?=E8=AF=95=EF=BC=8CUI=E5=A2=9E=E5=BC=BA=E4=B8=AA=E6=80=A7?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE=E3=80=81=E7=A6=BB=E7=BA=BF=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E3=80=81=E6=8E=A5=E5=8F=A3=E6=8E=92=E5=BA=8F=20?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=8D=B3=E5=8C=96=EF=BC=9Ahttp://pigx-gatewa?= =?UTF-8?q?y:9999/doc.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-gateway/pom.xml | 5 +++++ pom.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 75e7d739e..c71e1aee9 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -79,6 +79,11 @@ springfox-swagger2 ${swagger.fox.version} + + com.github.xiaoymin + swagger-bootstrap-ui + ${swagger-bootstrap-ui.version} + diff --git a/pom.xml b/pom.xml index 3ef63d872..c5757ba56 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,7 @@ 4.5.6 0.0.9 2.9.2 + 1.9.3 2.10.0 1.7 4.1.0 From 9be33944cdb8715b6da26a2bf293cddd5348b474 Mon Sep 17 00:00:00 2001 From: Lucky <641787296@qq.com> Date: Sat, 27 Apr 2019 23:23:58 +0800 Subject: [PATCH 9/9] :whale: swagger api. add R discription --- pigx-common/pigx-common-core/pom.xml | 5 +++++ .../main/java/com/pig4cloud/pigx/common/core/util/R.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 6b4aa513c..1157ed73d 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -70,5 +70,10 @@ transmittable-thread-local ${ttl.version} + + + io.swagger + swagger-annotations + diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java index 4044da87e..a688f6f1a 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java @@ -20,6 +20,8 @@ package com.pig4cloud.pigx.common.core.util; import com.pig4cloud.pigx.common.core.constant.CommonConstants; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.Accessors; @@ -34,21 +36,25 @@ import java.io.Serializable; @Builder @ToString @Accessors(chain = true) +@ApiModel(description = "响应信息主体") @AllArgsConstructor public class R implements Serializable { private static final long serialVersionUID = 1L; @Getter @Setter + @ApiModelProperty(value = "返回标记：成功标记=0，失败标记=0") private int code = CommonConstants.SUCCESS; @Getter @Setter + @ApiModelProperty(value = "返回信息") private String msg = "success"; @Getter @Setter + @ApiModelProperty(value = "数据") private T data; public R() {