kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/pom.xml
@@ -21,5 +21,9 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-usercenter-api</artifactId> </dependency> </dependencies> </project> kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java
@@ -44,4 +44,6 @@ * @return ProductOrderDetail对象 */ List<GroupProductDetail> groupProductDetail(Page<GroupProductDetail> page, @Param("p") Map<String, Object> params); List<ProductOrderJoinDetail> getTypeByUser(Long id); } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
@@ -58,5 +58,7 @@ * @return */ ResultBody updateEnabled(Map<String, Object> params); ResultBody getTypeByUser(SysUser sysUser); } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISysFeedbackService.java
@@ -36,5 +36,7 @@ * @return */ ResultBody updateEnabled(Map<String, Object> params); ResultBody getoneee(); } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -1,10 +1,10 @@ package com.kidgrow.oprationcenter.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.model.PageResult; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysUser; import com.kidgrow.common.model.*; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.common.utils.DateUtils; import com.kidgrow.oprationcenter.feign.DiagnosticService; import com.kidgrow.oprationcenter.feign.RoleOrganizationService; import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper; @@ -13,12 +13,16 @@ import com.kidgrow.oprationcenter.vo.DiagnosisRecord; import com.kidgrow.oprationcenter.vo.GroupProductDetail; import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; import com.kidgrow.usercenter.feign.SysDoctorService; import com.kidgrow.usercenter.feign.SysHospitalService; import com.kidgrow.usercenter.model.SysHospital; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,6 +41,10 @@ DiagnosticService diagnosticService; @Autowired private RoleOrganizationService roleOrganizationService; @Autowired private SysDoctorService sysDoctorService; @Autowired private SysHospitalService sysHospitalService; /** * 列表 * @param params @@ -112,4 +120,48 @@ int i = baseMapper.updateById(productOrder); return i > 0 ? ResultBody.ok().data(productOrder).msg("更新成功") : ResultBody.failed("更新失败"); } @Override public ResultBody getTypeByUser(SysUser sysUser) { List<SysOrganization> organizations = sysUser.getOrganizations(); if(organizations.size()>0){ SysOrganization sysOrganization = organizations.get(0); List<ProductOrderJoinDetail> list=baseMapper.getTypeByUser(sysOrganization.getId()); if (list.size()>0) { ProductOrderJoinDetail productOrderJoinDetail = list.get(0); //查询用户的真实姓名 Map<String,Object> selectMap=new HashMap<>(); selectMap.put("user_id",sysUser.getId()); ResultBody listByMap = sysDoctorService.getListByMap(selectMap); List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class); String str=""; if(sysDoctors!=null&&sysDoctors.size()>0){ str= sysDoctors.get(0).getDoctorName(); } //查询医院的 logo Map<String,Object> map=new HashMap<>(); map.put("id",sysOrganization.getId()); ResultBody allByMap = sysHospitalService.findAllByMap(map); List<SysHospital> hospitals = JSON.parseArray(JSON.toJSONString(allByMap.getData()), SysHospital.class); String logo=""; if(hospitals.size()>0){ logo = hospitals.get(0).getHospitalLogo(); } Map<String,Object> mapVo=new HashMap<>(); mapVo.put("type",productOrderJoinDetail.getProType()); mapVo.put("realName",str); //剩余时间 Date proEndtime = productOrderJoinDetail.getProEndtime(); Double surplusDay=DateUtils.getDays(proEndtime, new Date()); int surplus = surplusDay.intValue(); mapVo.put("surplus",surplus); mapVo.put("logo",logo); return ResultBody.ok().data(mapVo); }else { return ResultBody.failed("该用户套餐已经失效"); } }else { return ResultBody.failed("该用户的组织已经失效"); } } } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java
@@ -7,8 +7,10 @@ import com.kidgrow.oprationcenter.mapper.SysFeedbackMapper; import com.kidgrow.oprationcenter.model.SysFeedback; import com.kidgrow.oprationcenter.service.ISysFeedbackService; import com.kidgrow.usercenter.feign.SysDoctorService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @@ -26,6 +28,8 @@ @Slf4j @Service public class SysFeedbackServiceImpl extends SuperServiceImpl<SysFeedbackMapper, SysFeedback> implements ISysFeedbackService { @Autowired SysDoctorService sysDoctorService; /** * 列表 * @param params @@ -67,4 +71,9 @@ int i = baseMapper.updateById(feedback); return i > 0 ? ResultBody.ok().data(feedback).msg("更新成功") : ResultBody.failed("更新失败"); } @Override public ResultBody getoneee() { return sysDoctorService.findById(1L); } } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -140,4 +140,21 @@ GROUP BY DE.pro_id order by pro_count desc </select> <select id="getTypeByUser" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail" parameterType="long"> SELECT pod.* FROM `product_order` po INNER JOIN product_order_detail pod ON po.id = pod.order_id WHERE po.hospital_id = #{id} AND NOW() >= pod.pro_begintime AND NOW() <=pod.pro_endtime AND pod.enabled = 1 AND pod.is_del = 0 AND po.enabled = 1 AND po.is_del = 0 ORDER BY pod.pro_type desc,pod.pro_endtime desc </select> </mapper> kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -237,4 +237,15 @@ } return resultBody; } /** * 获取 用户的状态 为试用状态还是 启用状态 * * @return */ @ApiOperation(value = "获取 用户的状态") @GetMapping("/getTypeByUser") public ResultBody getTypeByUser(@LoginUser SysUser sysUser) { return productOrderDetailService.getTypeByUser(sysUser); } } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
@@ -130,4 +130,9 @@ } return sysFeedbackService.updateEnabled(params); } @PostMapping("getDoctor") public ResultBody getoneee(){ return sysFeedbackService.getoneee(); } } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/feign/SysHospitalService.java
New file @@ -0,0 +1,29 @@ package com.kidgrow.usercenter.feign; import com.kidgrow.common.constant.ServiceNameConstants; import com.kidgrow.common.model.ResultBody; import com.kidgrow.usercenter.feign.fallback.SysDoctorServiceFallbackFactory; import com.kidgrow.usercenter.feign.fallback.SysHospitalServiceFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.Map; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> * * @Description: <br> * @Project: <br> * @CreateDate: Created in 2020/2/22 14:33 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> */ @FeignClient(name = ServiceNameConstants.USER_SERVICE, fallbackFactory = SysHospitalServiceFallbackFactory.class, decode404 = true) public interface SysHospitalService { /** * 根据条件查询 * @param map */ @PostMapping(value = "/syshospital/findAllByMap") ResultBody findAllByMap(@RequestBody Map<String, Object> map); } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/feign/fallback/SysHospitalServiceFallbackFactory.java
New file @@ -0,0 +1,33 @@ package com.kidgrow.usercenter.feign.fallback; import com.kidgrow.common.model.ResultBody; import com.kidgrow.usercenter.feign.SysDoctorService; import com.kidgrow.usercenter.feign.SysHospitalService; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.Map; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> * * @Description: <br> * @Project: <br> * @CreateDate: Created in 2020/2/22 14:33 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> */ @Slf4j @Component public class SysHospitalServiceFallbackFactory implements FallbackFactory<SysHospitalService> { @Override public SysHospitalService create(Throwable throwable) { return new SysHospitalService() { @Override public ResultBody findAllByMap(Map<String, Object> map) { return ResultBody.failed("查询失败"); } }; } } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/pom.xml
@@ -26,5 +26,9 @@ <groupId>eu.bitwalker</groupId> <artifactId>UserAgentUtils</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-api</artifactId> </dependency> </dependencies> </project> kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java
@@ -113,4 +113,10 @@ ResultBody getThisUserOrganizationUser(HttpServletRequest request); ResultBody findCountByMap(Map<String, Object> map); ResultBody passwordByPhone(Map<String, Object> map); ResultBody registerByPhone(Map<String, Object> map); ResultBody updatePhone(Map<String, Object> map,SysUser sysUser); } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -1,14 +1,21 @@ package com.kidgrow.usercenter.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.annotation.LoginUser; import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.constant.SecurityConstants; import com.kidgrow.common.context.ClientContextHolder; import com.kidgrow.common.lock.DistributedLock; import com.kidgrow.common.model.*; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.common.utils.DateUtils; import com.kidgrow.redis.util.RedisUtils; import com.kidgrow.sms.feign.SmsChuangLanService; import com.kidgrow.sms.model.ConstantSMS; import com.kidgrow.usercenter.mapper.SysRoleMenuMapper; import com.kidgrow.usercenter.mapper.SysUserMapper; import com.kidgrow.usercenter.model.SysRoleUser; @@ -33,6 +40,7 @@ import java.util.*; import java.util.stream.Collectors; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> * @@ -44,8 +52,7 @@ @Slf4j @Service public class SysUserServiceImpl extends SuperServiceImpl<SysUserMapper, SysUser> implements ISysUserService { private final static String LOCK_KEY_USERNAME = CommonConstant.LOCK_KEY_PREFIX+"username:"; private final static String LOCK_KEY_USERNAME = CommonConstant.LOCK_KEY_PREFIX + "username:"; @Autowired private PasswordEncoder passwordEncoder; @@ -59,11 +66,14 @@ private ISysOrganizationService organizationService; @Autowired private ISysUserOrgService iSysUserOrgService; @Autowired private RedisUtils redisUtils; @Autowired private SmsChuangLanService smsChuangLanService; @Autowired private DistributedLock lock; @Override public LoginAppUser findByUsername(String username) { @@ -115,6 +125,7 @@ /** * 根据用户名查询用户 * * @param username * @return */ @@ -122,13 +133,14 @@ public SysUser selectByUsername(String username) { String clientId = ClientContextHolder.getClient(); List<SysUser> users = baseMapper.selectList( new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id",clientId) new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id", clientId) ); return getUser(users); } /** * 根据手机号查询用户 * * @param mobile * @return */ @@ -142,6 +154,7 @@ /** * 根据openId查询用户 * * @param openId * @return */ @@ -252,8 +265,8 @@ } String username = sysUser.getUsername(); boolean result = super.saveOrUpdateIdempotency(sysUser, lock , LOCK_KEY_USERNAME+username, new QueryWrapper<SysUser>().eq("username", username) , username+"已存在"); , LOCK_KEY_USERNAME + username, new QueryWrapper<SysUser>().eq("username", username) , username + "已存在"); // boolean result=true; //更新角色 if (result && StrUtil.isNotEmpty(sysUser.getRoleId())) { @@ -296,30 +309,31 @@ /** * 获取当前用的 组织下的所有人员 * * @param request * @return */ @Override public ResultBody getThisUserOrganizationUser(HttpServletRequest request) { String id = request.getHeader(SecurityConstants.USER_ID_HEADER); List<SysUser> sysUsers=new ArrayList<>(); if(StringUtils.isNotBlank(id)){ QueryWrapper<SysUserOrg> queryWrapper=new QueryWrapper(); queryWrapper.eq("user_id",id); List<SysUser> sysUsers = new ArrayList<>(); if (StringUtils.isNotBlank(id)) { QueryWrapper<SysUserOrg> queryWrapper = new QueryWrapper(); queryWrapper.eq("user_id", id); List<SysUserOrg> list = iSysUserOrgService.list(queryWrapper); if(list.size()>0){ if (list.size() > 0) { List<Long> collect = list.stream().map(e -> e.getOrgId()).collect(Collectors.toList()); if (collect.size()>0) { queryWrapper=new QueryWrapper<>(); queryWrapper.in("org_id",collect); if (collect.size() > 0) { queryWrapper = new QueryWrapper<>(); queryWrapper.in("org_id", collect); List<SysUserOrg> sysUserOrgs = iSysUserOrgService.list(queryWrapper); List<Long> userIds = sysUserOrgs.stream().map(e -> e.getUserId()).collect(Collectors.toList()); QueryWrapper<SysUser> sysUserQueryWrapper=new QueryWrapper(); sysUserQueryWrapper.in("id",userIds.stream().distinct().collect(Collectors.toList())); sysUsers= baseMapper.selectList(sysUserQueryWrapper); QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper(); sysUserQueryWrapper.in("id", userIds.stream().distinct().collect(Collectors.toList())); sysUsers = baseMapper.selectList(sysUserQueryWrapper); } } }else { } else { return ResultBody.failed("暂无数据"); } return ResultBody.ok().data(sysUsers); @@ -330,4 +344,142 @@ Integer integer = baseMapper.selectCountByMap(map); return ResultBody.ok().data(integer); } /** * 通过手机号 修改密码 * @param map * @return */ @Override public ResultBody passwordByPhone(Map<String, Object> map) { //手机号,type,验证码,新密码 String phone = MapUtils.getString(map, "phone"); if (phone == null || "".equals(phone.trim())) { return ResultBody.failed("请输入手机号"); } String verificationCode = MapUtils.getString(map, "verificationCode"); if (verificationCode == null || "".equals(verificationCode.trim())) { return ResultBody.failed("请输入验证码"); } String newPass = MapUtils.getString(map, "newPass"); if (newPass == null || "".equals(newPass.trim())) { return ResultBody.failed("请输入正确的密码"); } Object hget = redisUtils.hget(ConstantSMS.PASSWORD_SMS, map.get("phone").toString()); if (hget != null) { JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget)); Object verificationCodeObject = redisJson.get("verificationCode"); if (verificationCode.equals(verificationCodeObject)) { Object date = redisJson.get("endTime"); long time = DateUtils.parseDate(date.toString()).getTime(); Date dateNow = new Date(); long timeNow = dateNow.getTime(); if (timeNow <= time) { //查询表 Map<String, Object> selectMap = new HashMap<>(); selectMap.put("mobile", phone); List<SysUser> sysUsers = baseMapper.selectByMap(selectMap); if (sysUsers.size() > 0) { SysUser user = new SysUser(); user.setId(sysUsers.get(0).getId()); user.setPassword(passwordEncoder.encode(newPass)); baseMapper.updateById(user); //将Redis 清除 redisUtils.hdel(ConstantSMS.PASSWORD_SMS, phone); return ResultBody.ok(); } else { return ResultBody.failed("暂无该手机号信息"); } } else { return ResultBody.failed("验证码超时"); } } else { return ResultBody.failed("验证码错误"); } } else { return ResultBody.failed("该手机号没有验证码"); } } /** * 通过手机号 注册验证 * @param map * @return */ @Override public ResultBody registerByPhone(Map<String, Object> map) { //手机号,type,验证码,新密码 String phone = MapUtils.getString(map, "phone"); if (phone == null || "".equals(phone.trim())) { return ResultBody.failed("请输入手机号"); } Map<String, Object> selectMap = new HashMap<>(); selectMap.put("mobile", phone); List<SysUser> sysUsers = baseMapper.selectByMap(selectMap); if(sysUsers.size()>0){ return ResultBody.failed("该手机号已经注册"); } Map<String, Object> mapDto=new HashMap(); mapDto.put("phone",phone); mapDto.put("type",ConstantSMS.REGISTER_SMS); return smsChuangLanService.sendVerificationCode(mapDto); } /** * 通过手机号修改 手机号 * @param map * @return */ @Override public ResultBody updatePhone(Map<String, Object> map,SysUser sysUser) { String password = MapUtils.getString(map, "password"); if (StringUtils.isBlank(password)) { return ResultBody.failed("请输入密码"); } String phone = MapUtils.getString(map, "phone"); if (StringUtils.isBlank(phone)) { return ResultBody.failed("请输入新手机号"); } String verificationCode = MapUtils.getString(map, "verificationCode"); if (StringUtils.isBlank(verificationCode)) { return ResultBody.failed("请输入验证码"); } if (!passwordEncoder.matches(sysUser.getPassword(),password)) { return ResultBody.failed("密码错误"); } Object hget = redisUtils.hget(ConstantSMS.PHONE_SMS, map.get("phone").toString()); if (hget != null) { JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget)); Object verificationCodeObject = redisJson.get("verificationCode"); if (verificationCode.equals(verificationCodeObject)) { Object date = redisJson.get("endTime"); long time = DateUtils.parseDate(date.toString()).getTime(); Date dateNow = new Date(); long timeNow = dateNow.getTime(); if (timeNow <= time) { //查询表 Map<String, Object> selectMap = new HashMap<>(); selectMap.put("mobile", phone); List<SysUser> sysUsers = baseMapper.selectByMap(selectMap); if (sysUsers.size() > 0) { return ResultBody.failed("该手机号已经注册"); } else { SysUser user = new SysUser(); user.setId(sysUser.getId()); user.setMobile(phone); baseMapper.updateById(user); //将Redis 清除 redisUtils.hdel(ConstantSMS.PHONE_SMS, phone); return ResultBody.ok(); } } else { return ResultBody.failed("验证码超时"); } } else { return ResultBody.failed("验证码错误"); } } else { return ResultBody.failed("该手机号没有验证码"); } } } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -48,6 +48,7 @@ public class SysUserController { private static final String ADMIN_CHANGE_MSG = "超级管理员不给予修改"; /** * 全文搜索逻辑删除Dto */ @@ -353,4 +354,25 @@ public ResultBody getThisUserOrganizationUser(HttpServletRequest request){ return appUserService.getThisUserOrganizationUser(request); } /** * 通过手机修改密码 */ @PutMapping(value = "/users/passwordByPhone") public ResultBody passwordByPhone(@RequestBody Map<String,Object> map) { return appUserService.passwordByPhone(map); } /** * 通过手机号注册 新用户 */ @PutMapping(value = "/users/registerByPhone") public ResultBody registerByPhone(@RequestBody Map<String,Object> map) { return appUserService.registerByPhone(map); } /** * 更换手机号 */ @PutMapping(value = "/users/updatePhone") public ResultBody updatePhone(@RequestBody Map<String,Object> map, @LoginUser SysUser sysUser) { return appUserService.updatePhone(map,sysUser); } } kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
@@ -22,15 +22,19 @@ /** * 商品Demo服务名 */ String DEMO_PRODUCT_SERVICE="demo-product-server"; String DEMO_PRODUCT_SERVICE = "demo-product-server"; /** * 订单Demo服务名 */ String DEMO_ORDER_SERVICE="demo-order-server"; String DEMO_ORDER_SERVICE = "demo-order-server"; /** * 诊断数据服务 */ String RECORD_CENTER_SERVICE="recordcenter-server"; String RECORD_CENTER_SERVICE = "recordcenter-server"; /** * 短信服务名 */ String SMS_SERVICE_SERVER = "sms-service-server"; } kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java
@@ -77,8 +77,17 @@ @Override public void updateFill(MetaObject metaObject) { //mybatis-plus版本2.0.9+ setFieldValByName(UPDATE_TIME, new Date(), metaObject); setFieldValByName(UPDATE_USER_ID, Long.valueOf(request.getHeader(SecurityConstants.USER_ID_HEADER).toString()), metaObject); setFieldValByName(UPDATE_USER_NAME, request.getHeader(SecurityConstants.USER_HEADER), metaObject); Object updateTime = getFieldValByName(UPDATE_TIME, metaObject); Object updateUserId = getFieldValByName(UPDATE_USER_ID, metaObject); Object updateUserName = getFieldValByName(UPDATE_USER_NAME, metaObject); if (updateTime == null) { setFieldValByName(UPDATE_TIME, new Date(), metaObject); } if ((updateUserId == null) && (request.getHeader(SecurityConstants.USER_ID_HEADER) != null)) { setFieldValByName(UPDATE_USER_ID, Long.valueOf(request.getHeader(SecurityConstants.USER_ID_HEADER).toString()), metaObject); } if ((updateUserName == null) && (request.getHeader(SecurityConstants.USER_HEADER) != null)) { setFieldValByName(UPDATE_USER_NAME, request.getHeader(SecurityConstants.USER_HEADER), metaObject); } } } kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-api/pom.xml
New file @@ -0,0 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>kidgrow-plugin-sms</artifactId> <groupId>com.kidgrow</groupId> <version>1.0</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>kidgrow-plugin-sms-api</artifactId> </project> kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-api/src/main/java/com/kidgrow/sms/feign/SmsChuangLanService.java
New file @@ -0,0 +1,29 @@ package com.kidgrow.sms.feign; import com.kidgrow.common.constant.ServiceNameConstants; import com.kidgrow.common.model.ResultBody; import com.kidgrow.sms.feign.fallback.SmsChuangLanServiceFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.Map; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> * * @Description: <br> * @Project: <br> * @CreateDate: Created in 2020/2/27 22:04 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> */ @FeignClient(value = ServiceNameConstants.SMS_SERVICE_SERVER, fallbackFactory = SmsChuangLanServiceFallbackFactory.class, decode404 = true) public interface SmsChuangLanService { /** * feign rpc访问远程 接口 */ @PostMapping(value = "/smsChangLan/send") ResultBody sendVerificationCode(@RequestBody Map map); } kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-api/src/main/java/com/kidgrow/sms/feign/fallback/SmsChuangLanServiceFallbackFactory.java
New file @@ -0,0 +1,27 @@ package com.kidgrow.sms.feign.fallback; import com.kidgrow.common.model.ResultBody; import com.kidgrow.sms.feign.SmsChuangLanService; import feign.hystrix.FallbackFactory; import java.util.Map; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> * * @Description: <br> * @Project: <br> * @CreateDate: Created in 2020/2/27 22:05 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> */ public class SmsChuangLanServiceFallbackFactory implements FallbackFactory<SmsChuangLanService> { @Override public SmsChuangLanService create(Throwable throwable) { return new SmsChuangLanService() { @Override public ResultBody sendVerificationCode(Map ma) { return ResultBody.failed("短息调用失败"); } }; } } kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-api/src/main/java/com/kidgrow/sms/model/ConstantSMS.java
New file @@ -0,0 +1,9 @@ package com.kidgrow.sms.model; import com.kidgrow.common.constant.CommonConstant; public interface ConstantSMS { String PASSWORD_SMS = "PASSWORD_SMS";//修改密码 短信验证的type值 String REGISTER_SMS = "REGISTER_SMS";//注册 短信验证的type值 String PHONE_SMS = "PHONE_SMS";//注册 短信验证的type值 } kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-api/src/main/java/com/kidgrow/sms/model/SmsModel.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/model/SmsModel.java @@ -1,4 +1,4 @@ package com.kidgrow.sms.aliyun.model; package com.kidgrow.sms.model; import io.swagger.annotations.ApiModel; import lombok.Data; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/pom.xml
New file @@ -0,0 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>kidgrow-plugin-sms</artifactId> <groupId>com.kidgrow</groupId> <version>1.0</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>kidgrow-plugin-sms-biz</artifactId> <dependencies> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-api</artifactId> </dependency> </dependencies> </project> kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/Dockerfile
kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/main/java/com/kidgrow/sms/client/SmsClient.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/client/SmsClient.java @@ -1,4 +1,4 @@ package com.kidgrow.sms.aliyun.client; package com.kidgrow.sms.client; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -9,11 +9,12 @@ import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; import com.google.gson.Gson; import com.kidgrow.sms.aliyun.exception.SmsException; import com.kidgrow.sms.aliyun.template.BatchSmsTemplate; import com.kidgrow.sms.aliyun.template.SmsTemplate; import com.kidgrow.sms.aliyun.util.AliyunSmsUtils; import com.kidgrow.sms.exception.SmsException; import com.kidgrow.sms.template.BatchSmsTemplate; import com.kidgrow.sms.template.SmsTemplate; import com.kidgrow.sms.util.AliyunSmsUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.*; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/main/java/com/kidgrow/sms/exception/SmsException.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/exception/SmsException.java @@ -1,4 +1,4 @@ package com.kidgrow.sms.aliyun.exception; package com.kidgrow.sms.exception; import com.kidgrow.common.exception.KidgrowException; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/main/java/com/kidgrow/sms/service/AliyunSmsService.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/service/AliyunSmsService.java @@ -1,7 +1,7 @@ package com.kidgrow.sms.aliyun.service; package com.kidgrow.sms.service; import com.kidgrow.common.model.ResultBody; import com.kidgrow.sms.aliyun.model.SmsModel; import com.kidgrow.sms.model.SmsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/main/java/com/kidgrow/sms/template/BatchSmsTemplate.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/template/BatchSmsTemplate.java @@ -1,4 +1,4 @@ package com.kidgrow.sms.aliyun.template; package com.kidgrow.sms.template; import lombok.*; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/main/java/com/kidgrow/sms/template/SmsTemplate.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/template/SmsTemplate.java @@ -1,4 +1,4 @@ package com.kidgrow.sms.aliyun.template; package com.kidgrow.sms.template; import lombok.*; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/main/java/com/kidgrow/sms/util/AliyunSmsUtils.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/util/AliyunSmsUtils.java @@ -1,10 +1,10 @@ package com.kidgrow.sms.aliyun.util; package com.kidgrow.sms.util; import com.aliyuncs.CommonResponse; import com.google.gson.Gson; import com.kidgrow.sms.aliyun.exception.SmsException; import com.kidgrow.sms.aliyun.template.BatchSmsTemplate; import com.kidgrow.sms.aliyun.template.SmsTemplate; import com.kidgrow.sms.exception.SmsException; import com.kidgrow.sms.template.BatchSmsTemplate; import com.kidgrow.sms.template.SmsTemplate; import org.apache.commons.lang3.StringUtils; import java.util.Collection; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-biz/src/main/java/com/kidgrow/sms/util/SmsChuangLanUtils.java
New file @@ -0,0 +1,63 @@ package com.kidgrow.sms.util; import com.alibaba.fastjson.JSONObject; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.util.HashMap; import java.util.Map; public class SmsChuangLanUtils { public static void main(String[] args) { //短信下发 String sendUrl = "http://smssh1.253.com/msg/send/json"; Map map = new HashMap(); map.put("account","N2561124");//API账号 map.put("password","Mguj6qlRWX7b5e");//API密码 map.put("msg","123123");//短信内容 map.put("phone","18600376209");//手机号 map.put("report","false");//是否需要状态报告 JSONObject js = (JSONObject) JSONObject.toJSON(map); System.out.println(sendSmsByPost(sendUrl,js.toString())); } public static String send(Map map,String url){ JSONObject js = (JSONObject) JSONObject.toJSON(map); return sendSmsByPost(url,js.toString()); } public static String sendSmsByPost(String path, String postContent) { URL url = null; try { url = new URL(path); HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection(); httpURLConnection.setRequestMethod("POST"); httpURLConnection.setConnectTimeout(10000); httpURLConnection.setReadTimeout(10000); httpURLConnection.setDoOutput(true); httpURLConnection.setDoInput(true); httpURLConnection.setRequestProperty("Charset", "UTF-8"); httpURLConnection.setRequestProperty("Content-Type", "application/json"); httpURLConnection.connect(); OutputStream os=httpURLConnection.getOutputStream(); os.write(postContent.getBytes("UTF-8")); os.flush(); StringBuilder sb = new StringBuilder(); int httpRspCode = httpURLConnection.getResponseCode(); if (httpRspCode == HttpURLConnection.HTTP_OK) { BufferedReader br = new BufferedReader( new InputStreamReader(httpURLConnection.getInputStream(), "utf-8")); String line = null; while ((line = br.readLine()) != null) { sb.append(line); } br.close(); return sb.toString(); } } catch (Exception e) { e.printStackTrace(); } return null; } } kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/Dockerfilecopy from kidgrow-plugin/kidgrow-plugin-sms/Dockerfile copy to kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/Dockerfile
kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/pom.xml
New file @@ -0,0 +1,66 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>kidgrow-plugin-sms</artifactId> <groupId>com.kidgrow</groupId> <version>1.0</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>kidgrow-plugin-sms-center-server</artifactId> <dependencies> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-config</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-api</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-biz</artifactId> </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> <skip>true</skip> </configuration> </plugin> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <executions> <execution> <goals> <goal>repackage</goal> </goals> </execution> </executions> </plugin> <plugin> <groupId>com.spotify</groupId> <artifactId>dockerfile-maven-plugin</artifactId> <configuration> <!-- Dockerfile目录指定 --> <dockerfile>Dockerfile</dockerfile> <repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository> <!-- 生成镜像标签 如不指定 默认为latest --> <tag>1.0.1</tag> <!--<tag>${project.version}</tag>--> <buildArgs> <JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE> </buildArgs> </configuration> </plugin> </plugins> </build> </project> kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/SmsApplication.java
kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/aliyun/config/SmsAutoConfiguration.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/config/SmsAutoConfiguration.java @@ -1,6 +1,6 @@ package com.kidgrow.sms.aliyun.config; import com.kidgrow.sms.aliyun.client.SmsClient; import com.kidgrow.sms.client.SmsClient; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/aliyun/config/SmsProperties.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/config/SmsProperties.java @@ -1,6 +1,6 @@ package com.kidgrow.sms.aliyun.config; import com.kidgrow.sms.aliyun.template.SmsTemplate; import com.kidgrow.sms.template.SmsTemplate; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.boot.context.properties.ConfigurationProperties; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/aliyun/controller/SmsController.java
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/java/com/kidgrow/sms/aliyun/controller/SmsController.java @@ -3,11 +3,11 @@ import com.kidgrow.common.base.ResponseCode; import com.kidgrow.common.model.ResultBody; import com.kidgrow.redis.template.RedisRepository; import com.kidgrow.sms.aliyun.client.SmsClient; import com.kidgrow.sms.aliyun.exception.SmsException; import com.kidgrow.sms.aliyun.model.SmsModel; import com.kidgrow.sms.aliyun.service.AliyunSmsService; import com.kidgrow.sms.aliyun.util.AliyunSmsUtils; import com.kidgrow.sms.client.SmsClient; import com.kidgrow.sms.exception.SmsException; import com.kidgrow.sms.service.AliyunSmsService; import com.kidgrow.sms.model.SmsModel; import com.kidgrow.sms.util.AliyunSmsUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/lanchuang/controller/SmsChuangLanController.java
New file @@ -0,0 +1,157 @@ package com.kidgrow.sms.lanchuang.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.utils.DateUtils; import com.kidgrow.redis.util.RedisUtils; import com.kidgrow.sms.util.SmsChuangLanUtils; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; 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.RestController; import java.util.*; @RestController @RequestMapping("smsChangLan") @Api(tags = "创蓝短信模块") public class SmsChuangLanController { @Value("${chuanglan.sms.sendUrl}") private String CHUANGLAN_SMS_SENDURL; @Value("${chuanglan.sms.account}") private String CHUANGLAN_SMS_ACCOUNT; @Value("${chuanglan.sms.password}") private String CHUANGLAN_SMS_PASSWORD; @Value("${chuanglan.sms.num}") private Integer CHUANGLAN_SMS_NUM; @Value("${chuanglan.sms.timeLimit}") private Integer CHUANGLAN_SMS_TIMELIMIT; @Autowired private RedisUtils redisUtils; /** * type 为类型, "type":"LOGIN_SMS" 为登录,"type":"PASSWORD_SMS" 为密码找回,"type":"REGISTER_SMS" 为 * @param map * @return */ @PostMapping("send") public ResultBody sendVerificationCode(@RequestBody Map map) { if(CHUANGLAN_SMS_NUM==null){ CHUANGLAN_SMS_NUM=5; } Object phone = map.get("phone"); if (map.get("phone")==null||"".equals(map.get("phone"))){ return ResultBody.failed("请输入手机号"); } Object type = map.get("type"); if (map.get("type")==null||"".equals(map.get("type"))){ return ResultBody.failed("请输入保存的类型"); } String verificationCode=""; Random random=new Random(); for (int i = 0; i < 6; i++) { int i1 = random.nextInt(9); verificationCode+=i1; } try { //组装发送消息的内容 map.put("account", CHUANGLAN_SMS_ACCOUNT);//API账号 map.put("password", CHUANGLAN_SMS_PASSWORD);//API密码 map.put("report","false"); map.put("msg","您好,您的验证码是"+verificationCode); //在Redis中获取 Object hget = redisUtils.hget(map.get("type").toString(), map.get("phone").toString()); JSONObject jsonObject =new JSONObject(); Map<String,Object> cunMap=new HashMap<>(); cunMap.put("verificationCode",verificationCode); cunMap.put("count",CHUANGLAN_SMS_NUM);//总共 if(hget==null){ String send = SmsChuangLanUtils.send(map, CHUANGLAN_SMS_SENDURL); jsonObject=JSON.parseObject(send); String s1 = DateUtils.formatCurrentDateTime(); cunMap.put("date",s1); cunMap.put("remnant",CHUANGLAN_SMS_NUM-1);//剩余 Date date2 = DateUtils.addMilliseconds(DateUtils.parseDate(s1), CHUANGLAN_SMS_TIMELIMIT); cunMap.put("endTime",DateUtils.formatDateTime(date2)); }else { JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget)); Object remnantObject = redisJson.get("remnant"); if(remnantObject instanceof Integer){ Integer remnant=(Integer)remnantObject; if(remnant>0){ String send = SmsChuangLanUtils.send(map, CHUANGLAN_SMS_SENDURL); jsonObject=JSON.parseObject(send); String s1 = DateUtils.formatCurrentDateTime(); cunMap.put("date",DateUtils.formatCurrentDateTime()); cunMap.put("remnant",remnant-1);//剩余 Date date2 = DateUtils.addMilliseconds(DateUtils.parseDate(s1), CHUANGLAN_SMS_TIMELIMIT); cunMap.put("endTime",DateUtils.formatDateTime(date2)); }else{ return ResultBody.failed().data("每个手机号限用5次"); } }else { return ResultBody.failed(); } } if ("0".equals(jsonObject.get("code"))) { redisUtils.hset(map.get("type").toString(), map.get("phone").toString(),cunMap,getSecondsNextEarlyMorning()); return ResultBody.ok().data(verificationCode); } else { return ResultBody.failed(); } } catch (Exception e) { e.printStackTrace(); return ResultBody.failed(); } } @PostMapping("verification") public ResultBody verification(@RequestBody Map<String,Object> map){ Object phone = map.get("phone"); if (map.get("phone")==null||"".equals(map.get("phone"))){ return ResultBody.failed("请输入手机号"); } Object verificationCode = map.get("verificationCode"); if (map.get("verificationCode")==null||"".equals(map.get("verificationCode"))){ return ResultBody.failed("请输入保存的类型"); } Object type = map.get("type"); if (map.get("type")==null||"".equals(map.get("type"))){ return ResultBody.failed("请输入保存的类型"); } Object hget = redisUtils.hget(map.get("type").toString(), map.get("phone").toString()); if(hget!=null){ JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget)); Object verificationCodeObject = redisJson.get("verificationCode"); if(verificationCode.equals(verificationCodeObject)){ Object date = redisJson.get("date"); long time = DateUtils.addMilliseconds(DateUtils.parseDate(date.toString()), CHUANGLAN_SMS_TIMELIMIT).getTime(); Date dateNow=new Date(); long timeNow = dateNow.getTime(); if(timeNow<=time){ return ResultBody.ok(); }else { return ResultBody.failed("验证码超时"); } }else { return ResultBody.failed("验证码错误"); } }else { return ResultBody.failed("该手机号没有验证码"); } } //获取 存放 Redis的时间 public Long getSecondsNextEarlyMorning() { Calendar cal = Calendar.getInstance(); cal.add(Calendar.DAY_OF_YEAR, 1); // 改成这样就好了 cal.set(Calendar.HOUR_OF_DAY, 0); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.MILLISECOND, 0); return (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000; } } kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/resources/application.yml
File was renamed from kidgrow-plugin/kidgrow-plugin-sms/src/main/resources/application.yml @@ -1,3 +1,11 @@ #创蓝 chuanglan: sms: sendUrl: http://smssh1.253.com/msg/send/json account: N2561124 password: Mguj6qlRWX7b5e num: 5 timeLimit: 720000 #阿里云相关 aliyun: sms: @@ -34,9 +42,7 @@ port: 8008 # context-path: / spring: application: name: sms-service eureka: instance: @@ -46,4 +52,7 @@ prefer-ip-address: true client: serviceUrl: defaultZone: ${kidgrow.eureka.client.serviceUrl.defaultZone} defaultZone: ${kidgrow.eureka.client.serviceUrl.defaultZone} spring: application: name: sms-service-server kidgrow-plugin/kidgrow-plugin-sms/pom.xml
@@ -10,58 +10,25 @@ <modelVersion>4.0.0</modelVersion> <artifactId>kidgrow-plugin-sms</artifactId> <packaging>pom</packaging> <modules> <module>kidgrow-plugin-sms-api</module> <module>kidgrow-plugin-sms-biz</module> <module>kidgrow-plugin-sms-center-server</module> </modules> <dependencies> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-config</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-common-spring-boot-starter</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-redis-spring-boot-starter</artifactId> </dependency> <dependency> <groupId>com.aliyun</groupId> <artifactId>aliyun-java-sdk-core</artifactId> </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> <skip>true</skip> </configuration> </plugin> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <executions> <execution> <goals> <goal>repackage</goal> </goals> </execution> </executions> </plugin> <plugin> <groupId>com.spotify</groupId> <artifactId>dockerfile-maven-plugin</artifactId> <configuration> <!-- Dockerfile目录指定 --> <dockerfile>Dockerfile</dockerfile> <repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository> <!-- 生成镜像标签 如不指定 默认为latest --> <tag>1.0.1</tag> <!--<tag>${project.version}</tag>--> <buildArgs> <JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE> </buildArgs> </configuration> </plugin> </plugins> </build> </project> kidgrow-springcloud/kidgrow-springcloud-zuul/pom.xml
@@ -12,6 +12,10 @@ <artifactId>kidgrow-springcloud-zuul</artifactId> <dependencies> <!-- <dependency>--> <!-- <groupId>com.kidgrow</groupId>--> <!-- <artifactId>kidgrow-usercenter-api</artifactId>--> <!-- </dependency>--> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-config</artifactId> kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/feign/SysDoctorService.java
@@ -2,15 +2,11 @@ import com.kidgrow.common.constant.ServiceNameConstants; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysUserOrg; import com.kidgrow.zuul.feign.fallback.SysDoctorServiceFallbackFactory; import com.kidgrow.zuul.feign.fallback.SysUserOrgServiceFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; /** kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/feign/fallback/SysDoctorServiceFallbackFactory.java
@@ -1,14 +1,11 @@ package com.kidgrow.zuul.feign.fallback; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysUserOrg; import com.kidgrow.zuul.feign.SysDoctorService; import com.kidgrow.zuul.feign.SysOrganizationService; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; /** kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
@@ -1,6 +1,5 @@ package com.kidgrow.zuul.filter; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.constant.SecurityConstants; @@ -24,7 +23,6 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.util.HashMap; import java.util.List; @@ -45,7 +43,7 @@ @Component public class UserInfoHeaderFilter extends ZuulFilter { @Autowired SysDoctorService sysDoctorService; private SysDoctorService sysDoctorService; @Override public String filterType() { return FilterConstants.PRE_TYPE; kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -234,5 +234,4 @@ butler: auto-generate-from-zuul-routes: true generate-routes: user,file,log,codegenerator,auth apiDocsPath: v2/api-docs apiDocsPath: v2/api-docs kidgrow-web/kidgrow-web-manager/src/main/resources/static/.vscode/settings.json
New file @@ -0,0 +1,3 @@ { "liveServer.settings.port": 5501 } pom.xml
@@ -164,6 +164,26 @@ <!-- 自定义 starter --> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-center-server</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-biz</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-config</artifactId> <version>${project.version}</version> </dependency>