历史订单排序

pom.xml

@@ -114,12 +114,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.15</version>
-        </dependency>
-
         <!--springboot websocket模块-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -217,19 +211,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <!--            <exclusions>-->
-            <!--                <exclusion>-->
-            <!--                    <groupId>org.springframework.boot</groupId>-->
-            <!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
-            <!--                </exclusion>-->
-            <!--            </exclusions>-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <!--                &lt;!&ndash;undertow servlet 容器&ndash;&gt;-->
-        <!--                <dependency>-->
-        <!--                    <groupId>org.springframework.boot</groupId>-->
-        <!--                    <artifactId>spring-boot-starter-undertow</artifactId>-->
-        <!--                </dependency>-->
+        <!--undertow servlet 容器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
 
         <!--springboot自动配置-->
         <dependency>
@@ -313,6 +307,27 @@
                 <configuration>
                 </configuration>
             </plugin>
+
+            <!-- docker的maven插件，官网：https://github.com/spotify/docker-maven-plugin -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.13</version>
+                <configuration>
+                    <imageName>${project.artifactId}:${project.version}</imageName>
+                    <baseImage>openjdk:8-jdk-alpine</baseImage>
+                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                    <!--                    <dockerHost>http://127.0.0.1:2375</dockerHost>-->
+                </configuration>
+            </plugin>
+
         </plugins>
 
         <resources>

src/docker/dev.dockerfile

+FROM openjdk:8-jdk-alpine
+ADD ../../target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar app.jar
+ENTRYPOINT ["java","-Dspring.profiles.active=dev","-Xms256m","-Xmx256m","-Xss2m","-jar","/app.jar"]

src/docker/prod.dockerfile

+FROM openjdk:8-jdk-alpine
+ADD ../../target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar app.jar
+ENTRYPOINT ["java","-Dspring.profiles.active=prod","-Xms2048m","-Xmx2048m","-Xss2m","-jar","/app.jar"]

src/docker/test.dockerfile

+FROM openjdk:8-jdk-alpine
+ADD ../../target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar /app.jar
+ENTRYPOINT ["java","-Dspring.profiles.active=test","-Xms2048m","-Xmx2048m","-Xss2m","-jar","/app.jar"]

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -594,7 +594,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
                 .eq(OrderManage::getDepartmentId, gogirlToken.getDepartmentId())
-                .eq(OrderManage::getOrderUser, customerId));
+                .eq(OrderManage::getOrderUser, customerId)
+                .orderByDesc(OrderManage::getCreateTime));
 
         //订单记录的图片
         for (OrderManage orderManage : orderManageList) {

src/shell/dev-docker.sh

+docker build -f ../docker/dev.dockerfile -t gogirl-miniapp-backend-dev5443:3.5 . \
+&& docker run \
+-v /Users/huluobin/docker/gogirl-miniapp-backend/dev/log:/log \
+-p 5443:5443 \
+gogirl-miniapp-backend-dev5443:3.5
\ No newline at end of file

src/shell/prod-docker.sh

+docker build -f ../docker/prod.dockerfile -t gogirl-miniapp-backend-prod5444:3.5 . \
+&& docker run \
+-v /Users/huluobin/docker/gogirl-miniapp-backend/prod/log:/log \
+-p 5444:5444 \
+gogirl-miniapp-backend-prod5444:3.5
\ No newline at end of file

src/shell/test-docker.sh

+docker build -f ../docker/test.dockerfile -t gogirl-miniapp-backend-test5445:3.5 . \
+&& docker run \
+-v /Users/huluobin/docker/gogirl-miniapp-backend/test/log:/log \
+-p 5445:5445 \
+gogirl-miniapp-backend-test5445:3.5
\ No newline at end of file