init

.env.example

@@ -1,16 +1,41 @@
-APP_NAME=skeleton
+# 环境
+APP_ENV=dev
 
-DB_DRIVER=mysql
-DB_HOST=localhost
-DB_PORT=3306
-DB_DATABASE=hyperf
+# 项目名称
+APP_NAME=hyperf-advanced
+
+# 是否缓存扫描注解
+SCAN_CACHEABLE=false
+
+CRONTAB_ENABLE=false
+
+# 监听端口
+HTTP_PORT=9501
+# RPC_PORT=9503
+
+# 日志等级，默认DEBUG
+LOG_LEVEL=200
+
+# Swoole进程数配置
+WORKER_NUM=2
+TASK_WORKER_NUM=2
+
+# MySQL数据库配置
+DB_READ_HOST=127.0.0.1
+DB_WRITE_HOST=127.0.0.1
 DB_USERNAME=root
+DB_PORT=3306
+DB_DATABASE=hyperf_admin
 DB_PASSWORD=
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
-DB_PREFIX=
+DB_PREFIX=t_
 
-REDIS_HOST=localhost
-REDIS_AUTH=(null)
+
+# Redis配置
+REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
-REDIS_DB=0
+REDIS_DB=3
+REDIS_AUTH=
+
+HOST=http://127.0.0.1:9501

.env.online

@@ -0,0 +1,41 @@
+# 环境
+APP_ENV=prod
+
+# 项目名称
+APP_NAME=hyperf-advanced
+
+# 是否缓存扫描注解
+SCAN_CACHEABLE=false
+
+CRONTAB_ENABLE=true
+
+# 监听端口
+HTTP_PORT=9501
+# RPC_PORT=9503
+
+# 日志等级，默认DEBUG
+LOG_LEVEL=200
+
+# Swoole进程数配置
+WORKER_NUM=2
+TASK_WORKER_NUM=2
+
+# MySQL数据库配置
+DB_READ_HOST=127.0.0.1
+DB_WRITE_HOST=127.0.0.1
+DB_USERNAME=root
+DB_PORT=3306
+DB_DATABASE=hyperf_admin
+DB_PASSWORD=
+DB_CHARSET=utf8mb4
+DB_COLLATION=utf8mb4_unicode_ci
+DB_PREFIX=t_
+
+
+# Redis配置
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+REDIS_DB=3
+REDIS_AUTH=
+
+HOST=http://127.0.0.1:9501

.gitignore

@@ -9,5 +9,7 @@ vendor/
 .phpintel/
 .env
 .DS_Store
-*.lock
-.phpunit*
+.phpunit*
+*.cache
+public
+composer.lock

.php_cs → .php-cs-fixer.php

@@ -4,20 +4,20 @@
 This file is part of Hyperf.
 
 @link     https://www.hyperf.io
-@document https://doc.hyperf.io
+@document https://hyperf.wiki
 @contact  [email protected]
