diff --git a/src/main/java/com/cetc32/dh/config/DataManageConfig.java b/src/main/java/com/cetc32/dh/config/DataManageConfig.java index d2b8efda7e32e86613ceeabdfc13a6dfaff3aeaa..5804a78f046b008b97ecc7b90051a73a1145a502 100644 --- a/src/main/java/com/cetc32/dh/config/DataManageConfig.java +++ b/src/main/java/com/cetc32/dh/config/DataManageConfig.java @@ -113,7 +113,7 @@ public class DataManageConfig implements WebMvcConfigurer { //是否发送Cookie信息 .allowCredentials(true) //放行哪些原始域(请求方式) - .allowedMethods("GET","POST", "PUT", "DELETE") + .allowedMethods("GET","POST", "PUT", "DELETE","OPTIONS") //放行哪些原始域(头部信息) .allowedHeaders("*") //暴露哪些头部信息（因为跨域访问默认不能获取全部头部信息） diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index fbe20d4ecb0d70bf3064d8bbd10407535d634943..d5346b44f695e7a9df4da67e75efd7506af1587a 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -409,7 +409,7 @@ public class AuthController { for(ResultUserInfoDe u:users){ ListroleIds =u.getRole(); //确保权限优先级为当前记录 - System.out.println(u.getPermissions()); + //System.out.println("getPermission: "+u.getPermissions()); if(u.getPermissions() != null && 0 < u.getPermissions().size()) continue; if(null!=u.getRole()) diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java index f682fc74ca871a13334af3b5c8bd7cd3909c8a99..f9eaf4bd744428449b26edb3205d33e2598181e4 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -29,6 +30,10 @@ import java.util.Map; @RestController @RequestMapping("/rest/role/") public class AuthRoleController { + @Value("${sso.basePermission}") + String basePermission; + @Value("${sso.syscode}") + String sysCode; @Autowired AdminRoleServiceImpl adminRoleService; @@ -75,6 +80,10 @@ public class AuthRoleController { } if(newRole.getId() == null){ BaseAdminRole br=new BaseAdminRole(); + if(newRole.getSystemMenu().stream().noneMatch(f-> f==(basePermission))){ + newRole.getSystemMenu().add(basePermission); + } + System.out.println("权限个数"+newRole.getSystemMenu().size()); BeanUtils.copyProperties(newRole, br); //新增角色 if(adminRoleService.addRole(br)>0) @@ -112,6 +121,9 @@ public class AuthRoleController { } } BaseAdminRole br=new BaseAdminRole(); + if(role.getSystemMenu().stream().noneMatch(f-> basePermission.equals(f)|| f.startsWith(sysCode))){ + role.getSystemMenu().add(basePermission); + } BeanUtils.copyProperties(role, br); if(adminRoleService.updateRole(br)>0) { diff --git a/src/main/java/com/cetc32/dh/controller/views/IndexController.java b/src/main/java/com/cetc32/dh/controller/views/IndexController.java index 76949b67222e06b6f520cc3bd405fbc2fe32798d..81c5f52f08e50697ed33b2e6427ff5020338f36d 100644 --- a/src/main/java/com/cetc32/dh/controller/views/IndexController.java +++ b/src/main/java/com/cetc32/dh/controller/views/IndexController.java @@ -99,7 +99,6 @@ public class IndexController { public String register(String ReturnUrl, ModelMap map, HttpServletRequest req){ if(ReturnUrl==null) ReturnUrl=eip; - System.out.println(ReturnUrl); map.put("ReturnUrl", ReturnUrl); map.put("originUrl", req.getRequestURL()); return "register"; diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml new file mode 100644 index 0000000000000000000000000000000000000000..6d20cce00b2508e19367431e007ffffd3e43ccdf --- /dev/null +++ b/src/main/resources/application-xwybjb.yml @@ -0,0 +1,76 @@ +server: + port: 8081 + server: + connectionTimeout: 18000000 + +spring: + application: + name: dhManager + datasource: + url: jdbc:postgresql://180.184.65.203:5432/dhmanage + #url: jdbc:postgresql://192.168.1.60:5432/dhmanage + username: postgres + #password: 123456 + password: Zdk@824. + driver-class-name: org.postgresql.Driver + +# datasource: +# url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 +# username: root +# password: 123 +# initial-size: 1 +# min-idle: 1 +# max-active: 20 +# test-on-borrow: true +# driver-class-name: com.mysql.cj.jdbc.Driver +# type: com.zaxxer.hikari.HikariDataSource + + servlet: + multipart: + max-file-size: 5GB + max-request-size: 5GB + +#设置静态资源路径，多个以逗号分隔 + resources: + static-locations: classpath:static/,file:static/ + thymeleaf: + cache: false + mode: HTML +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 + configuration: + map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 + +generator: + targetProject: src/main/java + mappers: tk.mybatis.mapper.common.Mapper + javaModel-targetPackage: com.cetc32.dh.entity + sqlMap-targetPackage: mapper + javaClient-targetPackage: com.cetc32.dh.mybatis +logging: + level: + com.cetc32: debug + +storePath: /root/ +upLoadPath: ${storePath}upLoad + +rootPath: /root/daohang/data +myPath: ${rootPath}myPath +writePath: ${rootPath}/product +eip: http://localhost:8080/ +#verifyUrl: ${sso.authcenter}/rest/auth/verify?token= +#passportUrl: ${sso.authcenter}/?ReturnUrl= +#defaultLoginRequiredEnable: false +sso: + authcenter: http://localhost:${server.port} + verifyUrl: ${sso.authcenter}/rest/auth/verify?token= + passportUrl: ${sso.authcenter}/?ReturnUrl= + defaultLoginRequiredEnable: false + permission: S000^接口用户@/rest/auth/**;*权限管理@/**; + sysurl : http://localhost:${server.port} + sysname : 用户中心 + registerUrl : ${sso.authcenter}/rest/api/sys/sync + #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** + syscode: S000 + basePermission: S000接口用户 diff --git a/src/main/resources/mapper/SysInfoMapper.xml b/src/main/resources/mapper/SysInfoMapper.xml index cf793842d4ec45eedb64033dbd0b3ef6609a9066..78199d0dbb71782bf304a3ee9ee8166a9df25e1a 100644 --- a/src/main/resources/mapper/SysInfoMapper.xml +++ b/src/main/resources/mapper/SysInfoMapper.xml @@ -25,7 +25,7 @@ insert into sysinfos(syscode,sysname,pcode,url) values(#{sysCode},#{sysName},#{pCode},#{url}) - on conflict (syscode) do update set sysname =#{sysName},url = #{url} + on conflict (syscode) do update set sysname =#{sysName},url = #{url},pcode =#{pCode}