最新版本

wang-hao-jie

2022-08-25 59feba9fab96f893003137eae393ed646ec07c0e

最新版本

 xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java

@@ -131,7 +131,7 @@
                // 自定义权限拒绝处理类
                .exceptionHandling().accessDeniedHandler(accessDeniedHandler)
                .and()
                // 图形验证码过滤器
                //图形验证码过滤器
                //.addFilterBefore(imageValidateFilter, UsernamePasswordAuthenticationFilter.class)
                // 短信验证码过滤器
                //.addFilterBefore(smsValidateFilter, UsernamePasswordAuthenticationFilter.class)

 xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java

@@ -15,7 +15,7 @@
 * 用户接口
 * @author Exrickx
 */
@CacheConfig(cacheNames = "user")
//@CacheConfig(cacheNames = "user")
public interface UserService extends XbootBaseService<User, String> {

    /**
@@ -23,7 +23,7 @@
     * @param username
     * @return
     */
    @Cacheable(key = "#username")
    //@Cacheable(key = "#username")
    User findByUsername(String username);

    /**

 xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/CaptchaController.java

@@ -1,139 +1,144 @@
//package cn.exrick.xboot.base.controller.common;
//
//import cn.exrick.xboot.core.common.annotation.RateLimiter;
//import cn.exrick.xboot.core.common.constant.CommonConstant;
//import cn.exrick.xboot.core.common.redis.RedisTemplateHelper;
//import cn.exrick.xboot.core.common.sms.SmsUtil;
//import cn.exrick.xboot.core.common.utils.CommonUtil;
//import cn.exrick.xboot.core.common.utils.CreateVerifyCode;
//import cn.exrick.xboot.core.common.utils.IpInfoUtil;
//import cn.exrick.xboot.core.common.utils.ResultUtil;
//import cn.exrick.xboot.core.common.vo.Result;
//import cn.exrick.xboot.core.service.SettingService;
//import cn.exrick.xboot.core.service.UserService;
//import cn.hutool.core.util.IdUtil;
//import cn.hutool.core.util.StrUtil;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.transaction.annotation.Transactional;
//import org.springframework.web.bind.annotation.PathVariable;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestMethod;
//import org.springframework.web.bind.annotation.RestController;
//
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//import java.io.IOException;
//import java.util.concurrent.TimeUnit;
//
///**
// * @author Exrickx
// */
//@Api(tags = "验证码接口")
//@RequestMapping("/xboot/common/captcha")
//@RestController
//@Transactional
//@Slf4j
//public class CaptchaController {
//
//    @Autowired
//    private SmsUtil smsUtil;
//
//    @Autowired
//    private RedisTemplateHelper redisTemplate;
//
//    @Autowired
//    private IpInfoUtil ipInfoUtil;
//
//    @Autowired
//    private UserService userService;
//
//    @Autowired
//    private SettingService settingService;
//
//    @RequestMapping(value = "/init", method = RequestMethod.GET)
//    @ApiOperation(value = "初始化验证码")
//    public Result<Object> initCaptcha() {
//
//        String captchaId = IdUtil.simpleUUID();
//        String code = new CreateVerifyCode().randomStr(4);
//        // 缓存验证码
//        redisTemplate.set(captchaId, code, 2L, TimeUnit.MINUTES);
//        return ResultUtil.data(captchaId);
//    }
//
//    @RequestMapping(value = "/draw/{captchaId}", method = RequestMethod.GET)
//    @ApiOperation(value = "根据验证码ID获取图片")
//    public void drawCaptcha(@PathVariable("captchaId") String captchaId,
//                            HttpServletResponse response) throws IOException {
//
//        // 得到验证码 生成指定验证码
//        String code = redisTemplate.get(captchaId);
//        CreateVerifyCode vCode = new CreateVerifyCode(116, 36, 4, 10, code);
//        response.setContentType("image/png");
//        vCode.write(response.getOutputStream());
//    }
//
//    @RequestMapping(value = "/sendRegistSms/{mobile}", method = RequestMethod.GET)
//    @ApiOperation(value = "发送注册短信验证码")
//    public Result<Object> sendRegistSmsCode(@PathVariable String mobile, HttpServletRequest request) {
//
//        return sendSms(mobile, 2, 0, request);
//    }
//
//    @RequestMapping(value = "/sendLoginSms/{mobile}", method = RequestMethod.GET)
//    @ApiOperation(value = "发送登录短信验证码")
//    @RateLimiter(name="sendLoginSms", rate = 1, ipLimit = true)
//    public Result<Object> sendLoginSmsCode(@PathVariable String mobile, HttpServletRequest request) {
//
//        return sendSms(mobile, 1, 0, request);
//    }
//
//    @RequestMapping(value = "/sendResetSms/{mobile}", method = RequestMethod.GET)
//    @ApiOperation(value = "发送重置密码短信验证码")
//    public Result<Object> sendResetSmsCode(@PathVariable String mobile, HttpServletRequest request) {
//
//        return sendSms(mobile, 1, 5, request);
//    }
//
//    @RequestMapping(value = "/sendEditMobileSms/{mobile}", method = RequestMethod.GET)
//    @ApiOperation(value = "发送修改手机短信验证码")
//    public Result<Object> sendEditMobileSmsCode(@PathVariable String mobile, HttpServletRequest request) {
//
//        if (userService.findByMobile(mobile) != null) {
//            return ResultUtil.error("该手机号已绑定账户");
//        }
//        return sendSms(mobile, 0, 0, request);
//    }
//
//    /**
//     * @param mobile       手机号
//     * @param range        发送范围 0发送给所有手机号 1只发送给注册手机 2只发送给未注册手机
//     * @param templateType 0通用模版 1注册 2登录 3修改手机 4修改密码 5重置密码 6工作流模版
//     */
//    public Result<Object> sendSms(String mobile, Integer range, Integer templateType, HttpServletRequest request) {
//
//        if (range == 1 && userService.findByMobile(mobile) == null) {
//            return ResultUtil.error("手机号未注册");
//        } else if (range == 2 && userService.findByMobile(mobile) != null) {
//            return ResultUtil.error("手机号已注册");
//        }
//        // IP限流 1分钟限1个请求
//        String key = "sendSms:" + ipInfoUtil.getIpAddr(request);
//        String value = redisTemplate.get(key);
//        if (StrUtil.isNotBlank(value)) {
//            return ResultUtil.error("您发送的太频繁啦，请稍后再试");
//        }
//        // 生成6位数验证码
//        String code = CommonUtil.getRandomNum();
//        // 缓存验证码
//        redisTemplate.set(CommonConstant.PRE_SMS + mobile, code, 5L, TimeUnit.MINUTES);
//        // 发送验证码
//        smsUtil.sendCode(mobile, code, templateType);
//        // 请求成功 标记限流
//        redisTemplate.set(key, "sended", 1L, TimeUnit.MINUTES);
//        return ResultUtil.success("发送短信验证码成功");
//    }
//}
package cn.exrick.xboot.base.controller.common;

import cn.exrick.xboot.core.common.annotation.RateLimiter;
import cn.exrick.xboot.core.common.constant.CommonConstant;
import cn.exrick.xboot.core.common.redis.RedisTemplateHelper;
import cn.exrick.xboot.core.common.sms.SmsUtil;
import cn.exrick.xboot.core.common.utils.CommonUtil;
import cn.exrick.xboot.core.common.utils.CreateVerifyCode;
import cn.exrick.xboot.core.common.utils.IpInfoUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.core.service.SettingService;
import cn.exrick.xboot.core.service.UserService;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;

/**
 * @author Exrickx
 */
@Api(tags = "验证码接口")
@RequestMapping("/xboot/common/captcha")
@RestController
@Transactional
@Slf4j
public class CaptchaController {

