diff --git a/.env b/.env index aceaf0b..5a3ac38 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -APP_DEBUG=true admin_pannel_address="http://hphb-protal.uzchain.tech" upload_directory="./upload" page_count=2 [APP] DEFAULT_TIMEZONE=Asia/Shanghai [DATABASE] TYPE=mysql HOSTNAME=192.168.0.100 DATABASE=protal USERNAME=protal PASSWORD=12345654321 HOSTPORT=3306 CHARSET=utf8 DEBUG=true PREFIX=fa_ [LANG] default_lang=zh-cn [aliyunsms] accessKeyId=LTAI5t6oEsk1iPSXenJfDAxY accesskey=tvbeWgGITSWFaen2OAoolITz3t6UWR regionid=cn-hangzhou signName=域展科技 TemplateCode=SMS_176560077 oss_bucket=hphb-storage oss_endpoint=oss-cn-beijing.aliyuncs.com \ No newline at end of file +APP_DEBUG=true ADMIN_PANNEL_ADDRESS="http://hphb-protal.uzchain.tech" UPLOAD_DIRECTORY="./upload" PAGE_COUNT=2 [APP] DEFAULT_TIMEZONE=Asia/Shanghai [DATABASE] TYPE=mysql HOSTNAME=192.168.0.100 DATABASE=protal USERNAME=protal PASSWORD=12345654321 HOSTPORT=3306 CHARSET=utf8 DEBUG=true PREFIX=fa_ [LANG] DEFAULT_LANG=zh-cn [ALIYUNSMS] ACCESSKEYID=LTAI5t6oEsk1iPSXenJfDAxY ACCESSKEY=tvbeWgGITSWFaen2OAoolITz3t6UWR REGIONID=cn-hangzhou SIGNNAME=域展科技 TEMPLATECODE=SMS_176560077 OSS_BUCKET=hphb-storage OSS_ENDPOINT=oss-cn-beijing.aliyuncs.com \ No newline at end of file diff --git a/app/common.php b/app/common.php index d66363a..d89c01a 100644 --- a/app/common.php +++ b/app/common.php @@ -161,9 +161,9 @@ use OSS\OssClient; if (!function_exists('aliyun')) { function aliyun($savePath, $category = '', $isunlink = false, $bucket = "hphb-storage") { - $accessKeyId = env('aliyunsms.accessKeyId');//去阿里云后台获取秘钥 - $accessKeySecret = env('aliyunsms.accesskey');//去阿里云后台获取秘钥 - $endpoint = env('aliyunsms.oss_endpoint');//你的阿里云OSS地址 + $accessKeyId = env('ALIYUNSMS.accessKeyId');//去阿里云后台获取秘钥 + $accessKeySecret = env('ALIYUNSMS.accesskey');//去阿里云后台获取秘钥 + $endpoint = env('ALIYUNSMS.oss_endpoint');//你的阿里云OSS地址 $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint); // 判断bucketname是否存在，不存在就去创建 if (!$ossClient->doesBucketExist($bucket)) { @@ -172,7 +172,7 @@ if (!function_exists('aliyun')) { $category = empty($category) ? $bucket : $category; $savePath = str_replace("\\", "/", $savePath); $object = '/' . $savePath;//想要保存文件的名称 - $file = env("upload_directory").'\\' . $savePath;//文件路径，必须是本地的。 + $file = env("UPLOAD_DIRECTORY").'\\' . $savePath;//文件路径，必须是本地的。 try { echo 'bc'; @@ -185,7 +185,7 @@ if (!function_exists('aliyun')) { } catch (OssException $e) { echo $e->getErrorMessage(); } - $web = "https://hphb-storage.".env('aliyunsms.oss_endpoint').'/'.$object;//这里是你阿里云oss外网访问的Bucket域名 + $web = "https://hphb-storage.".env('ALIYUNSMS.oss_endpoint').'/'.$object;//这里是你阿里云oss外网访问的Bucket域名 return $web; } } @@ -194,13 +194,13 @@ if (!function_exists('aliyun')) { function aliyun($localfile = '', $path = '') { $config = [ - 'access' => env('aliyunsms.accessKeyId'), - 'access_key' => env('aliyunsms.accesskey'), + 'access' => env('ALIYUNSMS.ACCESSKEYID'), + 'access_key' => env('ALIYUNSMS.ACCESSKEY'), 'bucket' => 'hphb-storage', 'url' => 'https://oss-cn-beijing.aliyuncs.com' ]; $path = "r/".$localfile; - $localfile = env("upload_directory").'/' . $localfile;//文件路径，必须是本地的。 + $localfile = env("UPLOAD_DIRECTORY").'/' . $localfile;//文件路径，必须是本地的。 if (!file_exists($localfile)) { return ('Not found file'); } @@ -255,7 +255,7 @@ function StudentToArray($list = []) : array { "age"=>$vo['age'], ]; } - if(count($list)where("student_id",$student_id)->limit(env("page_count"))->order('count desc')->paginate([ - "list_rows"=>env("page_count"), + "list_rows"=>env("PAGE_COUNT"), "page"=>$lastIndex ]); diff --git a/app/controller/Ranking.php b/app/controller/Ranking.php index 946d905..ea8ab3c 100644 --- a/app/controller/Ranking.php +++ b/app/controller/Ranking.php @@ -30,7 +30,7 @@ class Ranking } $result = []; $list = Db::name("student")->where($where)->limit(env("page_count"))->order('hot desc')->paginate([ - "list_rows"=>env("page_count"), + "list_rows"=>env("PAGE_COUNT"), "page"=>$lastIndex ]); diff --git a/app/controller/Sign.php b/app/controller/Sign.php index d28c1e5..d3a466f 100644 --- a/app/controller/Sign.php +++ b/app/controller/Sign.php @@ -32,7 +32,7 @@ class Sign "identifier"=>$info['identifier'], "nickname"=>$info['nickname'], "mobile"=>$info['mobile'], - "avatar"=> env("admin_pannel_address") . $info['avatar'], + "avatar"=> env("ADMIN_PANNEL_ADDRESS") . $info['avatar'], "gender"=>$info['gender'], "birthday"=>$info['birthday'], "age"=>$info['age'], @@ -59,7 +59,7 @@ class Sign "identifier"=>$info['identifier'], "nickname"=>$info['nickname'], "mobile"=>$info['mobile'], - "avatar"=> env("admin_pannel_address") . $info['avatar'], + "avatar"=> env("ADMIN_PANNEL_ADDRESS") . $info['avatar'], "gender"=>$info['gender'], "birthday"=>$info['birthday'], "age"=>$info['age'], diff --git a/app/controller/Student.php b/app/controller/Student.php index fba8939..48df7ea 100644 --- a/app/controller/Student.php +++ b/app/controller/Student.php @@ -28,7 +28,7 @@ class Student } $result = []; $list = Db::name("student")->where($where)->limit(env("page_count"))->order('hot desc')->paginate([ - "list_rows"=>env("page_count"), + "list_rows"=>env("PAGE_COUNT"), "page"=>$lastIndex ]); diff --git a/app/controller/Upload.php b/app/controller/Upload.php index 494d00d..54379ea 100644 --- a/app/controller/Upload.php +++ b/app/controller/Upload.php @@ -14,7 +14,7 @@ class Upload return show("请选择图片！"); } $file = $GLOBALS['data']['file']; - $dir = env('upload_directory'); + $dir = env('UPLOAD_DIRECTORY'); if(!is_dir($dir)){ mkdir($dir, 0777, true); } diff --git a/app/tools/Sms.php b/app/tools/Sms.php index ee7471c..54134fb 100644 --- a/app/tools/Sms.php +++ b/app/tools/Sms.php @@ -21,14 +21,14 @@ class Sms */ public static function sendmsg($number, $code, $signName='', $template='') { - if(empty($signName)) $signName = env('aliyunsms.signName'); - if(empty($template)) $template = env('aliyunsms.TemplateCode'); + if(empty($signName)) $signName = env('ALIYUNSMS.SIGNNAME'); + if(empty($template)) $template = env('ALIYUNSMS.TEMPLATECODE'); if (intval($number) == 0 || $code == "" || $signName == "" || $template == "") { return ['code' => 0, 'message' => '参数不全']; } - AlibabaCloud::accessKeyClient(env('aliyunsms.accessKeyId'), env('aliyunsms.accesskey')) - ->regionId(env('aliyunsms.regionid')) + AlibabaCloud::accessKeyClient(env('ALIYUNSMS.ACCESSKEYID'), env('aliyunsms.accesskey')) + ->regionId(env('ALIYUNSMS.REGIONID')) ->asDefaultClient(); try { $result = AlibabaCloud::rpc() @@ -39,7 +39,7 @@ class Sms ->host('dysmsapi.aliyuncs.com') ->options([ 'query' => [ - 'RegionId' => env('aliyunsms.regionid'), + 'RegionId' => env('ALIYUNSMS.REGIONID'), 'PhoneNumbers' => $number, 'SignName' => $signName, 'TemplateCode' => $template, @@ -99,7 +99,7 @@ class Sms if ($token == '') { return ['code' => 0, 'message' => '参数不全']; } - AlibabaCloud::accessKeyClient(env('aliyunsms.accessKeyId'), env('aliyunsms.accesskey')) + AlibabaCloud::accessKeyClient(env('ALIYUNSMS.ACCESSKEYID'), env('ALIYUNSMS.ACCESSKEY')) ->regionId('cn-hangzhou') ->asDefaultClient(); try { diff --git a/config/lang.php b/config/lang.php index 59f320f..1d8d258 100644 --- a/config/lang.php +++ b/config/lang.php @@ -5,7 +5,7 @@ return [ // 默认语言 - 'default_lang' => env('lang.default_lang', 'zh-cn'), + 'default_lang' => env('lang.DEFAULT_LANG', 'zh-cn'), // 允许的语言列表 'allow_lang_list' => [], // 多语言自动侦测变量名