From 9aa599fb0b3344de588599a7e0f245b17eaf3358 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 27 Apr 2019 21:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EDocker=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=AE=9E=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/jeesite-core.yml    |  2 +-
 web/bin/docker-bulid.bat                      | 17 +++++++++
 web/bin/docker-bulid.sh                       | 13 +++++++
 web/bin/docker/Dockerfile                     | 23 +++++++++++
 web/bin/docker/application-prod.yml           | 26 +++++++++++++
 web/pom.xml                                   | 38 ++++++++++++++++++-
 web/src/main/resources/config/application.yml |  6 ++-
 7 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 web/bin/docker-bulid.bat
 create mode 100644 web/bin/docker-bulid.sh
 create mode 100644 web/bin/docker/Dockerfile
 create mode 100644 web/bin/docker/application-prod.yml

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 7ecd4227..5e0e46ad 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -458,7 +458,7 @@ web:
   
   # 静态资源路径前缀，可做CDN加速优化
   staticPrefix: /static
-
+  
   # 自定义正则表达式验证（主键、登录名）
   validator:
     id: '[a-zA-Z0-9_\-/#\u4e00-\u9fa5]{0,64}'
diff --git a/web/bin/docker-bulid.bat b/web/bin/docker-bulid.bat
new file mode 100644
index 00000000..86c62d5f
--- /dev/null
+++ b/web/bin/docker-bulid.bat
@@ -0,0 +1,17 @@
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  */
+echo.
+echo [��Ϣ] ʹ�� Spring Boot Docker ���� Web ���̡�
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean package docker:build -Dmaven.test.skip=true -U -Pdocker
+
+pause
\ No newline at end of file
diff --git a/web/bin/docker-bulid.sh b/web/bin/docker-bulid.sh
new file mode 100644
index 00000000..858ce937
--- /dev/null
+++ b/web/bin/docker-bulid.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# /**
+#  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  *
+#  * Author: ThinkGem@163.com
+#  * 
+#  */
+echo ""
+echo "[信息] 使用 Spring Boot Docker 编译 Web 工程。"
+echo ""
+
+cd ..
+mvn clean package docker:build -Dmaven.test.skip=true -U -Pdocker
\ No newline at end of file
diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile
new file mode 100644
index 00000000..529924c7
--- /dev/null
+++ b/web/bin/docker/Dockerfile
@@ -0,0 +1,23 @@
+FROM frolvlad/alpine-java:jdk8-slim
+MAINTAINER ThinkGem@163.com
+ENV TZ "Asia/Shanghai"
+ENV LANG C.UTF-8
+VOLUME /tmp
+
+WORKDIR /app
+ADD web.war .
+RUN jar -xvf web.war
+# RUN chmod -R 755 ./*
+
+WORKDIR /app/WEB-INF
+ENV JAVA_OPTS "-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
+
+ADD application-prod.yml ./classes/config
+# ADD jeesite.lic .
+
+ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
+
+EXPOSE 8980
+
+# docker run -p 8983:8983 com.jeesite/jeesite-web:4.1
diff --git a/web/bin/docker/application-prod.yml b/web/bin/docker/application-prod.yml
new file mode 100644
index 00000000..c9faa3fc
--- /dev/null
+++ b/web/bin/docker/application-prod.yml
@@ -0,0 +1,26 @@
+
+# 数据库连接
+jdbc: 
+  
+  # Mysql 数据库配置
+  type: mysql
+  driver: com.mysql.jdbc.Driver
+  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+  username: jeesite
+  password: jeesite
+  testSql: SELECT 1
+
+# MyBatis 相关
+mybatis:
+
+  # Mapper文件刷新线程
+  mapper:
+    refresh:
+      enabled: false
+      
+# 文件相关
+file:
+
+  # 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
+  baseDir: /root/jeesite
+  
diff --git a/web/pom.xml b/web/pom.xml
index 5198a99a..723d029c 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -26,6 +26,10 @@
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
 		<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
 		
+		<!-- docker service -->
+		<docker.registryUrl>http://192.168.56.102:2375</docker.registryUrl>
+		<docker.imageName>${project.groupId}/${project.artifactId}:4.1</docker.imageName>
+		
 	</properties>
 
 	<dependencies>
@@ -106,7 +110,7 @@
 				</configuration>
 			</plugin>
 			
-			<!-- Eclipse插件 -->
+			<!-- Eclipse 插件 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
@@ -122,6 +126,38 @@
 		</plugins>
 	</build>
 	
+	<profiles>
+		<!-- Docker 插件 -->
+		<profile>
+			<id>docker</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>com.spotify</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
+						<version>1.1.0</version>
+						<configuration>
+							<serverId>docker-hub</serverId>
+							<registryUrl>${docker.registryUrl}</registryUrl>
+							<dockerHost>${docker.registryUrl}</dockerHost>
+							<imageName>${docker.imageName}</imageName>
+							<dockerDirectory>${project.basedir}/bin/docker</dockerDirectory>
+							<resources>
+								<resource>
+									<targetPath>/</targetPath>
+									<directory>${project.build.directory}</directory>
+									<include>web.war</include>
+								</resource>
+							</resources>
+							<forceTags>true</forceTags>
+							<pushImage>false</pushImage>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	
 	<developers>  
 		<developer>
 			<id>thinkgem</id>
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 4e7240ec..bf71bb21 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -475,7 +475,7 @@ logging:
 #  
 #  # 静态资源路径前缀，可做CDN加速优化
 #  staticPrefix: /static
-#
+#  
 #  # 自定义正则表达式验证（主键、登录名）
 #  validator:
 #    id: '[a-zA-Z0-9_\-/#\u4e00-\u9fa5]{0,64}'
@@ -484,6 +484,10 @@ logging:
 #  # 核心模块的Web功能（仅作为微服务时设为false）
 #  core: 
 #    enabled: true
+#  
+#  # 在线API文档工具
+#  swagger: 
+#    enabled: true
 
 # 错误页面500.html是否输出错误信息（正式环境，为提供安全性可设置为false）
 #error: