java110
2021-01-27 2657bfd82966e503192bb776c21bc0f30b0963be
优化代码
3个文件已修改
32 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/user/UserDto.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/user/UserLoginListener.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/login/impl/OwnerAppLoginSMOImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/user/UserDto.java
@@ -65,6 +65,8 @@
    private String belongCommunityId;
    private boolean loginByPhone;
    public String getUserId() {
@@ -266,4 +268,12 @@
    public void setToken(String token) {
        this.token = token;
    }
    public boolean isLoginByPhone() {
        return loginByPhone;
    }
    public void setLoginByPhone(boolean loginByPhone) {
        this.loginByPhone = loginByPhone;
    }
}
service-api/src/main/java/com/java110/api/listener/user/UserLoginListener.java
@@ -6,10 +6,11 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.factory.AuthenticationFactory;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.userAttr.UserAttrPo;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
@@ -80,7 +81,17 @@
            } else {
                userDto.setUserName(reqJson.getString("userName"));
            }
            userDto.setPassword(AuthenticationFactory.passwdMd5(reqJson.getString("password")));
            //验证码登录
            if (reqJson.containsKey("loginByPhone") && reqJson.getBoolean("loginByPhone")) {
                String code = CommonCache.getValue(reqJson.getString("userName") + "_validateTel");
                if (!reqJson.getString("password").equals(code)) {
                    throw new SMOException("验证码错误");
                }
            } else {
                userDto.setPassword(AuthenticationFactory.passwdMd5(reqJson.getString("password")));
            }
            errorInfo = "用户名或密码错误";
        } else {
            userDto.setKey(reqJson.getString("key"));
@@ -91,7 +102,7 @@
        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
        if (userDtos == null || userDtos.size() < 1) {
            throw new SMOException("登录失败," + errorInfo);
            throw new SMOException(errorInfo);
        }
        //表名登录成功
service-front/src/main/java/com/java110/front/smo/login/impl/OwnerAppLoginSMOImpl.java
@@ -67,11 +67,16 @@
        ResponseEntity<String> responseEntity;
        JSONObject loginInfo = JSONObject.parseObject(pd.getReqData());
        boolean loginByPhone = false;
        if (paramIn.containsKey("loginByPhone")) {
            loginByPhone = paramIn.getBoolean("loginByPhone");
        }
        loginInfo.put("passwd", AuthenticationFactory.passwdMd5(loginInfo.getString("password")));
        UserDto userDto = new UserDto();
        userDto.setUserName(loginInfo.getString("username"));
        userDto.setPassword(loginInfo.getString("password"));
        userDto.setLoginByPhone(loginByPhone);
        userDto = super.postForApi(pd, userDto, ServiceCodeConstant.SERVICE_CODE_USER_LOGIN, UserDto.class);
        if (userDto == null) {