shiro cookie优化,员工授权等其他

admin/src/main/resources/templates/business/employee/index.html

@@ -38,13 +38,14 @@
                 <div class="pull-right screen-btn-group">
                     <button class="layui-btn open-popup" data-title="添加员工" th:attr="data-url=@{/bss/employee/add}" data-size="auto">
                         <i class="fa fa-plus"></i> 添加</button>
+                    <button class="layui-btn open-popup-param" data-type="radio" data-title="角色分配" th:attr="data-url=@{/system/role/rolePage}" data-size="480,400">
+                        <i class="fa fa-user-secret"></i> 授权</button>
                     <div class="btn-group">
                         <button class="layui-btn">操作<span class="caret"></span></button>
                         <dl class="layui-nav-child layui-anim layui-anim-upbit">
                             <dd><a class="ajax-status" th:href="@{/bss/employee/status/ok}">启用</a></dd>
                             <dd><a class="ajax-status" th:href="@{/bss/employee/status/freezed}">冻结</a></dd>
                             <dd><a class="ajax-status" th:href="@{/bss/employee/status/delete}">删除</a></dd>
-                            <dd><a class="ajax-status" th:href="@{/bss/employee/role}">授权</a></dd>
                         </dl>
                     </div>
                 </div>
@@ -88,7 +89,6 @@
                             <a class="open-popup" data-title="编辑员工" th:attr="data-url=@{'/bss/employee/edit/'+${item.id}}" data-size="auto" href="#">编辑</a>
                             <a class="open-popup" data-title="详细信息" th:attr="data-url=@{'/bss/employee/detail/'+${item.id}}" data-size="800,600" href="#">详细</a>
                             <a class="ajax-get" data-msg="您是否确认删除" th:href="@{/bss/employee/status/delete(ids=${item.id})}">删除</a>
-                            <a class="open-popup" th:href="@{/bss/employee/role}">授权</a>
                         </td>
                     </tr>
                     </tbody>

admin/src/main/resources/templates/main.html

@@ -54,7 +54,7 @@
                 <img class="layui-side-user-avatar open-popup" th:attr="data-url=@{/userInfo}" data-size="680,464"
                      th:src="@{'/system/user/picture?p='+${user.picture}}" alt="头像">
                 <div>
-                    <p class="layui-side-user-name" th:text="${user.nickname}">TIMO</p>
+                    <p class="layui-side-user-name" th:text="${user.nickname}"></p>
                     <p class="layui-side-user-designation">在线</p>
                 </div>
             </div>

admin/src/main/resources/templates/system/role/add.html

@@ -18,6 +18,12 @@
                 <input class="layui-input" type="text" name="title"  placeholder="请输入角色名称" th:value="${role?.title}">
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">类型</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="type" mo:dict="ROLE_TYPE" mo-selected="${role?.type}" mo-empty="" lay-type="type"></select>
+            </div>
+        </div>
         <div class="layui-form-item layui-form-text">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">

admin/src/main/resources/templates/system/role/detail.html

@@ -13,6 +13,10 @@
                 <th width='100px'>角色编号名称</th>
                 <td>[[${role.title}]]（[[${role.name}]]）</td>
             </tr>
+            <tr>
+                <th>角色类型</th>
+                <td th:text="${#dicts.keyValue('ROLE_TYPE', role.type)}" colspan="3"></td>
+            </tr>
             <tr>
                 <th>创建用户</th>
                 <td th:text="${role.createBy?.nickname}"></td>