Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Our/Common.php

@@ -188,7 +188,7 @@ class Common
                         break;
                     default:
                         foreach ($files as $f) {
-                            $output = $staticUrl . '/' .$directory . $f;
+                            $output = $staticUrl . '/' .$directory . $f.\Our\NameConst::jpgSuffix;
                         }
                         break;
                 }

application/library/Our/ImageUtil.php

@@ -100,6 +100,10 @@ class ImageUtil {
         if (is_null($ossClient)) {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::ossServerSetError);
         }
+
+        if(strpos($uploadImageName,\Our\NameConst::dot)===false){
+            $uploadImageName = $uploadImageName.\Our\NameConst::jpgSuffix;
+        }
         $ossUploadFilePath = $path.$uploadImageName;
         //return $ossUploadFilePath;
         $return = $ossClient->uploadFile($bucketName, $ossUploadFilePath, $filePath);