合并分支 'master-server' 到 'master'

Master server



查看合并请求 !705

@@ -276,4 +276,17 @@ class ExtensionModuleController extends BaseController
         ];
         ];
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
+    /**
+     * @remark :设置排序
+     * @name   :setSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/22 17:27
+     */
+    public function setSort(){
+        $moduleFieldModel = new ExtensionModuleField();
+        $moduleFieldModel->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        $this->response('success');
+    }
 }
 }

@@ -94,7 +94,8 @@ class CustomModuleContentLogic extends BaseLogic
         }elseif($v['type'] == 4){
         }elseif($v['type'] == 4){
             $arr1 = json_decode($info['values']);
             $arr1 = json_decode($info['values']);
             foreach ($arr1 as $k1=>$v1){
             foreach ($arr1 as $k1=>$v1){
-                $v1 = getFileUrl($v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn'] ?? 0);
+                $v1 = (array)$v1;
+                $v1['url'] = getFileUrl($v1['url'] ?? $v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn'] ?? 0);
                 $arr1[$k1] = $v1;
                 $arr1[$k1] = $v1;
             }
             }
             $v['values'] = $arr1;
             $v['values'] = $arr1;
@@ -306,7 +307,7 @@ class CustomModuleContentLogic extends BaseLogic
             $v['values'] = json_encode($v['values']);
             $v['values'] = json_encode($v['values']);
         }elseif ($v['type'] == 4){
         }elseif ($v['type'] == 4){
             foreach ($v['values'] as $k1=>$v1){
             foreach ($v['values'] as $k1=>$v1){
-                $v1 = str_replace_url($v1);
+                $v1['url'] = str_replace_url($v1['url']);
                 $v['values'][$k1] = $v1;
                 $v['values'][$k1] = $v1;
             }
             }
             $v['values'] = json_encode($v['values']);
             $v['values'] = json_encode($v['values']);

@@ -274,15 +274,15 @@ class CosService
      */
      */
     public function getPosition(){
     public function getPosition(){
         return [
         return [
-            1=>'gravity/northWest',
-            2=>'gravity/north',
-            3=>'gravity/northEast',
-            4=>'gravity/west',
-            5=>'gravity/center',
-            6=>'gravity/east',
-            7=>'gravity/southWest',
-            8=>'gravity/south',
-            9=>'gravity/southEast',
+            1=>'northWest',
+            2=>'north',
+            3=>'northEast',
+            4=>'west',
+            5=>'center',
+            6=>'east',
+            7=>'southWest',
+            8=>'south',
+            9=>'southEast',
         ];
         ];
     }
     }
 
 

@@ -585,6 +585,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/editModuleValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'editModuleValue'])->name('extension_module_editModuleValue');
         Route::any('/editModuleValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'editModuleValue'])->name('extension_module_editModuleValue');
         Route::any('/sendUniqueStr', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'sendUniqueStr'])->name('extension_module_sendUniqueStr');
         Route::any('/sendUniqueStr', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'sendUniqueStr'])->name('extension_module_sendUniqueStr');
         Route::any('/getFieldType', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'getFieldType'])->name('extension_module_getFieldType');
         Route::any('/getFieldType', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'getFieldType'])->name('extension_module_getFieldType');
+        Route::any('/setSort', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSort'])->name('extension_module_setSort');
     });
     });
 
 
     //自定义小语种文本信息
     //自定义小语种文本信息