Merge branch 'dev' into dev-sxb

app/common/middleware/SignatureMiddleware.php

@@ -3,96 +3,55 @@
 namespace app\common\middleware;
 
 use think\facade\Cache;
-use think\facade\Log;
-use think\Request;
 use think\Response;
 
 class SignatureMiddleware
 {
-    public function handle(Request $request, \Closure $next)
+    public function handle($request, \Closure $next)
     {
-        // 获取必要参数
-        $essential = $request->only(['timestamp', 'nonce', 'signature']);
-
-        // 验证必要参数
-        if (count(array_filter($essential)) !== 3) {
-            return $this->errorResponse('参数不完整', 400);
-        }
-
-        // 验证时间戳（5分钟内有效）
-        if (abs(time() - (int)$essential['timestamp']) > 300) {
-            return $this->errorResponse('请求已过期', 400);
-        }
-
-        // 验证nonce唯一性
-        $nonceKey = 'nonce:' . $essential['nonce'];
-        if (Cache::has($nonceKey)) {
-            return $this->errorResponse('重复请求', 400);
-        }
-
-        // 构造签名数据（与前端完全一致）
-        $signData = $request->param();
-        unset($signData['signature']);
-
-        // 按键名排序
-        ksort($signData);
-
-        // 生成签名字符串（与前端相同格式）
-        $signContent = '';
-        foreach ($signData as $key => $value) {
-            $signContent .= "{$key}={$value}&";
+        // 1. 获取加密签名
+        $sign = $request->header('X-Sign');
+        if (!$sign) {
+            return $this->reject('缺少签名', 401);
         }
-        $signContent = rtrim($signContent, '&');
-
-        // 记录原始签名内容（用于调试）
-        Log::debug("Sign Content: " . $signContent);
-
-        // 获取公钥
-        $publicKey = openssl_pkey_get_public(
-            file_get_contents(env('RSA_PUBLIC_KEY_PATH'))
-        );
 
-        if (!$publicKey) {
-            Log::error("公钥加载失败");
-            return $this->errorResponse('系统错误', 500);
+        // 2. 读取私钥
+        $privateKey = file_get_contents(env('RSA_PRIVATE_KEY_PATH'));
+        if (!$privateKey) {
+            return $this->reject('服务器密钥错误', 500);
         }
 
-        // 计算签名的MD5值（与前端一致）
-        $md5Hash = md5($signContent);
-        Log::debug("MD5 Hash: " . $md5Hash);
-
-        // 解码前端签名（前端使用公钥加密）
-        $signature = base64_decode($essential['signature']);
-
-        // 使用公钥解密签名
+        // 3. 解密数据
         $decrypted = '';
-        $success = openssl_public_decrypt($signature, $decrypted, $publicKey);
+        openssl_private_decrypt(base64_decode($sign), $decrypted, $privateKey);
 
-        if (!$success) {
-            Log::error("签名解密失败: " . openssl_error_string());
-            return $this->errorResponse('签名验证失败', 403);
+        if (!$decrypted || !strpos($decrypted, ':')) {
+            return $this->reject('无效签名', 403);
         }
 
-        Log::debug("解密结果: " . $decrypted);
+        // 4. 分离随机数和时间戳
+        list($nonce, $timestamp) = explode(':', $decrypted, 2);
 
-        // 比较解密后的值与MD5哈希
-        if ($decrypted !== $md5Hash) {
-            Log::error("签名验证失败: 期望 {$md5Hash}, 实际 {$decrypted}");
-            return $this->errorResponse('签名验证失败', 403);
+        // 5. 验证时间有效性（5分钟内）
+        if (abs(time() - $timestamp / 1000) > 300) {
+            return $this->reject('请求已过期', 403);
         }
 
-        // 记录已使用的nonce（5分钟过期）
-        Cache::set($nonceKey, 1, 300);
+        // 6. 防重放攻击（检查nonce唯一性）
+        $cacheKey = 'nonce_' . $nonce;
+        if (Cache::has($cacheKey)) {
+            return $this->reject('重复请求', 403);
+        }
+        Cache::set($cacheKey, 1, 300); // 5分钟缓存
 
         return $next($request);
     }
 
-    private function errorResponse(string $message, int $code): Response
+    private function reject($msg, $code): Response
     {
-        return json([
+        return Response::create([
             'code' => $code,
-            'msg' => $message,
-            'data' => null
-        ])->code($code);
+            'msg'  => $msg
+        ], 'json')->code($code);
     }
 }

app/common/repositories/finance/FinanceRepository.php

@@ -157,6 +157,7 @@ class FinanceRepository extends BaseRepository
 
             // 会员专区订单总数
             //总数
+            $mer_idhy = 496;
             $chengjiaomoney = Db::name('store_order')->where($where)->where('mer_id', 496)->count();
             $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 496)->count();
             $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 496)->count();
@@ -165,6 +166,7 @@ class FinanceRepository extends BaseRepository
     
             //精彩生活区订单总数
             //总数
+            $mer_idjc = 439;
             $chengjiaocount = Db::name('store_order')->where($where)->where('mer_id', 439)->count();
             $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 439)->count();
             $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 439)->count();
@@ -181,6 +183,7 @@ class FinanceRepository extends BaseRepository
     
             //复购区订单总数
             //总数
+            $mer_idfg = 491;
             $tuikuanmoney = Db::name('store_order')->where($where)->where('mer_id', 491)->count();
             $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 491)->count();
             $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 491)->count();
@@ -246,10 +249,10 @@ class FinanceRepository extends BaseRepository
             $list6[] = ['count' => $todayCount, 'name' => '日订单总数'];
     
     
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'list' => $list1];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'list' => $list2];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'mer_id' => $mer_idhy, 'list' => $list1];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'mer_id' => $mer_idjc, 'list' => $list2];
             $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '商贸区订单总数', 'list' => $list3];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'list' => $list4];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'mer_id' => $mer_idfg, 'list' => $list4];
             $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '三方平台订单总数', 'list' => $list5];
             $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '线下订单总数', 'list' => $list6];
             return $data;

app/controller/admin/user/User.php

@@ -281,6 +281,10 @@ class User extends BaseController
         }
         $user['marker_phone_list'] = $marker_phone_list;
 
+        $old_user_lianc_data = Db::name("old_user_lianc")->select()->toArray();//将联创等级数据一起发送到前端
+        $user['old_user_lianc_data'] = $old_user_lianc_data;
+
+
         return app('json')->success($user);
     }
 
@@ -383,6 +387,12 @@ class User extends BaseController
 
         $this->repository->update($id, $data);
 
+        $originatorIdOld = request()->post('originator_id_old','');//接收originator_id_old数据,并更新到数据库里
+        if ($originatorIdOld === '') {
+            $originatorIdOld = null;
+        }
+        Db::name('user')->where('uid', $id)->update(['originator_id_old' => $originatorIdOld]);
+
         //更新身份证信息
         $cardData = [];
         if ($data['card_id']) {
@@ -414,11 +424,11 @@ class User extends BaseController
             Db::name('user_rich')->insert($user_rich_ypdate);
         }
 
-
-
-
-
-        return app('json')->success('编辑成功');
+        $user = Db::name('user')->where('uid', $id)->find();
+        if (isset($user['originator_id_old']) && is_null($user['originator_id_old'])) {
+            $user['originator_id_old'] = '';
+        }
+        return app('json')->success('编辑成功',$user);
     }
 
     public function maker_check_phone($id)

app/controller/api/Auth.php

@@ -1354,7 +1354,7 @@ class Auth extends BaseController
             'code' => 200,
             'msg' => 'success',
             'data' => [
-                'public_key' => $publicKey
+                'publicKey' => $publicKey
             ]
         ]);
     }

route/api.php

@@ -979,7 +979,8 @@ Route::group('api/', function () {
     Route::get('auth/getPublicKey', 'api.Auth/getPublicKey');
 
     //验证码
-    Route::post('auth/verify', 'api.Auth/verify')
+    Route::post('auth/verify', 'api.Auth/verify');
+    Route::post('auth/sendSms', 'api.Auth/verify')
         ->middleware(SignatureMiddleware::class)
         ->middleware(RateLimitMiddleware::class);
     //微信配置