diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index 067d05b91..eaf8e5922 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -223,6 +223,10 @@ class Common extends BaseController } MyViewAssign('site_store_info', $site_store_info); + // 更多链接地址 + $site_store_links = empty($site_store_info['links']) ? [] : $site_store_info['links']; + MyViewAssign('site_store_links', $site_store_links); + // 系统基础信息 $is_system_show_base = (empty($site_store_info) || empty($site_store_info['vip']) || !isset($site_store_info['vip']['status']) || $site_store_info['vip']['status'] == 0 || ($site_store_info['vip']['status'] == 1 && (AdminIsPower('index', 'storeaccountsbind') || AdminIsPower('index', 'inspectupgrade')))) ? 1 : 0; MyViewAssign('is_system_show_base', $is_system_show_base); diff --git a/app/admin/view/default/config/index.html b/app/admin/view/default/config/index.html index 233ddea9c..2abfe711e 100755 --- a/app/admin/view/default/config/index.html +++ b/app/admin/view/default/config/index.html @@ -86,7 +86,7 @@
- 请到百度地图开放平台申请，查看配置教程 + 请到百度地图开放平台申请 {{if !empty($site_store_links) and !empty($site_store_links['baidu_map_course'])}}查看配置教程 {{/if}}
diff --git a/app/admin/view/default/email/nav.html b/app/admin/view/default/email/nav.html index 7cb89222b..fa37b43be 100755 --- a/app/admin/view/default/email/nav.html +++ b/app/admin/view/default/email/nav.html @@ -9,5 +9,5 @@
-

参考相关邮箱配置教程 点击去看教程

+

由于不同邮箱平台存在一些差异、配置也有所不同、具体以邮箱平台配置教程为准 {{if !empty($site_store_links) and !empty($site_store_links['email_set_course'])}}查看配置教程 {{/if}}

\ No newline at end of file diff --git a/app/admin/view/default/index/init.html b/app/admin/view/default/index/init.html index c5de09250..7ba2cc18f 100755 --- a/app/admin/view/default/index/init.html +++ b/app/admin/view/default/index/init.html @@ -37,7 +37,7 @@ - {{$Think.APPLICATION_VERSION}} + {{$Think.APPLICATION_VERSION}} 检查更新{{if !empty($site_store_info) and !empty($site_store_info['upgrade']) and !empty($site_store_info['upgrade']['version_old']) and $site_store_info['upgrade']['version_old'] eq $Think.APPLICATION_VERSION}}{{/if}} @@ -230,25 +230,29 @@ ShopXO企业级电商系统提供商 -
交流社区
-
- ShopXO交流社区 -
+ {{if !empty($site_store_links) and !empty($site_store_links['community_website'])}} +
交流社区
+
+ ShopXO交流社区 +
+ {{/if}}
开源协议
- 查看开源协议 + 查看开源协议
+ {{if !empty($site_store_links) and !empty($site_store_links['system_update_log'])}} +
更新日志
+
+ 查看更新日志 +
+ {{/if}} +
研发成员
龚哥哥
- -
更新日志
-
- 查看更新日志 -
diff --git a/app/admin/view/default/public/event_value_tips.html b/app/admin/view/default/public/event_value_tips.html index 82ff3138c..dd0a0868f 100644 --- a/app/admin/view/default/public/event_value_tips.html +++ b/app/admin/view/default/public/event_value_tips.html @@ -14,9 +14,11 @@

2. 小程序以/pages开始

3. 例如：/pages/user/user

4. 支持带参数 ?x=xx

-

- 小程序页面地址配置说明 -

+ {{if !empty($site_store_links) and !empty($site_store_links['app_mini_pages'])}} +

+ 小程序页面地址配置说明 +

+ {{/if}}
diff --git a/app/admin/view/default/public/footer.html b/app/admin/view/default/public/footer.html index a51c6479c..8b04cbc0b 100755 --- a/app/admin/view/default/public/footer.html +++ b/app/admin/view/default/public/footer.html @@ -20,7 +20,7 @@
- 未有账号，去注册 + 未有账号，去注册

一个账号支持绑定多台ShopXO商城

diff --git a/app/admin/view/default/seo/index.html b/app/admin/view/default/seo/index.html index b43f4f93b..ef1becc7c 100755 --- a/app/admin/view/default/seo/index.html +++ b/app/admin/view/default/seo/index.html @@ -5,7 +5,7 @@
-

参考伪静态配置教程 点击去看教程

+

根据服务器环境[Nginx、Apache、IIS]不同配置相应的伪静态规则 {{if !empty($site_store_links) and !empty($site_store_links['htaccess_set_course'])}}查看配置教程 {{/if}}

diff --git a/app/service/PluginsUpgradeService.php b/app/service/PluginsUpgradeService.php index 4e4e03c01..2552cce3a 100644 --- a/app/service/PluginsUpgradeService.php +++ b/app/service/PluginsUpgradeService.php @@ -29,9 +29,6 @@ class PluginsUpgradeService // 输入参数 public static $params; - // 远程插件更新接口 - public static $store_plugins_upgrade_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeurl'; - /** * 更新入口 * @author Devil @@ -195,7 +192,7 @@ class PluginsUpgradeService } // 获取信息 - $ret = StoreService::RemoteStoreData($accounts, $password, self::$store_plugins_upgrade_url, $params); + $ret = StoreService::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_plugins_upgrade_url'), $params); if(!empty($ret) && isset($ret['code']) && $ret['code'] == 0) { $key = md5($ret['data']); diff --git a/app/service/StoreService.php b/app/service/StoreService.php index f96574687..38e01821e 100644 --- a/app/service/StoreService.php +++ b/app/service/StoreService.php @@ -21,18 +21,6 @@ use app\service\ConfigService; */ class StoreService { - // 远程信息接口 - public static $store_site_info_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=siteinfo'; - - // 远程检查更新接口 - public static $store_inspect_upgrade_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=inspectupgrade'; - - // 远程插件安全合法校验接口 - public static $store_plugins_legal_check_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginslegalcheck'; - - // 远程插件更新信息接口 - public static $store_plugins_upgrade_info_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeinfo'; - // 站点商店数据缓存key public static $site_store_info_key = 'admin_site_store_info_data'; @@ -176,7 +164,7 @@ class StoreService } // 获取信息 - $res = self::RemoteStoreData($accounts, $password, self::$store_site_info_url); + $res = self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_site_info_url')); if($res['code'] == 0) { // 存储缓存、取远程给的时间，未拿到时间则默认60分钟 @@ -204,7 +192,7 @@ class StoreService $password = MyC('common_store_password'); // 获取信息 - return self::RemoteStoreData($accounts, $password, self::$store_inspect_upgrade_url); + return self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_inspect_upgrade_url')); } /** @@ -240,7 +228,7 @@ class StoreService 'plugins_ver' => $params['ver'], 'plugins_config' => $params['config'], ]; - return self::RemoteStoreData($accounts, $password, self::$store_plugins_legal_check_url, $request_params); + return self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_plugins_legal_check_url'), $request_params); } /** @@ -265,7 +253,7 @@ class StoreService } // 获取更新信息 - return self::RemoteStoreData($accounts, $password, self::$store_plugins_upgrade_info_url, $params); + return self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_plugins_upgrade_info_url'), $params); } return DataReturn('无插件数据', 0); diff --git a/app/service/SystemUpgradeService.php b/app/service/SystemUpgradeService.php index 4157db12e..691710d0f 100644 --- a/app/service/SystemUpgradeService.php +++ b/app/service/SystemUpgradeService.php @@ -25,9 +25,6 @@ class SystemUpgradeService // 输入参数 public static $params; - // 远程系统更新接口 - public static $store_plugins_upgrade_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=systemsupgradeurl'; - // session key public static $package_url_key = 'package_url_key'; public static $package_system_dir_key = 'package_system_dir_key'; @@ -308,7 +305,7 @@ class SystemUpgradeService } // 获取信息 - $ret = StoreService::RemoteStoreData($accounts, $password, self::$store_plugins_upgrade_url, $params); + $ret = StoreService::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_system_upgrade_url'), $params); if(!empty($ret) && isset($ret['code']) && $ret['code'] == 0) { MySession(self::$package_url_key, $ret['data']); diff --git a/config/shopxo.php b/config/shopxo.php index cff3d5819..fbf611d6b 100755 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -99,15 +99,35 @@ return [ // css/js引入host地址、以/斜杠结尾 'public_host' => $cdn_public_host, - // 应用商店地址 + + // 应用商店基础地址 'website_url' => 'https://shopxo.net/', 'store_url' => 'https://store.shopxo.net/', 'store_payment_url' => 'https://store.shopxo.net/', 'store_theme_url' => 'https://store.shopxo.net/', + 'store_regster_url' => 'https://store.shopxo.net/regster.html', + + // 插件在线下载地址 'store_download_url' => 'https://store.shopxo.net/index.php?s=store-package-onine.html', - // 开启U带域名 - 'url_domain_deploy' => true, + // 远程系统更新接口 + 'store_system_upgrade_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=systemsupgradeurl', + + // 远程插件更新接口 + 'store_plugins_upgrade_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeurl', + + // 远程信息接口 + 'store_site_info_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=siteinfo', + + // 远程检查更新接口 + 'store_inspect_upgrade_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=inspectupgrade', + + // 远程插件安全合法校验接口 + 'store_plugins_legal_check_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginslegalcheck', + + // 远程插件更新信息接口 + 'store_plugins_upgrade_info_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeinfo', + // 支付业务类型,支付插件根据业务类型自动生成支付入口文件 'payment_business_type_all' => [