1，修复三级分推广积分存储和统计问题。

2，修复码支付接口地址。
3，修复同步详情图片正则。
4，其他细节。

application/admin/controller/Images.php

@@ -152,9 +152,8 @@ class Images extends Base
 
             if($param['col'] == 2){
                 $content = $v[$col_pic];
-                $rule = mac_buildregx("<img[^>]*src\s*=\s*['".chr(34)."]?([\w/\-\:.]*)['".chr(34)."]?[^>]*>","is");
+                $rule = mac_buildregx('<img[^>]*src=[\'"]?([^>\'"\s]*)[\'"]?[^>]*>',"is");
                 preg_match_all($rule,$content,$matches);
-
                 $matchfieldarr=$matches[1];
                 $matchfieldstrarr=$matches[0];
                 $matchfieldvalue="";
@@ -162,8 +161,8 @@ class Images extends Base
                 {
                     $matchfieldvalue=$matchfieldstrarr[$f];
                     $img_old = trim(preg_replace("/[ \r\n\t\f]{1,}/"," ",$matchfieldstr));
-
                     $img_url = model('Image')->down_load($img_old, $config, $param['tab']);
+
                     $des = '';
                     if(in_array($config['mode'],['local']) || substr($img_url,0,7)=='upload/'){
                         $img_url = MAC_PATH . $img_url;

application/admin/controller/User.php

@@ -59,11 +59,8 @@ class User extends Base
         $param = input();
         $param['page'] = intval($param['page']) <1 ? 1 : $param['page'];
         $param['limit'] = intval($param['limit']) <1 ? $this->_pagesize : $param['limit'];
-
         $param['uid'] = intval($param['uid']);
-
         $where=[];
-
         if(!empty($param['level'])){
             if($param['level']=='1'){
                 $where['user_pid'] = ['eq', $param['uid']];
@@ -86,35 +83,35 @@ class User extends Base
 
         $order='user_id desc';
         $res = model('User')->listData($where,$order,$param['page'],$param['limit']);
-
-        $list=[];
+        $group_list = model('Group')->getCache('group_list');
+        foreach($res['list'] as $k=>$v){
+            $res['list'][$k]['group_name'] = $group_list[$v['group_id']]['group_name'];
+        }
 
         $where2=[];
         $where2['user_pid'] = ['eq', $param['uid']];
-        $user_ids_1 = Db::name('User')->where($where2)->column('user_id');
-        $level_cc_1 = count($user_ids_1);
-        $where3=[];
-        $where3['user_id_1'] = ['in',$user_ids_1];
+        $level_cc_1 = Db::name('User')->where($where2)->count();
+        $where3 = [];
+        $where3['user_id'] = $param['uid'];
+        $where3['plog_type'] = 4;
         $points_cc_1 = Db::name('Plog')->where($where3)->sum('plog_points');
 
-
         $where2=[];
         $where2['user_pid_2'] = ['eq', $param['uid']];
-        $user_ids_2 = Db::name('User')->where($where2)->column('user_id');
-        $level_cc_2 = count($user_ids_2);
-        $where3=[];
-        $where3['user_id_1'] = ['in',$user_ids_2];
+        $level_cc_2 = Db::name('User')->where($where2)->count();
+        $where3 = [];
+        $where3['user_id'] = $param['uid'];
+        $where3['plog_type'] = 5;
         $points_cc_2 = Db::name('Plog')->where($where3)->sum('plog_points');
 
         $where2=[];
         $where2['user_pid_3'] = ['eq', $param['uid']];
-        $user_ids_3 = Db::name('User')->where($where2)->column('user_id');
-        $level_cc_3 = count($user_ids_3);
-        $where3=[];
-        $where3['user_id_1'] = ['in',$user_ids_3];
+        $level_cc_3 = Db::name('User')->where($where2)->count();
+        $where3 = [];
+        $where3['user_id'] = $param['uid'];
+        $where3['plog_type'] = 6;
         $points_cc_3 = Db::name('Plog')->where($where3)->sum('plog_points');
 
-
         $data=[];
         $data['level_cc_1'] = intval($level_cc_1);
         $data['level_cc_2'] = intval($level_cc_2);

application/admin/view/plog/index.html

@@ -10,7 +10,9 @@
                         <option value="1" {if condition="$param['type'] eq '1'"}selected {/if}>{:lang('admin/plog/points_recharge')}</option>
                         <option value="2" {if condition="$param['type'] eq '2'"}selected {/if}>{:lang('admin/plog/reg_promote')}</option>
                         <option value="3" {if condition="$param['type'] eq '3'"}selected {/if}>{:lang('admin/plog/visit_promote')}</option>
-                        <option value="4" {if condition="$param['type'] eq '4'"}selected {/if}>{:lang('admin/plog/three_distribution')}</option>
+                        <option value="4" {if condition="$param['type'] eq '4'"}selected {/if}>{:lang('one_level_distribution')}</option>
+                        <option value="5" {if condition="$param['type'] eq '5'"}selected {/if}>{:lang('two_level_distribution')}</option>
+                        <option value="6" {if condition="$param['type'] eq '6'"}selected {/if}>{:lang('three_level_distribution')}</option>
                         <option value="7" {if condition="$param['type'] eq '7'"}selected {/if}>{:lang('admin/plog/points_upgrade')}</option>
                         <option value="8" {if condition="$param['type'] eq '8'"}selected {/if}>{:lang('admin/plog/points_buy')}</option>
                         <option value="9" {if condition="$param['type'] eq '9'"}selected {/if}>{:lang('admin/plog/points_withdrawal')}</option>
@@ -50,7 +52,7 @@
                 <td>{$vo.plog_id}</td>
                 <td>[{$vo.user_id}]{$vo.user_name}</td>
                 <td>{$vo.plog_type|mac_get_plog_type_text}</td>
-                <td>{if condition="in_array($vo.plog_type,[1,2,3,4])"}+{else/}-{/if}{$vo.plog_points}</td>
+                <td>{if condition="in_array($vo.plog_type,[1,2,3,4,5,6])"}+{else/}-{/if}{$vo.plog_points}</td>
                 <td>{$vo.plog_remarks}</td>
                 <td>{$vo.plog_time|mac_day=color}</td>
                 <td>

application/admin/view/user/reward.html

@@ -49,7 +49,7 @@
                 <td>{$vo.user_name}</td>
                 <td>{$vo.group_name}</td>
                 <td>{if condition="$vo['user_status'] eq 1"}<span class="layui-badge layui-bg-green">{:lang('open')}</span>{else/}<span class="layui-badge">{:lang('close')}</span>{/if}</td>
-                <td>{if condition="$vo['user_pid'] eq $param['uid']"}{:lang('admin/user/reward/one_distribution')}{elseif condition="$vo['user_pid_2'] eq $param['uid']"}{:lang('admin/user/reward/two_distribution')}{else/}{/if}</td>
+                <td>{if condition="$vo['user_pid'] eq $param['uid']"}{:lang('admin/user/reward/one_distribution')}{elseif condition="$vo['user_pid_2'] eq $param['uid']"}{:lang('admin/user/reward/two_distribution')}{else/}{:lang('admin/user/reward/three_distribution')}{/if}</td>
                 <td>{$vo.user_reg_time|mac_day=color}</td>
             </tr>
             {/volist}

application/common.php

@@ -1014,7 +1014,7 @@ function mac_get_ulog_type_text($data)
 
 function mac_get_plog_type_text($data)
 {
-    $arr = [1=>lang('integral_recharge'),2=>lang('registration_promotion'),3=>lang('visit_promotion'),4=>lang('three_level_distribution'),7=>lang('points_upgrade'),8=>lang('integral_consumption'),9=>lang('integral_withdrawal')];
+    $arr = [1=>lang('integral_recharge'),2=>lang('registration_promotion'),3=>lang('visit_promotion'),4=>lang('one_level_distribution'),5=>lang('two_level_distribution'),6=>lang('three_level_distribution'),7=>lang('points_upgrade'),8=>lang('integral_consumption'),9=>lang('integral_withdrawal')];
     return $arr[$data];
 }
 

application/common/extend/pay/Codepay.php

@@ -43,7 +43,7 @@ class Codepay {
         }
 
         $query = $urls . '&sign='.md5($sign.trim( $GLOBALS['config']['pay']['codepay']['appkey'] )); //创建订单所需的参数
-        $url = "http://api2.fateqq.com:52888/creat_order/?{$query}"; //支付页面
+        $url = "https://api.xiuxiu888.com/creat_order/?{$query}"; //支付页面
 
         mac_redirect($url);
     }

application/common/model/Image.php

@@ -16,15 +16,14 @@ class Image extends Base {
 
     public function down_exec($url,$config,$flag='vod')
     {
-        $upload_image_ext = 'jpg,png,gif';
-        $ext = strrchr($url,'.');
-
-        if(strpos($upload_image_ext,$ext)===false){
-            $ext = '.jpg';
+        $upload_image_ext = 'jpg,jpeg,png,gif,webp';
+        $ext = strtolower(pathinfo($url, PATHINFO_EXTENSION));
+        if(!in_array($ext, explode(',', $upload_image_ext))){
+            $ext = 'jpg';
         }
         $img = mac_curl_get($url);
         if($img){
-            $file_name = md5(uniqid()) . $ext;
+            $file_name = md5(uniqid()) .'.' . $ext;
             // 上传附件路径
             $_upload_path = ROOT_PATH . 'upload' . '/' . $flag . '/';
             // 附件访问路径

application/common/model/Upload.php

@@ -52,7 +52,7 @@ class Upload extends Base {
         $data = [];
         $config = config('maccms.site');
         $pre= $config['install_dir'];
-        $upload_image_ext = 'jpg,jpeg,png,gif';
+        $upload_image_ext = 'jpg,jpeg,png,gif,webp';
         $upload_file_ext = 'doc,docx,xls,xlsx,ppt,pptx,pdf,wps,txt,rar,zip,torrent';
         $upload_media_ext = 'rm,rmvb,avi,mkv,mp4,mp3';
         $add_rnd = false;

application/common/model/User.php

@@ -913,7 +913,7 @@ class User extends Base
                     if($r){
                         $data = [];
                         $data['user_id'] = $GLOBALS['user']['user_pid_2'];
-                        $data['plog_type'] = 4;
+                        $data['plog_type'] = 5;
                         $data['plog_points'] = $points;
                         $data['plog_remarks'] =lang('model/user/reward_tip',[$GLOBALS['user']['user_id'],$GLOBALS['user']['user_name'],$fee_points,$points]);
                         model('Plog')->saveData($data);
@@ -929,7 +929,7 @@ class User extends Base
                     if($r){
                         $data = [];
                         $data['user_id'] = $GLOBALS['user']['user_pid_3'];
-                        $data['plog_type'] = 4;
+                        $data['plog_type'] = 6;
                         $data['plog_points'] = $points;
                         $data['plog_remarks'] = lang('model/user/reward_tip',[$GLOBALS['user']['user_id'],$GLOBALS['user']['user_name'],$fee_points,$points]);
                         model('Plog')->saveData($data);

application/extra/version.php

@@ -3,7 +3,7 @@ return array (
     'name' => '苹果CMS内容管理系统',
     'copyright' => 'MacCMS',
     'url' => '//github.com/magicblack',
-    'code' => '2020.1000.1070',
+    'code' => '2020.1000.1072',
     'license' => '免费版',
 );
 ?>

application/lang/zh-cn.php

@@ -7,7 +7,7 @@
 *内部处理key：开头 model/、controller/、只在模块内使用
 */
 return [
-    'lang_ver'=>'1069+',
+    'lang_ver'=>'1072+',
     'hello'  => '欢迎使用',
     'maccms_name'=>'苹果CMS-v10',
     'maccms_copyright'=>'© MacCMS All Rights Reserved.',
@@ -67,6 +67,8 @@ return [
     'integral_recharge'=>'积分充值',
     'registration_promotion'=>'注册推广',
     'visit_promotion'=>'访问推广',
+    'one_level_distribution'=>'一级分销',
+    'two_level_distribution'=>'二级分销',
     'three_level_distribution'=>'三级分销',
     'points_upgrade'=>'积分升级',
     'integral_consumption'=>'积分消费',
@@ -341,6 +343,7 @@ return [
     'cj_time'=>'采集时间',
     'reply_time'=>'回复时间',
     'log_time'=>'日志时间',
+    'reg_time'=>'注册时间',
     'related'=>'关联',
 
     'card_no'=>'卡号',

application/lang/zh-tw.php

@@ -7,7 +7,7 @@
 *內部處理key：開頭 model/、controller/、只在模塊內使用
 */
 return [
-    'lang_ver'=>'1069+',
+    'lang_ver'=>'1072+',
     'hello'  => '歡迎使用',
     'maccms_name'=>'蘋果CMS-v10',
     'maccms_copyright'=>'© MacCMS All Rights Reserved.',
@@ -67,6 +67,8 @@ return [
     'integral_recharge'=>'積分充值',
     'registration_promotion'=>'註冊推廣',
     'visit_promotion'=>'訪問推廣',
+    'one_level_distribution'=>'一級分銷',
+    'two_level_distribution'=>'二級分銷',
     'three_level_distribution'=>'三級分銷',
     'points_upgrade'=>'積分升級',
     'integral_consumption'=>'積分消費',
@@ -341,6 +343,7 @@ return [
     'cj_time'=>'采集時間',
     'reply_time'=>'回復時間',
     'log_time'=>'日誌時間',
+    'reg_time'=>'註冊時間',
     'related'=>'關聯',
 
     'card_no'=>'卡號',