唐金木 3 years ago
parent
commit
91f5f5df9d

+ 129 - 63
php/.idea/workspace.xml

@@ -3,17 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="6c0b7e36-47c6-4066-b96b-afd3eeb21cad" 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$/app/admin/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Order.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/admin/controller/Uploads.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Uploads.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/common/controller/Orde.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/common/controller/Orde.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/08.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/admin/temp/492b7ed1ae4d47eebdacd95ef84c73a4.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/admin/temp/492b7ed1ae4d47eebdacd95ef84c73a4.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/admin/temp/be7bf232a4fecabce4a8a121c31b6485.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/admin/temp/fd3382e0c1e6539206f1c35861056032.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/admin/temp/fd3382e0c1e6539206f1c35861056032.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/session/sess_704f72601738fb3cc6160a8139fa9ef3" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/session/sess_704f72601738fb3cc6160a8139fa9ef3" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/view/admin/contents/opens.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/contents/opens.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/view/admin/order/buy.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/order/buy.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/view/admin/order/push.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/order/push.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/web/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/controller/Login.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/web/model/Tripartite.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/model/Tripartite.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/09.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/admin/log/202006/09.log" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -26,11 +19,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/admin/controller/Uploads.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="404">
-              <caret line="43" column="59" lean-forward="true" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" />
+            <state relative-caret-position="322">
+              <caret line="29" column="6" lean-forward="true" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
               <folding>
                 <element signature="e#419#453#0#PHP" expanded="true" />
               </folding>
@@ -39,6 +32,51 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/web/model/Tripartite.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="667">
+              <caret line="46" column="40" lean-forward="true" selection-start-line="46" selection-start-column="40" selection-end-line="46" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/common/controller/Orde.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="269">
+              <caret line="94" column="19" lean-forward="true" selection-start-line="94" selection-start-column="19" selection-end-line="94" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/web/model/Msg.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="243">
+              <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/web/model/Send.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="120">
+              <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/web/controller/Login.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="338">
+              <caret line="190" column="21" selection-start-line="190" selection-start-column="21" selection-end-line="190" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/common.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="390">
@@ -100,7 +138,6 @@
         <option value="$PROJECT_DIR$/app/admin/controller/Agent.php" />
         <option value="$PROJECT_DIR$/view/admin/Agent/xiaji.html" />
         <option value="$PROJECT_DIR$/view/admin/login/index.html" />
-        <option value="$PROJECT_DIR$/app/web/controller/Login.php" />
         <option value="$PROJECT_DIR$/view/admin/auth/group.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/Finance.php" />
         <option value="$PROJECT_DIR$/app/admin/controller/Certificate.php" />
@@ -131,6 +168,9 @@
         <option value="$PROJECT_DIR$/view/admin/order/adminorder.html" />
         <option value="$PROJECT_DIR$/view/admin/contents/opens.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/Uploads.php" />
+        <option value="$PROJECT_DIR$/app/web/controller/Login.php" />
+        <option value="$PROJECT_DIR$/app/web/model/Send.php" />
+        <option value="$PROJECT_DIR$/app/web/model/Tripartite.php" />
       </list>
     </option>
   </component>
@@ -218,7 +258,8 @@
     </include_path>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-11" />
+    <option name="x" value="300" />
+    <option name="y" value="165" />
     <option name="width" value="1936" />
     <option name="height" value="1056" />
   </component>
@@ -244,15 +285,46 @@
               <item name="php" type="b2602c69:ProjectViewProjectNode" />
               <item name="php" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="php" type="b2602c69:ProjectViewProjectNode" />
+              <item name="php" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="php" type="b2602c69:ProjectViewProjectNode" />
+              <item name="php" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="php" type="b2602c69:ProjectViewProjectNode" />
               <item name="php" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="php" type="b2602c69:ProjectViewProjectNode" />
+              <item name="php" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="php" type="b2602c69:ProjectViewProjectNode" />
+              <item name="php" type="462c0819:PsiDirectoryNode" />
+              <item name="vendor" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="php" type="b2602c69:ProjectViewProjectNode" />
+              <item name="php" type="462c0819:PsiDirectoryNode" />
+              <item name="vendor" type="462c0819:PsiDirectoryNode" />
+              <item name="guzzlehttp" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -297,12 +369,12 @@
       <option name="presentableId" value="Default" />
       <updated>1591579855742</updated>
       <workItem from="1591579857139" duration="28400000" />
