clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、实现api手机归属地查询 

2、引入正则校验controller
This commit is contained in:
xjs 2022-01-18 14:31:26 +08:00
parent c0cce9fb0b
commit 8fddea4427
13 changed files with 232 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xjs-business/xjs-business-common/src/main/java/com/xjs/consts/ApiConst.java
View File

@ -50,6 +50,8 @@ public class ApiConst {
public static final String ROLL_HOLIDAYS = "ROLL-节假日";
public static final String ROLL_MOBILE_BELONG = "ROLL-手机归属地";
//-------------------url------------------------------
@ -99,6 +101,10 @@ public class ApiConst {
*/
public static final String ROLL_HOLIDAYS_URL = "https://www.mxnzp.com/api/holiday/recent/list";
/**
* 接口文档：https://www.mxnzp.com/doc/detail?id=13
*/
public static final String ROLL_MOBILE_BELONG_URL = "https://www.mxnzp.com/api/mobile_location/aim_mobile";
//-----------------------api请求参数常量-----------------------------

14
xjs-business/xjs-business-common/src/main/java/com/xjs/consts/RegexConst.java Normal file
View File

@ -0,0 +1,14 @@
package com.xjs.consts;
/**
* 正则表达式常量
* @author xiejs
* @since 2022-01-18
*/
public class RegexConst {
/**
* 手机号码正则
*/
public static final String MOBILE_REGEX= "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$";
}

24
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java
View File

@ -1,10 +1,10 @@
package com.xjs.apitools.controller;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.xjs.apitools.domain.ApiHoliday;
import com.xjs.apitools.domain.ApiMobileBelong;
import com.xjs.apitools.service.ApiToolsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -12,9 +12,13 @@ import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
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 java.util.regex.Pattern;
import static com.xjs.consts.RegexConst.MOBILE_REGEX;
/**
* api小工具控制器
@ -33,13 +37,25 @@ public class ApiToolsController {
private ApiToolsService apiToolsService;
@GetMapping
@GetMapping("holiday")
@ApiOperation("获取节假日信息")
@Log(title = "获取节假日")
@RequiresPermissions("open:apitools:holiday")
public R<List<ApiHoliday>> getHolidayApiData() {
List<ApiHoliday> apiHolidayList = apiToolsService.getApiHolidayList();
return CollUtil.isNotEmpty(apiHolidayList) ? R.ok(apiHolidayList) : R.fail();
return R.ok(apiToolsService.getApiHolidayList());
}
@GetMapping("mobilebelong")
@ApiOperation("获取手机归属地信息")
@Log(title = "获取手机归属地")
@RequiresPermissions("open:apitools:mobilebelong")
public R<ApiMobileBelong> getMobileBelongApiData(@RequestParam(name = "mobile") String mobile) {
boolean matches = Pattern.matches(MOBILE_REGEX, mobile);
if (!matches) {
return R.fail("请输入正确的手机号码！！！");
}
return R.ok(apiToolsService.getApiMobileBelong(mobile));
}

35
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiMobileBelong.java Normal file
View File

@ -0,0 +1,35 @@
package com.xjs.apitools.domain;
import lombok.Data;
import java.io.Serializable;
/**
* api手机归属地实体
*
* @author xiejs
* @since 2022-01-18
*/
@Data
public class ApiMobileBelong implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 目标手机号
*/
private String mobile;
/**
* 归属地省份
*/
private String province;
/**
* 归属地描述
*/
private String carrier;
}

28
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/RequestBody.java Normal file
View File

@ -0,0 +1,28 @@
package com.xjs.apitools.domain;
import lombok.Data;
/**
*
* @author xiejs
* @since 2022-01-18
*/
@Data
public class RequestBody {
/**
* 应用id
*/
private String app_id;
/**
* 应用密钥
*/
private String app_secret;
/**
* 目标手机
*/
private String mobile;
}

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHolidayFactory.java
View File

@ -3,10 +3,10 @@ package com.xjs.apitools.factory.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xjs.apitools.domain.ApiHoliday;
import com.xjs.apitools.domain.RequestBody;
import com.xjs.apitools.factory.ApiToolsFactory;
import com.xjs.common.client.api.roll.RollHolidayFeignClient;
import com.xjs.config.RollProperties;
import com.xjs.copywriting.domain.RequestBody;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

42
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollMobileBelongFactory.java Normal file
View File

@ -0,0 +1,42 @@
package com.xjs.apitools.factory.impl;
import com.alibaba.fastjson.JSONObject;
import com.xjs.apitools.domain.ApiMobileBelong;
import com.xjs.apitools.domain.RequestBody;
import com.xjs.apitools.factory.ApiToolsFactory;
import com.xjs.common.client.api.roll.RollMobileBelongFeignClient;
import com.xjs.config.RollProperties;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
import static com.xjs.consts.ApiConst.ROLL_CODE_SUCCESS;
/**
* roll平台获取手机归属地api工厂实现
* @author xiejs
* @since 2022-01-18
*/
@Component
@Log4j2
public class RollMobileBelongFactory implements ApiToolsFactory<ApiMobileBelong, RequestBody> {
@Autowired
private RollProperties rollProperties;
@Autowired
private RollMobileBelongFeignClient rollMobileBelongFeignClient;
@Override
public ApiMobileBelong apiData(RequestBody req) {
req.setApp_secret(rollProperties.getApp_secret());
req.setApp_id(rollProperties.getApp_id());
JSONObject jsonObject = rollMobileBelongFeignClient.mobileBelongApi(req);
if (!jsonObject.containsKey(DEMOTE_ERROR) && jsonObject.getInteger("code") == ROLL_CODE_SUCCESS.intValue()) {
JSONObject jsonData = jsonObject.getJSONObject("data");
return jsonData.toJavaObject(ApiMobileBelong.class);
}
return null;
}
}

9
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/ApiToolsService.java
View File

@ -1,6 +1,7 @@
package com.xjs.apitools.service;
import com.xjs.apitools.domain.ApiHoliday;
import com.xjs.apitools.domain.ApiMobileBelong;
import java.util.List;
@ -17,4 +18,12 @@ public interface ApiToolsService {
*/
List<ApiHoliday> getApiHolidayList();
/**
* 获取手机归属地信息
* @param mobile 手机号
* @return ApiMobileBelong
*/
ApiMobileBelong getApiMobileBelong(String mobile);
}

21
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java
View File

@ -1,14 +1,19 @@
package com.xjs.apitools.service.impl;
import com.xjs.apitools.domain.ApiHoliday;
import com.xjs.apitools.domain.ApiMobileBelong;
import com.xjs.apitools.domain.RequestBody;
import com.xjs.apitools.factory.ApiToolsFactory;
import com.xjs.apitools.factory.impl.RollHolidayFactory;
import com.xjs.apitools.factory.impl.RollMobileBelongFactory;
import com.xjs.apitools.service.ApiToolsService;
import com.xjs.exception.ApiException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
/**
@ -21,24 +26,38 @@ import java.util.stream.Collectors;
public class ApiToolsServiceImpl implements ApiToolsService {
private ApiToolsFactory<ApiHoliday, Object> holidayFactory;
private ApiToolsFactory<ApiMobileBelong, RequestBody> mobileBelongFactory;
@Autowired
public void setHolidayFactory(RollHolidayFactory rollHolidayFactory) {
this.holidayFactory = rollHolidayFactory;
}
@Autowired
public void setMobileBelongFactory(RollMobileBelongFactory rollMobileBelongFactory) {
this.mobileBelongFactory = rollMobileBelongFactory;
}
@Override
public List<ApiHoliday> getApiHolidayList() {
List<ApiHoliday> apiHolidayList = holidayFactory.apiDataList();
Optional.ofNullable(apiHolidayList).orElseThrow(ApiException::new);
List<ApiHoliday> collect = apiHolidayList.stream().map(holidayFactory -> {
if (holidayFactory.getResidueDays() >= 0) {
return holidayFactory;
}else {
} else {
return null;
}
}).collect(Collectors.toList());
collect.removeIf(Objects::isNull);
return collect;
}
@Override
public ApiMobileBelong getApiMobileBelong(String mobile) {
RequestBody requestBody = new RequestBody();
requestBody.setMobile(mobile);
return Optional.ofNullable(mobileBelongFactory.apiData(requestBody))
.orElseThrow(ApiException::new);
}
}

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/api/roll/RollHolidayFeignClient.java
View File

@ -2,8 +2,8 @@ package com.xjs.common.client.api.roll;
import com.alibaba.fastjson.JSONObject;
import com.xjs.annotation.ApiLog;
import com.xjs.apitools.domain.RequestBody;
import com.xjs.common.client.factory.RollHolidayFeignFactory;
import com.xjs.copywriting.domain.RequestBody;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;

26
xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/api/roll/RollMobileBelongFeignClient.java Normal file
View File

@ -0,0 +1,26 @@
package com.xjs.common.client.api.roll;
import com.alibaba.fastjson.JSONObject;
import com.xjs.annotation.ApiLog;
import com.xjs.apitools.domain.RequestBody;
import com.xjs.common.client.factory.RollMobileBelongFeignFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import static com.xjs.consts.ApiConst.*;
/**
* roll手机归属地接口api调用
* @author xiejs
* @since 2022-01-18
*/
@FeignClient(name = "rollMobileBelong", url = ROLL_MOBILE_BELONG_URL, fallbackFactory = RollMobileBelongFeignFactory.class)
public interface RollMobileBelongFeignClient {
@GetMapping()
@ApiLog(name = ROLL_MOBILE_BELONG,
url = ROLL_MOBILE_BELONG_URL,
method = "Get")
JSONObject mobileBelongApi(@SpringQueryMap RequestBody requestBody);
}

28
xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/factory/RollMobileBelongFeignFactory.java Normal file
View File

@ -0,0 +1,28 @@
package com.xjs.common.client.factory;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.domain.R;
import com.xjs.common.client.api.roll.RollMobileBelongFeignClient;
import lombok.extern.log4j.Log4j2;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
/**
* @author xiejs
* @since 2022-01-18
*/
@Component
@Log4j2
public class RollMobileBelongFeignFactory implements FallbackFactory<RollMobileBelongFeignClient> {
@Override
public RollMobileBelongFeignClient create(Throwable cause) {
log.error("api模块roll 手机归属地服务调用失败:{},执行降级处理", cause.getMessage());
return requestBody -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put(DEMOTE_ERROR, R.FAIL);
return jsonObject;
};
}
}

4
xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/service/impl/IPServiceImpl.java
View File

@ -1,7 +1,7 @@
package com.xjs.weather.service.impl;
import com.ruoyi.common.redis.service.RedisService;
import com.xjs.exception.BusinessException;
import com.xjs.exception.ApiException;
import com.xjs.weather.domain.IPInfoVo;
import com.xjs.weather.factory.impl.RollIPFactory;
import com.xjs.weather.service.IPService;
@ -37,7 +37,7 @@ public class IPServiceImpl implements IPService {
redisService.setCacheObject(IP_INFO, ipInfoVo, IP_INFO_EXPIRE, TimeUnit.MINUTES);
return ipInfoVo;
}else {
throw new BusinessException("获取IP信息异常！！");
throw new ApiException("获取IP信息异常！！");
}
}
}