From 8fc8468219f87bb584312e77b7c0bf889874bbfb Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Wed, 19 May 2021 20:46:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0dockerfile=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall-ums/ums-boot/Dockerfile                  |  6 ++++
 mall-ums/ums-boot/pom.xml                     | 36 +++++++------------
 youlai-admin/admin-boot/Dockerfile            |  6 ++++
 youlai-admin/admin-boot/pom.xml               | 35 ++++++------------
 .../youlai/admin/mapper/SysUserMapper.java    |  2 +-
 5 files changed, 36 insertions(+), 49 deletions(-)
 create mode 100644 mall-ums/ums-boot/Dockerfile
 create mode 100644 youlai-admin/admin-boot/Dockerfile

diff --git a/mall-ums/ums-boot/Dockerfile b/mall-ums/ums-boot/Dockerfile
new file mode 100644
index 000000000..5fd4451e6
--- /dev/null
+++ b/mall-ums/ums-boot/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ADD target/ums-boot.jar ums-boot.jar
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/ums-boot.jar"]
+EXPOSE 8100
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
\ No newline at end of file
diff --git a/mall-ums/ums-boot/pom.xml b/mall-ums/ums-boot/pom.xml
index 3584a7f21..e2c217a2b 100644
--- a/mall-ums/ums-boot/pom.xml
+++ b/mall-ums/ums-boot/pom.xml
@@ -104,6 +104,7 @@
 
     <build>
         <finalName>${artifactId}</finalName>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -112,45 +113,31 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.2.2</version>
+
+                <!--将插件绑定在某个phase执行-->
                 <executions>
-                    <!--执行mvn package,即执行 mvn clean package docker:build-->
-                   <!-- <execution>
+                    <execution>
                         <id>build-image</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>build</goal>
+                            <!-- <goal>build</goal>-->
                         </goals>
-                    </execution>-->
+                    </execution>
                 </executions>
-
                 <configuration>
-                    <!-- 镜像名称 -->
                     <imageName>${project.artifactId}</imageName>
-                    <!-- 指定标签 -->
+                    <!--指定标签-->
                     <imageTags>
                         <imageTag>latest</imageTag>
                     </imageTags>
-                    <!-- 基础镜像-->
-                    <baseImage>openjdk:8-jdk-alpine</baseImage>
-
-                    <!-- 切换到容器工作目录-->
-                    <workdir>/</workdir>
-
-                    <entryPoint>["java","-jar","${project.build.finalName}.jar"]</entryPoint>
-
-                    <!-- 指定远程 Docker API地址  -->
-                    <dockerHost>https://c.youlai.tech:2376</dockerHost>
-                    <!-- 指定tls证书的目录 -->
-                    <dockerCertPath>C:\cert\docker\c.youlai.tech</dockerCertPath>
-
-                    <!-- 复制 jar包到docker容器指定目录-->
+                    <!-- 指定 Dockerfile 路径-->
+                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+                    <forceTags>true</forceTags>
                     <resources>
                         <resource>
                             <targetPath>/</targetPath>
-                            <!-- 用于指定需要复制的根目录，${project.build.directory}表示target目录 -->
                             <directory>${project.build.directory}</directory>
-                            <!-- 用于指定需要复制的文件，${project.build.finalName}.jar就是打包后的target目录下的jar包名称　-->
                             <include>${project.build.finalName}.jar</include>
                         </resource>
                     </resources>
@@ -158,4 +145,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
diff --git a/youlai-admin/admin-boot/Dockerfile b/youlai-admin/admin-boot/Dockerfile
new file mode 100644
index 000000000..6e96e3cd4
--- /dev/null
+++ b/youlai-admin/admin-boot/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ADD target/admin-boot.jar admin-boot.jar
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/admin-boot.jar"]
+EXPOSE 8100
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
\ No newline at end of file
diff --git a/youlai-admin/admin-boot/pom.xml b/youlai-admin/admin-boot/pom.xml
index cf07d5d1c..73bbd2fad 100644
--- a/youlai-admin/admin-boot/pom.xml
+++ b/youlai-admin/admin-boot/pom.xml
@@ -101,6 +101,7 @@
 
     <build>
         <finalName>${artifactId}</finalName>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -109,45 +110,31 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.2.2</version>
+
+                <!--将插件绑定在某个phase执行-->
                 <executions>
-                    <!--执行mvn package,即执行 mvn clean package docker:build-->
-                   <!-- <execution>
+                    <execution>
                         <id>build-image</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>build</goal>
+                           <!-- <goal>build</goal>-->
                         </goals>
-                    </execution>-->
+                    </execution>
                 </executions>
-
                 <configuration>
-                    <!-- 镜像名称 -->
                     <imageName>${project.artifactId}</imageName>
-                    <!-- 指定标签 -->
+                    <!--指定标签-->
                     <imageTags>
                         <imageTag>latest</imageTag>
                     </imageTags>
-                    <!-- 基础镜像-->
-                    <baseImage>openjdk:8-jdk-alpine</baseImage>
-
-                    <!-- 切换到容器工作目录-->
-                    <workdir>/</workdir>
-
-                    <entryPoint>["java","-jar","${project.build.finalName}.jar"]</entryPoint>
-
-                    <!-- 指定远程 Docker API地址  -->
-                    <dockerHost>https://f.youlai.tech:2376</dockerHost>
-                    <!-- 指定tls证书的目录 -->
-                    <dockerCertPath>C:\cert\docker\f.youlai.tech</dockerCertPath>
-
-                    <!-- 复制 jar包到docker容器指定目录-->
+                    <!-- 指定 Dockerfile 路径-->
+                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+                    <forceTags>true</forceTags>
                     <resources>
                         <resource>
                             <targetPath>/</targetPath>
-                            <!-- 用于指定需要复制的根目录，${project.build.directory}表示target目录 -->
                             <directory>${project.build.directory}</directory>
-                            <!-- 用于指定需要复制的文件，${project.build.finalName}.jar就是打包后的target目录下的jar包名称　-->
                             <include>${project.build.finalName}.jar</include>
                         </resource>
                     </resources>
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java
index c17970ee0..f39e5a29e 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java
@@ -20,7 +20,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "       left join sys_dept d on u.dept_id= d.id " +
             "       left join sys_user_role ur on u.id=ur.user_id " +
             "       left join sys_role r on ur.role_id=r.id " +
-            "   where deleted != 1 " +
+            "   where u.deleted != 1 " +
             " <if test ='user.username!=null and user.username.trim() neq \"\"'>" +
             "       and u.username like concat('%',#{user.username},'%')" +
             " </if>" +