diff --git a/README.md b/README.md index 04a40cb..caceb6c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ 前端项目`mall-admin-web`地址：https://github.com/macrozheng/mall-admin-web -项目演示地址： [http://39.98.69.210/index.html](http://39.98.69.210/index.html) +项目演示地址： [http://39.98.190.128/index.html](http://39.98.190.128/index.html) ![后台管理系统功能演示.gif](https://github.com/macrozheng/mall/blob/master/document/resource/mall-admin.gif) @@ -36,7 +36,7 @@ 前端项目`mall-app-web`地址：敬请期待...... -项目演示地址：[http://39.98.69.210/mall-app/mainpage.html](http://39.98.69.210/mall-app/mainpage.html) +项目演示地址：[http://39.98.190.128/mall-app/mainpage.html](http://39.98.190.128/mall-app/mainpage.html) ![前台商城系统功能演示.gif](https://github.com/macrozheng/mall/blob/master/document/resource/mall-app.gif) diff --git a/document/reference/docker.md b/document/reference/docker.md index 4ad6792..b06bbef 100644 --- a/document/reference/docker.md +++ b/document/reference/docker.md @@ -32,6 +32,8 @@ docker start $ContainerId - docker rm -f $(docker ps -a -q) ### 查看启动错误日志 docker logs $ContainerIdName(或者$ContainerId) +### 查看容器的IP地址（172.17.0.*） +docker inspect --format '{{ .NetworkSettings.IPAddress }}' $ContainerId ## Docker Registry ### Docker Registry 2.0搭建 @@ -52,7 +54,7 @@ docker tag macro/eureka-server:0.0.1 localhost:5000/macro/eureka-server:0.0.1 - tip： pom.xml修改192.168.1.71:5000/macro/${project.artifactId}:${project.version} - tip： - docker要支持http:echo '{ "insecure-registries":["192.168.1.71:5000"] }' > /etc/docker/daemon.json + docker要支持http:echo '{ "insecure-registries":["39.98.190.128:5000"] }' > /etc/docker/daemon.json ### 修改Docker镜像存放位置 1. 查看Docker的存放位置：docker info | grep "Docker Root Dir"（默认为/var/lib/docker） 2. 关闭Docker服务：systemctl stop docker diff --git a/mall-admin/pom.xml b/mall-admin/pom.xml index fbc0e4b..fb21d33 100644 --- a/mall-admin/pom.xml +++ b/mall-admin/pom.xml @@ -110,33 +110,33 @@ org.springframework.boot spring-boot-maven-plugin - - com.spotify - docker-maven-plugin - 1.1.0 - - - build-image - package - - build - - - - - mall/${project.artifactId}:${project.version} - http://192.168.1.71:2375 - java:8 - ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mall-admin/src/main/resources/application-prod.properties b/mall-admin/src/main/resources/application-prod.properties index 55e63df..b23e9cb 100644 --- a/mall-admin/src/main/resources/application-prod.properties +++ b/mall-admin/src/main/resources/application-prod.properties @@ -1,7 +1,7 @@ #===datasource start=== spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8 -spring.datasource.username=root -spring.datasource.password=root +spring.datasource.username=reader +spring.datasource.password=123456 #===datasource end=== #===druid start=== diff --git a/mall-admin/src/main/resources/application-read.properties b/mall-admin/src/main/resources/application-read.properties deleted file mode 100644 index e2cdd95..0000000 --- a/mall-admin/src/main/resources/application-read.properties +++ /dev/null @@ -1,20 +0,0 @@ -#===datasource start=== -#===just for read=== -spring.datasource.url=jdbc:mysql://localhost/mall?useUnicode=true&characterEncoding=utf-8 -spring.datasource.username=reader -spring.datasource.password=123456 -#===datasource end=== - -#===druid start=== -#\u8FDE\u63A5\u6C60\u521D\u59CB\u5316\u5927\u5C0F -spring.datasource.druid.initial-size=5 -#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570 -spring.datasource.druid.min-idle=10 -#\u6700\u5927\u8FDE\u63A5\u6570 -spring.datasource.druid.max-active=20 -#\u4E0D\u7EDF\u8BA1\u8FD9\u4E9B\u8BF7\u6C42\u6570\u636E -spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/* -#\u8BBF\u95EE\u76D1\u63A7\u7F51\u9875\u7684\u767B\u5F55\u7528\u6237\u540D\u548C\u5BC6\u7801 -spring.datasource.druid.stat-view-servlet.login-username=druid -spring.datasource.druid.stat-view-servlet.login-password=druid -#===druid end=== \ No newline at end of file diff --git a/mall-portal/pom.xml b/mall-portal/pom.xml index 9c3e656..8bc159a 100644 --- a/mall-portal/pom.xml +++ b/mall-portal/pom.xml @@ -100,33 +100,33 @@ org.springframework.boot spring-boot-maven-plugin - - com.spotify - docker-maven-plugin - 1.1.0 - - - build-image - package - - build - - - - - mall/${project.artifactId}:${project.version} - http://192.168.1.71:2375 - java:8 - ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mall-portal/src/main/resources/application-prod.properties b/mall-portal/src/main/resources/application-prod.properties index f2eac1f..09b1b29 100644 --- a/mall-portal/src/main/resources/application-prod.properties +++ b/mall-portal/src/main/resources/application-prod.properties @@ -4,8 +4,8 @@ server.port=8085 #===datasource start=== spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8 -spring.datasource.username=root -spring.datasource.password=root +spring.datasource.username=reader +spring.datasource.password=123456 #===datasource end=== #===druid start=== diff --git a/mall-search/pom.xml b/mall-search/pom.xml index 04e7d05..95c987f 100644 --- a/mall-search/pom.xml +++ b/mall-search/pom.xml @@ -75,33 +75,33 @@ org.springframework.boot spring-boot-maven-plugin - - com.spotify - docker-maven-plugin - 1.1.0 - - - build-image - package - - build - - - - - mall/${project.artifactId}:${project.version} - http://192.168.1.71:2375 - java:8 - ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mall-search/src/main/resources/application-prod.properties b/mall-search/src/main/resources/application-prod.properties index 5c290c5..a8e93cf 100644 --- a/mall-search/src/main/resources/application-prod.properties +++ b/mall-search/src/main/resources/application-prod.properties @@ -1,7 +1,7 @@ #===datasource start=== spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8 -spring.datasource.username=root -spring.datasource.password=root +spring.datasource.username=reader +spring.datasource.password=123456 #===datasource end=== #===druid start===