Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-server/src/main/resources/application.yml

@@ -34,6 +34,9 @@ spring:
   sleuth:
     sampler:
       probability: 1.0
+  redis:
+    host: 192.168.0.182
+    port: 6379
 management:
   endpoints:
     web:

applications/commons/commons-server/src/main/resources/config/application-docker-prod.yml

@@ -16,5 +16,8 @@ spring:
     url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
+  redis:
+    host: 10.10.100.173
+    port: 6379
 logging:
   destination: 10.10.100.160:5000

applications/sale/sale-server/src/main/resources/application.yml

@@ -34,6 +34,9 @@ spring:
   sleuth:
     sampler:
       probability: 1.0
+  redis:
+    host: 192.168.0.182
+    port: 6379
 eureka:
   instance:
     leaseRenewalIntervalInSeconds: 10

applications/sale/sale-server/src/main/resources/config/application-docker-prod.yml

@@ -16,5 +16,8 @@ spring:
     url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
+  redis:
+    host: 10.10.100.173
+    port: 6379
 logging:
   destination: 10.10.100.160:5000

applications/storage/storage-server/src/main/resources/application.yml

@@ -35,6 +35,9 @@ spring:
   sleuth:
     sampler:
       probability: 1.0
+  redis:
+    host: 192.168.0.182
+    port: 6379
 eureka:
   instance:
     leaseRenewalIntervalInSeconds: 10

applications/storage/storage-server/src/main/resources/config/application-docker-prod.yml

@@ -16,5 +16,8 @@ spring:
     url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
+  redis:
+    host: 10.10.100.173
+    port: 6379
 logging:
   destination: 10.10.100.160:5000

base-servers/datacenter/datacenter-server/pom.xml

@@ -50,5 +50,16 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

base-servers/datacenter/datacenter-server/src/main/docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM frolvlad/alpine-oraclejdk8:slim
 VOLUME /tmp
-ADD manage-server-1.0.0-SNAPSHOT.jar app.jar
+ADD datacenter-server-1.0.0-SNAPSHOT.jar app.jar
 RUN sh -c 'touch /app.jar'
 ENV JAVA_OPTS=""
 ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]

base-servers/datacenter/datacenter-server/src/main/resources/application.yml

@@ -55,7 +55,7 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
-  port: 8700
+  port: 8720
   tomcat:
     uri-encoding: UTF-8
 management:

base-servers/datacenter/datacenter-server/src/main/resources/config/application-docker-dev.yml

@@ -9,4 +9,4 @@ spring:
   rabbitmq:
     virtual-host: dev
 server:
-  port: 8710
+  port: 8730

base-servers/datacenter/datacenter-server/src/main/resources/config/application-docker-test.yml

@@ -9,4 +9,4 @@ spring:
   rabbitmq:
     virtual-host: test
 server:
-  port: 8715
+  port: 8735