huwei_0806 发布系统代码 [ibz-ou，统一组织单位]

config.xml

@@ -37,11 +37,6 @@
 	  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/SysEmployeeSearchContext.java

@@ -27,6 +27,13 @@ import cn.ibizlab.core.ou.domain.SysEmployee;
 @Data
 public class SysEmployeeSearchContext extends QueryWrapperContext<SysEmployee> {
 
+	private String n_username_eq;//[用户全局名]
+	public void setN_username_eq(String n_username_eq) {
+        this.n_username_eq = n_username_eq;
+        if(!ObjectUtils.isEmpty(this.n_username_eq)){
+            this.getSearchCond().eq("username", n_username_eq);
+        }
+    }
 	private String n_username_in;//[用户全局名]
 	public void setN_username_in(String n_username_in) {
         this.n_username_in = n_username_in;

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[SYS_DEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_dept-58-1">
+    <changeSet author="root" id="tab-sys_dept-58-1">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/>
@@ -42,7 +42,7 @@
 
 
     <!--输出实体[SYS_DEPTMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_deptmember-27-2">
+    <changeSet author="root" id="tab-sys_deptmember-27-2">
         <createTable tableName="IBZDEPTMEMBER">
                 <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPTMEMBER_MEMBERID"/>
@@ -60,7 +60,7 @@
 
 
     <!--输出实体[SYS_EMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_emp-74-3">
+    <changeSet author="root" id="tab-sys_emp-75-3">
         <createTable tableName="IBZEMP">
                 <column name="USERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/>
@@ -140,7 +140,7 @@
 
 
     <!--输出实体[SYS_ORG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_org-33-4">
+    <changeSet author="root" id="tab-sys_org-33-4">
         <createTable tableName="IBZORG">
                 <column name="ORGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ORG_ORGID"/>
@@ -170,7 +170,7 @@
 
 
     <!--输出实体[SYS_POST]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_post-21-5">
+    <changeSet author="root" id="tab-sys_post-21-5">
         <createTable tableName="IBZPOST">
                 <column name="POSTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_POST_POSTID"/>
@@ -188,7 +188,7 @@
 
 
     <!--输出实体[SYS_TEAM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_team-21-6">
+    <changeSet author="root" id="tab-sys_team-21-6">
         <createTable tableName="IBZTEAM">
                 <column name="TEAMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAM_TEAMID"/>
@@ -204,7 +204,7 @@
 
 
     <!--输出实体[SYS_TEAMMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_teammember-27-7">
+    <changeSet author="root" id="tab-sys_teammember-27-7">
         <createTable tableName="IBZTEAMMEMBER">
                 <column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/>
@@ -221,46 +221,46 @@
     </changeSet>
 
         <!--输出实体[SYS_DEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_dept-58-8">
+    <changeSet author="root" id="fk-sys_dept-58-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-58-9">
+    <changeSet author="root" id="fk-sys_dept-58-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]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-27-10">
+    <changeSet author="root" id="fk-sys_deptmember-27-10">
        <addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_DEPT_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-27-11">
+    <changeSet author="root" id="fk-sys_deptmember-27-11">
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-27-12">
+    <changeSet author="root" id="fk-sys_deptmember-27-12">
        <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_EMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-74-13">
+    <changeSet author="root" id="fk-sys_emp-75-13">
        <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_DEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-74-14">
+    <changeSet author="root" id="fk-sys_emp-75-14">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-74-15">
+    <changeSet author="root" id="fk-sys_emp-75-15">
        <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_POST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_ORG]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_org-33-16">
+    <changeSet author="root" id="fk-sys_org-33-16">
        <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_SYS_ORG_SYS_ORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_POST]外键关系 -->
         <!--输出实体[SYS_TEAM]外键关系 -->
         <!--输出实体[SYS_TEAMMEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-27-17">
+    <changeSet author="root" id="fk-sys_teammember-27-17">
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-27-18">
+    <changeSet author="root" id="fk-sys_teammember-27-18">
        <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-27-19">
+    <changeSet author="root" id="fk-sys_teammember-27-19">
        <addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_TEAM_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
     </changeSet>
 

ibzou-provider/ibzou-provider-api/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 /ibzou-provider-api.jar
 
-EXPOSE 40001
+EXPOSE 8081
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

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

@@ -3,23 +3,9 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "40001:40001"
+      - "8081:8081"
     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: