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

shaofan
1 parent 01767b9a
Showing 7 changed files with 92 additions and 8 deletions
01-讲义/md/day01-项目概述.md
01-讲义/md/day03-支付微服务.md
01-讲义/md/day09-智能调度之作业范围.md
pom.xml
sl-express-ms-base-service/src/test/java/com/sl/ms/base/mq/AuthUserMQListenerTest.java
sl-express-ms-transport-domain/src/main/java/com/sl/transport/domain/CostConfigurationDTO.java
sl-express-ms-work-service/src/main/java/com/sl/ms/work/entity/TransportTaskEntity.java
@@ -548,7 +548,7 @@ spring:
     nacos:
       username: nacos
       password: nacos
-      server-addr: 192.168.150.101:8848
+      server-addr: nacos.diligrp.com:8848
       discovery:
         namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
         ip: 192.168.150.1
@@ -190,7 +190,7 @@ seata:
   registry:
     type: nacos
     nacos:
-      server-addr: 192.168.150.101:8848
+      server-addr: nacos.diligrp.com:8848
       namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
       group: DEFAULT_GROUP
       application: seata-server
@@ -686,7 +686,7 @@ spring:
     nacos:
       username: nacos
       password: nacos
-      server-addr: 192.168.150.101:8848
+      server-addr: nacos.diligrp.com:8848
       discovery:
         namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
       config:
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.dili</groupId>
+    <artifactId>sl-express-all</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+    <description>sl-express</description>
+
+    <modules>
+        <!-- 基础公共模块 -->
+        <module>sl-express-common</module>
+        <module>sl-express-mq</module>
+<!--        <module>sl-express-sdn</module>-->
+        <module>sl-express-pay</module>
+        <module>sl-express-xxl-job</module>
+<!--        <module>sentinel</module>-->
+
+        <!-- API 模块 -->
+        <module>sl-express-ms-base-api</module>
+        <module>sl-express-ms-carriage-api</module>
+        <module>sl-express-ms-courier-api</module>
+        <module>sl-express-ms-driver-api</module>
+        <module>sl-express-ms-oms-api</module>
+        <module>sl-express-ms-search-api</module>
+        <module>sl-express-ms-service-scope-api</module>
+        <module>sl-express-ms-sms-api</module>
+        <module>sl-express-ms-track-api</module>
+        <module>sl-express-ms-trade-api</module>
+        <module>sl-express-ms-transport-api</module>
+        <module>sl-express-ms-transport-info-api</module>
+        <module>sl-express-ms-user-api</module>
+        <module>sl-express-ms-work-api</module>
+
+        <!-- Domain 模块 -->
+        <module>sl-express-ms-base-domain</module>
+        <module>sl-express-ms-carriage-domain</module>
+        <module>sl-express-ms-courier-domain</module>
+        <module>sl-express-ms-driver-domain</module>
+        <module>sl-express-ms-oms-domain</module>
+        <module>sl-express-ms-search-domain</module>
+        <module>sl-express-ms-service-scope-domain</module>
+        <module>sl-express-ms-sms-domain</module>
+        <module>sl-express-ms-track-domain</module>
+        <module>sl-express-ms-trade-domain</module>
+        <module>sl-express-ms-transport-domain</module>
+        <module>sl-express-ms-transport-info-domain</module>
+        <module>sl-express-ms-user-domain</module>
+        <module>sl-express-ms-work-domain</module>
+
+        <!-- Service 模块 -->
+        <module>sl-express-ms-base-service</module>
+        <module>sl-express-ms-carriage-service</module>
+        <module>sl-express-ms-courier-service</module>
+        <module>sl-express-ms-dispatch-service</module>
+        <module>sl-express-ms-driver-service</module>
+        <module>sl-express-ms-oms-service</module>
+        <module>sl-express-ms-search-service</module>
+        <module>sl-express-ms-service-scope-service</module>
+        <module>sl-express-ms-sms-service</module>
+        <module>sl-express-ms-track-service</module>
+        <module>sl-express-ms-trade-service</module>
+        <module>sl-express-ms-transport-service</module>
+        <module>sl-express-ms-transport-info-service</module>
+        <module>sl-express-ms-user-service</module>
+        <module>sl-express-ms-work-service</module>
+
+        <!-- Web 模块 -->
+        <module>sl-express-ms-web-courier</module>
+        <module>sl-express-ms-web-customer</module>
+        <module>sl-express-ms-web-driver</module>
+        <module>sl-express-ms-web-manager</module>
+
+        <!-- 网关 -->
+        <module>sl-express-gateway</module>
+    </modules>
+
+</project>
@@ -14,7 +14,7 @@ class AuthUserMQListenerTest {
     @Test
     void listenUserMsg() {
-        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";
-        authUserMQListener.listenUserMsg(s);
+//        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";
+//        authUserMQListener.listenUserMsg(s);
     }
 }
 \ No newline at end of file
@@ -17,9 +17,7 @@ import javax.validation.constraints.NotNull;
 @NoArgsConstructor
 @ApiModel("成本配置")
 public class CostConfigurationDTO {
-    @ApiModelProperty(value = "线路类型，    TRUNK_LINE(1, \"干线\", \"一级转运中心到一级转运中心\"),\n" +
-            "    BRANCH_LINE(2, \"支线\", \"一级转运中心与二级转运中心之间线路\"),\n" +
-            "    CONNECT_LINE(3, \"接驳路线\", \"二级转运中心到网点\"),", required = true)
+
     @NotNull(message = "线路类型不能为空！")
     @Min(value = 1, message = "线路类型最小为1！")
     @Max(value = 3, message = "线路类型最大为3！")
@@ -5,9 +5,11 @@ import com.sl.ms.work.domain.enums.transporttask.TransportTaskAssignedStatus;
 import com.sl.ms.work.domain.enums.transporttask.TransportTaskLoadingStatus;
 import com.sl.ms.work.domain.enums.transporttask.TransportTaskStatus;
 import com.sl.transport.common.entity.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import java.time.LocalDateTime;
@@ -20,6 +22,8 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @TableName("sl_transport_task")
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class TransportTaskEntity extends BaseEntity {
     private static final long serialVersionUID = 1L;