From d8729dfcc9810797060fa926cf2eb007cdde294c Mon Sep 17 00:00:00 2001 From: devil_gong Date: Mon, 5 Nov 2018 15:17:25 +0800 Subject: [PATCH] upd --- service/Application/Common/Conf/master.php | 6 +++--- .../Service/AlipayLifeService.class.php | 14 +++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/service/Application/Common/Conf/master.php b/service/Application/Common/Conf/master.php index 5e87863b2..9d92b3248 100755 --- a/service/Application/Common/Conf/master.php +++ b/service/Application/Common/Conf/master.php @@ -11,9 +11,9 @@ return array( // 数据库配置信息 'DB_TYPE' => 'mysql', // 数据库类型 'DB_HOST' => '127.0.0.1', // 服务器地址 - 'DB_NAME' => 'shopxo', // 数据库名 - 'DB_USER' => 'shopxotest', // 用户名 - 'DB_PWD' => 'ShopXO#123@test', // 密码 + 'DB_NAME' => 'demo_shopxo', // 数据库名 + 'DB_USER' => 'demo_shopxo', // 用户名 + 'DB_PWD' => 'XMSHriXTyHjTJa4f', // 密码 'DB_PORT' => 3306, // 端口 'DB_PARAMS' => array(), // 数据库连接参数 'DB_PREFIX' => 's_', // 数据库表前缀 diff --git a/service/Application/Service/AlipayLifeService.class.php b/service/Application/Service/AlipayLifeService.class.php index 3500dd7f9..f88c6fc86 100755 --- a/service/Application/Service/AlipayLifeService.class.php +++ b/service/Application/Service/AlipayLifeService.class.php @@ -89,7 +89,7 @@ class AlipayLifeService 'alipay_life_message_id' => intval($params['message_id']), 'title' => I('title', '', null, $params), 'content' => I('content', '', null, $params), - 'url' => I('url', '', null, $params), + 'url' => isset($params['url']) ? $params['url'] : '', 'action_name' => I('action_name', '', null, $params), 'image_url' => isset($params['image_url']) ? $params['image_url'] : '', 'add_time' => time(), @@ -112,16 +112,24 @@ class AlipayLifeService if($alipay_life_message['send_type'] == 1 && !empty($alipay_life_message['alipay_life_ids'])) { $alipay_life_ids = json_decode($alipay_life_message['alipay_life_ids'], true); - $$alipay_life_id = isset($alipay_life_ids[0]) ? $alipay_life_ids[0] : ''; + $alipay_life_id = isset($alipay_life_ids[0]) ? $alipay_life_ids[0] : ''; } else { $alipay_life_id = M('AlipayLifeUser')->where(['id'=>$alipay_life_message['alipay_life_user_id']])->getField('alipay_life_id'); } + } else { + return DataReturn('消息主数据有误', -5); } if(!empty($alipay_life_id)) { $obj = new \Library\AlipayLife(['life_data'=>M('AlipayLife')->find($alipay_life_id)]); $res = $obj->UploadImage(['file'=>ROOT_PATH.substr($data['image_url'], 1)]); - $data['out_image_url'] = (isset($res['status']) && $res['status'] == 0) ? $res['data'] : ''; + if($res['status'] != 0) + { + return DataReturn($res['msg'], -10); + } + $data['out_image_url'] = $res['data']; + } else { + return DataReturn('消息生活号id有误', -10); } } }