-      <workItem from="1591664797337" duration="6407000" />
+      <workItem from="1591664797337" duration="8571000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="34807000" />
+    <option name="totallyTimeSpent" value="36971000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -321,7 +393,7 @@
       <window_info anchor="bottom" id="Docker" order="7" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.329718" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.329718" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -345,33 +417,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/view/admin/finance/shenhe.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="117" column="31" lean-forward="true" selection-start-line="117" selection-start-column="31" selection-end-line="117" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/update_level.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="59" column="24" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/static/plugins/layui/extend/tableSelect/tableSelect.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#form#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#input#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/tongxingzheng.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
@@ -544,13 +589,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/web/controller/Login.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="120" column="8" selection-start-line="120" selection-start-column="8" selection-end-line="120" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/web/controller/Base.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="598">
@@ -695,13 +733,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/common/controller/Orde.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="589">
-          <caret line="180" column="40" selection-start-line="180" selection-start-column="27" selection-end-line="180" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/admin/controller/Order.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="232">
@@ -742,13 +773,48 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/admin/controller/Uploads.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="404">
-          <caret line="43" column="59" lean-forward="true" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" />
+        <state relative-caret-position="322">
+          <caret line="29" column="6" lean-forward="true" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
           <folding>
             <element signature="e#419#453#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/web/controller/Login.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="338">
+          <caret line="190" column="21" selection-start-line="190" selection-start-column="21" selection-end-line="190" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/web/model/Send.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/web/model/Tripartite.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="667">
+          <caret line="46" column="40" lean-forward="true" selection-start-line="46" selection-start-column="40" selection-end-line="46" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/common/controller/Orde.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="94" column="19" lean-forward="true" selection-start-line="94" selection-start-column="19" selection-end-line="94" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/web/model/Msg.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 0 - 3
php/app/admin/controller/Uploads.php

@@ -27,15 +27,12 @@ class Uploads {
     ];
     protected $imageValidate = [
         'image' => 'filesize:10240|fileExt:jpg,png,gif,jpeg,bmp,svg,wmv'
-
     ];
     protected $videoValidate = [
         'file' => 'filesize:10240|avi,rmvb,3gp,flv,mp4,wmv'
-
     ];
     protected $voiceValidate = [
         'file' => 'filesize:2048|mp3,wma,wav,amr,wmv'
-
     ];
     public function initialize()
 

+ 2 - 1
php/app/web/controller/Login.php

@@ -14,6 +14,7 @@ use app\common\model\PhoneCode;
 
 use app\common\model\System;
 use app\common\model\User;
+use app\web\model\Send;
 use app\web\model\Team;
 use app\web\model\Tripartite;
 use Ramsey\Uuid\Uuid;
@@ -187,7 +188,7 @@ class Login
     // 测试接口
     public function test()
     {
-        Team::father(2,8);
+       Send::login_code("13323821192","123456");
 
     }
 

+ 78 - 0
php/app/web/model/Send.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ *
+ * User: anyluck
+ * Date: 2020/6/9
+ * Time: 17:36
+ */
+
+namespace app\web\model;
+
+
+class Send
+{
+ // 第三方 短信验证码
+
+    private  static $url="http://v.juhe.cn/sms/send";
+    private static $key="bb0c0c29147b4629aa2db6faba90afc4";
+
+    // 登录
+    public static function login_code($mobile,$code)
+    {
+        $params["mobile"]=$mobile;
+        $params["tpl_id"]="215598";
+        $params["tpl_value"]=urlencode("#code#=".$code."&#company#=聚合数据");
+        $params["key"]=self::$key;
+        $params["dtype"]="json";
+        $paramstring = http_build_query($params);
+        $content = self::juheCurl(self::$url, $paramstring);
+        $result = json_decode($content, true);
+            if ($result["error_code"]==0){
+                return true;
+            }else{
+                return false;
+            }
+       
+    }
+
+
+    /**
+     * 请求接口返回内容
+     * @param  string $url [请求的URL地址]
+     * @param  string $params [请求的参数]
+     * @param  int $ipost [是否采用POST形式]
+     * @return  string
+     */
+   public static function juheCurl($url, $params = false, $ispost = 0)
+    {
+        $httpInfo = array();
+        $ch = curl_init();
+
+        curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'JuheData');
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 60);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        if ($ispost) {
+            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+            curl_setopt($ch, CURLOPT_URL, $url);
+        } else {
+            if ($params) {
+                curl_setopt($ch, CURLOPT_URL, $url.'?'.$params);
+            } else {
+                curl_setopt($ch, CURLOPT_URL, $url);
+            }
+        }
+        $response = curl_exec($ch);
+        if ($response === FALSE) {
+            //echo "cURL Error: " . curl_error($ch);
+            return false;
+        }
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $httpInfo = array_merge($httpInfo, curl_getinfo($ch));
+        curl_close($ch);
+        return $response;
+    }
+}