    @Autowired
    private SmsUtil smsUtil;

    @Autowired
    private RedisTemplateHelper redisTemplate;

    @Autowired
    private IpInfoUtil ipInfoUtil;

    @Autowired
    private UserService userService;

    @Autowired
    private SettingService settingService;

    @RequestMapping(value = "/init", method = RequestMethod.GET)
    @ApiOperation(value = "初始化验证码")
    public Result<Object> initCaptcha() {

        String captchaId = IdUtil.simpleUUID();
        String code = new CreateVerifyCode().randomStr(4);
        // 缓存验证码
        redisTemplate.set(captchaId, code, 2L, TimeUnit.MINUTES);
        Map<String,String> map = new HashMap<String,String>();
        map.put("captchaId",captchaId);
        map.put("code",code);
        return ResultUtil.data(map);
    }

    @RequestMapping(value = "/draw/{captchaId}", method = RequestMethod.GET)
    @ApiOperation(value = "根据验证码ID获取图片")
    public void drawCaptcha(@PathVariable("captchaId") String captchaId,
                            HttpServletResponse response) throws IOException {

        // 得到验证码 生成指定验证码
        String code = redisTemplate.get(captchaId);
        CreateVerifyCode vCode = new CreateVerifyCode(116, 36, 4, 10, code);
        response.setContentType("image/png");
        vCode.write(response.getOutputStream());
    }

    @RequestMapping(value = "/sendRegistSms/{mobile}", method = RequestMethod.GET)
    @ApiOperation(value = "发送注册短信验证码")
    public Result<Object> sendRegistSmsCode(@PathVariable String mobile, HttpServletRequest request) {

        return sendSms(mobile, 2, 0, request);
    }

    @RequestMapping(value = "/sendLoginSms/{mobile}", method = RequestMethod.GET)
    @ApiOperation(value = "发送登录短信验证码")
    @RateLimiter(name="sendLoginSms", rate = 1, ipLimit = true)
    public Result<Object> sendLoginSmsCode(@PathVariable String mobile, HttpServletRequest request) {

        return sendSms(mobile, 1, 0, request);
    }

    @RequestMapping(value = "/sendResetSms/{mobile}", method = RequestMethod.GET)
    @ApiOperation(value = "发送重置密码短信验证码")
    public Result<Object> sendResetSmsCode(@PathVariable String mobile, HttpServletRequest request) {

        return sendSms(mobile, 1, 5, request);
    }

    @RequestMapping(value = "/sendEditMobileSms/{mobile}", method = RequestMethod.GET)
    @ApiOperation(value = "发送修改手机短信验证码")
    public Result<Object> sendEditMobileSmsCode(@PathVariable String mobile, HttpServletRequest request) {

        if (userService.findByMobile(mobile) != null) {
            return ResultUtil.error("该手机号已绑定账户");
        }
        return sendSms(mobile, 0, 0, request);
    }

    /**
     * @param mobile       手机号
     * @param range        发送范围 0发送给所有手机号 1只发送给注册手机 2只发送给未注册手机
     * @param templateType 0通用模版 1注册 2登录 3修改手机 4修改密码 5重置密码 6工作流模版
     */
    public Result<Object> sendSms(String mobile, Integer range, Integer templateType, HttpServletRequest request) {

        if (range == 1 && userService.findByMobile(mobile) == null) {
            return ResultUtil.error("手机号未注册");
        } else if (range == 2 && userService.findByMobile(mobile) != null) {
            return ResultUtil.error("手机号已注册");
        }
        // IP限流 1分钟限1个请求
        String key = "sendSms:" + ipInfoUtil.getIpAddr(request);
        String value = redisTemplate.get(key);
        if (StrUtil.isNotBlank(value)) {
            return ResultUtil.error("您发送的太频繁啦，请稍后再试");
        }
        // 生成6位数验证码
        String code = CommonUtil.getRandomNum();
        // 缓存验证码
        redisTemplate.set(CommonConstant.PRE_SMS + mobile, code, 5L, TimeUnit.MINUTES);
        // 发送验证码
        smsUtil.sendCode(mobile, code, templateType);
        // 请求成功 标记限流
        redisTemplate.set(key, "sended", 1L, TimeUnit.MINUTES);
        return ResultUtil.success("发送短信验证码成功");
    }
}

 xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java

@@ -231,9 +231,9 @@

        User user = securityUtil.getCurrUser();
        // 在线DEMO所需
        if (user.getType()==0) {
            return ResultUtil.error("业务账号不支持修改密码");
        }
//        if (user.getType()==0) {
//            return ResultUtil.error("业务账号不支持修改密码");
//        }

        if (!new BCryptPasswordEncoder().matches(password, user.getPassword())) {
            return ResultUtil.error("旧密码不正确");
@@ -241,11 +241,15 @@

        String newEncryptPass = new BCryptPasswordEncoder().encode(newPass);
        user.setPassword(newEncryptPass);
        if(StrUtil.isEmpty(passStrength)){
            passStrength="强";
        }
        user.setPassStrength(passStrength);
        user.setDescription(newPass);
        userService.update(user);

        // 手动更新缓存
        redisTemplate.delete(USER + user.getUsername());
        //redisTemplate.delete(USER + user.getUsername());

        return ResultUtil.success("修改密码成功");
    }

 xboot-modules/xboot-generator/src/main/java/cn/exrick/xboot/generator/XbootMPGenerator.java

@@ -33,13 +33,13 @@
     * 实体类名
     * 建议仅需修改
     */
    private static final String CLASS_NAME = "DuoZheng";
    private static final String CLASS_NAME = "CarLocation";

    /**
     * 类说明描述
     * 建议仅需修改
     */
    private static final String DESCRIPTION = "一户多证表";
    private static final String DESCRIPTION = "车辆定位表";

