From 171957bea00ea8bdeac7493a4974adeb5235a880 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 8 Jun 2023 17:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=99=E6=AD=BB=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/constants/CommonConstants.java | 2 + .../com/cool/store/enums/MenuTypeEnum.java | 31 +++ .../cool/store/enums/PlatFormTypeEnum.java | 43 ++++ .../java/com/cool/store/dao/SysMenuDAO.java | 26 ++ .../com/cool/store/mapper/SysMenuMapper.java | 29 +++ .../main/resources/mapper/SysMenuMapper.xml | 239 ++++++++++++++++++ .../resources/mybatis-generator.properties | 2 +- .../java/com/cool/store/entity/SysMenuDO.java | 82 ++++++ .../com/cool/store/vo/menu/MenuTreeVO.java | 118 +++++++++ .../com/cool/store/service/MenuService.java | 16 ++ .../store/service/impl/MenuServiceImpl.java | 31 +++ .../store/config/ServletContextConfig.java | 69 +++++ .../cool/store/controller/MenuController.java | 27 ++ .../store/controller/OssClientController.java | 6 +- .../main/resources/application-ab.properties | 7 +- .../main/resources/application-dev.properties | 7 +- .../main/resources/application-hd.properties | 9 +- .../resources/application-local.properties | 3 +- .../resources/application-online.properties | 9 +- .../main/resources/application-pre.properties | 9 +- .../resources/application-test.properties | 7 +- .../cool/store/config/CommonBeanConfig.java | 17 -- .../store/config/ServletContextConfig.java | 69 +++++ .../main/resources/application-ab.properties | 7 +- .../main/resources/application-dev.properties | 7 +- .../main/resources/application-hd.properties | 9 +- .../resources/application-local.properties | 7 +- .../resources/application-online.properties | 9 +- .../main/resources/application-pre.properties | 9 +- .../resources/application-test.properties | 7 +- 30 files changed, 878 insertions(+), 35 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/MenuTypeEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/PlatFormTypeEnum.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysMenuMapper.java create mode 100644 coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java create mode 100644 coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java create mode 100644 coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java delete mode 100644 coolstore-partner-webc/src/main/java/com/cool/store/config/CommonBeanConfig.java create mode 100644 coolstore-partner-webc/src/main/java/com/cool/store/config/ServletContextConfig.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 0346611e9..ffbff6a66 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -74,6 +74,8 @@ public class CommonConstants { public static final String DELETE_DEPT_ID = "-1"; public static final String AI_USER_ID = "a100000001"; + public static final long ZERO_LONG = 0L; + public static final int ZERO = 0; public static final int ONE = 1; public static final int TWO = 2; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MenuTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MenuTypeEnum.java new file mode 100644 index 000000000..c5ee0d090 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MenuTypeEnum.java @@ -0,0 +1,31 @@ +package com.cool.store.enums; + +/** + * @author zhangchenbiao + * @FileName: MentTypeEnum + * @Description: + * @date 2021-09-23 17:59 + */ +public enum MenuTypeEnum { + + + MENU(1,"菜单"), + AUTH(2,"权限"); + + private Integer code; + + private String message; + + MenuTypeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/PlatFormTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/PlatFormTypeEnum.java new file mode 100644 index 000000000..e472f7d2d --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/PlatFormTypeEnum.java @@ -0,0 +1,43 @@ +package com.cool.store.enums; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @author zhangchenbiao + * @FileName: PlatFormTypeEnum + * @Description: + * @date 2023-06-08 16:43 + */ +public enum PlatFormTypeEnum { + + /** + * 菜单类型 + */ + PC("PC","pc端菜单"), + ; + + private String code; + private String msg; + + protected static final Map map = Arrays.stream(values()).collect( + Collectors.toMap(PlatFormTypeEnum::getCode, Function.identity())); + + PlatFormTypeEnum(String code, String msg){ + this.code=code; + this.msg=msg; + } + + public String getCode() { + return code; + } + + public String getMsg() { + return msg; + } + public static PlatFormTypeEnum getByCode(String code) { + return map.get(code); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java new file mode 100644 index 000000000..8c1f5224d --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java @@ -0,0 +1,26 @@ +package com.cool.store.dao; + +import com.cool.store.entity.SysMenuDO; +import com.cool.store.mapper.SysMenuMapper; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: SysMenuDAO + * @Description: + * @date 2023-06-08 16:41 + */ +@Repository +public class SysMenuDAO { + + @Resource + private SysMenuMapper sysMenuMapper; + + public List selectMenuAll(List parentIds, String platformType){ + return sysMenuMapper.selectMenuAll(parentIds, platformType); + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysMenuMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysMenuMapper.java new file mode 100644 index 000000000..dcab9b53e --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysMenuMapper.java @@ -0,0 +1,29 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.SysMenuDO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author zhangchenbiao + * @date 2023-06-08 04:38 + */ +public interface SysMenuMapper { + /** + * + * 默认插入方法，只会给有值的字段赋值 + * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null + * dateTime:2023-06-08 04:38 + */ + int insertSelective(SysMenuDO record); + + /** + * + * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 + * dateTime:2023-06-08 04:38 + */ + int updateByPrimaryKeySelective(SysMenuDO record); + + List selectMenuAll(@Param("list") List parentIds, @Param("platformType") String platformType); +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml new file mode 100644 index 000000000..1cf6031d4 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, parent_id, code, name, alias, path, perms, source, sort, category, action, remark, + platform, is_deleted, type, target, component, icon, menu_type, env, common_functions_icon + + + insert into sys_menu + + + parent_id, + + + code, + + + name, + + + alias, + + + path, + + + perms, + + + source, + + + sort, + + + category, + + + action, + + + remark, + + + platform, + + + is_deleted, + + + type, + + + target, + + + component, + + + icon, + + + menu_type, + + + env, + + + common_functions_icon, + + + + + #{parentId}, + + + #{code}, + + + #{name}, + + + #{alias}, + + + #{path}, + + + #{perms}, + + + #{source}, + + + #{sort}, + + + #{category}, + + + #{action}, + + + #{remark}, + + + #{platform}, + + + #{isDeleted}, + + + #{type}, + + + #{target}, + + + #{component}, + + + #{icon}, + + + #{menuType}, + + + #{env}, + + + #{commonFunctionsIcon}, + + + + + update sys_menu + + + parent_id = #{parentId}, + + + code = #{code}, + + + name = #{name}, + + + alias = #{alias}, + + + path = #{path}, + + + perms = #{perms}, + + + source = #{source}, + + + sort = #{sort}, + + + category = #{category}, + + + action = #{action}, + + + remark = #{remark}, + + + platform = #{platform}, + + + is_deleted = #{isDeleted}, + + + type = #{type}, + + + target = #{target}, + + + component = #{component}, + + + icon = #{icon}, + + + menu_type = #{menuType}, + + + env = #{env}, + + + common_functions_icon = #{commonFunctionsIcon}, + + + where id = #{id} + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/test/resources/mybatis-generator.properties b/coolstore-partner-dao/src/test/resources/mybatis-generator.properties index 67f8b8545..70f638782 100644 --- a/coolstore-partner-dao/src/test/resources/mybatis-generator.properties +++ b/coolstore-partner-dao/src/test/resources/mybatis-generator.properties @@ -3,4 +3,4 @@ jdbc.url = jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcoll jdbc.user= coolstore jdbc.password = CSCErYcXniNYm7bT -table.name = enterprise_user_role \ No newline at end of file +table.name = sys_menu \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java new file mode 100644 index 000000000..4dbd9616f --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java @@ -0,0 +1,82 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author zhangchenbiao + * @date 2023-06-08 04:38 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysMenuDO implements Serializable { + @ApiModelProperty("自增id") + private Long id; + + @ApiModelProperty("父级菜单") + private Long parentId; + + @ApiModelProperty("菜单编号") + private String code; + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单别名") + private String alias; + + @ApiModelProperty("请求地址(前端路由)") + private String path; + + @ApiModelProperty("后端权限标识") + private String perms; + + @ApiModelProperty("菜单资源(图片)") + private String source; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("菜单类型(菜单，按钮)") + private Integer category; + + @ApiModelProperty("操作按钮类型(工具栏，操作栏，工具操作栏)") + private Integer action; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("所属项目（PC，小程序）") + private String platform; + + @ApiModelProperty("是否已删除") + private Integer isDeleted; + + @ApiModelProperty("操作类型") + private String type; + + @ApiModelProperty("是否新开页面") + private String target; + + @ApiModelProperty("组件") + private String component; + + @ApiModelProperty("图标") + private String icon; + + @ApiModelProperty("菜单类型 1菜单 2权限") + private Integer menuType; + + @ApiModelProperty("环境") + private String env; + + @ApiModelProperty("常用功能_图标") + private String commonFunctionsIcon; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java new file mode 100644 index 000000000..272a5c0f2 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java @@ -0,0 +1,118 @@ +package com.cool.store.vo.menu; + +import com.cool.store.entity.SysMenuDO; +import com.cool.store.enums.MenuTypeEnum; +import com.google.common.collect.Lists; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * describe: + * + * @author zhouyiping + * @date 2020/09/22 + */ +@Data +public class MenuTreeVO { + + @ApiModelProperty("请求地址(前端路由)") + private String path; + + @ApiModelProperty("菜单编号") + private String code; + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单id") + private Long id; + + @ApiModelProperty("父级菜单") + private Long parentId; + + @ApiModelProperty("是否新开页面") + private String target; + + @ApiModelProperty("组件") + private String component; + + @ApiModelProperty("图标'") + private String icon; + + @ApiModelProperty("常用功能图标") + private String commonFunctionsIcon; + + @ApiModelProperty("菜单类型 1菜单 2权限") + private Integer menuType; + + @ApiModelProperty("权限列表") + private List authorityList; + + @ApiModelProperty("子菜单") + private List children; + + public static List dealMenuTree(Long rootId, List menuList) { + if(CollectionUtils.isEmpty(menuList)){ + return Lists.newArrayList(); + } + Map> parentGroup = ListUtils.emptyIfNull(menuList).stream().collect(Collectors.groupingBy(SysMenuDO::getParentId)); + List menuDOList = parentGroup.get(rootId); + if (CollectionUtils.isEmpty(menuDOList)) { + return Collections.emptyList(); + } + List voList = convertVO(menuDOList); + List treeVOList = new LinkedList<>(voList); + for (MenuTreeVO data : treeVOList) { + getChild(data, parentGroup); + } + return treeVOList; + } + + public static List convertVO(List menuList) { + menuList = menuList.stream().sorted(Comparator.comparing(SysMenuDO::getSort)).collect(Collectors.toList()); + List resultList = new ArrayList<>(); + for (SysMenuDO menu : menuList) { + MenuTreeVO vo = new MenuTreeVO(); + vo.setId(menu.getId()); + vo.setParentId(menu.getParentId()); + vo.setName(menu.getName()); + vo.setCode(menu.getType()); + vo.setPath(menu.getPath()); + vo.setComponent(menu.getComponent()); + vo.setTarget(menu.getTarget()); + vo.setIcon(menu.getIcon()); + vo.setMenuType(menu.getMenuType()); + vo.setCommonFunctionsIcon(menu.getCommonFunctionsIcon()); + resultList.add(vo); + } + return resultList; + } + + public static void getChild(MenuTreeVO data, Map> parentGroup) { + List sysMenuDOList = parentGroup.get(data.getId()); + List parentMenuList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.MENU.getCode().equals(menu.getMenuType())).collect(Collectors.toList()); + List parentAuthList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.AUTH.getCode().equals(menu.getMenuType())).collect(Collectors.toList()); + //属于菜单下时候 + if (CollectionUtils.isNotEmpty(parentMenuList)) { + List voList = convertVO(parentMenuList); + List authList = parentMenuList.stream().map(SysMenuDO::getType).collect(Collectors.toList()); + data.setAuthorityList(authList); + List menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList()); + data.setChildren(menuList); + voList.forEach(child -> { + getChild(child, parentGroup); + }); + } + //数据是权限的的时候 + if (CollectionUtils.isNotEmpty(parentAuthList)) { + List authList = parentAuthList.stream().map(SysMenuDO::getType).collect(Collectors.toList()); + data.setAuthorityList(authList); + } + } + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java new file mode 100644 index 000000000..6b6445ec8 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java @@ -0,0 +1,16 @@ +package com.cool.store.service; + +import com.cool.store.vo.menu.MenuTreeVO; + +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: MenuService + * @Description: + * @date 2023-06-08 16:43 + */ +public interface MenuService { + + List getUserMenus(String userId); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java new file mode 100644 index 000000000..07315810d --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java @@ -0,0 +1,31 @@ +package com.cool.store.service.impl; + +import com.cool.store.constants.CommonConstants; +import com.cool.store.dao.SysMenuDAO; +import com.cool.store.entity.SysMenuDO; +import com.cool.store.enums.PlatFormTypeEnum; +import com.cool.store.service.MenuService; +import com.cool.store.vo.menu.MenuTreeVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: MenuServiceImpl + * @Description: + * @date 2023-06-08 16:43 + */ +@Service +public class MenuServiceImpl implements MenuService { + + @Resource + private SysMenuDAO sysMenuDAO; + + @Override + public List getUserMenus(String userId) { + List menuList= sysMenuDAO.selectMenuAll(null, PlatFormTypeEnum.PC.getCode()); + return MenuTreeVO.dealMenuTree(CommonConstants.ZERO_LONG, menuList); + } +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java new file mode 100644 index 000000000..1223dc39e --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java @@ -0,0 +1,69 @@ +package com.cool.store.config; + +import javafx.application.Application; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.web.servlet.HandlerExceptionResolver; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: ServletContextConfig + * @Description: + * @date 2023-06-08 16:28 + */ +@Configuration +@ComponentScan(basePackageClasses = Application.class, useDefaultFilters = true) +public class ServletContextConfig extends WebMvcConfigurationSupport { + + private final Logger logger = LoggerFactory.getLogger(ServletContextConfig.class); + + /** + * 配置servlet处理 + */ + @Override + public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { + configurer.enable(); + } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("*") + .allowCredentials(true) + .allowedMethods("GET", "POST", "OPTIONS", "PUT", "DELETE") + .maxAge(3600); + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/**").addResourceLocations("classpath:/static/"); + registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + super.addResourceHandlers(registry); + } + + @Override + public void configureMessageConverters(List> converters) { + } + + /** + * 统一异常处理 + * + * @param exceptionResolvers + */ + @Override + public void configureHandlerExceptionResolvers(List exceptionResolvers) { + } + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java new file mode 100644 index 000000000..affb789d1 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java @@ -0,0 +1,27 @@ +package com.cool.store.controller; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.MenuService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author zhangchenbiao + * @FileName: MenuController + * @Description: + * @date 2023-06-08 16:58 + */ +@RestController +public class MenuController { + + @Resource + private MenuService menuService; + + @GetMapping("/test/menu/getUserMenus") + public ResponseResult getUserMenus(){ + return ResponseResult.success(menuService.getUserMenus(null)); + } + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java index f9e44fd53..ff1861975 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java @@ -34,13 +34,15 @@ public class OssClientController { private String endpoint; @Value("${oss.bucket:null}") private String bucket; + @Value("${corpId:null}") + private String corpId; @GetMapping("/getUploadFileConfig") - public ResponseResult getUploadFileConfig(@RequestParam("enterpriseId")String enterpriseId){ + public ResponseResult getUploadFileConfig(){ // host的格式为 bucketname.endpoint String host = "http://" + bucket + "." + endpoint; // 用户上传文件时指定的前缀。 - String dir = "partner/" + enterpriseId + "/"; + String dir = "partner/" + corpId + "/"; OSSClient client = new OSSClient(endpoint, accessKeyId, accessKeySecret); try { diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index d12393932..b9a171ad1 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -42,4 +42,9 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in rocketmq.topic=simple_message rocketmq.orderTopic=order_message -default.database.name=coolcollege_intelligent_hy +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 71ad1c900..9d78f2b81 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -42,4 +42,9 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in rocketmq.topic=simple_message rocketmq.orderTopic=order_message -default.database.name=coolcollege_intelligent_hy \ No newline at end of file +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-hd.properties b/coolstore-partner-webb/src/main/resources/application-hd.properties index 6cb958e9e..0e0a2dcc4 100644 --- a/coolstore-partner-webb/src/main/resources/application-hd.properties +++ b/coolstore-partner-webb/src/main/resources/application-hd.properties @@ -40,4 +40,11 @@ rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message -rocketmq.orderTopic=order_message \ No newline at end of file +rocketmq.orderTopic=order_message + +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 5c01609e8..14c369a05 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -50,5 +50,4 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore - -default.database.name=coolcollege_intelligent_hy \ No newline at end of file +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties index 21fe024d9..f80836fe7 100644 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ b/coolstore-partner-webb/src/main/resources/application-online.properties @@ -40,4 +40,11 @@ rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message -rocketmq.orderTopic=order_message \ No newline at end of file +rocketmq.orderTopic=order_message + +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-pre.properties b/coolstore-partner-webb/src/main/resources/application-pre.properties index 21fe024d9..f80836fe7 100644 --- a/coolstore-partner-webb/src/main/resources/application-pre.properties +++ b/coolstore-partner-webb/src/main/resources/application-pre.properties @@ -40,4 +40,11 @@ rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message -rocketmq.orderTopic=order_message \ No newline at end of file +rocketmq.orderTopic=order_message + +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-webb/src/main/resources/application-test.properties index ad573b430..8b52a2f2a 100644 --- a/coolstore-partner-webb/src/main/resources/application-test.properties +++ b/coolstore-partner-webb/src/main/resources/application-test.properties @@ -42,4 +42,9 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in rocketmq.topic=simple_message rocketmq.orderTopic=order_message -default.database.name=coolcollege_intelligent_hy \ No newline at end of file +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/CommonBeanConfig.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/CommonBeanConfig.java deleted file mode 100644 index 96ebe7966..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/CommonBeanConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.config; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author zhangchenbiao - * @FileName: CommonBeanConfig - * @Description: - * @date 2023-05-19 18:41 - */ -@Slf4j -@Component -public class CommonBeanConfig { - - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/ServletContextConfig.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/ServletContextConfig.java new file mode 100644 index 000000000..1223dc39e --- /dev/null +++ b/coolstore-partner-webc/src/main/java/com/cool/store/config/ServletContextConfig.java @@ -0,0 +1,69 @@ +package com.cool.store.config; + +import javafx.application.Application; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.web.servlet.HandlerExceptionResolver; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: ServletContextConfig + * @Description: + * @date 2023-06-08 16:28 + */ +@Configuration +@ComponentScan(basePackageClasses = Application.class, useDefaultFilters = true) +public class ServletContextConfig extends WebMvcConfigurationSupport { + + private final Logger logger = LoggerFactory.getLogger(ServletContextConfig.class); + + /** + * 配置servlet处理 + */ + @Override + public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { + configurer.enable(); + } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("*") + .allowCredentials(true) + .allowedMethods("GET", "POST", "OPTIONS", "PUT", "DELETE") + .maxAge(3600); + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/**").addResourceLocations("classpath:/static/"); + registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + super.addResourceHandlers(registry); + } + + @Override + public void configureMessageConverters(List> converters) { + } + + /** + * 统一异常处理 + * + * @param exceptionResolvers + */ + @Override + public void configureHandlerExceptionResolvers(List exceptionResolvers) { + } + +} diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index 71ad1c900..9d78f2b81 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -42,4 +42,9 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in rocketmq.topic=simple_message rocketmq.orderTopic=order_message -default.database.name=coolcollege_intelligent_hy \ No newline at end of file +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties index 71ad1c900..9d78f2b81 100644 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ b/coolstore-partner-webc/src/main/resources/application-dev.properties @@ -42,4 +42,9 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in rocketmq.topic=simple_message rocketmq.orderTopic=order_message -default.database.name=coolcollege_intelligent_hy \ No newline at end of file +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-hd.properties b/coolstore-partner-webc/src/main/resources/application-hd.properties index ea9ed3913..9ba2dfa95 100644 --- a/coolstore-partner-webc/src/main/resources/application-hd.properties +++ b/coolstore-partner-webc/src/main/resources/application-hd.properties @@ -38,4 +38,11 @@ rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message -rocketmq.orderTopic=order_message \ No newline at end of file +rocketmq.orderTopic=order_message + +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index b3ace8492..c42cdb613 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -45,4 +45,9 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in rocketmq.topic=simple_message rocketmq.orderTopic=order_message -default.database.name=coolcollege_intelligent_hy +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties index ea9ed3913..9ba2dfa95 100644 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ b/coolstore-partner-webc/src/main/resources/application-online.properties @@ -38,4 +38,11 @@ rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message -rocketmq.orderTopic=order_message \ No newline at end of file +rocketmq.orderTopic=order_message + +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-pre.properties b/coolstore-partner-webc/src/main/resources/application-pre.properties index ea9ed3913..9ba2dfa95 100644 --- a/coolstore-partner-webc/src/main/resources/application-pre.properties +++ b/coolstore-partner-webc/src/main/resources/application-pre.properties @@ -38,4 +38,11 @@ rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message -rocketmq.orderTopic=order_message \ No newline at end of file +rocketmq.orderTopic=order_message + +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-test.properties b/coolstore-partner-webc/src/main/resources/application-test.properties index defe7cd06..9e89a7798 100644 --- a/coolstore-partner-webc/src/main/resources/application-test.properties +++ b/coolstore-partner-webc/src/main/resources/application-test.properties @@ -40,4 +40,9 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in rocketmq.topic=simple_message rocketmq.orderTopic=order_message -default.database.name=coolcollege_intelligent_hy \ No newline at end of file +#oss配置 +oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 +oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS +oss.endpoint=oss-cn-shanghai.aliyuncs.com +oss.bucket=vec-coolstore +corp.id = 10e5fa7c74da175d \ No newline at end of file