Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
e9250468
Commit
e9250468
authored
Apr 20, 2021
by
jiawei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://111.203.232.171:8888/lee/chnmuseum-party
parents
d60896b0
54bdac3f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
98 additions
and
96 deletions
+98
-96
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+10
-1
TAppVersionController.java
...chnmuseum/party/web/controller/TAppVersionController.java
+88
-95
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
e9250468
...
...
@@ -662,8 +662,17 @@ public class ChinaMobileRestApiController extends BaseController {
Map
map
=
new
HashMap
();
if
(
StringUtils
.
isNotBlank
(
versionNo
))
{
if
(
Long
.
parseLong
(
versionNo
)
>=
Long
.
parseLong
(
current
.
getAppVersion
()))
{
final
String
prefix
=
StringUtils
.
substring
(
versionNo
,
0
,
StringUtils
.
indexOf
(
versionNo
,
"."
));
final
String
suffix
=
StringUtils
.
substring
(
versionNo
,
StringUtils
.
indexOf
(
versionNo
,
"."
)).
replaceAll
(
"\\."
,
""
);
String
currAppVersion
=
current
.
getAppVersion
();
final
String
prefix1
=
StringUtils
.
substring
(
currAppVersion
,
0
,
StringUtils
.
indexOf
(
currAppVersion
,
"."
));
final
String
suffix1
=
StringUtils
.
substring
(
currAppVersion
,
StringUtils
.
indexOf
(
currAppVersion
,
"."
)).
replaceAll
(
"\\."
,
""
);
if
(
Double
.
parseDouble
(
prefix
+
"."
+
suffix
)
>=
Double
.
parseDouble
(
prefix1
+
"."
+
suffix1
))
{
map
.
put
(
"isLatest"
,
true
);
}
else
{
map
.
put
(
"isLatest"
,
false
);
}
}
else
{
map
.
put
(
"isLatest"
,
false
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TAppVersionController.java
View file @
e9250468
This diff is collapsed.
Click to expand it.
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