跨域处理

authentication/src/main/java/com/jzg/config/SecurityConfig.java

@@ -62,17 +62,6 @@ public class SecurityConfig {
         return new TokenAuthenticationFilter(authenticationManager,tokenService);
     }
 
-    @Bean
-    public CorsFilter corsFilter(){
-        CorsConfiguration config = new CorsConfiguration();
-        config.addAllowedOrigin("*");
-        config.addAllowedMethod("*");
-        config.addAllowedHeader("*");
-
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", config);
-        return new CorsFilter(source);
-    }
 
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -0,0 +1,46 @@
+package com.jzg.config;
+
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsUtils;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import reactor.core.publisher.Mono;
+
+@Configuration
+public class CorsConfig {
+
+    @Bean
+    public CorsWebFilter corsWebFilter() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 允许所有来源，你可以根据需要修改为具体的来源
+        corsConfiguration.addAllowedOrigin("http://192.168.5.41:9000");
+        // 允许的方法
+        corsConfiguration.addAllowedMethod("*");
+        // 允许的头信息
+        corsConfiguration.addAllowedHeader("*");
+        // 允许携带凭证，例如 Cookie 等
+        corsConfiguration.setAllowCredentials(true);
+        // 预检请求的缓存时间（秒）
+        corsConfiguration.setMaxAge(3600L);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        // 应用到所有路径
+        source.registerCorsConfiguration("/**", corsConfiguration);
+
+        return new CorsWebFilter(source);
+    }
+
+
+}

gateway/src/main/resources/application.yml

@@ -6,6 +6,7 @@ spring:
     allow-bean-definition-overriding: true
   cloud:
     gateway:
+
       routes:
         - id: auth_route
           uri: http://localhost:8081/

platform/src/main/java/com/jzg/entity/po/SysRole.java

@@ -12,7 +12,7 @@ public class SysRole extends BaseModel {
     @TableId
     private String id;
 
-    private Long systemId;
+    private String systemId;
 
     private String name;
 

platform/src/main/java/com/jzg/entity/po/SysSystem.java

@@ -14,7 +14,7 @@ import lombok.Data;
 @Data
 public class SysSystem extends BaseModel {
     /** 租户id */
-    private Long sysId;
+    private String sysId;
 
     /** 租户Code */
     private String sysCode;

platform/src/main/java/com/jzg/entity/vo/SysRoleVo.java

@@ -9,9 +9,12 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Schema(description = "用户角色表VO")
@@ -23,7 +26,7 @@ public class SysRoleVo extends PageRequest {
 
     @NotNull(message = "系统id不能为空")
     @Schema(description = "系统id")
-    private Long system;
+    private String system;
 
     @NotNull(message = "角色名称不能为空")
     @Size(min=1,max=100,message = "角色名称长度不能大于100")
@@ -34,11 +37,18 @@ public class SysRoleVo extends PageRequest {
     @Schema(description = "备注")
     private String remark;
 
-    @Schema(description = "权限id数组")
-    private List<String> permsId;
+    @Schema(description = "权限")
+    private List<PermsVo> perms;
 
-    @Schema(description = "权限标识数组")
-    private List<String> perms;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class PermsVo{
+        private String id;
+
+        private String auth;
+    }
 
     public SysRole getSysRole(){
         SysRole sysRole = new SysRole();

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -17,7 +17,7 @@ public interface SysSystemService extends IService<SysSystem> {
      * @param systemCode
      * @return
      */
-    public SysSystem getBySystemCode(Long systemCode);
+    public SysSystem getBySystemCode(String systemCode);
 
     /**
      * 根据systemCode 判断是否存在数据

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -26,7 +26,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
      * @return
      */
     @Override
-    public SysSystem getBySystemCode(Long systemCode) {
+    public SysSystem getBySystemCode(String systemCode) {
         return this.getOne(new LambdaQueryWrapper<SysSystem>()
                 .eq(SysSystem::getSysCode, systemCode));
     }

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -65,14 +65,14 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
         }
         List<SysRolePerms> sysRolePermsList = new ArrayList<>();
         sysRole.setSystemId(bySystemCode.getSysId());
-        for(int i=0;i<sysRoleVo.getPermsId().size();i++){
+        sysRoleVo.getPerms().forEach(item->{
             SysRolePerms perms = new SysRolePerms();
             perms.setId(IdGenerate.nextId());
             perms.setRoleId(sysRole.getId());
-            perms.setPermsId(sysRoleVo.getPermsId().get(i));
-            perms.setPerms(sysRoleVo.getPerms().get(i));
+            perms.setPermsId(item.getId());
+            perms.setPerms(item.getAuth());
             sysRolePermsList.add(perms);
-        }
+        });
 
         if(sysRolePermsMapper.insert(sysRolePermsList).stream().count() > 0 && baseMapper.insert(sysRole) > 0){
             return true;