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

Merge branch 'develop' into feature/mzl_dev

Browse Source 
# Conflicts:
#	composer.json
#	composer.lock
This commit is contained in:
ylyg5690
2025-03-21 15:13:43 +08:00
parent deec0e9a87
commit cea9aac861
4 changed files with 23 additions and 23 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) public function grade(Request $request)
{ {
$id = Util::getParam($request, 'id'); $id = Util::getParam($request, 'id');
$id = Util::getParam($request, 'grade'); $grade = Util::getParam($request, 'grade');
if (Util::isEmpty($id)) { if (Util::isEmpty($id)) {
return Util::fail('', 'id' . trans('not_null')); return Util::fail('', 'id' . trans('not_null'));
} }
@@ -230,7 +230,7 @@ class CustomerController
return Util::fail('', 'grade' . trans('not_null')); return Util::fail('', 'grade' . trans('not_null'));
} }
$data = [ $data = [
'grade' => Util::getParam($request, 'grade', 0), 'grade' => $grade,
]; ];
$res = Customer::where('id', $id) $res = Customer::where('id', $id)
->update($data); ->update($data);
app/controller/UserController.php
+10 -4
View File
@@ -19,6 +19,7 @@ class UserController
public function login(Request $request) public function login(Request $request)
{ {
$email = Util::getParam($request, 'email'); $email = Util::getParam($request, 'email');
$language = Util::getParam($request, 'language');
if (Util::isEmpty($email)) { if (Util::isEmpty($email)) {
return Util::fail([], 'email' . trans('not_null')); return Util::fail([], 'email' . trans('not_null'));
} }
@@ -26,6 +27,7 @@ class UserController
if (Util::isEmpty($password)) { if (Util::isEmpty($password)) {
return Util::fail([], 'password' . trans('not_null')); return Util::fail([], 'password' . trans('not_null'));
} }
$user = User::select(['id', 'name', 'sex', 'role', 'avatar', 'email', 'password']) $user = User::select(['id', 'name', 'sex', 'role', 'avatar', 'email', 'password'])
->where('status', 0) ->where('status', 0)
->where('email', $request->post('email')) ->where('email', $request->post('email'))
@@ -43,6 +45,7 @@ class UserController
//验证密码 //验证密码
// if (!password_verify($userPassword, $hashedPassword)) { // if (!password_verify($userPassword, $hashedPassword)) {
if ($userPassword == $hashedPassword) { if ($userPassword == $hashedPassword) {
locale($language);
return Util::fail([], trans('password_error')); return Util::fail([], trans('password_error'));
} }
$userId = $user['id']; // 实际从数据库获取 $userId = $user['id']; // 实际从数据库获取
@@ -56,6 +59,12 @@ class UserController
unset($result['password']); unset($result['password']);
$result['token'] = $token; $result['token'] = $token;
if (Util::isEmpty($language)) {
User::where('id', $userId)
->update(['language' => $language]);
locale($language);
}
return Util::success($result, trans('login_success')); return Util::success($result, trans('login_success'));
} }
@@ -163,11 +172,8 @@ class UserController
*/ */
public function language(Request $request) public function language(Request $request)
{ {
$id = Util::getParam($request, 'id'); $id = $request->user['id'];
$language = Util::getParam($request, 'language'); $language = Util::getParam($request, 'language');
if (Util::isEmpty($id)) {
return Util::fail([], 'id' . trans('not_null'));
}
if (Util::isEmpty($language)) { if (Util::isEmpty($language)) {
return Util::fail([], 'language' . trans('not_null')); return Util::fail([], 'language' . trans('not_null'));
} }
composer.lock
Generated
+10 -16
View File
@@ -736,26 +736,20 @@
}, },
{ {
"name": "iidestiny/flysystem-oss", "name": "iidestiny/flysystem-oss",
"version": "4.0", "version": "4.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/iiDestiny/flysystem-oss.git", "url": "https://github.com/iiDestiny/flysystem-oss.git",
"reference": "6b6cf6850be377c484c086505d942e61afa2875c" "reference": "154ccb26075a20b350e2357289bfeabe3ca79ba0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/iiDestiny/flysystem-oss/zipball/6b6cf6850be377c484c086505d942e61afa2875c", "url": "https://api.github.com/repos/iiDestiny/flysystem-oss/zipball/154ccb26075a20b350e2357289bfeabe3ca79ba0",
"reference": "6b6cf6850be377c484c086505d942e61afa2875c", "reference": "154ccb26075a20b350e2357289bfeabe3ca79ba0",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"aliyuncs/oss-sdk-php": "^2.4", "aliyuncs/oss-sdk-php": "^2",
"ext-curl": "*", "ext-curl": "*",
"ext-json": "*", "ext-json": "*",
"ext-openssl": "*", "ext-openssl": "*",
@@ -763,8 +757,8 @@
"php": "^8.0.2" "php": "^8.0.2"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "^1.2", "mockery/mockery": "^1.5",
"phpunit/phpunit": "^6.5", "phpunit/phpunit": "^9.5",
"symfony/var-dumper": "^3.4" "symfony/var-dumper": "^3.4"
}, },
"type": "library", "type": "library",
@@ -792,9 +786,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/iiDestiny/flysystem-oss/issues", "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", "name": "illuminate/bus",
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::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]);