diff --git a/config.js b/config.js index d783ea1..e4dba5e 100644 --- a/config.js +++ b/config.js @@ -1,26 +1,25 @@ // 应用全局配置 module.exports = { - //baseUrl: 'https://vue.ruoyi.vip/prod-api', - baseUrl: 'http://localhost:8888', - // 应用信息 - appInfo: { - // 应用名称 - name: "ruoyi-app", - // 应用版本 - version: "1.1.0", - // 应用logo - logo: "/static/logo.png", - // 官方网站 - site_url: "http://ruoyi.vip", - // 政策协议 - agreements: [{ - title: "隐私政策", - url: "https://ruoyi.vip/protocol.html" - }, - { - title: "用户服务协议", - url: "https://ruoyi.vip/protocol.html" - } - ] - } -} + baseUrl: '/api', + // 应用信息 + appInfo: { + // 应用名称 + name: "DOAN", + // 应用版本 + version: "1.0.0", + // 应用logo + logo: "/static/logo.png", + // 官方网站 + site_url: "", + // 政策协议 + agreements: [{ + title: "隐私政策", + url: "https://ruoyi.vip/protocol.html" + }, + { + title: "用户服务协议", + url: "https://ruoyi.vip/protocol.html" + } + ] + } +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8a86db5..00a9b93 100644 --- a/manifest.json +++ b/manifest.json @@ -58,7 +58,16 @@ "template" : "static/index.html", "devServer" : { "port" : 9090, - "https" : false + "https" : false, + "disableHostCheck":true, + "proxy":{ + "/api":{ + "target":"http://localhost:8888", + "pathRewrite":{ + "^/api": "" + } + } + } }, "title" : "RuoYi-App", "router" : { diff --git a/pages/login.vue b/pages/login.vue index 7f0e8c8..f2b4b57 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -1,202 +1,212 @@ diff --git a/store/modules/user.js b/store/modules/user.js index c1ec441..a1eb26e 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -1,98 +1,116 @@ import config from '@/config' import storage from '@/utils/storage' import constant from '@/utils/constant' -import { login, logout, getInfo } from '@/api/login' -import { getToken, setToken, removeToken } from '@/utils/auth' +import { + login, + logout, + getInfo +} from '@/api/login' +import { + getToken, + setToken, + removeToken +} from '@/utils/auth' const baseUrl = config.baseUrl const user = { - state: { - token: getToken(), - name: storage.get(constant.name), - avatar: storage.get(constant.avatar), - roles: storage.get(constant.roles), - permissions: storage.get(constant.permissions) - }, + state: { + token: getToken(), + name: storage.get(constant.name), + avatar: storage.get(constant.avatar), + roles: storage.get(constant.roles), + permissions: storage.get(constant.permissions) + }, - mutations: { - SET_TOKEN: (state, token) => { - state.token = token - }, - SET_NAME: (state, name) => { - state.name = name - storage.set(constant.name, name) - }, - SET_AVATAR: (state, avatar) => { - state.avatar = avatar - storage.set(constant.avatar, avatar) - }, - SET_ROLES: (state, roles) => { - state.roles = roles - storage.set(constant.roles, roles) - }, - SET_PERMISSIONS: (state, permissions) => { - state.permissions = permissions - storage.set(constant.permissions, permissions) - } - }, + mutations: { + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + storage.set(constant.name, name) + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + storage.set(constant.avatar, avatar) + }, + SET_ROLES: (state, roles) => { + state.roles = roles + storage.set(constant.roles, roles) + }, + SET_PERMISSIONS: (state, permissions) => { + state.permissions = permissions + storage.set(constant.permissions, permissions) + } + }, - actions: { - // 登录 - Login({ commit }, userInfo) { - const username = userInfo.username.trim() - const password = userInfo.password - const code = userInfo.code - const uuid = userInfo.uuid - return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { - setToken(res.token) - commit('SET_TOKEN', res.token) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, + actions: { + // 登录 + Login({ + commit + }, userInfo) { + const username = userInfo.username.trim() + const password = userInfo.password + const code = userInfo.code + const uuid = userInfo.uuid + return new Promise((resolve, reject) => { + login(username, password, code, uuid).then(res => { + setToken(res.data) + commit('SET_TOKEN', res.data) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, - // 获取用户信息 - GetInfo({ commit, state }) { - return new Promise((resolve, reject) => { - getInfo().then(res => { - const user = res.user - const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/profile.jpg") : baseUrl + user.avatar - const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName - if (res.roles && res.roles.length > 0) { - commit('SET_ROLES', res.roles) - commit('SET_PERMISSIONS', res.permissions) - } else { - commit('SET_ROLES', ['ROLE_DEFAULT']) - } - commit('SET_NAME', username) - commit('SET_AVATAR', avatar) - resolve(res) - }).catch(error => { - reject(error) - }) - }) - }, + // 获取用户信息 + GetInfo({ + commit, + state + }) { + return new Promise((resolve, reject) => { + getInfo().then(res => { + const user = res.user + const avatar = (user == null || user.avatar == "" || user.avatar == null) ? + require("@/static/images/profile.jpg") : baseUrl + user.avatar + const username = (user == null || user.userName == "" || user.userName == + null) ? "" : user.userName + if (res.roles && res.roles.length > 0) { + commit('SET_ROLES', res.roles) + commit('SET_PERMISSIONS', res.permissions) + } else { + commit('SET_ROLES', ['ROLE_DEFAULT']) + } + commit('SET_NAME', username) + commit('SET_AVATAR', avatar) + resolve(res) + }).catch(error => { + reject(error) + }) + }) + }, - // 退出系统 - LogOut({ commit, state }) { - return new Promise((resolve, reject) => { - logout(state.token).then(() => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - commit('SET_PERMISSIONS', []) - removeToken() - storage.clean() - resolve() - }).catch(error => { - reject(error) - }) - }) - } - } + // 退出系统 + LogOut({ + commit, + state + }) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + commit('SET_TOKEN', '') + commit('SET_ROLES', []) + commit('SET_PERMISSIONS', []) + removeToken() + storage.clean() + resolve() + }).catch(error => { + reject(error) + }) + }) + } + } } -export default user +export default user \ No newline at end of file