From acba81e1548617478c9b8e0a85311b8ddfe3b7d0 Mon Sep 17 00:00:00 2001
From: 1517874642 <1517874642@qq.com>
Date: Mon, 30 Nov 2020 13:39:24 +0800
Subject: [PATCH] fix

---
 .../service/controller/AddressController.java |  4 +-
 .../com/hp/user/service/utils/HttpResult.java |  2 +-
 .../java/com/hp/user/utils/HttpResult.java    | 63 -------------------
 3 files changed, 3 insertions(+), 66 deletions(-)
 delete mode 100644 user-service/src/main/java/com/hp/user/utils/HttpResult.java

diff --git a/user-service/src/main/java/com/hp/user/service/controller/AddressController.java b/user-service/src/main/java/com/hp/user/service/controller/AddressController.java
index 574a590..a91f9b4 100644
--- a/user-service/src/main/java/com/hp/user/service/controller/AddressController.java
+++ b/user-service/src/main/java/com/hp/user/service/controller/AddressController.java
@@ -2,8 +2,8 @@ package com.hp.user.service.controller;
 
 import com.hp.user.client.entity.AddressVO;
 import com.hp.user.client.service.AddressService;
-import com.hp.user.util.IdWorker;
-import com.hp.user.utils.HttpResult;
+import com.hp.user.service.utils.IdWorker;
+import com.hp.user.service.utils.HttpResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/user-service/src/main/java/com/hp/user/service/utils/HttpResult.java b/user-service/src/main/java/com/hp/user/service/utils/HttpResult.java
index 0576c68..31d0af8 100644
--- a/user-service/src/main/java/com/hp/user/service/utils/HttpResult.java
+++ b/user-service/src/main/java/com/hp/user/service/utils/HttpResult.java
@@ -1,4 +1,4 @@
-package com.hp.user.utils;
+package com.hp.user.service.utils;
 import java.io.Serializable;
 
 public class HttpResult implements Serializable {
diff --git a/user-service/src/main/java/com/hp/user/utils/HttpResult.java b/user-service/src/main/java/com/hp/user/utils/HttpResult.java
deleted file mode 100644
index 96cf818..0000000
--- a/user-service/src/main/java/com/hp/user/utils/HttpResult.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.hp.user.utils;
-
-import java.io.Serializable;
-
-public class HttpResult implements Serializable {
-    private int code; // 状态码
-    private String message;
-    private Object data;
-
-    public HttpResult() {
-
-    }
-
-    public HttpResult(int code, String message, Object data) {
-        this.code = code;
-        this.message = message;
-        this.data = data;
-    }
-
-    public static HttpResult success() {
-        return new HttpResult(0, "操作成功", "");
-    }
-
-    public static HttpResult success(Object data) {
-        return new HttpResult(0, "操作成功", data);
-    }
-
-    public static HttpResult success(String message, Object data) {
-        return new HttpResult(0, message, data);
-    }
-
-    public static HttpResult fail() {
-        return new HttpResult(-1, "操作失败", "");
-    }
-
-    public static HttpResult fail(String message) {
-        return new HttpResult(-1, message, "");
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Object getData() {
-        return data;
-    }
-
-    public void setData(Object data) {
-        this.data = data;
-    }
-}
\ No newline at end of file