功能优化

Richer
app/Admin/Extensions/CustomActions.php
app/Admin/Traits/GridFieldTrait.php
app/Models/Traits/ChatTrait.php
app/Models/Traits/SyncTrait.php
app/Services/RechargeOrderService.php
app/Services/User/UserService.php
app/Services/WechatService.php
resources/views/index.blade.php
--- a/app/Admin/Extensions/CustomActions.php
查看文件 @ffad275
+++ b/app/Admin/Extensions/CustomActions.php
查看文件 @ffad275
@@ -924,7 +924,7 @@ SCRIPT;
         Admin::script($script);
         return <<<EOT
-<a href="javascript:;" data-id="{$id}" class="btn btn-sm btn-success grid-add-times" >{$action}</a>
+<a href="javascript:;" data-id="{$id}" class="btn btn-sm btn-success grid-add-times" style="display:block;width:120px">{$action}</a>
 EOT;
     }
--- a/app/Admin/Traits/GridFieldTrait.php
查看文件 @ffad275
+++ b/app/Admin/Traits/GridFieldTrait.php
查看文件 @ffad275
@@ -46,11 +46,11 @@ trait GridFieldTrait
     {
         $avatar = $relation ? $relation .'.avatar' : 'avatar';
         $nickname = $relation ? $relation .'.nickname' : 'nickname'; ;
-        $mobile = $relation ? $relation .'.mobile' : 'mobile';;
+//        $mobile = $relation ? $relation .'.mobile' : 'mobile';;
         $this->gridSingleImageField($avatar, __('avatar'));
         $this->gridTextField($nickname, __('nickname'));
-        $this->gridTextField($mobile, __('mobile'));
+//        $this->gridTextField($mobile, __('mobile'));
     }
     /**
--- a/app/Models/Traits/ChatTrait.php
查看文件 @ffad275
+++ b/app/Models/Traits/ChatTrait.php
查看文件 @ffad275
@@ -269,7 +269,7 @@ trait ChatTrait
      * @param string $type
      * @return string
      */
