From e35a216ce0de5497b8ab9250af69479996a33fcc Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Fri, 15 May 2020 23:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=8C=85=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 22 ++++---- .../com/kiisoo/ic/common/ErrorMesage.java | 55 +++++++++++++++++++ .../kiisoo/ic/common/MessageException.java | 52 ++++++++++++++++++ .../store/service/StoreEmployeeService.java | 1 - .../service/StorePromotionDataService.java | 1 - .../service/PromotionCodeService.java | 7 --- .../java/com/kiisoo/ic/utils/OkhttpUtil.java | 4 +- 7 files changed, 120 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/kiisoo/ic/common/ErrorMesage.java create mode 100644 src/main/java/com/kiisoo/ic/common/MessageException.java diff --git a/pom.xml b/pom.xml index 35d2030..12b19aa 100644 --- a/pom.xml +++ b/pom.xml @@ -25,17 +25,17 @@ - - com.kiisoo.aegis - aegis-common - 0.5.0-SNAPSHOT - - - slf4j-log4j12 - org.slf4j - - - + + + + + + + + + + + org.projectlombok diff --git a/src/main/java/com/kiisoo/ic/common/ErrorMesage.java b/src/main/java/com/kiisoo/ic/common/ErrorMesage.java new file mode 100644 index 0000000..08f6234 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/common/ErrorMesage.java @@ -0,0 +1,55 @@ +package com.kiisoo.ic.common; + +public class ErrorMesage { + + private String status; + private String title; + private Integer code; + private String description; + + public ErrorMesage() { + } + + public ErrorMesage(String status, String title, Integer code, String description) { + this.status = status; + this.title = title; + this.code = code; + this.description = description; + } + + public String getStatus() { + return this.status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getCode() { + return this.code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String toString() { + return "ErrorMesage{status='" + this.status + '\'' + ", title='" + this.title + '\'' + ", code=" + this.code + ", description='" + this.description + '\'' + '}'; + } +} diff --git a/src/main/java/com/kiisoo/ic/common/MessageException.java b/src/main/java/com/kiisoo/ic/common/MessageException.java new file mode 100644 index 0000000..4f10f91 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/common/MessageException.java @@ -0,0 +1,52 @@ +package com.kiisoo.ic.common; + + +public class MessageException extends Exception{ + private String status; + private String title; + private Integer code; + private String description; + + public MessageException(ErrorMesage errorMesage) { + this.status = errorMesage.getStatus(); + this.title = errorMesage.getTitle(); + this.code = errorMesage.getCode(); + this.description = errorMesage.getDescription(); + } + + public String getStatus() { + return this.status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getCode() { + return this.code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String toString() { + return "MessageException{status='" + this.status + '\'' + ", title='" + this.title + '\'' + ", code=" + this.code + ", description='" + this.description + '\'' + '}'; + } +} diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index 7faac13..295ce0c 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.kiisoo.aegis.common.faces.util.HttpUtil; import com.kiisoo.ic.common.utils.ExcelUtils; import com.kiisoo.ic.common.utils.MD5FileUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil; diff --git a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java index a3937b0..aab5feb 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.kiisoo.aegis.common.faces.util.HttpUtil; import com.kiisoo.ic.common.utils.MD5FileUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpResult; diff --git a/src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java b/src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java index fda773a..5762ba0 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java +++ b/src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java @@ -1,24 +1,17 @@ package com.kiisoo.ic.synchronous.service; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.kiisoo.aegis.common.faces.util.HttpUtil; import com.kiisoo.ic.common.utils.MD5FileUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil; -import com.kiisoo.ic.common.utils.httpClientUtil.HttpResult; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.store.bean.BsdShareCodeResponse; -import com.kiisoo.ic.store.constant.Constants; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; -import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO; import com.kiisoo.ic.store.entity.StoreUserDTO; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; -import com.kiisoo.ic.synchronous.entity.PromotionDO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/kiisoo/ic/utils/OkhttpUtil.java b/src/main/java/com/kiisoo/ic/utils/OkhttpUtil.java index 06f61ee..ee27517 100644 --- a/src/main/java/com/kiisoo/ic/utils/OkhttpUtil.java +++ b/src/main/java/com/kiisoo/ic/utils/OkhttpUtil.java @@ -4,8 +4,8 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.kiisoo.aegis.common.faces.util.ErrorMesage; -import com.kiisoo.aegis.common.faces.util.MessageException; +import com.kiisoo.ic.common.ErrorMesage; +import com.kiisoo.ic.common.MessageException; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory;