From ee875d054cad4efb24812d6d70ff6b19badaf819 Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Mon, 14 Dec 2020 09:12:30 +0800
Subject: [PATCH] 头像全路径
---
application/api/controller/User.php | 26 ++++++++++++++------------
public/api.html | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 115 insertions(+), 35 deletions(-)
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index e322ae5..cb5c6fe 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -36,7 +36,7 @@ class User extends Base
* @ApiReturn({
"code": 1,
"msg": "用户信息",
- "time": "1607588102",
+ "time": "1607908165",
"data": {
"id": 1, //用户ID
"group_id": 1, //分组ID
@@ -44,18 +44,19 @@ class User extends Base
"avatar": "shuoshenme", //头像
"money": "0.00", //余额
"score": 0, //积分
- "token": "1419ae8b-dd47-4ab5-9c10-c88d42dc4cb3", //token
- "user_id": 1, // 用户ID
- "createtime": 1607397247, //注册时间
- "expiretime": 1609989247, //token过期时间
- "expires_in": 2401145, //过期时间段
- "group": { //分组
- "name": "默认组", //分组名称
- "image": "http://www.ant.top" //分组图片
+ "token": "1419ae8b-dd47-4ab5-9c10-c88d42dc4cb3",
+ "user_id": 1,
+ "createtime": 1607397247,
+ "expiretime": 1609989247,
+ "expires_in": 2081082,
+ "group": {
+ "name": "默认组",
+ "image": "http://www.ant.top"
},
"coupons_num": 0, //优惠券数量
- "is_store": 0, //是否是店铺管理员:0=否,1=是
- "store_id": 0 //店铺ID
+ "is_store": 1,
+ "store_id": 1,
+ "avatar_full": "http://www.ant.topshuoshenme" //头像全路径
}
})
*/
@@ -80,7 +81,8 @@ class User extends Base
// 只有一个店铺 直接进入店铺
$data['store_id'] = $userStores[0]['store_id'];
}
-
+ // 头像全路径
+ $data['avatar_full'] = cdnurl($data['avatar'],true);
$this->success('用户信息', $data);
}
diff --git a/public/api.html b/public/api.html
index dc8929f..3099f22 100755
--- a/public/api.html
+++ b/public/api.html
@@ -1559,7 +1559,7 @@
<div class="panel-heading" id="heading-13">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion13" href="#collapseOne13"> <span class="text-muted">addons/shopro/coupons/index</span></a>
+ <a data-toggle="collapse" data-parent="#accordion13" href="#collapseOne13"> <span class="text-muted">/api/coupons/index</span></a>
</h4>
</div>
<div id="collapseOne13" class="panel-collapse collapse">
@@ -1603,7 +1603,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="addons/shopro/coupons/index" method="get" name="form13" id="form13">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/coupons/index" method="get" name="form13" id="form13">
<div class="form-group">
无
</div>
@@ -4135,7 +4135,7 @@
<div class="panel-heading" id="heading-14">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion14" href="#collapseOne14"> <span class="text-muted">addons/shopro/coupons/lists</span></a>
+ <a data-toggle="collapse" data-parent="#accordion14" href="#collapseOne14"> <span class="text-muted">/api/coupons/lists</span></a>
</h4>
</div>
<div id="collapseOne14" class="panel-collapse collapse">
@@ -4179,7 +4179,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="addons/shopro/coupons/lists" method="get" name="form14" id="form14">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/coupons/lists" method="get" name="form14" id="form14">
<div class="form-group">
无
</div>
@@ -4319,7 +4319,7 @@
<div class="panel-heading" id="heading-15">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion15" href="#collapseOne15"> <span class="text-muted">addons/shopro/coupons/get</span></a>
+ <a data-toggle="collapse" data-parent="#accordion15" href="#collapseOne15"> <span class="text-muted">/api/coupons/get</span></a>
</h4>
</div>
<div id="collapseOne15" class="panel-collapse collapse">
@@ -4363,7 +4363,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="addons/shopro/coupons/get" method="get" name="form15" id="form15">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/coupons/get" method="get" name="form15" id="form15">
<div class="form-group">
无
</div>
@@ -4411,7 +4411,7 @@
<div class="panel-heading" id="heading-16">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion16" href="#collapseOne16"> <span class="text-muted">addons/shopro/coupons/detail</span></a>
+ <a data-toggle="collapse" data-parent="#accordion16" href="#collapseOne16"> <span class="text-muted">/api/coupons/detail</span></a>
</h4>
</div>
<div id="collapseOne16" class="panel-collapse collapse">
@@ -4455,7 +4455,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="addons/shopro/coupons/detail" method="get" name="form16" id="form16">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/coupons/detail" method="get" name="form16" id="form16">
<div class="form-group">
无
</div>
@@ -4503,7 +4503,7 @@
<div class="panel-heading" id="heading-17">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion17" href="#collapseOne17"> <span class="text-muted">addons/shopro/coupons/goods</span></a>
+ <a data-toggle="collapse" data-parent="#accordion17" href="#collapseOne17"> <span class="text-muted">/api/coupons/goods</span></a>
</h4>
</div>
<div id="collapseOne17" class="panel-collapse collapse">
@@ -4547,7 +4547,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="addons/shopro/coupons/goods" method="get" name="form17" id="form17">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/coupons/goods" method="get" name="form17" id="form17">
<div class="form-group">
无
</div>
@@ -7783,7 +7783,84 @@
<div class="tab-pane" id="sample27">
<div class="row">
<div class="col-md-12">
- <pre id="sample_response27">无</pre>
+ <pre id="sample_response27">{
+ "code": 1,
+ "msg": "秒杀商品列表",
+ "time": "1607734877",
+ "data": {
+ "total": 1, //数据总数
+ "per_page": 10,
+ "current_page": 1,
+ "last_page": 1,
+ "data": [{
+ "id": 1, //商品ID
+ "type": "normal",
+ "title": "测试商品", //标题
+ "subtitle": "测试啊", //副标题
+ "weigh": 0,
+ "category_ids": "3", //所属分类ID
+ "image": "http://www.ant.top/assets/img/qrcode.png", //商品主图
+ "price": "0.01", //商品价格
+ "original_price": "10000.00", //原价
+ "is_sku": 0,
+ "likes": 0,
+ "views": 3,
+ "sales": 0, //销量
+ "show_sales": 0, //显示销量
+ "dispatch_type": "express",
+ "dispatch_ids": "1",
+ "deletetime": null,
+ "activity": {
+ "id": 7,
+ "title": "秒杀测试",
+ "type": "seckill",
+ "richtext_id": 0,
+ "richtext_title": "",
+ "starttime": 1607616000,
+ "endtime": 1607702400,
+ "rules": {
+ "limit_buy": "1",
+ "order_auto_close": "",
+ "activity_auto_close": ""
+ }
+ },
+ "activity_type": "seckill",
+ "sku_price": [{
+ "id": 1,
+ "goods_sku_ids": null,
+ "goods_id": 1,
+ "weigh": 0,
+ "image": null,
+ "stock": 20,
+ "sales": 0,
+ "sn": "",
+ "weight": 0,
+ "price": "0.01",
+ "goods_sku_text": null,
+ "status": "up",
+ "activity_type": "seckill",
+ "activity_id": 7,
+ "item_goods_sku_price": {
+ "id": 4,
+ "activity_id": 7,
+ "sku_price_id": 1,
+ "goods_id": 1,
+ "stock": 20,
+ "sales": 0,
+ "price": "0.01",
+ "status": "up"
+ },
+ "goods_sku_id_arr": [
+ ""
+ ]
+ }],
+ "stock": 20,
+ "dispatch_type_arr": [
+ "express"
+ ]
+ }]
+ }
+ }</pre>
</div>
</div>
</div><!-- #sample -->
@@ -10268,7 +10345,7 @@
<pre id="sample_response80">{
"code": 1,
"msg": "用户信息",
- "time": "1607588102",
+ "time": "1607908165",
"data": {
"id": 1, //用户ID
"group_id": 1, //分组ID
@@ -10276,18 +10353,19 @@
"avatar": "shuoshenme", //头像
"money": "0.00", //余额
"score": 0, //积分
- "token": "1419ae8b-dd47-4ab5-9c10-c88d42dc4cb3", //token
- "user_id": 1, // 用户ID
- "createtime": 1607397247, //注册时间
- "expiretime": 1609989247, //token过期时间
- "expires_in": 2401145, //过期时间段
- "group": { //分组
- "name": "默认组", //分组名称
- "image": "http://www.ant.top" //分组图片
+ "token": "1419ae8b-dd47-4ab5-9c10-c88d42dc4cb3",
+ "user_id": 1,
+ "createtime": 1607397247,
+ "expiretime": 1609989247,
+ "expires_in": 2081082,
+ "group": {
+ "name": "默认组",
+ "image": "http://www.ant.top"
},
"coupons_num": 0, //优惠券数量
- "is_store": 0, //是否是店铺管理员:0=否,1=是
- "store_id": 0 //店铺ID
+ "is_store": 1,
+ "store_id": 1,
+ "avatar_full": "http://www.ant.topshuoshenme" //头像全路径
}
}</pre>
</div>
@@ -11081,7 +11159,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2020-12-12 09:00:17 </div>
+ Generated on 2020-12-14 09:11:58 </div>
<div class="col-md-6" align="right">
<a href="./" target="_blank">My Website</a>
</div>
--
libgit2 0.24.0