+ 3 - 2
php/app/web/model/Tripartite.php

@@ -42,7 +42,7 @@ class Tripartite
             PhoneCode::create($add);
 
             if ($type==0){// 手机验证码
-                    self::send_phone($phone);
+                    self::send_phone($phone,$code);
             }else{// 邮件
                 self::send_mail($phone);
             }
@@ -50,8 +50,9 @@ class Tripartite
     }
 
     // 发送手机号码
-    public static function send_phone($phone)
+    public static function send_phone($phone,$code)
     {
+        Send::login_code($phone,$code);
 
     }
 

+ 10 - 0
php/runtime/admin/log/202006/09.log

@@ -668,3 +668,13 @@
 [2020-06-09T10:23:19+08:00][sql] INSERT INTO `lm_admin_log` SET `log_title` = '开盘设置' , `log_content` = '点击菜单' , `log_url` = '/admin/contents/opens.html' , `admin_id` = 1 , `username` = 'admin' , `log_agent` = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36' , `log_ip` = '127.0.0.1' , `create_time` = 1591669399 , `update_time` = 1591669399 [ RunTime:0.120130s ]
 [2020-06-09T10:23:19+08:00][sql] SHOW FULL COLUMNS FROM `lm_system` [ RunTime:0.121612s ]
 [2020-06-09T10:23:19+08:00][sql] SELECT `name`,`value` FROM `lm_system` WHERE  `type` = 'open' [ RunTime:0.119638s ]
+[2020-06-09T17:49:42+08:00][sql] CONNECT:[ UseTime:0.180193s ] mysql:host=120.78.128.100;port=3306;dbname=test;charset=utf8
+[2020-06-09T17:49:42+08:00][sql] SHOW FULL COLUMNS FROM `lm_auth_rule` [ RunTime:0.121429s ]
+[2020-06-09T17:49:42+08:00][sql] SELECT `href`,`href` FROM `lm_auth_rule` [ RunTime:0.120121s ]
+[2020-06-09T17:49:42+08:00][sql] SELECT * FROM `lm_auth_rule` WHERE  `menu_status` = 1 ORDER BY `sort` ASC [ RunTime:0.118944s ]
+[2020-06-09T17:49:42+08:00][sql] SHOW FULL COLUMNS FROM `lm_config` [ RunTime:0.119038s ]
+[2020-06-09T17:49:42+08:00][sql] SELECT `value` FROM `lm_config` WHERE  `code` = 'site_logo' LIMIT 1 [ RunTime:0.119912s ]
+[2020-06-09T17:49:42+08:00][sql] SELECT `value` FROM `lm_config` WHERE  `code` = 'site_name' LIMIT 1 [ RunTime:0.119497s ]
+[2020-06-09T17:49:44+08:00][sql] CONNECT:[ UseTime:0.183017s ] mysql:host=120.78.128.100;port=3306;dbname=test;charset=utf8
+[2020-06-09T17:49:44+08:00][sql] SHOW FULL COLUMNS FROM `lm_auth_rule` [ RunTime:0.121650s ]
+[2020-06-09T17:49:44+08:00][sql] SELECT `href`,`href` FROM `lm_auth_rule` [ RunTime:0.122342s ]