Merge branch '6.0' of https://github.com/xiaodit/think-admin into 6.0

.travis.yml

@@ -7,7 +7,7 @@ script:
   - composer self-update
   - composer global require phpstan/phpstan
   - composer install
-  - composer analyze
+#  - composer analyze
 
 cache:
   directories:
@@ -32,7 +32,7 @@ before_deploy:
   - cp .env.example .env
   - chmod -R 777 runtime
   - docker buildx ls
-  - docker buildx build -t xiaodi93/ant-design-admin:latest --platform=linux/arm64 . --push
+  - docker buildx build -t xiaodi93/ant-design-admin:latest --platform=linux/amd64 . --push
 
 deploy:
   provider: releases

Dockerfile

@@ -3,7 +3,7 @@ ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
 
-FROM xiaodi93/rpi-php:latest
+FROM xiaodi93/dcnmp-php71:latest
 
 ARG TZ="Asia/Shanghai"
 ENV TZ ${TZ}
@@ -14,4 +14,4 @@ RUN apk upgrade --update \
     && echo ${TZ} > /etc/timezone \
     && rm -rf /var/cache/apk/*
 
-COPY ./ /var/www/html
+COPY ./ /var/www/html

README.md

@@ -4,8 +4,10 @@
 
 ThinkPHP 6.0 与 Ant Design Pro Vue 基础前后分离权限系统
 
+**目前为止，它还是一个开发版本**
+
 前端: 
-Ant Design Vue Pro [项目](https://github.com/xiaodit/think-ant-vue) [预览](https://ant.wfunc.com)
+Ant Design Vue Pro [项目](https://github.com/xiaodit/think-ant-vue) [预览](https://preview.wfunc.com)
 
 QQ 群 `996887666` 暗号 `Tant`
 
@@ -16,7 +18,7 @@ QQ 群 `996887666` 暗号 `Tant`
 没安装Composer？ 请在最新版本链接下找到`Tant_Full.zip`下载
 
 ## 安装
-### 正式版本
+### 测试版本
 ```sh
 composer create-project xiaodi/tant
 ```