前端更新

front/src/api/index.js

@@ -2,20 +2,8 @@
 import { getRequest, postRequest, putRequest, getNoAuthRequest, postNoAuthRequest } from '@/libs/axios';
 
 
-
-// 文件上传接口
-export const uploadFile = "/upload/file"
-// 验证码渲染图片接口
-export const drawCodeImage = "/common/captcha/draw/"
-// 获取菜单
-export const getMenuList = "/adminapi/permission/menu/list"
-// 获取数据字典
-export const getDictData = "/dictData/getByType/"
-
 // 获取菜单
-/*export const getMenuList = (params) => {
-    return getRequest('/permission/menulist', params)
-}*/
+export const getMenuList = "/adminapi/permission/menu/userRoleMenuList"
 
 // 登陆
 export const login = (params) => {
@@ -25,10 +13,6 @@ export const login = (params) => {
 export const userInfo = (params) => {
     return getRequest('/user/info', params)
 }
-// 注册
-export const regist = (params) => {
-    return postNoAuthRequest('/user/regist', params)
-}
 
 //登出
 export const logout = (params) => {
@@ -39,10 +23,6 @@ export const logout = (params) => {
 export const changePass = (params) => {
     return postRequest('/auth/resetPassword', params)
 }
-// 解锁
-export const unlock = (params) => {
-    return postRequest('/user/unlock', params)
-}
 
 
 // 获取用户数据 多条件
@@ -83,6 +63,8 @@ export const resetUserPass = (params) => {
     return postRequest('/user/resetPass', params)
 }
 
+/*=================== 角色相关接口   开始================================ */
+
 
 // 获取全部角色数据
 export const getAllRoleList = (params) => {
@@ -103,7 +85,7 @@ export const editRole = (params) => {
 
 // 设为或取消注册角色
 export const setDefaultRole = (params) => {
-    return postRequest('/role/setDefault', params)
+    return postRequest('/permission/role/setDefault', params)
 }
 // 分配角色权限
 export const editRolePerm = (params) => {
@@ -116,9 +98,14 @@ export const deleteRole = (params) => {
 }
 
 
+/*=================== 角色相关接口   结束================================ */
+
+
+/*=================== 菜单相关接口   开始================================ */
+
 // 添加菜单权限
 export const addMenus = (params) => {
-    return postRequest('/permission/add', params)
+    return postRequest('/permission/menu/add', params)
 }
 // 编辑菜单权限
 export const editMenus = (params) => {
@@ -138,10 +125,9 @@ export const getAllPermissionList = (params) => {
     return getRequest('/permission/menu/all', params)
 }
 
+/*=================== 菜单相关接口   结束================================ */
 
 
-//======================================================
-
 // 加载数据
 export const loadPermission = (id, params) => {
     return getRequest(`/permission/getByParentId/${id}`, params)
@@ -207,7 +193,6 @@ export const getDictDataByType = (type, params) => {
 }
 
 
-
 // 分页获取日志数据
 export const getLogListData = (params) => {
     return getRequest('/log/getAllByPage', params)
@@ -221,69 +206,6 @@ export const deleteAllLog = (params) => {
     return postRequest('/log/delAll', params)
 }
 
-
-// 分页获取Redis数据
-export const getRedisData = (params) => {
-    return getRequest('/redis/getAllByPage', params)
-}
-// 通过key获取Redis信息
-export const getRedisByKey = (key, params) => {
-    return getRequest(`/redis/getByKey/${key}`, params)
-}
-// 获取Redis键值数量
-export const getRedisKeySize = (params) => {
-    return getRequest('/redis/getKeySize', params)
-}
-// 获取Redis内存
-export const getRedisMemory = (params) => {
-    return getRequest('/redis/getMemory', params)
-}
-// 获取Redis信息
-export const getRedisInfo = (params) => {
-    return getRequest('/redis/info', params)
-}
-// 添加编辑Redis
-export const saveRedis = (params) => {
-    return postRequest('/redis/save', params)
-}
-// 删除Redis
-export const deleteRedis = (params) => {
-    return postRequest('/redis/delByKeys', params)
-}
-// 清空Redis
-export const deleteAllRedis = (params) => {
-    return postRequest('/redis/delAll', params)
-}
-
-
-
-// 分页获取定时任务数据
-export const getQuartzListData = (params) => {
-    return getRequest('/quartzJob/getAllByPage', params)
-}
-// 添加定时任务
-export const addQuartz = (params) => {
-    return postRequest('/quartzJob/add', params)
-}
-// 编辑定时任务
-export const editQuartz = (params) => {
-    return postRequest('/quartzJob/edit', params)
-}
-// 暂停定时任务
-export const pauseQuartz = (params) => {
-    return postRequest('/quartzJob/pause', params)
-}
-// 恢复定时任务
-export const resumeQuartz = (params) => {
-    return postRequest('/quartzJob/resume', params)
-}
-// 删除定时任务
-export const deleteQuartz = (params) => {
-    return postRequest('/quartzJob/delByIds', params)
-}
-
-
-
 // base64上传
 export const base64Upload = (params) => {
     return postRequest('/upload/file', params)

front/src/libs/util.js

@@ -318,7 +318,7 @@ util.initMenuData = function (vm, data) {
     menuData.forEach(e => {
         let nav = {
             name: e.menu_name,
-            title: e.menu_name,
+            title: e.title,
             icon: e.menu_icon,
             isMenu: true,
             //url: e.url,
@@ -343,10 +343,12 @@ util.initMenuData = function (vm, data) {
         }
     } else {
         // 默认第一个
-        currNav = navList[0].menu_name;
+        currNav = navList[0].name;
         vm.$store.commit('setCurrNavTitle', navList[0].title);
     }
+        
     vm.$store.commit('setCurrNav', currNav);
+
     for (var item of menuData) {
         if (item.menu_name == currNav) {
             // 过滤
@@ -381,7 +383,7 @@ util.initRouterNode = function (routers, data) {
         //字段转换
         if(menu.menu_name && menu.menu_path){
             menu.name = menu.menu_name
-            menu.title = menu.menu_name
+            menu.title = menu.title
             menu.icon = menu.menu_icon
             menu.path = menu.menu_path
         }

front/src/store/modules/app.js

@@ -8,7 +8,7 @@ const app = {
         loading: false, // 全局加载动画
         added: false, // 加载路由标识
         navList: [], // 顶部菜单
-        currNav: "平台首页", // 当前顶部菜单name
+        currNav: "page_index", // 当前顶部菜单name
         currNavTitle: "平台首页", // 当前顶部菜单标题
         cachePage: [],
         lang: '',

front/src/views/Main.vue

@@ -176,7 +176,6 @@ export default {
     messageTip,
     user,
     Footer,
-    language,
     circleLoading,
   },
   data() {
@@ -269,7 +268,7 @@ export default {
       if (currWidth <= 1200) {
         this.sliceNum = 2;
       }
-      this.setStore("currNav", '平台首页');
+      this.setStore("currNav", 'page_index');
       this.$store.commit("setCurrNav", '平台首页');
     },
     getCurrNav() {

front/src/views/login.vue

@@ -76,13 +76,11 @@ import { login, userInfo} from "@/api/index";
 import Cookies from "js-cookie";
 import Header from "@/views/main-components/header";
 import Footer from "@/views/main-components/footer";
-import LangSwitch from "@/views/main-components/lang-switch";
 import CountDownButton from "@/views/my-components/xboot/count-down-button";
 import util from "@/libs/util.js";
 export default {
   components: {
     CountDownButton,
-    LangSwitch,
     Header,
     Footer,
   },
@@ -171,10 +169,8 @@ export default {
         });
       }
     },
-    relatedLogin() {},
   },
   mounted() {
-    this.relatedLogin();
   },
 };
 </script>

front/src/views/main-components/footer.vue

 <template>
   <div class="foot">
-    <Row type="flex" justify="space-around" class="foot-item">
-      <a
-        class="item"
-        href="https://www.kancloud.cn/exrick/xboot/1009234"
-        target="_blank"
-        >{{ $t("docs") }}</a
-      >
-      <a class="item" href="https://github.com/Exrick/x-boot" target="_blank">
-        <Icon custom="iconfont icon-github" size="16" />
-      </a>
-      <a class="item" href="http://xpay.exrick.cn/pay?xboot" target="_blank">{{
-        $t("fullVersion")
-      }}</a>
-    </Row>
     <Row type="flex" justify="center" class="copyright">
-      Copyright © 2018 - Present
-      <a href="http://exrick.cn" target="_blank" style="margin: 0 5px"
-        >Exrick</a
-      >
+      Copyright © 2022 - Present
       {{ $t("rights") }}
     </Row>
   </div>

front/src/views/main-components/header.vue

 <template>
   <div>
     <div class="header">
-      <div class="description">{{ $t("xboot") }}</div>
     </div>
   </div>
 </template>
@@ -20,12 +19,12 @@ export default {
 
 <style lang="less">
 .header {
-  margin-top: 8vh;
+  margin-top: 28vh;
   margin-bottom: 5vh;
   text-align: center;
 
   .description {
-    font-size: 14px;
+    font-size: 34px;
     color: rgba(0, 0, 0, 0.45);
     margin-top: 1vh;
   }

front/src/views/sys/menu-manage/menuManage.vue

@@ -116,22 +116,29 @@
             </FormItem>
             <FormItem
               label="名称"
-              prop="title"
+              prop="name"
               v-if="form.menuType == 'top' || form.menuType == 'page'"
             >
-              <Input v-model="form.title" />
+              <Input v-model="form.name" />
             </FormItem>
             <FormItem
               label="名称"
-              prop="title"
+              prop="name"
               v-if="form.menuType == 'button'"
               class="block-tool"
             >
               <Tooltip placement="right" content="操作按钮名称不得重复">
-                <Input v-model="form.title" />
+                <Input v-model="form.name" />
               </Tooltip>
             </FormItem>
-            <FormItem label="路径" prop="path">
+            <FormItem
+              label="标题"
+              prop="title"
+              v-if="form.menuType == 'top' || form.menuType == 'page'"
+            >
+              <Input v-model="form.title" />
+            </FormItem>
+            <FormItem label="页面路径" prop="path">
               <Input v-model="form.path" />
             </FormItem>
             <FormItem
@@ -170,7 +177,7 @@
                 <InputNumber
                   :max="1000"
                   :min="0"
-                  v-model="form.sortOrder"
+                  v-model="form.sort"
                 ></InputNumber>
               </Tooltip>
             </FormItem>
@@ -247,21 +254,27 @@
         </FormItem>
         <FormItem
           label="名称"
-          prop="title"
+          prop="name"
           v-if="formAdd.type == -1 || formAdd.type == 0"
         >
-          <Input v-model="formAdd.title" />
+          <Input v-model="formAdd.name" />
         </FormItem>
         <FormItem
           label="名称"
-          prop="title"
+          prop="name"
           v-if="formAdd.type == 1"
           class="block-tool"
         >
           <Tooltip placement="right" content="操作按钮名称不得重复">
-            <Input v-model="formAdd.title" />
+            <Input v-model="formAdd.name" />
           </Tooltip>
         </FormItem>
+        <FormItem
+          label="标题"
+          prop="title"
+        >
+          <Input v-model="formAdd.title" />
+        </FormItem>
         <FormItem label="路径" prop="path" v-if="formAdd.type == 0 || formAdd.type == 1">
           <Input v-model="formAdd.path" />
         </FormItem>
@@ -360,8 +373,8 @@ export default {
       modalTitle: "",
       form: {
         id: "",
-        title: "",
         name: "",
+        title: "",
         icon: "",
         path: "",
         component: "",
@@ -379,9 +392,9 @@ export default {
         buttonType: "",
       },
       formValidate: {
-        title: [{ required: true, message: "名称不能为空", trigger: "change" }],
+        title: [{ required: true, message: "标题不能为空", trigger: "change" }],
         name: [
-          { required: true, message: "路由英文名不能为空", trigger: "change" },
+          { required: true, message: "名称不能为空", trigger: "change" },
         ],
         icon: [{ required: true, message: "图标不能为空", trigger: "change" }],
         path: [{ required: true, message: "路径不能为空", trigger: "change" }],
@@ -449,7 +462,6 @@ export default {
     getAllList() {
       this.loading = true;
       this.getRequest("/permission/menu/all").then((res) => {
-        console.info(res.data.list)
         this.loading = false;
         if (res.status == 'success') {
           // 仅展开指定级数 默认后端已展开所有
@@ -519,7 +531,6 @@ export default {
             }
           });
           this.data = res.data.list;
-          console.info(this.data)
           let str = JSON.stringify(res.data.list);
           this.dataEdit = JSON.parse(str);
           // 头部加入一级
@@ -563,6 +574,11 @@ export default {
           v[0].selected = false;
           return;
         }
+        if (data.level == 2) {
+          this.$Message.warning("请选择2级菜单节点");
+          v[0].selected = false;
+          return;
+        }
         this.form.parentId = data.id;
         let level = data.level + 1;
         if (level < 0) {
@@ -646,18 +662,6 @@ export default {
         }
       });
     },
-    changeEditUrl(e) {
-      let v = e.target.value;
-      if (v.indexOf("http") > -1) {
-        this.form.component = "sys/monitor/monitor";
-      }
-    },
-    changeAddUrl(e) {
-      let v = e.target.value;
-      if (v.indexOf("http") > -1) {
-        this.formAdd.component = "sys/monitor/monitor";
-      }
-    },
     add() {
       if (!this.form.id) {
         this.$Message.warning("请先点击选择一个菜单权限节点");

front/src/views/sys/role-manage/roleManage.vue

@@ -90,7 +90,6 @@ export default {
             sortType: "desc",
             modalType: 0,
             roleModalVisible: false,
-            permModalVisible: false,
             modalTitle: "",
             searchForm: {
                 // 搜索框初始化对象
@@ -439,7 +438,7 @@ export default {
             };
             setDefaultRole(params).then((res) => {
                 this.loading = false;
-                if (res.success) {
+                if (res.status == 'success') {
                     this.$Message.success("操作成功");
                     this.getDataList();
                 }
@@ -453,7 +452,7 @@ export default {
             };
             setDefaultRole(params).then((res) => {
                 this.loading = false;
-                if (res.success) {
+                if (res.status == 'success') {
                     this.$Message.success("操作成功");
                     this.getDataList();
                 }

front/src/views/sys/user-manage/userManage.vue

@@ -39,7 +39,6 @@
                 </Button>
                 <DropdownMenu slot="list">
                     <DropdownItem name="refresh">刷新</DropdownItem>
-                    <DropdownItem name="reset">重置用户密码</DropdownItem>
                 </DropdownMenu>
             </Dropdown>
             <Button type="dashed" @click="openSearch = !openSearch">{{
@@ -260,9 +259,9 @@ export default {
                     },
                 },
                 {
-                    title: "所属角色",
+                    title: "所在角色组",
                     key: "belongTo",
-                    minWidth: 180,
+                    minWidth: 100,
                     sortable: false,
                 },
                 {
@@ -275,7 +274,7 @@ export default {
                 {
                     title: "操作",
                     key: "action",
-                    width: 170,
+                    width: 270,
                     align: "center",
                     fixed: "right",
                     render: (h, params) => {