Browse Source

Merge remote-tracking branch 'origin/master'

Administrator 3 năm trước cách đây
mục cha
commit
07eb3dbb57
25 tập tin đã thay đổi với 365 bổ sung17 xóa
  1. 16 0
      boman-api/boman-api-gen/src/main/resources/rebel.xml
  2. 16 0
      boman-api/boman-api-jflow/src/main/resources/rebel.xml
  3. 16 0
      boman-api/boman-api-system/src/main/resources/rebel.xml
  4. 16 0
      boman-api/boman-api-web-core/src/main/resources/rebel.xml
  5. 13 0
      boman-api/boman-domain/src/main/java/com.boman.domain/SysMenu.java
  6. 16 0
      boman-api/boman-domain/src/main/resources/rebel.xml
  7. 16 0
      boman-auth/src/main/resources/rebel.xml
  8. 16 0
      boman-common/boman-common-core/src/main/resources/rebel.xml
  9. 16 0
      boman-common/boman-common-datascope/src/main/resources/rebel.xml
  10. 16 0
      boman-common/boman-common-datasource/src/main/resources/rebel.xml
  11. 16 0
      boman-common/boman-common-log/src/main/resources/rebel.xml
  12. 16 0
      boman-common/boman-common-redis/src/main/resources/rebel.xml
  13. 16 0
      boman-common/boman-common-security/src/main/resources/rebel.xml
  14. 16 0
      boman-common/boman-common-swagger/src/main/resources/rebel.xml
  15. 16 0
      boman-gateway/src/main/resources/rebel.xml
  16. 16 0
      boman-modules/boman-file/src/main/resources/rebel.xml
  17. 16 0
      boman-modules/boman-gen/src/main/resources/rebel.xml
  18. 16 0
      boman-modules/boman-job/src/main/resources/rebel.xml
  19. 14 0
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java
  20. 10 11
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java
  21. 13 1
      boman-modules/boman-system/src/main/java/com/boman/system/domain/vo/RouterVo.java
  22. 13 0
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java
  23. 13 4
      boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml
  24. 16 0
      boman-visual/boman-monitor/src/main/resources/rebel.xml
  25. 1 1
      boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

+ 16 - 0
boman-api/boman-api-gen/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-api-gen</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-api/boman-api-gen/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-api/boman-api-jflow/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-api-jflow</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-api/boman-api-jflow/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-api/boman-api-system/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-api-system</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-api/boman-api-system/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-api/boman-api-web-core/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-api-web-core</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-api/boman-api-web-core/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 13 - 0
boman-api/boman-domain/src/main/java/com.boman.domain/SysMenu.java

@@ -85,6 +85,19 @@ public class SysMenu extends BaseEntity
      */
     private List<Map<String, Object>> containsHead;
 
+    /*
+     * 额外的参数
+     */
+    private String extraParam;
+
+    public String getExtraParam() {
+        return extraParam;
+    }
+
+    public void setExtraParam(String extraParam) {
+        this.extraParam = extraParam;
+    }
+
     public List<Map<String, Object>> getContainsHead() {
         return containsHead;
     }

+ 16 - 0
boman-api/boman-domain/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-domain</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-api/boman-domain/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-auth/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>shujuju-auth</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-auth/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-common/boman-common-core/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-common-core</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-common/boman-common-core/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-common/boman-common-datascope/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-common-datascope</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-common/boman-common-datascope/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-common/boman-common-datasource/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-common-datasource</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-common/boman-common-datasource/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-common/boman-common-log/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-common-log</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-common/boman-common-log/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-common/boman-common-redis/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-common-redis</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-common/boman-common-redis/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-common/boman-common-security/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-common-security</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-common/boman-common-security/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-common/boman-common-swagger/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-common-swagger</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-common/boman-common-swagger/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-gateway/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>shujuju-gateway</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-gateway/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-modules/boman-file/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>shujuju-file</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-modules/boman-file/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-modules/boman-gen/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>shujuju-gen</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-modules/boman-gen/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 16 - 0
boman-modules/boman-job/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-modules-job</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-modules/boman-job/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 14 - 0
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java

@@ -250,4 +250,18 @@ public class SysMenuController extends BaseController
         return menuService.listBtnByUserId(userId);
     }
 
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(userId);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ajax;
+    }
+
 }

+ 10 - 11
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -72,19 +72,18 @@ public class SysRoleController extends BaseController
     @PreAuthorize(hasPermi = "system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败,角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
+    public AjaxResult add(@Validated @RequestBody SysRole role) {
+        if (null == role.getId()) {
+            if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
+                return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败,角色名称已存在");
+            } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
+                return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
+            }
+            role.setCreateBy(SecurityUtils.getUsername());
+            return toAjax(roleService.insertRole(role));
         }
-        role.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(roleService.insertRole(role));
 
