From e99608a8566b6a9759dc0d1289c13919d7b79632 Mon Sep 17 00:00:00 2001 From: RB Date: Sat, 12 Mar 2022 15:51:00 +0800 Subject: [PATCH] fix: login ua --- .../java/com/rebuild/web/user/signup/LoginController.java | 7 +++++-- src/main/resources/web/assets/js/rb-page.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rebuild/web/user/signup/LoginController.java b/src/main/java/com/rebuild/web/user/signup/LoginController.java index bb87ec872..dbce29a15 100644 --- a/src/main/java/com/rebuild/web/user/signup/LoginController.java +++ b/src/main/java/com/rebuild/web/user/signup/LoginController.java @@ -244,8 +244,11 @@ public class LoginController extends BaseController { try { UserAgent uas = UserAgent.parseUserAgentString(ua); - uaClear = uas.getBrowser().toString(); - if (uas.getBrowserVersion() != null) uaClear = "-" + uas.getBrowserVersion(); + uaClear = uas.getBrowser().name(); + if (uas.getBrowserVersion() != null) { + String mv = uas.getBrowserVersion().getMajorVersion(); + if (!uaClear.endsWith(mv)) uaClear += "-" + mv; + } OperatingSystem os = uas.getOperatingSystem(); if (os != null) { diff --git a/src/main/resources/web/assets/js/rb-page.js b/src/main/resources/web/assets/js/rb-page.js index 03d8641e3..b0343baa6 100644 --- a/src/main/resources/web/assets/js/rb-page.js +++ b/src/main/resources/web/assets/js/rb-page.js @@ -871,7 +871,7 @@ var $autoLocation = function (call) { geo.getCurrentPosition(function (e) { if (this.getStatus() === window.BMAP_STATUS_SUCCESS) { var geoc = new window.BMapGL.Geocoder() - geoc.getLocation(e.point, (r) => { + geoc.getLocation(e.point, function (r) { var v = { lat: e.latitude, lng: e.longitude,