Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
eda1e0b0
Commit
eda1e0b0
authored
Dec 10, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
client
parent
db573537
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
ApiConst.php
application/library/Our/ApiConst.php
+3
-1
NameConst.php
application/library/Our/NameConst.php
+5
-0
SettingService.php
application/models/Business/Common/SettingService.php
+9
-3
No files found.
application/library/Our/ApiConst.php
View file @
eda1e0b0
...
...
@@ -423,7 +423,9 @@ class ApiConst
const
set
=
2
;
//桌面最新版本
const
clietnAppversion
=
'1.0.1'
;
const
xpClietnAppVersion
=
'1.0.2'
;
const
winClientAppVersion
=
'1.0.2'
;
//微信小程序是否发布
const
isWxPublish
=
0
;
...
...
application/library/Our/NameConst.php
View file @
eda1e0b0
...
...
@@ -157,6 +157,8 @@ class NameConst {
const
clientUpdateUrl
=
'shenbd.zip'
;
const
xpClientUpdateUrl
=
'shendbxp.zip'
;
const
leftBracket
=
'['
;
const
rightBracket
=
']'
;
const
elasticName
=
'elastic.master'
;
...
...
@@ -196,6 +198,9 @@ class NameConst {
const
Macao
=
'澳门'
;
const
otherCountry
=
'海外'
;
const
xp
=
'xp'
;
const
win
=
'win'
;
}
?>
\ No newline at end of file
application/models/Business/Common/SettingService.php
View file @
eda1e0b0
...
...
@@ -23,14 +23,20 @@ class SettingServiceModel extends \Business\AbstractModel{
* 获取应用版本
* @return array 版本信息
*/
public
function
getAppVersion
(){
public
function
getAppVersion
(
$data
){
$settingDAO
=
\DAO\SettingModel
::
getInstance
();
$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'));
$updateUrl
=
\Bootstrap
::
getUrlIniConfig
(
'ossHost'
);
$fileName
=
'/'
.
NameConst
::
clientUpdateUrl
;
$updateUrl
=
$updateUrl
.
'/'
.
$fileName
;
return
array
(
'version'
=>
$version
[
'app_version'
],
'updateUrl'
=>
$updateUrl
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment