Merge branch 'master' of http://git.2b3.cn/tencent/services

src/Common/Bean/Annotation/Auth.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/9/12
+ * Time: 13:32
+ */
+namespace Hdll\Services\Common\Bean\Annotation;
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target("ALL")
+ * Class Auth
+ * @package App\Bean\Annotation
+ */
+class Auth
+{
+    private $name='';
+
+    private $scope=0;
+
+    private $option='==';
+
+    public function __construct(array $values)
+    {
+        if (isset($values['value'])) {
+            $this->name = $values['value'];
+        }
+        if (isset($values['name'])) {
+            $this->name = $values['name'];
+        }
+
+        if (isset($values['scope'])) {
+            $this->scope = $values['scope'];
+        }
+
+        if (isset($values['option'])) {
+            $this->option = $values['option'];
+        }
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function setScope($scope)
+    {
+        $this->scope = $scope;
+    }
+
+    public function setOption($option)
+    {
+        $this->option = $option;
+    }
+
+
+    public function getName() : string
+    {
+        return $this->name;
+    }
+
+    public function getScope()
+    {
+        return $this->scope;
+    }
+
+    public function getOption()
+    {
+        return $this->option;
+    }
+}
\ No newline at end of file

src/Common/Bean/Collector/AuthCollector.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/9/12
+ * Time: 13:44
+ */
+namespace Hdll\Services\Common\Bean\Collector;
+
+use Hdll\Services\Common\Bean\Annotation\Auth;
+use Swoft\Bean\CollectorInterface;
+
+class AuthCollector implements CollectorInterface
+{
+    /**
+     * @var array
+     */
+    private static $auth = [];
+
+    public static function collect(string $className,
+                                   $objectAnnotation = null,
+                                   string $propertyName = '',
+                                   string $methodName = '',
+                                   $propertyValue = null)
+    {
+        if ($objectAnnotation instanceof Auth) {
+            $scope = $objectAnnotation->getScope();
+            $option = $objectAnnotation->getOption();
+            if ( $methodName ==='' ) {
+                self::$auth[$className]['scope'] = $scope;
+                self::$auth[$className]['option'] = $option;
+            } else {
+                self::$auth[$className]['methods'][$methodName]['scope'] = $scope;
+                self::$auth[$className]['methods'][$methodName]['option'] = $option;
+            }
+
+
+
+        }
+
+    }
+
+    public static function getCollector()
+    {
+        return self::$auth;
+    }
+
+}
\ No newline at end of file

src/Common/Bean/Parser/AuthParser.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/9/12
+ * Time: 13:43
+ */
+namespace Hdll\Services\Common\Bean\Parser;
+
+use Hdll\Services\Common\Bean\Collector\AuthCollector;
+use Swoft\Bean\Annotation\Scope;
+use Swoft\Bean\Parser\AbstractParser;
+
+/**
+ * @uses AuthParser
+ * Class AuthParser
+ * @package App\Bean\Parser
+ */
+class AuthParser extends AbstractParser
+{
+    public function parser(string $className,
+                           $objectAnnotation = null,
+                           string $propertyName = '',
+                           string $methodName = '',
+                           $propertyValue = null)
+    {
+        $beanName = $className;
+        $scope    = Scope::SINGLETON;
+
+        AuthCollector::collect($className, $objectAnnotation, $propertyName, $methodName, $propertyValue);
+
+        return [$beanName, $scope, ""];
+
+    }
+
+}
\ No newline at end of file

src/Common/Bean/Wrapper/AuthWrapper.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/9/13
+ * Time: 13:28
+ */
+namespace Hdll\Services\Common\Bean\Wrapper;
+
+use Hdll\Services\Common\Bean\Annotation\Auth;
+use Swoft\Bean\Wrapper\AbstractWrapper;
+
+class AuthWrapper extends AbstractWrapper
+{
+    /**
+     * @var array 解析哪些注解(类级)
+     */
+    protected $classAnnotations = [
+        Auth::class
+    ];
+    /**
+     * @var array 解析哪些注解(属性级)
+     */
+    protected $propertyAnnotations = [
+        Auth::class
+    ]
+    ;
+    /**
+     * @var array 解析哪些注解(方法级)
+     */
+    protected $methodAnnotations = [
+        Auth::class
+    ];
+    /**
+     * 是否解析类注解
+     * @param array $annotations
+     * @return bool
+     */
+    public function isParseClassAnnotations(array $annotations): bool
+    {
+        return true;
+    }
+    /**
+     * 是否解析属性注解
+     * @param array $annotations
+     * @return bool
+     */
+    public function isParsePropertyAnnotations(array $annotations): bool
+    {
+        return true;
+    }
+    /**
+     * 是否解析方法注解
+     * @param array $annotations
+     * @return bool
+     */
+    public function isParseMethodAnnotations(array $annotations): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file

src/Common/ClsLogger/LogHandler.php

@@ -49,7 +49,7 @@ class LogHandler extends AbstractProcessingHandler
      */
      */
     protected function write(array $records)
     protected function write(array $records)
     {
     {
-        $messageText = implode("<*|||*>", $records);
+        $messageText = implode(" __||__ ", $records);
 
 
         if($this->topicId == ClsLog::TOPICID_ERROR) {
         if($this->topicId == ClsLog::TOPICID_ERROR) {
             ClsLog::error($messageText);
             ClsLog::error($messageText);

src/Common/Config/.env.prod

+#线上环境公共配置项：

src/Common/Config/log-php.prod

+<?php
+/*
+ * This file is part of Swoft.
+ * (c) Swoft <group@swoft.org>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'clsErrorLogHandler' => [
+        'class'     => \Hdll\Services\Common\ClsLogger\LogHandler::class,
+        'topicId'   => \Hdll\Services\Common\ClsLogger\ClsLog::TOPICID_ERROR,
+        'formatter' => '${lineFormatter}',
+        'levels'    => [
+            \Swoft\Log\Logger::ERROR,
+            \Swoft\Log\Logger::WARNING,
+            \Swoft\Log\Logger::CRITICAL,
+        ],
+    ],
+    'clsNoticeLogHandler' => [
+        'class'     => \Hdll\Services\Common\ClsLogger\LogHandler::class,
+        'topicId'   => \Hdll\Services\Common\ClsLogger\ClsLog::TOPICID_NOTICE,
+        'formatter' => '${lineFormatter}',
+        'levels'    => [
+            \Swoft\Log\Logger::NOTICE,
+            \Swoft\Log\Logger::INFO,
+            \Swoft\Log\Logger::DEBUG,
+            \Swoft\Log\Logger::TRACE,
+        ],
+    ],
+    'logger' => [
+        'name'          => APP_NAME,
+        'enable'        => true,
+        'flushInterval' => 100,
+        'flushRequest'  => true,
+        'handlers'      => [
+            '${clsErrorLogHandler}',
+            '${clsNoticeLogHandler}',
+        ],
+    ],
+];

src/Common/Entity/CommonEntity.php

@@ -93,12 +93,17 @@ class CommonEntity extends Model
 
 
         //获取注解里的table
         //获取注解里的table
         $res = new \ReflectionClass(static::class);
         $res = new \ReflectionClass(static::class);
-        self::$commentString = $res->getDocComment();
-
-        if ( false !== strpos(self::$commentString,"{split}") &&  !App::$isInTest) {
+        $commentString = $res->getDocComment();
+
+        if (
+        (
+            false !== strpos($commentString,"{split}")
+            || false !== strpos($commentString,"@Split")
+        )
+            &&  !App::$isInTest) {
             $dbNum = self::getDbNum();
             $dbNum = self::getDbNum();
-            $tableName = self::getTableName().'_'.$dbNum;
-            self::setTableName($tableName);
+            $tableName = self::getTableName($commentString).'_'.$dbNum;
+            //self::setTableName($tableName);
 
 
             return $tableName;
             return $tableName;
         } else {
         } else {
@@ -143,9 +148,10 @@ class CommonEntity extends Model
      * 获取原始表名
      * 获取原始表名
      * @return string
      * @return string
      */
      */
-    protected static function getTableName()
+    protected static function getTableName($commentString = '')
     {
     {
-        preg_match('/(?<=Table\(name=").*(?="\))/', self::$commentString, $matches);
+        $commentString = $commentString === ''?self::$commentString:$commentString;
+        preg_match('/(?<=Table\(name=").*(?="\))/', $commentString, $matches);
         return $tableName = isset($matches[0])?$matches[0]:'';
         return $tableName = isset($matches[0])?$matches[0]:'';
     }
     }
 }
 }
\ No newline at end of file