ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化首页

This commit is contained in:
zhujj 2019-01-09 11:02:08 +08:00
parent 427e457e9f
commit cc8517e771
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-exam/src/main/resources/mapper/exam/ExamPracticeMapper.xml
View File

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" /> <result property="id" column="id" />
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id" />
<result property="name" column="name" /> <result property="name" column="name" />
<result property="price" column="price" />
<result property="enableControlTime" column="enable_control_time" /> <result property="enableControlTime" column="enable_control_time" />
<result property="startTime" column="start_time" /> <result property="startTime" column="start_time" />
<result property="endTime" column="end_time" /> <result property="endTime" column="end_time" />
@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectExamPracticeVo"> <sql id="selectExamPracticeVo">
id, dept_id, name, enable_control_time, start_time, end_time, practice_user_limit, create_by, create_date, update_by, update_date, remarks, del_flag </sql> id, dept_id, name, price,enable_control_time, start_time, end_time, practice_user_limit, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
<select id="selectExamPracticeList" parameterType="ExamPractice" resultMap="ExamPracticeResult"> <select id="selectExamPracticeList" parameterType="ExamPractice" resultMap="ExamPracticeResult">
select select

2
ruoyi-framework/src/main/java/com/ruoyi/framework/jwt/JwtUtil.java
View File

@ -47,7 +47,7 @@ public class JwtUtil {
*/ */
public static String getLoginName() { public static String getLoginName() {
try { try {
String token = ServletUtils.getRequest().getHeader("Authorization"); String token = ServletUtils.getRequest().getHeader("token");
DecodedJWT jwt = JWT.decode(token); DecodedJWT jwt = JWT.decode(token);
return jwt.getClaim("loginName").asString(); return jwt.getClaim("loginName").asString();
} catch (JWTDecodeException e) { } catch (JWTDecodeException e) {