diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java index fceb6833..a811e71f 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java @@ -36,11 +36,6 @@ public class Role extends CommonEntity { */ private String name; - /** - * 角色权限字符串 - */ - private String code; - /** * 显示顺序 */ diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java index 4bc2fe70..0de47f5a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java @@ -71,9 +71,6 @@ public class RoleController { @PostMapping("/save") @PreAuthorize("@pms.hasPermission('role_add')") public R save(@RequestBody Role role) { - if (StrUtil.isBlank(role.getCode()) && ObjectUtil.isNull(role.getId()) && StrUtil.isNotBlank(role.getName())) { - role.setCode(PinyinUtil.getAllFirstLetter(role.getName())); - } roleService.insertRole(role); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml index 947a33ab..9f7f904c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml @@ -11,7 +11,7 @@ spring: cloud: nacos: discovery: - ip: @profiles.ip@ + #ip: @profiles.ip@ server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml index f086cbf2..775c397e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml @@ -5,7 +5,6 @@ - @@ -18,7 +17,7 @@