xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
ylyg5690
2025-03-21 15:11:58 +08:00
parent 8b23f26dce
commit d8c5500b34
5 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/CustomerController.php
+2 -2
View File
@@ -222,7 +222,7 @@ class CustomerController
public function grade(Request $request)
{
$id = Util::getParam($request, 'id');
$id = Util::getParam($request, 'grade');
$grade = Util::getParam($request, 'grade');
if (Util::isEmpty($id)) {
return Util::fail('', 'id' . trans('not_null'));
}
@@ -230,7 +230,7 @@ class CustomerController
return Util::fail('', 'grade' . trans('not_null'));
}
$data = [
'grade' => Util::getParam($request, 'grade', 0),
'grade' => $grade,
];
$res = Customer::where('id', $id)
->update($data);
app/controller/UserController.php
+10 -4
View File
@@ -19,6 +19,7 @@ class UserController
public function login(Request $request)
{
$email = Util::getParam($request, 'email');
$language = Util::getParam($request, 'language');
if (Util::isEmpty($email)) {
return Util::fail([], 'email' . trans('not_null'));
}
@@ -26,6 +27,7 @@ class UserController
if (Util::isEmpty($password)) {
return Util::fail([], 'password' . trans('not_null'));
}
$user = User::select(['id', 'name', 'sex', 'role', 'avatar', 'email', 'password'])
->where('status', 0)
->where('email', $request->post('email'))
@@ -43,6 +45,7 @@ class UserController
//验证密码
// if (!password_verify($userPassword, $hashedPassword)) {
if ($userPassword == $hashedPassword) {
locale($language);
return Util::fail([], trans('password_error'));
}
$userId = $user['id']; // 实际从数据库获取
@@ -56,6 +59,12 @@ class UserController
unset($result['password']);
$result['token'] = $token;
if (Util::isEmpty($language)) {
User::where('id', $userId)
->update(['language' => $language]);
locale($language);
}
return Util::success($result, trans('login_success'));
}
@@ -163,11 +172,8 @@ class UserController
*/
public function language(Request $request)
{
$id = Util::getParam($request, 'id');
$id = $request->user['id'];
$language = Util::getParam($request, 'language');
if (Util::isEmpty($id)) {
return Util::fail([], 'id' . trans('not_null'));
}
if (Util::isEmpty($language)) {
return Util::fail([], 'language' . trans('not_null'));
}
composer.json
+1 -1
View File
@@ -37,7 +37,7 @@
"illuminate/database": "^11.44",
"phpmailer/phpmailer": "^6.9",
"shopwwi/webman-filesystem": "^2.0",
"iidestiny/flysystem-oss": "4",
"iidestiny/flysystem-oss": "^4",
"vlucas/phpdotenv": "^5.6"
},
"suggest": {
composer.lock
Generated
+12 -24
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "8d5fe425388a62621d55a80ee07c34e8",
"content-hash": "1a64bcf537bed214294c8043291f03f3",
"packages": [
{
"name": "aliyuncs/oss-sdk-php",
@@ -411,26 +411,20 @@
},
{
"name": "iidestiny/flysystem-oss",
"version": "4.0",
"version": "4.5",
"source": {
"type": "git",
"url": "https://github.com/iiDestiny/flysystem-oss.git",
"reference": "6b6cf6850be377c484c086505d942e61afa2875c"
"reference": "154ccb26075a20b350e2357289bfeabe3ca79ba0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/iiDestiny/flysystem-oss/zipball/6b6cf6850be377c484c086505d942e61afa2875c",
"reference": "6b6cf6850be377c484c086505d942e61afa2875c",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
"url": "https://api.github.com/repos/iiDestiny/flysystem-oss/zipball/154ccb26075a20b350e2357289bfeabe3ca79ba0",
"reference": "154ccb26075a20b350e2357289bfeabe3ca79ba0",
"shasum": ""
},
"require": {
"aliyuncs/oss-sdk-php": "^2.4",
"aliyuncs/oss-sdk-php": "^2",
"ext-curl": "*",
"ext-json": "*",
"ext-openssl": "*",
@@ -438,8 +432,8 @@
"php": "^8.0.2"
},
"require-dev": {
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^6.5",
"mockery/mockery": "^1.5",
"phpunit/phpunit": "^9.5",
"symfony/var-dumper": "^3.4"
},
"type": "library",
@@ -467,9 +461,9 @@
],
"support": {
"issues": "https://github.com/iiDestiny/flysystem-oss/issues",
"source": "https://github.com/iiDestiny/flysystem-oss/tree/4.0"
"source": "https://github.com/iiDestiny/flysystem-oss/tree/4.5"
},
"time": "2022-04-19T06:23:50+00:00"
"time": "2025-02-12T05:54:03+00:00"
},
{
"name": "illuminate/bus",
@@ -2025,13 +2019,7 @@
"type": "zip",
"url": "https://api.github.com/repos/shopwwi/webman-filesystem/zipball/de33afdbfc56678323f1aafb8d011d79378d164a",
"reference": "de33afdbfc56678323f1aafb8d011d79378d164a",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
"shasum": ""
},
"require": {
"league/flysystem": "^2.3|^3.0",
config/route.php
+1 -1
View File
@@ -24,7 +24,7 @@ use Webman\Route;
Route::any('/login', [app\controller\UserController::class, 'login'])->middleware([app\middleware\CrossDomain::class]);
// 文件上传接口
Route::post('/upload', [app\controller\UploadController::class, 'uploadImage']);
Route::any('/upload', [app\controller\UploadController::class, 'uploadImage'])->middleware([app\middleware\CrossDomain::class]);