lab_gzf 部署微服务接口

f0306b40 · ibizdev · ab58c3a1 · f0306b40 · f0306b40 · f0306b40
--- a/assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/Dockerfile
+++ b/assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-app-assetmanagement.jar
-EXPOSE 10325
+EXPOSE 8080
 ADD assetmanagement-app-assetmanagement.jar /assetmanagement-app-assetmanagement.jar
--- a/assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml
+++ b/assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml
@@ -3,25 +3,9 @@ services:
  assetmanagement-app-assetmanagement:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-app-assetmanagement:latest
    ports:
-      - "10325:10325"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10325
-      - 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_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?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_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
    deploy:
      resources:
           limits:

--- a/assetmanagement-core/src/main/resources/liquibase/h2_table.xml
+++ b/assetmanagement-core/src/main/resources/liquibase/h2_table.xml
@@ -116,7 +116,7 @@
    <!--输出实体[EAMASSET]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamasset-87-6">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamasset-89-6">
        <createTable tableName="ASSET">
                <column name="ASSETID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_EAMASSET_ASSETID"/>
@@ -260,7 +260,7 @@
    <!--输出实体[EAMLOCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-90-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-91-12">
        <createTable tableName="EAMLOCATION">
                <column name="EAMLOCATIONID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_EAMLOCATION_EAMLOCATIONID"/>
@@ -697,16 +697,16 @@
       <addForeignKeyConstraint baseColumnNames="EAMAPPLYSTATEMODELID" baseTableName="EAMAPPLYTYPE" constraintName="DER1N_EAMAPPLYTYPE_EAMAPPLYSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMAPPLYSTATEMODELID" referencedTableName="EAMAPPLYSTATEMODEL" validate="true"/>
    </changeSet>
        <!--输出实体[EAMASSET]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-87-36">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-89-36">
       <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSETSTATE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEID" referencedTableName="EAMASSETSTATE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-87-37">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-89-37">
       <addForeignKeyConstraint baseColumnNames="EAMASSETTYPEID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSETTYPE_EA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETTYPEID" referencedTableName="EAMASSETTYPE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-87-38">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-89-38">
       <addForeignKeyConstraint baseColumnNames="PASSETID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSET_PASSET" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-87-39">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-89-39">
       <addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMLOCATION_EAM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
    </changeSet>
        <!--输出实体[EAMASSETPARTSGROUP]外键关系 -->
@@ -727,13 +727,13 @@
       <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEMODELID" baseTableName="EAMASSETTYPE" constraintName="DER1N_EAMASSETTYPE_EAMASSETSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEMODELID" referencedTableName="EAMASSETSTATEMODEL" validate="true"/>
    </changeSet>
        <!--输出实体[EAMLOCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-90-45">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-91-45">
       <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEID" referencedTableName="EAMLOCATIONSTATE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-90-46">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-91-46">
       <addForeignKeyConstraint baseColumnNames="EAMLOCATIONTYPEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONTYPEID" referencedTableName="EAMLOCATIONTYPE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-90-47">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-91-47">
       <addForeignKeyConstraint baseColumnNames="PEAMLOCATIONID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATION_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
    </changeSet>
        <!--输出实体[EAMLOCATIONSTATE]外键关系 -->

--- a/assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/Dockerfile
+++ b/assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-provider-assetapi.jar
-EXPOSE 8081
+EXPOSE 10315
 ADD assetmanagement-provider-assetapi.jar /assetmanagement-provider-assetapi.jar
--- a/assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/assetmanagement-provider-assetapi.yaml
+++ b/assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/assetmanagement-provider-assetapi.yaml
@@ -3,9 +3,25 @@ services:
  assetmanagement-provider-assetapi:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-provider-assetapi:latest
    ports:
-      - "8081:8081"
+      - "10315:10315"
    networks:
      - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10315
+      - 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_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?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_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
    deploy:
      resources:
           limits:

--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizassetmanagement/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ibizassetmanagement/
-      mvn clean package -Passetmanagement
+      mvn clean package -Passetapi
-      cd assetmanagement-app/assetmanagement-app-assetmanagement
+      cd assetmanagement-provider/assetmanagement-provider-assetapi
-      mvn -Passetmanagement docker:build
+      mvn -Passetapi docker:build
-      mvn -Passetmanagement docker:push
+      mvn -Passetapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-app-assetmanagement.yaml iBizEE --with-registry-auth
+      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-provider-assetapi.yaml iBizEE --with-registry-auth      
      </command>
    </hudson.tasks.Shell>
  </builders>