gx

@@ -369,10 +369,30 @@ class ImageController extends Controller
         $settingInfo = $imageSettingModel->read(['project_id'=>$project_id]);
         $settingInfo = $imageSettingModel->read(['project_id'=>$project_id]);
         if($settingInfo !== false){
         if($settingInfo !== false){
             if($settingInfo['status'] == 1 && !empty($settingInfo['image_data'])){
             if($settingInfo['status'] == 1 && !empty($settingInfo['image_data'])){
-                $settingInfo['image_data'] = json_decode($settingInfo['image_data'],true);
+                $image_data = json_decode($settingInfo['image_data'],true);
+                foreach ($image_data as $k => $v){
+                    $arr = implode('/',$v);
+                    if ($arr[0] == 'image') {
+                        $arr[1] = urlSafeBase64Encode($arr[1]);
+                    }
+                    $image_data[$k] = $v;
+                }
             }
             }
             if($settingInfo['status'] == 2 && !empty($settingInfo['str_data'])){
             if($settingInfo['status'] == 2 && !empty($settingInfo['str_data'])){
-                $settingInfo['str_data'] = json_decode($settingInfo['str_data'],true);
+                $str_data = json_decode($settingInfo['str_data'],true);
+                foreach ($str_data as $k => $v){
+                    $arr = implode('/',$v);
+                    if ($arr[0] == 'text') {
+                        $arr[1] = urlSafeBase64Encode($arr[1]);
+                    }
+                    if ($arr[0] == 'font') {
+                        $arr[1] = urlSafeBase64Encode($arr[1]);
+                    }
+                    if ($arr[0] == 'fill') {
+                        $arr[1] = urlSafeBase64Encode($arr[1]);
+                    }
+                    $str_data[$k] = $arr;
+                }
             }
             }
         }
         }
         return null;
         return null;