initial 2.0.0-b2 commit

Dockerfile

@@ -8,10 +8,9 @@ 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 && \
+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 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 && \

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)]()
 
 
 

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": {

docker_mixed/Dockerfile

@@ -3,8 +3,7 @@ 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 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 && \