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/pcm/domain/HRTransferApply.java

@@ -181,6 +181,13 @@ public class HRTransferApply extends EntityMP implements Serializable {
     @JSONField(name = "attachment")
     @JsonProperty("attachment")
     private String attachment;
+    /**
+     * 工作流实例
+     */
+    @TableField(value = "wfinstanceid")
+    @JSONField(name = "wfinstanceid")
+    @JsonProperty("wfinstanceid")
+    private String wfinstanceid;
 
     /**
      * 员工
@@ -290,6 +297,14 @@ public class HRTransferApply extends EntityMP implements Serializable {
         this.modify("attachment",attachment);
     }
 
+    /**
+     * 设置 [工作流实例]
+     */
+    public void setWfinstanceid(String wfinstanceid){
+        this.wfinstanceid = wfinstanceid ;
+        this.modify("wfinstanceid",wfinstanceid);
+    }
+
 
 }
 

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

@@ -1019,6 +1019,8 @@
                 </column>
                 <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="WFINSTANCEID" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 

humanresource-core/src/main/resources/mapper/humanresource/hremployee/HREmployeeMapper.xml

@@ -105,7 +105,7 @@
     <!--数据查询[LeaveDuty]-->
     <sql id="LeaveDuty" databaseId="mysql">
 		<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID  LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID  LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID  LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID  
-					 WHERE 	( t21.`JOBSTATE` = 'ONDUTY' )
+					 WHERE 	( t21.`JOBSTATE` = 'LEAVEDUTY' )
 			]]>
     </sql>
     <!--数据查询[OnDuty]-->

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/HRTransferApplyDTO.java

@@ -179,6 +179,14 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable {
     @JsonProperty("attachment")
     private String attachment;
 
+    /**
+     * 属性 [WFINSTANCEID]
+     *
+     */
+    @JSONField(name = "wfinstanceid")
+    @JsonProperty("wfinstanceid")
+    private String wfinstanceid;
+
 
     /**
      * 设置 [HRTRANSFERAPPLYNAME]
@@ -252,6 +260,14 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable {
         this.modify("attachment",attachment);
     }
 
+    /**
+     * 设置 [WFINSTANCEID]
+     */
+    public void setWfinstanceid(String  wfinstanceid){
+        this.wfinstanceid = wfinstanceid ;
+        this.modify("wfinstanceid",wfinstanceid);
+    }
+
 
 }