diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0f921b7..5c99974 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,32 +7,35 @@ - - - + + + + + + + + + + + + + - - - - - - - - + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index d7ebdd8..26e35c8 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -51,6 +51,14 @@ + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 98065b9..4cda9d5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + @@ -9,6 +10,11 @@ + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/boot-auth/src/main/resources/bootstrap.yml b/boot-auth/src/main/resources/bootstrap.yml index c3c879a..a7068c4 100644 --- a/boot-auth/src/main/resources/bootstrap.yml +++ b/boot-auth/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/boot-auth/target/classes/bootstrap.yml b/boot-auth/target/classes/bootstrap.yml index c3c879a..a7068c4 100644 --- a/boot-auth/target/classes/bootstrap.yml +++ b/boot-auth/target/classes/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/boot-gateway/src/main/resources/bootstrap.yml b/boot-gateway/src/main/resources/bootstrap.yml index 5a410ef..bd14a78 100644 --- a/boot-gateway/src/main/resources/bootstrap.yml +++ b/boot-gateway/src/main/resources/bootstrap.yml @@ -23,7 +23,7 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd sentinel: # 取消控制台懒加载 eager: true diff --git a/boot-gateway/target/classes/bootstrap.yml b/boot-gateway/target/classes/bootstrap.yml index 5a410ef..bd14a78 100644 --- a/boot-gateway/target/classes/bootstrap.yml +++ b/boot-gateway/target/classes/bootstrap.yml @@ -23,7 +23,7 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd sentinel: # 取消控制台懒加载 eager: true diff --git a/boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml b/boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml index 72f060a..852bbda 100644 --- a/boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml +++ b/boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/boot-modules/boot-gen/src/main/resources/bootstrap.yml b/boot-modules/boot-gen/src/main/resources/bootstrap.yml index 632e294..ecad6bb 100644 --- a/boot-modules/boot-gen/src/main/resources/bootstrap.yml +++ b/boot-modules/boot-gen/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/boot-modules/boot-job/src/main/resources/bootstrap.yml b/boot-modules/boot-job/src/main/resources/bootstrap.yml index 410790f..15268e1 100644 --- a/boot-modules/boot-job/src/main/resources/bootstrap.yml +++ b/boot-modules/boot-job/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml b/boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml index dd457fc..8944e92 100644 --- a/boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml +++ b/boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/boot-modules/boot-system/boot-system-server/target/classes/bootstrap.yml b/boot-modules/boot-system/boot-system-server/target/classes/bootstrap.yml index dd457fc..8944e92 100644 --- a/boot-modules/boot-system/boot-system-server/target/classes/bootstrap.yml +++ b/boot-modules/boot-system/boot-system-server/target/classes/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/boot-mq/pom.xml b/boot-mq/pom.xml deleted file mode 100644 index bcd1c45..0000000 --- a/boot-mq/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - com.boot - boot - 3.6.3 - - - com.bwie - boot-mq - - - 17 - 17 - UTF-8 - - - - - com.boot - boot-common-core - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-amqp - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - - diff --git a/boot-visual/boot-monitor/src/main/resources/bootstrap.yml b/boot-visual/boot-monitor/src/main/resources/bootstrap.yml index 7e85aa6..0c30ddb 100644 --- a/boot-visual/boot-monitor/src/main/resources/bootstrap.yml +++ b/boot-visual/boot-monitor/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 123456789 + namespace: wdwdwd diff --git a/car-charging/car-charging-common/pom.xml b/car-charging/car-charging-common/pom.xml new file mode 100644 index 0000000..e90a369 --- /dev/null +++ b/car-charging/car-charging-common/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + com.bawei + car-charging + 3.6.3 + + + car-charging-common + + + 17 + 17 + UTF-8 + + + + + + + com.boot + boot-common-core + + + org.projectlombok + lombok + + + + diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Channel.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Channel.java new file mode 100644 index 0000000..0a2750a --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Channel.java @@ -0,0 +1,90 @@ +package com.car.charging.common.domain; + +import java.util.Date; + +/** + * @ClassName Channel + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 9:42 + */ +public class Channel { + + private Integer channelId; + private String channelName; + private Date createTime; + private Integer createUser; + private Date updTime; + private Integer updUser; + private Integer isDel; + + + public Channel() { + } + + public Channel(Integer channelId, String channelName, Date createTime, Integer createUser, Date updTime, Integer updUser, Integer isDel) { + this.channelId = channelId; + this.channelName = channelName; + this.createTime = createTime; + this.createUser = createUser; + this.updTime = updTime; + this.updUser = updUser; + this.isDel = isDel; + } + + public Integer getChannelId() { + return channelId; + } + + public void setChannelId(Integer channelId) { + this.channelId = channelId; + } + + public String getChannelName() { + return channelName; + } + + public void setChannelName(String channelName) { + this.channelName = channelName; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Integer getCreateUser() { + return createUser; + } + + public void setCreateUser(Integer createUser) { + this.createUser = createUser; + } + + public Date getUpdTime() { + return updTime; + } + + public void setUpdTime(Date updTime) { + this.updTime = updTime; + } + + public Integer getUpdUser() { + return updUser; + } + + public void setUpdUser(Integer updUser) { + this.updUser = updUser; + } + + public Integer getIsDel() { + return isDel; + } + + public void setIsDel(Integer isDel) { + this.isDel = isDel; + } +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/ChargingMiddleTable.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/ChargingMiddleTable.java new file mode 100644 index 0000000..65d11c1 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/ChargingMiddleTable.java @@ -0,0 +1,40 @@ +package com.car.charging.common.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @ClassName ChargingMiddleTable + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 14:02 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ChargingMiddleTable { + + private Integer cityId; + private Integer channelId; + private Integer serverTypeId; + private Integer rankId; + private Integer estimatedId; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date updateTime; + private String userName; + private Integer availableState; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date createTime; + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/City.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/City.java new file mode 100644 index 0000000..f35c5d2 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/City.java @@ -0,0 +1,23 @@ +package com.car.charging.common.domain; + +import lombok.Data; + +/** + * @ClassName City 城市 类 + * @Version 1.0 + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 9:31 + */ +@Data +public class City { + + + private Integer cityId; + + private String cityName; + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/EstimatedOrder.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/EstimatedOrder.java new file mode 100644 index 0000000..c377fce --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/EstimatedOrder.java @@ -0,0 +1,40 @@ +package com.car.charging.common.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @ClassName EstimatedOrder + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/27 19:56 + */ +@Data +public class EstimatedOrder { + + private Integer id; + private Integer city_id; + private Integer server_type_id; + private Integer channel_id; + private Integer rank_id; + private Double kilometres; + private Integer server_time; + private BigDecimal meal_price; + private BigDecimal basics_price; + private Integer night_id; + private Integer section_id; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date create_time; + + + + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/NightServer.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/NightServer.java new file mode 100644 index 0000000..3a1422d --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/NightServer.java @@ -0,0 +1,27 @@ +package com.car.charging.common.domain; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @ClassName NightServer + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/27 19:53 + */ +@Data +public class NightServer { + + + private Integer id; + private Integer vechicleId; + private Double nightServerMileagePrice; + private BigDecimal nightServerTimePrice; + private BigDecimal mileagePrice; + private BigDecimal timePrice; + private Double longWayMileage; + private BigDecimal longWayPrice; + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Rank.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Rank.java new file mode 100644 index 0000000..dc9a85b --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Rank.java @@ -0,0 +1,36 @@ +package com.car.charging.common.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @ClassName Rank + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 9:44 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor + + + + +public class Rank { + + private Integer rankId; + private String rankName; + private Date createTime; + private Integer createUser; + private Date updTime; + private Integer updUser; + private Integer isDel; + + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Section.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Section.java new file mode 100644 index 0000000..f9cf674 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Section.java @@ -0,0 +1,28 @@ +package com.car.charging.common.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @ClassName Section + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/28 22:04 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Section { + + + private Integer id; + private Integer startTime; + private Integer endTime; + private BigDecimal kilometrePrice; + private BigDecimal timePrice; + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/AddChannel.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/AddChannel.java new file mode 100644 index 0000000..49e8d16 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/AddChannel.java @@ -0,0 +1,74 @@ +package com.car.charging.common.domain.req; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @ClassName AddChannel + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/28 15:36 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AddChannel { + + + + private Integer cityId; + + private Integer channelId; + + private Integer serverTypeId; + + private Integer rankId; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + + + + private BigDecimal mealPrice; + + private BigDecimal basicsPrice; + + private Double kilometres; + + private Integer nightId; + + private Integer serverTime; + + private Integer nightServerTime; + + + + private BigDecimal mileagePrice; + + private BigDecimal timePrice; + + private Double longWayMileage; + + private BigDecimal longWayPrice; + + private BigDecimal nightServerMileagePrice; + + private BigDecimal nightServerTimePrice; + + + private BigDecimal kilometrePrice; + + + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/ChargingMiddleTableReq.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/ChargingMiddleTableReq.java new file mode 100644 index 0000000..1265849 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/ChargingMiddleTableReq.java @@ -0,0 +1,50 @@ +package com.car.charging.common.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName ChargingMiddleTableReq + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 14:40 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ChargingMiddleTableReq { + + private Integer pageNum =1; + + private Integer pageSize =3; + + /** + * 城市id + */ + private Integer cityId; + /** + * 渠道id + */ + private Integer channelId; + /** + * 服务类型id + */ + private Integer serverTypeId; + /** + * 所属级别id + */ + private Integer rankId; + + + /** + * 状态 + */ + private Integer availableState; + + + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/charginListAdd.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/charginListAdd.java new file mode 100644 index 0000000..8489739 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/charginListAdd.java @@ -0,0 +1,39 @@ +package com.car.charging.common.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName charginListAdd + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/28 9:44 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class charginListAdd { + + /** + * 城市id + */ + private Integer cityId; + /** + * 渠道id + */ + private Integer channelId; + /** + * 服务类型id + */ + private Integer serverTypeId; + /** + * 所属级别id + */ + private Integer rankId; + + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/serverType.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/serverType.java new file mode 100644 index 0000000..47cc867 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/serverType.java @@ -0,0 +1,34 @@ +package com.car.charging.common.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @ClassName serverType + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 9:47 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class serverType { + + + private Integer serverTypeId; + private String typeName; + private Date createTime; + private Integer createUser; + private Date updTime; + private Integer updUser; + private Integer isDel; + + + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/vo/ChargingMiddleTableVo.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/vo/ChargingMiddleTableVo.java new file mode 100644 index 0000000..02af571 --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/vo/ChargingMiddleTableVo.java @@ -0,0 +1,51 @@ +package com.car.charging.common.domain.vo; + +import com.car.charging.common.domain.Channel; +import com.car.charging.common.domain.City; +import com.car.charging.common.domain.Rank; +import com.car.charging.common.domain.serverType; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @ClassName ChargingMiddleTableVo + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 14:37 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ChargingMiddleTableVo { + + + private Integer id; + private Integer cityId; + private Integer channelId; + private Integer serverTypeId; + private Integer rankId; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date updateTime; + private String userName; + private Integer availableState; + + private Channel channel; + + private City city; + + private Rank rank; + + private serverType type; + + + + + + +} diff --git a/car-charging/car-charging-common/src/main/java/com/car/charging/common/result/PageResult.java b/car-charging/car-charging-common/src/main/java/com/car/charging/common/result/PageResult.java new file mode 100644 index 0000000..8b6527b --- /dev/null +++ b/car-charging/car-charging-common/src/main/java/com/car/charging/common/result/PageResult.java @@ -0,0 +1,35 @@ +package com.car.charging.common.result; + +import com.boot.common.core.domain.Result; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author DongZl + * @description: 列表返回结果集 + */ +@Data +public class PageResult implements Serializable { + /** + * 总条数 + */ + private long total; + /** + * 结果集合 + */ + private List list; + public PageResult() { + } + public PageResult(long total, List list) { + this.total = total; + this.list = list; + } + public static PageResult toPageResult(long total, List list){ + return new PageResult(total , list); + } + public static Result> toResult(long total, List list){ + return Result.ok(PageResult.toPageResult(total,list)); + } +} diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Channel.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Channel.class new file mode 100644 index 0000000..9bee6f5 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Channel.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/ChargingMiddleTable.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/ChargingMiddleTable.class new file mode 100644 index 0000000..a0ae29d Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/ChargingMiddleTable.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/City.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/City.class new file mode 100644 index 0000000..019cfff Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/City.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/EstimatedOrder.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/EstimatedOrder.class new file mode 100644 index 0000000..a35a6ae Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/EstimatedOrder.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/NightServer.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/NightServer.class new file mode 100644 index 0000000..7d124da Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/NightServer.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Rank.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Rank.class new file mode 100644 index 0000000..96e19b1 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Rank.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Section.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Section.class new file mode 100644 index 0000000..2f3d627 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/Section.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/AddChannel.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/AddChannel.class new file mode 100644 index 0000000..9d00964 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/AddChannel.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/ChargingMiddleTableReq.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/ChargingMiddleTableReq.class new file mode 100644 index 0000000..5dd2e6b Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/ChargingMiddleTableReq.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/charginListAdd.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/charginListAdd.class new file mode 100644 index 0000000..4569ed4 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/req/charginListAdd.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/serverType.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/serverType.class new file mode 100644 index 0000000..766a1d5 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/serverType.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/vo/ChargingMiddleTableVo.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/vo/ChargingMiddleTableVo.class new file mode 100644 index 0000000..bdcd9a9 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/domain/vo/ChargingMiddleTableVo.class differ diff --git a/car-charging/car-charging-common/target/classes/com/car/charging/common/result/PageResult.class b/car-charging/car-charging-common/target/classes/com/car/charging/common/result/PageResult.class new file mode 100644 index 0000000..b4bfb06 Binary files /dev/null and b/car-charging/car-charging-common/target/classes/com/car/charging/common/result/PageResult.class differ diff --git a/car-charging/car-charging-remote/pom.xml b/car-charging/car-charging-remote/pom.xml new file mode 100644 index 0000000..cbb43cc --- /dev/null +++ b/car-charging/car-charging-remote/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.bawei + car-charging + 3.6.3 + + + car-charging-remote + + + 17 + 17 + UTF-8 + + + + + + com.bawei + car-charging-common + 3.6.3 + + + + + diff --git a/car-charging/car-charging-server/pom.xml b/car-charging/car-charging-server/pom.xml new file mode 100644 index 0000000..1b5e7cd --- /dev/null +++ b/car-charging/car-charging-server/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + com.bawei + car-charging + 3.6.3 + + + car-charging-server + + + 17 + 17 + UTF-8 + + + + + + + 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.boot + boot-common-datasource + + + + + com.boot + boot-common-datascope + + + + + com.boot + boot-common-log + + + + + com.boot + boot-common-swagger + + + + + com.boot + boot-system-common + + + + com.boot + boot-file-remote + + + com.bawei + car-charging-common + 3.6.3 + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + + diff --git a/car-charging/car-charging-server/src/main/java/com/car/charging/CarChargingApplication.java b/car-charging/car-charging-server/src/main/java/com/car/charging/CarChargingApplication.java new file mode 100644 index 0000000..fdaa124 --- /dev/null +++ b/car-charging/car-charging-server/src/main/java/com/car/charging/CarChargingApplication.java @@ -0,0 +1,36 @@ +package com.car.charging; + +import com.boot.common.security.annotation.EnableCustomConfig; +import com.boot.common.security.annotation.EnableRyFeignClients; +import com.boot.common.swagger.annotation.EnableCustomSwagger2; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author boot + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +@MapperScan("com.car.charging.mapper") +public class CarChargingApplication +{ + public static void main(String[] args) + { + SpringApplication.run(CarChargingApplication.class, args); + System.out.println("~~|~~~ 计费模块启动成功 ~~~|~~\n" + + " --------- ---------\n" + + " ||| ||| \n" + + " \n" + + " | | \n" + + " (_ o _) \n" + + " ||||||||||||||| \n" + + " ~~~~~~~~~~~~~~~~~~~~~~~ \n" + + " \n" + + " "); + } +} diff --git a/car-charging/car-charging-server/src/main/java/com/car/charging/controller/CharginController.java b/car-charging/car-charging-server/src/main/java/com/car/charging/controller/CharginController.java new file mode 100644 index 0000000..82f60d1 --- /dev/null +++ b/car-charging/car-charging-server/src/main/java/com/car/charging/controller/CharginController.java @@ -0,0 +1,99 @@ +package com.car.charging.controller; + +import com.boot.common.core.domain.Result; + +import com.car.charging.common.domain.*; +import com.car.charging.common.domain.req.AddChannel; +import com.car.charging.common.domain.req.ChargingMiddleTableReq; +import com.car.charging.common.domain.vo.ChargingMiddleTableVo; +import com.car.charging.common.result.PageResult; +import com.car.charging.service.ChargingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import com.car.charging.common.domain.Channel; +import java.util.List; + +/** + * @ClassName CharginController + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 14:33 + */ +@RestController +public class CharginController { + + + @Autowired + private ChargingService charginService; + + /* + *计费列表 + */ + @PostMapping("/charginList") + public Result> charginList(@RequestBody ChargingMiddleTableReq req){ + + Result> result = charginService.list(req); + + return result; + + } + + @PostMapping("/AddChannel") + public Result AddChannel(@RequestBody AddChannel addChannel){ + + return Result.ok(charginService.addCharging(addChannel)); + } + + +// @PostMapping("/viewList") +// public Result + + + + + @PostMapping("/ChannelList") + public Result> ChannelList(){ + +// List result = charginService.ChannelList(); + + List result = charginService.ChannelList(); + + return Result.ok(result); + } + + @PostMapping("/CityList") + public Result> CityList(){ + List result = charginService.CityList(); + + return Result.ok(result); + } + + @PostMapping("/RankList") + public Result> RankList(){ + List result = charginService.RankList(); + + return Result.ok(result); + } + + @PostMapping("/serverTypeList") + public Result> serverTypeList(){ + List result = charginService.serverTypeList(); + + return Result.ok(result); + } + + + + + + + + + + + + +} diff --git a/car-charging/car-charging-server/src/main/java/com/car/charging/mapper/ChargingMapper.java b/car-charging/car-charging-server/src/main/java/com/car/charging/mapper/ChargingMapper.java new file mode 100644 index 0000000..1058f6a --- /dev/null +++ b/car-charging/car-charging-server/src/main/java/com/car/charging/mapper/ChargingMapper.java @@ -0,0 +1,42 @@ +package com.car.charging.mapper; + +import com.car.charging.common.domain.*; +import com.car.charging.common.domain.req.AddChannel; +import com.car.charging.common.domain.req.ChargingMiddleTableReq; +import com.car.charging.common.domain.vo.ChargingMiddleTableVo; + +import java.util.List; + +/** + * @ClassName ChargingMapper + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 14:14 + */ + +public interface ChargingMapper { + + + List list(ChargingMiddleTableReq res); + + List ChannelList(); + + List CityList(); + + List RankList(); + + List serverTypeList(); + + + + + int addChargingMiddleTable(AddChannel addChannel); + + int addNightServer(AddChannel addChannel); + + int addEstimatedOrder(AddChannel addChannel); + + + int addSection(AddChannel addChannel); + +} diff --git a/car-charging/car-charging-server/src/main/java/com/car/charging/service/ChargingService.java b/car-charging/car-charging-server/src/main/java/com/car/charging/service/ChargingService.java new file mode 100644 index 0000000..922b856 --- /dev/null +++ b/car-charging/car-charging-server/src/main/java/com/car/charging/service/ChargingService.java @@ -0,0 +1,42 @@ +package com.car.charging.service; + +import com.boot.common.core.domain.Result; +import com.car.charging.common.domain.*; +import com.car.charging.common.domain.req.AddChannel; +import com.car.charging.common.domain.req.ChargingMiddleTableReq; +import com.car.charging.common.domain.vo.ChargingMiddleTableVo; +import com.car.charging.common.result.PageResult; + +import java.util.List; + +/** + * @ClassName ChargingService + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 14:17 + */ +public interface ChargingService { + Result> list(ChargingMiddleTableReq req); + + List ChannelList(); + + List CityList(); + + List RankList(); + + List serverTypeList(); + + + + int addChargingMiddleTable(AddChannel addChannel); + + int addNightServer(AddChannel addChannel); + + int addEstimatedOrder(AddChannel addChannel); + + int addSection(AddChannel addChannel); + + + + boolean addCharging(AddChannel addChannel); +} diff --git a/car-charging/car-charging-server/src/main/java/com/car/charging/service/impl/ChargingServiceImpl.java b/car-charging/car-charging-server/src/main/java/com/car/charging/service/impl/ChargingServiceImpl.java new file mode 100644 index 0000000..fe3f82e --- /dev/null +++ b/car-charging/car-charging-server/src/main/java/com/car/charging/service/impl/ChargingServiceImpl.java @@ -0,0 +1,140 @@ +package com.car.charging.service.impl; + +import com.boot.common.core.domain.Result; +import com.car.charging.common.domain.*; +import com.car.charging.common.domain.req.AddChannel; +import com.car.charging.common.domain.req.ChargingMiddleTableReq; +import com.car.charging.common.domain.vo.ChargingMiddleTableVo; +import com.car.charging.common.result.PageResult; + +import com.car.charging.mapper.ChargingMapper; +import com.car.charging.service.ChargingService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + +import java.util.List; + +/** + * @ClassName ChargingServiceImpl + * @Description 描述 + * @Author Di.Wu + * @Date 2024/2/26 14:17 + */ +@Service +public class ChargingServiceImpl implements ChargingService{ + + @Autowired + private ChargingMapper mapper; + + @Override + public Result> list(ChargingMiddleTableReq req) { + + PageHelper.startPage(req.getPageNum(), req.getPageSize()); + + + List list =mapper.list(req); + + PageInfo chargingMiddleTableVoPageInfo = new PageInfo<>(list); + + + return PageResult.toResult(chargingMiddleTableVoPageInfo.getTotal(),list); + } + + @Override + public List ChannelList() { + + return mapper.ChannelList(); + } + + @Override + public List CityList() { + return mapper.CityList(); + } + + @Override + public List RankList() { + return mapper.RankList(); + } + + @Override + public List serverTypeList() { + return mapper.serverTypeList(); + } + + + + + @Override + public int addChargingMiddleTable(AddChannel addChannel) { + + int addChargingMiddleTable = mapper.addChargingMiddleTable(addChannel); + + if (addChargingMiddleTable>0){ + return 1; + } + + return 0; + } + + @Override + public int addNightServer(AddChannel addChannel) { + int addNightServer = mapper.addNightServer(addChannel); + + if (addNightServer>0){ + return 1; + } + + return 0; + } + + @Override + public int addEstimatedOrder(AddChannel addChannel) { + int addEstimatedOrder = mapper.addEstimatedOrder(addChannel); + + if (addEstimatedOrder>0){ + return 1; + } + + return 0; + } + + @Override + public int addSection(AddChannel addChannel) { + + int addSection = mapper.addSection(addChannel); + + if (addSection>0){ + return 1; + } + + return 0; + } + + @Transactional + @Override + public boolean addCharging(AddChannel addChannel) { + + + + mapper.addNightServer(addChannel); + + + mapper.addEstimatedOrder(addChannel); + + mapper.addSection(addChannel); + + mapper.addChargingMiddleTable(addChannel); + + return true; + + + + + } + + +} diff --git a/car-charging/car-charging-server/src/main/resources/banner.txt b/car-charging/car-charging-server/src/main/resources/banner.txt new file mode 100644 index 0000000..d0fed30 --- /dev/null +++ b/car-charging/car-charging-server/src/main/resources/banner.txt @@ -0,0 +1,22 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + + + + + + ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~} + | | } + | | } + | | } + | | } + | | } + | | } + ~~~~~~~~~~~~~~~~~~ |~~~~~~~~~~~~~~~~~ } + | | } + | | } + | | } + | | } + | | } + | | } + ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~} diff --git a/car-charging/car-charging-server/src/main/resources/bootstrap.yml b/car-charging/car-charging-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..de5cd2c --- /dev/null +++ b/car-charging/car-charging-server/src/main/resources/bootstrap.yml @@ -0,0 +1,27 @@ +# Tomcat +server: + port: 9002 + +# Spring +spring: + application: + # 应用名称 + name: car-charging + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 122.152.215.207:8848 + namespace: wdwdwd + config: + # 配置中心地址 + server-addr: 122.152.215.207:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: wdwdwd diff --git a/car-charging/car-charging-server/src/main/resources/mapper/charging/ChargingMapper.xml b/car-charging/car-charging-server/src/main/resources/mapper/charging/ChargingMapper.xml new file mode 100644 index 0000000..7a99bab --- /dev/null +++ b/car-charging/car-charging-server/src/main/resources/mapper/charging/ChargingMapper.xml @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO + charging_middle_table( + `city_id`, + `channel_id`, + `server_type_id`, + `rank_id`, + `create_time` ) + VALUES + ( #{cityId},#{channelId},#{serverTypeId},#{rankId},#{createTime}); + + + + INSERT INTO + `night_server` + ( + `night_server_mileage_price`, + `night_server_time_price`, + `mileage_price`, + `time_price`, + `long_way_mileage`, + `long_way_price`) + VALUES + (#{nightServerMileagePrice}, #{nightServerTimePrice}, #{mealPrice}, #{timePrice}, #{longWayMileage}, #{longWayPrice}); + + + + INSERT INTO `estimated_order` + (`city_id`, + `server_type_id`, + `channel_id`, + `rank_id`, + `kilometres`, + `server_time`, + `meal_price`, + `basics_price`, + `night_id`) + VALUES + (#{cityId}, #{serverTypeId}, #{channelId}, #{rankId},#{kilometres},#{serverTime}, #{mealPrice}, #{basicsPrice}, #{nightId}); + + + + + INSERT INTO `tb_section` + + `kilometre_price`, + `time_price` + + VALUES + + #{kilometrePrice}, + #{timePrice} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/car-charging/car-charging-server/target/classes/banner.txt b/car-charging/car-charging-server/target/classes/banner.txt new file mode 100644 index 0000000..1f2fea1 --- /dev/null +++ b/car-charging/car-charging-server/target/classes/banner.txt @@ -0,0 +1,17 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~} + | | } + | | } + | | } + | | } + | | } + | | } + ~~~~~~~~~~~~~~~~~~ |~~~~~~~~~~~~~~~~~ } + | | } + | | } + | | } + | | } + | | } + | | } + ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~} diff --git a/car-charging/car-charging-server/target/classes/bootstrap.yml b/car-charging/car-charging-server/target/classes/bootstrap.yml new file mode 100644 index 0000000..de5cd2c --- /dev/null +++ b/car-charging/car-charging-server/target/classes/bootstrap.yml @@ -0,0 +1,27 @@ +# Tomcat +server: + port: 9002 + +# Spring +spring: + application: + # 应用名称 + name: car-charging + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 122.152.215.207:8848 + namespace: wdwdwd + config: + # 配置中心地址 + server-addr: 122.152.215.207:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: wdwdwd diff --git a/car-charging/car-charging-server/target/classes/com/car/charging/CarChargingApplication.class b/car-charging/car-charging-server/target/classes/com/car/charging/CarChargingApplication.class new file mode 100644 index 0000000..211f674 Binary files /dev/null and b/car-charging/car-charging-server/target/classes/com/car/charging/CarChargingApplication.class differ diff --git a/car-charging/car-charging-server/target/classes/com/car/charging/controller/CharginController.class b/car-charging/car-charging-server/target/classes/com/car/charging/controller/CharginController.class new file mode 100644 index 0000000..cfe4888 Binary files /dev/null and b/car-charging/car-charging-server/target/classes/com/car/charging/controller/CharginController.class differ diff --git a/car-charging/car-charging-server/target/classes/com/car/charging/mapper/ChargingMapper.class b/car-charging/car-charging-server/target/classes/com/car/charging/mapper/ChargingMapper.class new file mode 100644 index 0000000..bcc0520 Binary files /dev/null and b/car-charging/car-charging-server/target/classes/com/car/charging/mapper/ChargingMapper.class differ diff --git a/car-charging/car-charging-server/target/classes/com/car/charging/service/ChargingService.class b/car-charging/car-charging-server/target/classes/com/car/charging/service/ChargingService.class new file mode 100644 index 0000000..d189069 Binary files /dev/null and b/car-charging/car-charging-server/target/classes/com/car/charging/service/ChargingService.class differ diff --git a/car-charging/car-charging-server/target/classes/com/car/charging/service/impl/ChargingServiceImpl.class b/car-charging/car-charging-server/target/classes/com/car/charging/service/impl/ChargingServiceImpl.class new file mode 100644 index 0000000..e2e36da Binary files /dev/null and b/car-charging/car-charging-server/target/classes/com/car/charging/service/impl/ChargingServiceImpl.class differ diff --git a/car-charging/car-charging-server/target/classes/mapper/charging/ChargingMapper.xml b/car-charging/car-charging-server/target/classes/mapper/charging/ChargingMapper.xml new file mode 100644 index 0000000..7a99bab --- /dev/null +++ b/car-charging/car-charging-server/target/classes/mapper/charging/ChargingMapper.xml @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO + charging_middle_table( + `city_id`, + `channel_id`, + `server_type_id`, + `rank_id`, + `create_time` ) + VALUES + ( #{cityId},#{channelId},#{serverTypeId},#{rankId},#{createTime}); + + + + INSERT INTO + `night_server` + ( + `night_server_mileage_price`, + `night_server_time_price`, + `mileage_price`, + `time_price`, + `long_way_mileage`, + `long_way_price`) + VALUES + (#{nightServerMileagePrice}, #{nightServerTimePrice}, #{mealPrice}, #{timePrice}, #{longWayMileage}, #{longWayPrice}); + + + + INSERT INTO `estimated_order` + (`city_id`, + `server_type_id`, + `channel_id`, + `rank_id`, + `kilometres`, + `server_time`, + `meal_price`, + `basics_price`, + `night_id`) + VALUES + (#{cityId}, #{serverTypeId}, #{channelId}, #{rankId},#{kilometres},#{serverTime}, #{mealPrice}, #{basicsPrice}, #{nightId}); + + + + + INSERT INTO `tb_section` + + `kilometre_price`, + `time_price` + + VALUES + + #{kilometrePrice}, + #{timePrice} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/car-charging/pom.xml b/car-charging/pom.xml new file mode 100644 index 0000000..34d5df4 --- /dev/null +++ b/car-charging/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.boot + boot + 3.6.3 + + + com.bawei + car-charging + pom + + car-charging-common + car-charging-remote + car-charging-server + + + + 17 + 17 + UTF-8 + + + diff --git a/logs/boot-auth/info.log b/logs/boot-auth/info.log index edc5e6e..fe5e2ca 100644 --- a/logs/boot-auth/info.log +++ b/logs/boot-auth/info.log @@ -98,3 +98,24 @@ 19:43:17.744 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-auth, group=DEFAULT_GROUP 19:43:17.744 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-auth.yml, group=DEFAULT_GROUP 19:43:17.745 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-auth-dev.yml, group=DEFAULT_GROUP +15:24:31.356 [main] INFO c.a.n.c.e.SearchableProperties - [sortPropertySourceDefaultOrder,197] - properties search order:PROPERTIES->JVM->ENV->DEFAULT_SETTING +15:24:31.406 [background-preinit] INFO o.h.v.i.util.Version - [,21] - HV000001: Hibernate Validator 6.2.5.Final +15:24:31.963 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +15:24:31.964 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +15:24:33.470 [main] INFO c.b.a.BootAuthApplication - [logStartupProfileInfo,637] - The following 1 profile is active: "dev" +15:24:34.903 [main] INFO o.a.c.h.Http11NioProtocol - [log,173] - Initializing ProtocolHandler ["http-nio-9200"] +15:24:34.905 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] +15:24:34.906 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/9.0.76] +15:24:35.090 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext +15:24:36.202 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**]. +15:24:38.249 [main] INFO o.a.c.h.Http11NioProtocol - [log,173] - Starting ProtocolHandler ["http-nio-9200"] +15:24:38.274 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +15:24:38.274 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +15:24:38.457 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP boot-auth 10.3.216.28:9200 register finished +15:24:38.719 [main] INFO c.b.a.BootAuthApplication - [logStarted,61] - Started BootAuthApplication in 7.971 seconds (JVM running for 9.151) +15:24:38.733 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-auth, group=DEFAULT_GROUP +15:24:38.734 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-auth.yml, group=DEFAULT_GROUP +15:24:38.736 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-auth-dev.yml, group=DEFAULT_GROUP +15:24:39.107 [RMI TCP Connection(8)-10.3.216.28] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet' +15:30:08.003 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,95] - De-registering from Nacos Server now... +15:30:08.018 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,115] - De-registration finished. diff --git a/logs/boot-gateway/info.log b/logs/boot-gateway/info.log index 2f3ced5..451723c 100644 --- a/logs/boot-gateway/info.log +++ b/logs/boot-gateway/info.log @@ -98,3 +98,23 @@ 19:43:22.866 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-gateway.yml, group=DEFAULT_GROUP 19:43:22.867 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-gateway-dev.yml, group=DEFAULT_GROUP 19:43:22.867 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-gateway, group=DEFAULT_GROUP +15:24:38.623 [main] INFO c.a.n.c.e.SearchableProperties - [sortPropertySourceDefaultOrder,197] - properties search order:PROPERTIES->JVM->ENV->DEFAULT_SETTING +15:24:38.673 [background-preinit] INFO o.h.v.i.util.Version - [,21] - HV000001: Hibernate Validator 6.2.5.Final +15:24:38.984 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +15:24:38.984 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +15:24:40.441 [main] INFO c.b.g.BootGatewayApplication - [logStartupProfileInfo,637] - The following 1 profile is active: "dev" +15:24:43.495 [main] INFO c.a.c.s.g.s.SentinelSCGAutoConfiguration - [sentinelGatewayFilter,144] - [Sentinel SpringCloudGateway] register SentinelGatewayFilter with order: -2147483648 +15:24:43.991 [main] INFO c.a.c.s.g.s.SentinelSCGAutoConfiguration - [sentinelGatewayBlockExceptionHandler,134] - [Sentinel SpringCloudGateway] register SentinelGatewayBlockExceptionHandler +15:24:44.379 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +15:24:44.379 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +15:24:44.597 [main] INFO c.a.c.s.d.c.SentinelConverter - [convert,79] - converter can not convert rules because source is empty +15:24:45.414 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +15:24:45.414 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +15:24:45.597 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP boot-gateway 10.3.216.28:8080 register finished +15:24:45.785 [main] INFO c.a.c.n.d.GatewayLocatorHeartBeatPublisher - [start,64] - Start nacos gateway locator heartBeat task scheduler. +15:24:45.811 [main] INFO c.b.g.BootGatewayApplication - [logStarted,61] - Started BootGatewayApplication in 7.708 seconds (JVM running for 9.297) +15:24:45.817 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-gateway.yml, group=DEFAULT_GROUP +15:24:45.819 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-gateway-dev.yml, group=DEFAULT_GROUP +15:24:45.821 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-gateway, group=DEFAULT_GROUP +15:30:08.010 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,95] - De-registering from Nacos Server now... +15:30:08.033 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,115] - De-registration finished. diff --git a/logs/boot-system/info.log b/logs/boot-system/info.log index 19dec17..72bf47f 100644 --- a/logs/boot-system/info.log +++ b/logs/boot-system/info.log @@ -194,3 +194,31 @@ 20:40:06.368 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-system-dev.yml, group=DEFAULT_GROUP 20:40:06.369 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-system.yml, group=DEFAULT_GROUP 20:40:06.370 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-system, group=DEFAULT_GROUP +15:24:47.466 [main] INFO c.a.n.c.e.SearchableProperties - [sortPropertySourceDefaultOrder,197] - properties search order:PROPERTIES->JVM->ENV->DEFAULT_SETTING +15:24:47.553 [background-preinit] INFO o.h.v.i.util.Version - [,21] - HV000001: Hibernate Validator 6.2.5.Final +15:24:48.083 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +15:24:48.083 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +15:24:49.699 [main] INFO c.b.s.BootSystemApplication - [logStartupProfileInfo,637] - The following 1 profile is active: "dev" +15:24:51.638 [main] INFO o.a.c.h.Http11NioProtocol - [log,173] - Initializing ProtocolHandler ["http-nio-9201"] +15:24:51.639 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] +15:24:51.639 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/9.0.76] +15:24:51.829 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext +15:24:53.729 [main] INFO c.a.d.p.DruidDataSource - [init,996] - {dataSource-1,master} inited +15:24:53.730 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,154] - dynamic-datasource - add a datasource named [master] success +15:24:53.731 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,234] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master] +15:24:57.193 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**]. +15:24:58.955 [main] INFO o.a.c.h.Http11NioProtocol - [log,173] - Starting ProtocolHandler ["http-nio-9201"] +15:24:58.974 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +15:24:58.975 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +15:24:59.166 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP boot-system 10.3.216.28:9201 register finished +15:24:59.703 [main] INFO c.b.s.BootSystemApplication - [logStarted,61] - Started BootSystemApplication in 13.188 seconds (JVM running for 14.542) +15:24:59.715 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-system-dev.yml, group=DEFAULT_GROUP +15:24:59.716 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-system.yml, group=DEFAULT_GROUP +15:24:59.716 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,129] - [Nacos Config] Listening config: dataId=boot-system, group=DEFAULT_GROUP +15:24:59.876 [RMI TCP Connection(4)-10.3.216.28] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet' +15:30:08.081 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,95] - De-registering from Nacos Server now... +15:30:08.094 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,115] - De-registration finished. +15:30:08.225 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,211] - dynamic-datasource start closing .... +15:30:08.227 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2138] - {dataSource-1} closing ... +15:30:08.231 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2211] - {dataSource-1} closed +15:30:08.231 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource all closed success,bye diff --git a/pom.xml b/pom.xml index 698cd00..1e155b0 100644 --- a/pom.xml +++ b/pom.xml @@ -246,7 +246,7 @@ boot-visual boot-modules boot-common - boot-mq + car-charging pom