From ce990d3181bda44d07b6de0ce2a8c38d065524fd Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 14 May 2020 09:50:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/ApplyService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php index 9db28b296..7a6eb7355 100644 --- a/Application/Base/Service/ApplyService.class.php +++ b/Application/Base/Service/ApplyService.class.php @@ -60,7 +60,7 @@ class ApplyService { $promoteIds = array_merge($promoteIds, array_column($children, 'id')); $conditions['promote_id'] = ['in', $promoteIds]; } - M('apply', 'tab_')->where($conditions)->save(['offline_status' => 1]); + M('apply', 'tab_')->where($conditions)->save(['offline_status' => 1, 'enable_status' => 0]); } public function updateAfterPack($apply, $packageUrl, $plistUrl) From 4b852cf071419f3bfa4203f5f1d6f942eb77dac9 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 14 May 2020 10:07:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/ApplyService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php index 7a6eb7355..9db28b296 100644 --- a/Application/Base/Service/ApplyService.class.php +++ b/Application/Base/Service/ApplyService.class.php @@ -60,7 +60,7 @@ class ApplyService { $promoteIds = array_merge($promoteIds, array_column($children, 'id')); $conditions['promote_id'] = ['in', $promoteIds]; } - M('apply', 'tab_')->where($conditions)->save(['offline_status' => 1, 'enable_status' => 0]); + M('apply', 'tab_')->where($conditions)->save(['offline_status' => 1]); } public function updateAfterPack($apply, $packageUrl, $plistUrl) From 1c5a02594abe3e8f236c02fb9809ffeb64148b54 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 15 May 2020 09:48:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ToolController.class.php | 4 +- Application/Admin/View/Tool/age.html | 45 ++++++++++++++-- Application/Admin/View/Tool/smsset.html | 51 +++++++++++++++++++ 3 files changed, 95 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 7fda82955..20f4c5928 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -149,7 +149,7 @@ class ToolController extends ThinkController { */ public function smsset($value='') { - $this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang"); + $this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang,juhedata"); $this->meta_title = '短信设置'; $this->m_title = '短信设置'; @@ -166,7 +166,7 @@ class ToolController extends ThinkController { */ public function age($value='') { - $this->BaseConfig("tool_age"); + $this->BaseConfig("tool_age,juhe_age"); $this->meta_title = '实名认证'; $this->m_title = '实名认证'; diff --git a/Application/Admin/View/Tool/age.html b/Application/Admin/View/Tool/age.html index f71d1de6c..959a7d60f 100644 --- a/Application/Admin/View/Tool/age.html +++ b/Application/Admin/View/Tool/age.html @@ -4,6 +4,10 @@
+

{$meta_title}

用于配置实名认证相关参数的功能；需要到阿里云创建实名认证接口参数

@@ -35,8 +39,8 @@ 短信设置启用状态 - - + + @@ -44,8 +48,43 @@ + +
+
+
+ + + + + + + + + + + + +
Appkey + + 阿里云实名认证接口 控制台->云市场->appcode +
启用状态 + + + + + 短信设置启用状态 +
+ + +
+
+
- +
diff --git a/Application/Admin/View/Tool/smsset.html b/Application/Admin/View/Tool/smsset.html index 600385b37..9c9c803fc 100644 --- a/Application/Admin/View/Tool/smsset.html +++ b/Application/Admin/View/Tool/smsset.html @@ -10,6 +10,7 @@
  • 极光
  • 阿里大鱼（新）
  • 中网
    • +
  • 聚合数据

    • {$meta_title}

    用于配置短信通知功能相关参数的功能

    @@ -347,6 +348,56 @@
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    模板id + + 模板id +
    AppKey + + AppKey +
    每日IP发送数量 + + 0或空则不限制 +
    启用状态 + + + + + 短信设置启用状态 +
    + + + +
    +
    +
    From 192974e52d6aa189f485e1549c5aa4fe89ad8612 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 15 May 2020 13:59:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0sql=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 830ee62f2..57205c85b 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1748,4 +1748,8 @@ ALTER TABLE `sj_game_user`.`sj_user` ADD COLUMN `platform_account` varchar(60) NULL COMMENT '游戏渠道玩家账号' AFTER `age_type`; ALTER TABLE `tab_deposit` ADD COLUMN `old_change_promote_id` int(11) NULL DEFAULT 0 COMMENT '修改配置前渠道' , -ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置前渠道账号' ; \ No newline at end of file +ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置前渠道账号' ; + +--聚合渠道结算单 zyx 20200515 +INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhedata', '聚合数据', '{\"tpl_id\":\"215303\",\"key\":\"1aa07a33b6d6408e835e416fafcd6f22\",\"limit\":\"\",\"status\":\"1\"}', NULL, 1, 1, 1589361782); +INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhe_age', '聚合身份认证', '{\"appkey\":\"80427f4769c6938f12a870f51014ddbe\",\"status\":\"1\"}', NULL, 1, 1, 1464164373);