Merge branch 'user-rpc'

src/Constants/MaterialCategory.php

@@ -16,6 +16,9 @@ class MaterialCategory
     const LI_BU = 3; // 里布
     const HAO_CAI = 4; // 耗材
 
+    const FU_LIAO_WAREHOUSE = 33;
+    const MIAN_LIAO_WAREHOUSE = 36;
+
     /**
      * 通过原料类型获取对应仓库id
      * @param $categoryId
@@ -27,10 +30,10 @@ class MaterialCategory
         switch ($categoryId) {
             case self::FU_LIAO:
             case self::HAO_CAI:
-                return 33;
+                return self::FU_LIAO_WAREHOUSE;
             case self::MIAN_LIAO:
             case self::LI_BU:
-                return 36;
+                return self::MIAN_LIAO_WAREHOUSE;
             default:
                 throw new \Exception("原料类型不存在");
         }

src/functions.php

@@ -787,6 +787,7 @@ if (!function_exists('str_replace_first')) {
         return $subject;
     }
 }
+
 if (!function_exists('create_file_dir')) {
     /**
      * 检查当前目录是否存在 不存在就创建一个目录
@@ -799,3 +800,17 @@ if (!function_exists('create_file_dir')) {
         return !is_dir($dir) && mkdir($dir, 0777, true);
     }
 }
+
+if (!function_exists('get_images_url')) {
+
+    /**
+     * 富文本获取图片信息
+     * @param $str
+     * @return mixed
+     */
+    function get_images_url($str)
+    {
+        preg_match('/<img.+src=\"?(.+\.(jpg|gif|bmp|bnp|png))\"?.+>/i',$str,$match);
+        return $match;
+    }
+}
\ No newline at end of file