jackwang 部署微服务接口

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Ppim
-      cd humanresource-app/humanresource-app-pim
-      mvn -Ppim docker:build
-      mvn -Ppim docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
+      mvn clean package -Phrapi
+      cd humanresource-provider/humanresource-provider-hrapi
+      mvn -Phrapi docker:build
+      mvn -Phrapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/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 /humanresource-app-pim.jar
 
-EXPOSE 10327
+EXPOSE 8080
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "10327:10327"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10327
-      - 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:

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/impl/HROMHierarchyServiceImpl.java

@@ -220,7 +220,7 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
                 et.setPomhierarchy(majorEntity);
                 pomhierarchy=majorEntity;
             }
-            et.setPomhierarchyname(pomhierarchy.getOmhierarchyname());
+            et.setPomhierarchyname(pomhierarchy.getOrganizationname());
         }
         //实体关系[DER1N_OMHIERARCHY_ORGANIZATION_ORGANIZATIONID]
         if(!ObjectUtils.isEmpty(et.getOrganizationid())){

humanresource-core/src/main/resources/liquibase/h2_table.xml

@@ -112,7 +112,7 @@
 
 
     <!--输出实体[HROMHIERARCHY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-52-6">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-55-6">
         <createTable tableName="OMHIERARCHY">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -140,7 +140,7 @@
 
 
     <!--输出实体[HROMHIERARCHYCAT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-37-7">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-41-7">
         <createTable tableName="OMHIERARCHYCAT">
                 <column name="OMHIERARCHYCATID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HROMHIERARCHYCAT_OMHIERARCH"/>
@@ -305,13 +305,13 @@
         <!--输出实体[HRLEGAL]外键关系 -->
         <!--输出实体[HROMHIERARCHYPURPOSE]外键关系 -->
         <!--输出实体[HROMHIERARCHY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-52-14">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-55-14">
        <addForeignKeyConstraint baseColumnNames="HROMHIERARCHYCATID" baseTableName="OMHIERARCHY" constraintName="DER1N_HROMHIERARCHY_HROMHIERAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYCATID" referencedTableName="OMHIERARCHYCAT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-52-15">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-55-15">
        <addForeignKeyConstraint baseColumnNames="POMHIERARCHYID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_OMHIERARCHY_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYID" referencedTableName="OMHIERARCHY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-52-16">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-55-16">
        <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_ORGANIZATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HROMHIERARCHYCAT]外键关系 -->

humanresource-core/src/main/resources/mapper/base/hromhierarchy/HROMHierarchyMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HROMHierarchyResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t31.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t31 ON t1.HROMHIERARCHYCATID = t31.OMHIERARCHYCATID  ) t1 where omhierarchyid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  ) t1 where omhierarchyid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t31.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t31 ON t1.HROMHIERARCHYCATID = t31.OMHIERARCHYCATID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t31.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t31 ON t1.HROMHIERARCHYCATID = t31.OMHIERARCHYCATID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
 			]]>
     </sql>
 </mapper>

humanresource-provider/humanresource-provider-hrapi/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 /humanresource-provider-hrapi.jar
 
-EXPOSE 8081
+EXPOSE 10317
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "8081:8081"
+      - "10317:10317"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10317
+      - 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: