feat: 优化excel导入

.drone.yml

@@ -39,3 +39,7 @@ volumes: # 定义流水线挂载目录，用于共享数据
   - name: maven-cache
     host:
       path: /home/cache
+
+trigger:
+  branch:
+    - master

src/main/java/cn/ezhizao/project/business/company/domain/BizCompany.java

@@ -20,318 +20,451 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
  */
 @Data
 @TableName(value = "biz_company")
-public class BizCompany extends BaseEntity
-{
+public class BizCompany extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 合作伙伴分类：1、客户；2、供应商；3、外协商 */
+    /**
+     * 合作伙伴分类：1、客户；2、供应商；3、外协商
+     */
     @Excel(name = "合作伙伴分类：1、客户；2、供应商；3、外协商")
     @ApiModelProperty(value = "合作伙伴分类：1、客户；2、供应商；3、外协商")
     private String category;
 
-    /** 客户编码 */
+    /**
+     * 客户编码
+     */
     @Excel(name = "客户编码")
     @ApiModelProperty(value = "客户编码")
     private String code;
 
-    /** 客户名称 */
+    /**
+     * 客户名称
+     */
     @Excel(name = "客户名称")
     @ApiModelProperty(value = "客户名称")
     private String name;
 
-    /** 客户简称 */
+    /**
+     * 客户简称
+     */
     @Excel(name = "客户简称")
     @ApiModelProperty(value = "客户简称")
     private String shortName;
 
-    /** 曾用名 */
+    /**
+     * 曾用名
+     */
     @Excel(name = "曾用名")
     @ApiModelProperty(value = "曾用名")
     private String oldName;
 
-    /** 所有权人 */
+    /**
+     * 所有权人
+     */
     @Excel(name = "所有权人")
     @ApiModelProperty(value = "所有权人")
     private String owner;
 
-    /** 所有权人ID外键（字典所有权人分类） */
+    /**
+     * 所有权人ID外键（字典所有权人分类）
+     */
     @ApiModelProperty(value = "所有权人")
     private Long ownerId;
 
-    /** 企业电话 */
+    /**
+     * 企业电话
+     */
     @Excel(name = "企业电话")
     @ApiModelProperty(value = "企业电话")
     private String phone;
 
-    /** 企业邮箱 */
+    /**
+     * 企业邮箱
+     */
     @Excel(name = "企业邮箱")
     @ApiModelProperty(value = "企业邮箱")
     private String email;
 
-    /** 联系地址 */
+    /**
+     * 联系地址
+     */
     @Excel(name = "联系地址")
     @ApiModelProperty(value = "联系地址")
     private String contactAddress;
 
-    /** 客户阶段字典分类外键 */
+    /**
+     * 客户阶段字典分类外键
+     */
     @ApiModelProperty(value = "联系地址")
     private Long stageId;
 
-    /** 等级，对应的是数据字典外键 */
+    /**
+     * 等级，对应的是数据字典外键
+     */
     @ApiModelProperty(value = "联系地址")
     private Long companyLevelId;
 
-    /** 客户来源：与合同来源共用一个数据源 */
+    /**
+     * 客户来源：与合同来源共用一个数据源
+     */
     @ApiModelProperty(value = "联系地址")
     private Long sourceCategoryId;
 
-    /** 客户来源 */
+    /**
+     * 客户来源
+     */
     @Excel(name = "客户来源")
     @ApiModelProperty(value = "客户来源")
     private String source;
 
-    /** 客户来源： */
+    /**
+     * 客户来源：
+     */
     @ApiModelProperty(value = "客户来源")
     private Long sourceId;
 
-    /** 企业类型 */
+    /**
+     * 企业类型
+     */
     @Excel(name = "企业类型")
     @ApiModelProperty(value = "企业类型")
     private String type;
 
-    /** 企业类型字典分类外键 */
+    /**
+     * 企业类型字典分类外键
+     */
     @ApiModelProperty(value = "企业类型")
     private Long typeId;
 
-    /** 社会信用代码 */
+    /**
+     * 社会信用代码
+     */
     @Excel(name = "社会信用代码")
     @ApiModelProperty(value = "社会信用代码")
     private String socialCreditCode;
 
-    /** 主营业务 */
+    /**
+     * 主营业务
+     */
     @Excel(name = "主营业务")
     @ApiModelProperty(value = "主营业务")
     private String mainBusiness;
 
-    /** 主营行业字典分类外键 */
+    /**
+     * 主营行业字典分类外键
+     */
     @ApiModelProperty(value = "主营业务")
     private Long mainBusinessId;
 
-    /** 法定代表人 */
+    /**
+     * 法定代表人
+     */
     @Excel(name = "法定代表人")
     @ApiModelProperty(value = "法定代表人")
     private String legalRepresentative;
 
-    /** 成立日期 */
+    /**
+     * 成立日期
+     */
     @Excel(name = "成立日期")
     @ApiModelProperty(value = "成立日期")
     private String foundationDate;
 
-    /** 出执照日期 */
+    /**
+     * 出执照日期
+     */
     @Excel(name = "出执照日期")
     @ApiModelProperty(value = "出执照日期")
     private String licenceDate;
 
-    /** 营业开始时间 */
+    /**
+     * 营业开始时间
+     */
     @Excel(name = "营业开始时间")
     @ApiModelProperty(value = "营业开始时间")
     private String businessStartDate;
 
-    /** 营业结束时间 */
+    /**
+     * 营业结束时间
+     */
     @Excel(name = "营业结束时间")
     @ApiModelProperty(value = "营业结束时间")
     private String businessEndDate;
 
-    /** 长期有效否 */
+    /**
+     * 长期有效否
+     */
     @Excel(name = "长期有效否")
     @ApiModelProperty(value = "长期有效否")
     private Integer isPermanentlyEffective;
 
-    /** 注册资金 */
+    /**
+     * 注册资金
+     */
     @Excel(name = "注册资金")
     @ApiModelProperty(value = "注册资金")
     private String registerMoney;
 
-    /** 注册资金单位 */
+    /**
+     * 注册资金单位
+     */
     @Excel(name = "注册资金单位")
     @ApiModelProperty(value = "注册资金单位")
     private String registerMoneyUnit;
 
-    /** 注册资金数据字典id */
+    /**
+     * 注册资金数据字典id
+     */
     @ApiModelProperty(value = "注册资金单位")
     private Long registerMoneyUnitId;
 
-    /** 注册省份编码 */
+    /**
+     * 注册省份编码
+     */
     @Excel(name = "注册省份编码")
     @ApiModelProperty(value = "注册省份编码")
     private String provinceCode;
 
-    /** 省 */
+    /**
+     * 省
+     */
     @Excel(name = "省")
     @ApiModelProperty(value = "省")
     private String province;
 
-    /** 注册城市编码 */
+    /**
+     * 注册城市编码
+     */
     @Excel(name = "注册城市编码")
     @ApiModelProperty(value = "注册城市编码")
     private String cityCode;
 
-    /** 市 */
+    /**
+     * 市
+     */
     @Excel(name = "市")
     @ApiModelProperty(value = "市")
     private String city;
 
-    /** 注册行政区编码 */
+    /**
+     * 注册行政区编码
+     */
     @Excel(name = "注册行政区编码")
     @ApiModelProperty(value = "注册行政区编码")
     private String districtCode;
 
-    /** 区 */
+    /**
+     * 区
+     */
     @Excel(name = "区")
     @ApiModelProperty(value = "区")
     private String district;
 
-    /** 注册详细地址 */
+    /**
+     * 注册详细地址
+     */
     @Excel(name = "注册详细地址")
     @ApiModelProperty(value = "注册详细地址")
     private String address;
 
-    /** 经营范围 */
+    /**
+     * 经营范围
+     */
     @Excel(name = "经营范围")
     @ApiModelProperty(value = "经营范围")
     private String businessField;
 
-    /** 纳税类型 */
+    /**
+     * 纳税类型
+     */
     @Excel(name = "纳税类型")
     @ApiModelProperty(value = "纳税类型")
     private String taxType;
 
-    /** 纳税类型字典分类ID外键 */
+    /**
+     * 纳税类型字典分类ID外键
+     */
     @ApiModelProperty(value = "纳税类型")
     private Long taxTypeId;
 
-    /** 报税类别ID外键字典 */
+    /**
+     * 报税类别ID外键字典
+     */
     @ApiModelProperty(value = "纳税类型")
     private Long taxDeclarationCategoryId;
 
-    /** 是否零申报 */
+    /**
+     * 是否零申报
+     */
     @Excel(name = "是否零申报")
     @ApiModelProperty(value = "是否零申报")
     private Integer isZero;
 
-    /** 税盘ID外键字典 */
+    /**
+     * 税盘ID外键字典
+     */
     @ApiModelProperty(value = "是否零申报")
     private Long taxDishId;
 
-    /** 主管税务机关 */
+    /**
+     * 主管税务机关
+     */
     @Excel(name = "主管税务机关")
     @ApiModelProperty(value = "主管税务机关")
     private String competentTaxAuthority;
 
-    /** 税务专管员 */
+    /**
+     * 税务专管员
+     */
     @Excel(name = "税务专管员")
     @ApiModelProperty(value = "税务专管员")
     private String taxCollectorName;
 
-    /** 专管员电话 */
+    /**
+     * 专管员电话
+     */
     @Excel(name = "专管员电话")
     @ApiModelProperty(value = "专管员电话")
     private String taxCollectorPhone;
 
-    /** 核税月份 */
+    /**
+     * 核税月份
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "核税月份", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "核税月份")
     private Date taxMonth;
 
-    /** 开户行 */
+    /**
+     * 开户行
+     */
     @Excel(name = "开户行")
     @ApiModelProperty(value = "开户行")
     private String openingBank;
 
-    /** 银行账户 */
+    /**
+     * 银行账户
+     */
     @Excel(name = "银行账户")
     @ApiModelProperty(value = "银行账户")
     private String bankAccount;
 
-    /** 账套外键 */
+    /**
+     * 账套外键
+     */
     @ApiModelProperty(value = "银行账户")
     private Long accountSetsId;
 
-    /** 主程序账套外键 */
+    /**
+     * 主程序账套外键
+     */
     @ApiModelProperty(value = "银行账户")
+    @TableField(exist = false)
     private Long mainAccountSetsId;
 
-    /** 年收入 */
+    /**
+     * 年收入
+     */
     @Excel(name = "年收入")
     @ApiModelProperty(value = "年收入")
     private String annualIncome;
 
-    /** 政务网账号 */
+    /**
+     * 政务网账号
+     */
     @Excel(name = "政务网账号")
     @ApiModelProperty(value = "政务网账号")
     private String governmentAccountNo;
 
-    /** 政务网密码 */
+    /**
+     * 政务网密码
+     */
     @Excel(name = "政务网密码")
     @ApiModelProperty(value = "政务网密码")
     private String governmentPassword;
 
-    /** 社保账号 */
+    /**
+     * 社保账号
+     */
     @Excel(name = "社保账号")
     @ApiModelProperty(value = "社保账号")
     private String socialSecurityAccountNo;
 
-    /** 社保密码 */
+    /**
+     * 社保密码
+     */
     @Excel(name = "社保密码")
     @ApiModelProperty(value = "社保密码")
     private String socialSecurityPassword;
 
-    /** 用工密码 */
+    /**
+     * 用工密码
+     */
     @Excel(name = "用工密码")
     @ApiModelProperty(value = "用工密码")
     private String employeePassword;
 
-    /** 公积金密码 */
+    /**
+     * 公积金密码
+     */
     @Excel(name = "公积金密码")
     @ApiModelProperty(value = "公积金密码")
     private String housingFundPassword;
 
-    /** 公积金单位账号 */
+    /**
+     * 公积金单位账号
+     */
     @Excel(name = "公积金单位账号")
     @ApiModelProperty(value = "公积金单位账号")
     private String housingFundUnitAccount;
 
-    /** 公积金划款密码 */
+    /**
+     * 公积金划款密码
+     */
     @Excel(name = "公积金划款密码")
     @ApiModelProperty(value = "公积金划款密码")
     private String housingFundDeductionPassword;
 
-    /** 征收方式 */
+    /**
+     * 征收方式
+     */
     @Excel(name = "征收方式")
     @ApiModelProperty(value = "征收方式")
     private String collectionMethod;
 
-    /** 定额金额 */
+    /**
+     * 定额金额
+     */
     @Excel(name = "定额金额")
     @ApiModelProperty(value = "定额金额")
     private BigDecimal quotaAmount;
 
-    /** 窗口现金交 */
+    /**
+     * 窗口现金交
+     */
     @Excel(name = "窗口现金交")
     @ApiModelProperty(value = "窗口现金交")
     private Integer isPayOnWindow;
 
-    /** 初次社保信息保存 */
+    /**
+     * 初次社保信息保存
+     */
     @Excel(name = "初次社保信息保存")
     @ApiModelProperty(value = "初次社保信息保存")
     private Integer isFirstSocialSecurity;
 
-    /** 初次公积金信息保存 */
+    /**
+     * 初次公积金信息保存
+     */
     @Excel(name = "初次公积金信息保存")
     @ApiModelProperty(value = "初次公积金信息保存")
     private Integer isFirstHousingFund;
 
+    @ApiModelProperty(value = "租户id")
+    private Long tenantId;
     @TableField(exist = false)
     private List<Long> ids;
+
+    @TableField(exist = false)
+    private String principal;
 }

