语言包传参修改

.gitignore

@@ -5,4 +5,4 @@
 /public/nginx.htaccess
 /runtime/*
 /public/uploads/*
-hitpay
+

application/api/controller/User.php

@@ -98,7 +98,7 @@ class User extends Api
             $ret = $this->auth->direct($user->id);
         } else {
             //$ret = $this->auth->register('', '', '', $mobile, []);
-            $this->error('Account is incorrect');
+            $this->error(__('Account is incorrect'));
         }
         if ($ret) {
             Sms::flush($mobile, 'mobilelogin');

application/common/controller/Api.php

@@ -166,7 +166,8 @@ class Api
     {
         $name = Loader::parseName($name);
         $name = preg_match("/^([a-zA-Z0-9_\.\/]+)\$/i", $name) ? $name : 'index';
-        $lang = $this->request->langset();
+        //$lang = $this->request->langset();
+        $lang = $this->lang;
         $lang = preg_match("/^([a-zA-Z\-_]{2,10})\$/i", $lang) ? $lang : 'zh-cn';
         Lang::load(APP_PATH . $this->request->module() . '/lang/' . $lang . '/' . str_replace('.', '/', $name) . '.php');
     }
@@ -188,7 +189,7 @@ class Api
         }
         foreach($data as $key => $val){
             if(in_array($key,$field)){
-                if($this->lang == 'EN'){
+                if($this->lang == 'en'){
                     $data[$key] = $data[$key.'_en'];
                     unset($data[$key.'_en']);
                 }else{

application/common/controller/Apic.php

@@ -159,7 +159,8 @@ class Apic
     {
         $name = Loader::parseName($name);
         $name = preg_match("/^([a-zA-Z0-9_\.\/]+)\$/i", $name) ? $name : 'index';
-        $lang = $this->request->langset();
+        //$lang = $this->request->langset();
+        $lang = $this->lang;
         $lang = preg_match("/^([a-zA-Z\-_]{2,10})\$/i", $lang) ? $lang : 'zh-cn';
         Lang::load(APP_PATH . $this->request->module() . '/lang/' . $lang . '/' . str_replace('.', '/', $name) . '.php');
     }
@@ -181,7 +182,7 @@ class Apic
         }
         foreach($data as $key => $val){
             if(in_array($key,$field)){
-                if($this->lang == 'EN'){
+                if($this->lang == 'en'){
                     $data[$key] = $data[$key.'_en'];
                     unset($data[$key.'_en']);
                 }else{