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) { 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) }) 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')