-@license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+@license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 EOF;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
         '@Symfony' => true,
         '@DoctrineAnnotation' => true,
         '@PhpCsFixer' => true,
         'header_comment' => [
-            'commentType' => 'PHPDoc',
+            'comment_type' => 'PHPDoc',
             'header' => $header,
             'separate' => 'none',
             'location' => 'after_declare_strict',
@@ -62,11 +62,13 @@
         'multiline_whitespace_before_semicolons' => [
             'strategy' => 'no_multi_line',
         ],
+        'constant_case' => [
+            'case' => 'lower',
+        ],
         'class_attributes_separation' => true,
         'combine_consecutive_unsets' => true,
         'declare_strict_types' => true,
         'linebreak_after_opening_tag' => true,
-        'lowercase_constants' => true,
         'lowercase_static_reference' => true,
         'no_useless_else' => true,
         'no_unused_imports' => true,

Dockerfile

@@ -1,59 +1,125 @@
-# Default Dockerfile
+
+# hyperf/hyperf:7.4
 #
 # @link     https://www.hyperf.io
 # @document https://doc.hyperf.io
 # @contact  [email protected]
-# @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+# @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
-FROM hyperf/hyperf:7.2-alpine-cli
-LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"
+FROM alpine:3.12
 
-##
-# ---------- env settings ----------
-##
-# --build-arg timezone=Asia/Shanghai
 ARG timezone
 
 ENV TIMEZONE=${timezone:-"Asia/Shanghai"} \
-    COMPOSER_VERSION=1.9.0 \
-    APP_ENV=prod
+    APP_ENV=prod \
+    SCAN_CACHEABLE=(true)
+
+ENV SWOOLE_VERSION 4.7.0
+ENV PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php7-dev php7-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake"
+
+
+LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"
+
+# trust this project public key to trust the packages.
+ADD https://alpine-apk-repository.knowyourself.cc/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
 
-# update
 RUN set -ex \
+    # change apk source repo
+    && echo "https://alpine-apk-repository.knowyourself.cc/v3.12/php-7.4" >> /etc/apk/repositories \
+    && echo "@php https://alpine-apk-repository.knowyourself.cc/v3.12/php-7.4" >> /etc/apk/repositories \
     && apk update \
-    # install composer
-    && cd /tmp \
-    && wget https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
-    && chmod u+x composer.phar \
-    && mv composer.phar /usr/local/bin/composer \
-    # show php version and extensions
-    && php -v \
-    && php -m \
-    #  ---------- some config ----------
-    && cd /etc/php7 \
-    # - config PHP
+    && apk add --no-cache \
+    # Install base packages ('ca-certificates' will install 'nghttp2-libs')
+    ca-certificates \
+    curl \
+    wget \
+    tar \
+    xz \
+    libressl \
+    tzdata \
+    pcre \
+    php7 \
+    php7-bcmath \
+    php7-curl \
+    php7-ctype \
+    php7-dom \
+    php7-gd \
+    php7-iconv \
+    php7-json \
+    php7-mbstring \
+    php7-mysqlnd \
+    php7-openssl \
+    php7-pdo \
+    php7-pdo_mysql \
+    php7-pdo_sqlite \
+    php7-phar \
+    php7-posix \
+    php7-redis \
+    php7-sockets \
+    php7-sodium \
+    php7-sysvshm \
+    php7-sysvmsg \
+    php7-sysvsem \
+    php7-zip \
+    php7-zlib \
+    php7-xml \
+    php7-xmlreader \
+    php7-pcntl \
+    php7-opcache \
+    && ln -sf /usr/bin/php7 /usr/bin/php
+
+RUN set -ex \
+    && apk update \
+    # for swoole extension libaio linux-headers
+    && apk add --no-cache libstdc++ openssl git bash \
+    && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS libaio-dev openssl-dev curl-dev
+
+# composer
+RUN curl -O https://mirrors.aliyun.com/composer/composer.phar \
+    && chmod +x composer.phar \
+    && mv composer.phar /usr/bin/composer
+# use aliyun composer
+RUN composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
+
+# swoole ext
+RUN cd /tmp \
+    && wget https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz -O swoole.tar.gz \
+    && mkdir -p swoole \
+    && tar -xf swoole.tar.gz -C swoole --strip-components=1 \
+    && rm swoole.tar.gz \
+    && ln -s /usr/bin/phpize7 /usr/local/bin/phpize \
+    && ln -s /usr/bin/php-config7 /usr/local/bin/php-config \
+    && ( \
+        cd swoole \
+        && phpize \
+        && ./configure --enable-openssl --enable-http2 --enable-swoole-curl --enable-swoole-json \
+        && make -s -j$(nproc) && make install \
+    ) \
     && { \
-        echo "upload_max_filesize=100M"; \
-        echo "post_max_size=108M"; \
-        echo "memory_limit=1024M"; \
+        echo "upload_max_filesize=128M"; \
+        echo "post_max_size=128M"; \
+        echo "memory_limit=1G"; \
         echo "date.timezone=${TIMEZONE}"; \
-    } | tee conf.d/99-overrides.ini \
-    # - config timezone
+    } | tee /etc/php7/conf.d/99_overrides.ini \
     && ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
     && echo "${TIMEZONE}" > /etc/timezone \
-    # ---------- clear works ----------
-    && rm -rf /var/cache/apk/* /tmp/* /usr/share/man \
+    && echo "opcache.enable_cli = 'On'" >> /etc/php7/conf.d/00_opcache.ini \
+    && echo "extension=swoole.so" > /etc/php7/conf.d/50_swoole.ini \
+    && echo "swoole.use_shortname = 'Off'" >> /etc/php7/conf.d/50_swoole.ini \
+    && rm -r swoole \
+    && php -v \
+    && php -m \
+    && php --ri swoole \
+    && composer \
+    && apk del --purge *-dev \
+    && rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/share/php7 \
     && echo -e "\033[42;37m Build Completed :).\033[0m\n"
 
-WORKDIR /opt/www
-
-# Composer Cache
-# COPY ./composer.* /opt/www/
-# RUN composer install --no-dev --no-scripts
+WORKDIR /hyperf
 
-COPY . /opt/www
-RUN composer install --no-dev -o
+COPY . /hyperf
+RUN composer install --no-dev -o && php bin/hyperf.php
 
 EXPOSE 9501
 
-ENTRYPOINT ["php", "/opt/www/bin/hyperf.php", "start"]
+ENTRYPOINT ["php", "/hyperf/bin/hyperf.php", "start"]

README.md

@@ -8,9 +8,9 @@
 
 If You Like This Please Give Me Star
 
-基于 yii 扩展的高级hyerf框架
+基于 Hyperf 2.0
 
-目前还在研发中，请慎用
+目前还在重构中，看看就行，别拉下来
 
 安装
 ------------
@@ -20,25 +20,9 @@ The preferred way to install this extension is through [composer](http://getcomp
 Either run
 
 ```
-git clone https://github.com/ice-leng/hyperf-advanced.git
+git clone -b 2.0 https://github.com/ice-leng/hyperf-advanced.git
 ```
 使用扩展
 --------------
- - [ ] API
-    - [x] [接口文档](https://github.com/ice-leng/hyperf-swagger)
-    - [x] [帮助类](https://github.com/ice-leng/hyperf-helper)
-    - [x] [token机制](https://github.com/ice-leng/hyperf-jwt)
-    - [x] [auth访问权限](https://github.com/ice-leng/hyperf-auth)
-    - [x] [Yii Db](https://github.com/ice-leng/hyperf-yii-db)
-    - [ ] ActiveRecode 文件生成脚手架
-    - [ ] elk 接入日志分析系统
-    - [ ] jaeger tracing 
- - [ ] Backend
-    - [x] [permission 权限](https://github.com/ice-leng/hyperf-yii-rbac)
-    - [ ] [session访问权限](https://github.com/ice-leng/hyperf-auth)
-    - [ ] 导航menu
-    - [ ] 混编模版
-
-
-
+- [swagger，路由](https://github.com/daodao97/apidog)