diff --git a/GiiJsonRpc.php b/GiiJsonRpc.php index fc4ceee..ff718c8 100644 --- a/GiiJsonRpc.php +++ b/GiiJsonRpc.php @@ -51,14 +51,12 @@ interface ' . ucfirst($name) . 'RpcInterface namespace Rpc\Producers; -use Kiri\Annotation\Target; use Kiri\Annotation\Mapping; use Rpc\\' . ucfirst($name) . 'RpcInterface; use Exception; use Kiri\Rpc\JsonRpcConsumers; -#[Target] #[Mapping(' . ucfirst($name) . 'RpcInterface::class)] class ' . ucfirst($name) . 'RpcService extends JsonRpcConsumers implements ' . ucfirst($name) . 'RpcInterface { @@ -86,13 +84,11 @@ class ' . ucfirst($name) . 'RpcService extends JsonRpcConsumers implements ' . u namespace Rpc\Consumers; -use Kiri\Annotation\Target; use Kiri\Rpc\Annotation\JsonRpc; use Kiri\Message\Handler\Controller; use Rpc\\' . ucfirst($name) . 'RpcInterface; -#[Target] #[JsonRpc(service: \'' . $name . '\', version: \'2.0\')] class ' . ucfirst($name) . 'RpcConsumer extends Controller implements ' . ucfirst($name) . 'RpcInterface { diff --git a/GiiModel.php b/GiiModel.php index 094527a..bea4c1a 100644 --- a/GiiModel.php +++ b/GiiModel.php @@ -77,7 +77,6 @@ namespace ' . $namespace . '; use Exception; -use Kiri\Annotation\Target; use Kiri\Core\Json; use Database\Connection; use Database\Model; @@ -98,7 +97,7 @@ use Database\Model; * *' . implode('', $this->visible) . ' */ -#[Target] class ' . $managerName . ' extends Model +class ' . $managerName . ' extends Model { '; diff --git a/GiiRpcClient.php b/GiiRpcClient.php index dc4892f..3129024 100644 --- a/GiiRpcClient.php +++ b/GiiRpcClient.php @@ -39,7 +39,6 @@ namespace App\Client\Rpc; use Kiri\Annotation\Rpc\Consumer; use Kiri\Annotation\Rpc\RpcClient; -use Kiri\Annotation\Target; use Exception; use Rpc\Client; use Kiri\Core\Json; @@ -53,7 +52,6 @@ use Kiri; * Class ' . $managerName . 'Consumer * @package App\Client\Rpc */ -#[Target] #[RpcClient(cmd: \'' . $service . '\', port: ' . $port . ', timeout: 1, mode: ' . $mode . ')] class ' . $managerName . 'Consumer extends \Rpc\Consumer { diff --git a/GiiRpcService.php b/GiiRpcService.php index 7ce27fb..a9a80d0 100644 --- a/GiiRpcService.php +++ b/GiiRpcService.php @@ -35,7 +35,6 @@ class GiiRpcService extends GiiBase namespace App\Rpc; use Kiri\Annotation\Route\RpcProducer; -use Kiri\Annotation\Target; use Exception; use Kiri\Message\Controller; use Kiri\Core\Json; @@ -48,7 +47,6 @@ use Kiri\Core\Json; * Class ' . $managerName . 'Consumer * @package App\Client\Rpc */ -#[Target] class ' . $managerName . 'Producer extends Controller {