gx

@@ -426,6 +426,10 @@ if (!function_exists('getImageUrl')) {
             }
             }
         }else{
         }else{
             $imageModel = new Image();
             $imageModel = new Image();
+            if (strpos($hash, '.') !== false) {
+                $info = $imageModel->read(['path'=>['like','%'.$hash.'%']]);
+                $hash = $info['hash'];
+            }
             $info = $imageModel->read(['hash'=>$hash]);
             $info = $imageModel->read(['hash'=>$hash]);
             if(!empty($info)){
             if(!empty($info)){
                 if($info['is_cos'] == 1){
                 if($info['is_cos'] == 1){

@@ -171,7 +171,15 @@ class LoginController extends BaseController
         $data = $this->wechatLogin($message->FromUserName);
         $data = $this->wechatLogin($message->FromUserName);
         $socket = new Socket();
         $socket = new Socket();
         $socket->socket(json_encode($data));
         $socket->socket(json_encode($data));
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($message, true) . PHP_EOL, FILE_APPEND);
+        $arr = [
+            'ToUserName' => 'gh_27174ac5c9d8',
+            'FromUserName' => 'oMbcI6gRzvfrU8ssGsEyvzXOO94w',
+            'CreateTime' => '1693385898',
+            'MsgType' => 'event',
+            'Event' => 'subscribe',
+            'EventKey' => 'qrscene_global-v6_v6',
+            'Ticket' => 'gQF27zwAAAAAAAAAAS5odHRwOi8vd2VpeGluLnFxLmNvbS9xLzAyWnppdHhWTlRjOEcxTlBpTE5BY2IAAgRjBO9kAwQQDgAA',
+        ];
         return "<xml>
         return "<xml>
                 <ToUserName><![CDATA[$message->FromUserName]]></ToUserName>
                 <ToUserName><![CDATA[$message->FromUserName]]></ToUserName>
                 <FromUserName><![CDATA[$message->ToUserName]]></FromUserName>
                 <FromUserName><![CDATA[$message->ToUserName]]></FromUserName>
@@ -253,7 +261,9 @@ class LoginController extends BaseController
             'code'=>Code::USER_LOGIN_ERROE,
             'code'=>Code::USER_LOGIN_ERROE,
             'message'=>'当前用户未绑定账户，请绑定后',
             'message'=>'当前用户未绑定账户，请绑定后',
         ];
         ];
-        $socket = new Socket();
-        return $socket->socket(json_encode($data));
+        $webSocket = new Socket();
+        $webSocket->send('hello');
+        $response = $webSocket->receive();
+        $webSocket->close();
     }
     }
 }
 }

@@ -3,9 +3,8 @@
 namespace App\Http\Logic\Aside\Template;
 namespace App\Http\Logic\Aside\Template;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\File\Image;
 use App\Models\Template\TemplateModule;
 use App\Models\Template\TemplateModule;
-use App\Models\Template\BSetting;
-use App\Models\Template\TemplateType;
 
 
 /**
 /**
  * @remark :左侧模块管理
  * @remark :左侧模块管理
@@ -65,12 +64,12 @@ class ATemplateModuleLogic extends BaseLogic
      */
      */
     public function setAttribute($param){
     public function setAttribute($param){
         if(isset($param['image']) && !empty($param['image'])){
         if(isset($param['image']) && !empty($param['image'])){
-            $param['image'] = basename($param['image']);
+            $param['image'] = $this->imageName(basename($param['image']));
         }
         }
         if(isset($param['images']) && !empty($param['images'])){
         if(isset($param['images']) && !empty($param['images'])){
             $arr_images = [];
             $arr_images = [];
             foreach ($param['images'] as $v){
             foreach ($param['images'] as $v){
-                $arr_images[] = basename($v);
+                $arr_images[] = $this->imageName(basename($v));;
             }
             }
             $param['images'] = implode(',',$arr_images);
             $param['images'] = implode(',',$arr_images);
         }
         }
@@ -115,5 +114,19 @@ class ATemplateModuleLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
-
+    /**
+     * @remark :如果是图片名称返回图片hash值
+     * @name   :imageName
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/31 11:49
+     */
+    public function imageName($string){
+        $imageModel = new Image();
+        if (strpos($string, '.') !== false) {
+            $info = $imageModel->read(['path'=>['like','%'.$string.'%']]);
+            $string = $info['hash'];
+        }
+        return $string;
+    }
 }
 }

@@ -44,6 +44,8 @@ class TemplateModule extends Base
         return $value;
         return $value;
     }
     }
 
 
+
+
     /**
     /**
      * @remark :写入器images
      * @remark :写入器images
      * @name   :setImageAttribute
      * @name   :setImageAttribute