修改bug

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

@@ -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");
             }

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

@@ -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");//操作状态

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

@@ -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("添加成功！");
 	 }
 }

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

@@ -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();

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

@@ -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());
 		}

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

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

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

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