From 43e0ac19bbd05929534658d0accbe6af5fb443d1 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Thu, 27 Dec 2018 15:03:05 +0800
Subject: [PATCH 1/3] add png handle

---
 application/controllers/info_amp.php | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index c1fd3f2c..869847f6 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -329,4 +329,35 @@ class Info_amp extends CI_Controller
             ));
         }
     }
+
+    public function handel_png_source() {
+        $png_base64 = $this->input->post('png_base64');
+        //$png_base64 = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABlBMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDrEX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';
+        $file = md5($png_base64).'.jpg';
+        $path = realpath('../cht-system/views/from_word').'/'.$file;
+        $png_base64 = str_replace('data:image/png;base64,', '', $png_base64);
+        $png_base64 = str_replace('data:image/jpg;base64,', '', $png_base64);
+        $png_base64 = base64_decode($png_base64);
+        $im = imagecreatefromstring($png_base64);
+        //保存图像
+        imagejpeg($im, $path);
+        //释放内存
+        imagedestroy($im);
+        $size = getimagesize($path);
+        if($png_base64) {
+            echo(json_encode(array(
+                'status' => 'success',
+                'path' => '/information-view/from_word/'.$file,
+                'width' => $size[0],
+                'height' => $size[1]
+            )));
+        } else {
+            echo(json_encode(array(
+                'status' => 'error',
+                'width' => 0,
+                'height' => 0
+            )));
+        }
+    }
+    
 }

From 568c03eb8ceb32d934730d4861e1069fdb6c5921 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Thu, 27 Dec 2018 15:05:11 +0800
Subject: [PATCH 2/3] add png handle 2

---
 application/controllers/info_amp.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 869847f6..d17bcc0e 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -344,7 +344,7 @@ class Info_amp extends CI_Controller
         //释放内存
         imagedestroy($im);
         $size = getimagesize($path);
-        if($png_base64) {
+        if($png_base64 && $size) {
             echo(json_encode(array(
                 'status' => 'success',
                 'path' => '/information-view/from_word/'.$file,
@@ -353,9 +353,7 @@ class Info_amp extends CI_Controller
             )));
         } else {
             echo(json_encode(array(
-                'status' => 'error',
-                'width' => 0,
-                'height' => 0
+                'status' => 'error'
             )));
         }
     }

From b732fe9fc1feefca6dd7cf95a85e0e6662a6c4b2 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Thu, 27 Dec 2018 15:08:24 +0800
Subject: [PATCH 3/3] add png handle 3

---
 application/controllers/info_amp.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index d17bcc0e..f9683ce0 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -334,7 +334,7 @@ class Info_amp extends CI_Controller
         $png_base64 = $this->input->post('png_base64');
         //$png_base64 = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABlBMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDrEX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';
         $file = md5($png_base64).'.jpg';
-        $path = realpath('../cht-system/views/from_word').'/'.$file;
+        $path = realpath('../cht-system/views/information/word_img').'/'.$file;
         $png_base64 = str_replace('data:image/png;base64,', '', $png_base64);
         $png_base64 = str_replace('data:image/jpg;base64,', '', $png_base64);
         $png_base64 = base64_decode($png_base64);
@@ -347,7 +347,7 @@ class Info_amp extends CI_Controller
         if($png_base64 && $size) {
             echo(json_encode(array(
                 'status' => 'success',
-                'path' => '/information-view/from_word/'.$file,
+                'path' => '/information-view/information/word_img/'.$file,
                 'width' => $size[0],
                 'height' => $size[1]
             )));