无关风月
2025-02-07 643cccdfd2c00285cfdce0be609f7cd909207ad6
bug修改
1个文件已添加
4个文件已修改
55 ■■■■ 已修改文件
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/UploadPdfDTO.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java
@@ -153,7 +153,11 @@
     * @param chargeGun 桩编号
     * @return
     */
    public static String faultMsg(String phone,String site,String chargeGun){
        // 去除特殊字符 比如.-/{(等等
        site = site.replaceAll("[\\p{P}+~$`^=|<>~`$^+=|<>¥×]", "");
        SubmitTempletReq submitReq = new SubmitTempletReq();
        if(site.length()<=10){
            String[] paramss = {site,chargeGun};
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -118,7 +118,11 @@
    
    public static void main(String[] args) {
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        String encode = passwordEncoder.encode("49a15811ea47e8e9c6d8f3ef4d7bbc54");
        String encode = passwordEncoder.encode("0173940ec8314d1671c2ba365d28fcc1");
        System.err.println(encode);
//        String s = encryptPassword("0173940ec8314d1671c2ba365d28fcc1");
//        System.err.println(s);
//        boolean b = matchesPassword("0173940ec8314d1671c2ba365d28fcc1", "$2a$10$5ViClN9ACi9jM7W9wLqmJ.kgpYhT7da7sWvBDI5j2fXKNrBakUdQS");
//        System.err.println(b);
    }
}
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -1326,6 +1326,14 @@
    }
    
    
    public static void main(String[] args) {
//        String reqStr1 = MsgUtil.codeMsg("19983174515", "123456");
//        String result1 = HttpUtils.post(MsgConstants.SEND_URL, reqStr1);
        String reqStr3 = MsgUtil.faultMsg("18398968484", "长河服务区充电站(遂", "123");
        String result3 = HttpUtils.post(MsgConstants.SEND_URL, reqStr3);
        System.err.println(result3);
    }
    @PostMapping(value = "/user/logOut")
    @ApiOperation(value = "退出登录", tags = {"小程序-个人中心"})
    public AjaxResult logOut(){
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -15,10 +15,7 @@
import com.ruoyi.order.api.model.TOrderInvoice;
import com.ruoyi.order.api.query.TOrderInvoiceQuery;
import com.ruoyi.order.api.vo.TOrderInvoiceVO;
import com.ruoyi.order.dto.AddOrderInvoice;
import com.ruoyi.order.dto.GetOrderInvoiceList;
import com.ruoyi.order.dto.MyOrderInvoiceInfo;
import com.ruoyi.order.dto.OrderInvoiceList;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.export.OrderInvoiceExport;
import com.ruoyi.order.service.TOrderInvoiceService;
import io.swagger.annotations.Api;
@@ -80,12 +77,11 @@
    
    
    @RequiresPermissions(value = {"/invoiceManagement/accept_hear_case"}, logical = Logical.OR)
    @GetMapping("/uploadPdf")
    @PostMapping("/uploadPdf")
    @ApiOperation(value = "上传发票", tags = {"管理后台-发票管理"})
    public AjaxResult<String> uploadPdf(@RequestParam("id") Long id,
                                        @RequestParam("invoiceUrl") String invoiceUrl){
        TOrderInvoice orderInvoice = orderInvoiceService.getById(id);
        orderInvoice.setInvoiceUrl(invoiceUrl);
    public AjaxResult<String> uploadPdf(@RequestBody UploadPdfDTO dto){
        TOrderInvoice orderInvoice = orderInvoiceService.getById(dto.getId());
        orderInvoice.setInvoiceUrl(dto.getInvoiceUrl());
        orderInvoice.setStatus(3);
        orderInvoiceService.updateById(orderInvoice);
        // 发送邮箱
@@ -145,7 +141,7 @@
            // 组装附件
            MimeBodyPart filePart = new MimeBodyPart();
            String imageUrl = invoiceUrl;
            String imageUrl = dto.getInvoiceUrl();
            try {
                // 下载数据
                URL url = new URL(imageUrl);
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/UploadPdfDTO.java
New file
@@ -0,0 +1,21 @@
package com.ruoyi.order.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
 * @author zhibing.pu
 * @Date 2024/8/20 13:54
 */
@Data
@ApiModel(value = "上传发票")
public class UploadPdfDTO {
    @ApiModelProperty("发票id")
    public Long id;
    @ApiModelProperty("文件路径")
    private String invoiceUrl;
}