github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 14:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

Browse Source
This commit is contained in:
liaofei 2023-06-21 15:59:00 +08:00
commit f497b8fa6e
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crmeb/app/api/controller/v1/PublicController.php
View File

@ -643,7 +643,8 @@ class PublicController
*/
public function getVersion()
{
return app('json')->success(['version' => get_crmeb_version()]);
$version = parse_ini_file(app()->getRootPath() . '.version');
return app('json')->success(['version' => $version['version'], 'version_code' => $version['version_code']]);
}
/**

2
crmeb/app/api/route/v1.php
View File

@ -21,7 +21,7 @@ Route::group(function () {
Route::any('order_call_back', 'v1.order.StoreOrderController/callBack')->option(['real_name' => '商家寄件回调']);//商家寄件回调
Route::get('get_script', 'v1.PublicController/getScript')->option(['real_name' => '获取统计代码']);//获取统计代码
Route::get('version', 'v1.PublicController/getVersion')->option(['real_name' => '获取代码版本号']);
})->option(['mark' => 'serve', 'mark_name' => '服务接口']);
})->middleware(\app\http\middleware\AllowOriginMiddleware::class)->option(['mark' => 'serve', 'mark_name' => '服务接口']);
Route::group(function () {
//apple快捷登陆

7
crmeb/public/install/crmeb.sql
View File

@ -33773,12 +33773,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
(443, 'hw_secretKey', 'text', 'input', 111, '', 1, '', 100, 0, '\"\"', '华为云secretKey', '华为云secretKey', 0, 1),
(444, 'ty_secretKey', 'text', 'input', 112, '', 1, '', 100, 0, '\"\"', '天翼云secretKey', '天翼云secretKey', 0, 1),
(445, 'ty_accessKey', 'text', 'input', 112, '', 1, '', 100, 0, '\"\"', '天翼云accessKey', '天翼云accessKey', 0, 1),
(446, 'coupon_return_open', 'radio', 'input', 27, '1=>退还\n0=>不退还', 1, '', 0, 0, '\"1\"', '优惠券退还状态', '优惠券是否退回开关，商品成功退款后，退回/不退回使用的优惠券', 0, 1),
(447, 'yihaotong_sms_appid', 'text', 'input', 18, '', 1, '', 0, 0, '\"\"', '短信服务AppId', '一号通应用管理内短信服务的appid，不填写则使用默认的应用appid', 0, 1),
(448, 'yihaotong_send_appid', 'text', 'input', 18, '', 1, '', 0, 0, '\"\"', '商家寄件AppId', '一号通应用管理内商家寄件的appid，不填写则使用默认的应用appid', 0, 1),
(449, 'yihaotong_face_appid', 'text', 'input', 18, '', 1, '', 100, 0, '\"\"', '面单打印AppId', '一号通应用管理内面单打印的appid，不填写则使用默认的应用appid', 0, 1),
(450, 'yihaotong_express_appid', 'text', 'input', 18, '', 1, '', 100, 0, '\"\"', '物流查询AppId', '一号通应用管理内物流查询的appid，不填写则使用默认的应用appid', 0, 1),
(451, 'yihaotong_copy_appid', 'text', '', 18, '', 1, '', 100, 0, '\"\"', '商品采集AppId', '一号通应用管理内商品采集的appid，不填写则使用默认的应用appid', 0, 1);
(446, 'coupon_return_open', 'radio', 'input', 27, '1=>退还\n0=>不退还', 1, '', 0, 0, '\"1\"', '优惠券退还状态', '优惠券是否退回开关，商品成功退款后，退回/不退回使用的优惠券', 0, 1);
-- --------------------------------------------------------