diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index dcbfa70f..7529b32d 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -107,6 +107,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/company/WCLogin", "anon");//微信登录 filterChainDefinitionMap.put("/company/jscode2session", "anon");//微信登录凭证校验 + //和会员系统交互的接口 //filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议 //filterChainDefinitionMap.put("/meeting/payMeeting/addStandardsFile","anon");//会员系统推送文件 @@ -174,6 +175,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/company/payContactsManagement/addMeeting","anon"); filterChainDefinitionMap.put("/company/payContactsManagement/queryByIdMeeting","anon"); filterChainDefinitionMap.put("/company/payContactsManagement/queryWXByCompany","anon"); + //企业端注册个人 + filterChainDefinitionMap.put("/home/registerSelf", "anon"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 239add62..34e49e87 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -63,8 +63,6 @@ public class PayCaseCommitteeController extends JeroController { * @return */ DetailForCaseCommittee detail(String id,String userId); + + + void registerSelf(RegisterSelf registerSelf); + + void modify(String id, String emailPassword); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java index ddf56f0d..afaa513c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java @@ -4,11 +4,18 @@ package com.jero.data.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.util.CommonUtils; +import com.jero.common.util.RedisUtil; +import com.jero.company.service.IPayContactsManagementService; import com.jero.data.entity.DetailForCaseCommittee; import com.jero.data.entity.PayCaseCommittee; +import com.jero.data.entity.RegisterSelf; import com.jero.data.mapper.PayCaseCommitteeMapper; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,9 +30,15 @@ import javax.annotation.Resource; */ @Service public class PayCaseCommitteeServiceImpl extends ServiceImpl implements IPayCaseCommitteeService { - + @Autowired + private RedisUtil redisUtil; @Resource private PayCaseCommitteeMapper payCaseCommitteeMapper; + @Resource + private IPayContactsManagementService payContactsManagementService; + @Resource + private ISysUserService sysUserService; + /** * 企业端分标委列表 * @param page @@ -47,4 +60,46 @@ public class PayCaseCommitteeServiceImpl extends ServiceImpl registerSelf(@Valid @RequestBody RegisterSelf registerSelf) { + payCaseCommitteeService.registerSelf(registerSelf); + return Result.OK("注册成功"); + } + + @ApiOperation(value = "修改授权码") + @PostMapping(value = "/modify") + public Result modify(@RequestParam(value = "id",required = true)String id, + @RequestParam(value = "emailPassword",required = true)String emailPassword) { + payCaseCommitteeService.modify(id,emailPassword); + return Result.OK("修改成功"); + } } diff --git a/jero-boot-module-system/pom.xml b/jero-boot-module-system/pom.xml index 71c24b6a..57909e1c 100644 --- a/jero-boot-module-system/pom.xml +++ b/jero-boot-module-system/pom.xml @@ -50,7 +50,5 @@ - - - - \ No newline at end of file + + diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 5de40f53..3a438277 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -6,8 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.aliyuncs.exceptions.ClientException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; -import com.jero.modules.system.entity.SysRole; -import com.jero.modules.system.entity.SysUserRole; +import com.jero.modules.system.entity.*; import com.jero.modules.system.model.SysLoginVO; import com.jero.modules.system.service.*; import io.swagger.annotations.Api; @@ -24,8 +23,6 @@ import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; import com.jero.common.util.encryption.EncryptedString; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.model.SysLoginModel; import com.jero.modules.system.util.RandImageUtil; import org.springframework.beans.BeanUtils; @@ -36,6 +33,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -459,6 +457,7 @@ public class LoginController { obj.put("multi_depart", 2); } sysUser.setPhone(PasswordUtil.decrypt(sysUser.getPhone())); + sysUser.setEmail(PasswordUtil.decrypt(sysUser.getEmail())); obj.put("token", token); obj.put("userInfo", sysUser); obj.put("sysAllDictItems", sysDictService.queryAllDictItems()); @@ -628,6 +627,7 @@ public class LoginController { return Result.OK("修改密码成功"); } + @ApiOperation(value = "发送手机号验证码") @GetMapping(value = "/sendVerificationCode") public Result sendVerificationCode(@RequestParam(name="phone") String phone, @@ -643,4 +643,4 @@ public class LoginController { String string = redisUtil.get("_verification:_phone:" + phone).toString(); return Result.OK(string); } -} \ No newline at end of file +} diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index d5f2757c..8dc5d445 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -62,17 +62,17 @@ public interface ISysUserService extends IService { * @return */ public boolean deleteBatchUsers(String userIds); - + public SysUser getUserByName(String username); - + /** * 添加用户和用户角色关系 * @param user * @param roles */ public void addUserWithRole(SysUser user,String roles); - - + + /** * 修改用户和用户角色关系 * @param user @@ -86,7 +86,7 @@ public interface ISysUserService extends IService { * @return */ public List getRole(String username); - + /** * 查询用户信息包括 部门信息 * @param username @@ -157,14 +157,14 @@ public interface ISysUserService extends IService { * @return 权限集合 */ Set getUserPermissionsSet(String username); - + /** * 根据用户名设置部门ID * @param username * @param orgCode */ void updateUserDepart(String username,String orgCode); - + /** * 根据手机号获取用户名和密码 */ @@ -190,7 +190,7 @@ public interface ISysUserService extends IService { * @param departs */ void editUserWithDepart(SysUser user, String departs); - + /** * 校验用户是否有效 * @param sysUser @@ -259,4 +259,7 @@ public interface ISysUserService extends IService { * @return PayContactsManagement */ PayContactsManagement getPayContactsManagementByPhone(String phone); + + + } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index bc665675..b7621f0d 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -47,24 +47,24 @@ import java.util.stream.Collectors; @Service @Slf4j public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { - - @Autowired + + @Resource private SysUserMapper userMapper; - @Autowired + @Resource private SysPermissionMapper sysPermissionMapper; - @Autowired + @Resource private SysUserRoleMapper sysUserRoleMapper; - @Autowired + @Resource private SysUserDepartMapper sysUserDepartMapper; - @Autowired + @Resource private ISysBaseAPI sysBaseAPI; - @Autowired + @Resource private SysDepartMapper sysDepartMapper; - @Autowired + @Resource private SysRoleMapper sysRoleMapper; - @Autowired + @Resource private SysDepartRoleUserMapper departRoleUserMapper; - @Autowired + @Resource private SysDepartRoleMapper sysDepartRoleMapper; @Resource private BaseCommonService baseCommonService; @@ -126,8 +126,8 @@ public class SysUserServiceImpl extends ServiceImpl impl public SysUser getUserByName(String username) { return userMapper.getUserByName(username); } - - + + @Override @Transactional public void addUserWithRole(SysUser user, String roles) { @@ -162,7 +162,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public List getRole(String username) { return sysUserRoleMapper.getRoleByUserName(username); } - + /** * 通过用户名获取用户角色集合 * @param username 用户名 @@ -206,7 +206,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // SysUser user = userMapper.getUserByName(username); // info.setSysUserCode(user.getUsername()); // info.setSysUserName(user.getRealname()); - + LoginUser user = sysBaseAPI.getUserByName(username); if(user!=null) { @@ -214,7 +214,7 @@ public class SysUserServiceImpl extends ServiceImpl impl info.setSysUserName(user.getRealname()); info.setSysOrgCode(user.getOrgCode()); } - + //多部门支持in查询 List list = sysDepartMapper.queryUserDeparts(user.getId()); List sysMultiOrgCode = new ArrayList(); @@ -230,7 +230,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } info.setSysMultiOrgCode(sysMultiOrgCode); - + return info; } @@ -564,6 +564,8 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.getPayContactsManagementByPhone(phone); } + + /** * 忘记密码校验 * @param user