去掉属性器定义 避免和关联定义冲突

Author: liu21st

src/model/concern/Attribute.php

@@ -471,9 +471,7 @@ private function setWithAttr(string $name, $value, array $data = [])
     {
         $attr   = Str::studly($name);
         $method = 'set' . $attr . 'Attr';
-        if (method_exists($this, $attr) && $set = $this->$attr()['set'] ?? '') {
-            $value = $set($value, $data);
-        } elseif (method_exists($this, $method)) {
+        if (method_exists($this, $method)) {
             $value = $this->$method($value, $data);
         } else {
             // 类型转换
@@ -571,9 +569,6 @@ private function getWithAttr(string $name, $value, array $data = [])
         if ($withAttr) {
             // 动态获取器
             $value = $withAttr($value, $data, $this);
-        } elseif (method_exists($this, $attr) && $get = $this->$attr()['get'] ?? '') {
-            // 属性器
-            $value = $get($value, $data);
         } elseif (method_exists($this, $method)) {
             // 获取器
             $value = $this->$method($value, $data);

src/model/concern/OptimLock.php

@@ -22,7 +22,7 @@ trait OptimLock
 {
     protected function getOptimLockField()
     {
-        return $this->getOption('optim_lock_field') ?? 'lock_version';
+        return $this->getOption('optimLock') ?? 'lock_version';
     }
 
     /**