From b2a04d238f34b135ead120045081f2e6d59a5ab2 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Fri, 10 Jan 2020 12:31:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1=E7=99=BB?= =?UTF-8?q?=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/game/bean/dto/ScreenDto.java | 2 +- .../com/ccsens/mt/service/ScoreService.java | 6 +- .../com/ccsens/tall/bean/dto/UserDto.java | 11 +- .../com/ccsens/tall/bean/po/SysDomain.java | 11 + .../ccsens/tall/bean/po/SysDomainExample.java | 70 +++ .../com/ccsens/tall/bean/vo/DomainVo.java | 2 + .../com/ccsens/tall/service/IUserService.java | 8 +- .../ccsens/tall/service/SysDomainService.java | 1 + .../com/ccsens/tall/service/UserService.java | 173 +++++--- .../com/ccsens/tall/web/UserController.java | 39 +- .../resources/mapper_raw/SysDomainMapper.xml | 33 +- .../main/java/com/ccsens/util/CodeEnum.java | 4 +- .../java/com/ccsens/util/WebConstant.java | 8 +- .../ccsens/util/bean/wx/dto/WxGzhAction.java | 151 +++++++ .../ccsens/util/bean/wx/po/WxAccessToken.java | 18 + .../ccsens/util/bean/wx/po/WxBaseEntity.java | 12 + .../ccsens/util/bean/wx/po/WxGzhAuthType.java | 23 + .../com/ccsens/util/bean/wx/po/WxGzhMenu.java | 97 +++++ .../ccsens/util/bean/wx/po/WxGzhMsgEvent.java | 53 +++ .../ccsens/util/bean/wx/po/WxGzhMsgType.java | 34 ++ .../util/bean/wx/po/WxOauth2AccessToken.java | 26 ++ .../util/bean/wx/po/WxOauth2UserInfo.java | 42 ++ .../ccsens/util/bean/wx/po/WxOperation.java | 21 + .../ccsens/util/exception/BaseException.java | 6 + .../util/exception/BusinessException.java | 16 + .../ccsens/util/exception/WxException.java | 19 + .../java/com/ccsens/util/wx/WxGzhUtil.java | 273 ++++++++++++ .../java/com/ccsens/util/wx/WxXcxUtil.java | 406 ++++++++++++++++++ 28 files changed, 1482 insertions(+), 83 deletions(-) create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/dto/WxGzhAction.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxAccessToken.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxBaseEntity.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxGzhAuthType.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxGzhMenu.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxGzhMsgEvent.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxGzhMsgType.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxOauth2AccessToken.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxOauth2UserInfo.java create mode 100644 util/src/main/java/com/ccsens/util/bean/wx/po/WxOperation.java create mode 100644 util/src/main/java/com/ccsens/util/exception/BusinessException.java create mode 100644 util/src/main/java/com/ccsens/util/exception/WxException.java create mode 100644 util/src/main/java/com/ccsens/util/wx/WxGzhUtil.java create mode 100644 util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java diff --git a/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java b/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java index 8d0cc451..a6b856b2 100644 --- a/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java +++ b/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java @@ -13,7 +13,7 @@ public class ScreenDto { public static class MemberGame{ @ApiModelProperty("项目id") private Long projectId; - @ApiModelProperty("要创建的小游戏的类型 例如：SQ 代表数钱小游戏") + @ApiModelProperty("要创建的小游戏的类型 例如：SQ：数钱 SP：赛跑") private String gameType; } diff --git a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java index ef433720..c80d165a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java @@ -270,12 +270,12 @@ public class ScoreService implements IScoreService{ List judgeList = judgeDao.selectByExample(judgeExample); if (CollectionUtil.isNotEmpty(judgeList)) { for (MtJudge judge : judgeList) { - BigDecimal scoreSUM = scoreDao.sumScoreByJudgeId(judge.getId(), taskId); - if(ObjectUtil.isNotNull(scoreSUM)) { + BigDecimal scoreSum = scoreDao.sumScoreByJudgeId(judge.getId(), taskId); + if(ObjectUtil.isNotNull(scoreSum)) { judgeScore = new ScoreVo.JudgeScore(); judgeScore.setJudgeId(judge.getId()); judgeScore.setJudgeName(judge.getNickname()); - judgeScore.setScore(scoreSUM); + judgeScore.setScore(scoreSum); judgeScoreList.add(judgeScore); } diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java index 3249ac5b..996bfbba 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java @@ -96,5 +96,14 @@ public class UserDto { private byte source = WebConstant.Regist.SOURCE; } - + @Data + @ApiModel + public static class WxPhone{ + @ApiModelProperty("手机号") + private String phone; + @ApiModelProperty("手机验证码") + private String smsCode; + @ApiModelProperty("微信code") + private String wxCode; + } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java index 55678592..9f904717 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java @@ -14,6 +14,8 @@ public class SysDomain implements Serializable { private String systemName; + private String backdropUrl; + private Byte showCalendar; private Long showProjectId; @@ -70,6 +72,14 @@ public class SysDomain implements Serializable { this.systemName = systemName == null ? null : systemName.trim(); } + public String getBackdropUrl() { + return backdropUrl; + } + + public void setBackdropUrl(String backdropUrl) { + this.backdropUrl = backdropUrl == null ? null : backdropUrl.trim(); + } + public Byte getShowCalendar() { return showCalendar; } @@ -137,6 +147,7 @@ public class SysDomain implements Serializable { sb.append(", logo=").append(logo); sb.append(", companyName=").append(companyName); sb.append(", systemName=").append(systemName); + sb.append(", backdropUrl=").append(backdropUrl); sb.append(", showCalendar=").append(showCalendar); sb.append(", showProjectId=").append(showProjectId); sb.append(", caption=").append(caption); diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java index 9e4cacaa..6cadfa21 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java @@ -445,6 +445,76 @@ public class SysDomainExample { return (Criteria) this; } + public Criteria andBackdropUrlIsNull() { + addCriterion("backdrop_url is null"); + return (Criteria) this; + } + + public Criteria andBackdropUrlIsNotNull() { + addCriterion("backdrop_url is not null"); + return (Criteria) this; + } + + public Criteria andBackdropUrlEqualTo(String value) { + addCriterion("backdrop_url =", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlNotEqualTo(String value) { + addCriterion("backdrop_url <>", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlGreaterThan(String value) { + addCriterion("backdrop_url >", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlGreaterThanOrEqualTo(String value) { + addCriterion("backdrop_url >=", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlLessThan(String value) { + addCriterion("backdrop_url <", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlLessThanOrEqualTo(String value) { + addCriterion("backdrop_url <=", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlLike(String value) { + addCriterion("backdrop_url like", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlNotLike(String value) { + addCriterion("backdrop_url not like", value, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlIn(List values) { + addCriterion("backdrop_url in", values, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlNotIn(List values) { + addCriterion("backdrop_url not in", values, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlBetween(String value1, String value2) { + addCriterion("backdrop_url between", value1, value2, "backdropUrl"); + return (Criteria) this; + } + + public Criteria andBackdropUrlNotBetween(String value1, String value2) { + addCriterion("backdrop_url not between", value1, value2, "backdropUrl"); + return (Criteria) this; + } + public Criteria andShowCalendarIsNull() { addCriterion("show_calendar is null"); return (Criteria) this; diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java index b2645d6c..2f35101b 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java @@ -22,6 +22,8 @@ public class DomainVo { private String companyName; @ApiModelProperty("系统名") private String systemName; + @ApiModelProperty("系统名") + private String backdropUrl; @ApiModelProperty("标题") private String caption; @ApiModelProperty("栏外标题") diff --git a/tall/src/main/java/com/ccsens/tall/service/IUserService.java b/tall/src/main/java/com/ccsens/tall/service/IUserService.java index c1d71bfe..b0f9ed79 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IUserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IUserService.java @@ -26,7 +26,7 @@ public interface IUserService { UserVo.UserSign registerUser(UserDto.UserSignup userSignup)throws Exception; - String bindingPhone(Long currentUserId, String phone, String code)throws Exception; + String bindingPhone(Long currentUserId,UserDto.WxPhone wxPhone)throws Exception; String getPhone(Long userId); @@ -34,6 +34,8 @@ public interface IUserService { Boolean findAccount(String account); + Boolean findPhone(String phone); + UserVo.UserSign saveAuth(UserDto.UserSignup userSignup); void updateAccount(UserDto.Account account); @@ -46,8 +48,6 @@ public interface IUserService { List selectUserIdByRoleId(Long roleId)throws Exception; - //访问用户管理微服务========================================================================== -// UserVo.TokenBean userManageSignin(UserDto.UserSginin dto)throws Exception; //默认注册 /** @@ -58,4 +58,6 @@ public interface IUserService { *@date: 2019/10/29 14:43 */ long defaultRegisterUser(com.ccsens.cloudutil.bean.tall.dto.UserDto.DefaultUserSingup signup); + + } diff --git a/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java b/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java index 4a32779d..2e027abd 100644 --- a/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java +++ b/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java @@ -40,6 +40,7 @@ public class SysDomainService implements ISysDomainService{ domainInfo.setLogo(""); domainInfo.setCompanyName("传控电子科技有限公司"); domainInfo.setSystemName("欢迎登录时物链条"); + domainInfo.setBackdropUrl(""); domainInfo.setCaption("TM"); domainInfo.setHeadline("TALL"); domainInfo.setShowCalender(1); diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index 390431b9..2734166b 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -3,6 +3,7 @@ package com.ccsens.tall.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.tall.bean.dto.UserDto; import com.ccsens.tall.bean.po.*; @@ -13,7 +14,9 @@ import com.ccsens.tall.persist.dao.ProMemberRoleDao; import com.ccsens.tall.persist.dao.SysAuthDao; import com.ccsens.tall.persist.dao.SysUserDao; import com.ccsens.util.*; +import com.ccsens.util.bean.wx.po.WxOauth2UserInfo; import com.ccsens.util.exception.BaseException; +import com.ccsens.util.wx.WxGzhUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +29,7 @@ import java.util.Map; @Slf4j @Service -@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class UserService implements IUserService { @Autowired private SysUserDao userDao; @@ -63,9 +66,7 @@ public class UserService implements IUserService { case Wxmp: return wxmplogin(identifier); case OAUTH2_Wx: - //微信登录 - //Fix Me. - break; + return wxLogin(identifier); case OAUTH2_WeiBo: //Fix Me. break; @@ -75,10 +76,63 @@ public class UserService implements IUserService { return emailLogin(identifier, credential); case Account: return accountLogin(identifier, credential); + default: + break; } return null; } + /** + * 微信登陆 + * @param code + * @return + * @throws Exception + */ + private UserVo.UserSign wxLogin(String code) throws Exception { + UserVo.UserSign userSignVo = null; + //0.获取微信信息openId和unionId + String openid = null; + String unionId = null; + WxOauth2UserInfo wxOauth2UserInfo = WxGzhUtil.getOauth2UserInfo(code); + if (ObjectUtil.isNotNull(wxOauth2UserInfo)) { + openid = wxOauth2UserInfo.getOpenId(); + unionId = wxOauth2UserInfo.getUnionId(); + } + log.info("openId,{}"); + + //1.查找对应账户,不存在则注册 + List authList = null; + SysAuth theAuth = null; + SysAuthExample authExample = new SysAuthExample(); + authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value) + .andIdentifierEqualTo(openid).andCredentialEqualTo(unionId); + authList = authDao.selectByExample(authExample); + if (CollectionUtil.isNotEmpty(authList)) { + theAuth = authList.get(0); + } else { +// throw new BaseException(CodeEnum.NOT_BINDING); + //1.添加user + SysUser user = new SysUser(); + user.setId(snowflake.nextId()); + userDao.insertSelective(user); + + //2.添加auth + SysAuth auth = new SysAuth(); + auth.setId(snowflake.nextId()); + auth.setUserId(user.getId()); + auth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value); + auth.setIdentifier(openid); + auth.setCredential(unionId); + authDao.insertSelective(auth); + } + + //2.返回 + userSignVo = new UserVo.UserSign(); + userSignVo.setUserId(theAuth.getUserId()); + userSignVo.setAuthId(theAuth.getId()); + return userSignVo; + } + public void __addSigninRecord(WebConstant.CLIENT_TYPE clientType, String clientIp, Long authId) { // SigninLog siginLog = new SigninLog(); // siginLog.setId(snowflake.nextId()); @@ -91,6 +145,7 @@ public class UserService implements IUserService { /** * 手机号登陆 + * * @param phone * @param smsVerifyCode * @return @@ -275,8 +330,8 @@ public class UserService implements IUserService { } //2.生成随机验证码 - //String verifyCode = RandomUtil.randomNumbers(4); - String verifyCode = "1111"; + String verifyCode = RandomUtil.randomNumbers(4); +// String verifyCode = "1111"; //3.保存到redis中 Integer codeValidInSeconds = WebConstant.Expired_Verify_Code_In_Seconds; @@ -285,7 +340,7 @@ public class UserService implements IUserService { redisUtil.set(RedisKeyManager.getSigninSmsExistKey(phone), verifyCode, codeExistINSeconds); //5.发送验证码 - //SmsUtil.sendSms(identifier,verifyCode,"微信小程序",codeValidInSeconds); + SmsUtil.sendSms(phone,verifyCode,"微信小程序",codeValidInSeconds); //6.返回 smsCodeVo = new UserVo.SmsCode(); @@ -327,8 +382,7 @@ public class UserService implements IUserService { Boolean flag = findAccount(userSignup.getAccount()); if (!flag) { userSignVo = saveAuth(userSignup); - - }else { + } else { throw new BaseException("账号已存在"); } } else { @@ -408,6 +462,20 @@ public class UserService implements IUserService { return CollectionUtil.isNotEmpty(authList); } + /** + * 查找手机号 + */ + @Override + public Boolean findPhone(String phone) { + Boolean flag = false; + SysAuthExample authExample = new SysAuthExample(); + authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value) + .andIdentifierEqualTo(phone); + List authList = authDao.selectByExample(authExample); + + return CollectionUtil.isNotEmpty(authList); + } + /** * 修改账号信息 */ @@ -433,49 +501,55 @@ public class UserService implements IUserService { return !redisUtil.hasKey(RedisKeyManager.getTokenCachedKey(authId)); } + /** + * 微信绑定手机号 + * @param currentUserId + * @param wxPhone + * @return + * @throws Exception + */ @Override - public String bindingPhone(Long currentUserId, String phone, String code) throws Exception { - if (redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(phone))) { - if (code.equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(phone)).toString())) { - //查找改用户以前绑定的手机，如果有 替换 - SysAuthExample authExample = new SysAuthExample(); - authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value) - .andUserIdEqualTo(currentUserId); - List authList = authDao.selectByExample(authExample); - if (CollectionUtil.isNotEmpty(authList)) { - for (SysAuth auth : authList) { - if (auth.getIdentifier().equals(phone)) { - throw new BaseException(-1, "您的账号已经绑定过此手机，请勿重复绑定"); - } else { - throw new BaseException(-1, "您的账号已绑定手机" + auth.getIdentifier()); - } - } - } else { - //改手机对应账户，如果有，提示 - List phoneList = null; - SysAuth theAuth = null; - SysAuthExample phoneExample = new SysAuthExample(); - authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value) - .andIdentifierEqualTo(phone); - phoneList = authDao.selectByExample(phoneExample); - if (CollectionUtil.isNotEmpty(authList)) {//已被注册 提示 - throw new BaseException(-1, "该手机号已被注册，请更换手机号重试"); + public String bindingPhone(Long currentUserId, UserDto.WxPhone wxPhone) throws Exception { + if (isSmsCodeCorrect(wxPhone.getPhone(), wxPhone.getSmsCode())) { + //查找该用户以前绑定的手机 + SysAuthExample authExample = new SysAuthExample(); + authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value) + .andUserIdEqualTo(currentUserId); + List authList = authDao.selectByExample(authExample); + if (CollectionUtil.isNotEmpty(authList)) { + for (SysAuth auth : authList) { + if (auth.getIdentifier().equals(wxPhone.getPhone())) { + throw new BaseException(-1, "您的账号已经绑定过此手机，请勿重复绑定"); } else { - //绑定 添加auth - SysAuth auth = new SysAuth(); - auth.setId(snowflake.nextId()); - auth.setUserId(currentUserId); - auth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Phone.value); - auth.setIdentifier(phone); - auth.setCredential(code); - authDao.insertSelective(auth); + throw new BaseException(-1, "您的账号已绑定手机" + auth.getIdentifier()); } } + } else { + //改手机对应账户，如果有，提示 + List phoneList = null; + SysAuth theAuth = null; + SysAuthExample phoneExample = new SysAuthExample(); + authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value) + .andIdentifierEqualTo(wxPhone.getPhone()); + phoneList = authDao.selectByExample(phoneExample); + if (CollectionUtil.isNotEmpty(phoneList)) {//已被注册 提示 + //合并 + } else { + throw new BaseException(CodeEnum.NOT_REGISTER); +// //绑定 添加auth +// SysAuth auth = new SysAuth(); +// auth.setId(snowflake.nextId()); +// auth.setUserId(currentUserId); +// auth.setIdentifyType((byte) WebCo nstant.IDENTIFY_TYPE.Phone.value); +// auth.setIdentifier(phone); +// auth.setCredential(code); +// authDao.insertSelective(auth); + } } - } else { - throw new BaseException(-1, "验证信息不正确"); + }else { + throw new BaseException(CodeEnum.SMS_CODE_CORRECT); } - return phone; + return null; } @Override @@ -521,7 +595,7 @@ public class UserService implements IUserService { } /** - *判断验证码是否有效 + * 判断验证码是否有效 */ private Boolean isSmsCodeCorrect(String phone, String smsCode) throws Exception { Boolean correct = false; @@ -549,10 +623,10 @@ public class UserService implements IUserService { List authList = authDao.selectByExample(sysAuthExample); if (CollectionUtil.isNotEmpty(authList)) { SysAuth auth = authList.get(0); - if(!ShiroKit.authenticate(passwordDto.getPassword(), auth.getCredential(), auth.getSalt())){ + if (!ShiroKit.authenticate(passwordDto.getPassword(), auth.getCredential(), auth.getSalt())) { auth.setCredential(ShiroKit.md5(passwordDto.getPassword(), auth.getSalt())); authDao.updateByPrimaryKeySelective(auth); - }else { + } else { throw new BaseException("新密码不能和旧密码相同"); } } else { @@ -569,6 +643,7 @@ public class UserService implements IUserService { /** * 通过用户查找手机号 + * * @param userId * @return */ diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java index e3cc18b9..438eb0ed 100644 --- a/tall/src/main/java/com/ccsens/tall/web/UserController.java +++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java @@ -63,6 +63,7 @@ public class UserController { switch (identify_type) { case Wxmp: case OAUTH2_Wx: + case Wx_H5: case OAUTH2_WeiBo: { break; } @@ -145,13 +146,23 @@ public class UserController { @ApiImplicitParams({ }) @RequestMapping(value = "/account", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> accounts(HttpServletRequest request, - @ApiParam @RequestParam String account) throws Exception { -// List accounts = userService.findAccount(); + public JsonResponse accounts(@ApiParam @RequestParam String account) throws Exception { + userService.findAccount(account); return JsonResponse.newInstance().ok(); } + + @ApiOperation(value = "/检查账号是否被注册", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/phone", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) + public JsonResponse findPhone(@ApiParam @RequestParam String phone) throws Exception { + + userService.findPhone(phone); + return JsonResponse.newInstance().ok(); + } + // @ApiOperation(value = "/修改账号信息",notes = "") // @ApiImplicitParams({ // }) @@ -162,16 +173,16 @@ public class UserController { // } -// @ApiOperation(value = "/微信绑定手机",notes = "") -// @ApiImplicitParams({ -// }) -// @RequestMapping(value="/phone",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) -// public JsonResponse bindingPhone(HttpServletRequest request, -// @ApiParam @RequestBody UserDto.Phone phone) throws Exception { -// Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); -// String returnPhone = userService.bindingPhone(currentUserId,phone.getPhone(),phone.getCode()); -// return JsonResponse.newInstance().ok(returnPhone); -// } + @ApiOperation(value = "/微信绑定手机",notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value="/phone",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) + public JsonResponse bindingPhone(HttpServletRequest request, + @ApiParam @RequestBody UserDto.WxPhone wxPhone) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + String returnPhone = userService.bindingPhone(currentUserId,wxPhone); + return JsonResponse.newInstance().ok(returnPhone); + } @ApiOperation(value = "/更改绑定手机", notes = "") @ApiImplicitParams({ @@ -282,6 +293,8 @@ public class UserController { List memberIdInfo = proMemberService.getMemberIdByProjectId(projectId); return memberIdInfo; } + + } diff --git a/tall/src/main/resources/mapper_raw/SysDomainMapper.xml b/tall/src/main/resources/mapper_raw/SysDomainMapper.xml index bed2493f..f5be06f1 100644 --- a/tall/src/main/resources/mapper_raw/SysDomainMapper.xml +++ b/tall/src/main/resources/mapper_raw/SysDomainMapper.xml @@ -7,6 +7,7 @@ + @@ -74,7 +75,7 @@ - id, domain_name, logo, company_name, system_name, show_calendar, show_project_id, + id, domain_name, logo, company_name, system_name, backdrop_url, show_calendar, show_project_id, caption, headline, created_at, updated_at, rec_status