diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java index 5ffd4cd..361ee93 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java @@ -153,7 +153,7 @@ public class SltAgreementInfo { /** * 费用承担方 */ - @Excel(name = "费用承担方") + @Excel(name = "费用承担方(01项目,03分包)") private String costBearingParty; /** * 调整天数 diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltInfoVo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltInfoVo.java index e8566cf..8898b87 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltInfoVo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltInfoVo.java @@ -11,7 +11,7 @@ import java.util.List; @Data public class SltInfoVo { /** - * 租赁费用列表（01、03） + * 租赁费用列表 (01项目 03分包) */ List leaseList; List leaseListOne; diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java index 9ef7480..2565729 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java @@ -940,16 +940,46 @@ public class DateTimeHelper { return list; } - public static String getCalStartDay() { + public static String getPreMonthFirstDay() { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + // 获取当前月第一天： Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, -1); - c.set(Calendar.DAY_OF_MONTH, 21); + c.set(Calendar.DAY_OF_MONTH, 1);// 设置为1号,当前日期既为本月第一天 String first = format.format(c.getTime()); return first; } - public static String getCalDay(int day) { + public static String getCurrentMonthFirstDay() { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + // 获取当前月第一天： + Calendar c = Calendar.getInstance(); + c.add(Calendar.MONTH, 0); + c.set(Calendar.DAY_OF_MONTH, 1);// 设置为1号,当前日期既为本月第一天 + String first = format.format(c.getTime()); + return first; + } + + public static String getPreLastDay() { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + // 获取当前月最后一天 + Calendar c = Calendar.getInstance(); + c.add(Calendar.MONTH, -1); + c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH)); + String last = format.format(c.getTime()); + return last; + } + + public static String getPreMonthCalStartDay(int day) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + Calendar c = Calendar.getInstance(); + c.add(Calendar.MONTH, -1); + c.set(Calendar.DAY_OF_MONTH, day); + String first = format.format(c.getTime()); + return first; + } + + public static String getCurrentMonthCalEndDay(int day) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); diff --git a/sgzb-modules/pom.xml b/sgzb-modules/pom.xml index bbe03a3..44b7146 100644 --- a/sgzb-modules/pom.xml +++ b/sgzb-modules/pom.xml @@ -14,7 +14,6 @@ sgzb-job sgzb-file sgzb-material - sgzb-settlement sgzb-modules diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index c3f3f6c..f5bab20 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -55,7 +55,7 @@ public class LeaseApplyInfo implements Serializable { /** * 费用承担方 */ - @ApiModelProperty(value = "费用承担方") + @ApiModelProperty(value = "费用承担方(01项目,03分包)") private String costBearingParty; /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index 09d5594..1701377 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -69,7 +69,7 @@ public class TmTask implements Serializable { /** * 费用承担方 */ - @ApiModelProperty(value = "费用承担方") + @ApiModelProperty(value = "费用承担方(01项目,03分包)") private String costBearingParty; /** * 编号 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java index 991459e..58bf8fb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java @@ -136,7 +136,7 @@ public class AgreementInfo extends BaseEntity { private String cost; @ApiModelProperty(value = "结算状态") private String sltStatus; - @ApiModelProperty(value = "费用承担方") + @ApiModelProperty(value = "费用承担方(01项目,03分包)") private String costBearingParty; private String codeNum; /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java index 0a8878e..f9de886 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java @@ -23,6 +23,10 @@ public class ProjectMonthCosts { * 结算记录关联id */ private Integer sltMonthId; + /** + * 结算记录关联 task id + */ + private Integer taskId; /** * 单位id */ @@ -36,7 +40,7 @@ public class ProjectMonthCosts { */ private String month; /** - * 费用承担方 + * 费用承担方(01项目,03分包) */ private String costBearingParty; /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java index 5a0b37c..3ac12f2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java @@ -63,7 +63,7 @@ public class ProjectMonthDetail { */ private String leasePrice; /** - * 费用承担方 + * 费用承担方(01项目,03分包) */ private String costBearingParty; private String leaseDays; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java index ffdc51f..f17cd44 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/CalMonthlyMapper.java @@ -28,6 +28,8 @@ public interface CalMonthlyMapper { int deleteCalcRecord(CalMonthlyBean bean); + int deleteMonthlyDetail(CalMonthlyBean bean); + int deleteMonthlyCosts(CalMonthlyBean bean); int insertProMonCosts(ProjectMonthCosts projectMonthCosts); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java index 6696637..07cbe71 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/Inform.java @@ -1,28 +1,35 @@ package com.bonus.sgzb.material.remind; +import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.material.remind.service.CalcMonthlyService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; - @Component public class Inform { @Autowired - private CalcMonthlyService calcfourCostService; + private CalcMonthlyService calcMonthlyService; - private final int CAL_DAY = 9; + @Value("${sgzb.job.settlementJobDay}") + private String settlementJobDay; -// @Scheduled(cron = "0 */1 * * * ? ") // 间隔5分钟执行 -// @Scheduled(cron = "0 0 1 22 * ? ") // 每个月22日凌晨1点执行 + //@Scheduled(cron = "0 */3 * * * ? ") // 间隔3分钟执行 + @Scheduled(cron = "${job.settlementJobCron}") // 结算日次日凌晨执行 @Async public void taskCycle() { System.out.println("===springMVC定时器启动===="); try { - // 生成每月数据 (上月21日---本月20日) - calcfourCostService.calcMonthInfo(CAL_DAY); + + if (StringUtils.isEmpty(settlementJobDay)) { + calcMonthlyService.calcMonthInfo(1); + } else { + int calDay = Integer.parseInt(settlementJobDay); + calcMonthlyService.calcMonthInfo(calDay); + } } catch (Exception e) { e.printStackTrace(); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java index 777d495..01cc7cc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java @@ -34,22 +34,27 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { @Override public void calcMonthInfo(int day) { - String time = DateTimeHelper.getNowDate(); - String calDay = DateTimeHelper.getCalDay(day); - if (time.equals(calDay)) { - CalMonthlyBean record = new CalMonthlyBean(); - String month = DateTimeHelper.getCurrentMonth(); - record.setMonth(month); -// cleanSameMonthOldRecords(record); - List list = agreementInfoService.getAllAgreementId(); - String startTime = DateTimeHelper.getCalStartDay(); - String endTime = DateTimeHelper.getCalDay(day - 1); - list.forEach(t -> { - t.setStartTime(startTime); - t.setEndTime(endTime); - }); - getLeaseListMonth(list, record); + String month; + String startTime; + String endTime; + if (day == 1) { + month = DateTimeHelper.getPrevMonth(); + startTime = DateTimeHelper.getPreMonthFirstDay(); + endTime = DateTimeHelper.getCurrentMonthFirstDay(); + } else { + month = DateTimeHelper.getCurrentMonth(); + startTime = DateTimeHelper.getPreMonthCalStartDay(day); + endTime = DateTimeHelper.getCurrentMonthCalEndDay(day); } + CalMonthlyBean record = new CalMonthlyBean(); + record.setMonth(month); + cleanSameMonthOldRecords(record); + List list = agreementInfoService.getAllAgreementId(); + list.forEach(t -> { + t.setStartTime(startTime); + t.setEndTime(endTime); + }); + addProjectMonthCosts(list, record); } private void cleanSameMonthOldRecords(CalMonthlyBean record) { @@ -59,26 +64,27 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { //清除上月之前计算过的记录 calc_project_month calMonthlyMapper.deleteCalcRecord(bean); - //清除上月之前计算过的记录 project_month_costs(表名待定） + //清除上月之前计算过的记录 project_month_detail, project_month_costs + calMonthlyMapper.deleteMonthlyDetail(bean); calMonthlyMapper.deleteMonthlyCosts(bean); } } } - private List getLeaseListMonth(List list, CalMonthlyBean record) { + private List addProjectMonthCosts(List list, CalMonthlyBean record) { List leaseList = new ArrayList<>(); - + calMonthlyMapper.insertCalcRecord(record); + String taskId = record.getId(); for (AgreementInfo bean : list) { if (StringUtils.isNotBlank(bean.getStartTime()) && StringUtils.isNotBlank(bean.getEndTime())) { List monthList = sltAgreementInfoMapper.getLeaseListMonthNotNull(bean); monthList.stream().filter(Objects::nonNull); + for (SltAgreementInfo sltAgreementInfo : monthList) { - calMonthlyMapper.insertCalcRecord(record); - // slt_project_month的主键id - String spmId = record.getId(); ProjectMonthCosts projectMonthCosts = new ProjectMonthCosts(); projectMonthCosts.setAgreementId(Integer.parseInt(sltAgreementInfo.getAgreementId())); - projectMonthCosts.setSltMonthId(Integer.parseInt(spmId)); + projectMonthCosts.setSltMonthId(Integer.parseInt(taskId)); + projectMonthCosts.setTaskId(Integer.parseInt(taskId)); projectMonthCosts.setUnitId(sltAgreementInfo.getUnitId()); projectMonthCosts.setProjectId(sltAgreementInfo.getLotId()); projectMonthCosts.setMonth(record.getMonth()); @@ -94,7 +100,7 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { agreementInfo.setIds(sltAgreementInfo.getIds()); sltAgreementInfo.setMonth(bean.getMonth()); agreementInfo.setEndTime(sltAgreementInfo.getOffTime()); - List leaseListOneMonth = getLeaseListOneMonth(agreementInfo, sltAgreementInfo, pmcId); + List leaseListOneMonth = addProjectMonthDetail(agreementInfo, sltAgreementInfo, pmcId); projectMonthCosts.setCosts(sltAgreementInfo.getCosts()); calMonthlyMapper.updateProMonCosts(projectMonthCosts); sltAgreementInfo.setNode(leaseListOneMonth); @@ -106,13 +112,13 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { } - private List getLeaseListOneMonth(AgreementInfo list, SltAgreementInfo sltAgreementInfo, Integer pmcId) { + private List addProjectMonthDetail(AgreementInfo agreementInfo, SltAgreementInfo sltAgreementInfo, Integer pmcId) { ArrayList idList = new ArrayList<>(); - String[] ids = list.getIds().split(","); + String[] ids = agreementInfo.getIds().split(","); for (String id : ids) { idList.add(id); } - List leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(list, idList); + List leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(agreementInfo, idList); BigDecimal leaseCostOne = BigDecimal.ZERO; for (SltAgreementInfo bean : leaseList) { if (bean.getLeasePrice() == null) { diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index eac5f63..cf08402 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -32,3 +32,10 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +# 多站点特殊配置 +sgzb: + site: cq + job: + settlementJobDay: 21 + settlementJobCron: "0 0 1 21 * ?" \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml index 6a16529..93dd5e8 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml @@ -8,9 +8,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INSERT INTO slt_project_month (month,create_time) VALUES (#{month},now()) - insert into project_month_costs(agreement_id,slt_month_id,unit_id,project_id,month,cost_bearing_party) + insert into project_month_costs(agreement_id,task_id,unit_id,project_id,month,cost_bearing_party) values - (#{agreementId},#{sltMonthId},#{unitId},#{projectId},#{month},#{costBearingParty}) + (#{agreementId},#{taskId},#{unitId},#{projectId},#{month},#{costBearingParty}) insert into project_month_detail (type_id,ma_id,unit,start_time,end_time,slt_days,slt_costs,month_temporarily_costs,pro_month_cost_id,num,lease_price) @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pmc.costs as costs FROM project_month_costs pmc - LEFT JOIN slt_project_month spm ON pmc.slt_month_id = spm.id + LEFT JOIN slt_project_month spm ON pmc.task_id = spm.id LEFT JOIN bm_agreement_info bai ON pmc.agreement_id = bai.agreement_id LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id @@ -78,10 +78,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from calc_project_month + delete from slt_project_month where id = #{id} + + delete + from project_month_detail + where pro_month_cost_id in + (select id from project_month_costs where task_id = #{id}) + + delete from project_month_costs where task_id = #{id} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml index ab1d9a1..07e0614 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml @@ -553,15 +553,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sai.start_time <= #{endTime} AND (sai.end_time >= #{startTime} OR sai.end_time IS NULL) GROUP BY - ( CASE WHEN #{startTime} >= DATE( sai.start_time ) THEN #{startTime} ELSE DATE( sai.start_time ) END ), - CASE - WHEN #{endTime} >= DATE( COALESCE ( sai.end_time, CURDATE() ) ) THEN - DATE( - COALESCE ( - sai.end_time, - CURDATE())) ELSE #{endTime} - END, - lai.cost_bearing_party + beginTime,offTime,lai.cost_bearing_party ORDER BY DATE_FORMAT( DATE_ADD( DATE( sai.start_time ), INTERVAL 1 - DAYOFMONTH( sai.start_time ) DAY ), '%Y-%m' ) diff --git a/sgzb-modules/sgzb-settlement/pom.xml b/sgzb-modules/sgzb-settlement/pom.xml deleted file mode 100644 index ddf9921..0000000 --- a/sgzb-modules/sgzb-settlement/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - sgzb-modules - com.bonus.sgzb - 3.6.3 - - 4.0.0 - - sgzb-modules-settlement - - - sgzb-modules-settlement - - - - com.bonus.sgzb - sgzb-common-core - - - com.bonus.sgzb - sgzb-common-security - - - com.bonus.sgzb - sgzb-common-swagger - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - com.mysql - mysql-connector-j - - - - - com.bonus.sgzb - sgzb-common-datasource - - - - - com.bonus.sgzb - sgzb-common-datascope - - - - - com.bonus.sgzb - sgzb-common-log - - - - - - com.bonus.sgzb - sgzb-common-swagger - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.projectlombok - lombok - - - - - 8 - 8 - - - \ No newline at end of file diff --git a/sgzb-modules/sgzb-settlement/src/main/java/com/bonus/sgzb/settlement/SgzbSettlementApplication.java b/sgzb-modules/sgzb-settlement/src/main/java/com/bonus/sgzb/settlement/SgzbSettlementApplication.java deleted file mode 100644 index f246b26..0000000 --- a/sgzb-modules/sgzb-settlement/src/main/java/com/bonus/sgzb/settlement/SgzbSettlementApplication.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.bonus.sgzb.settlement; - - -import com.bonus.sgzb.common.security.annotation.EnableCustomConfig; -import com.bonus.sgzb.common.security.annotation.EnableRyFeignClients; -import com.bonus.sgzb.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * 结算服务 - * - * @author ruoyi - */ -@EnableCustomSwagger2 -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -@EnableCustomConfig -@EnableRyFeignClients -public class SgzbSettlementApplication -{ - public static void main(String[] args) - { - SpringApplication.run(SgzbSettlementApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 结算模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } -} diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/banner.txt b/sgzb-modules/sgzb-settlement/src/main/resources/banner.txt deleted file mode 100644 index 27cacb9..0000000 --- a/sgzb-modules/sgzb-settlement/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ __ _ _ - (_) / _|(_)| | - _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ -| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ -| | | |_| || (_) || |_| || | | | | || || __/ -|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| - __/ | - |___/ \ No newline at end of file diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml deleted file mode 100644 index 15884a9..0000000 --- a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9304 - -# Spring -spring: - application: - # 应用名称 - name: sgzb-settlement - profiles: - # 环境配置 - active: sgzb_cloud_dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: sgzb_cloud_dev_cqjj - config: - # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: sgzb_cloud_dev_cqjj - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/logback.xml b/sgzb-modules/sgzb-settlement/src/main/resources/logback.xml deleted file mode 100644 index ed6c17d..0000000 --- a/sgzb-modules/sgzb-settlement/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file