tianzeOrg
/
TextBigData
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改登陆时取用参数

Browse Source
master
xiaoCJ
parent 7af99a8b08
commit 6c8a97dec7
6 changed files with 118 additions and 104 deletions

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
import java.util.List;
import java.util.Set;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.framework.web.service.TokenService;
@ -57,9 +58,11 @@ public class SysLoginController {
*/
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody) {
SysUser sysUser = sysUserMapper.selectUserByUserName(loginBody.getUsername());
String username = loginBody.getUsername();
SysUser sysUser = sysUserMapper.selectUserByStudentNumber(username);
String roleId= String.valueOf(sysUserRoleMapper.selectRoleIdByUserId(sysUser.getUserId()));
if (("student".equals(loginBody.getRole()) && "2".equals(roleId)) || ("teacher".equals(loginBody.getRole()) && "100".equals(roleId)) || "admin".equals(loginBody.getUsername())) {
if (("student".equals(loginBody.getRole()) && "2".equals(roleId))
|| ("teacher".equals(loginBody.getRole()) && "100".equals(roleId)) || "admin".equals(loginBody.getUsername())) {
AjaxResult ajax = AjaxResult.success();
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

198
ruoyi-admin/src/main/resources/application-druid.yml
Unescape Escape View File

@ -1,111 +1,20 @@
### 数据源配置
#spring:
# data:
# mongodb:
# database: makesoft
# host: 120.78.220.29
# port: 27017
# username: makesoft
# password: makesoft
#
# datasource:
# type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.cj.jdbc.Driver
# druid:
# # 主库数据源
# master:
# url: jdbc:mysql://120.78.220.29:3306/makesoft?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Biemo123
# # 从库数据源
# slave:
# # 从数据源开关/默认关闭
# enabled: false
# url:
# username:
# password:
# # 初始连接数
# initialSize: 5
# # 最小连接池数量
# minIdle: 10
# # 最大连接池数量
# maxActive: 20
# # 配置获取连接等待超时的时间
# maxWait: 120000
# # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
# timeBetweenEvictionRunsMillis: 120000
# # 配置一个连接在池中最小生存的时间，单位是毫秒
# minEvictableIdleTimeMillis: 600000
# # 配置一个连接在池中最大生存的时间，单位是毫秒
# maxEvictableIdleTimeMillis: 1800000
# # 配置检测连接是否有效
# validationQuery: SELECT 1 FROM DUAL
# testWhileIdle: true
# testOnBorrow: false
# testOnReturn: false
# webStatFilter:
# enabled: true
# statViewServlet:
# enabled: true
# # 设置白名单，不填则允许所有访问
# allow:
# url-pattern: /druid/*
# # 控制台管理用户名和密码
# login-username: ruoyi
# login-password: 123456
# filter:
# stat:
# enabled: true
# # 慢SQL记录
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: true
# wall:
# config:
# multi-statement-allow: true
#
#elasticsearch:
# schema: http
# address: 120.78.220.29:9200
# connectTimeout: 10000
# socketTimeout: 10000
# connectionRequestTimeout: 10000
# maxConnectNum: 100
# maxConnectPerRoute: 100
#
#sso:
# apiUrl: http://test.vsp.cqooc.com/open/api/v2/oauth/token?appId={APPID}&signature={SIGNATURE}&ticket={TICKET}
# password: admin123
# secretKey: 4ce36bf549d64d44b6cbc48e926abb05
# appId: cb00a3e26b963b25e28cae6e046f1190
#report:
# uploadUrl: http://test.vsp.cqooc.com/open/api/v2/upload/data
# refreshUrl: http://test.vsp.cqooc.com/open/api/v2/oauth/refresh?token=TOKEN&appid=APPID&signature=SIGNATURE
# validateUrl: http://vsp.cqooc.com/open/api/v2/oauth/validate?username=USERNAME&password=PASSWORD&nonce=NONCE&cnonce=CNONCE&appid=APPID&signature=SIGNATURE
# uploadAttachmentUrl: http://test.vsp.cqooc.com/open/api/v2/upload/attachment?access_token=ACCESS_TOKEN&appid=APPID&originId=ORIGINID&filename=FILENAME&title=TITLE&remarks=REMARKS
# getReportListUrl: http://test.vsp.cqooc.com/open/api/v2/query/data?appId=APPID&accessToken=ACCESS_TOKEN&signature=SIGNATURE
#################重庆二师配置
项目相关配置
数据源配置
## 数据源配置
spring:
data:
mongodb:
database: makesoft
host: 10.3.116.99
host: 120.78.220.29
port: 27017
username: makesoft
password: makesoft
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://10.3.116.99:3306/makesoft?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://120.78.220.29:3306/makesoft?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Biemo123
# 从库数据源
@ -116,11 +25,11 @@ spring:
username:
password:
# 初始连接数
initialSize: 10
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 100
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 120000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
@ -157,14 +66,12 @@ spring:
elasticsearch:
schema: http
address: 10.3.116.99:9200
address: 120.78.220.29:9200
connectTimeout: 10000
socketTimeout: 10000
connectionRequestTimeout: 10000
maxConnectNum: 100
maxConnectPerRoute: 100
username: elastic
password: es@test001
sso:
apiUrl: http://test.vsp.cqooc.com/open/api/v2/oauth/token?appId={APPID}&signature={SIGNATURE}&ticket={TICKET}
@ -177,3 +84,96 @@ report:
validateUrl: http://vsp.cqooc.com/open/api/v2/oauth/validate?username=USERNAME&password=PASSWORD&nonce=NONCE&cnonce=CNONCE&appid=APPID&signature=SIGNATURE
uploadAttachmentUrl: http://test.vsp.cqooc.com/open/api/v2/upload/attachment?access_token=ACCESS_TOKEN&appid=APPID&originId=ORIGINID&filename=FILENAME&title=TITLE&remarks=REMARKS
getReportListUrl: http://test.vsp.cqooc.com/open/api/v2/query/data?appId=APPID&accessToken=ACCESS_TOKEN&signature=SIGNATURE
#################重庆二师配置
#项目相关配置
#数据源配置
#spring:
# data:
# mongodb:
# database: makesoft
# host: 10.3.116.99
# port: 27017
# username: makesoft
# password: makesoft
#
#
# datasource:
# type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.cj.jdbc.Driver
# druid:
# # 主库数据源
# master:
# url: jdbc:mysql://10.3.116.99:3306/makesoft?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Biemo123
# # 从库数据源
# slave:
# # 从数据源开关/默认关闭
# enabled: false
# url:
# username:
# password:
# # 初始连接数
# initialSize: 10
# # 最小连接池数量
# minIdle: 10
# # 最大连接池数量
# maxActive: 100
# # 配置获取连接等待超时的时间
# maxWait: 120000
# # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
# timeBetweenEvictionRunsMillis: 120000
# # 配置一个连接在池中最小生存的时间，单位是毫秒
# minEvictableIdleTimeMillis: 600000
# # 配置一个连接在池中最大生存的时间，单位是毫秒
# maxEvictableIdleTimeMillis: 1800000
# # 配置检测连接是否有效
# validationQuery: SELECT 1 FROM DUAL
# testWhileIdle: true
# testOnBorrow: false
# testOnReturn: false
# webStatFilter:
# enabled: true
# statViewServlet:
# enabled: true
# # 设置白名单，不填则允许所有访问
# allow:
# url-pattern: /druid/*
# # 控制台管理用户名和密码
# login-username: ruoyi
# login-password: 123456
# filter:
# stat:
# enabled: true
# # 慢SQL记录
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: true
# wall:
# config:
# multi-statement-allow: true
#
#elasticsearch:
# schema: http
# address: 10.3.116.99:9200
# connectTimeout: 10000
# socketTimeout: 10000
# connectionRequestTimeout: 10000
# maxConnectNum: 100
# maxConnectPerRoute: 100
# username: elastic
# password: es@test001
#
#sso:
# apiUrl: http://test.vsp.cqooc.com/open/api/v2/oauth/token?appId={APPID}&signature={SIGNATURE}&ticket={TICKET}
# password: admin123
# secretKey: 4ce36bf549d64d44b6cbc48e926abb05
# appId: cb00a3e26b963b25e28cae6e046f1190
#report:
# uploadUrl: http://test.vsp.cqooc.com/open/api/v2/upload/data
# refreshUrl: http://test.vsp.cqooc.com/open/api/v2/oauth/refresh?token=TOKEN&appid=APPID&signature=SIGNATURE
# validateUrl: http://vsp.cqooc.com/open/api/v2/oauth/validate?username=USERNAME&password=PASSWORD&nonce=NONCE&cnonce=CNONCE&appid=APPID&signature=SIGNATURE
# uploadAttachmentUrl: http://test.vsp.cqooc.com/open/api/v2/upload/attachment?access_token=ACCESS_TOKEN&appid=APPID&originId=ORIGINID&filename=FILENAME&title=TITLE&remarks=REMARKS
# getReportListUrl: http://test.vsp.cqooc.com/open/api/v2/query/data?appId=APPID&accessToken=ACCESS_TOKEN&signature=SIGNATURE

6
ruoyi-admin/src/main/resources/application.yml
Unescape Escape View File

@ -62,10 +62,10 @@ spring:
# redis 配置
redis:
# 地址
# host: 120.78.220.29
# port: 6379
host: 10.3.116.99
host: 120.78.220.29
port: 6379
# host: 10.3.116.99
# port: 6379
# 连接超时时间
timeout: 10s

5
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
Unescape Escape View File

@ -93,6 +93,11 @@ public class SecurityUtils
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
return passwordEncoder.encode(password);
}
public static void main(String[] args) {
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
System.out.println(passwordEncoder.encode("cqdesfxy027E"));
}
//$2a$10$u.vJlcN4vQlY5m9Tnc3jFOGeg9nrDkSZ34eXoHkt/Vw7hs3HvRMnO
/**
* 判断密码是否相同

1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
Unescape Escape View File

@ -142,6 +142,7 @@ public interface SysUserMapper
List<SysUser> selectClassStuNumberNameByClass(/*@Param("stuClass") String stuClass,*/@Param("deptId")Long deptId);
List<SysUser> selectClassStuNumberNameByClassAll();
SysUser selectUserByStudentNumber(@Param("username")String username);
List<SysUser> selectClassStuNumberNameByAllClass(@Param("stuClass") String stuClass);

5
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
Unescape Escape View File

@ -261,6 +261,11 @@
where u.user_id = #{userId}
</select>
<select id="selectUserByStudentNumber" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.studentnumber = #{username}
</select>
<select id="checkUserNameUnique" parameterType="String" resultType="int">
select count(1)
from sys_user

Write Preview
Loading…
Cancel
Save