-
diff --git a/application/common.php b/application/common.php
index d4ce11c20..7fff39ba7 100755
--- a/application/common.php
+++ b/application/common.php
@@ -990,19 +990,31 @@ function FileSizeByteToUnit($bit)
*/
function SyncJob($url, $port = 80, $time = 30)
{
- $url_str = str_replace(array('http://', 'https://'), '', $url);
- $location = strpos($url_str, '/');
- $host = substr($url_str, 0, $location);
- $fp = fsockopen($host, $port, $errno, $errstr, $time);
- if($fp)
+ // curl
+ if(function_exists('curl_init'))
{
- $out = "GET ".str_replace($host, '', $url_str)." HTTP/1.1\r\n";
- $out .= "Host: ".$host."\r\n";
- $out .= "Content-type: application/x-www-form-urlencoded\r\n";
- $out .= "Connection: Close\r\n\r\n";
- fputs($fp, $out);
- fclose($fp);
+ CurlGet($url, 1);
+ return true;
+
+ // fsockopen
+ } elseif(function_exists('fsockopen'))
+ {
+ $url_str = str_replace(array('http://', 'https://'), '', $url);
+ $location = strpos($url_str, '/');
+ $host = substr($url_str, 0, $location);
+ $fp = fsockopen($host, $port, $errno, $errstr, $time);
+ if($fp)
+ {
+ $out = "GET ".str_replace($host, '', $url_str)." HTTP/1.1\r\n";
+ $out .= "Host: ".$host."\r\n";
+ $out .= "Content-type: application/x-www-form-urlencoded\r\n";
+ $out .= "Connection: Close\r\n\r\n";
+ fputs($fp, $out);
+ fclose($fp);
+ }
+ return true;
}
+ return false;
}
/**
@@ -1597,11 +1609,13 @@ function CurlGet($url, $timeout = 10)
* @param [string] $url [请求地址]
* @param [array] $post [发送的post数据]
* @param [boolean] $is_json [是否使用 json 数据发送]
+ * @param [int] $timeout [超时时间]
* @return [mixed] [请求返回的数据]
*/
-function CurlPost($url, $post, $is_json = false)
+function CurlPost($url, $post, $is_json = false, $timeout = 30)
{
$ch = curl_init();
+ curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_HEADER, false);
diff --git a/application/index/view/default/buy/index.html b/application/index/view/default/buy/index.html
index 8559f7c50..96d2cb02e 100755
--- a/application/index/view/default/buy/index.html
+++ b/application/index/view/default/buy/index.html
@@ -225,44 +225,6 @@
{{/if}}
-
- {{if $common_order_is_booking neq 1}}
- -- {{/if}} - - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} -
选择支付
- {{if !empty($payment_list)}} --
- {{foreach $payment_list as $payment}}
-
-
- {{if !empty($payment.logo)}}
-
- {{/if}} - {{$payment.name}} - -
- {{/foreach}}
-
没有支付方式- {{/if}} -- plugins_view_buy_payment_bottom -- {{/if}} - {{if !empty($plugins_view_buy_payment_bottom_data) and is_array($plugins_view_buy_payment_bottom_data)}} - {{foreach $plugins_view_buy_payment_bottom_data as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} - {{/if}} - {{/foreach}} - {{/if}} - -订单信息
@@ -549,9 +511,47 @@ {{/foreach}} {{/if}} + + + {{if $common_order_is_booking neq 1}} +++ {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +选择支付
+ {{if !empty($payment_list)}} +-
+ {{foreach $payment_list as $payment}}
+
-
+ {{if !empty($payment.logo)}}
+
+ {{/foreach}}
+
没有支付方式+ {{/if}} ++ plugins_view_buy_payment_bottom ++ {{/if}} + {{if !empty($plugins_view_buy_payment_bottom_data) and is_array($plugins_view_buy_payment_bottom_data)}} + {{foreach $plugins_view_buy_payment_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + -+diff --git a/application/index/view/default/public/footer_nav.html b/application/index/view/default/public/footer_nav.html index 2ec0f3421..61667bf62 100755 --- a/application/index/view/default/public/footer_nav.html +++ b/application/index/view/default/public/footer_nav.html @@ -89,17 +89,17 @@ {{$Think.APPLICATION_VERSION}} {{if !empty($home_site_icp)}} -+
{{/if}} {{if !empty($home_site_security_record_name)}} -+
-
diff --git a/application/service/AppMiniService.php b/application/service/AppMiniService.php index 807f5c174..efac95391 100755 --- a/application/service/AppMiniService.php +++ b/application/service/AppMiniService.php @@ -622,7 +622,7 @@ class AppMiniService if(is_array($config) && isset($config['plugins'])) { $config['plugins']['live-player-plugin'] = [ - 'version' => MyC('common_app_weixin_liveplayer_ver', '1.2.7', true), + 'version' => MyC('common_app_weixin_liveplayer_ver', '1.2.8', true), 'provider' => 'wx2b03c6e691cd7370', ]; if(file_put_contents($file, JsonFormat($config)) === false) diff --git a/application/service/PackageInstallService.php b/application/service/PackageInstallService.php new file mode 100644 index 000000000..b84a816f4 --- /dev/null +++ b/application/service/PackageInstallService.php @@ -0,0 +1,308 @@ + $id, + 'type' => $type, + 'url' => MyUrl('admin/packageinstall/install'), + 'admin_url' => MyUrl('admin/index/index', ['to_url'=>urldecode(base64_encode(MyUrl('admin/pluginsadmin/index')))]), + ]; + } + + /** + * 软件安装 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param [array] $params [输入参数] + */ + public static function Install($params = []) + { + // 参数校验 + $ret = self::ParamsCheck($params); + if($ret['code'] != 0) + { + return $ret; + } + + // 操作类型 + switch($params['opt']) + { + // 获取url地址 + case 'url' : + $ret = self::UrlHandle($params['id']); + break; + + // 下载软件包 + case 'download' : + $ret = self::DownloadHandle($params['key']); + break; + + // 安装软件包 + case 'install' : + $ret = self::InstallHandle($params); + break; + } + return $ret; + } + + /** + * 安装软件包 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param [array] $params [输入参数] + */ + public static function InstallHandle($params) + { + // 获取目录文件 + $res = self::DirFileData($params['key']); + if(!file_exists($res['url'])) + { + return DataReturn('软件包不存在、请重新安装', -1); + } + + // 根据插件类型调用安装程序 + switch($params['type']) + { + // 功能插件 + case 'plugins' : + $ret = PluginsAdminService::PluginsUploadHandle($res['url'], $params); + break; + + // 默认 + default : + $ret = DataReturn('插件操作类型有误', -1); + } + + // 移除session + session($params['key'], null); + + // 删除本地文件 + \base\FileUtil::UnlinkFile($res['url']); + + return $ret; + } + + /** + * 下载软件包 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param [string] $key [缓存key] + */ + public static function DownloadHandle($key) + { + // 获取下载地址 + $url = session($key); + if(empty($url)) + { + return DataReturn('下载地址为空', -1); + } + + // 获取目录文件 + $res = self::DirFileData($key); + + // 目录不存在则创建 + \base\FileUtil::CreateDir($res['dir'].$res['path']); + + // 下载保存 + if(@file_put_contents($res['url'], RequestGet($url)) !== false) + { + return DataReturn('success', 0, $key); + } + return DataReturn('插件下载失败', -1); + } + + /** + * 获取下载地址 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param [int] $goods_id [商品id] + */ + public static function UrlHandle($goods_id) + { + // 获取下载地址 + $url = config('shopxo.store_download_url'); + $data = [ + 'goods_id' => $goods_id, + 'url' => __MY_URL__, + 'host' => __MY_HOST__, + 'ip' => __MY_ADDR__, + 'ver' => APPLICATION_VERSION, + ]; + $ret = self::HttpRequest($url, $data); + if(!empty($ret) && isset($ret['code']) && $ret['code'] == 0) + { + $key = md5($ret['data']); + session($key, $ret['data']); + $ret['data'] = $key; + } + return $ret; + } + + /** + * 获取软件存储信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param [string] $key [缓存key] + */ + public static function DirFileData($key) + { + // 将软件包下载到磁盘 + $dir = ROOT; + $path = 'runtime'.DS.'data'.DS.'plugins_package_install'.DS; + $filename = $key.'.zip'; + + // 目录不存在则创建 + \base\FileUtil::CreateDir($dir.$path); + + return [ + 'dir' => $dir, + 'path' => $path, + 'file' => $filename, + 'url' => $dir.$path.$filename, + ]; + } + + /** + * 输入参数校验 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param [array] $params [输入参数] + */ + public static function ParamsCheck($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '商品id有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'type', + 'error_msg' => '插件类型有误', + ], + [ + 'checked_type' => 'in', + 'key_name' => 'opt', + 'checked_data' => ['url', 'download', 'install'], + 'error_msg' => '操作类型有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 下载和安装需要校验key + if(in_array($params['opt'], ['download', 'install']) && empty($params['key'])) + { + return DataReturn('操作key有误', -1); + } + + return DataReturn('success', 0); + } + + /** + * 网络请求 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param [string] $url [请求url] + * @param [array] $data [发送数据] + * @return [json] [请求返回数据] + */ + public static function HttpRequest($url, $data) + { + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_FAILONERROR, false); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + + $body_string = ''; + if(is_array($data) && 0 < count($data)) + { + foreach($data as $k => $v) + { + $body_string .= $k.'='.urlencode($v).'&'; + } + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $body_string); + } + $headers = [ + 'Content-type: application/x-www-form-urlencoded;charset=UTF-8', + 'X-Requested-With: XMLHttpRequest', + ]; + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + $reponse = curl_exec($ch); + $error = curl_errno($ch); + curl_close($ch); + if($error) + { + return DataReturn("curl出错，错误码:$error", -1); + } + return json_decode($reponse, true); + } +} +?> \ No newline at end of file diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index 93e531476..f2789cb98 100755 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -1032,6 +1032,21 @@ php; return DataReturn('文件格式有误，请上传zip压缩包', -2); } + // 上传处理 + return self::PluginsUploadHandle($_FILES['file']['tmp_name'], $params); + } + + /** + * 应用上传处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-12-19T00:53:45+0800 + * @param [string] $package_file [软件包地址] + * @param [array] $params [输入参数] + */ + public static function PluginsUploadHandle($package_file, $params = []) + { // 权限校验 $ret = self::PowerCheck(); if($ret['code'] != 0) @@ -1055,7 +1070,7 @@ php; $plugins = ''; // 开始解压文件 - $resource = zip_open($_FILES['file']['tmp_name']); + $resource = zip_open($package_file); if(!is_resource($resource)) { return DataReturn('压缩包打开失败['.$resource.']', -10); diff --git a/application/service/StoreService.php b/application/service/StoreService.php index 9fc856491..7a7f2c9fa 100644 --- a/application/service/StoreService.php +++ b/application/service/StoreService.php @@ -72,7 +72,11 @@ class StoreService */ public static function RequestParamsString($params = []) { - return '?ver='.APPLICATION_VERSION.'&url='.urlencode(__MY_URL__).'&host='.urlencode(__MY_HOST__).'&ip='.urlencode(__MY_ADDR__); + // 当前管理员后台地址 + $admin_url = explode('?', __MY_VIEW_URL__); + + // 拼接商店请求参数地址 + return '?ver='.urldecode(base64_encode(APPLICATION_VERSION)).'&url='.urlencode(base64_encode(__MY_URL__)).'&host='.urlencode(base64_encode(__MY_HOST__)).'&ip='.urlencode(base64_encode(__MY_ADDR__)).'&admin_url='.urlencode(base64_encode($admin_url[0])); } } ?> \ No newline at end of file diff --git a/application/tags.php b/application/tags.php index 7900e6895..7fb4b4ce8 100755 --- a/application/tags.php +++ b/application/tags.php @@ -32,109 +32,5 @@ return array ( 'log_write' => array ( ), - 'plugins_admin_css' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_css' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_js' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_navigation_header_handle' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_users_center_left_menu_handle' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_header_navigation_top_right_handle' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_warehouse_goods_inventory_deduct' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_warehouse_goods_inventory_rollback' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_warehouse_goods_inventory_sync' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_goods_field_status_update' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_goods_delete' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_goods_save_end' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_editor_path_type_admin_goods_saveinfo' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_view_goods_detail_right_content_bottom' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_view_goods_detail_base_bottom' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_view_goods_detail_base_buy_nav_min_inside_begin' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_warehouse_handle_end' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_buy_order_insert_begin' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_buy_order_insert_end' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_system_begin' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_view_buy_form_inside' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_view_buy_base_confirm_top' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_view_admin_order_list_operate' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_order_status_change_history_success_handle' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_order_aftersale_audit_handle_end' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), - 'plugins_service_goods_buy_nav_button_handle' => - array ( - 0 => 'app\\plugins\\store\\Hook', - ), ); ?> \ No newline at end of file diff --git a/config/shopxo.php b/config/shopxo.php index f6a3660e4..100afcfd0 100755 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -28,7 +28,7 @@ if(substr($cdn_public_host, -1) != DS) // 配置信息 return [ // 开发模式 - 'is_develop' => false, + 'is_develop' => true, // 默认编码 'default_charset' => 'utf-8', @@ -85,8 +85,9 @@ return [ // 应用商店地址 'website_url' => 'https://shopxo.net/', 'store_url' => 'https://store.shopxo.net/', - 'store_payment_url' => 'https://store.shopxo.net/payment.html', - 'store_theme_url' => 'https://store.shopxo.net/theme.html', + 'store_payment_url' => 'https://store.shopxo.net/', + 'store_theme_url' => 'https://store.shopxo.net/', + 'store_download_url' => 'http://dev.shopxo.net/index.php?s=store-package-onine.html', // 开启U带域名 'url_domain_deploy' => true, diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index a9d69d8d6..af616f102 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -1,5 +1,15 @@ $(function() { + /** + * 指定url地址 + */ + var to_url = GetQueryValue('to_url') || null; + console.log(to_url) + if(to_url != null) + { + console.log(to_url); + } + /** * url加载 */ diff --git a/public/static/admin/default/js/packageinstall.js b/public/static/admin/default/js/packageinstall.js new file mode 100644 index 000000000..a3c1ae8f0 --- /dev/null +++ b/public/static/admin/default/js/packageinstall.js @@ -0,0 +1,95 @@ +/** + * 异步请求步骤 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param {[string]} key [操作key（仅download和install需要）] + * @param {[string]} opt [操作类型（url 获取下载地址， download 下载插件包， install 安装插件包）] + * @param {[string]} msg [提示信息] + */ +function RequestHandle(key, opt, msg) +{ + // 操作容器 + var $container = $('.packageinstall-container'); + var $progress = $('.progress-container'); + var $error = $('.error-container'); + var $success = $('.success-container'); + + // 获取参数值 + var id = $container.data('id') || 0; + var type = $container.data('type') || null; + var url = $container.data('url') || null; + var admin_url = $container.data('admin-url') || null; + if(id == 0 || type == null || url == null) + { + $progress.addClass('am-hide'); + $error.removeClass('am-hide'); + $error.find('.msg-text').text('请求参数有误'); + return false; + } + + // 默认获取地址 + if((opt || null) == null) + { + opt = 'url'; + } + + // 加载提示 + $progress.find('.msg-text').text(msg || '正在获取中...'); + + // ajax + $.ajax({ + url: url, + type: 'POST', + dataType: 'json', + timeout: 30000, + data: {"id":id, "type":type, "opt":opt, "key":key || ''}, + success: function(result) + { + if((result || null) != null && result.code == 0) + { + switch(opt) + { + // 获取下载地址 + case 'url' : + RequestHandle(result.data, 'download', '正在下载中...'); + break; + + // 下载插件包 + case 'download' : + RequestHandle(result.data, 'install', '正在安装中...'); + break; + + // 安装完成 + case 'install' : + $progress.addClass('am-hide'); + $error.addClass('am-hide'); + $success.removeClass('am-hide'); + setTimeout(function() + { + window.location.href = admin_url; + }, 3000); + break; + } + } else { + $progress.addClass('am-hide'); + $error.removeClass('am-hide'); + $error.find('.msg-text').text(((result || null) == null) ? '返回数据格式错误' : (result.msg || '异常错误')); + } + }, + error: function(xhr, type) + { + $progress.addClass('am-hide'); + $error.removeClass('am-hide'); + $error.find('.msg-text').text(HtmlToString(xhr.responseText) || '异常错误'); + } + }); +} + +$(function() +{ + // 请求安装 + RequestHandle(); +}); \ No newline at end of file diff --git a/public/static/common/images/beian-gongan-icon.png b/public/static/common/images/beian-gongan-icon.png index 9f763946d..dbc8488ba 100644 Binary files a/public/static/common/images/beian-gongan-icon.png and b/public/static/common/images/beian-gongan-icon.png differ diff --git a/public/static/common/images/beian-icp-icon.png b/public/static/common/images/beian-icp-icon.png index 23d3964ed..f1d2342c9 100644 Binary files a/public/static/common/images/beian-icp-icon.png and b/public/static/common/images/beian-icp-icon.png differ diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index e5d05cbc0..5c0972927 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -1913,6 +1913,30 @@ function HtmlToString(html_str) return ToTxt(html_str).replace(/\<\;br[\&ensp\;|\&emsp\;]*[\/]?\>\;|\r\n|\n/g, '
+
{{$home_site_security_record_name}}
'); } +/** + * 获取浏览器参数 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-22 + * @desc description + * @param {[string]} field [参数字段名称] + */ +function GetQueryValue(field) +{ + var query = window.location.search.substring(1); + var vars = query.split('&'); + for(var i=0;i -
- {{if !empty($payment.logo)}}
-
+