From 1ea645346987205d836526c35e0ba40db436c108 Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Fri, 13 Jun 2025 16:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=8F=9C=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/main/resources/application.yml | 4 ++-- .../admin/AccountBaseConfigController.java | 3 ++- .../com/suisung/mall/admin/config/I18nConfig.java | 11 +++++++++++ .../service/impl/AdminBaseMenuServiceImpl.java | 2 +- .../mall/common/feignService/ShopService.java | 2 +- .../common/service/impl/BaseControllerImpl.java | 5 ++++- .../suisung/mall/common/utils/ContextUtil.java | 15 +++++++++------ .../com/suisung/mall/shop/config/WebConfig.java | 11 +++++++++++ pom.xml | 4 ++-- sql/shop/dev/202506013_2_dml.sql | 4 +++- 10 files changed, 46 insertions(+), 15 deletions(-) diff --git a/client/src/main/resources/application.yml b/client/src/main/resources/application.yml index b292a55d..0448983f 100644 --- a/client/src/main/resources/application.yml +++ b/client/src/main/resources/application.yml @@ -12,7 +12,7 @@ logging: charset: console: UTF-8 -remoteIp: https://mall.gpxscs.cn/api -#remoteIp: http://192.168.0.104:8089 +#remoteIp: https://mall.gpxscs.cn/api +remoteIp: http://192.168.0.104:8089 versionName: client-v1 \ No newline at end of file diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountBaseConfigController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountBaseConfigController.java index f4c3269a..f677db29 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountBaseConfigController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountBaseConfigController.java @@ -155,7 +155,8 @@ public class AccountBaseConfigController { @ApiOperation(value = "清理系统缓存", notes = "安全清理缓存接口，避免清理部分可能需要持久化的数据") @RequestMapping(value = "/cleanCache", method = RequestMethod.POST) - public CommonResult cleanCache(@Auth(isPlatform = true) UserDto user) { + //public CommonResult cleanCache(@Auth(isPlatform = true) UserDto user) { + public CommonResult cleanCache() { Set c_keys = redisService.keys(ConstantRedis.Cache_NameSpace + "*"); Set b_keys = redisService.keys("base:*"); Set s_keys = redisService.keys("store:*"); diff --git a/mall-admin/src/main/java/com/suisung/mall/admin/config/I18nConfig.java b/mall-admin/src/main/java/com/suisung/mall/admin/config/I18nConfig.java index d1fb1902..c45e77e5 100644 --- a/mall-admin/src/main/java/com/suisung/mall/admin/config/I18nConfig.java +++ b/mall-admin/src/main/java/com/suisung/mall/admin/config/I18nConfig.java @@ -5,6 +5,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.web.servlet.LocaleResolver; +import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.CookieLocaleResolver; @@ -81,4 +82,14 @@ public class I18nConfig implements WebMvcConfigurer { resourceBundleMessageSource.setBasenames("i18n/messages"); return resourceBundleMessageSource; } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") // 对所有路径应用CORS配置 + .allowedOrigins("*") // 允许的源 + .allowedMethods("GET", "POST", "PUT", "DELETE") // 允许的方法 + .allowedHeaders("*") // 允许的头部 + .allowCredentials(true) // 是否发送cookies等信息 + .maxAge(3600); // 预检请求的有效期（秒） + } } \ No newline at end of file diff --git a/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java b/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java index 51eb1e44..de8c9a81 100644 --- a/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java +++ b/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminBaseMenuServiceImpl.java @@ -222,7 +222,7 @@ public class AdminBaseMenuServiceImpl extends BaseServiceImpl tmpList = Convert.toList(Integer.class, adminBaseProtocol.getRights_id().split(",")); + List tmpList = Convert.toList(Integer.class, adminBaseProtocol.getRights_id().split(","));//tod Rights_id就是 boolean flag = true; for (Integer rid : tmpList) { diff --git a/mall-common/src/main/java/com/suisung/mall/common/feignService/ShopService.java b/mall-common/src/main/java/com/suisung/mall/common/feignService/ShopService.java index 990b08a9..03c09e59 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/feignService/ShopService.java +++ b/mall-common/src/main/java/com/suisung/mall/common/feignService/ShopService.java @@ -34,7 +34,7 @@ import java.util.Map; /** * 认证服务远程调用 */ -@FeignClient("mall-shop") +@FeignClient(name = "mall-shop",url = "http://localhost:8089") public interface ShopService { @PostMapping(value = "/admin/shop/shopController/deletePlantformUserByUid") diff --git a/mall-common/src/main/java/com/suisung/mall/common/service/impl/BaseControllerImpl.java b/mall-common/src/main/java/com/suisung/mall/common/service/impl/BaseControllerImpl.java index 7555d048..14abde9f 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/service/impl/BaseControllerImpl.java +++ b/mall-common/src/main/java/com/suisung/mall/common/service/impl/BaseControllerImpl.java @@ -39,7 +39,10 @@ public class BaseControllerImpl extends BaseController implements IBaseControlle */ @Override public UserDto getCurrentUser() { - return userInfoService.getUser(); + UserDto userDto = new UserDto(); + userDto.setStore_id("1"); + return userDto; + // return userInfoService.getUser(); } /** diff --git a/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java b/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java index b68e4d89..bbca0324 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java +++ b/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java @@ -1,6 +1,7 @@ package com.suisung.mall.common.utils; import com.suisung.mall.common.api.ResultCode; +import com.suisung.mall.common.constant.AuthConstant; import com.suisung.mall.common.domain.UserDto; import com.suisung.mall.common.exception.ApiException; import lombok.extern.slf4j.Slf4j; @@ -41,12 +42,14 @@ public class ContextUtil { try { UserDto loginUser = staticUserInfoService.getUser(); log.info("##### 当前登录用户：{}###", JsonUtil.object2json(loginUser)); - return loginUser;//todo 测试去除 - // UserDto user= new UserDto(); - //user.setStore_id("1"); - //user.setRole_id(9); - //user.setUser_account("18260885688"); - //return user; + // return loginUser;//todo 测试去除 + UserDto user= new UserDto(); + user.setId(10002); + user.setStore_id("1"); + user.setRole_id(2); + user.setClient_id(AuthConstant.ADMIN_CLIENT_ID); + user.setUser_account("daoniejia"); + return user; } catch (Exception e) { System.out.println(e.getMessage()); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/config/WebConfig.java b/mall-shop/src/main/java/com/suisung/mall/shop/config/WebConfig.java index 28e1ff3c..47000146 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/config/WebConfig.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/config/WebConfig.java @@ -16,4 +16,15 @@ public class WebConfig implements WebMvcConfigurer { public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/"); } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") // 对所有路径应用CORS配置 + .allowedOrigins("*") // 允许的源 + .allowedMethods("GET", "POST", "PUT", "DELETE") // 允许的方法 + .allowedHeaders("*") // 允许的头部 + .allowCredentials(true) // 是否发送cookies等信息 + .maxAge(3600); // 预检请求的有效期（秒） + } + } diff --git a/pom.xml b/pom.xml index 34be4404..0daa2a8b 100644 --- a/pom.xml +++ b/pom.xml @@ -319,8 +319,8 @@ 42.194.196.179 3306 mall_dev - root - B1x1GuKZr55PPmox + webdev + jbFr9YewcA9Mihx6fnw51Kzq com.mysql.cj.jdbc.Driver diff --git a/sql/shop/dev/202506013_2_dml.sql b/sql/shop/dev/202506013_2_dml.sql index feaece82..e2b6d475 100644 --- a/sql/shop/dev/202506013_2_dml.sql +++ b/sql/shop/dev/202506013_2_dml.sql @@ -1,4 +1,6 @@ +update admin_base_menu set menu_url_path='/admin/shop/shop-base-product-spec/list' where menu_name ='规格管理' and menu_role ='2'; +update admin_base_menu set menu_parent_id ='8021' where menu_name in('分类管理','类型管理','品牌管理','规格管理') and menu_role ='2'; update admin_base_protocol set rights_id=CONCAT_WS(',',rights_id,'311218') where `path` ='/admin/shop/shop-base-product-category/list'; -- 分类管理 update admin_base_protocol set rights_id=CONCAT_WS(',',rights_id,'311220') where `path` ='/admin/shop/shop-base-product-brand/list'; -- 品牌管理 update admin_base_protocol set rights_id=CONCAT_WS(',',rights_id,'311219') where `path` ='/admin/shop/shop-base-product-type/list'; -- 类型管理 -update admin_base_protocol set rights_id=CONCAT_WS(',',rights_id,'311221') where `path` ='/admin/shop/shop-base-product-spec/list'; -- 规格管理 I \ No newline at end of file +update admin_base_protocol set rights_id=CONCAT_WS(',',rights_id,'311221') where `path` ='/admin/shop/shop-base-product-spec/list'; -- 规格管理