src/main/java/cn/ezhizao/project/business/deduct/controller/BizDeductController.java

@@ -125,7 +125,7 @@ public class BizDeductController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizDeduct bizDeduct) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizDeduct);
-        startPage();
+//        startPage();
         startOrderBy();
         List<BizDeduct> list = bizDeductService.getList(bizDeduct);
         list.forEach(item -> {

src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderCurrentController.java

@@ -7,10 +7,13 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.company.domain.BizCompany;
+import cn.ezhizao.project.business.company.service.IBizCompanyService;
 import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrder;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderExport;
+import cn.ezhizao.project.business.workOrder.domain.vo.EntrustVo;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
 import cn.ezhizao.project.system.domain.SysCurrentMonth;
 import cn.ezhizao.project.system.service.ISysCurrentMonthService;
@@ -18,16 +21,18 @@ import cn.ezhizao.project.tenant.domain.Tenant;
 import cn.ezhizao.project.tenant.service.ITenantService;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
-import io.swagger.models.auth.In;
-import org.aspectj.weaver.loadtime.Aj;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.sql.Date;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +52,8 @@ public class WorkOrderCurrentController extends BaseController {
     IBizEntrustService bizEntrustService;
     @Resource
     ITenantService tenantService;
+    @Resource
+    IBizCompanyService bizCompanyService;
 
     /**
      * 查询工单信息列表
@@ -113,8 +120,8 @@ public class WorkOrderCurrentController extends BaseController {
             result.put("checkResult", true);
             DateTime dateTime = new DateTime();
             dateTime.setField(DateField.YEAR, Integer.parseInt(months.get(0).getYear()));
-            dateTime.setField(DateField.MONTH, Integer.parseInt(months.get(0).getMonth()) - 1);
             dateTime.setField(DateField.DAY_OF_MONTH, 1);
+            dateTime.setField(DateField.MONTH, Integer.parseInt(months.get(0).getMonth()) - 1);
             result.put("currentMonth", dateTime.toString("yyyy-MM-dd"));
             return success(result);
         }
@@ -155,6 +162,122 @@ public class WorkOrderCurrentController extends BaseController {
         return toAjax(status);
     }
 
+    @PostMapping("/importEntrust")
+    @Transactional
+    public AjaxResult importEntrust(MultipartFile file) throws Exception {
+        AtomicInteger failureNum = new AtomicInteger();
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        try{
+
+            Long tenantId = getTenantId();
+            //获取当前月
+            SysCurrentMonth sysCurrentMonth = sysCurrentMonthService.getOne(new QueryWrapper<SysCurrentMonth>().eq("tenant_id", tenantId).eq("type", 0));
+            String day = "-01";
+            String workMonth = sysCurrentMonth.getYear() + "-" + sysCurrentMonth.getMonth() + day;
+            ExcelUtil<EntrustVo> util = new ExcelUtil<>(EntrustVo.class);
+            List<EntrustVo> entrustVos = util.importExcel(file.getInputStream());
+            List<EntrustVo> newEntrustList = new ArrayList<>();
+            entrustVos.forEach(f -> {
+                ArrayList<Integer> objects = new ArrayList<>();
+                if (f.getTaskName1().equals("是")) {
+                    objects.add(1);
+                }
+                if (f.getTaskName2().equals("是")) {
+                    objects.add(2);
+                }
+                if (f.getTaskName3().equals("是")) {
+                    objects.add(3);
+                }
+                f.setCount(objects);
+            });
+
+            for (EntrustVo entrustVo : entrustVos) {
+                for (Integer integer : entrustVo.getCount()) {
+                    EntrustVo entrustVo1 = new EntrustVo();
+                    if (integer == 1) {
+                        entrustVo1.setTaskId(1);
+                    } else if (integer == 2) {
+                        entrustVo1.setTaskId(2);
+                    } else {
+                        entrustVo1.setTaskId(3);
+                    }
+                    entrustVo1.setNo(entrustVo.getNo());
+                    entrustVo1.setToEntrustName(entrustVo.getToEntrustName());
+                    entrustVo1.setCompanyName(entrustVo.getCompanyName());
+                    newEntrustList.add(entrustVo1);
+                }
+            }
+
+            newEntrustList.forEach(f -> {
+                try {
+                    BizCompany company = bizCompanyService.getOne(new LambdaQueryWrapper<BizCompany>()
+                            .eq(BizCompany::getTenantId, tenantId)
+                            .eq(BizCompany::getName, f.getCompanyName().trim()));
+                    if (company == null) {
+                        failureNum.getAndIncrement();
+                        failureMsg.append("<br/>" +"序号为"+f.getNo() +"，" + "客户 " +f.getCompanyName() + "不存在");
+                    } else {
+                        f.setCompanyId(company.getId());
+                    }
+
+                } catch (Exception e) {
+                    System.out.println(e);
+                }
+
+            });
+            //获取工单
+            for (EntrustVo e : newEntrustList) {
+                List<BizWorkOrder> bizWorkOrders = bizWorkOrderService.list(new LambdaQueryWrapper<BizWorkOrder>()
+                        .eq(BizWorkOrder::getTenantId, tenantId)
+                        .eq(BizWorkOrder::getIsStop, 0)
+                        .eq(BizWorkOrder::getDeleted, 0)
+                        .eq(BizWorkOrder::getType, 1)
+                        .eq(BizWorkOrder::getTaskTypeId, e.getTaskId())
+                        .eq(BizWorkOrder::getCompanyId, e.getCompanyId()));
+                if (bizWorkOrders== null ||bizWorkOrders.size() == 0) {
+                    failureNum.getAndIncrement();
+                    String s = "";
+                    if(e.getTaskId() == 1){
+                        s = "代理记账服务";
+                    } else if (e.getTaskId()==2){
+                        s = "社保代缴服务";
+                    }else {
+                        s = "公积金代缴服务";
+                    }
+                    failureMsg.append("<br/>" +"序号为"+e.getNo() +"，" + "客户 " + e.getCompanyName() + " 没有"+s);
+                }else {
+                    e.setWorkOrderIds(bizWorkOrders.stream().map(m -> m.getId()).collect(Collectors.toList()));
+                }
+            }
+
+            //根据受委托方分组
+            Map<String, List<EntrustVo>> map = newEntrustList.stream().collect(Collectors.groupingBy(e -> e.getToEntrustName()));
+            for (String s : map.keySet()) {
+                BizEntrust bizEntrust = new BizEntrust();
+                Tenant one = tenantService.getOne(new LambdaQueryWrapper<Tenant>().eq(Tenant::getAccountName, s));
+                bizEntrust.setToTenantId(one.getId());
+                bizEntrust.setWorkMonth(Date.valueOf(workMonth));
+                List<Long> workOrderIds = map.get(s).stream()
+                        .flatMap(e -> e.getWorkOrderIds().stream())
+                        .collect(Collectors.toList());
+                bizEntrust.setWorkOrderIds(workOrderIds);
+                this.addEntrust(bizEntrust);
+            }
+        }catch (Exception e){
+
+        }
+
+
+        if (Integer.valueOf(failureNum.toString()) > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功");
+        }
+        return success(successMsg);
+    }
+
     private boolean addEntrust(List<Long> workOrderId, Date paramWorkMonth, Long toTenantId) {
         BizEntrust entrust = new BizEntrust();
         entrust.setWorkOrderIds(workOrderId);
@@ -297,7 +420,7 @@ public class WorkOrderCurrentController extends BaseController {
         if (bizWorkOrder.getToTenantId() == null) {
             setTenantId(bizWorkOrder);
         }
-        startPage();
+//        startPage();
         startOrderBy();
 //        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);

src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderNextController.java

@@ -220,8 +220,8 @@ public class WorkOrderNextController extends BaseController {
             result.put("checkResult", true);
             DateTime dateTime = new DateTime();
             dateTime.setField(DateField.YEAR, Integer.parseInt(months.get(0).getYear()));
-            dateTime.setField(DateField.MONTH, Integer.parseInt(months.get(0).getMonth()) - 1);
             dateTime.setField(DateField.DAY_OF_MONTH, 1);
+            dateTime.setField(DateField.MONTH, Integer.parseInt(months.get(0).getMonth()) - 1);
             result.put("currentMonth", dateTime.toString("yyyy-MM-dd"));
             return success(result);
         }

src/main/java/cn/ezhizao/project/business/workOrder/domain/vo/EntrustVo.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.workOrder.domain.vo;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EntrustVo {
+    private static final long serialVersionUID = 1L;
+    @Excel(name = "序号")
+    private String no;
+    @Excel(name = "受委托方")
+    private String toEntrustName;
+
+    @Excel(name = "客户名称")
+    private String companyName;
+
+    //@Excel(name = "项目")
+    //private String taskName;
+    @Excel(name = "报税")
+    private String taskName1;
+    @Excel(name = "社保")
+    private String taskName2;
+    @Excel(name = "公积金")
+    private String taskName3;
+    private List<Long> workOrderIds;
+    private int taskId;
+    private Long companyId;
+    private List<Integer> count;
+}

src/main/resources/application-dev.yml

@@ -1,17 +1,21 @@
 # 数据源配置
 spring:
+    cloud:
+        nacos:
+            discovery:
+                server-addr: 154.8.178.69:8848
     application:
-        name: ezhizao-yzbh-entrust-zx
+        name: ezhizao-yzbh-entrust
     # redis 配置
     redis:
         # 地址
-        host: 120.46.159.163
+        host: 62.234.54.84
         # 端口，默认为6379
-        port: 6379
+        port: 16379
         # 数据库索引
         database: 8
         # 密码
-        password: ezhizao.cn123456
+        password: yuchang@2023
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -30,9 +34,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://120.46.159.163:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
-                username: root
-                password: ezhizao.cn123456
+                url: jdbc:mysql://154.8.178.69:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                username: admin
+                password: admin
 #                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
 #                username: root
 #                password: 123456
@@ -84,4 +88,4 @@ spring:
                         multi-statement-allow: true
 # 文件上传
 ruoyi:
-    profile: D:/Ezhizao/yzbh/
+    profile: /home/ruoyi/yzbh