1. 修改密码新增运控系统配置
							parent
							
								
									1fb74cc907
								
							
						
					
					
						commit
						c6805509ae
					
				| 
						 | 
					@ -157,7 +157,7 @@ public class TrxServiceImpl implements TrxService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // 处理ukey登录用户
 | 
					            // 处理ukey登录用户
 | 
				
			||||||
            log.info("开始uKey登录用户入库, userId:" + userId);
 | 
					            log.info("开始uKey登录用户入库, userId:" + userId);
 | 
				
			||||||
            saveUserByTrx(userId,"");
 | 
					            saveUserByTrx(userId, "");
 | 
				
			||||||
            log.info("uKey登录用户入库结束");
 | 
					            log.info("uKey登录用户入库结束");
 | 
				
			||||||
            // 登录
 | 
					            // 登录
 | 
				
			||||||
            log.info("开始uKey登录用户登录云管平台");
 | 
					            log.info("开始uKey登录用户登录云管平台");
 | 
				
			||||||
| 
						 | 
					@ -206,13 +206,14 @@ public class TrxServiceImpl implements TrxService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // 处理ukey登录用户
 | 
					            // 处理ukey登录用户
 | 
				
			||||||
            log.info("开始软Key登录用户入库, userId:" + userId);
 | 
					            log.info("开始软Key登录用户入库, userId:" + userId);
 | 
				
			||||||
            saveUserByTrx(userId,trxAuthModel.getPassword());
 | 
					            saveUserByTrx(userId, trxAuthModel.getPassword());
 | 
				
			||||||
            log.info("软Key登录用户入库结束");
 | 
					            log.info("软Key登录用户入库结束");
 | 
				
			||||||
            // 登录
 | 
					            // 登录
 | 
				
			||||||
            log.info("开始软Key登录用户登录云管平台");
 | 
					            log.info("开始软Key登录用户登录云管平台");
 | 
				
			||||||
 | 
					            log.info("用户pass:" + trxAuthModel.getPassword());
 | 
				
			||||||
            User user = userRepository.getByUserId(userId);
 | 
					            User user = userRepository.getByUserId(userId);
 | 
				
			||||||
            Encryptor encryptor = new AESEncryptor();
 | 
					            Encryptor encryptor = new AESEncryptor();
 | 
				
			||||||
            String password = encryptor.encrypt(userId + "CMP", null);
 | 
					            String password = encryptor.encrypt(trxAuthModel.getPassword(), null);
 | 
				
			||||||
            login = userServiceImpl.login(user.getAccount(), password, null, null, true);
 | 
					            login = userServiceImpl.login(user.getAccount(), password, null, null, true);
 | 
				
			||||||
            login.getData().put("trxToken", trxToken);
 | 
					            login.getData().put("trxToken", trxToken);
 | 
				
			||||||
            log.info("软Key登录用户登录云管平台结束");
 | 
					            log.info("软Key登录用户登录云管平台结束");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue