jackwang 部署微服务接口

0e8c8a42 · ibizdev · f95e9f55 · 0e8c8a42 · 0e8c8a42 · 0e8c8a42
--- a/config.xml
+++ b/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>

--- a/humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
+++ b/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
--- a/humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
+++ b/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:

--- a/humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRContract.java
+++ b/humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRContract.java
@@ -211,6 +211,35 @@ public class HRContract extends EntityMP implements Serializable {
    @JSONField(name = "attachment")
    @JsonProperty("attachment")
    private String attachment;
+    /**
+     * 单位
+     */
+    @TableField(exist = false)
+    @JSONField(name = "organizationname")
+    @JsonProperty("organizationname")
+    private String organizationname;
+    /**
+     * 员工状态
+     */
+    @TableField(exist = false)
+    @JSONField(name = "empstate")
+    @JsonProperty("empstate")
+    private String empstate;
+    /**
+     * 到本单位时间
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "startorgtime" , format="yyyy-MM-dd")
+    @JsonProperty("startorgtime")
+    private Timestamp startorgtime;
+    /**
+     * 员工编号
+     */
+    @TableField(exist = false)
+    @JSONField(name = "employeecode")
+    @JsonProperty("employeecode")
+    private String employeecode;

    /**
     * 员工

--- a/humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRContractServiceImpl.java
+++ b/humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRContractServiceImpl.java
@@ -236,6 +236,10 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr
                hremployee=majorEntity;
            }
            et.setHremployeename(hremployee.getEmployeename());
+            et.setOrganizationname(hremployee.getOrganizationname());
+            et.setEmpstate(hremployee.getEmpstate());
+            et.setStartorgtime(hremployee.getStartorgtime());
+            et.setEmployeecode(hremployee.getEmployeecode());
        }
        //实体关系[DER1N_HRCONTRACT_HRORGANIZATION_MGRORGANIZATIONID_6BD9DC]
        if(!ObjectUtils.isEmpty(et.getMgrorganizationid())){

--- a/humanresource-core/src/main/resources/liquibase/h2_table.xml
+++ b/humanresource-core/src/main/resources/liquibase/h2_table.xml
@@ -86,7 +86,7 @@


    <!--输出实体[HRCONTRACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-103-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-120-4">
        <createTable tableName="T_HRCONTRACT">
                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                </column>
@@ -340,7 +340,7 @@


    <!--输出实体[HREMPLOYEE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-286-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-287-12">
        <createTable tableName="EMPLOYEE">
                <column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
                </column>
@@ -1089,10 +1089,10 @@
       <addForeignKeyConstraint baseColumnNames="REGISTERORGANIZATIONID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HRORGANIZA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
    </changeSet>
        <!--输出实体[HRCONTRACT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-103-38">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-120-38">
       <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-103-39">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-120-39">
       <addForeignKeyConstraint baseColumnNames="MGRORGANIZATIONID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HRORGANIZATIO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
    </changeSet>
        <!--输出实体[HRDISTRIBUTION]外键关系 -->
@@ -1121,13 +1121,13 @@
    </changeSet>
        <!--输出实体[HREMPSTATE]外键关系 -->
        <!--输出实体[HREMPLOYEE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-286-47">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-287-47">
       <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-286-48">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-287-48">
       <addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-286-49">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-287-49">
       <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HRPOST_HRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
    </changeSet>
        <!--输出实体[HRFAMILY]外键关系 -->

--- a/humanresource-core/src/main/resources/mapper/humanresource/hrcontract/HRContractMapper.xml
+++ b/humanresource-core/src/main/resources/mapper/humanresource/hrcontract/HRContractMapper.xml
--- a/humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
+++ b/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
--- a/humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
+++ b/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:

--- a/humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRContractDTO.java
+++ b/humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRContractDTO.java
@@ -213,6 +213,39 @@ public class HRContractDTO extends DTOBase implements Serializable {
    @JsonProperty("attachment")
    private String attachment;

+    /**
+     * 属性 [ORGANIZATIONNAME]
+     *
+     */
+    @JSONField(name = "organizationname")
+    @JsonProperty("organizationname")
+    private String organizationname;
+
+    /**
+     * 属性 [EMPSTATE]
+     *
+     */
+    @JSONField(name = "empstate")
+    @JsonProperty("empstate")
+    private String empstate;
+
+    /**
+     * 属性 [STARTORGTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "startorgtime" , format="yyyy-MM-dd")
+    @JsonProperty("startorgtime")
+    private Timestamp startorgtime;
+
+    /**
+     * 属性 [EMPLOYEECODE]
+     *
+     */
+    @JSONField(name = "employeecode")
+    @JsonProperty("employeecode")
+    private String employeecode;
+

    /**
     * 设置 [HRCONTRACTNAME]