修改bug

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

@@ -93,8 +93,11 @@ public class JwtUtil {
 	public static String getUsername(String token) {
 		try {
 			DecodedJWT jwt = JWT.decode(token);
+			System.out.println("jwt222-----------"+jwt.getClaim("username").asString());
 			return jwt.getClaim("username").asString();
 		} catch (JWTDecodeException e) {
+			System.out.println("getUsername-----------null");
+			e.printStackTrace();
 			return null;
 		}
 	}
@@ -123,7 +126,11 @@ public class JwtUtil {
 	 */
 	public static String getUserNameByToken(HttpServletRequest request) throws JeecgBootException {
 		String accessToken = request.getHeader("X-Access-Token");
-		String username = getUsername(accessToken);
+//		String username = getUsername(accessToken);
+
+		DecodedJWT jwt = JWT.decode(accessToken);
+		String username = jwt.getClaim("username").asString();
+		System.out.println("getUserNameByToken-----------"+username);
 		if (oConvertUtils.isEmpty(username)) {
 			throw new JeecgBootException("未获取到用户");
 		}

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java

@@ -37,8 +37,10 @@ import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
 import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
 import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
 import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
+import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
 import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
 import org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoNum;
+import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
 import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -76,7 +78,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKetangbiaoService> {
 	@Autowired
 	private IKcKetangbiaoService kcKetangbiaoService;
-
+	@Autowired
+	private IKcKechengbiaoService kcKechengbiaoService;
 	@Autowired
 	private ChangeTingKeTongJi changeTingKeTongJi;
 
@@ -410,6 +413,20 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 		if(kcKetangbiao==null) {
 			return Result.error("未找到对应数据");
 		}
+
+		//查询是否思政课程
+		try {
+			QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();
+			kcKechengbiaoQueryWrapper.eq("rwbh",kcKetangbiao.getRwbh());
+			kcKechengbiaoQueryWrapper.last("limit 1");
+			KcKechengbiao kechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper);
+			kcKetangbiao.setSzkc(kechengbiao.getSzkc());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+
+
 		//查询对应教室数据
 		QueryWrapper<KcJiaoshirongliang> jiaoshirongliangQw = new QueryWrapper<>();
 		jiaoshirongliangQw.eq("jsbh",kcKetangbiao.getJsbh());

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

@@ -184,8 +184,11 @@ public class LoginController {
 	@GetMapping("/user/getUserInfo")
 	public Result<JSONObject> getUserInfo(HttpServletRequest request){
 		Result<JSONObject> result = new Result<JSONObject>();
+		System.out.println("getUserInfo------------------"+request.getHeader("X-Access-Token"));
 		String  username = JwtUtil.getUserNameByToken(request);
+		System.out.println("username------------------"+username);
 		if(oConvertUtils.isNotEmpty(username)) {
+			System.out.println("isnotempty-----------------------"+username);
 			// 根据用户名查询用户信息
 			SysUser sysUser = sysUserService.getUserByName(username);
 			JSONObject obj=new JSONObject();
@@ -204,6 +207,7 @@ public class LoginController {
 			//update-begin---author:liusq ---date:2022-06-29  for：接口返回值修改，同步修改这里的判断逻辑-----------
 			//update-end---author:scott ---date::2022-06-20  for：vue3前端，支持自定义首页--------------
 
+			System.out.println("111111111-----------------------");
 			obj.put("userInfo",sysUser);
 			obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
 
@@ -213,6 +217,7 @@ public class LoginController {
 			List<SysUserRole> sysUserRoleList = sysUserRoleService.list(sysUserRoleQw);
 			Set<String> roleIdSet = sysUserRoleList.stream().map(x -> x.getRoleId()).collect(Collectors.toSet());
 
+			System.out.println("22222222222-----------------------");
 			if(roleIdSet != null && !roleIdSet.isEmpty()){
 				QueryWrapper<SysRole> sysRoleQw = new QueryWrapper<>();
 				sysRoleQw.in("id",roleIdSet);
@@ -220,9 +225,12 @@ public class LoginController {
 				obj.put("roleList",sysRoleList);
 			}
 
+			System.out.println("3333333333333-----------------------"+obj.toJSONString());
 			result.setResult(obj);
 			result.success("");
 		}
+		System.out.println("result1-----------------------"+result.getCode());
+		System.out.println("result2-----------------------"+result.getMessage());
 		return result;
 
 	}

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

@@ -542,7 +542,7 @@ public class SysUserController {
                     SysUser sysUserExcel = listSysUsers.get(i);
                     if (StringUtils.isBlank(sysUserExcel.getPassword())) {
                         // 密码默认为 “123456”
-                        sysUserExcel.setPassword("123456");
+                        sysUserExcel.setPassword("kczx@^1!");
                     }
                     // 密码加密加盐
                     String salt = oConvertUtils.randomGen(8);

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

@@ -88,7 +88,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMappe
         //设置初始密码
         String salt = oConvertUtils.randomGen(8);
         user.setSalt(salt);
-        String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "123456", salt);
+        String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "kczx@^1!", salt);
         user.setPassword(passwordEncode);
         user.setRealname(account.getRealname());
         user.setAvatar(account.getAvatar());

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

@@ -525,6 +525,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	 */
 	@Override
 	public Result<?> checkUserIsEffective(SysUser sysUser) {
+		System.out.println("------------------11--------------------------sysUser:"+sysUser);
 		Result<?> result = new Result<Object>();
 		//情况1：根据用户信息查询，该用户不存在
 		if (sysUser == null) {
@@ -547,6 +548,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			result.error500("该用户已冻结");
 			return result;
 		}
+		System.out.println("------------------11--------------------------checkUserIsEffective");
 
 //
 //		baseCommonService.addLog("用户名: " + sysUser.getUsername() + ",登录成功！", CommonConstant.LOG_TYPE_1, null);
@@ -564,16 +566,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		final String username = XmlUtils.getTextForElement(res, "user");
 		final String realname = XmlUtils.getTextForElement(res, "cn");
 		final String containerId = XmlUtils.getTextForElement(res, "containerId");
+
+		System.out.println("------------------1--------------------------"+containerId);
 		String roles = "";
 		int userIdentity = 1;
 		//判断是否为教师
 		if(StringUtils.indexOf(containerId,"ou=jzg") != -1){
+			System.out.println("------------------2--------------------------"+containerId);
 			roles = "teacher";//教师角色
 			userIdentity = 2;//允许进入后台
 		}else if(StringUtils.indexOf(containerId,"ou=bzks") != -1){
+			System.out.println("------------------3--------------------------"+containerId);
 			roles = "student";//学生角色
 			userIdentity = 1;//不允许进入后台
 		}else{
+			System.out.println("------------------4--------------------------"+containerId);
 			return checkUserIsEffective(sysUser);
 		}
 
@@ -582,17 +589,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		jwmsQw.last("limit 1");
 		SysJwms jwms = jwmsService.getOne(jwmsQw);
 		if(jwms != null){
+			System.out.println("------------------5--------------------------jwms");
 			roles = "jwms";//教务秘书角色
 			userIdentity = 2;//允许进入后台
 		}
+		System.out.println("------------------6--------------------------"+userIdentity);
 
 		QueryWrapper<SysRole> sysRoleQw = new QueryWrapper<>();
+		System.out.println("------------------7--------------------------"+roles);
 		sysRoleQw.in("role_code",roles);
 		sysRoleQw.last("limit 1");
 		SysRole sysRole = sysRoleService.getOne(sysRoleQw);
 		if(sysRole != null){
+			System.out.println("------------------8--------------------------"+roles);
 			roles = sysRole.getId();
 		}else{
+			System.out.println("------------------9--------------------------"+roles);
 			log.error("创建用户出现错误，未找到["+roles+"]角色，请添加");
 			throw new JeecgBootException("创建用户出现错误，未找到["+roles+"]角色，请添加");
 		}
@@ -600,6 +612,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		StringUtils.split(containerId,",");
 		//情况1：根据用户信息查询，该用户不存在
 		if (sysUser == null) {
+			System.out.println("------------------10--------------------------user null");
 			//创建用户
 			SysUser user = new SysUser();
 			user.setUsername(username);
@@ -607,7 +620,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			user.setActivitiSync(1);
 			String salt = oConvertUtils.randomGen(8);
 			user.setSalt(salt);
-			String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "123456", salt);
+			String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "kczx@^1!", salt);
 			user.setPassword(passwordEncode);
 			user.setPhone(username);
 			user.setUserIdentity(userIdentity);

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

@@ -586,7 +586,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
         // 通过 username 来关联
         sysUser.setUsername(dtUser.getUserid());
         // 密码默认为 “123456”，随机加盐
-        String password = "123456", salt = oConvertUtils.randomGen(8);
+        String password = "kczx@^1!", salt = oConvertUtils.randomGen(8);
         String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
         sysUser.setSalt(salt);
         sysUser.setPassword(passwordEncode);

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

@@ -624,7 +624,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
         // 通过 username 来关联
         sysUser.setUsername(user.getUserid());
         // 密码默认为 “123456”，随机加盐
-        String password = "123456", salt = oConvertUtils.randomGen(8);
+        String password = "kczx@^1!", salt = oConvertUtils.randomGen(8);
         String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
         sysUser.setSalt(salt);
         sysUser.setPassword(passwordEncode);

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

@@ -144,7 +144,7 @@ spring:
           driver-class-name: oracle.jdbc.OracleDriver
   #redis 配置
   redis:
-    database: 0
+    database: 1
     host: 127.0.0.1
     port: 6379
     password: ''