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
368b211b
Commit
368b211b
authored
Dec 10, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version
parent
818257a4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
ApiConst.php
application/library/Our/ApiConst.php
+4
-3
SettingService.php
application/models/Business/Common/SettingService.php
+5
-3
No files found.
application/library/Our/ApiConst.php
View file @
368b211b
...
@@ -423,10 +423,11 @@ class ApiConst
...
@@ -423,10 +423,11 @@ class ApiConst
const
set
=
2
;
const
set
=
2
;
//桌面最新版本
//桌面最新版本
const
xpClie
tn
AppVersion
=
'1.0.4'
;
const
xpClie
nt
AppVersion
=
'1.0.4'
;
const
winClientAppVersion
=
'1.0.4'
;
const
winClientAppVersion
=
'1.0.4'
;
const
xpClientAppVersionOnline
=
'1.0.0'
;
//微信小程序是否发布
const
winClientAppVersionOnline
=
'1.0.0'
;
//微信小是否发布
const
isWxPublish
=
0
;
const
isWxPublish
=
0
;
//消息模板类型
//消息模板类型
...
...
application/models/Business/Common/SettingService.php
View file @
368b211b
...
@@ -26,21 +26,23 @@ class SettingServiceModel extends \Business\AbstractModel{
...
@@ -26,21 +26,23 @@ class SettingServiceModel extends \Business\AbstractModel{
public
function
getAppVersion
(
$data
){
public
function
getAppVersion
(
$data
){
$settingDAO
=
\DAO\SettingModel
::
getInstance
();
$settingDAO
=
\DAO\SettingModel
::
getInstance
();
$version
=
array
();
$version
=
array
();
$version
[
'app_version'
]
=
ApiConst
::
xpClietnAppVersion
;
if
(
$data
[
'opSystem'
]
==
NameConst
::
xp
){
if
(
$data
[
'opSystem'
]
==
NameConst
::
xp
){
$version
[
'app_version'
]
=
ApiConst
::
xpClietnAppVersion
;
if
(
APP_ENV
==
'pre'
){
if
(
APP_ENV
==
'pre'
){
$version
[
'app_version'
]
=
ApiConst
::
xpClientAppVersion
;
$fileName
=
'/'
.
NameConst
::
xpClientUpdateUrl
;
$fileName
=
'/'
.
NameConst
::
xpClientUpdateUrl
;
}
}
if
(
APP_ENV
==
'product'
||
APP_ENV
==
'productOne'
){
if
(
APP_ENV
==
'product'
||
APP_ENV
==
'productOne'
){
$version
[
'app_version'
]
=
ApiConst
::
xpClientAppVersionOnline
;
$fileName
=
'/'
.
NameConst
::
xpOnlineClientUpdateUrl
;
$fileName
=
'/'
.
NameConst
::
xpOnlineClientUpdateUrl
;
}
}
}
else
{
}
else
{
$version
[
'app_version'
]
=
ApiConst
::
winClientAppVersion
;
if
(
APP_ENV
==
'pre'
){
if
(
APP_ENV
==
'pre'
){
$version
[
'app_version'
]
=
ApiConst
::
winClientAppVersion
;
$fileName
=
'/'
.
NameConst
::
clientUpdateUrl
;
$fileName
=
'/'
.
NameConst
::
clientUpdateUrl
;
}
}
if
(
APP_ENV
==
'product'
||
APP_ENV
==
'productOne'
){
if
(
APP_ENV
==
'product'
||
APP_ENV
==
'productOne'
){
$version
[
'app_version'
]
=
ApiConst
::
winClientAppVersionOnline
;
$fileName
=
'/'
.
NameConst
::
onlineClientUpdateUrl
;
$fileName
=
'/'
.
NameConst
::
onlineClientUpdateUrl
;
}
}
...
...
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