Merge branch 'large_screen_display_feature' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/jobhandler/IPJobHandler.java

@@ -71,7 +71,13 @@ public class IPJobHandler extends IJobHandler {
         if (null != regionDTO) {
             appUserDetail.setProvinceCode(Integer.valueOf(String.valueOf(regionDTO.getParentId())));
             appUserDetail.setCityCode(Integer.valueOf(String.valueOf(regionDTO.getId())));
+        }else{
+            if (StringUtils.isNotEmpty(cityName)){
+                appUserDetail.setProvinceCode(Integer.valueOf(ipJsonObject.get(IPAddress.RPOINCE_ID).toString()));
+                appUserDetail.setCityCode(Integer.valueOf(ipJsonObject.get(IPAddress.CITY_ID).toString()));
             }
+        }
+
 
     }
 
@@ -85,5 +91,7 @@ public class IPJobHandler extends IJobHandler {
         public static final String BASE_IP_PARSING_URL2 = "https://www.mxnzp.com/api/ip/aim_ip?ip=";
         public static final String BASE_DATA = "data";
         public static final String CITY_NAME = "city";
+        public static final String RPOINCE_ID="provinceId";
+        public static final String CITY_ID="cityId";
     }
 }