购物车微服务迁移至docker

build supermarket-cart image, rename docker to start_up
ZongXR · Mar 26, 2022 · ef9177e · ef9177e
1 parent 5ea3b87
commit ef9177e
Show file tree

Hide file tree

Showing 39 changed files with 75 additions and 10 deletions.
diff --git a/cart/Dockerfile b/cart/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:11.0.7-jre
+MAINTAINER ZongXiangrui<zxr@tju.edu.cn>
+ENV APP_PORT=10005
+EXPOSE ${APP_PORT}
+ARG JAR_FILE
+WORKDIR /opt
+COPY target/${JAR_FILE} /opt/app.jar
+CMD ["java", "-version"]
+ENTRYPOINT ["java", "-jar", "/opt/app.jar"]
diff --git a/cart/pom.xml b/cart/pom.xml
@@ -8,15 +8,18 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>cart</artifactId>
-
+    <artifactId>${project.parent.artifactId}-cart</artifactId>
+    <groupId>com.supermarket.cart</groupId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <dependencies>
         <!--    共享资源    -->
         <dependency>
-            <groupId>com.supermarket</groupId>
-            <artifactId>common</artifactId>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../common/target/supermarket-common.jar</systemPath>
+            <groupId>com.supermarket.common</groupId>
+            <artifactId>supermarket-common</artifactId>
             <version>1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
@@ -48,6 +51,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!--    mybatis连接spring    -->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
@@ -99,7 +112,47 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
 
+                <executions>
+                    <execution>
+                        <id>build-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>push-image</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
 
+                <configuration>
+                    <repository>zongxr/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/cart/src/main/resources/application.properties b/cart/src/main/resources/application.properties
@@ -1,8 +1,7 @@
-server.port=10005
+server.port=${APP_PORT}
 
 # Êý¾ÝÔ´
-#spring.datasource.url=jdbc:mysql://localhost:3306/supermarket?useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai
-spring.datasource.url=jdbc:mysql://10.42.83.8:8066/supermarket?useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://mycat:8066/supermarket?useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=root
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
@@ -14,4 +13,4 @@ mybatis.configuration.map-underscore-to-camel-case=true
 
 # ÅäÖÃÎ¢·þÎñ
 spring.application.name=cart
-eureka.client.service-url.defaultZone=http://localhost:10000/eureka
+eureka.client.service-url.defaultZone=http://supermarket-eureka-1:10000/eureka
diff --git a/cart/src/main/resources/log4j2-spring.xml b/cart/src/main/resources/log4j2-spring.xml
@@ -91,7 +91,7 @@
     <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效 -->
     <loggers>
         <!--<root level="all">-->
-        <root level="ALL">
+        <root level="INFO">
             <appender-ref ref="Console" />
             <appender-ref ref="RollingFileInfo" />
             <appender-ref ref="RollingFileWarn" />

diff --git a/docker/app/nginx.conf → start_up/app/nginx.conf b/docker/app/nginx.conf → start_up/app/nginx.conf
diff --git a/docker/app/start_app.sh → start_up/app/start_app.sh b/docker/app/start_app.sh → start_up/app/start_app.sh
@@ -6,3 +6,7 @@ docker run -d --name supermarket-eureka-1 --restart always --net net-app -p 1000
 docker run -d --name supermarket-product-1 --restart always --net net-app -p 10002:10002 zongxr/supermarket-product:1.0-SNAPSHOT
 docker network connect net-mysql supermarket-product-1
 docker network connect net-redis supermarket-product-1
+
+# 启动购物车微服务
+docker run -d --name supermarket-cart-1 --restart always --net net-app -p 10005:10005 zongxr/supermarket-cart:1.0-SNAPSHOT
+docker network connect net-mysql supermarket-cart-1
diff --git a/docker/elasticsearch/Dockerfile → start_up/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile → start_up/elasticsearch/Dockerfile
diff --git a/docker/elasticsearch/docker-entrypoint.sh → start_up/elasticsearch/docker-entrypoint.sh b/docker/elasticsearch/docker-entrypoint.sh → start_up/elasticsearch/docker-entrypoint.sh
diff --git a/docker/elasticsearch/license.json → start_up/elasticsearch/license.json b/docker/elasticsearch/license.json → start_up/elasticsearch/license.json
diff --git a/docker/elasticsearch/start_es.sh → start_up/elasticsearch/start_es.sh b/docker/elasticsearch/start_es.sh → start_up/elasticsearch/start_es.sh
diff --git a/docker/elasticsearch/x-pack-core-6.8.6.jar → start_up/elasticsearch/x-pack-core-6.8.6.jar b/docker/elasticsearch/x-pack-core-6.8.6.jar → start_up/elasticsearch/x-pack-core-6.8.6.jar
diff --git a/docker/mycat/Dockerfile → start_up/mycat/Dockerfile b/docker/mycat/Dockerfile → start_up/mycat/Dockerfile
diff --git a/docker/mycat/conf/autopartition-long.txt → start_up/mycat/conf/autopartition-long.txt b/docker/mycat/conf/autopartition-long.txt → start_up/mycat/conf/autopartition-long.txt
diff --git a/docker/mycat/conf/cacheservice.properties → start_up/mycat/conf/cacheservice.properties b/docker/mycat/conf/cacheservice.properties → start_up/mycat/conf/cacheservice.properties
diff --git a/docker/mycat/conf/ehcache.xml → start_up/mycat/conf/ehcache.xml b/docker/mycat/conf/ehcache.xml → start_up/mycat/conf/ehcache.xml
diff --git a/...er/mycat/conf/index_to_charset.properties → ...up/mycat/conf/index_to_charset.properties b/...er/mycat/conf/index_to_charset.properties → ...up/mycat/conf/index_to_charset.properties
diff --git a/docker/mycat/conf/log4j.xml → start_up/mycat/conf/log4j.xml b/docker/mycat/conf/log4j.xml → start_up/mycat/conf/log4j.xml
diff --git a/docker/mycat/conf/myid.properties → start_up/mycat/conf/myid.properties b/docker/mycat/conf/myid.properties → start_up/mycat/conf/myid.properties
diff --git a/docker/mycat/conf/partition-hash-int.txt → start_up/mycat/conf/partition-hash-int.txt b/docker/mycat/conf/partition-hash-int.txt → start_up/mycat/conf/partition-hash-int.txt
diff --git a/docker/mycat/conf/partition-range-mod.txt → start_up/mycat/conf/partition-range-mod.txt b/docker/mycat/conf/partition-range-mod.txt → start_up/mycat/conf/partition-range-mod.txt
diff --git a/docker/mycat/conf/router.xml → start_up/mycat/conf/router.xml b/docker/mycat/conf/router.xml → start_up/mycat/conf/router.xml
diff --git a/docker/mycat/conf/rule.xml → start_up/mycat/conf/rule.xml b/docker/mycat/conf/rule.xml → start_up/mycat/conf/rule.xml
diff --git a/docker/mycat/conf/schema.xml → start_up/mycat/conf/schema.xml b/docker/mycat/conf/schema.xml → start_up/mycat/conf/schema.xml
diff --git a/docker/mycat/conf/sequence_conf.properties → start_up/mycat/conf/sequence_conf.properties b/docker/mycat/conf/sequence_conf.properties → start_up/mycat/conf/sequence_conf.properties
diff --git a/...er/mycat/conf/sequence_db_conf.properties → ...up/mycat/conf/sequence_db_conf.properties b/...er/mycat/conf/sequence_db_conf.properties → ...up/mycat/conf/sequence_db_conf.properties
diff --git a/.../mycat/conf/sequence_time_conf.properties → .../mycat/conf/sequence_time_conf.properties b/.../mycat/conf/sequence_time_conf.properties → .../mycat/conf/sequence_time_conf.properties
diff --git a/docker/mycat/conf/server.xml → start_up/mycat/conf/server.xml b/docker/mycat/conf/server.xml → start_up/mycat/conf/server.xml
diff --git a/docker/mycat/conf/wrapper.conf → start_up/mycat/conf/wrapper.conf b/docker/mycat/conf/wrapper.conf → start_up/mycat/conf/wrapper.conf
diff --git a/docker/mycat/conf/zk-create.yaml → start_up/mycat/conf/zk-create.yaml b/docker/mycat/conf/zk-create.yaml → start_up/mycat/conf/zk-create.yaml
diff --git a/docker/mysql/Dockerfile → start_up/mysql/Dockerfile b/docker/mysql/Dockerfile → start_up/mysql/Dockerfile
diff --git a/docker/mysql/data.sql → start_up/mysql/data.sql b/docker/mysql/data.sql → start_up/mysql/data.sql
diff --git a/docker/mysql/ddl.sql → start_up/mysql/ddl.sql b/docker/mysql/ddl.sql → start_up/mysql/ddl.sql
diff --git a/docker/mysql/docker-entrypoint.sh → start_up/mysql/docker-entrypoint.sh b/docker/mysql/docker-entrypoint.sh → start_up/mysql/docker-entrypoint.sh
diff --git a/docker/mysql/start_mysql.sh → start_up/mysql/start_mysql.sh b/docker/mysql/start_mysql.sh → start_up/mysql/start_mysql.sh
diff --git a/docker/redis/Dockerfile → start_up/redis/Dockerfile b/docker/redis/Dockerfile → start_up/redis/Dockerfile
diff --git a/docker/redis/redis-3.0.0.gem → start_up/redis/redis-3.0.0.gem b/docker/redis/redis-3.0.0.gem → start_up/redis/redis-3.0.0.gem
diff --git a/docker/redis/redis-trib.rb → start_up/redis/redis-trib.rb b/docker/redis/redis-trib.rb → start_up/redis/redis-trib.rb
diff --git a/docker/redis/redis.conf → start_up/redis/redis.conf b/docker/redis/redis.conf → start_up/redis/redis.conf
diff --git a/docker/redis/start_redis.sh → start_up/redis/start_redis.sh b/docker/redis/start_redis.sh → start_up/redis/start_redis.sh