+        return edit(role);
     }
 
     /**

+ 13 - 1
boman-modules/boman-system/src/main/java/com/boman/system/domain/vo/RouterVo.java

@@ -8,7 +8,6 @@ import java.util.List;
  * 
  * @author ruoyi
  */
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class RouterVo
 {
     /**
@@ -56,6 +55,19 @@ public class RouterVo
      */
     private List<RouterVo> children;
 
+    /*
+     * 额外的参数
+     */
+    private String extraParam;
+
+    public String getExtraParam() {
+        return extraParam;
+    }
+
+    public void setExtraParam(String extraParam) {
+        this.extraParam = extraParam;
+    }
+
     public String getSysTableName() {
         return sysTableName;
     }

+ 13 - 0
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -204,6 +204,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
+            router.setExtraParam(getExtraParam(menu));
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache())));
             if (menu.getSysTableName() != null) {
                 router.setSysTableName(menu.getSysTableName());
@@ -220,6 +221,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 children.setComponent(menu.getComponent());
                 children.setName(StringUtils.capitalize(menu.getPath()));
                 children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache())));
+                children.setExtraParam(getExtraParam(menu));
                 if (menu.getSysTableName() != null) {
                     children.setSysTableName(menu.getSysTableName());
                 }
@@ -435,6 +437,17 @@ public class SysMenuServiceImpl implements ISysMenuService {
         return routerName;
     }
 
+
+    /**
+     * 获取路由名称
+     *
+     * @param menu 菜单信息
+     * @return 路由名称
+     */
+    public String getExtraParam(SysMenu menu) {
+        return menu.getExtraParam();
+    }
+
     /**
      * 获取路由地址
      *

+ 13 - 4
boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -25,10 +25,13 @@
 		<result property="updateBy"       column="update_by"      />
 		<result property="remark"         column="remark"         />
 		<result property="sysTableName"   column="sys_table_name" />
+		<result property="extraParam"   column="extra_param" />
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time, create_by, update_by, update_time, remark, sys_table_name
+        select id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible
+             , status, ifnull(perms,'') as perms, icon, create_time, create_by, update_by, update_time, remark
+             , sys_table_name, extra_param
 		from sys_menu
     </sql>
     
@@ -58,7 +61,10 @@
 	</select>
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by, m.update_time, m.remark, m.sys_table_name
+		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status
+		              , ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon
+		              , m.order_num, m.create_time, m.create_by, m.update_by, m.update_time
+		              , m.remark, m.sys_table_name, m.extra_param
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = '0'
 		order by m.parent_id, m.order_num
 	</select>
@@ -85,7 +91,7 @@
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
 		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms
 		              , m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by
-		              , m.update_time, m.remark, m.sys_table_name
+		              , m.update_time, m.remark, m.sys_table_name, m.extra_param
 		from sys_menu m
 			 left join sys_role_menu rm on m.id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
@@ -95,7 +101,7 @@
 	    union
 		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms
 					  , m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by
-					  , m.update_time, m.remark, m.sys_table_name
+					  , m.update_time, m.remark, m.sys_table_name, m.extra_param
 		from sys_menu m
 				 left join sys_role_menu rm on m.id = rm.menu_id
 				 left join sys_user_role ur on rm.role_id = ur.role_id
@@ -202,6 +208,7 @@
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="sysTableName != null and sysTableName != ''">sys_table_name = #{sysTableName},</if>
+			<if test="extraParam != null and extraParam != ''">extra_param = #{extraParam},</if>
 			update_time = sysdate()
 		</set>
 		where id = #{id}
@@ -226,6 +233,7 @@
 		<if test="updateBy != null and updateBy != ''">update_by,</if>
 		<if test="updateTime != null and updateTime != ''">update_time,</if>
 		<if test="sysTableName != null and sysTableName != ''">sys_table_name,</if>
+		<if test="extraParam != null and extraParam != ''">extra_param,</if>
 		create_time
 		)values(
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
@@ -245,6 +253,7 @@
 		<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
 		<if test="updateTime != null and updateTime != ''">#{updateTime},</if>
 		<if test="sysTableName != null and sysTableName != ''">#{sysTableName},</if>
+		<if test="extraParam != null and extraParam != ''">#{extraParam},</if>
 		sysdate()
 		)
 	</insert>

+ 16 - 0
boman-visual/boman-monitor/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-visual-monitor</id>
+
+	<classpath>
+		<dir name="D:/project/shujuju/boman-visual/boman-monitor/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -44,7 +44,7 @@ public class VaccineInfoController extends BaseController {
     /**
      * 查询疫苗信息列表
      */
-    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:list')")
+//    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:list')")
     @GetMapping("/list")
     public TableDataInfo list(VaccineInfoOperation vaccineInfo) {
         startPage();