MoneyQ 部署微服务应用 [后台服务，演示应用]

f96156c2 · ibizdev · 98af8a52 · f96156c2 · f96156c2 · f96156c2
--- a/config.xml
+++ b/config.xml
@@ -37,12 +37,12 @@
 	  git clone -b master $para2 demosys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd demosys/
-      mvn clean package -Pdemoapi
-      mvn install -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
+      mvn clean package -Pweb
+      mvn install -Pweb
+      cd demo-app/demo-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/demo-app/demo-app-web/src/main/docker/Dockerfile
+++ b/demo-app/demo-app-web/src/main/docker/Dockerfile
@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar

-EXPOSE 8080
+EXPOSE 51001

 ADD demo-app-web.jar /demo-app-web.jar
--- a/demo-app/demo-app-web/src/main/docker/demo-app-web-k8s.yaml
+++ b/demo-app/demo-app-web/src/main/docker/demo-app-web-k8s.yaml
@@ -22,7 +22,36 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 8080
+        - containerPort: 51001
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.240.110"      
+        - name: SERVER_PORT
+          value: "51001"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.240.110:8848"
+        - name: SPRING_REDIS_HOST
+          value: "172.16.240.110"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_LAB01_df847bdfd"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "3d6@460A"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_LAB01_df847bdfd"
+        - name: NACOS
+          value: "172.16.240.110:8848"      
+        - name: SEATA_REGISTRY_NACOS_SERVER-ADDR
+          value: "172.16.240.110:8848"      
+        - name: SEATA_ENABLED
+          value: "true"      
        volumeMounts:
        - name: data
          mountPath: /app/file
@@ -42,9 +71,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 8080
-    targetPort: 8080
-    nodePort: 8080
+    port: 51001
+    targetPort: 51001
+    nodePort: 51001
    protocol: TCP
  selector:
    app: demo-app-web

--- a/demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
+++ b/demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
@@ -3,9 +3,24 @@ services:
  demo-app-web:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
    ports:
-      - "8080:8080"
+      - "51001:51001"
    networks:
      - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=51001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
+      - SPRING_DATASOURCE_PASSWORD=3d6@460A
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
    deploy:
      resources:
           limits:

--- a/demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
+++ b/demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar

-EXPOSE 51000
+EXPOSE 8081

 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
--- a/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi-k8s.yaml
+++ b/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi-k8s.yaml
@@ -22,36 +22,7 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 51000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.110"      
-        - name: SERVER_PORT
-          value: "51000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.110:8848"
-        - name: SPRING_REDIS_HOST
-          value: "172.16.240.110"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_df847bdfd"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "3d6@460A"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_df847bdfd"
-        - name: NACOS
-          value: "172.16.240.110:8848"      
-        - name: SEATA_REGISTRY_NACOS_SERVER-ADDR
-          value: "172.16.240.110:8848"      
-        - name: SEATA_ENABLED
-          value: "true"      
+        - containerPort: 8081
        volumeMounts:
        - name: data
          mountPath: /app/file
@@ -71,9 +42,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 51000
-    targetPort: 51000
-    nodePort: 51000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
    protocol: TCP
  selector:
    app: demo-provider-demoapi

--- a/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
+++ b/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
@@ -3,24 +3,9 @@ services:
  demo-provider-demoapi:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
    ports:
-      - "51000:51000"
+      - "8081:8081"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
    deploy:
      resources:
           limits: