diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php index c543d8376..fb9a75346 100644 --- a/crmeb/app/api/controller/v1/PublicController.php +++ b/crmeb/app/api/controller/v1/PublicController.php @@ -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']]); } /** diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php index 586fe4b64..871368eec 100644 --- a/crmeb/app/api/route/v1.php +++ b/crmeb/app/api/route/v1.php @@ -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快捷登陆 diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index bf6d774c5..2ec06fbe7 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -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); -- --------------------------------------------------------