-    public static function sendRequest($open_ai, $send_data, $type = 'stream')
+    public static function sendRequest($open_ai, $send_data, $type = 'chunked')
     {
         $answer = '';
         if ($type === 'chunked') {
--- a/app/Models/Traits/SyncTrait.php
查看文件 @ffad275
+++ b/app/Models/Traits/SyncTrait.php
查看文件 @ffad275
@@ -363,7 +363,7 @@ trait SyncTrait
 //                $logo =   config('app.url') .'/assets/admin/img/logo.png';
 //            }
         // add by Richer 于2022年6月10日14:02:26使用系统的logo
-        dump($dir);
+//        dump($dir);
         // 生成二维码
         if (!is_dir($dir)) {
             mkdir(iconv("UTF-8", "GBK", $dir), 0777, true);
@@ -371,7 +371,7 @@ trait SyncTrait
         $filename = $id .'.png';
         $filepath   = $dir . '/' . $filename;
-        dump($filepath);
+//        dump($filepath);
         $url = config('app.url') .  '?inviter_id='.$user->id;
 //            if (!file_exists($filepath)) {
@@ -390,17 +390,8 @@ trait SyncTrait
 //            }
         // 返回二维码图片路径
         $img_src = config('filesystems.disks.qr_code.url') . '/'. $filename;
-        dump($img_src);
+//        dump($img_src);
-        // 创建一张空的画布，像素3628x1757，背景白色
-//            $img = Image::canvas(300, 300, '#fff');
-//            // 获取本地图片，可以获取input上传文件
-//            $leftImage = Image::make('https://www.baidu.com/img/flexible/logo/pc/result.png')->resize(30, 30);
-//            $rightImage = Image::make($img_src)->resize(220, 220);
-//            // 插入到画布，left-top是距离左侧和顶部，值对应的是后面 100 100 处
-//            $img->insert($leftImage, 'left-top', 0, 0);
-//            $img->insert($rightImage, 'center');
-//            //可以直接返回图像，也可通过$img->save()进行保存图片
         $user->invite_qr_code = ltrim($img_src);
         $user->save();
--- a/app/Services/RechargeOrderService.php
查看文件 @ffad275
+++ b/app/Services/RechargeOrderService.php
查看文件 @ffad275
@@ -241,9 +241,9 @@ class RechargeOrderService extends BaseService
         $event = WalletRecord::DIRECT;
         if ($level == 2) {
             $rate = optional(SystemSetting::getSetting())->secondary_distribution_rate;
+            $event = WalletRecord::INDIRECT;
         } else {
             $rate = optional(SystemSetting::getSetting())->primary_distribution_rate;
-            $event = WalletRecord::INDIRECT;
         }
         $amount = ($rate * $order->amount) / 100;
--- a/app/Services/User/UserService.php
查看文件 @ffad275
+++ b/app/Services/User/UserService.php
查看文件 @ffad275
@@ -528,7 +528,7 @@ class UserService extends BaseService
             $wallet = $user->getWallet();
             $amount = $request->amount;
-            if ($amount < 100) {
+            if ($amount < 10) {
                 $this->message = '提现失败，最少提现 100 元。';
                 return false;
             }
--- a/app/Services/WechatService.php
查看文件 @ffad275
+++ b/app/Services/WechatService.php
查看文件 @ffad275
@@ -492,9 +492,19 @@ class WechatService extends BaseService
         // 正在申请
         $user_info = session('wechat.oauth_user.default')->original; // 拿到授权用户资料
         record_log('wechat-auth', '授权用户信息：' .json_encode($user_info));
+        //{
+        //"openid":"oPWfywhfTBVSJTLLTX-bqwZi7Jn4",
+        //"nickname":"Yogurt.\ud83c\udf52",
+        //"sex":0,
+        //"language":"",
+        //"city":"",
+        //"province":"",
+        //"country":"",
+        //"headimgurl":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/rryRSUHjPng6RZ337uNlpylDUxWR8OMlmu5k0FE2ugaUxcQNR7TiacEib0ZgsTxpzyWJ6AQhbrcALfDEsqXOZZtQ\/132",
+        //"privilege":[]}
 //        $factory = app(WechatFactory::class);
-//        // 公众号好手气
+//        // 公众号
 //        $user_info = $factory->setOfficialAccountConfigure()->loginOfficialAccount()->original;
 //
 //        // 拿到静默获取的openid, 静默获取只能获取openid   点击按钮可以获取详细信息
@@ -518,28 +528,17 @@ class WechatService extends BaseService
         }
         if ($user_info) {
-            $pid = $request->inviter_id ? : 0; // 邀请人id
-            $gid = 0;
-            if ($pid) {
-                $inviter = User::find($pid);
-                $gid = optional($inviter)->pid;
+            if (Arr::get($user_info, 'headimgurl')) {
+                $user->avatar       = Arr::get($user_info, 'headimgurl');
             }
-            $user->avatar       = Arr::get($user_info, 'avatarUrl');
-            $user->nickname     = Arr::get($user_info, 'nickName');
-            $user->gender       = Arr::get($user_info, 'gender');
+            if (Arr::get($user_info, 'nickname')) {
+                $user->nickname       = Arr::get($user_info, 'nickname');
+            }
+//            $user->nickname     = Arr::get($user_info, 'nickName');
+            $user->gender       = Arr::get($user_info, 'sex');
             $user->country      = Arr::get($user_info, 'country');
             $user->province     = Arr::get($user_info, 'province');
             $user->city         = Arr::get($user_info, 'city');
-            $user->times     = 10; // 新用户注册赠送 10 条
-            $user->invite_qr_code = 'mini_program_code/'.$user->id .'.png';
-            $user->pid          = $pid;
-            $user->gid          = $gid;
-            $user->openid       = $openid;
-            $user->password     = bcrypt(config('constants.PASSWORD'));
-            $user->role         = Role::GENERAL;
-            $user->password     = bcrypt(config('constants.PASSWORD'));
-            $user->registered_at = date('Y-m-d H:i:s');
-            $user->registered_ip = $request->ip();
         }
         $user->token    = JWTAuth::fromuser($user);
         $user->save();
@@ -566,10 +565,9 @@ class WechatService extends BaseService
         $gid = 0;
         if ($pid) {
             $inviter = User::find($pid);
-            $gid = optional($inviter)->pid;
+            $gid = optional($inviter)->pid ?? 0;
         }
         $user->times        = 10; // 新用户注册赠送 10 条
-        $user->username     = $mobile;
         $user->pid          = $pid;
         $user->gid          = $gid;
         $user->username     = $mobile;
@@ -580,6 +578,10 @@ class WechatService extends BaseService
         $user->password  = bcrypt(config('constants.PASSWORD'));
         $user->registered_at = date('Y-m-d H:i:s');
         $user->registered_ip = $request->ip();
+        // add by Richer 于 2023年5月16日09:47:42  设置默认的昵称和头像
+        $user->nickname = '昵称' . $user->id;
+        $user->avatar = 'avatar/'. rand(1, 20) .'.png';
+
         return $user;
     }
--- a/resources/views/index.blade.php
查看文件 @ffad275
+++ b/resources/views/index.blade.php
查看文件 @ffad275
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>chatApp</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-        document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.87f773bf.js></script><script src=./static/js/index.c244513e.js></script></body></html>
+        document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.fc0b6f42.js></script><script src=./static/js/index.d3e1bce3.js></script></body></html>