productDev/dmvisit.git

			@@ -155,9 +155,20 @@
			throw e;
			}
			}
			try {
			LoginUserInfo user = dealLoginByPwdNewBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid(),request);
			systemLoginLogService.create(loginLog);
			return user;
			}catch (BusinessException e){
			loginLog.setSuccess(Boolean.FALSE);
			systemLoginLogService.create(loginLog);
			throw e;

			}catch (Exception e){
			loginLog.setSuccess(Boolean.FALSE);
			systemLoginLogService.create(loginLog);
			throw e;
			}
			}
			@Override
			public LoginUserInfo loginH5 (LoginH5DTO dto, ServerHttpRequest request) {
			@@ -191,6 +202,7 @@
			loginLog.setPlatform(Utils.User_Client.getPlatform(request));
			loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
			loginLog.setOsInfo(Utils.User_Client.getOS(request));
			loginLog.setSuccess(Boolean.TRUE);
			}
			loginLog.setServerIp(Utils.Server.getIP());
			return loginLog;
			@@ -200,9 +212,20 @@
			public LoginUserInfo loginH5ByPhone(LoginPhoneDTO dto, ServerHttpRequest request) {
			isCaptcheValide(dto.getPhone(),dto.getCode());//检查验证码
			SystemLoginLog loginLog = getInitLoginlog(dto.getPhone(),request);
			try{
			LoginUserInfo userInfo = dealLoginByPwdNewBiz(null,null,dto.getPhone(),dto.getOpenid(), request );
			systemLoginLogService.create(loginLog);
			return userInfo;
			}catch (BusinessException e){
			loginLog.setSuccess(Boolean.FALSE);
			systemLoginLogService.create(loginLog);
			throw e;

			}catch (Exception e){
			loginLog.setSuccess(Boolean.FALSE);
			systemLoginLogService.create(loginLog);
			throw e;
			}
			}
			private LoginUserInfo dealLoginByPwdNewBiz(String username,String pwd, String phone, String openid, ServerHttpRequest request) {
			// 根据用户名查询用户对象