更改连接数据库地址；调整功能添加接口

dblayer-mbg/src/main/resources/application-local.yml

@@ -3,7 +3,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息

security-center/src/main/java/com/lantone/security/facade/FuncManagementFacade.java

@@ -18,6 +18,7 @@ import com.lantone.dblayermbg.entity.Menu;
 import com.lantone.dblayermbg.entity.MenuResource;
 import com.lantone.dblayermbg.entity.Resource;
 import com.lantone.dblayermbg.entity.RoleSoftwareMenu;
+import com.lantone.dblayermbg.entity.RoleSoftwareResource;
 import com.lantone.dblayermbg.entity.SoftwareMenu;
 import com.lantone.dblayermbg.entity.SoftwareResource;
 import com.lantone.dblayermbg.entity.User;
@@ -26,6 +27,7 @@ import com.lantone.dblayermbg.facade.MenuFacade;
 import com.lantone.dblayermbg.facade.MenuResourceFacade;
 import com.lantone.dblayermbg.facade.ResourceFacade;
 import com.lantone.dblayermbg.facade.RoleSoftwareMenuFacade;
+import com.lantone.dblayermbg.facade.RoleSoftwareResourceFacade;
 import com.lantone.dblayermbg.facade.SoftwareMenuFacade;
 import com.lantone.dblayermbg.facade.SoftwareResourceFacade;
 import com.lantone.common.enums.IsDeleteEnum;
@@ -62,6 +64,8 @@ public class FuncManagementFacade {
     @Autowired
     private SoftwareResourceFacade softwareResourceFacade;
     @Autowired
+    private RoleSoftwareResourceFacade roleSoftwareResourceFacade;
+    @Autowired
     private UserRoleFacade userRoleFacade;
 
     /**
@@ -136,7 +140,7 @@ public class FuncManagementFacade {
             //2.插入功能菜单对应系统对应系统 sys_software_menu和sys_role_software_menu
             if (savaRoleSoftwareMenu(menu.getId(), addMenuVO.getSoftwares(), 1l)) {
                 //插入sys_resource、sys_menu_resource、sys_software_resource
-                return saveMenuResource(addMenuVO.getPermissions(), addMenuVO.getSoftwares(), menu.getId());
+                return saveMenuResource(addMenuVO.getPermissions(), addMenuVO.getSoftwares(), menu.getId(), 1l);
             }
         } else {
             Asserts.fail("菜单详情插入失败");
@@ -169,7 +173,7 @@ public class FuncManagementFacade {
      * @Description插入sys_resource、sys_menu_resource
      * @Return boolean
      */
-    private boolean saveMenuResource(List<String> permissions, List<Long> softwares, Long menuID) {
+    private boolean saveMenuResource(List<String> permissions, List<Long> softwares, Long menuID, Long roleID) {
         //2.3 判断该功能菜单是否有对应权限
         if (ListUtil.isNotEmpty(permissions)) {
             permissions.stream().forEach(permission -> {
@@ -203,6 +207,11 @@ public class FuncManagementFacade {
                                 softwareResource.setSoftwareId(softwareId);
                                 softwareResource.setResourceId(resource.getId());
                                 softwareResourceFacade.save(softwareResource);
+                                //插入超级管理员与SoftwareResource关系 sys_role_software_resource
+                                RoleSoftwareResource roleSoftwareResource = new RoleSoftwareResource();
+                                roleSoftwareResource.setRoleId(roleID);
+                                roleSoftwareResource.setSoftwareResourceId(softwareResource.getId());
+                                roleSoftwareResourceFacade.save(roleSoftwareResource);
                             });
                         } else {
                             Asserts.fail("菜单与资源权限插入失败");
@@ -215,7 +224,7 @@ public class FuncManagementFacade {
             });
             return true;
         }
-        return false;
+        return true;
     }
 
     /**
@@ -309,7 +318,7 @@ public class FuncManagementFacade {
                 //3.1插入功能菜单对应系统对应系统 sys_software_menu和sys_role_software_menu
                 if (savaRoleSoftwareMenu(updateMenuVO.getId(), updateMenuVO.getSoftwares(), 1l)) {
                     //3.2插入sys_resource、sys_menu_resource、sys_software_resource
-                    return saveMenuResource(updateMenuVO.getPermissions(), updateMenuVO.getSoftwares(), updateMenuVO.getId());
+                    return saveMenuResource(updateMenuVO.getPermissions(), updateMenuVO.getSoftwares(), updateMenuVO.getId(), 1l);
                 }
             }
         }

security-center/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
         enabled: true
         service-id: config-center
   profiles:
-    active: test
+    active: local
 
 eureka:
   client: