github/mall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

server move

Browse Source
This commit is contained in:
zhh 2019-01-04 11:27:29 +08:00
parent 1a236d8ed9
commit 73214817a8
9 changed files with 92 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -28,7 +28,7 @@
前端项目`mall-admin-web`地址：https://github.com/macrozheng/mall-admin-web 前端项目`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) ![后台管理系统功能演示.gif](https://github.com/macrozheng/mall/blob/master/document/resource/mall-admin.gif)
@ -36,7 +36,7 @@
前端项目`mall-app-web`地址：敬请期待...... 前端项目`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) ![前台商城系统功能演示.gif](https://github.com/macrozheng/mall/blob/master/document/resource/mall-app.gif)

4
document/reference/docker.md
View File

@ -32,6 +32,8 @@ docker start $ContainerId
- docker rm -f $(docker ps -a -q) - docker rm -f $(docker ps -a -q)
### 查看启动错误日志 ### 查看启动错误日志
docker logs $ContainerIdName(或者$ContainerId) docker logs $ContainerIdName(或者$ContainerId)
### 查看容器的IP地址（172.17.0.*）
docker inspect --format '{{ .NetworkSettings.IPAddress }}' $ContainerId
## Docker Registry ## Docker Registry
### Docker Registry 2.0搭建 ### 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： - tip：
pom.xml修改<imageName>192.168.1.71:5000/macro/${project.artifactId}:${project.version}</imageName> pom.xml修改<imageName>192.168.1.71:5000/macro/${project.artifactId}:${project.version}</imageName>
- tip： - 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镜像存放位置 ### 修改Docker镜像存放位置
1. 查看Docker的存放位置：docker info | grep "Docker Root Dir"（默认为/var/lib/docker） 1. 查看Docker的存放位置：docker info | grep "Docker Root Dir"（默认为/var/lib/docker）
2. 关闭Docker服务：systemctl stop docker 2. 关闭Docker服务：systemctl stop docker

54
mall-admin/pom.xml
View File

@ -110,33 +110,33 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <!--<plugin>-->
<groupId>com.spotify</groupId> <!--<groupId>com.spotify</groupId>-->
<artifactId>docker-maven-plugin</artifactId> <!--<artifactId>docker-maven-plugin</artifactId>-->
<version>1.1.0</version> <!--<version>1.1.0</version>-->
<executions> <!--<executions>-->
<execution> <!--<execution>-->
<id>build-image</id> <!--<id>build-image</id>-->
<phase>package</phase> <!--<phase>package</phase>-->
<goals> <!--<goals>-->
<goal>build</goal> <!--<goal>build</goal>-->
</goals> <!--</goals>-->
</execution> <!--</execution>-->
</executions> <!--</executions>-->
<configuration> <!--<configuration>-->
<imageName>mall/${project.artifactId}:${project.version}</imageName> <!--<imageName>mall/${project.artifactId}:${project.version}</imageName>-->
<dockerHost>http://192.168.1.71:2375</dockerHost> <!--<dockerHost>http://39.98.190.128:2375</dockerHost>-->
<baseImage>java:8</baseImage> <!--<baseImage>java:8</baseImage>-->
<entryPoint>["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint> <!--<entryPoint>["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint>-->
<resources> <!--<resources>-->
<resource> <!--<resource>-->
<targetPath>/</targetPath> <!--<targetPath>/</targetPath>-->
<directory>${project.build.directory}</directory> <!--<directory>${project.build.directory}</directory>-->
<include>${project.build.finalName}.jar</include> <!--<include>${project.build.finalName}.jar</include>-->
</resource> <!--</resource>-->
</resources> <!--</resources>-->
</configuration> <!--</configuration>-->
</plugin> <!--</plugin>-->
</plugins> </plugins>
</build> </build>
</project> </project>

4
mall-admin/src/main/resources/application-prod.properties
View File

@ -1,7 +1,7 @@
#===datasource start=== #===datasource start===
spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8 spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8
spring.datasource.username=root spring.datasource.username=reader
spring.datasource.password=root spring.datasource.password=123456
#===datasource end=== #===datasource end===
#===druid start=== #===druid start===

20
mall-admin/src/main/resources/application-read.properties
View File

@ -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===

54
mall-portal/pom.xml
View File

@ -100,33 +100,33 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <!--<plugin>-->
<groupId>com.spotify</groupId> <!--<groupId>com.spotify</groupId>-->
<artifactId>docker-maven-plugin</artifactId> <!--<artifactId>docker-maven-plugin</artifactId>-->
<version>1.1.0</version> <!--<version>1.1.0</version>-->
<executions> <!--<executions>-->
<execution> <!--<execution>-->
<id>build-image</id> <!--<id>build-image</id>-->
<phase>package</phase> <!--<phase>package</phase>-->
<goals> <!--<goals>-->
<goal>build</goal> <!--<goal>build</goal>-->
</goals> <!--</goals>-->
</execution> <!--</execution>-->
</executions> <!--</executions>-->
<configuration> <!--<configuration>-->
<imageName>mall/${project.artifactId}:${project.version}</imageName> <!--<imageName>mall/${project.artifactId}:${project.version}</imageName>-->
<dockerHost>http://192.168.1.71:2375</dockerHost> <!--<dockerHost>http://39.98.190.128:2375</dockerHost>-->
<baseImage>java:8</baseImage> <!--<baseImage>java:8</baseImage>-->
<entryPoint>["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint> <!--<entryPoint>["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint>-->
<resources> <!--<resources>-->
<resource> <!--<resource>-->
<targetPath>/</targetPath> <!--<targetPath>/</targetPath>-->
<directory>${project.build.directory}</directory> <!--<directory>${project.build.directory}</directory>-->
<include>${project.build.finalName}.jar</include> <!--<include>${project.build.finalName}.jar</include>-->
</resource> <!--</resource>-->
</resources> <!--</resources>-->
</configuration> <!--</configuration>-->
</plugin> <!--</plugin>-->
</plugins> </plugins>
</build> </build>

4
mall-portal/src/main/resources/application-prod.properties
View File

@ -4,8 +4,8 @@ server.port=8085
#===datasource start=== #===datasource start===
spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8 spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8
spring.datasource.username=root spring.datasource.username=reader
spring.datasource.password=root spring.datasource.password=123456
#===datasource end=== #===datasource end===
#===druid start=== #===druid start===

54
mall-search/pom.xml
View File

@ -75,33 +75,33 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <!--<plugin>-->
<groupId>com.spotify</groupId> <!--<groupId>com.spotify</groupId>-->
<artifactId>docker-maven-plugin</artifactId> <!--<artifactId>docker-maven-plugin</artifactId>-->
<version>1.1.0</version> <!--<version>1.1.0</version>-->
<executions> <!--<executions>-->
<execution> <!--<execution>-->
<id>build-image</id> <!--<id>build-image</id>-->
<phase>package</phase> <!--<phase>package</phase>-->
<goals> <!--<goals>-->
<goal>build</goal> <!--<goal>build</goal>-->
</goals> <!--</goals>-->
</execution> <!--</execution>-->
</executions> <!--</executions>-->
<configuration> <!--<configuration>-->
<imageName>mall/${project.artifactId}:${project.version}</imageName> <!--<imageName>mall/${project.artifactId}:${project.version}</imageName>-->
<dockerHost>http://192.168.1.71:2375</dockerHost> <!--<dockerHost>http://39.98.190.128:2375</dockerHost>-->
<baseImage>java:8</baseImage> <!--<baseImage>java:8</baseImage>-->
<entryPoint>["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint> <!--<entryPoint>["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint>-->
<resources> <!--<resources>-->
<resource> <!--<resource>-->
<targetPath>/</targetPath> <!--<targetPath>/</targetPath>-->
<directory>${project.build.directory}</directory> <!--<directory>${project.build.directory}</directory>-->
<include>${project.build.finalName}.jar</include> <!--<include>${project.build.finalName}.jar</include>-->
</resource> <!--</resource>-->
</resources> <!--</resources>-->
</configuration> <!--</configuration>-->
</plugin> <!--</plugin>-->
</plugins> </plugins>
</build> </build>

4
mall-search/src/main/resources/application-prod.properties
View File

@ -1,7 +1,7 @@
#===datasource start=== #===datasource start===
spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8 spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8
spring.datasource.username=root spring.datasource.username=reader
spring.datasource.password=root spring.datasource.password=123456
#===datasource end=== #===datasource end===
#===druid start=== #===druid start===