去掉跨域，id为long转换string

sckw-auth/src/main/java/com/sckw/auth/controller/AuthController.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
  * @author: czh
  * @date: 2023/6/19
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/auth")
 public class AuthController {
@@ -38,7 +37,7 @@ public class AuthController {
     }
 
     /**
-     * @param reqDto 注册入参
+     * @param reqDto 注册
      * @return HttpResult
      * @desc: 用户注册
      * @author: czh

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/LongToStringUtils.java

@@ -0,0 +1,23 @@
+package com.sckw.core.utils;
+
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.map.JsonSerializer;
+import org.codehaus.jackson.map.SerializerProvider;
+
+import java.io.IOException;
+
+/**
+ * @author czh
+ * @desc TODO
+ * @date 2023/7/10
+ */
+public class LongToStringUtils extends JsonSerializer<Long> {
+
+    @Override
+    public void serialize(Long aLong, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+        if(null!=aLong) {
+            jsonGenerator.writeString(String.valueOf(aLong));
+        }
+    }
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/config/WebMvcConfig.java

@@ -1,23 +0,0 @@
-package com.sckw.core.web.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @author czh
- * @desc 跨域访问配置
- * @date 2023/7/6
- */
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowCredentials(true)
-                .allowedMethods("GET", "HEAD", "POST","PUT", "DELETE", "OPTIONS")
-                .maxAge(3600);
-    }
-
-}

sckw-common/sckw-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -2,6 +2,5 @@ com.sckw.core.aspect.DaoAspect
 com.sckw.core.exception.GlobalSystemExceptionHandler
 com.sckw.core.web.config.CustomConfig
 com.sckw.core.filter.LoginFilter
-com.sckw.core.web.config.WebMvcConfig
 com.sckw.core.filter.ExceptionFilterConfig
 com.sckw.core.config.MybatisPlusConfig

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/ExceptionController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @desc TODO
  * @date 2023/6/14
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/error")
 public class ExceptionController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsDeptController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
  * @author zk
  * @date 2023-05-31
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/kwsDept")
 public class KwsDeptController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -16,7 +16,6 @@ import java.util.Map;
  * @author zk
  * @date 2023-05-31
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/kwsEnt")
 public class KwsEnterpriseController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsMenuController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
  * @author zk
  * @date 2023-05-31
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/kwsMenu")
 public class KwsMenuController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsRoleController.java

@@ -21,7 +21,6 @@ import java.util.List;
  * @author zk
  * @date 2023-05-31
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/kwsRole")
 public class KwsRoleController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -21,7 +21,6 @@ import java.util.List;
  * @author zk
  * @date 2023-05-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/kwsUser")
 public class KwsUserController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/SysAreaController.java

@@ -13,7 +13,6 @@ import java.util.Map;
  * @author zk
  * @date 2023-05-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/sysArea")
 public class SysAreaController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/SysDictController.java

@@ -23,7 +23,6 @@ import java.util.Map;
  * @author zk
  * @date 2023-05-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/sysDict")
 public class SysDictController {

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/FindMenuTreeResVo.java

@@ -0,0 +1,141 @@
+package com.sckw.system.model.vo.res;
+
+import com.sckw.core.utils.LongToStringUtils;
+import lombok.Data;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author czh
+ * @desc 菜单树
+ * @date 2023/7/10
+ */
+@Data
+public class FindMenuTreeResVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 6849124104398557126L;
+
+    /**
+     * 主键
+     */
+    @JsonSerialize(using = LongToStringUtils.class)
+    private Long id;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status = 0;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 删除标识(0正常/-1删除)
+     */
+    private Integer delFlag = 0;
+
+
+    /**
+     * 终端类型(1运营端、2企业PC端、3企业APP、4司机端)
+     */
+    private Integer clientType;
+
+    /**
+     * 子父级菜单关系
+     */
+    private Long parentId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 地址
+     */
+    private String url;
+
+    /**
+     * 权限标识
+     */
+    private String perms;
+
+    /**
+     * 类型:0目录/1菜单/2按钮
+     */
+    private Integer type;
+
+    /**
+     * 请求后端接口地址（按钮才有）
+     */
+    private String links;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 层级
+     */
+    private Integer level;
+
+    /**
+     * 是否定制（0否，1是）
+     */
+    private Integer custom;
+
+    /**
+     * 是否默认展示
+     */
+    private Integer isDisplay;
+
+    /**
+     * 此菜单是否开放（0普通菜单，1超级管理员菜单，2非普通用户菜单）
+     */
+    private Integer isMain;
+
+    /**
+     * PC端适用企业类型（1供应商，2采购商，34PL物流，43PL物流）
+     */
+    private String usingRoles;
+
+    /**
+     * 子菜单
+     */
+    private List<FindMenuTreeResVo> children;
+
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/KwsMenuResVo.java

@@ -16,4 +16,5 @@ public class KwsMenuResVo extends KwsMenu {
      * 自菜单
      */
     private List<KwsMenuResVo> children;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/QueryChildMenuResVo.java

@@ -1,6 +1,8 @@
 package com.sckw.system.model.vo.res;
 
+import com.sckw.core.utils.LongToStringUtils;
 import lombok.Data;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -19,6 +21,7 @@ public class QueryChildMenuResVo implements Serializable {
     /**
      * 菜单id
      */
+    @JsonSerialize(using = LongToStringUtils.class)
     private Long id;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -20,6 +20,7 @@ import com.sckw.system.model.vo.req.FindMenuTreeReqVo;
 import com.sckw.system.model.vo.req.MoveMenuReqVo;
 import com.sckw.system.model.vo.req.QueryChildMenuReqVo;
 import com.sckw.system.model.vo.req.RoleBindMenuReqVo;
+import com.sckw.system.model.vo.res.FindMenuTreeResVo;
 import com.sckw.system.model.vo.res.KwsMenuResVo;
 import com.sckw.system.model.vo.res.QueryChildMenuResVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -210,7 +211,7 @@ public class KwsMenuService {
      * @author: czh
      * @date: 2023/7/7
      */
-    public List<KwsMenuResVo> findTree(FindMenuTreeReqVo reqVo) throws SystemException {
+    public List<FindMenuTreeResVo> findTree(FindMenuTreeReqVo reqVo) throws SystemException {
         FindMenuTreePojo findMenuTreePojo = new FindMenuTreePojo();
         BeanUtils.copyProperties(reqVo, findMenuTreePojo);
 
@@ -235,7 +236,7 @@ public class KwsMenuService {
             List<KwsMenuResVo> child = getChild(kwsMenu.getId(), menuList);
             kwsMenu.setChildren(child);
         }
-        return rootList;
+        return BeanUtils.copyToList(rootList, FindMenuTreeResVo.class);
     }
 
     public List<KwsMenuResVo> findList(FindMenuTreePojo findMenuTreePojo) {