From dbf7f05df5a624a83a7f28707b5eb9291fc5799c Mon Sep 17 00:00:00 2001 From: linhaojun Date: Mon, 13 Feb 2023 22:53:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/aurora/util/IpUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/aurora-springboot/src/main/java/com/aurora/util/IpUtil.java b/aurora-springboot/src/main/java/com/aurora/util/IpUtil.java index 78c7b3e..5502a35 100644 --- a/aurora-springboot/src/main/java/com/aurora/util/IpUtil.java +++ b/aurora-springboot/src/main/java/com/aurora/util/IpUtil.java @@ -1,5 +1,6 @@ package com.aurora.util; +import com.aurora.constant.CommonConstant; import eu.bitwalker.useragentutils.UserAgent; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -89,11 +90,14 @@ public class IpUtil { } public static String getIpProvince(String ipSource) { + if (StringUtils.isBlank(ipSource)) { + return CommonConstant.UNKNOWN; + } String[] strings = ipSource.split("\\|"); - if (strings[1].endsWith("省")) { + if (strings.length > 1 && strings[1].endsWith("省")) { return StringUtils.substringBefore(strings[1], "省"); } - return strings[1]; + return strings[0]; } public static UserAgent getUserAgent(HttpServletRequest request) { From dd79ca09589a4f154e1fd35e6e3a81b72c88e2dd Mon Sep 17 00:00:00 2001 From: linhaojun Date: Mon, 13 Feb 2023 23:05:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-blog/src/api/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurora-vue/aurora-blog/src/api/api.ts b/aurora-vue/aurora-blog/src/api/api.ts index fda3104..21de5ee 100644 --- a/aurora-vue/aurora-blog/src/api/api.ts +++ b/aurora-vue/aurora-blog/src/api/api.ts @@ -44,7 +44,7 @@ export default { return axios.get('/api/articles/' + articleId) }, getAllCategories: () => { - return axios.get('/api//categories/all') + return axios.get('/api/categories/all') }, getAllTags: () => { return axios.get('/api/tags/all') From e744ac4f88fa5bc1127c7c9b9b4c77a1bf848c25 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Mon, 13 Feb 2023 23:08:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-admin/src/views/album/Photo.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/aurora-vue/aurora-admin/src/views/album/Photo.vue b/aurora-vue/aurora-admin/src/views/album/Photo.vue index 035969a..195016a 100644 --- a/aurora-vue/aurora-admin/src/views/album/Photo.vue +++ b/aurora-vue/aurora-admin/src/views/album/Photo.vue @@ -327,7 +327,6 @@ export default { if (file.size / 1024 < this.config.UPLOAD_SIZE) { resolve(file) } - // 压缩到200KB,这里的200就是要压缩的大小,可自定义 imageConversion.compressAccurately(file, this.config.UPLOAD_SIZE).then((res) => { resolve(res) })