hebao1234 部署微服务接口 [ibz-dst，micorservice]

83268c93 · ibizdev · 841e2236 · 83268c93 · 83268c93 · 83268c93
--- a/config.xml
+++ b/config.xml
@@ -37,12 +37,10 @@
 	  git clone -b master $para2 ibzdst/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ibzdst/
-      mvn clean package -Pweb
-      mvn install -Pweb
-      cd ibzdst-app/ibzdst-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdst-app-web.yaml ibzlab-rt --with-registry-auth
+      mvn clean package -Papi-war
+      cd ibzdst-provider/ibzdst-provider-api
+      mvn -Papi-war exec:exec@prepare
+      mvn -Papi-war exec:exec@buildpush  
      </command>
    </hudson.tasks.Shell>
  </builders>

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

-EXPOSE 30011
+EXPOSE 8080

 ADD ibzdst-app-web.jar /ibzdst-app-web.jar
--- a/ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web-k8s.yaml
+++ b/ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web-k8s.yaml
@@ -22,34 +22,7 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 30011
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "30011"
-        - 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: 8080
        volumeMounts:
        - name: data
          mountPath: /app/file
@@ -69,9 +42,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 30011
-    targetPort: 30011
-    nodePort: 30011
+    port: 8080
+    targetPort: 8080
+    nodePort: 8080
    protocol: TCP
  selector:
    app: ibzdst-app-web

--- a/ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web.yaml
+++ b/ibzdst-app/ibzdst-app-web/src/main/docker/ibzdst-app-web.yaml
@@ -3,29 +3,9 @@ services:
  ibzdst-app-web:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
    ports:
-      - "30011:30011"
+      - "8080:8080"
    networks:
      - agent_network
-    #logging:
-    #  driver: loki
-    #  options:
-    #    loki-url: "http://172.16.240.111:3100/loki/api/v1/push"
-    #    max-size: "50m"
-    #    max-file: "10"
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30011
-      - 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/ibzdst-provider/ibzdst-provider-api/src/main/docker/Dockerfile
+++ b/ibzdst-provider/ibzdst-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 /ibzdst-provider-api.jar

-EXPOSE 8081
+EXPOSE 40011

 ADD ibzdst-provider-api.jar /ibzdst-provider-api.jar
--- a/ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml
@@ -22,7 +22,38 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 8081
+        - containerPort: 40011
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.180.237"      
+        - name: SERVER_PORT
+          value: "40011"
+        - 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&serverTimezone=GMT%2B8"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_A_5d9d78509"
+        - name: IBIZ_DEPLOY_ISDOCKER
+          value: "true"      
+        - name: IBIZ_DEPLOY_PACKAGETYPE
+          value: "war"      
+        - name: NACOS
+          value: "172.16.100.243:8848"      
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
+          value: "ibizdev"      
        volumeMounts:
        - name: data
          mountPath: /app/file
@@ -42,9 +73,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 40011
+    targetPort: 40011
+    nodePort: 40011
    protocol: TCP
  selector:
    app: ibzdst-provider-api

--- a/ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api.yaml
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api.yaml
@@ -3,9 +3,31 @@ services:
  ibzdst-provider-api:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
    ports:
-      - "8081:8081"
+      - "40011:40011"
    networks:
      - agent_network
+    #logging:
+    #  driver: loki
+    #  options:
+    #    loki-url: "http://172.16.240.111:3100/loki/api/v1/push"
+    #    max-size: "50m"
+    #    max-file: "10"
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40011
+      - 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&serverTimezone=GMT%2B8
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - IBIZ_DEPLOY_ISDOCKER=true
+      - IBIZ_DEPLOY_PACKAGETYPE=war
+      - NACOS=172.16.100.243:8848
+      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
    deploy:
      resources:
           limits: