From ea5dd49c7a7b45071a9f3c3d6120fbfd8c1a8c0a Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Sat, 15 Jan 2022 23:19:06 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjs/utils/{ChineseUtil.java => ChineseUtils.java} | 2 +- .../java/com/xjs/utils/{IPUtil.java => IPUtils.java} | 10 +++++----- .../{ChineseUtilTest.java => ChineseUtilsTest.java} | 4 ++-- .../xjs/word/service/impl/EnglishWordServiceImpl.java | 6 +++--- .../com/xjs/weather/factory/impl/RollIPFactory.java | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename xjs-business/xjs-business-common/src/main/java/com/xjs/utils/{ChineseUtil.java => ChineseUtils.java} (98%) rename xjs-business/xjs-business-common/src/main/java/com/xjs/utils/{IPUtil.java => IPUtils.java} (96%) rename xjs-business/xjs-business-common/src/test/java/com/xjs/utils/{ChineseUtilTest.java => ChineseUtilsTest.java} (85%) diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/ChineseUtil.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/ChineseUtils.java similarity index 98% rename from xjs-business/xjs-business-common/src/main/java/com/xjs/utils/ChineseUtil.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/utils/ChineseUtils.java index 93be2dfa..9a6067cb 100644 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/ChineseUtil.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/ChineseUtils.java @@ -5,7 +5,7 @@ package com.xjs.utils; * @desc 中文工具类 * @create 2021-12-29 */ -public class ChineseUtil { +public class ChineseUtils { /** * 校验String是否全是中文 diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/IPUtil.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/IPUtils.java similarity index 96% rename from xjs-business/xjs-business-common/src/main/java/com/xjs/utils/IPUtil.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/utils/IPUtils.java index 666b2deb..1b725463 100644 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/IPUtil.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/utils/IPUtils.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; * @author xiejs * @since 2022-01-15 */ -public class IPUtil { +public class IPUtils { /** * 获取外网ip @@ -26,7 +26,7 @@ public class IPUtil { String ip = null; // 第一种方式 try { - ip = IPUtil.getNowIP1(); + ip = IPUtils.getNowIP1(); ip.trim(); } catch (Exception e) { System.out.println("getPublicIP - getNowIP1 failed ~ "); @@ -35,7 +35,7 @@ public class IPUtil { return ip; // 第二种方式 try { - ip = IPUtil.getNowIP2(); + ip = IPUtils.getNowIP2(); ip.trim(); } catch (Exception e) { System.out.println("getPublicIP - getNowIP2 failed ~ "); @@ -44,7 +44,7 @@ public class IPUtil { return ip; // 第三种方式 try { - ip = IPUtil.getNowIP3(); + ip = IPUtils.getNowIP3(); ip.trim(); } catch (Exception e) { System.out.println("getPublicIP - getNowIP3 failed ~ "); @@ -53,7 +53,7 @@ public class IPUtil { return ip; // 第四种方式 try { - ip = IPUtil.getNowIP4(); + ip = IPUtils.getNowIP4(); ip.trim(); } catch (Exception e) { System.out.println("getPublicIP - getNowIP4 failed ~ "); diff --git a/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java b/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilsTest.java similarity index 85% rename from xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java rename to xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilsTest.java index 4d89667f..99fec2ec 100644 --- a/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java +++ b/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilsTest.java @@ -11,11 +11,11 @@ import java.util.Date; * @desc * @create 2021-12-29 */ -class ChineseUtilTest { +class ChineseUtilsTest { @Test public void test1() { - boolean b = ChineseUtil.checkNameChese("爱喔爱"); + boolean b = ChineseUtils.checkNameChese("爱喔爱"); System.out.println(b); } diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java index 6c374732..09d9d306 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java @@ -11,7 +11,7 @@ import com.xjs.business.api.RemoteTranDIctFeign; import com.xjs.business.api.RemoteTranslationFeign; import com.xjs.business.api.domain.TranslationVo; import com.xjs.exception.BusinessException; -import com.xjs.utils.ChineseUtil; +import com.xjs.utils.ChineseUtils; import com.xjs.word.domain.EnglishWord; import com.xjs.word.mapper.EnglishWordMapper; import com.xjs.word.service.IEnglishWordService; @@ -110,8 +110,8 @@ public class EnglishWordServiceImpl implements IEnglishWordService { throw new BusinessException("该单词已存在！！！!"); } //校验前端传入的是否英文或中文 - boolean alpha = ChineseUtil.isAlpha(englishWord.getContent()); - boolean chinese = ChineseUtil.checkNameChese(englishWord.getContent()); + boolean alpha = ChineseUtils.isAlpha(englishWord.getContent()); + boolean chinese = ChineseUtils.checkNameChese(englishWord.getContent()); if (!alpha && !chinese) { throw new BusinessException("不能包含其他符号！！！"); } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java index 4fdd59ef..6a8193cd 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java @@ -5,7 +5,7 @@ import com.ruoyi.common.redis.service.RedisService; import com.xjs.common.client.api.roll.RollIPFeignClient; import com.xjs.config.RollProperties; import com.xjs.copywriting.domain.RequestBody; -import com.xjs.utils.IPUtil; +import com.xjs.utils.IPUtils; import com.xjs.weather.domain.IPInfoVo; import com.xjs.weather.factory.IPFactory; import lombok.extern.log4j.Log4j2; @@ -35,7 +35,7 @@ public class RollIPFactory implements IPFactory { public IPInfoVo IpApi() { RequestBody requestBody = new RequestBody(); try { - requestBody.setIp(IPUtil.getV4IP()); + requestBody.setIp(IPUtils.getV4IP()); } catch (Exception e) { requestBody.setIp("127.0.0.1"); }