Skip to content

D
dd_school
Commit 0409a5c2 by zhaopanyu
Options

zpy10.10

parent e6d3e9ae
Showing with 264 additions and 239 deletions
ruoyi-ui/README.md
......@@ -28,4 +28,9 @@ npm run build:stage
# 构建生产环境
npm run build:prod
```
\ No newline at end of file
```
#开发环境
在index页面，打开created中 this.csToken()
#生产环境
在index页面，打开created中 this.getCode()
ruoyi-ui/src/main.js
......@@ -12,7 +12,6 @@ import directive from "./directive"; // directive
import plugins from "./plugins"; // plugins
import { download } from "@/utils/request";
import moment from "moment";
import "./assets/icons"; // icon
import "./permission"; // permission control
import { getDicts } from "@/api/system/dict/data";
......
ruoyi-ui/src/router/index.js
......@@ -57,6 +57,11 @@ export const constantRoutes = [
hidden: true,
},
{
path: "/dd",
component: () => import("@/views/whitePage"),
hidden: true,
},
{
path: "/register",
component: () => import("@/views/register"),
hidden: true,
......@@ -71,7 +76,7 @@ export const constantRoutes = [
component: () => import("@/views/error/401"),
hidden: true,
},
{
path: "",
component: Layout,
......
ruoyi-ui/src/store/modules/user.js
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 user = {
state: {
token: getToken(),
name: '',
employeeType: '',
avatar: '',
sign: '',
name: "",
employeeType: "",
avatar: "",
sign: "",
roles: [],
permissions: [],
roleKey: '',
roleId: '',
deptId: '',
userId: '',
roleKey: "",
roleId: "",
deptId: "",
userId: "",
teacher: {},
education: '',
education: "",
sex: "",
},
mutations: {
SET_TOKEN: (state, token) => {
state.token = token
state.token = token;
},
SET_NAME: (state, name) => {
state.name = name
state.name = name;
},
SET_EDUCATION: (state, education) => {
state.education = education
state.education = education;
},
SET_EMPLOYEETYPE: (state, employeeType) => {
state.employeeType = employeeType
state.employeeType = employeeType;
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
state.avatar = avatar;
},
SET_SIGN: (state, sign) => {
state.sign = sign
state.sign = sign;
},
SET_ROLES: (state, roles) => {
state.roles = roles
state.roles = roles;
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
state.permissions = permissions;
},
SET_USER: (state, info) => {
......@@ -56,92 +56,105 @@ const user = {
},
SET_SEX: (state, sex) => {
state.sex = sex;
}
},
},
actions: {
// 登录
Login({commit}, userInfo) {
Login({ commit }, userInfo) {
// const username = userInfo.username.trim()
const phonenumber = userInfo.phonenumber.trim()
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
const phonenumber = userInfo.phonenumber.trim();
const password = userInfo.password;
const code = userInfo.code;
const uuid = userInfo.uuid;
return new Promise((resolve, reject) => {
login(phonenumber, password, code, uuid).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
resolve()
}).catch(error => {
reject(error)
})
})
login(phonenumber, password, code, uuid)
.then((res) => {
setToken(res.token);
commit("SET_TOKEN", res.token);
resolve();
})
.catch((error) => {
reject(error);
});
});
},
// 获取用户信息
GetInfo({commit, state}) {
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
getInfo().then(res => {
// console.log(res, 81)
const user = res.user
const teacher = res.teacher
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
const sign = (user.sign == "" || user.sign == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.sign;
if (res.roles &&/* */ res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_SEX', user.sex)
commit('SET_NAME', user.userName)
commit('SET_EDUCATION', teacher.education)
commit('SET_EMPLOYEETYPE', user.employeeType)
getInfo()
.then((res) => {
console.log("getInfo", res);
const user = res.user;
const teacher = res.teacher;
const avatar =
user.avatar == "" || user.avatar == null
? require("@/assets/images/profile.jpg")
: process.env.VUE_APP_BASE_API + user.avatar;
const sign =
user.sign == "" || user.sign == null
? require("@/assets/images/profile.jpg")
: process.env.VUE_APP_BASE_API + user.sign;
if (res.roles && /* */ res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组
commit("SET_ROLES", res.roles);
commit("SET_PERMISSIONS", res.permissions);
} else {
commit("SET_ROLES", ["ROLE_DEFAULT"]);
}
commit("SET_SEX", user.sex);
commit("SET_NAME", user.userName);
commit("SET_EDUCATION", teacher.education);
commit("SET_EMPLOYEETYPE", user.employeeType);
commit('SET_AVATAR', avatar)
commit('SET_SIGN', sign)
commit('SET_USER', {
deptId: user.deptId,
roleId: user.roles[0] && user.roles[0].roleId,
userId: user.userId,
roleKey: res.roles[0]
})
commit('SET_TEACHER', {
...res.teacher,
deptName: user.dept.deptName,
roles: user.roles.map(item => item.roleName).join('、')
commit("SET_AVATAR", avatar);
commit("SET_SIGN", sign);
commit("SET_USER", {
deptId: user.deptId,
roleId: user.roles[0] && user.roles[0].roleId,
userId: user.userId,
roleKey: res.roles[0],
});
commit("SET_TEACHER", {
...res.teacher,
deptName: user.dept.deptName,
roles: user.roles.map((item) => item.roleName).join("、"),
});
resolve(res);
})
resolve(res)
}).catch(error => {
reject(error)
})
})
.catch((error) => {
reject(error);
});
});
},
// 退出系统
LogOut({commit, state}) {
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token).then(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
resolve()
}).catch(error => {
reject(error)
})
})
logout(state.token)
.then(() => {
commit("SET_TOKEN", "");
commit("SET_ROLES", []);
commit("SET_PERMISSIONS", []);
removeToken();
resolve();
})
.catch((error) => {
reject(error);
});
});
},
// 前端 登出
FedLogOut({commit}) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
removeToken()
resolve()
})
}
}
}
FedLogOut({ commit }) {
return new Promise((resolve) => {
commit("SET_TOKEN", "");
removeToken();
resolve();
});
},
},
};
export default user
export default user;
ruoyi-ui/src/views/index.vue
......@@ -404,8 +404,7 @@ import { getUser } from '@/api/system/user'
// 任务模块
// import { taskList } from "@/api/smartSchool/studentManage/studentLeave";
import { listPic } from '@/api/smartSchool/schoolManage/introduce/pic'
import router from "../router";
import Cookies from "js-cookie";
import * as dd from 'dingtalk-jsapi';
import { getToken, setToken, removeToken } from '@/utils/auth'
......@@ -530,7 +529,6 @@ export default {
},
methods: {
// 获取code
getCode() {
dd.getAuthCode({
......@@ -577,32 +575,18 @@ export default {
// 测试token
csToken() {
getCode(123).then(res => {
console.log('res', res.token);
if (res.token) {
setToken(res.token)
this.$store.commit('SET_TOKEN', res.token)
// this.$router.push({ path: '/index' });
// 判断当前用户是否已拉取完user_info信息
this.$store.dispatch('GetInfo').then((res) => {
this.$store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
this.init()
})
})
} else {
this.$message.error(res.message)
}
})
if (getToken()) {
console.log('getToken', getToken());
this.init()
} else {
this.$router.push({ path: '/login' });
}
},
//从后端获取任务数量
taskNum() {
getTaskNum().then(res => {
console.log('taskNumList', res)
// console.log('taskNumList', res)
this.taskNumList = res.data
})
},
......@@ -683,6 +667,7 @@ export default {
// 获取用户信息
getUserInfo() {
this.userInfo = this.$store.state.user.teacher
console.log('this.userInfo', this.$store.state.user.teacher);
},
// 获取通知公告信息
......
ruoyi-ui/src/views/login.vue
<template>
<button @click="getCode">123</button>
<!--<div class="login-container">-->
<!--<div class="login-page login-cover">-->
<!-- <div class="cover-container">-->
......@@ -18,13 +17,13 @@
<!-- </div>-->
<!--</div>-->
<!--</div>-->
<!-- <div class="login">
<div class="login">
<div class="login-card-container">
<div class="login-card-left">
<el-image style="width: 600px;" :src="require('@/assets/images/login.png')" lazy></el-image> -->
<!-- :src="require('@/assets/images/logo-login.gif')"-->
<!-- </div> -->
<!-- <div class="login-card-right">
<el-image style="width: 600px;" :src="require('@/assets/images/login.png')" lazy></el-image>
<!-- :src="require('@/assets/images/logo-login.gif')"-->
</div>
<div class="login-card-right">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">智慧校园管理系统</h3>
<el-form-item prop="phonenumber">
......@@ -37,22 +36,22 @@
auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item> -->
<!-- <el-form-item prop="code" v-if="captchaEnabled">-->
<!-- <el-input-->
<!-- v-model="loginForm.code"-->
<!-- auto-complete="off"-->
<!-- placeholder="验证码"-->
<!-- style="width: 63%"-->
<!-- @keyup.enter.native="handleLogin"-->
<!-- >-->
<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
<!-- </el-input>-->
<!-- <div class="login-code">-->
<!-- <img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
</el-form-item>
<!-- <el-form-item prop="code" v-if="captchaEnabled">-->
<!-- <el-input-->
<!-- v-model="loginForm.code"-->
<!-- auto-complete="off"-->
<!-- placeholder="验证码"-->
<!-- style="width: 63%"-->
<!-- @keyup.enter.native="handleLogin"-->
<!-- >-->
<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
<!-- </el-input>-->
<!-- <div class="login-code">-->
<!-- <img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
<el-form-item style="width:100%;">
<el-button :loading="loading" size="medium" type="primary" style="width:100%;"
@click.native.prevent="handleLogin">
......@@ -65,14 +64,16 @@
</el-form-item>
</el-form>
</div>
</div> -->
<!-- 底部 -->
<!-- <div class="el-login-footer">
</div>
<!-- 底部 -->
<div class="el-login-footer">
<span>© 2021 zhimin Copyright </span>
</div>
</div> -->
</div>
</template>
<script>
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
......@@ -86,13 +87,8 @@ export default {
name: "Login",
data() {
return {
code: null,
token: null,
authCodeTimestamp: 0, // 用于存储免登码的时间戳
authCodeExpiration: 5 * 60 * 1000, // 免登码有效期（假设为5分钟）
codeUrl: "",
loginForm: {
// username: "admin",
......@@ -137,7 +133,7 @@ export default {
},
mounted() {
// this.getCode();
// this.getCookie();
this.getCookie();
},
methods: {
// 获取code
......@@ -199,59 +195,55 @@ export default {
// // console.error('登录失败', error);
// }
// }
// getCode() {
// getCodeImg().then(res => {
// this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
// if (this.captchaEnabled) {
// this.codeUrl = "data:image/gif;base64," + res.img;
// this.loginForm.uuid = res.uuid;
// }
// });
// },
// getCookie() {
// // const username = Cookies.get("username");
// // 获取手机号码
// const phonenumber = Cookies.get("phonenumber");
// const password = Cookies.get("password");
// const rememberMe = Cookies.get('rememberMe')
// this.loginForm = {
// // username: username === undefined ? this.loginForm.username : username,
// phonenumber: phonenumber === undefined ? this.loginForm.phonenumber : phonenumber,
// password: password === undefined ? this.loginForm.password : decrypt(password),
// rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
// };
// },
// handleLogin() {
// this.$refs.loginForm.validate(valid => {
// if (valid) {
// this.loading = true;
// if (this.loginForm.rememberMe) {
// // Cookies.set("username", this.loginForm.username, { expires: 30 });
// Cookies.set("phonenumber", this.loginForm.phonenumber, { expires: 30 });
// Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
// Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
// } else {
// // Cookies.remove("username");
// Cookies.remove("phonenumber");
// Cookies.remove("password");
// Cookies.remove('rememberMe');
// }
// this.$store.dispatch("Login", this.loginForm).then(() => {
// this.$router.push({ path: this.redirect || "/" }).catch(() => {
// });
// }).catch(() => {
// this.loading = false;
// if (this.captchaEnabled) {
// this.getCode();
// }
// });
// }
// });
// }
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.img;
this.loginForm.uuid = res.uuid;
}
});
},
getCookie() {
// const username = Cookies.get("username");
// 获取手机号码
const phonenumber = Cookies.get("phonenumber");
const password = Cookies.get("password");
const rememberMe = Cookies.get('rememberMe')
this.loginForm = {
// username: username === undefined ? this.loginForm.username : username,
phonenumber: phonenumber === undefined ? this.loginForm.phonenumber : phonenumber,
password: password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
};
},
handleLogin() {
this.$refs.loginForm.validate(valid => {
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
// Cookies.set("username", this.loginForm.username, { expires: 30 });
Cookies.set("phonenumber", this.loginForm.phonenumber, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
} else {
// Cookies.remove("username");
Cookies.remove("phonenumber");
Cookies.remove("password");
Cookies.remove('rememberMe');
}
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {
});
}).catch(() => {
this.loading = false;
if (this.captchaEnabled) {
this.getCode();
}
});
}
});
}
}
......
ruoyi-ui/src/views/smartSchool/personWork/awArds/materialPreparation/index.vue
......@@ -92,6 +92,7 @@
<el-link :href="`${baseUrl}${file.accessoryUrl}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ file.accessoryName }} </span>
</el-link>
</li>
</el-form-item>
</el-col>
......@@ -217,7 +218,7 @@ export default {
},
/** 提交按钮 */
submitForm: function () {
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.schoolAccessoryList.length > 0) {
......
ruoyi-ui/src/views/whitePage.vue
<template>
<div>
<button @click="getAuthCode">获取钉钉授权码</button>
<button @click="csToken">获取钉钉授权码</button>
</div>
</template>
<script>
import * as dd from 'dingtalk-jsapi';
import { getCode } from "@/api/ddLogin";
import router from "../router";
import { getToken, setToken, removeToken } from '@/utils/auth'
export default {
data() {
......@@ -14,31 +16,29 @@ export default {
redirect: "/index", // 这里假设要跳转到首页
code: null,
token: null,
authCodeTimestamp: 0, // 用于存储免登码的时间戳
authCodeExpiration: 5 * 60 * 1000, // 免登码有效期（假设为5分钟）
};
},
created() {
// 钉钉code码，正式时打开
// this.getCode()
// token,测试用
this.csToken()
},
methods: {
getAuthCode() {
// 检查是否有有效的免登码
const currentTime = Date.now();
console.log(currentTime);
if (this.code && currentTime - this.authCodeTimestamp < this.authCodeExpiration) {
// 使用存储的免登码
console.log('使用缓存的免登码', this.code);
this.loginWithAuthCode(this.code);
return;
}
// 获取新的免登码
// 获取code
getCode() {
dd.getAuthCode({
corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
success: (res) => {
console.log('获取新的免登码成功', res);
const { code } = res;
// 存储新的免登码和时间戳
this.code = code;
this.authCodeTimestamp = currentTime;
const code = res.code
// this.code = code;
// this.authCodeTimestamp = currentTime;
// console.log('this.authCodeTimestamp', this.authCodeTimestamp);
console.log('code', code);
this.getToken(code)
// console.log('loginResponse', loginResponse);
},
fail: (res) => {
console.log('获取免登码失败', res);
......@@ -46,25 +46,51 @@ export default {
complete: () => { },
});
},
async loginWithAuthCode(code) {
console.log('code', code);
try {
// 向后端发送请求，使用免登码进行登录
const loginResponse = await getCode({ code });
console.log('code', code);
console.log('跳转页面');
// 处理登录成功的情况，可能需要保存用户信息或者跳转到其他页面
console.log('用户登录成功', loginResponse);
const { token } = loginResponse.data; // 假设返回的数据中包含 token 字段
console.log('用户 Token:', token); // 打印返回的 Token
this.$router.push({ path: "/index" })
// 获取token
getToken(code) {
getCode(code).then(res => {
console.log('res', res.token);
if (res.token) {
setToken(res.token)
this.$store.commit('SET_TOKEN', res.token)
// this.$router.push({ path: '/index' });
// 判断当前用户是否已拉取完user_info信息
this.$store.dispatch('GetInfo').then((res) => {
this.$store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
// this.init()
})
})
} else {
this.$message.error(res.message)
}
}
catch (error) {
// 处理登录失败的情况
// console.error('登录失败', error);
}
}
})
},
// 测试token
csToken() {
getCode(123).then(res => {
console.log('res', res.token);
if (res.token) {
setToken(res.token)
this.$store.commit('SET_TOKEN', res.token)
this.$router.push({ path: '/index' });
// 判断当前用户是否已拉取完user_info信息
this.$store.dispatch('GetInfo').then((res) => {
this.$store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
this.init()
})
})
} else {
this.$message.error(res.message)
}
})
},
},
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment