Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

.env.development

@@ -2,4 +2,5 @@
 ENV = 'development'
 
 # 本地环境接口地址
+# VITE_API_URL = 'http://101.200.198.249:8899/api/v1'
 VITE_API_URL = 'http://101.200.198.249:8899/api/v1'

src/api/system/config/index.ts

@@ -3,7 +3,7 @@ import request from '/@/utils/request';
 
 export function getConfigList(query:Object) {
     return request({
-        url: '/api/v1/system/config/list',
+        url: '/system/config/list',
         method: 'get',
         params:query
     })
@@ -11,7 +11,7 @@ export function getConfigList(query:Object) {
 
 export function getConfig(id:number) {
     return request({
-        url: '/api/v1/system/config/get',
+        url: '/system/config/get',
         method: 'get',
         params:{id}
     })
@@ -19,7 +19,7 @@ export function getConfig(id:number) {
 
 export function addConfig(data:any) {
     return request({
-        url: '/api/v1/system/config/add',
+        url: '/system/config/add',
         method: 'post',
         data:data
     })
@@ -27,7 +27,7 @@ export function addConfig(data:any) {
 
 export function editConfig(data:any) {
     return request({
-        url: '/api/v1/system/config/edit',
+        url: '/system/config/edit',
         method: 'put',
         data:data
     })
@@ -35,7 +35,7 @@ export function editConfig(data:any) {
 
 export function deleteConfig(ids:number[]) {
     return request({
-        url: '/api/v1/system/config/delete',
+        url: '/system/config/delete',
         method: 'delete',
         data:{ids}
     })

src/api/system/dbInit/index.ts

@@ -3,7 +3,7 @@ import request from '/@/utils/request';
 // 是否已初始化
 export function isInit() {
     return request({
-        url: '/api/v1/system/dbInit/isInit',
+        url: '/system/dbInit/isInit',
         method: 'get'
     })
 }
@@ -12,7 +12,7 @@ export function isInit() {
 // 获取环境信息
 export function getEnvInfo() {
     return request({
-        url: '/api/v1/system/dbInit/getEnvInfo',
+        url: '/system/dbInit/getEnvInfo',
         method: 'get'
     })
 }
@@ -20,7 +20,7 @@ export function getEnvInfo() {
 // 创建数据库
 export function createDb (data:object) {
     return request({
-        url: '/api/v1/system/dbInit/createDb',
+        url: '/system/dbInit/createDb',
         method: 'post',
         data: data
     })

src/api/system/dept/index.ts

@@ -2,7 +2,7 @@ import request from '/@/utils/request';
 
 export function getDeptList(query?:Object) {
     return request({
-        url: '/api/v1/system/dept/list',
+        url: '/system/dept/list',
         method: 'get',
         params:query
     })
@@ -11,7 +11,7 @@ export function getDeptList(query?:Object) {
 
 export function addDept(data:object) {
     return request({
-        url: '/api/v1/system/dept/add',
+        url: '/system/dept/add',
         method: 'post',
         data:data
     })
@@ -20,7 +20,7 @@ export function addDept(data:object) {
 
 export function editDept(data:object) {
     return request({
-        url: '/api/v1/system/dept/edit',
+        url: '/system/dept/edit',
         method: 'put',
         data:data
     })
@@ -29,7 +29,7 @@ export function editDept(data:object) {
 
 export function deleteDept(id:number) {
     return request({
-        url: '/api/v1/system/dept/delete',
+        url: '/system/dept/delete',
         method: 'delete',
         data:{id}
     })

src/api/system/dict/data.ts

@@ -8,7 +8,7 @@ export function getDicts(dictType :string,defaultValue?:string):Promise<any> {
         defaultValue:dv
     }
     return request({
-        url: '/api/v1/system/dict/data/getDictData',
+        url: '/system/dict/data/getDictData',
         method: 'get',
         params:params
     })
@@ -31,7 +31,7 @@ export function useDict(...args:string[]):ToRefs<any>{
 
 export function getDataList(query:Object) {
     return request({
-        url: '/api/v1/system/dict/data/list',
+        url: '/system/dict/data/list',
         method: 'get',
         params:query
     })
@@ -39,7 +39,7 @@ export function getDataList(query:Object) {
 
 export function getData(dictCode:number) {
     return request({
-        url: '/api/v1/system/dict/data/get',
+        url: '/system/dict/data/get',
         method: 'get',
         params:{dictCode}
     })
@@ -47,7 +47,7 @@ export function getData(dictCode:number) {
 
 export function addData(data:any) {
     return request({
-        url: '/api/v1/system/dict/data/add',
+        url: '/system/dict/data/add',
         method: 'post',
         data:data
     })
@@ -55,7 +55,7 @@ export function addData(data:any) {
 
 export function editData(data:any) {
     return request({
-        url: '/api/v1/system/dict/data/edit',
+        url: '/system/dict/data/edit',
         method: 'put',
         data:data
     })
@@ -63,7 +63,7 @@ export function editData(data:any) {
 
 export function deleteData(ids:number[]) {
     return request({
-        url: '/api/v1/system/dict/data/delete',
+        url: '/system/dict/data/delete',
         method: 'delete',
         data:{ids}
     })

src/api/system/dict/type.ts

@@ -2,7 +2,7 @@ import request from '/@/utils/request';
 
 export function getTypeList(query:Object) {
     return request({
-        url: '/api/v1/system/dict/type/list',
+        url: '/system/dict/type/list',
         method: 'get',
         params:query
     })
@@ -10,7 +10,7 @@ export function getTypeList(query:Object) {
 
 export function getType(dictId:number) {
     return request({
-        url: '/api/v1/system/dict/type/get',
+        url: '/system/dict/type/get',
         method: 'get',
         params:{dictId}
     })
@@ -18,7 +18,7 @@ export function getType(dictId:number) {
 
 export function addType(data:any) {
     return request({
-        url: '/api/v1/system/dict/type/add',
+        url: '/system/dict/type/add',
         method: 'post',
         data:data
     })
@@ -26,7 +26,7 @@ export function addType(data:any) {
 
 export function editType(data:any) {
     return request({
-        url: '/api/v1/system/dict/type/edit',
+        url: '/system/dict/type/edit',
         method: 'put',
         data:data
     })
@@ -35,7 +35,7 @@ export function editType(data:any) {
 
 export function deleteType(dictIds:number[]) {
     return request({
-        url: '/api/v1/system/dict/type/delete',
+        url: '/system/dict/type/delete',
         method: 'delete',
         data:{dictIds}
     })

src/api/system/menu/index.ts

@@ -17,14 +17,14 @@ export function getUserMenus() {
 
 export function getMenuParams() {
     return request({
-        url: '/api/v1/system/menu/getParams',
+        url: '/system/menu/getParams',
         method: 'get'
     })
 }
 
 export function addMenu(data:Object) {
     return request({
-        url: '/api/v1/system/menu/add',
+        url: '/system/menu/add',
         method: 'post',
         data:data
     })
@@ -32,7 +32,7 @@ export function addMenu(data:Object) {
 
 export function getMenuInfo(id:number) {
     return request({
-        url: '/api/v1/system/menu/get',
+        url: '/system/menu/get',
         method: 'get',
         params:{id}
     })
@@ -40,7 +40,7 @@ export function getMenuInfo(id:number) {
 
 export function updateMenu(data:Object) {
     return request({
-        url: '/api/v1/system/menu/update',
+        url: '/system/menu/update',
         method: 'put',
         data:data
     })
@@ -50,7 +50,7 @@ export function updateMenu(data:Object) {
 // 删除菜单
 export function delMenu(menuId:number) {
     return request({
-        url: '/api/v1/system/menu/delete',
+        url: '/system/menu/delete',
         method: 'delete',
         data:{ids:[menuId]}
     })

src/api/system/monitor/loginLog/index.ts

@@ -3,7 +3,7 @@ import request from '/@/utils/request';
 
 export function logList(query:object) {
     return request({
-        url: '/api/v1/system/loginLog/list',
+        url: '/system/loginLog/list',
         method: 'get',
         params:query
     })
@@ -12,7 +12,7 @@ export function logList(query:object) {
 
 export function deleteLog(ids:number[]) {
     return request({
-        url: '/api/v1/system/loginLog/delete',
+        url: '/system/loginLog/delete',
         method: 'delete',
         params:{ids}
     })
@@ -22,7 +22,7 @@ export function deleteLog(ids:number[]) {
 
 export function clearLog() {
     return request({
-        url: '/api/v1/system/loginLog/clear',
+        url: '/system/loginLog/clear',
         method: 'delete',
     })
 }

src/api/system/monitor/server/index.ts

@@ -3,7 +3,7 @@ import request from '/@/utils/request';
 
 export function getSysInfo() {
     return request({
-        url: '/api/v1/system/monitor/server',
+        url: '/system/monitor/server',
         method: 'get'
     })
 }

src/api/system/post/index.ts

@@ -2,7 +2,7 @@ import request from '/@/utils/request';
 
 export function getPostList(query:Object) {
     return request({
-        url: '/api/v1/system/post/list',
+        url: '/system/post/list',
         method: 'get',
         params:query
     })
@@ -10,7 +10,7 @@ export function getPostList(query:Object) {
 
 export function addPost(data:object) {
     return request({
-        url: '/api/v1/system/post/add',
+        url: '/system/post/add',
         method: 'post',
         data:data
     })
@@ -19,7 +19,7 @@ export function addPost(data:object) {
 
 export function editPost(data:object) {
     return request({
-        url: '/api/v1/system/post/edit',
+        url: '/system/post/edit',
         method: 'put',
         data:data
     })
@@ -28,7 +28,7 @@ export function editPost(data:object) {
 
 export function deletePost(ids:number[]) {
     return request({
-        url: '/api/v1/system/post/delete',
+        url: '/system/post/delete',
         method: 'delete',
         data:{ids}
     })

src/api/system/role/index.ts

@@ -2,7 +2,7 @@ import request from '/@/utils/request';
 
 export function getRoleList(query:Object) {
     return request({
-        url: '/api/v1/system/role/list',
+        url: '/system/role/list',
         method: 'get',
         params:query
     })
@@ -10,14 +10,14 @@ export function getRoleList(query:Object) {
 
 export function getRoleParams() {
     return request({
-        url: '/api/v1/system/role/getParams',
+        url: '/system/role/getParams',
         method: 'get'
     })
 }
 
 export function addRole(data:object) {
     return request({
-        url: '/api/v1/system/role/add',
+        url: '/system/role/add',
         method: 'post',
         data:data
     })
@@ -25,7 +25,7 @@ export function addRole(data:object) {
 
 export function getRole(id:number) {
     return request({
-        url: '/api/v1/system/role/get',
+        url: '/system/role/get',
         method: 'get',
         params:{id}
     })
@@ -34,7 +34,7 @@ export function getRole(id:number) {
 
 export function editRole(data:object) {
     return request({
-        url: '/api/v1/system/role/edit',
+        url: '/system/role/edit',
         method: 'put',
         data:data
     })
@@ -43,7 +43,7 @@ export function editRole(data:object) {
 
 export function deleteRole(id:number) {
     return request({
-        url: '/api/v1/system/role/delete',
+        url: '/system/role/delete',
         method: 'delete',
         data:{ids:[id]}
     })

src/api/system/user/index.ts

@@ -2,7 +2,7 @@ import request from '/@/utils/request';
 
 export function getUserList(query:Object) {
     return request({
-        url: '/api/v1/system/user/list',
+        url: '/system/user/list',
         method: 'get',
         params:query
     })
@@ -10,21 +10,21 @@ export function getUserList(query:Object) {
 
 export function getDeptTree() {
     return request({
-        url: '/api/v1/system/dept/treeSelect',
+        url: '/system/dept/treeSelect',
         method: 'get'
     })
 }
 
 export function getParams() {
     return request({
-        url: '/api/v1/system/user/params',
+        url: '/system/user/params',
         method: 'get'
     })
 }
 
 export function getEditUser(id:number) {
     return request({
-        url: '/api/v1/system/user/getEdit',
+        url: '/system/user/getEdit',
         method: 'get',
         params:{id}
     })
@@ -32,7 +32,7 @@ export function getEditUser(id:number) {
 
 export function addUser(data:object) {
     return request({
-        url: '/api/v1/system/user/add',
+        url: '/system/user/add',
         method: 'post',
         data:data
     })
@@ -41,7 +41,7 @@ export function addUser(data:object) {
 
 export function editUser(data:object) {
     return request({
-        url: '/api/v1/system/user/edit',
+        url: '/system/user/edit',
         method: 'put',
         data:data
     })
@@ -49,7 +49,7 @@ export function editUser(data:object) {
 
 export function resetUserPwd(userId:number, password:string) {
     return request({
-        url: '/api/v1/system/user/resetPwd',
+        url: '/system/user/resetPwd',
         method: 'put',
         data:{userId,password}
     })
@@ -57,7 +57,7 @@ export function resetUserPwd(userId:number, password:string) {
 
 export function changeUserStatus(userId:number, status:number) {
     return request({
-        url: '/api/v1/system/user/setStatus',
+        url: '/system/user/setStatus',
         method: 'put',
         data:{userId,status}
     })
@@ -66,7 +66,7 @@ export function changeUserStatus(userId:number, status:number) {
 
 export function deleteUser(ids:number[]) {
     return request({
-        url: '/api/v1/system/user/delete',
+        url: '/system/user/delete',
         method: 'delete',
         data:{ids}
     })

src/layout/footer/index.vue

@@ -1,8 +1,7 @@
 <template>
 	<div class="layout-footer mt15" v-show="isDelayFooter">
 		<div class="layout-footer-warp">
-			<div>Copyright © 2021-2023 g-fast.cn All Rights Reserved.</div>
-			<div class="mt5">云南奇讯科技有限公司版权所有</div>
+			<div>Copyright © 2021-2023 Sagoo All Rights Reserved.</div>
 		</div>
 	</div>
 </template>

src/layout/logo/index.vue

@@ -51,7 +51,7 @@ export default defineComponent({
 	justify-content: center;
 	box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px;
 	color: var(--el-color-primary);
-	font-size: 16px;
+	font-size: 20px;
 	cursor: pointer;
 	animation: logoAnimation 0.3s ease-in-out;
 	&:hover {
@@ -60,7 +60,8 @@ export default defineComponent({
 		}
 	}
 	&-medium-img {
-		width: 45px;
+		width: 35px;
+    padding-right: 5px;
 	}
 }
 .layout-logo-size {