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/humanresource/domain/HRContract.java

@@ -240,6 +240,13 @@ public class HRContract extends EntityMP implements Serializable {
     @JSONField(name = "employeecode")
     @JsonProperty("employeecode")
     private String employeecode;
+    /**
+     * 工作内容
+     */
+    @TableField(value = "workcontent")
+    @JSONField(name = "workcontent")
+    @JsonProperty("workcontent")
+    private String workcontent;
 
     /**
      * 员工
@@ -417,6 +424,14 @@ public class HRContract extends EntityMP implements Serializable {
         this.modify("attachment",attachment);
     }
 
+    /**
+     * 设置 [工作内容]
+     */
+    public void setWorkcontent(String workcontent){
+        this.workcontent = workcontent ;
+        this.modify("workcontent",workcontent);
+    }
+
 
 }
 

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

@@ -86,7 +86,7 @@
 
 
     <!--输出实体[HRCONTRACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-125-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-131-4">
         <createTable tableName="T_HRCONTRACT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -129,6 +129,8 @@
                 </column>
                 <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="WORKCONTENT" remarks="" type="VARCHAR(2000)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -1089,10 +1091,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-125-38">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-131-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-125-39">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-131-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]外键关系 -->

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:

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRContractDTO.java

@@ -246,6 +246,14 @@ public class HRContractDTO extends DTOBase implements Serializable {
     @JsonProperty("employeecode")
     private String employeecode;
 
+    /**
+     * 属性 [WORKCONTENT]
+     *
+     */
+    @JSONField(name = "workcontent")
+    @JsonProperty("workcontent")
+    private String workcontent;
+
 
     /**
      * 设置 [HRCONTRACTNAME]
@@ -367,6 +375,14 @@ public class HRContractDTO extends DTOBase implements Serializable {
         this.modify("attachment",attachment);
     }
 
+    /**
+     * 设置 [WORKCONTENT]
+     */
+    public void setWorkcontent(String  workcontent){
+        this.workcontent = workcontent ;
+        this.modify("workcontent",workcontent);
+    }
+
 
 }