    /**
     * 作者名

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/TestController.java

@@ -5,6 +5,7 @@
import cn.exrick.xboot.core.common.lock.RedisLockTemplate;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.Result;
import cn.hutool.core.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;

import java.util.Date;
import java.util.concurrent.TimeUnit;

/**

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java

@@ -144,9 +144,11 @@
        wrapper.eq("code",code);
        wrapper.isNotNull("user_id");
        Fingerprint one = iFingerprintService.getOne(wrapper);
        User byUsername = userService.findByUsername(one.getUsername());
        if(byUsername==null){
        User user = userService.findByUsername(one.getUsername());
        if(user==null){
            return ResultUtil.error("用户已删除");
        }else{
            one.setPassword(user.getDescription());
        }
        return new ResultUtil<Object>().setData(one);
    }
@@ -212,6 +214,7 @@
        }
    }


    @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
    @ApiOperation(value = "编辑或更新数据")
    public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) {

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java

@@ -165,10 +165,17 @@

        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = getFormatDate(sendTime);
        wrapper2.eq("a.area_id",area.getId());
        wrapper2.eq("a.send_date",format);
        wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
        List<OrderTask> list = iOrderTaskService.list2(wrapper2);
//        wrapper2.eq("a.area_id",area.getId());
//        wrapper2.eq("a.send_date",format);
//        wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
        //List<OrderTask> list = iOrderTaskService.list2(wrapper2);
        wrapper2.eq("area_id",area.getId());
        wrapper2.eq("send_date",format);
        wrapper2.orderByAsc("seq").orderByAsc("status");
        List<OrderTask> list = iOrderTaskService.list(wrapper2);
        for(OrderTask obj:list){
            obj.setCode(obj.getLinker());
        }
        return new ResultUtil<List<OrderTask>>().setData(list);
    }

@@ -192,8 +199,15 @@
            wrapper2.eq("area_id",area.getId());
            wrapper2.eq("send_date",format);
            wrapper2.eq("status",0);
            wrapper2.orderByAsc("seq");
            List<OrderTask> list = iOrderTaskService.list(wrapper2);
            //wrapper2.orderByAsc("seq");

            PageVo page = new PageVo();
            page.setSort("seq");
            page.setOrder("asc");
            page.setPageSize(1);
            page.setPageNumber(0);
            List<OrderTask> list = iOrderTaskService.page(PageUtil.initMpPage(page),wrapper2).getRecords();
            //List<OrderTask> list = iOrderTaskService.list(wrapper2);
            if(list.size()>0){
                orderTask = list.get(0);
            }else{

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java

@@ -34,6 +34,7 @@
    @Autowired
    private IOrderLogService iOrderLogService;


    @RequestMapping(value = "/getCarCount", method = RequestMethod.GET)
    @ApiOperation(value = "获取车辆数目")
    public Result<Object> getCarCount() {

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java

@@ -101,11 +101,14 @@
    @ApiModelProperty(value = "耗时 毫秒")
    private int time;

    @Transient
    @TableField(exist = false)
//    @Transient
//    @TableField(exist = false)
    @ApiModelProperty(value = "商户名称")
    private String customerName;

    @ApiModelProperty(value = "商户联系人")
    private String linker;

    @Transient
    @TableField(exist = false)
    @ApiModelProperty(value = "商户")

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java

@@ -45,7 +45,8 @@
            BeanUtil.copyProperties(orderTask,orderTask2);

            orderTask2.setUserName(getUser(orderTask.getUserId()));
            orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
            //orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
            //orderTask2.setCustomerName(orderTask.getCustomerName());
            list2.add(orderTask2);
        }
        iOrderTask2Service.saveBatch(list2);

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java

@@ -33,7 +33,7 @@
    @Scheduled(cron="0 0 21 * * ?")//每晚下午9点执行
    //@Scheduled(cron="0 33 17 * * ?")//测试
    public void execute(){
        String day = getDay(-14);
        String day = getDay(-10);
        QueryWrapper<OrderTask> wrapper = new QueryWrapper<>();
        wrapper.lt("send_Date",day);
        iOrderTaskService.remove(wrapper);
@@ -42,7 +42,7 @@
        wrapper2.lt("create_time",day+" 00:00:00");
        iOrderDetailService.remove(wrapper2);

        String day2 = getDay(-30);
        String day2 = getDay(-20);
        QueryWrapper<OrderTaskOriginal> wrapper3 = new QueryWrapper<>();
        wrapper3.lt("create_time",day2+" 00:00:00");
        iOrderTaskOriginalService.remove(wrapper3);

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java

@@ -59,7 +59,10 @@
                orderTask.setAreaId(area.getId());
                orderTask.setCarId(area.getCarId());
                orderTask.setAreaSectionId(getAreaSection(orderTask.getAreaId(),original.getAreaSection()));
                orderTask.setCustomerId(getCustomer(original.getCustomerCode(),original.getCustomerName(),original.getCustomerPhone(),original.getLinker(),orderTask.getAreaId(),orderTask.getAreaSectionId()));
                Customer customer = getCustomer(original.getCustomerCode(), original.getCustomerName(), original.getCustomerPhone(), original.getLinker(), orderTask.getAreaId(), orderTask.getAreaSectionId());
                orderTask.setCustomerId(customer.getId());
                orderTask.setCustomerName(customer.getName());
                orderTask.setLinker(customer.getLinker());
                orderTask.setEndDate(original.getPacketDate());
                orderTask.setSendDate(original.getSendDate());
                orderTask.setOrderDate(original.getOrderDate());
@@ -118,7 +121,7 @@
        }
    }

    public String getCustomer(String customerCode,String customerName,String customerPhone,String linker,String areaId,String areaSectionId){
    public Customer getCustomer(String customerCode,String customerName,String customerPhone,String linker,String areaId,String areaSectionId){
        QueryWrapper<Customer> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("licence",customerCode);
        Customer one = iCustomerService.getOne(queryWrapper);
@@ -132,12 +135,12 @@
            customer.setAreaSectionId(areaSectionId);
            customer.setKstatus(1);
            iCustomerService.saveOrUpdate(customer);
            return customer.getId();
            return customer;
        }
        one.setAreaId(areaId);
        one.setAreaSectionId(areaSectionId);
        iCustomerService.saveOrUpdate(one);
        return one.getId();
        return one;
    }

    public Area getArea(String name){