zhouweidong 部署微服务应用 [ibz-ou，统一组织单位]

d6e98af8 · ibizdev · 88cda962 · d6e98af8 · d6e98af8 · d6e98af8
--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzou/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ibzou/
-      mvn clean package -Papi
-      cd ibzou-provider/ibzou-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzou-app/ibzou-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml ibzlab-rt --with-registry-auth
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
+++ b/ibzou-app/ibzou-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 /ibzou-app-web.jar

-EXPOSE 8080
+EXPOSE 30001

 ADD ibzou-app-web.jar /ibzou-app-web.jar
--- a/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web-k8s.yaml
+++ b/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web-k8s.yaml
@@ -22,7 +22,34 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 8080
+        - containerPort: 30001
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.180.237"      
+        - name: SERVER_PORT
+          value: "30001"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.100.243:8848"
+        - name: SPRING_REDIS_HOST
+          value: "172.16.100.243"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_A_5d9d78509"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "@6dEfb3@"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?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_A_5d9d78509"
+        - name: NACOS
+          value: "172.16.100.243:8848"      
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
+          value: "ibizdev"      
        volumeMounts:
        - name: data
          mountPath: /app/file
@@ -42,9 +69,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 8080
-    targetPort: 8080
-    nodePort: 8080
+    port: 30001
+    targetPort: 30001
+    nodePort: 30001
    protocol: TCP
  selector:
    app: ibzou-app-web

--- a/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
+++ b/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
@@ -3,9 +3,23 @@ services:
  ibzou-app-web:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
    ports:
-      - "8080:8080"
+      - "30001:30001"
    networks:
      - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.100.243:8848
+      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
    deploy:
      resources:
           limits:

--- a/ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
+++ b/ibzou-provider/ibzou-provider-api/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 /ibzou-provider-api.jar

-EXPOSE 40001
+EXPOSE 8081

 ADD ibzou-provider-api.jar /ibzou-provider-api.jar
--- a/ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api-k8s.yaml
+++ b/ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api-k8s.yaml
@@ -22,34 +22,7 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 40001
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "40001"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.100.243:8848"
-        - name: SPRING_REDIS_HOST
-          value: "172.16.100.243"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_A_5d9d78509"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "@6dEfb3@"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?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_A_5d9d78509"
-        - name: NACOS
-          value: "172.16.100.243:8848"      
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
-          value: "ibizdev"      
+        - containerPort: 8081
        volumeMounts:
        - name: data
          mountPath: /app/file
@@ -69,9 +42,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 40001
-    targetPort: 40001
-    nodePort: 40001
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
    protocol: TCP
  selector:
    app: ibzou-provider-api

--- a/ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
+++ b/ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
@@ -3,23 +3,9 @@ services:
  ibzou-provider-api:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
    ports:
-      - "40001:40001"
+      - "8081:8081"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
    deploy:
      resources:
           limits: