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

.env

@@ -3,9 +3,10 @@ APP_ENV=local
 APP_KEY=base64:tXBuLJEDanur8QpVucLgqSpvCJvjQAA5ngxD/vMHwjM=
 APP_DEBUG=true
 APP_TIMEZONE=UTC
-APP_URL=http://localhost:8000
-FRONTEND_URL=http://127.0.0.1:8080
-BACKEND_URL=http://127.0.0.1:8080
+APP_URL=http://127.0.0.1:8000
+# 这下面两行必须配置，否则跨域会报错，或者配置为*允许所有
+FRONTEND_URL=http://127.0.0.1:4000
+BACKEND_URL=http://127.0.0.1:8000
 
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
@@ -22,11 +23,11 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=192.168.110.5
 DB_PORT=3306
 DB_DATABASE=massage_new
-DB_USERNAME=root
-DB_PASSWORD=root
+DB_USERNAME=dd
+DB_PASSWORD=Dd.123456
 
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
@@ -44,8 +45,8 @@ CACHE_PREFIX=
 MEMCACHED_HOST=127.0.0.1
 
 REDIS_CLIENT=phpredis
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
+REDIS_HOST=192.168.110.5
+REDIS_PASSWORD=Dd.123456
 REDIS_PORT=6379
 
 MAIL_MAILER=log

.gitignore

@@ -18,3 +18,6 @@ yarn-error.log
 /.fleet
 /.idea
 /.vscode
+.gitignore
+composer.json
+composer.lock

composer.json

@@ -5,22 +5,22 @@
     "keywords": ["laravel", "framework"],
     "license": "MIT",
     "require": {
-        "php": "^8.2",
-        "bensampo/laravel-enum": "^6.11",
-        "laravel/framework": "^11.9",
-        "laravel/sanctum": "^4.0",
-        "laravel/tinker": "^2.9",
-        "overtrue/laravel-wechat": "^7.3",
-        "spatie/laravel-permission": "^6.9"
+        "php": "^8.3",
+        "bensampo/laravel-enum": "*",
+        "laravel/framework": "*",
+        "laravel/sanctum": "*",
+        "laravel/tinker": "*",
+        "overtrue/laravel-wechat": "*",
+        "spatie/laravel-permission": "*"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.23",
-        "laravel/breeze": "^2.1",
-        "laravel/pint": "^1.13",
-        "laravel/sail": "^1.26",
-        "mockery/mockery": "^1.6",
-        "nunomaduro/collision": "^8.0",
-        "phpunit/phpunit": "^11.0.1"
+        "fakerphp/faker": "*",
+        "laravel/breeze": "*",
+        "laravel/pint": "*",
+        "laravel/sail": "*",
+        "mockery/mockery": "*",
+        "nunomaduro/collision": "*",
+        "phpunit/phpunit": "*"
     },
     "autoload": {
         "psr-4": {