diff --git a/app/controller/UserController.php b/app/controller/UserController.php index 4e7b4c8..97cf223 100644 --- a/app/controller/UserController.php +++ b/app/controller/UserController.php @@ -181,7 +181,7 @@ class UserController if ($code != $verification_code) { return Util::fail([], trans('code_error')); } - if(strlen($password) < 6) { + if(strlen($password) < 8) { return Util::fail([], trans('password_short')); } diff --git a/app/service/OssService.php b/app/service/OssService.php index 5e73783..9edc4a7 100644 --- a/app/service/OssService.php +++ b/app/service/OssService.php @@ -15,10 +15,10 @@ class OssService public function __construct() { - $this->accessKeyId = 'LTAI5tAGiH7bkVkmrniXnfkA'; - $this->accessKeySecret = 'nqklJBft6t3S0A4ZvxF4ci9ni91kmm'; - $this->bucket = 'vehicle-album'; - $this->endpoint = 'https://oss-cn-beijing.aliyuncs.com'; + $this->accessKeyId = getenv('OSS_ACCESSID'); + $this->accessKeySecret = getenv('OSS_ACCESSSECRET'); + $this->bucket = getenv('OSS_BUCKET'); + $this->endpoint = getenv('OSS_ENDPOINT'); $this->ossClient = new OssClient($this->accessKeyId, $this->accessKeySecret, $this->endpoint); } diff --git a/config/plugin/shopwwi/filesystem/app.php b/config/plugin/shopwwi/filesystem/app.php index 460a362..c217675 100644 --- a/config/plugin/shopwwi/filesystem/app.php +++ b/config/plugin/shopwwi/filesystem/app.php @@ -70,10 +70,10 @@ return [ // 'endpoint' => 'OSS_ENDPOINT', // 'url' => '', // 静态文件访问域名 - 'accessKey' => 'LTAI5tAGiH7bkVkmrniXnfkA', - 'secretKey' => 'nqklJBft6t3S0A4ZvxF4ci9ni91kmm', - 'bucket' => 'vehicle-album', - 'endpoint' => 'https://oss-cn-beijing.aliyuncs.com', + 'accessKey' => getenv('OSS_ACCESSID'), + 'secretKey' => getenv('OSS_ACCESSSECRET'), + 'bucket' => getenv('OSS_BUCKET'), + 'endpoint' => getenv('OSS_ENDPOINT'), 'url' => '', // 静态文件访问域名 // 'timeout' => 3600, // 'connectTimeout' => 10, diff --git a/resource/translations/en/messages.php b/resource/translations/en/messages.php index 21bb0ff..1380f46 100644 --- a/resource/translations/en/messages.php +++ b/resource/translations/en/messages.php @@ -28,7 +28,7 @@ return [ 'channel_not_null' => ' channel not null', 'email_consistent' => ' Inconsistent email addresses', 'sign_not_null' => ' No affiliated company has been set', - 'password_short' => ' Password cannot be less than 6 characters', + 'password_short' => ' Password cannot be less than 8 characters', 'id_empty' => ' ID cannot be empty', 'customer_id' => ' customer ID', 'tag_group_id' => ' tag group ID', diff --git a/resource/translations/ru/messages.php b/resource/translations/ru/messages.php index 67617df..986eead 100644 --- a/resource/translations/ru/messages.php +++ b/resource/translations/ru/messages.php @@ -28,7 +28,7 @@ return [ 'channel_not_null' => ' Каналы не могут быть пустыми', 'email_consistent' => ' Почтовый ящик не совпадает', 'sign_not_null' => ' Компания не создана', - 'password_short' => ' Пароль не может быть меньше 6.', + 'password_short' => ' Пароль не может быть меньше 8.', 'id_empty' => ' ID не может быть пустым', 'customer_id' => ' Идентификатор клиента', 'tag_group_id' => ' Идентификатор группы меток', diff --git a/resource/translations/zh_CN/messages.php b/resource/translations/zh_CN/messages.php index 98cdfcb..d129203 100644 --- a/resource/translations/zh_CN/messages.php +++ b/resource/translations/zh_CN/messages.php @@ -28,7 +28,7 @@ return [ 'channel_not_null' => ' 渠道不能为空', 'email_consistent' => ' 邮箱不一致', 'sign_not_null' => ' 未设置所属公司', - 'password_short' => ' 密码不能少于6位', + 'password_short' => ' 密码不能少于8位', 'id_empty' => ' id不能为空', 'customer_id' => ' 客户ID', 'tag_group_id' => ' 标签组ID',