Commit eda1e0b0 authored by christ's avatar christ

client

parent db573537
...@@ -423,7 +423,9 @@ class ApiConst ...@@ -423,7 +423,9 @@ class ApiConst
const set = 2; const set = 2;
//桌面最新版本 //桌面最新版本
const clietnAppversion='1.0.1'; const xpClietnAppVersion='1.0.2';
const winClientAppVersion='1.0.2';
//微信小程序是否发布 //微信小程序是否发布
const isWxPublish = 0; const isWxPublish = 0;
......
...@@ -157,6 +157,8 @@ class NameConst { ...@@ -157,6 +157,8 @@ class NameConst {
const clientUpdateUrl='shenbd.zip'; const clientUpdateUrl='shenbd.zip';
const xpClientUpdateUrl='shendbxp.zip';
const leftBracket = '['; const leftBracket = '[';
const rightBracket = ']'; const rightBracket = ']';
const elasticName='elastic.master'; const elasticName='elastic.master';
...@@ -196,6 +198,9 @@ class NameConst { ...@@ -196,6 +198,9 @@ class NameConst {
const Macao = '澳门'; const Macao = '澳门';
const otherCountry = '海外'; const otherCountry = '海外';
const xp='xp';
const win='win';
} }
?> ?>
\ No newline at end of file
...@@ -23,14 +23,20 @@ class SettingServiceModel extends \Business\AbstractModel{ ...@@ -23,14 +23,20 @@ class SettingServiceModel extends \Business\AbstractModel{
* 获取应用版本 * 获取应用版本
* @return array 版本信息 * @return array 版本信息
*/ */
public function getAppVersion(){ public function getAppVersion($data){
$settingDAO = \DAO\SettingModel::getInstance(); $settingDAO = \DAO\SettingModel::getInstance();
$version=array(); $version=array();
$version['app_version'] = ApiConst::clietnAppversion; $version['app_version'] = ApiConst::xpClietnAppVersion;
if($data['opSystem']==NameConst::xp){
$version['app_version']=ApiConst::xpClietnAppVersion;
$fileName='/'.NameConst::xpClientUpdateUrl;
}else{
$version['app_version']=ApiConst::winClientAppVersion;
$fileName='/'.NameConst::clientUpdateUrl;
}
//$version = $settingDAO->getListCache(array('app_version')); //$version = $settingDAO->getListCache(array('app_version'));
$updateUrl=\Bootstrap::getUrlIniConfig('ossHost'); $updateUrl=\Bootstrap::getUrlIniConfig('ossHost');
$fileName='/'.NameConst::clientUpdateUrl;
$updateUrl=$updateUrl.'/'.$fileName; $updateUrl=$updateUrl.'/'.$fileName;
return array('version'=>$version['app_version'],'updateUrl'=>$updateUrl); return array('version'=>$version['app_version'],'updateUrl'=>$updateUrl);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment