wang 1 месяц назад
Родитель
Сommit
554d3077a1

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/dto/BaseMessage.java → yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/BaseMessage.java

@@ -1,4 +1,4 @@
-package com.yami.shop.platform.dto;
+package com.yami.shop.bean.dto.hb;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/dto/HBBaseReq.java → yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/HBBaseReq.java

@@ -1,4 +1,4 @@
-package com.yami.shop.platform.dto;
+package com.yami.shop.bean.dto.hb;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/dto/HBStoreBaseInfoReq.java → yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/HBStoreBaseInfoReq.java

@@ -1,4 +1,4 @@
-package com.yami.shop.platform.dto;
+package com.yami.shop.bean.dto.hb;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/dto/OrderItemMessage.java → yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/OrderItemMessage.java

@@ -1,4 +1,4 @@
-package com.yami.shop.platform.dto;
+package com.yami.shop.bean.dto.hb;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/dto/OrderMessage.java → yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/OrderMessage.java

@@ -1,4 +1,4 @@
-package com.yami.shop.platform.dto;
+package com.yami.shop.bean.dto.hb;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/dto/StoreMessage.java → yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/StoreMessage.java

@@ -1,4 +1,4 @@
-package com.yami.shop.platform.dto;
+package com.yami.shop.bean.dto.hb;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/dto/StoreRegister.java → yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/StoreRegister.java

@@ -1,4 +1,4 @@
-package com.yami.shop.platform.dto;
+package com.yami.shop.bean.dto.hb;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/OrderController.java

@@ -1,10 +1,10 @@
 package com.yami.shop.platform.controller.hb;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yami.shop.common.util.hb.HBR;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.gather.zswl.platform.utils.HBR;
 import org.springframework.web.bind.annotation.*;
 
 /**

+ 0 - 41
yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/ResourceController.java

@@ -1,41 +0,0 @@
-package com.yami.shop.platform.controller.hb;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.gather.zswl.common.R;
-import org.gather.zswl.common.dto.menu.MenuResourceDTO;
-import org.gather.zswl.core.user.IUserSignService;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 资源管理
- *
- * @author mr wang
- * @version 1.0.0
- * @since 2025-09-08
- */
-@Slf4j
-@RestController
-@AllArgsConstructor
-@RequestMapping("/api/v1/res")
-@CrossOrigin(origins = "*")
-@Api(tags = "资源管理")
-public class ResourceController {
-    private final IUserSignService userService;
-
-    /**
-     * 获取后台管理系统的菜单
-     */
-    @GetMapping("/menus")
-    @ApiOperation(value = "系统的菜单", notes = "用户登录之后,获取后台管理系统的菜单")
-    public R<List<MenuResourceDTO>> doGetUserMenuResources() {
-        return R.SUCCESS(userService.getUserMenuResources());
-    }
-}

+ 4 - 34
yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/StoreManagementController.java

@@ -1,11 +1,11 @@
 package com.yami.shop.platform.controller.hb;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yami.shop.bean.model.hb.StoreManagement;
+import com.yami.shop.common.util.hb.HBR;
+import com.yami.shop.service.hb.IStoreManagementService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.gather.zswl.core.entity.StoreManagement;
-import org.gather.zswl.platform.service.IStoreManagementService;
-import org.gather.zswl.platform.utils.HBR;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -114,35 +114,5 @@ public class StoreManagementController {
         return storeManagementService.disableStore(storeId);
     }
 
-    /**
-     * 获取客户端真实IP地址
-     *
-     * @param request HTTP请求对象
-     * @return 客户端IP地址
-     */
-    private String getClientIp(HttpServletRequest request) {
-        String ip = request.getHeader("X-Forwarded-For");
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_CLIENT_IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getRemoteAddr();
-        }
-
-        // 如果是多个IP,取第一个
-        if (ip != null && ip.contains(",")) {
-            ip = ip.split(",")[0].trim();
-        }
-
-        return ip;
-    }
+
 }

+ 2 - 3
yami-shop-service/src/main/java/com/yami/shop/service/hb/IStoreManagementService.java

@@ -1,9 +1,8 @@
 package com.yami.shop.service.hb;
 
 import com.alibaba.fastjson.JSONObject;
-import org.gather.zswl.core.entity.StoreManagement;
-import org.gather.zswl.platform.dto.StoreRegister;
-import org.gather.zswl.platform.utils.HBR;
+import com.yami.shop.bean.model.hb.StoreManagement;
+import com.yami.shop.common.util.hb.HBR;
 
 import java.util.List;