Merge pull request #787 from swoft-cloud/feature

Feature

Author: stelin

Dockerfile

@@ -1,10 +1,30 @@
-FROM php:7.1
+# @description php image base on the debian 9.x
+#
+#                       Some Information
+# ------------------------------------------------------------------------------------
+# @link https://hub.docker.com/_/debian/      alpine image
+# @link https://hub.docker.com/_/php/         php image
+# @link https://github.com/docker-library/php php dockerfiles
+# @see https://github.com/docker-library/php/tree/master/7.2/stretch/cli/Dockerfile
+# ------------------------------------------------------------------------------------
+# @build-example docker build . -f Dockerfile -t swoft/swoft
+#
+FROM php:7.2
 
 LABEL maintainer="inhere <in.798@qq.com>" version="2.0"
 
-# Version
-ENV PHPREDIS_VERSION=4.3.0 \
-    SWOOLE_VERSION=4.3.5
+# --build-arg timezone=Asia/Shanghai
+ARG timezone
+# app env: prod pre test dev
+ARG app_env=prod
+# default use www-data user
+ARG work_user=www-data
+
+ENV APP_ENV=${app_env:-"prod"} \
+    TIMEZONE=${timezone:-"Asia/Shanghai"} \
+    PHPREDIS_VERSION=4.3.0 \
+    SWOOLE_VERSION=4.3.5 \
+    COMPOSER_ALLOW_SUPERUSER=1
 
 ADD . /var/www/swoft
 
@@ -13,35 +33,25 @@ RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && echo 'Asia/Shanghai' > /etc/timezone \
 # Libs
     && apt-get update \
-    && apt-get install -y \
-        curl \
-        wget \
-        git \
-        zip \
+    && apt-get install -y --no-install-recommends \
+        curl wget git zip unzip less vim openssl \
         libz-dev \
         libssl-dev \
         libnghttp2-dev \
         libpcre3-dev \
-    && apt-get clean \
-    && apt-get autoremove \
 # Install composer
     && curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/composer \
     && composer self-update --clean-backups \
-# Some php extension
-    && docker-php-ext-install pdo_mysql \
-       bcmath \
-       sockets \
-       zip \
-       sysvmsg \
-       sysvsem \
-       sysvshm \
-# Redis extension
+# Install PHP extensions
+    && docker-php-ext-install \
+       bcmath gd pdo_mysql mbstring sockets zip sysvmsg sysvsem sysvshm \
+# Install redis extension
     && wget http://pecl.php.net/get/redis-${PHPREDIS_VERSION}.tgz -O /tmp/redis.tar.tgz \
     && pecl install /tmp/redis.tar.tgz \
     && rm -rf /tmp/redis.tar.tgz \
     && docker-php-ext-enable redis \
-# Swoole extension
+# Install swoole extension
     && 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 \
@@ -55,9 +65,16 @@ RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     ) \
     && rm -r swoole \
     && docker-php-ext-enable swoole \
+# Clear dev deps
+    && apt-get clean \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+# Timezone
+    && cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
+    && echo "${TIMEZONE}" > /etc/timezone \
+    && echo "[Date]\ndate.timezone=${TIMEZONE}" > /usr/local/etc/php/conf.d/timezone.ini \
 # Install composer deps
     && cd /var/www/swoft \
-    && composer install \
+    && composer install --no-dev \
     && composer clearcache
 
 WORKDIR /var/www/swoft

app/Annotation/Mapping/AlphaDash.php

@@ -0,0 +1,63 @@
+<?php declare(strict_types=1);
+
+namespace App\Annotation\Mapping;
+
+use Doctrine\Common\Annotations\Annotation\Attribute;
+use Doctrine\Common\Annotations\Annotation\Attributes;
+
+/**
+ * Class AlphaDash
+ *
+ * @since 2.0
+ *
+ * @Annotation
+ * @Attributes({
+ *     @Attribute("message",type="string")
+ * })
+ */
+class AlphaDash
+{
+    /**
+     * @var string
+     */
+    private $message = '';
+
+    /**
+     * @var string
+     */
+    private $name = '';
+
+    /**
+     * StringType constructor.
+     *
+     * @param array $values
+     */
+    public function __construct(array $values)
+    {
+        if (isset($values['value'])) {
+            $this->message = $values['value'];
+        }
+        if (isset($values['message'])) {
+            $this->message = $values['message'];
+        }
+        if (isset($values['name'])) {
+            $this->name = $values['name'];
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+}

app/Annotation/Parser/AlphaDashParser.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace App\Annotation\Parser;
+
+use ReflectionException;
+use Swoft\Annotation\Annotation\Mapping\AnnotationParser;
+use Swoft\Annotation\Annotation\Parser\Parser;
+use App\Annotation\Mapping\AlphaDash;
+use Swoft\Validator\Exception\ValidatorException;
+use Swoft\Validator\ValidatorRegister;
+
+/**
+ * Class AlphaDashParser
+ *
+ * @AnnotationParser(annotation=AlphaDash::class)
+ */
+class AlphaDashParser extends Parser
+{
+    /**
+     * @param int $type
+     * @param object $annotationObject
+     *
+     * @return array
+     * @throws ReflectionException
+     * @throws ValidatorException
+     */
+    public function parse(int $type, $annotationObject): array
+    {
+        if ($type != self::TYPE_PROPERTY) {
+            return [];
+        }
+        ValidatorRegister::registerValidatorItem($this->className, $this->propertyName, $annotationObject);
+        return [];
+    }
+}

app/Common/DbSelector.php

@@ -36,4 +36,4 @@ public function select(Connection $connection): void
         $dbName = sprintf('%s%s', $createDbName, (string)$selectIndex);
         $connection->db($dbName);
     }
-}
+}

app/Common/RpcProvider.php

@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);
+
+
+namespace App\Common;
+
+
+use ReflectionException;
+use Swoft\Bean\Annotation\Mapping\Bean;
+use Swoft\Bean\Annotation\Mapping\Inject;
+use Swoft\Bean\Exception\ContainerException;
+use Swoft\Consul\Agent;
+use Swoft\Consul\Exception\ClientException;
+use Swoft\Consul\Exception\ServerException;
+use Swoft\Rpc\Client\Client;
+use Swoft\Rpc\Client\Contract\ProviderInterface;
+
+/**
+ * Class RpcProvider
+ *
+ * @since 2.0
+ *
+ * @Bean()
+ */
+class RpcProvider implements ProviderInterface
+{
+    /**
+     * @Inject()
+     *
+     * @var Agent
+     */
+    private $agent;
+
+    /**
+     * @param Client $client
+     *
+     * @return array
+     * @throws ReflectionException
+     * @throws ContainerException
+     * @throws ClientException
+     * @throws ServerException
+     * @example
+     * [
+     *     'host:port',
+     *     'host:port',
+     *     'host:port',
+     * ]
+     */
+    public function getList(Client $client): array
+    {
+        // Get health service from consul
+        $services = $this->agent->services();
+
+        $services = [
+
+        ];
+
+        return $services;
+    }
+}

app/Console/Command/AgentCommand.php

@@ -0,0 +1,84 @@
+<?php declare(strict_types=1);
+
+
+namespace App\Console\Command;
+
+use ReflectionException;
+use Swoft\Apollo\Config;
+use Swoft\Apollo\Exception\ApolloException;
+use Swoft\Bean\Annotation\Mapping\Inject;
+use Swoft\Bean\Exception\ContainerException;
+use Swoft\Co;
+use Swoft\Console\Annotation\Mapping\Command;
+use Swoft\Console\Annotation\Mapping\CommandMapping;
+use Swoft\Http\Server\HttpServer;
+use Swoft\Log\Helper\CLog;
+use Swoft\Rpc\Server\ServiceServer;
+use Swoft\WebSocket\Server\WebSocketServer;
+use Throwable;
+
+/**
+ * Class AgentCommand
+ *
+ * @since 2.0
+ *
+ * @Command("agent")
+ */
+class AgentCommand
+{
+    /**
+     * @Inject()
+     *
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @CommandMapping(name="index")
+     */
+    public function index(): void
+    {
+        $namespaces = [
+            'application'
+        ];
+
+        while (true) {
+            try {
+                $this->config->listen($namespaces, [$this, 'updateConfigFile']);
+            } catch (Throwable $e) {
+                CLog::error('Config agent fail(%s %s %d)!', $e->getMessage(), $e->getFile(), $e->getLine());
+            }
+        }
+    }
+
+    /**
+     * @param array $data
+     *
+     * @throws ContainerException
+     * @throws ReflectionException
+     */
+    public function updateConfigFile(array $data): void
+    {
+        foreach ($data as $namespace => $namespaceData) {
+            $configFile = sprintf('@config/%s.php', $namespace);
+
+            $configKVs = $namespaceData['configurations'] ?? '';
+            $content   = '<?php return ' . var_export($configKVs, true) . ';';
+            Co::writeFile(alias($configFile), $content, FILE_NO_DEFAULT_CONTEXT);
+
+            CLog::info('Apollo update success！');
+
+//            /** @var HttpServer $server */
+//            $server = bean('httpServer');
+//            $server->restart();
+
+//            /** @var ServiceServer $server */
+//            $server = bean('rpcServer');
+//            $server->restart();
+
+            /* @var WebSocketServer $server */
+            $server = bean('wsServer');
+            $server->restart();
+        }
+    }
+}

app/Console/Command/DemoCommand.php

@@ -4,6 +4,7 @@
 
 use Swoft\Console\Annotation\Mapping\Command;
 use Swoft\Console\Annotation\Mapping\CommandMapping;
+use Swoft\Console\Exception\ConsoleErrorException;
 use Swoft\Console\Helper\Show;
 use Swoft\Console\Input\Input;
 
@@ -25,4 +26,13 @@ public function test(Input $input): void
             'opts' => $input->getOptions(),
         ]);
     }
+
+    /**
+     * @CommandMapping("err")
+     * @throws ConsoleErrorException
+     */
+    public function coError(): void
+    {
+        ConsoleErrorException::throw('this is an error message');
+    }
 }