Răsfoiți Sursa

升级:docker部署。

lym 14 ore în urmă
părinte
comite
0f78204d78

+ 52 - 0
pom.xml

@@ -39,8 +39,42 @@
     <poi.version>3.14</poi.version>
     <poi.ooxml.version>3.14</poi.ooxml.version>
     <commons.io.version>2.5</commons.io.version>
+
+    <!-- docker 配置 -->
+    <docker.version>1</docker.version>
+    <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
   </properties>
 
+  <profiles>
+    <profile>
+      <id>dev</id>
+      <!--默认激活当前配置-->
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <profiles.active>dev</profiles.active>
+        <!-- Docker 配置 -->
+        <docker.dockerHost>http://172.16.90.199:2376</docker.dockerHost>
+        <docker.serviceId>DockerHub</docker.serviceId>
+        <docker.sslpath></docker.sslpath>
+        <docker.image.version>1.0.0</docker.image.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>pro</id>
+      <properties>
+        <profiles.active>pro</profiles.active>
+        <!-- Docker 配置 -->
+        <docker.dockerHost>http://172.16.90.199:2376</docker.dockerHost>
+        <docker.serviceId>DockerHub</docker.serviceId>
+        <!-- <docker.sslpath>../doc/ssl/pro</docker.sslpath> -->
+        <docker.sslpath></docker.sslpath>
+        <docker.image.version>${maven.build.timestamp}.${docker.version}</docker.image.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <dependencies>
 
     <dependency>
@@ -246,6 +280,24 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>com.spotify</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>1.2.2</version>
+        <configuration>
+          <serverId>${docker.serviceId}</serverId>
+          <dockerHost>${docker.dockerHost}</dockerHost>
+          <imageName>docker.io/${project.artifactId}:${docker.image.version}</imageName>
+          <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+          <resources>
+            <resource>
+              <targetPath>/</targetPath>
+              <directory>${project.build.directory}</directory>
+              <include>${project.build.finalName}.jar</include>
+            </resource>
+          </resources>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

+ 7 - 0
src/main/docker/Dockerfile

@@ -0,0 +1,7 @@
+FROM openjdk:8-jdk-alpine
+# time zone
+RUN echo "Asia/Shanghai" > /etc/timezone
+# VOLUME /logs
+COPY forest-map-1.0.jar app.jar
+# ENV JAVA_OPTS=""
+CMD ["java","-Djava.security.egd=file:/dev/./urandom", "-Xms512m", "-Xmx512m","-jar","app.jar"]

+ 3 - 3
src/main/resources/application-dev.properties

@@ -49,9 +49,9 @@ common.file.download.url=file/downloadDocument?fileName=
 mybatis.config-locations=classpath:mybatis-generator/generatorConfig.xml
 
 #data1
-first.datasource.jdbc-url=jdbc:mysql://172.16.90.64:3306/one-map?useUnicode=true&characterEncoding=utf8&useSSL=false&verifyServerCertificate=false
-first.datasource.username=root
-first.datasource.password=123456
+first.datasource.jdbc-url=jdbc:mysql://172.16.90.156:13306/one-map?useUnicode=true&characterEncoding=utf8&useSSL=false&verifyServerCertificate=false
+first.datasource.username=admin
+first.datasource.password=Dzkj$123
 first.datasource.driver-class-name=com.mysql.jdbc.Driver
 first.jpa.show-sql=true
 

+ 4 - 4
src/main/resources/mybatis-generator/generatorConfig.xml

@@ -4,7 +4,7 @@
   "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
   <classPathEntry
-    location="D:/developerUtil/app/a_maven/apache-maven-3.6.3-bin/reposity/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46.jar"/>
+    location="E:/app/two-repository/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46.jar"/>
   <context id="my" targetRuntime="MyBatis3">
     <commentGenerator>
       <property name="suppressDate" value="false"/>
@@ -14,9 +14,9 @@
 
     <!--&lt;!&ndash;数据库连接的信息:驱动类、连接地址、用户名、密码 &ndash;&gt;-->
     <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-      connectionURL="jdbc:mysql://47.111.224.169:3306/meitan_smart_map?characterEncoding=UTF-8"
-      userId="map"
-      password="Admin123"/>
+      connectionURL="jdbc:mysql://172.16.90.156:13306/one-map?characterEncoding=UTF-8"
+      userId="admin"
+      password="Dzkj$123"/>
 
     <!-- 默认false,把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer,为 true时把JDBC DECIMAL 和 NUMERIC 类型解析为java.math.BigDecimal -->
     <javaTypeResolver>