microservice / sl-express · Commits

Commit ea121624ecf858ee9675929de79f4bf0ef7a0f43

Authored by shaofan
1 parent 01767b9a
build: skipped

Adjust configurations, clean code, and introduce parent POM file.

Inline Side-by-side
Showing 7 changed files with 92 additions and 8 deletions
01-讲义/md/day01-项目概述.md
  View file @ea12162
... ... @@ -548,7 +548,7 @@ spring:
548 548 nacos:
549 549 username: nacos
550 550 password: nacos
551   - server-addr: 192.168.150.101:8848
  551 + server-addr: nacos.diligrp.com:8848
552 552 discovery:
553 553 namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
554 554 ip: 192.168.150.1
... ...
01-讲义/md/day03-支付微服务.md
  View file @ea12162
... ... @@ -190,7 +190,7 @@ seata:
190 190 registry:
191 191 type: nacos
192 192 nacos:
193   - server-addr: 192.168.150.101:8848
  193 + server-addr: nacos.diligrp.com:8848
194 194 namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
195 195 group: DEFAULT_GROUP
196 196 application: seata-server
... ...
01-讲义/md/day09-智能调度之作业范围.md
  View file @ea12162
... ... @@ -686,7 +686,7 @@ spring:
686 686 nacos:
687 687 username: nacos
688 688 password: nacos
689   - server-addr: 192.168.150.101:8848
  689 + server-addr: nacos.diligrp.com:8848
690 690 discovery:
691 691 namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
692 692 config:
... ...
pom.xml 0 → 100644
  View file @ea12162
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <modelVersion>4.0.0</modelVersion>
  6 +
  7 + <groupId>com.dili</groupId>
  8 + <artifactId>sl-express-all</artifactId>
  9 + <version>1.0.0</version>
  10 + <packaging>pom</packaging>
  11 + <name>${project.artifactId}</name>
  12 + <description>sl-express</description>
  13 +
  14 + <modules>
  15 + <!-- 基础公共模块 -->
  16 + <module>sl-express-common</module>
  17 + <module>sl-express-mq</module>
  18 +<!-- <module>sl-express-sdn</module>-->
  19 + <module>sl-express-pay</module>
  20 + <module>sl-express-xxl-job</module>
  21 +<!-- <module>sentinel</module>-->
  22 +
  23 + <!-- API 模块 -->
  24 + <module>sl-express-ms-base-api</module>
  25 + <module>sl-express-ms-carriage-api</module>
  26 + <module>sl-express-ms-courier-api</module>
  27 + <module>sl-express-ms-driver-api</module>
  28 + <module>sl-express-ms-oms-api</module>
  29 + <module>sl-express-ms-search-api</module>
  30 + <module>sl-express-ms-service-scope-api</module>
  31 + <module>sl-express-ms-sms-api</module>
  32 + <module>sl-express-ms-track-api</module>
  33 + <module>sl-express-ms-trade-api</module>
  34 + <module>sl-express-ms-transport-api</module>
  35 + <module>sl-express-ms-transport-info-api</module>
  36 + <module>sl-express-ms-user-api</module>
  37 + <module>sl-express-ms-work-api</module>
  38 +
  39 + <!-- Domain 模块 -->
  40 + <module>sl-express-ms-base-domain</module>
  41 + <module>sl-express-ms-carriage-domain</module>
  42 + <module>sl-express-ms-courier-domain</module>
  43 + <module>sl-express-ms-driver-domain</module>
  44 + <module>sl-express-ms-oms-domain</module>
  45 + <module>sl-express-ms-search-domain</module>
  46 + <module>sl-express-ms-service-scope-domain</module>
  47 + <module>sl-express-ms-sms-domain</module>
  48 + <module>sl-express-ms-track-domain</module>
  49 + <module>sl-express-ms-trade-domain</module>
  50 + <module>sl-express-ms-transport-domain</module>
  51 + <module>sl-express-ms-transport-info-domain</module>
  52 + <module>sl-express-ms-user-domain</module>
  53 + <module>sl-express-ms-work-domain</module>
  54 +
  55 + <!-- Service 模块 -->
  56 + <module>sl-express-ms-base-service</module>
  57 + <module>sl-express-ms-carriage-service</module>
  58 + <module>sl-express-ms-courier-service</module>
  59 + <module>sl-express-ms-dispatch-service</module>
  60 + <module>sl-express-ms-driver-service</module>
  61 + <module>sl-express-ms-oms-service</module>
  62 + <module>sl-express-ms-search-service</module>
  63 + <module>sl-express-ms-service-scope-service</module>
  64 + <module>sl-express-ms-sms-service</module>
  65 + <module>sl-express-ms-track-service</module>
  66 + <module>sl-express-ms-trade-service</module>
  67 + <module>sl-express-ms-transport-service</module>
  68 + <module>sl-express-ms-transport-info-service</module>
  69 + <module>sl-express-ms-user-service</module>
  70 + <module>sl-express-ms-work-service</module>
  71 +
  72 + <!-- Web 模块 -->
  73 + <module>sl-express-ms-web-courier</module>
  74 + <module>sl-express-ms-web-customer</module>
  75 + <module>sl-express-ms-web-driver</module>
  76 + <module>sl-express-ms-web-manager</module>
  77 +
  78 + <!-- 网关 -->
  79 + <module>sl-express-gateway</module>
  80 + </modules>
  81 +
  82 +</project>
... ...
sl-express-ms-base-service/src/test/java/com/sl/ms/base/mq/AuthUserMQListenerTest.java
  View file @ea12162
... ... @@ -14,7 +14,7 @@ class AuthUserMQListenerTest {
14 14  
15 15 @Test
16 16 void listenUserMsg() {
17   - String s = "{\"type\":\"USER\",\"operation\":\"DEL\",\"content\":[{\"id\":\"1014219558409471937\",\"superior\":\"-1\",\"account\":\"xxxx\",\"name\":\"xxxx\",\"orgId\":\"987327492140340001\",\"orgName\":null,\"stationId\":\"981223703335410625\",\"stationName\":null,\"email\":null,\"mobile\":\"13838383883\",\"sex\":{\"desc\":\"男\",\"code\":\"M\"},\"status\":true,\"avatar\":\"\",\"workDescribe\":\"\",\"passwordErrorLastTime\":null,\"passwordErrorNum\":0,\"passwordExpireTime\":null,\"password\":\"e10adc3949ba59abbe56e057f20f883e\",\"lastLoginTime\":null,\"roles\":null,\"roleNames\":null,\"userGroupsNames\":null,\"administrator\":false}]}\n";
18   - authUserMQListener.listenUserMsg(s);
  17 +// String s = "{\"type\":\"USER\",\"operation\":\"DEL\",\"content\":[{\"id\":\"1014219558409471937\",\"superior\":\"-1\",\"account\":\"xxxx\",\"name\":\"xxxx\",\"orgId\":\"987327492140340001\",\"orgName\":null,\"stationId\":\"981223703335410625\",\"stationName\":null,\"email\":null,\"mobile\":\"13838383883\",\"sex\":{\"desc\":\"男\",\"code\":\"M\"},\"status\":true,\"avatar\":\"\",\"workDescribe\":\"\",\"passwordErrorLastTime\":null,\"passwordErrorNum\":0,\"passwordExpireTime\":null,\"password\":\"e10adc3949ba59abbe56e057f20f883e\",\"lastLoginTime\":null,\"roles\":null,\"roleNames\":null,\"userGroupsNames\":null,\"administrator\":false}]}\n";
  18 +// authUserMQListener.listenUserMsg(s);
19 19 }
20 20 }
21 21 \ No newline at end of file
... ...
sl-express-ms-transport-domain/src/main/java/com/sl/transport/domain/CostConfigurationDTO.java
  View file @ea12162
... ... @@ -17,9 +17,7 @@ import javax.validation.constraints.NotNull;
17 17 @NoArgsConstructor
18 18 @ApiModel("成本配置")
19 19 public class CostConfigurationDTO {
20   - @ApiModelProperty(value = "线路类型， TRUNK_LINE(1, \"干线\", \"一级转运中心到一级转运中心\"),\n" +
21   - " BRANCH_LINE(2, \"支线\", \"一级转运中心与二级转运中心之间线路\"),\n" +
22   - " CONNECT_LINE(3, \"接驳路线\", \"二级转运中心到网点\"),", required = true)
  20 +
23 21 @NotNull(message = "线路类型不能为空！")
24 22 @Min(value = 1, message = "线路类型最小为1！")
25 23 @Max(value = 3, message = "线路类型最大为3！")
... ...
sl-express-ms-work-service/src/main/java/com/sl/ms/work/entity/TransportTaskEntity.java
  View file @ea12162
... ... @@ -5,9 +5,11 @@ import com.sl.ms.work.domain.enums.transporttask.TransportTaskAssignedStatus;
5 5 import com.sl.ms.work.domain.enums.transporttask.TransportTaskLoadingStatus;
6 6 import com.sl.ms.work.domain.enums.transporttask.TransportTaskStatus;
7 7 import com.sl.transport.common.entity.BaseEntity;
  8 +import lombok.AllArgsConstructor;
8 9 import lombok.Builder;
9 10 import lombok.Data;
10 11 import lombok.EqualsAndHashCode;
  12 +import lombok.NoArgsConstructor;
11 13 import lombok.experimental.Accessors;
12 14  
13 15 import java.time.LocalDateTime;
... ... @@ -20,6 +22,8 @@ import java.time.LocalDateTime;
20 22 @Accessors(chain = true)
21 23 @TableName("sl_transport_task")
22 24 @Builder
  25 +@NoArgsConstructor
  26 +@AllArgsConstructor
23 27 public class TransportTaskEntity extends BaseEntity {
24 28  
25 29 private static final long serialVersionUID = 1L;
... ...