Merge remote-tracking branch 'origin/master'

@@ -15,3 +15,5 @@ export const editUser = params => { return http.put(`${baseUrl}/edit`,params)};
 export const addUser = params => { return http.post(`${baseUrl}/add`,params)};
 export const addUser = params => { return http.post(`${baseUrl}/add`,params)};
 
 
 export const setUserRole = params => { return http.put(`${baseUrl}/roleset`,params)};
 export const setUserRole = params => { return http.put(`${baseUrl}/roleset`,params)};
+
+export const resetToken = params => { return http.put(`${baseUrl}/resetToken`,params)};

@@ -15,6 +15,7 @@
                     <el-dropdown-menu slot="dropdown">
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item>我的消息</el-dropdown-item>
                         <el-dropdown-item>我的消息</el-dropdown-item>
                         <el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item>
                         <el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item>
+                        <el-dropdown-item @click.native="updateCache">更新缓存</el-dropdown-item>
                         <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
                         <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown-menu>
                 </el-dropdown>
                 </el-dropdown>
@@ -91,7 +92,7 @@
 
 
 <script>
 <script>
     import rt from '../routes'
     import rt from '../routes'
-    import { editPass} from '../api/user';
+    import { editPass,resetToken} from '../api/user';
     import ElFormItem from "element-ui/packages/form/src/form-item";
     import ElFormItem from "element-ui/packages/form/src/form-item";
     export default {
     export default {
 
 
@@ -194,6 +195,23 @@
             editPass:function(){
             editPass:function(){
                 this.dialogFormVisible=true;
                 this.dialogFormVisible=true;
             },
             },
+            updateCache:function(){
+                resetToken().then( res =>{
+                    let response  = res.data;
+                    if (response.code === '200'){
+                        this.$notify({
+                            title: '成功',
+                            message: '缓存更新成功',
+                            type: 'success'
+                        });
+                    }else{
+                        this.$notify.error({
+                            title: '失败',
+                            message: '缓存更新失败'
+                        });
+                    }
+                })
+            },
             submitEdit(formName){
             submitEdit(formName){
                 this.$refs[formName].validate((valid) => {
                 this.$refs[formName].validate((valid) => {
                     if (valid) {
                     if (valid) {
@@ -353,6 +371,8 @@
             aside {
             aside {
                 flex:0 0 230px;
                 flex:0 0 230px;
                 width: 230px;
                 width: 230px;
+                overflow-y: scroll;
+                background: #606060;
                 // position: absolute;
                 // position: absolute;
                 // top: 0px;
                 // top: 0px;
                 // bottom: 0px;
                 // bottom: 0px;