springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -307,4 +307,12 @@ public R uuLogin(@RequestBody UuLoginVO uuLoginVO){ return userService.uuLogin(uuLoginVO); } @ApiOperation("天府通办登录") @PostMapping("tfLogin") public R tfLogin(@RequestBody UuLoginVO uuLoginVO){ userService.tfLogin(uuLoginVO); R r=tokenService.tfLogin(uuLoginVO.getMobile(),"Huacheng@123","wx118de8a734d269f0"); return r; } } springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -5,11 +5,7 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.interfaces.OperLog; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import com.panzhihua.auth.model.dos.LoginBody; import com.panzhihua.auth.service.LoginService; @@ -269,4 +265,10 @@ LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,appid); return R.ok(loginReturnVO); } @GetMapping("/tfLogin") public R tfLogin(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("appid")String appid){ LoginReturnVO loginReturnVO=loginService.tfLogin(account,password,appid); return R.ok(loginReturnVO); } } springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -138,4 +138,11 @@ * @return 登录结果 */ LoginReturnVO loginMcsUser(String account, String password,String appid); /** * 天府通办 * @param account 账户 * @param password 密码 * @return 登录结果 */ LoginReturnVO tfLogin(String account, String password,String appid); } springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -300,4 +300,16 @@ loginReturnVO.setRefreshToken(refeshToken); return loginReturnVO; } @Override public LoginReturnVO tfLogin(String account, String password, String appid) { Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_16"+"_"+appid, password)); LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal(); String token = JWTTokenUtil.generateToken(loginUser); String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser); LoginReturnVO loginReturnVO = new LoginReturnVO(); loginReturnVO.setToken(token); loginReturnVO.setRefreshToken(refeshToken); return loginReturnVO; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -1,6 +1,7 @@ package com.panzhihua.common.service.auth; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -154,4 +155,14 @@ */ @PostMapping("/loginMcsUser") R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid); /** * 天府通办登录 * @param account * @param password * @param appid * @return */ @GetMapping("/tfLogin") R tfLogin(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("appid")String appid); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5660,6 +5660,9 @@ @PostMapping("/reserve/commitNoToken") R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO); @PostMapping("/reserve/homeQuarantine/commitNoToken") R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO); /** * 我的预约/登记 * @param pageUserReserveDTO springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1270,4 +1270,8 @@ @GetMapping("/communityList") R communityList(@RequestParam("name") String name, @RequestParam("id") Long id); @PostMapping("/tfLogin") R tfLogin(@RequestBody UuLoginVO uuLoginVO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -1050,6 +1050,12 @@ return communityService.reserveCommitNoToken(comActReserveCommitVO); } @ApiOperation("对外用户提交居家隔离") @PostMapping("/homeQuarantine/commit/noToken") public R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO) { return communityService.homeQuarantineCommitNoToken(comActReserveCommitVO); } @ApiOperation(value = "查询西区社区列表") @GetMapping("/westList/noToken") public R getWestCommunityLists() { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -120,6 +120,16 @@ } /** * 外部调用提交居家隔离 * @param comActReserveCommitVO * @return */ @PostMapping("/homeQuarantine/commitNoToken") public R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){ return comActReserveService.commitNoToken(comActReserveCommitVO); } /** * 小程序提交预约/登记 * @param comActReserveCommitVO * @return springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java
@@ -30,6 +30,13 @@ R commitNoToken(ComActReserveCommitVO comActReserveCommitVO); /** * 外部提交预约登记 * @param comActReserveCommitVO * @return 预约登记结果 */ R homeQuarantineCommitNoToken(ComActReserveCommitVO comActReserveCommitVO); /** * 小程序我的预约登记 * @param pageUserReserveDTO * @return 预约登记列表 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -428,6 +428,131 @@ return R.fail("参数错误"); } @Override public R homeQuarantineCommitNoToken(ComActReserveCommitVO comActReserveCommitVO) { if(comActReserveCommitVO!=null){ ComActReserveDO comActReserveDO=new ComActReserveDO(); Date nowDate=DateUtil.date(); //查询预约登记记录 List<ComActReserveDO> list=comActReserveMapper.selectList(new QueryWrapper<ComActReserveDO>().lambda().eq(ComActReserveDO::getCommunityId,comActReserveCommitVO.getCommunityId()).eq(ComActReserveDO::getTitle,"居家隔离")); if(!list.isEmpty()){ comActReserveDO=list.get(0); } comActReserveCommitVO.setId(comActReserveDO.getId()); if(comActReserveDO!=null){ List<QuestnaiteSubVO> questnaiteSubVOS = JSON.parseArray(comActReserveCommitVO.getJsonObject(),QuestnaiteSubVO.class); if(!questnaiteSubVOS.isEmpty()){ Long questId=comActReserveCommitVO.getId(); List<ComActReserveAnswerContentDO> answerContentList=new ArrayList<>(); for(QuestnaiteSubVO questnaiteSub:questnaiteSubVOS){ //查询用户填写题目 ComActReserveSubDO questnaireSubDO = comActReserveSubMapper.selectOne(new QueryWrapper<ComActReserveSubDO>().lambda() .eq(ComActReserveSubDO::getReserveId,questId).eq(ComActReserveSubDO::getKey,questnaiteSub.getKey())); if(questnaireSubDO == null){ log.error("未查询到调查问卷题目，题目名称：" + questnaiteSub.getLabel() + "题目key：" + questnaiteSub.getKey()); continue; } Long queSubId = questnaireSubDO.getId(); //根据上传的类型查询不同的题目选项 if(questnaiteSub.getType().equals(QuestnaiteSubVO.type.danxuan) || questnaiteSub.getType().equals(QuestnaiteSubVO.type.imgselect)){ //单选题处理 ComActReserveSubSelectionDO subSelectionDO = comActReserveSubSelectionMapper.selectOne(new QueryWrapper<ComActReserveSubSelectionDO>() .lambda().eq(ComActReserveSubSelectionDO::getReserveSubId,queSubId).eq(ComActReserveSubSelectionDO::getReserveId,questId) .eq(ComActReserveSubSelectionDO::getKey,questnaiteSub.getValues())); if(subSelectionDO == null){ log.error("未查询到调查问卷选项，题目名称：" + questnaiteSub.getLabel() + "选项key：" + questnaiteSub.getValues()); continue; } ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO(); answerContentDO.setCreateAt(nowDate); answerContentDO.setReserveSelectionId(subSelectionDO.getId()); answerContentDO.setReserveSubId(queSubId); answerContentDO.setType(1); answerContentDO.setChoice(subSelectionDO.getOptionName()); answerContentDO.setAnswerContent(subSelectionDO.getContent()); answerContentList.add(answerContentDO); }else if(questnaiteSub.getType().equals(QuestnaiteSubVO.type.duoxuan)){ //多选题处理 String values = questnaiteSub.getValues(); String []value = values.split(","); for (int i = 0; i < value.length; i++) { ComActReserveSubSelectionDO subSelectionDO = comActReserveSubSelectionMapper.selectOne(new QueryWrapper<ComActReserveSubSelectionDO>() .lambda().eq(ComActReserveSubSelectionDO::getReserveSubId,queSubId).eq(ComActReserveSubSelectionDO::getReserveId,questId) .eq(ComActReserveSubSelectionDO::getKey,value[i])); if(subSelectionDO == null){ log.error("未查询到调查问卷选项，题目名称：" + questnaiteSub.getLabel() + "选项key：" + questnaiteSub.getValues()); continue; } ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO(); answerContentDO.setCreateAt(nowDate); answerContentDO.setReserveSelectionId(subSelectionDO.getId()); answerContentDO.setReserveSubId(queSubId); answerContentDO.setType(1); answerContentDO.setChoice(subSelectionDO.getOptionName()); answerContentDO.setAnswerContent(subSelectionDO.getContent()); answerContentList.add(answerContentDO); } }else{ //文字描述不做处理 if(!questnaiteSub.getType().equals(QuestnaiteSubVO.type.describe)){ //问答题处理 String values = questnaiteSub.getValues(); ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO(); answerContentDO.setCreateAt(nowDate); answerContentDO.setReserveSubId(queSubId); answerContentDO.setType(2); answerContentDO.setAnswerContent(values); answerContentList.add(answerContentDO); } } } if(!answerContentList.isEmpty()){ //更新回答用户数量 Integer joinCount = comActReserveDO.getJoinCount(); comActReserveDO.setJoinCount(joinCount != null ? joinCount + 1 : 1); comActReserveMapper.updateById(comActReserveDO); //新增用户答题记录 ComActReserveRecordDO userAnswerDO = new ComActReserveRecordDO(); userAnswerDO.setContent(comActReserveCommitVO.getContent()!=null?comActReserveCommitVO.getContent():""); userAnswerDO.setName(comActReserveCommitVO.getName()!=null?comActReserveCommitVO.getName():""); userAnswerDO.setCommunityId(comActReserveCommitVO.getCommunityId()); userAnswerDO.setPhone(comActReserveCommitVO.getPhone()!=null?comActReserveCommitVO.getPhone():""); userAnswerDO.setReserveId(questId); userAnswerDO.setReserveTime(comActReserveCommitVO.getReserveTime()!=null?comActReserveCommitVO.getReserveTime():new Date()); userAnswerDO.setType(comActReserveCommitVO.getType()!=null? comActReserveCommitVO.getType() : 2); userAnswerDO.setCreateAt(nowDate); userAnswerDO.setJsonObject(comActReserveCommitVO.getJsonObject()); userAnswerDO.setStatus(ComActReserveRecordDO.status.cg); comActReserveRecordService.saveOrUpdate(userAnswerDO); //给答题记录赋值预约登记记录id answerContentList.forEach(answerContent -> { answerContent.setReserveRecordId(userAnswerDO.getId()); }); comActReserveAnswerContentService.saveBatch(answerContentList); //新增用户操作记录 ComActReserveOperationRecordDO comActReserveOperationRecordDO=new ComActReserveOperationRecordDO(); comActReserveOperationRecordDO.setReserveId(comActReserveCommitVO.getId()); comActReserveOperationRecordDO.setReserveRecordId(userAnswerDO.getId()); comActReserveOperationRecordDO.setType(ComActReserveOperationRecordDO.type.br); comActReserveOperationRecordDO.setCreateAt(DateUtil.date()); comActReserveOperationRecordDO.setReserveTime(comActReserveCommitVO.getReserveTime()); comActReserveOperationRecordDO.setReserveContent(COMMIT); //comActReserveOperationRecordDO.setPhone(comActReserveCommitVO.getPhone()); comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.ytj); //comActReserveOperationRecordDO.setRemark(comActReserveCommitVO.getContent()); comActReserveOperationRecordMapper.insert(comActReserveOperationRecordDO); return R.ok("提交成功"); } } } } return R.fail("参数错误"); } /** * 社区后台-分页查询预约登记列表 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1444,4 +1444,9 @@ public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){ return userService.resetPassword(type,account); } @PostMapping("/tfLogin") public R tfLogin(@RequestBody UuLoginVO uuLoginVO){ return userService.tfLogin(uuLoginVO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -912,4 +912,11 @@ * @return */ R resetPassword(Integer type,String account); /** * 天府通办登录 * @param uuLoginVO * @return */ R tfLogin(UuLoginVO uuLoginVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3650,6 +3650,22 @@ return R.ok(); } @Override public R tfLogin(UuLoginVO uuLoginVO) { SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,uuLoginVO.getMobile()).eq(SysUserDO::getType,16)); if(sysUserDO==null){ sysUserDO=new SysUserDO(); sysUserDO.setPassword("$2a$10$F/2lE2NMhKNHJfi5.FLmfu7jIr7ImRWgCTTeO6m3IRNR2V4sv8YR."); sysUserDO.setType(16); sysUserDO.setStatus(1); sysUserDO.setPhone(uuLoginVO.getMobile()); sysUserDO.setAccount(uuLoginVO.getMobile()); sysUserDO.setAppId("wx118de8a734d269f0"); userDao.insert(sysUserDO); } return R.ok(); } @Override public R getAreaAndStreet() { springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -92,6 +92,7 @@ boolean uuPush = requestURI.contains("uuPush"); boolean wxCgi = requestURI.contains("cgi"); boolean isShop = requestURI.contains("isShop"); boolean tfLogin = requestURI.contains("tfLogin"); boolean noToken = requestURI.contains("noToken"); boolean listadvertisement = requestURI.contains("listadvertisement"); // boolean bigscreen = requestURI.contains("/bigscreen/party"); @@ -104,7 +105,7 @@ safeboxRequestWrapper.addHeader("appid",request.getHeader("appid")); if (login || doc || css || js || ui || swagger || ico || docs || error || refreshToken || useragreement || wxPay // ||wxCgi||isShop||listadvertisement||noToken||bigscreen) { || wxCgi || isShop || listadvertisement || noToken||uuRepay||kaphtcha||uuPush) { || wxCgi || isShop || listadvertisement || noToken||uuRepay||kaphtcha||uuPush||tfLogin) { // 什么也不做 } else { // 获取请求头中JWT的Token
