优化语言标识获取判断

Author: karsonzhang

composer.json

@@ -3,7 +3,7 @@
     "description": "addons package for fastadmin",
     "homepage": "https://github.com/karsonzhang/fastadmin-addons",
     "license": "Apache-2.0",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "authors": [
         {
             "name": "Karson",

src/addons/Controller.php

@@ -106,9 +106,12 @@ protected function _initialize()
         $config = get_addon_config($this->addon);
         $this->view->assign("config", $config);
 
+        $lang = $this->request->langset();
+        $lang = preg_match("/^([a-zA-Z\-_]{2,10})\$/i", $lang) ? $lang : 'zh-cn';
+
         // 加载系统语言包
         Lang::load([
-            ADDON_PATH . $this->addon . DS . 'lang' . DS . $this->request->langset() . EXT,
+            ADDON_PATH . $this->addon . DS . 'lang' . DS . $lang . EXT,
         ]);
 
         // 设置替换字符串

src/addons/Service.php

@@ -89,15 +89,15 @@ public static function download($name, $extend = [])
                 }
             }
         } catch (TransferException $e) {
-            throw new Exception(config('app_debug') ? $e->getMessage() : "Addon package download failed");
+            throw new Exception("Addon package download failed");
         }
 
         if ($write = fopen($tmpFile, 'w')) {
             fwrite($write, $content);
             fclose($write);
             return $tmpFile;
         }
-        throw new Exception(config('app_debug') && isset($content) ? $content : "No permission to write temporary files");
+        throw new Exception("No permission to write temporary files");
     }
 
     /**
@@ -121,7 +121,7 @@ public static function unzip($name)
             $zip->openFile($file);
         } catch (ZipException $e) {
             $zip->close();
-            throw new Exception(config('app_debug') ? $e->getMessage() : 'Unable to open the zip file');
+            throw new Exception('Unable to open the zip file');
         }
 
         $dir = self::getAddonDir($name);
@@ -133,7 +133,7 @@ public static function unzip($name)
         try {
             $zip->extractTo($dir);
         } catch (ZipException $e) {
-            throw new Exception(config('app_debug') ? $e->getMessage() : 'Unable to extract the file');
+            throw new Exception('Unable to extract the file');
         } finally {
             $zip->close();
         }
@@ -1121,9 +1121,9 @@ public static function sendRequest($url, $params = [], $method = 'POST')
             $content = $body->getContents();
             $json = (array)json_decode($content, true);
         } catch (TransferException $e) {
-            throw new Exception(config('app_debug') ? $e->getMessage() : __('Network error'));
+            throw new Exception(__('Network error'));
         } catch (\Exception $e) {
-            throw new Exception(config('app_debug') ? $e->getMessage() : __('Unknown data format'));
+            throw new Exception(__('Unknown data format'));
         }
         return $json;
     }