Skip to content

M
my-yaf-project
Commit 6f3daacc authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz_version1

parents 75ccd79f 39eaa762
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 26 deletions
application/models/Business/Goods/GoodsCommonService.php
View file @ 6f3daacc
...@@ -64,6 +64,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -64,6 +64,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
//获得列表 //获得列表
if($datas = $goodsDao->getList(implode($where, ' and '), $this->goodsStorageField)) { if($datas = $goodsDao->getList(implode($where, ' and '), $this->goodsStorageField)) {
foreach ($datas as $key=>$val) { foreach ($datas as $key=>$val) {
$datas[$key]['goodsImage']=\Our\ImageUtil::getGoodsImgUrl($val['goodsImage'],\Our\ApiConst::goodsSmallSize);
$datas[$key]['goodsAttr'] = $goodsDao->getFormatGoodsAttr($val['goodsAttr']); $datas[$key]['goodsAttr'] = $goodsDao->getFormatGoodsAttr($val['goodsAttr']);
} }
} }
......
application/models/Business/Order/RefundService.php
View file @ 6f3daacc
...@@ -428,32 +428,35 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -428,32 +428,35 @@ class RefundServiceModel extends \Business\AbstractModel
$refundReturns = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array($where, $this->storeRefundReturnField, $pageIndex, $pageSize, $order), \Our\ApiConst::oneDaySecond, array($storeId)); $refundReturns = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array($where, $this->storeRefundReturnField, $pageIndex, $pageSize, $order), \Our\ApiConst::oneDaySecond, array($storeId));
$orderGoodsId = array_column($refundReturns['list'], 'orderGoodsId'); $orderGoodsId = array_column($refundReturns['list'], 'orderGoodsId');
$orderIds= array_column($refundReturns['list'], 'orderId');
$orderWhere['order_id']=array('in',$orderIds);
//获得售后商品列表getOrderGoodsByRecIds //获得售后商品列表getOrderGoodsByRecIds
if (!empty($orderGoodsId)) { if (!empty($orderGoodsId)) {
$orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($orderWhere, "goods_amount as goods_amount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
$orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByRecIds'), array($orderGoodsId, $this->refundOrderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId)); $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByRecIds'), array($orderGoodsId, $this->refundOrderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
$refundGoods = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId'); $refundMerge = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId');
$refundMerge = Common::intergrateOneToOne($refundGoods, $orders, 'orderId', 'orderId'); $orderIds= array_column($refundMerge, 'orderId');
$refundMerge =Common::intergrateOneToOne($refundMerge,$orderCommons,'orderId','orderId'); $orderWhere['order_id']=array('in',$orderIds);
$orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($orderWhere, "order_id as orderId,goods_amount as goodsAmount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", ApiConst::zero, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
$orders=$orderDao->convertOrder($orders['list'],'orderId');
$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
$orderCommons=$orderDao->convertOrder($orderCommons,'orderId');
foreach ($refundMerge as &$value) { foreach ($refundMerge as &$value) {
$value['stateName'] = $refundReturnDao->getRefundTextStatus($value); $value['stateName'] = $refundReturnDao->getRefundTextStatus($value);
/*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero; /*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero;
$value['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero; $value['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero;
$value['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($value) ? ApiConst::one : ApiConst::zero;*/ $value['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($value) ? ApiConst::one : ApiConst::zero;*/
$value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额 // $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
$value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount']; // $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
// $value['orderAmount'] = $value['orderAmount']; // $value['orderAmount'] = $value['orderAmount'];
$value['reciverInfo'] = unserialize($value['reciverInfo']); $value['reciverInfo'] = unserialize($orderCommons['reciverInfo']);
$value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin)); $value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
$value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius; $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
$value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize); $value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize);
$value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']); $value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']);
$extent=$orderDao->getClienOrderCommon($orders[$value['orderId']]);
$value=array_merge($value,$extent);
$goodGroup=unserialize($value['goodsGroup']); $goodGroup=unserialize($value['goodsGroup']);
$value['goodsGroup']=!empty($goodGroup)?$goodGroup:[]; $value['goodsGroup']=!empty($goodGroup)?$goodGroup:[];
if ($value['refundType'] == ApiConst::refundTypeGoods) { if ($value['refundType'] == ApiConst::refundTypeGoods) {
...@@ -463,6 +466,10 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -463,6 +466,10 @@ class RefundServiceModel extends \Business\AbstractModel
} else { } else {
$value['reciverInfo'] = new \stdClass(); $value['reciverInfo'] = new \stdClass();
} }
$value['picInfo']=unserialize($value['picInfo']);
if(!empty($value['picInfo'])){
$value['picInfo'] = $refundReturnDao->getRefundPics($value['picInfo']['buyer']);
}
unset($value['goodsSpec']); unset($value['goodsSpec']);
// unset($value['picInfo']); // unset($value['picInfo']);
} }
...@@ -875,10 +882,8 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -875,10 +882,8 @@ class RefundServiceModel extends \Business\AbstractModel
if(!empty($refundReturn['picInfo'])){ if(!empty($refundReturn['picInfo'])){
$refundReturn['picInfo'] = $refundReturnDao->getRefundPics($refundReturn['picInfo']['buyer']); $refundReturn['picInfo'] = $refundReturnDao->getRefundPics($refundReturn['picInfo']['buyer']);
} }
$refundReturn['couponAmount'] = ($order['goodsAmount'] + $order['shippingFee']) - $order['orderAmount'];//优惠券金额 $orderExtent=$orderDao->getClienOrderCommon($order);
$refundReturn['orderAmount'] = $order['orderAmount'] ; $refundReturn=array_merge($refundReturn,$orderExtent);
$refundReturn['goodsAmount']=$order['goodsAmount'];
$refundReturn['shippingFee']=$order['shippingFee'];
// $value['orderAmount'] = $value['orderAmount']; // $value['orderAmount'] = $value['orderAmount'];
$refundReturn['reciverInfo'] = unserialize($this->orderCommon['reciverInfo']); $refundReturn['reciverInfo'] = unserialize($this->orderCommon['reciverInfo']);
if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) { if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
...@@ -893,6 +898,7 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -893,6 +898,7 @@ class RefundServiceModel extends \Business\AbstractModel
$refundReturn['platformStateName'] = ArrayConst::platformState[$refundReturn['platformState']]; $refundReturn['platformStateName'] = ArrayConst::platformState[$refundReturn['platformState']];
$refundReturn['refundShippingTypeName'] = ArrayConst::refundShippingType[$refundReturn['refundShippingType']]['name']; $refundReturn['refundShippingTypeName'] = ArrayConst::refundShippingType[$refundReturn['refundShippingType']]['name'];
$refundReturn['refundText'] = $refundReturnDao->getRefundTextStatus($refundReturn); $refundReturn['refundText'] = $refundReturnDao->getRefundTextStatus($refundReturn);
$refundReturn['stateName']=$refundReturn['refundText'];
$refundReturn['goodsImage'] = ImageUtil::getGoodsImgUrl($refundReturn['goodsImage'], ApiConst::goodsSmallSize); $refundReturn['goodsImage'] = ImageUtil::getGoodsImgUrl($refundReturn['goodsImage'], ApiConst::goodsSmallSize);
//$addressDao = \DAO\Order\DAddressModel::getInstance(); //$addressDao = \DAO\Order\DAddressModel::getInstance();
$info = $refundReturn; $info = $refundReturn;
......
application/models/Business/Store/ShopkeeperService.php
View file @ 6f3daacc
...@@ -308,6 +308,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -308,6 +308,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
if ($this->clientType && $this->clientType == NameConst::pcClient) { if ($this->clientType && $this->clientType == NameConst::pcClient) {
$value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额 $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
$value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount']; $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
// $value['orderAmount'] = $value['orderAmount']; // $value['orderAmount'] = $value['orderAmount'];
$value['reciverInfo'] = unserialize($value['reciverInfo']); $value['reciverInfo'] = unserialize($value['reciverInfo']);
$value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin)); $value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
...@@ -468,6 +469,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -468,6 +469,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
} }
$fields = $orderDao->getFields(); $fields = $orderDao->getFields();
$this->order = $orderDao->getConvertOrder($order, $fields); $this->order = $orderDao->getConvertOrder($order, $fields);
//收货人地址 //收货人地址
//收货人信息 //收货人信息
$this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond); $this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond);
......
application/models/DAO/Order/Order.php
View file @ 6f3daacc
...@@ -45,7 +45,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -45,7 +45,7 @@ class OrderModel extends \DAO\AbstractModel
public function getOrderDetailField() public function getOrderDetailField()
{ {
return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate,diliveryman_id as diliverymanId,shipping_arrival_time as shippingArrivalTime,delivery_time as deliveryTime'; return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate,diliveryman_id as diliverymanId,shipping_arrival_time as shippingArrivalTime,delivery_time as deliveryTime,order_note as orderNote';
} }
public function getOrderShippingField() public function getOrderShippingField()
...@@ -999,6 +999,16 @@ class OrderModel extends \DAO\AbstractModel ...@@ -999,6 +999,16 @@ class OrderModel extends \DAO\AbstractModel
return $convertResult; return $convertResult;
} }
public function convertOrder($orders, $field)
{
$convertResult = array();
foreach ($orders as $key => $value) {
$convertResult[$value[$field]] = $value;
}
return $convertResult;
}
public function getFields() public function getFields()
{ {
return array( return array(
...@@ -1025,6 +1035,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -1025,6 +1035,7 @@ class OrderModel extends \DAO\AbstractModel
'buyerId' => 'buyer_id', 'buyerId' => 'buyer_id',
'deliveryTime' => 'delivery_time', 'deliveryTime' => 'delivery_time',
'evaluationState'=>'evaluation_state', 'evaluationState'=>'evaluation_state',
'orderNote'=>'order_note'
); );
} }
......
application/views/qa/test.html 0 → 100644
View file @ 6f3daacc
<table class="" style="test-align:center">
<tbody>
<tr>
<td> 订单状态(orderState)</td>
<td> 配送类型(shippingType)</td>
<td> 支付状态（isReceivePayment）</td>
<td><span style="color: rgb(51, 51, 51); font-family: " arial="" negreta",="" arial;="" font-size:="" 13px;=""
font-weight:="" 700;="" text-align:="" center;="" white-space:="" normal;"="">订单状态（列表文案）</span> </td>
<td> 商品额外文案</td>
<td> 状态/倒计时</td>
<td> 店家操作</td>
</tr>
<tr>
<td> 20</td>
<td></td>
<td> 1541568512（大于0的时间戳）</td>
<td> 待接单</td>
<td></td>
<td> 请尽快确认订单<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
剩余关闭时间：5分 23秒</p></td>
<td> 接单</td>
</tr>
<tr>
<td> 20</td>
<td></td>
<td> 0</td>
<td> 待接单</td>
<td></td>
<td> 请尽快确认订单<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
剩余关闭时间：5分 23秒</p></td>
<td> 修改价格<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
确认收款</p>
<p style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
接单</p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待付款</td>
<td></td>
<td> 待线上付款</td>
<td> 修改价格</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待配送</td>
<td> {售后状态}<span
style="font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal; color: rgb(0, 0, 0);">（可能存在）</span>
</td>
<td> 待配送</td>
<td> 选择配送人员<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
打印订单</p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待配送</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 待配送</td>
<td> 修改价格<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
确认收款</p>
<p style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
<span style="color: rgb(0, 0, 0);">选择配送人员</span></p>
<p style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
<span style="color: rgb(0, 0, 0);">打印订单</span></p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待自提</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 待到店自取</td>
<td> 修改价格<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
确认收款</p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待自提</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 待到店自取</td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 已完成</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 订单已完成</td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 已取消</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 已取消<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
{取消原因}（orderNote）</p></td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 已关闭</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 已关闭<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
{关闭原因}(orderNodte)</p></td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table><p><br></p>
\ No newline at end of file
conf/application.ini
View file @ 6f3daacc
...@@ -284,31 +284,31 @@ push.open=1 ...@@ -284,31 +284,31 @@ push.open=1
[ccwdevelop : common] [ccwdevelop : common]
; 数据库配置 ; 数据库配置
resources.database.params.driver = "pdo_mysql" resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "192.168.80.18" resources.database.params.hostname = "127.0.0.1"
resources.database.params.port = 3306 resources.database.params.port = 3306
resources.database.params.database = "qmcs" resources.database.params.database = "qmcs"
resources.database.params.username = "root" resources.database.params.username = "root"
resources.database.params.password = "123456" resources.database.params.password = "root"
resources.database.params.charset = "UTF8" resources.database.params.charset = "UTF8"
resources.database.params.driver_options.1002 = "SET NAMES utf8" resources.database.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置 ; 从库配置
resources.database.slave.params.driver = "pdo_mysql" resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "192.168.80.18" resources.database.slave.params.hostname = "127.0.0.1"
resources.database.slave.params.port = 3306 resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs" resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "root" resources.database.slave.params.username = "root"
resources.database.slave.params.password = "123456" resources.database.slave.params.password = "root"
resources.database.slave.params.charset = "UTF8" resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8" resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置 ; 从库配置
resources.database.drawSource.params.driver = "pdo_mysql" resources.database.drawSource.params.driver = "pdo_mysql"
resources.database.drawSource.params.hostname = "192.168.80.18" resources.database.drawSource.params.hostname = "127.0.0.1"
resources.database.drawSource.params.port = 3306 resources.database.drawSource.params.port = 3306
resources.database.drawSource.params.database = "drawSource" resources.database.drawSource.params.database = "drawSource"
resources.database.drawSource.params.username = "root" resources.database.drawSource.params.username = "root"
resources.database.drawSource.params.password = "123456" resources.database.drawSource.params.password = "root"
resources.database.drawSource.params.charset = "UTF8" resources.database.drawSource.params.charset = "UTF8"
resources.database.drawSource.params.driver_options.1002 = "SET NAMES utf8" resources.database.drawSource.params.driver_options.1002 = "SET NAMES utf8"
...@@ -324,10 +324,10 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8" ...@@ -324,10 +324,10 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
password.key='~!@#$`1234qwertasdfgzxcvb'; password.key='~!@#$`1234qwertasdfgzxcvb';
redis.database.params.host = "127.0.0.1" redis.database.params.host = "192.168.1.201"
redis.database.params.port = "6379" redis.database.params.port = "6379"
redis.database.params.prefix = "qm_" redis.database.params.prefix = "qm_"
redis.database.params.password = "23456ertyu" redis.database.params.password = ""
out.config="/data/config"; out.config="/data/config";
;锁文件 ;锁文件
...@@ -336,8 +336,8 @@ out.locks="/data/locks"; ...@@ -336,8 +336,8 @@ out.locks="/data/locks";
;redis.database.params.password = "test" ;redis.database.params.password = "test"
;推送配置 ;推送配置
push.clientHost="ws://192.168.80.18:9502" push.clientHost="ws://192.168.1.201:9502"
push.host="192.168.80.18" push.host="192.168.1.201"
push.port="9503" push.port="9503"
push.open=1 push.open=1
push.user.service.id=293 push.user.service.id=293
......
public/clienttest/shopkeeper/warning.php 0 → 100644
View file @ 6f3daacc
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>简单的html5 File测试 for pic2base64</title>
<style>
</style>
</head>
<body>
<form action="/client/shopkeeper/warning" method="post">
用户登录状态key:<input name="data[key]" value="91d068d63d3658922ed683e8969c8036"/><br />
<p id="img_area"></p>
<input type="submit" value="提交">
</form>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment