yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2025-01-22 09:58:42 +08:00
parent c0bc0f4084
commit 432a22f0eb
7 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
View File

@ -26,7 +26,12 @@ public class IpUtils {
public static String getIpAddr(HttpServletRequest request) {
String ip = null;
try {
ip = request.getHeader("x-forwarded-for");
if (StringUtils.isEmpty(ip) || CommonConstant.UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
if (StringUtils.isEmpty(ip) || CommonConstant.UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("x-forwarded-for");
}
if (StringUtils.isEmpty(ip) || CommonConstant.UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java
View File

@ -360,11 +360,17 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
paramMap.put("TEAXM", kcKechengbiao.getSkjs());//教师姓名
paramMap.put("FXCJBH", zyInfo.getId());//分项成绩编号
paramMap.put("XNXQMC", kcKechengbiao.getXnxq());//学年学期
if(StringUtils.isNotBlank(zyInfo.getContent())){
zyInfo.setContent(zyInfo.getContent().replaceAll("'","‘"));
}
paramMap.put("ZYYQ", zyInfo.getContent());//作业要求
paramMap.put("CJSJ", DateUtils.formatDate(zyInfo.getCreateTime(), "yyyy-MM-dd"));//创建时间
paramMap.put("FXCJBL", zyInfo.getScore());//比例，成绩占比
paramMap.put("KCMC", kcKechengbiao.getKcmc());//课程名称
paramMap.put("KCRWDM", zyInfo.getRwbh());//开课任务编号
if(StringUtils.isNotBlank(zyInfo.getPfbz())){
zyInfo.setPfbz(zyInfo.getPfbz().replaceAll("'","‘"));
}
paramMap.put("PFBZ", zyInfo.getPfbz());//评分标准
paramMap.put("FXCJDM", zyInfo.getId());//主键
// paramMap.put("OPERATE_STATUS","i");//操作状态

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/blLoginLog/controller/BlLoginLogController.java
View File

@ -183,7 +183,7 @@ public class BlLoginLogController extends JeecgController<BlLoginLog, IBlLoginLo
@PostMapping(value = "/addLog")
public Result<String> addLog(@RequestBody SysUser sysUser) {
blLoginLogService.addLog("用户名: " + sysUser.getUsername() + ",登录成功！", CommonConstant.LOG_TYPE_1, null,null);
blLoginLogService.addLog("33用户名: " + sysUser.getUsername() + ",登录成功！", CommonConstant.LOG_TYPE_1, null,null);
return Result.OK("添加成功！");
}
}

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
View File

@ -171,7 +171,7 @@ public class LoginController {
userInfo(sysUser, result);
// step.5 登录成功删除验证码
redisUtil.del(CommonConstant.LOGIN_FAIL + username);
// redisUtil.del(CommonConstant.LOGIN_FAIL + username);
// step.6 记录用户登录日志
LoginUser loginUser = new LoginUser();

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
View File

@ -553,7 +553,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
//
// baseCommonService.addLog("用户名: " + sysUser.getUsername() + ",登录成功！", CommonConstant.LOG_TYPE_1, null);
try {
blLoginLogService.addLog("用户名: " + sysUser.getRealname() + ",登录成功！", CommonConstant.LOG_TYPE_1, null,sysUser);
blLoginLogService.addLog("44用户名: " + sysUser.getRealname() + ",登录成功！", CommonConstant.LOG_TYPE_1, null,sysUser);
}catch (Exception e) {
System.out.println("Error---------->: " + sysUser.getUsername());
}

6
jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
View File

@ -3,9 +3,9 @@ server:
tomcat:
max-swallow-size: -1
error:
include-exception: true
include-stacktrace: ALWAYS
include-message: ALWAYS
include-exception: false
include-stacktrace: NEVER
include-message: NEVER
servlet:
context-path: /jeecg-boot
compression:

6
jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
View File

@ -3,9 +3,9 @@ server:
tomcat:
max-swallow-size: -1
error:
include-exception: true
include-stacktrace: ALWAYS
include-message: ALWAYS
include-exception: false
include-stacktrace: NEVER
include-message: NEVER
servlet:
context-path: /jeecg-boot
compression: