From 7fe405d0afcb3d56a29d30d516eae27d41bb08fd Mon Sep 17 00:00:00 2001
From: jerry <jesse2061@outlook.com>
Date: Sun, 8 Nov 2020 20:14:08 +0800
Subject: [PATCH] initial 2.0.0-b2 commit

---
 Dockerfile              | 19 +++++++++----------
 README.md               |  2 +-
 composer.json           |  6 +++---
 docker_mixed/Dockerfile | 17 ++++++++---------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8130fa82..c1cc7cfb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,16 +8,15 @@ ENV LANGUAGE C.UTF-8
 RUN apt-get update && apt-get install -y software-properties-common tzdata
 RUN dpkg-reconfigure -f noninteractive tzdata
 VOLUME ["/app/zhamao-framework/"]
-RUN add-apt-repository ppa:ondrej/php && \
-	apt-get update && \
-	apt-get install php php-dev php-mbstring gcc make openssl \
-		php-mbstring php-json php-curl php-mysql -y && \
-	apt-get install wget composer -y && \
-	wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \
-	tar -zxvf v4.5.0.tar.gz && \
-	cd swoole-src-4.5.0/ && \
-	phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \
-	(echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
+RUN add-apt-repository ppa:ondrej/php &&
+    apt-get update && \
+    apt-get install php php-dev php-mbstring gcc make openssl php-mbstring php-json php-curl php-mysql -y && \
+    apt-get install wget composer -y && \
+    wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \
+    tar -zxvf v4.5.0.tar.gz && \
+    cd swoole-src-4.5.0/ && \
+    phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \
+    (echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
 
 
 ADD . /app/zhamao-framework
diff --git a/README.md b/README.md
index 905b33c3..36f322f1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 
 **2.0 版本开发完毕后，会发布测试版和并入 master 分支，敬请关注。**
 
-[![dev-version2](https://img.shields.io/badge/process-30%25-green)]()
+[![dev-version2](https://img.shields.io/badge/process-95%25-green)]()
 
 
 
diff --git a/composer.json b/composer.json
index 29aa2d21..351e3bdd 100644
--- a/composer.json
+++ b/composer.json
@@ -29,10 +29,10 @@
         "psy/psysh": "@stable",
         "symfony/console": "^5.1",
         "symfony/polyfill-ctype": "^1.18",
-        "zhamao/connection-manager": "^1.0",
+        "zhamao/connection-manager": "*@dev",
         "zhamao/console": "*@dev",
-        "zhamao/config": "^1.0",
-        "zhamao/request": "^1.0",
+        "zhamao/config": "*@dev",
+        "zhamao/request": "*@dev",
         "symfony/routing": "^5.1"
     },
     "suggest": {
diff --git a/docker_mixed/Dockerfile b/docker_mixed/Dockerfile
index b85a7dea..ca2291e8 100644
--- a/docker_mixed/Dockerfile
+++ b/docker_mixed/Dockerfile
@@ -2,15 +2,14 @@ FROM richardchien/cqhttp:latest
 RUN apt-get update && apt-get install -y software-properties-common tzdata
 RUN dpkg-reconfigure -f noninteractive tzdata
 RUN add-apt-repository ppa:ondrej/php && \
-	apt-get update && \
-	apt-get install php php-dev php-mbstring gcc make openssl \
-		php-mbstring php-json php-curl php-mysql -y && \
-	apt-get install wget composer -y && \
-	wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \
-	tar -zxvf v4.5.0.tar.gz && \
-	cd swoole-src-4.5.0/ && \
-	phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \
-	(echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
+    apt-get update && \
+    apt-get install php php-dev php-mbstring gcc make openssl php-mbstring php-json php-curl php-mysql -y && \
+    apt-get install wget composer -y && \
+    wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \
+    tar -zxvf v4.5.0.tar.gz && \
+    cd swoole-src-4.5.0/ && \
+    phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \
+    (echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
 ADD start.sh /home/user/start.sh
 RUN chown user:user /home/user/start.sh && chmod +x /home/user/start.sh
 ADD https://github.com/zhamao-robot/zhamao-framework/archive/master.zip /home/user/master.zip