1、新增ip服务查询接口，对接阿里云第三方服务，服务封装、ip模块旧引用清理、新增ip服务开关和配置；2、新增组织地理信息字段；3、新增登录对地理信息的校验；

2026-08-12 21:02:08 +08:00 · 2024-11-05 14:38:34 +08:00
parent eadb7f7633
commit 90eb6b8d6d
32 changed files with 463 additions and 4228 deletions
@@ -17,6 +17,8 @@ public class ErrorCodeConstants {
    public static final ErrorCode AUTH_TOKEN_EXPIRED = new ErrorCode(1_002_000_006, "Token 已经过期");
    public static final ErrorCode AUTH_MOBILE_NOT_EXISTS = new ErrorCode(1_002_000_007, "手机号不存在");
    public static final ErrorCode AUTH_MOBILE_NO_CHANGE = new ErrorCode(1_002_000_008, "手机号未发生改变，无需修改");
+    public static final ErrorCode AUTH_LOGIN_GEO_UNCORRECT = new ErrorCode(1_002_000_009, "登录失败，请前往机构登记地址登录系统");
+    public static final ErrorCode AUTH_LOGIN_ORG_GEO_EMPTY = new ErrorCode(1_002_000_010, "当前组织地址未登记，请联系组织管理员");

    // ========== 菜单模块 1-002-001-000 ==========
    public static final ErrorCode MENU_NAME_DUPLICATE = new ErrorCode(1_002_001_000, "已经存在该名字的菜单");
@@ -54,7 +54,6 @@ import java.util.Set;
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
 import static com.cf.imes.framework.common.util.collection.CollectionUtils.convertSet;
 import static com.cf.imes.framework.common.util.servlet.ServletUtils.getClientIP;
-import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;

@Tag(name = "管理后台 - 认证")
@RestController
@@ -86,7 +85,8 @@ public class AuthController {
    @PermitAll
    @Operation(summary = "使用账号密码登录")
    @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
-    public CommonResult<AuthLoginRespVO> login(@Valid @RequestBody AuthLoginReqVO reqVO) {
+    public CommonResult<AuthLoginRespVO> login(@Valid @RequestBody AuthLoginReqVO reqVO, HttpServletRequest request) {
+        reqVO.setIp(getClientIP(request));
        return success(authService.login(reqVO));
    }

@@ -51,6 +51,9 @@ public class AuthLoginReqVO {
    @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
    private String socialState;

+    @Schema(hidden = true)
+    private String ip;
+
    /**
     * 开启验证码的 Group
     */
@@ -1,5 +0,0 @@
-### 获得地区树
-GET {{baseUrl}}/system/area/tree
-Authorization: Bearer {{token}}
-organ-id: {{adminTenentId}}
-
@@ -1,50 +0,0 @@
-package com.cf.imes.module.system.controller.admin.ip;
-
-import cn.hutool.core.lang.Assert;
-import com.cf.imes.framework.common.pojo.CommonResult;
-import com.cf.imes.framework.common.util.object.BeanUtils;
-import com.cf.imes.framework.ip.core.Area;
-import com.cf.imes.framework.ip.core.utils.AreaUtils;
-import com.cf.imes.framework.ip.core.utils.IPUtils;
-import com.cf.imes.module.system.controller.admin.ip.vo.AreaNodeRespVO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-import static com.cf.imes.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 地区")
-@RestController
-@RequestMapping("/system/area")
-@Validated
-public class AreaController {
-
-    @GetMapping("/tree")
-    @Operation(summary = "获得地区树")
-    public CommonResult<List<AreaNodeRespVO>> getAreaTree() {
-        Area area = AreaUtils.getArea(Area.ID_CHINA);
-        Assert.notNull(area, "获取不到中国");
-        return success(BeanUtils.toBean(area.getChildren(), AreaNodeRespVO.class));
-    }
-
-    @GetMapping("/get-by-ip")
-    @Operation(summary = "获得 IP 对应的地区名")
-    @Parameter(name = "ip", description = "IP", required = true)
-    public CommonResult<String> getAreaByIp(@RequestParam("ip") String ip) {
-        // 获得城市
-        Area area = IPUtils.getArea(ip);
-        if (area == null) {
-            return success("未知");
-        }
-        // 格式化返回
-        return success(AreaUtils.format(area.getId()));
-    }
-
-}
@@ -1,23 +0,0 @@
-package com.cf.imes.module.system.controller.admin.ip.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "管理后台 - 地区节点 Response VO")
-@Data
-public class AreaNodeRespVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "110000")
-    private Integer id;
-
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "北京")
-    private String name;
-
-    /**
-     * 子节点
-     */
-    private List<AreaNodeRespVO> children;
-
-}
@@ -80,4 +80,28 @@ public class OrganSaveReqVO {
    @Size(max = 200, message = "备注长度不能超过200个字符")
    private String remark;

+
+    @Schema(description = "省")
+    @Size(max = 64, message = "省名称长度不能超过64个字符")
+    private String province;
+
+    @Schema(description = "市")
+    @Size(max = 64, message = "市名称长度不能超过64个字符")
+    private String city;
+
+    @Schema(description = "区")
+    @Size(max = 64, message = "区名称长度不能超过64个字符")
+    private String county;
+
+    @Schema(description = "地区编码")
+    @Size(max = 64, message = "地区编码长度不能超过64个字符")
+    private String areaCode;
+
+    @Schema(description = "经度")
+    @Size(max = 64, message = "经度长度不能超过64个字符")
+    private String longitude;
+
+    @Schema(description = "纬度")
+    @Size(max = 64, message = "纬度长度不能超过64个字符")
+    private String latitude;
 }
@@ -1,34 +0,0 @@
-package com.cf.imes.module.system.controller.app.ip;
-
-import cn.hutool.core.lang.Assert;
-import com.cf.imes.framework.common.pojo.CommonResult;
-import com.cf.imes.framework.common.util.object.BeanUtils;
-import com.cf.imes.framework.ip.core.Area;
-import com.cf.imes.framework.ip.core.utils.AreaUtils;
-import com.cf.imes.module.system.controller.app.ip.vo.AppAreaNodeRespVO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-import static com.cf.imes.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 地区")
-@RestController
-@RequestMapping("/system/area")
-@Validated
-public class AppAreaController {
-
-    @GetMapping("/tree")
-    @Operation(summary = "获得地区树")
-    public CommonResult<List<AppAreaNodeRespVO>> getAreaTree() {
-        Area area = AreaUtils.getArea(Area.ID_CHINA);
-        Assert.notNull(area, "获取不到中国");
-        return success(BeanUtils.toBean(area.getChildren(), AppAreaNodeRespVO.class));
-    }
-
-}
@@ -1,23 +0,0 @@
-package com.cf.imes.module.system.controller.app.ip.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "用户 App - 地区节点 Response VO")
-@Data
-public class AppAreaNodeRespVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "110000")
-    private Integer id;
-
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "北京")
-    private String name;
-
-    /**
-     * 子节点
-     */
-    private List<AppAreaNodeRespVO> children;
-
-}
@@ -1,20 +0,0 @@
-package com.cf.imes.module.system.convert.ip;
-
-import com.cf.imes.framework.ip.core.Area;
-import com.cf.imes.module.system.controller.admin.ip.vo.AreaNodeRespVO;
-import com.cf.imes.module.system.controller.app.ip.vo.AppAreaNodeRespVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface AreaConvert {
-
-    AreaConvert INSTANCE = Mappers.getMapper(AreaConvert.class);
-
-    List<AreaNodeRespVO> convertList(List<Area> list);
-
-    List<AppAreaNodeRespVO> convertList3(List<Area> list);
-
-}
@@ -112,4 +112,34 @@ public class OrganizationDO extends BaseDO {
     * 备注
     */
    private String remark;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String county;
+
+    /**
+     * 地区代码
+     */
+    private String areaCode;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
 }
@@ -1,38 +0,0 @@
-package com.cf.imes.module.system.framework.operatelog.core;
-
-import cn.hutool.core.util.StrUtil;
-import com.cf.imes.framework.ip.core.utils.AreaUtils;
-import com.mzt.logapi.service.IParseFunction;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * 地名的 {@link IParseFunction} 实现类
- *
- * @author HUIHUI
- */
-@Slf4j
-@Component
-public class AreaParseFunction implements IParseFunction {
-
-    public static final String NAME = "getArea";
-
-    @Override
-    public boolean executeBefore() {
-        return true; // 先转换值后对比
-    }
-
-    @Override
-    public String functionName() {
-        return NAME;
-    }
-
-    @Override
-    public String apply(Object value) {
-        if (StrUtil.isEmptyIfStr(value)) {
-            return "";
-        }
-        return AreaUtils.format(Integer.parseInt(value.toString()));
-    }
-
-}
@@ -6,7 +6,10 @@ import com.cf.imes.framework.common.enums.UserTypeEnum;
 import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil;
 import com.cf.imes.framework.common.util.monitor.TracerUtils;
 import com.cf.imes.framework.common.util.servlet.ServletUtils;
+import com.cf.imes.framework.common.util.string.StrUtils;
 import com.cf.imes.framework.common.util.validation.ValidationUtils;
+import com.cf.imes.framework.ip.core.service.IPQueryService;
+import com.cf.imes.framework.ip.core.service.dto.IPQueryDataRespDTO;
 import com.cf.imes.module.system.api.logger.dto.LoginLogCreateReqDTO;
 import com.cf.imes.module.system.api.sms.SmsCodeApi;
 import com.cf.imes.module.system.api.social.dto.SocialUserBindReqDTO;
@@ -83,12 +86,21 @@ public class AdminAuthServiceImpl implements AdminAuthService {
    @Resource
    private SmsCodeService smsCodeService;

+    @Resource
+    private IPQueryService ipQueryService;
+
    /**
     * 验证码的开关，默认为 true
     */
    @Value("${chenfeng.captcha.enable:true}")
    private Boolean captchaEnable;

+    /**
+     * 登录ip地址位置校验，默认为 false不开启
+     */
+    @Value("${chenfeng.ipquery.enable:false}")
+    private boolean ipQueryEnable;
+
    @Override
    public AdminUserDO authenticate(AuthLoginReqVO reqVO) {
        String username = reqVO.getUsername();
@@ -102,7 +114,11 @@ public class AdminAuthServiceImpl implements AdminAuthService {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AUTH_LOGIN_BAD_CREDENTIALS);
        }
        // 校验机构有效性
-        organService.validOrgan(user.getOrganId());
+        OrganizationDO organizationDO = organService.validOrgan(user.getOrganId());
+        // 校验机构地理位置
+        if (ipQueryEnable && !checkGeo(organizationDO, ServletUtils.getClientIP())) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AUTH_LOGIN_GEO_UNCORRECT);
+        }
        // 校验密码
        if (!userService.isPasswordMatch(password, user.getPassword())) {
            createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
@@ -116,6 +132,39 @@ public class AdminAuthServiceImpl implements AdminAuthService {
        return user;
    }

+    /**
+     * 校验地理位置
+     * 省市正确或地区代码对上了就校验通过
+     *
+     * @return
+     */
+    private boolean checkGeo(OrganizationDO organizationDO, String ip) {
+        // 检查组织的地理信息
+        if (ObjectUtil.isAllEmpty(organizationDO.getProvince(), organizationDO.getCity(), organizationDO.getAreaCode())) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AUTH_LOGIN_ORG_GEO_EMPTY);
+        }
+
+        IPQueryDataRespDTO ipQueryDataRespDTO = ipQueryService.querySource(ip);
+
+        // 省名称和市名称包含了ip定位服务返回的省和市即位置正确
+        boolean provinceAndCityMatch = false;
+        if (StrUtils.contains(organizationDO.getProvince(), ipQueryDataRespDTO.getProv()) && StrUtils.contains(organizationDO.getCity(), ipQueryDataRespDTO.getCity())) {
+            provinceAndCityMatch = true;
+        }
+
+        // 行政区编码等于ip定位服务返回的编码即位置正确
+        boolean areaCodeMatch = false;
+        if (ObjectUtil.equal(organizationDO.getAreaCode(), ipQueryDataRespDTO.getPostCode())) {
+            areaCodeMatch = true;
+        }
+
+        if (provinceAndCityMatch || areaCodeMatch) {
+            return true;
+        }
+        return false;
+    }
+
+
    @Override
    public AuthLoginRespVO login(AuthLoginReqVO reqVO) {
        // 校验验证码