1

.idea/workspace.xml

@@ -3,9 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/UserMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserMessage.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/common/service/OrderCallback.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/OrderCallback.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/runtime/log/single.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/log/single_sql.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_sql.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -477,7 +477,7 @@
       <workItem from="1700094705258" duration="24511000" />
       <workItem from="1700181113672" duration="598000" />
       <workItem from="1700191602612" duration="3899000" />
-      <workItem from="1700267230720" duration="4785000" />
+      <workItem from="1700267230720" duration="6736000" />
     </task>
     <servers />
   </component>

application/common/model/UserMessage.php

@@ -45,6 +45,13 @@ class UserMessage extends Model
             4=>['title'=>'活动订单','msg'=>['未支付订单提醒','活动订单申请退款','订单退款通知'],'channel'=>['xiaomi'=>"108239",'huawei'=>'EXPRESS','oppo'=>'order']],
             5=>['title'=>'活动发票','msg'=>['您的电子发票已开票','您的订单发票已发货'],'channel'=>['xiaomi'=>"108239",'huawei'=>'EXPRESS','oppo'=>'order']],
             ],// 活动
+        'activity_apply'=>[
+            1=>['title'=>'活动审核','msg'=>['恭喜您报名审核成功','抱歉啦报名审核失败~~','恭喜您报名成功'],'channel'=>['xiaomi'=>"108239",'huawei'=>'EXPRESS','oppo'=>'order']],
+            2=>['title'=>'变更通知','msg'=>['活动有变更'],'channel'=>['xiaomi'=>"108239",'huawei'=>'EXPRESS','oppo'=>'order']],
+            3=>['title'=>'活动提醒','msg'=>['活动有变更'],'channel'=>['xiaomi'=>"108239",'huawei'=>'EXPRESS','oppo'=>'order']],
+            4=>['title'=>'活动订单','msg'=>['未支付订单提醒','活动订单申请退款','订单退款通知'],'channel'=>['xiaomi'=>"108239",'huawei'=>'EXPRESS','oppo'=>'order']],
+            5=>['title'=>'活动发票','msg'=>['您的电子发票已开票','您的订单发票已发货'],'channel'=>['xiaomi'=>"108239",'huawei'=>'EXPRESS','oppo'=>'order']],
+        ],// 活动订单
         'demand'=>[
             1=>['title'=>'需求投稿','msg'=>['需求投稿成功请等待审核'],'channel'=>['xiaomi'=>"108237",'huawei'=>'IM','oppo'=>'message']],
             2=>['title'=>'需求审核','msg'=>['恭喜您需求审核成功','抱歉啦需求审核失败~~'],'channel'=>['xiaomi'=>"108237",'huawei'=>'IM','oppo'=>'message']],
@@ -152,11 +159,6 @@ class UserMessage extends Model
                 $res =  static::Jpush($to_user,$message['content'],$module,$type,$rel_id,$children_id,static::$type_desc[$module][$type]['channel'],['title'=>static::$type_desc[$module][$type]['title']]);
                 $message['jg_res']  = is_array($res) ? json_encode($res) :$res;
                 break;
-            case 'activity_apply':
-                $message['jg_type'] = 1;
-                $res =  static::Jpush($to_user,$message['content'],'activity',$type,$rel_id,$children_id,static::$type_desc[$module][$type]['channel'],['title'=>static::$type_desc['activity'][$type]['title']]);
-                $message['jg_res']  = is_array($res) ? json_encode($res) :$res;
-                break;
             case 'demand':
                 if(in_array($type,[3,4])) {
                     $message['jg_type'] = 1;

application/common/service/OrderCallback.php

@@ -167,7 +167,7 @@ class OrderCallback
                     ActivityApplyItem::where('id',$iv['id'])->update(['status'=>1,'qr_code'=>$url,'qr_content'=>$qr_content]);
                     $act_title = \app\common\model\Activity::where('id',$iv['act_id'])->value('title');
                     $content = '您已成功报名"'.$act_title.'"';
-                    UserMessage::sendUserMessage($iv['user_id'],'activity',1,0,0,$iv['id'],$content,$iv['id']);
+                    UserMessage::sendUserMessage($iv['user_id'],'activity_apply',1,0,0,$iv['id'],$content,$iv['id']);
                     UserSynth::ticketSend($iv['id']);
                 }else{
                     ActivityApplyItem::where('id',$iv['id'])->update(['status'=>1]);

runtime/log/single.log

@@ -32679,3 +32679,83 @@
   8 => 'title',
   9 => 'pagehtml',
 ) ]
+---------------------------------------------------------------
+
+[2023-11-18T11:01:12+08:00] 127.0.0.1 GET gaoyx.com/apidoc/config
+[运行时间：0.040850s] [吞吐率：24.48req/s] [内存消耗：2,381.61kb] [文件加载：130]
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/zh-cn.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/en-us.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\thinkphp\lang\zh-cn.php
+[ info ] [ ROUTE ] array (
+  'rule' => 'apidoc/config',
+  'route' => '\\hg\\apidoc\\Controller@getConfig',
+  'option' => 
+  array (
+    'merge_rule_regex' => false,
+  ),
+  'var' => 
+  array (
+  ),
+)
+[ info ] [ HEADER ] array (
+  'cookie' => 'PHPSESSID=kjf811uglnbl0s42g2r1f8ukdc; SECKEY_ABVK=92QEn0WqRESL21ZVnECvJeXyDw87WB3XXzbRYs60MEc%3D; BMAP_SECKEY=ebPg6MkYgNvaGJVfWwVd9wCsbm7MeYUsTZQm9JkLkXv3Q6ADWmXnFrZZaF_hROeOuf-DLd9rpDakugwqjJNSlA5E7au11HDdJkco29fT91HjrjoBHodt4TYK8WFqZ6pZe8Ib_xaS9_vrFs6RNjrAzYqCLx-B99c1YfY_5LaYUgkslX4Kvr7HBYgVl9wq7lM6',
+  'accept-language' => 'zh-CN,zh;q=0.9',
+  'accept-encoding' => 'gzip, deflate, br',
+  'referer' => 'https://gaoyx.com/apidoc/?appKey=V1.0',
+  'sec-fetch-dest' => 'empty',
+  'sec-fetch-mode' => 'cors',
+  'sec-fetch-site' => 'same-origin',
+  'sec-ch-ua-platform' => '"Windows"',
+  'user-agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+  'sec-ch-ua-mobile' => '?0',
+  'accept' => 'application/json, text/plain, */*',
+  'sec-ch-ua' => '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
+  'connection' => 'keep-alive',
+  'host' => 'gaoyx.com',
+  'content-length' => '',
+  'content-type' => '',
+)
+[ info ] [ PARAM ] array (
+)
+---------------------------------------------------------------
+
+[2023-11-18T11:01:13+08:00] 127.0.0.1 GET gaoyx.com/apidoc/data?appKey=V1.0&version=V1.0&cacheFileName=&reload=false
+[运行时间：0.109388s] [吞吐率：9.14req/s] [内存消耗：7,740.20kb] [文件加载：169]
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/zh-cn.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/en-us.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\thinkphp\lang\zh-cn.php
+[ info ] [ ROUTE ] array (
+  'rule' => 'apidoc/data',
+  'route' => '\\hg\\apidoc\\Controller@getList',
+  'option' => 
+  array (
+    'merge_rule_regex' => false,
+  ),
+  'var' => 
+  array (
+  ),
+)
+[ info ] [ HEADER ] array (
+  'cookie' => 'PHPSESSID=kjf811uglnbl0s42g2r1f8ukdc; SECKEY_ABVK=92QEn0WqRESL21ZVnECvJeXyDw87WB3XXzbRYs60MEc%3D; BMAP_SECKEY=ebPg6MkYgNvaGJVfWwVd9wCsbm7MeYUsTZQm9JkLkXv3Q6ADWmXnFrZZaF_hROeOuf-DLd9rpDakugwqjJNSlA5E7au11HDdJkco29fT91HjrjoBHodt4TYK8WFqZ6pZe8Ib_xaS9_vrFs6RNjrAzYqCLx-B99c1YfY_5LaYUgkslX4Kvr7HBYgVl9wq7lM6',
+  'accept-language' => 'zh-CN,zh;q=0.9',
+  'accept-encoding' => 'gzip, deflate, br',
+  'referer' => 'https://gaoyx.com/apidoc/?appKey=V1.0',
+  'sec-fetch-dest' => 'empty',
+  'sec-fetch-mode' => 'cors',
+  'sec-fetch-site' => 'same-origin',
+  'sec-ch-ua-platform' => '"Windows"',
+  'user-agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+  'sec-ch-ua-mobile' => '?0',
+  'accept' => 'application/json, text/plain, */*',
+  'sec-ch-ua' => '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
+  'connection' => 'keep-alive',
+  'host' => 'gaoyx.com',
+  'content-length' => '',
+  'content-type' => '',
+)
+[ info ] [ PARAM ] array (
+  'appKey' => 'V1.0',
+  'version' => 'V1.0',
+  'cacheFileName' => '',
+  'reload' => 'false',
+)