zhouweidong 部署微服务接口 [ibz-ou，microservice]

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
+      mvn clean package -Papi
+      cd ibzou-provider/ibzou-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/SysDepartmentSearchContext.java

@@ -84,6 +84,13 @@ public class SysDepartmentSearchContext extends QueryWrapperContext<SysDepartmen
 				this.getSearchCond().isNull("pdeptid");
 			}
         }
+    }
+	private String n_bcode_eq;//[业务编码]
+	public void setN_bcode_eq(String n_bcode_eq) {
+        this.n_bcode_eq = n_bcode_eq;
+        if(!ObjectUtils.isEmpty(this.n_bcode_eq)){
+            this.getSearchCond().eq("bcode", n_bcode_eq);
+        }
     }
 	private String n_bcode_like;//[业务编码]
 	public void setN_bcode_like(String n_bcode_like) {

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDepartmentServiceImpl.java

@@ -121,9 +121,8 @@ public class SysDepartmentServiceImpl extends ServiceImpl<SysDepartmentMapper, S
     @Transactional
     public SysDepartment get(String key) {
         SysDepartment et = getById(key);
-        if(et == null){
-            et = new SysDepartment();
-            et.setDeptid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDeptMemberServiceImpl.java

@@ -113,9 +113,8 @@ public class SysDeptMemberServiceImpl extends ServiceImpl<SysDeptMemberMapper, S
     @Transactional
     public SysDeptMember get(String key) {
         SysDeptMember et = getById(key);
-        if(et == null){
-            et = new SysDeptMember();
-            et.setMemberid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysEmployeeServiceImpl.java

@@ -119,9 +119,8 @@ public class SysEmployeeServiceImpl extends ServiceImpl<SysEmployeeMapper, SysEm
     @Transactional
     public SysEmployee get(String key) {
         SysEmployee et = getById(key);
-        if(et == null){
-            et = new SysEmployee();
-            et.setUserid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysOrganizationServiceImpl.java

@@ -125,9 +125,8 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
     @Transactional
     public SysOrganization get(String key) {
         SysOrganization et = getById(key);
-        if(et == null){
-            et = new SysOrganization();
-            et.setOrgid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
             et.setDepts(sysdepartmentService.selectByOrgid(key));

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysPostServiceImpl.java

@@ -109,9 +109,8 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
     @Transactional
     public SysPost get(String key) {
         SysPost et = getById(key);
-        if(et == null){
-            et = new SysPost();
-            et.setPostid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysTeamMemberServiceImpl.java

@@ -113,9 +113,8 @@ public class SysTeamMemberServiceImpl extends ServiceImpl<SysTeamMemberMapper, S
     @Transactional
     public SysTeamMember get(String key) {
         SysTeamMember et = getById(key);
-        if(et == null){
-            et = new SysTeamMember();
-            et.setTeammemberid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysTeamServiceImpl.java

@@ -103,9 +103,8 @@ public class SysTeamServiceImpl extends ServiceImpl<SysTeamMapper, SysTeam> impl
     @Transactional
     public SysTeam get(String key) {
         SysTeam et = getById(key);
-        if(et == null){
-            et = new SysTeam();
-            et.setTeamid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[SYS_DEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_dept-79-1">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_dept-80-1">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/>
@@ -225,10 +225,10 @@
     </changeSet>
 
         <!--输出实体[SYS_DEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_dept-79-8">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_dept-80-8">
        <addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_DEPT_PDEPTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_dept-79-9">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_dept-80-9">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_DEPTMEMBER]外键关系 -->

ibzou-core/src/main/resources/mapper/ou/sysdepartment/SysDepartmentMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.ou.mapper.SysDepartmentMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzou-core/src/main/resources/mapper/ou/sysdeptmember/SysDeptMemberMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.ou.mapper.SysDeptMemberMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzou-core/src/main/resources/mapper/ou/sysemployee/SysEmployeeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.ou.mapper.SysEmployeeMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzou-core/src/main/resources/mapper/ou/sysorganization/SysOrganizationMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.ou.mapper.SysOrganizationMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzou-core/src/main/resources/mapper/ou/syspost/SysPostMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.ou.mapper.SysPostMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzou-core/src/main/resources/mapper/ou/systeam/SysTeamMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.ou.mapper.SysTeamMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzou-core/src/main/resources/mapper/ou/systeammember/SysTeamMemberMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.ou.mapper.SysTeamMemberMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40001
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api-k8s.yaml

@@ -22,7 +22,34 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8081
+        - containerPort: 40001
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.180.237"      
+        - name: SERVER_PORT
+          value: "40001"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.100.243:8848"
+        - name: SPRING_REDIS_HOST
+          value: "172.16.100.243"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_A_5d9d78509"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "@6dEfb3@"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_A_5d9d78509"
+        - name: NACOS
+          value: "172.16.100.243:8848"      
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
+          value: "ibizdev"      
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -42,9 +69,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 40001
+    targetPort: 40001
+    nodePort: 40001
     protocol: TCP
   selector:
     app: ibzou-provider-api

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml

@@ -3,9 +3,23 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40001:40001"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.100.243:8848
+      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/SysDepartmentMapping.java

@@ -12,4 +12,3 @@ public interface SysDepartmentMapping extends MappingBase<SysDepartmentDTO, SysD
 
 
 }
-

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/SysDeptMemberMapping.java

@@ -12,4 +12,3 @@ public interface SysDeptMemberMapping extends MappingBase<SysDeptMemberDTO, SysD
 
 
 }
-

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/SysEmployeeMapping.java

@@ -12,4 +12,3 @@ public interface SysEmployeeMapping extends MappingBase<SysEmployeeDTO, SysEmplo
 
 
 }
-

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/SysOrganizationMapping.java

@@ -12,4 +12,3 @@ public interface SysOrganizationMapping extends MappingBase<SysOrganizationDTO,
 
 
 }
-

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/SysPostMapping.java

@@ -12,4 +12,3 @@ public interface SysPostMapping extends MappingBase<SysPostDTO, SysPost> {
 
 
 }
-

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/SysTeamMapping.java

@@ -12,4 +12,3 @@ public interface SysTeamMapping extends MappingBase<SysTeamDTO, SysTeam> {
 
 
 }
-

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/SysTeamMemberMapping.java

@@ -12,4 +12,3 @@ public interface SysTeamMemberMapping extends MappingBase<SysTeamMemberDTO, SysT
 
 
 }
-

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
 	JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
 					   @PathVariable("entity") String entity,
 					   @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
+
 }

ibzou-util/src/main/java/cn/ibizlab/util/domain/DELogic.java

@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
 
 import lombok.Data;
 import org.flowable.bpmn.model.Process;
+import org.springframework.core.io.Resource;
 import org.kie.api.runtime.KieContainer;
 import java.io.File;
 import java.io.Serializable;
@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
     Process process;
     KieContainer container;
     List<DELogic> refLogic;
-    List<File> refRuleFiles;
+    List<Resource> refRuleFiles;
     String md5;
 }

ibzou-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
+
     /**
      * 获取工作流步骤标识
      */

ibzou-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -254,6 +254,7 @@ public class AuthenticationUser implements UserDetails
 		if(this.sessionParams==null)
 		{
 			sessionParams = getUserSessionParam();
+			sessionParams.put("srfdynainstid",this.getSrfdynainstid());
 			sessionParams.put("srfpersonid", this.getUserid());
 			sessionParams.put("srfpersonname", this.getPersonname());
 			sessionParams.put("srforgsectorid", this.getMdeptid());

ibzou-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -3,7 +3,6 @@ package cn.ibizlab.util.security;
 import io.jsonwebtoken.ExpiredJwtException;
 import lombok.extern.slf4j.Slf4j;
 import cn.ibizlab.util.service.AuthenticationUserService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
+import org.springframework.util.StringUtils;
 
 @Slf4j
 @Component