hanzhengzheng/Goats-Cloud-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
hzz 2023-12-13 17:14:38 +08:00
parent d972ce5f21
commit 0741f00a5d
10 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/api/login.js
View File

@ -2,20 +2,27 @@ import request from '@/utils/request'
// 登录方法
export function login(username, password, code, uuid) {
const data = {
username,
password,
code,
uuid
}
return request({
url: '/auth/login',
url: '/login',
headers: {
isToken: false
isToken: false,
repeatSubmit: false
},
method: 'post',
data: { username, password, code, uuid }
data: data
})
}
// 注册方法
export function register(data) {
return request({
url: '/auth/register',
url: '/register',
headers: {
isToken: false
},
@ -24,18 +31,10 @@ export function register(data) {
})
}
// 刷新方法
export function refreshToken() {
return request({
url: '/auth/refresh',
method: 'post'
})
}
// 获取用户详细信息
export function getInfo() {
return request({
url: '/system/user/getInfo',
url: '/getInfo',
method: 'get'
})
}
@ -43,15 +42,15 @@ export function getInfo() {
// 退出方法
export function logout() {
return request({
url: '/auth/logout',
method: 'delete'
url: '/logout',
method: 'post'
})
}
// 获取验证码
export function getCodeImg() {
return request({
url: '/code',
url: '/captchaImage',
headers: {
isToken: false
},

2
src/api/menu.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 获取路由
export const getRouters = () => {
return request({
url: '/system/menu/getRouters',
url: '/getRouters',
method: 'get'
})
}

15
src/api/monitor/job.js
View File

@ -1,9 +1,8 @@
import request from '@/utils/request'
// 查询定时任务调度列表
export function listJob(query) {
return request({
url: '/schedule/job/list',
url: '/monitor/job/list',
method: 'get',
params: query
})
@ -12,7 +11,7 @@ export function listJob(query) {
// 查询定时任务调度详细
export function getJob(jobId) {
return request({
url: '/schedule/job/' + jobId,
url: '/monitor/job/' + jobId,
method: 'get'
})
}
@ -20,7 +19,7 @@ export function getJob(jobId) {
// 新增定时任务调度
export function addJob(data) {
return request({
url: '/schedule/job',
url: '/monitor/job',
method: 'post',
data: data
})
@ -29,7 +28,7 @@ export function addJob(data) {
// 修改定时任务调度
export function updateJob(data) {
return request({
url: '/schedule/job',
url: '/monitor/job',
method: 'put',
data: data
})
@ -38,7 +37,7 @@ export function updateJob(data) {
// 删除定时任务调度
export function delJob(jobId) {
return request({
url: '/schedule/job/' + jobId,
url: '/monitor/job/' + jobId,
method: 'delete'
})
}
@ -50,7 +49,7 @@ export function changeJobStatus(jobId, status) {
status
}
return request({
url: '/schedule/job/changeStatus',
url: '/monitor/job/changeStatus',
method: 'put',
data: data
})
@ -64,7 +63,7 @@ export function runJob(jobId, jobGroup) {
jobGroup
}
return request({
url: '/schedule/job/run',
url: '/monitor/job/run',
method: 'put',
data: data
})

6
src/api/monitor/jobLog.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询调度日志列表
export function listJobLog(query) {
return request({
url: '/schedule/jobLog/list',
url: '/monitor/jobLog/list',
method: 'get',
params: query
})
@ -12,7 +12,7 @@ export function listJobLog(query) {
// 删除调度日志
export function delJobLog(jobLogId) {
return request({
url: '/schedule/jobLog/' + jobLogId,
url: '/monitor/jobLog/' + jobLogId,
method: 'delete'
})
}
@ -20,7 +20,7 @@ export function delJobLog(jobLogId) {
// 清空调度日志
export function cleanJobLog() {
return request({
url: '/schedule/jobLog/clean',
url: '/monitor/jobLog/clean',
method: 'delete'
})
}

4
src/api/monitor/online.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询在线用户列表
export function list(query) {
return request({
url: '/system/online/list',
url: '/monitor/online/list',
method: 'get',
params: query
})
@ -12,7 +12,7 @@ export function list(query) {
// 强退用户
export function forceLogout(tokenId) {
return request({
url: '/system/online/' + tokenId,
url: '/monitor/online/' + tokenId,
method: 'delete'
})
}

13
src/components/ImageUpload/index.vue
View File

@ -79,7 +79,7 @@ const uploadList = ref([]);
const dialogImageUrl = ref("");
const dialogVisible = ref(false);
const baseUrl = import.meta.env.VITE_APP_BASE_API;
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传的图片服务器地址
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
const headers = ref({ Authorization: "Bearer " + getToken() });
const fileList = ref([]);
const showTip = computed(
@ -93,11 +93,11 @@ watch(() => props.modelValue, val => {
// 然后将数组转为对象数组
fileList.value = list.map(item => {
if (typeof item === "string") {
// if (item.indexOf(baseUrl) === -1) {
// item = { name: baseUrl + item, url: baseUrl + item };
// } else {
// }
if (item.indexOf(baseUrl) === -1) {
item = { name: baseUrl + item, url: baseUrl + item };
} else {
item = { name: item, url: item };
}
}
return item;
});
@ -148,7 +148,7 @@ function handleExceed() {
// 上传成功回调
function handleUploadSuccess(res, file) {
if (res.code === 200) {
uploadList.value.push({ name: res.data.name, url: res.data.url });
uploadList.value.push({ name: res.fileName, url: res.fileName });
uploadedSuccessfully();
} else {
number.value--;
@ -201,7 +201,6 @@ function listToString(list, separator) {
strs += list[i].url.replace(baseUrl, "") + separator;
}
}
return strs != "" ? strs.substr(0, strs.length - 1) : "";
}
</script>

5
src/store/modules/user.js
View File

@ -22,9 +22,8 @@ const useUserStore = defineStore(
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
let data = res.data
setToken(data.access_token)
this.token = data.access_token
setToken(res.token)
this.token = res.token
resolve()
}).catch(error => {
reject(error)

2
src/views/big/dept/components/add_edit.vue
View File

@ -27,7 +27,7 @@ import { addDept, updateDept } from '@/api/big/dept'
import ImageUpload from '@/components/ImageUpload/index.vue'
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传的图片服务器地址
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
const prop = defineProps({
visible: {
type: Boolean,

2
src/views/big/device/components/upLoad.vue
View File

@ -72,7 +72,7 @@ const upload = reactive({
// 设置上传的请求头部
headers:{ Authorization: "Bearer " + getToken() },
// 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/file/upload"
url: import.meta.env.VITE_APP_BASE_API + "/common/upload"
});
/**文件上传中处理 */
const handleFileUploadProgress = (event, file, fileList) => {

2
src/views/big/screen/components/add_edit.vue
View File

@ -37,7 +37,7 @@ import { addScreen, updateScreen } from '@/api/big/screen'
import ImageUpload from '@/components/ImageUpload/index.vue'
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传的图片服务器地址
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
const prop = defineProps({
visible: {
type: Boolean,