jackwang 部署微服务接口

cfe2c427 · ibizdev · c4dd92d8 · cfe2c427 · cfe2c427 · cfe2c427
--- 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/base/domain/HROperationUnit.java
+++ b/humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROperationUnit.java
@@ -96,6 +96,48 @@ public class HROperationUnit extends EntityMP implements Serializable {
    @JSONField(name = "organizationtype")
    @JsonProperty("organizationtype")
    private String organizationtype;
+    /**
+     * 组织层级
+     */
+    @TableField(exist = false)
+    @JSONField(name = "orglevel")
+    @JsonProperty("orglevel")
+    private BigInteger orglevel;
+    /**
+     * 排序号
+     */
+    @TableField(exist = false)
+    @JSONField(name = "showorder")
+    @JsonProperty("showorder")
+    private BigInteger showorder;
+    /**
+     * 运营单位类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "operationunittype")
+    @JsonProperty("operationunittype")
+    private String operationunittype;
+    /**
+     * 组织简称
+     */
+    @TableField(exist = false)
+    @JSONField(name = "shortname")
+    @JsonProperty("shortname")
+    private String shortname;
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
+    /**
+     * 组织编码
+     */
+    @TableField(exist = false)
+    @JSONField(name = "orgcode")
+    @JsonProperty("orgcode")
+    private String orgcode;




--- a/humanresource-core/src/main/resources/mapper/base/hroperationunit/HROperationUnitMapper.xml
+++ b/humanresource-core/src/main/resources/mapper/base/hroperationunit/HROperationUnitMapper.xml
@@ -5,7 +5,7 @@

    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HROperationUnitResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITID`, t1.`OPERATIONUNITNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OPERATIONUNIT` t1  LEFT JOIN ORGANIZATION t11 ON t1.OPERATIONUNITID = t11.ORGANIZATIONID  ) t1 where operationunitid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`MEMO`, t1.`OPERATIONUNITID`, t1.`OPERATIONUNITNAME`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OPERATIONUNIT` t1  LEFT JOIN ORGANIZATION t11 ON t1.OPERATIONUNITID = t11.ORGANIZATIONID  ) t1 where operationunitid=#{id}]]>
    </select>

    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITID`, t1.`OPERATIONUNITNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OPERATIONUNIT` t1  LEFT JOIN ORGANIZATION t11 ON t1.OPERATIONUNITID = t11.ORGANIZATIONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`MEMO`, t1.`OPERATIONUNITID`, t1.`OPERATIONUNITNAME`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OPERATIONUNIT` t1  LEFT JOIN ORGANIZATION t11 ON t1.OPERATIONUNITID = t11.ORGANIZATIONID  
 			]]>
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITID`, t1.`OPERATIONUNITNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OPERATIONUNIT` t1  LEFT JOIN ORGANIZATION t11 ON t1.OPERATIONUNITID = t11.ORGANIZATIONID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`MEMO`, t1.`OPERATIONUNITID`, t1.`OPERATIONUNITNAME`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OPERATIONUNIT` t1  LEFT JOIN ORGANIZATION t11 ON t1.OPERATIONUNITID = t11.ORGANIZATIONID  
 			]]>
    </sql>
 </mapper>

--- 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/HROperationUnitDTO.java
+++ b/humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HROperationUnitDTO.java
@@ -81,6 +81,54 @@ public class HROperationUnitDTO extends DTOBase implements Serializable {
    @JsonProperty("organizationtype")
    private String organizationtype;

+    /**
+     * 属性 [ORGLEVEL]
+     *
+     */
+    @JSONField(name = "orglevel")
+    @JsonProperty("orglevel")
+    private BigInteger orglevel;
+
+    /**
+     * 属性 [SHOWORDER]
+     *
+     */
+    @JSONField(name = "showorder")
+    @JsonProperty("showorder")
+    private BigInteger showorder;
+
+    /**
+     * 属性 [OPERATIONUNITTYPE]
+     *
+     */
+    @JSONField(name = "operationunittype")
+    @JsonProperty("operationunittype")
+    private String operationunittype;
+
+    /**
+     * 属性 [SHORTNAME]
+     *
+     */
+    @JSONField(name = "shortname")
+    @JsonProperty("shortname")
+    private String shortname;
+
+    /**
+     * 属性 [MEMO]
+     *
+     */
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
+
+    /**
+     * 属性 [ORGCODE]
+     *
+     */
+    @JSONField(name = "orgcode")
+    @JsonProperty("orgcode")
+    private String orgcode;
+

    /**
     * 设置 [OPERATIONUNITNAME]