Skip to content

I
ibzou
提交 74556a7f 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 83356b2c
显示空白字符变更
内嵌 并排
正在显示 包含 196 行增加 和 60 行删除
config.xml
浏览文件 @ 74556a7f
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
git clone -b master $para2 ibzou/ git clone -b master $para2 ibzou/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzou/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
浏览文件 @ 74556a7f
...@@ -14,6 +14,10 @@ services: ...@@ -14,6 +14,10 @@ services:
memory: 400M memory: 400M
mode: replicated mode: replicated
replicas: 1 replicas: 1
restart_policy:
condition: on-failure
max_attempts: 3
window: 120s
volumes: volumes:
- "nfs:/app/file" - "nfs:/app/file"
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysDepartment.java
浏览文件 @ 74556a7f
...@@ -171,6 +171,14 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -171,6 +171,14 @@ public class SysDepartment extends EntityMP implements Serializable {
@JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
private Timestamp updatedate; private Timestamp updatedate;
/**
* 启用标志
*/
@DEField(defaultValue = "1")
@TableField(value = "isvalid")
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/** /**
* *
...@@ -270,6 +278,14 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -270,6 +278,14 @@ public class SysDepartment extends EntityMP implements Serializable {
this.modify("leadername", leadername); this.modify("leadername", leadername);
} }
/**
* 设置 [启用标志]
*/
public void setIsvalid(Integer isvalid) {
this.isvalid = isvalid;
this.modify("isvalid", isvalid);
}
/** /**
* 复制当前对象数据到目标对象(粘贴重置) * 复制当前对象数据到目标对象(粘贴重置)
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysOrganization.java
浏览文件 @ 74556a7f
...@@ -136,6 +136,14 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -136,6 +136,14 @@ public class SysOrganization extends EntityMP implements Serializable {
@JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
private Timestamp updatedate; private Timestamp updatedate;
/**
* 启用标志
*/
@DEField(defaultValue = "1")
@TableField(value = "isvalid")
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/** /**
* *
...@@ -203,6 +211,14 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -203,6 +211,14 @@ public class SysOrganization extends EntityMP implements Serializable {
this.modify("domains", domains); this.modify("domains", domains);
} }
/**
* 设置 [启用标志]
*/
public void setIsvalid(Integer isvalid) {
this.isvalid = isvalid;
this.modify("isvalid", isvalid);
}
/** /**
* 复制当前对象数据到目标对象(粘贴重置) * 复制当前对象数据到目标对象(粘贴重置)
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/SysDepartmentSearchContext.java
浏览文件 @ 74556a7f
...@@ -120,6 +120,13 @@ public class SysDepartmentSearchContext extends QueryWrapperContext<SysDepartmen ...@@ -120,6 +120,13 @@ public class SysDepartmentSearchContext extends QueryWrapperContext<SysDepartmen
this.getSearchCond().like("pdeptname", n_pdeptname_like); this.getSearchCond().like("pdeptname", n_pdeptname_like);
} }
} }
private Integer n_isvalid_eq;//[启用标志]
public void setN_isvalid_eq(Integer n_isvalid_eq) {
this.n_isvalid_eq = n_isvalid_eq;
if(!ObjectUtils.isEmpty(this.n_isvalid_eq)){
this.getSearchCond().eq("isvalid", n_isvalid_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/SysOrganizationSearchContext.java
浏览文件 @ 74556a7f
...@@ -120,6 +120,13 @@ public class SysOrganizationSearchContext extends QueryWrapperContext<SysOrganiz ...@@ -120,6 +120,13 @@ public class SysOrganizationSearchContext extends QueryWrapperContext<SysOrganiz
this.getSearchCond().like("porgname", n_porgname_like); this.getSearchCond().like("porgname", n_porgname_like);
} }
} }
private Integer n_isvalid_eq;//[启用标志]
public void setN_isvalid_eq(Integer n_isvalid_eq) {
this.n_isvalid_eq = n_isvalid_eq;
if(!ObjectUtils.isEmpty(this.n_isvalid_eq)){
this.getSearchCond().eq("isvalid", n_isvalid_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 74556a7f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[SYS_DEPT]数据结构 --> <!--输出实体[SYS_DEPT]数据结构 -->
<changeSet author="root" id="tab-sys_dept-64-1"> <changeSet author="a_A_5d9d78509" id="tab-sys_dept-71-1">
<createTable tableName="IBZDEPT"> <createTable tableName="IBZDEPT">
<column name="DEPTID" remarks="" type="VARCHAR(100)"> <column name="DEPTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/>
...@@ -37,12 +37,14 @@ ...@@ -37,12 +37,14 @@
</column> </column>
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
</column> </column>
<column name="ISVALID" remarks="" type="INT">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[SYS_DEPTMEMBER]数据结构 --> <!--输出实体[SYS_DEPTMEMBER]数据结构 -->
<changeSet author="root" id="tab-sys_deptmember-34-2"> <changeSet author="a_A_5d9d78509" id="tab-sys_deptmember-34-2">
<createTable tableName="IBZDEPTMEMBER"> <createTable tableName="IBZDEPTMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)"> <column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_DEPTMEMBER_MEMBERID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPTMEMBER_MEMBERID"/>
...@@ -60,7 +62,7 @@ ...@@ -60,7 +62,7 @@
<!--输出实体[SYS_EMP]数据结构 --> <!--输出实体[SYS_EMP]数据结构 -->
<changeSet author="root" id="tab-sys_emp-84-3"> <changeSet author="a_A_5d9d78509" id="tab-sys_emp-84-3">
<createTable tableName="IBZEMP"> <createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)"> <column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/>
...@@ -140,7 +142,7 @@ ...@@ -140,7 +142,7 @@
<!--输出实体[SYS_ORG]数据结构 --> <!--输出实体[SYS_ORG]数据结构 -->
<changeSet author="root" id="tab-sys_org-39-4"> <changeSet author="a_A_5d9d78509" id="tab-sys_org-46-4">
<createTable tableName="IBZORG"> <createTable tableName="IBZORG">
<column name="ORGID" remarks="" type="VARCHAR(100)"> <column name="ORGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ORG_ORGID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_ORG_ORGID"/>
...@@ -165,12 +167,14 @@ ...@@ -165,12 +167,14 @@
</column> </column>
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
</column> </column>
<column name="ISVALID" remarks="" type="INT">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[SYS_POST]数据结构 --> <!--输出实体[SYS_POST]数据结构 -->
<changeSet author="root" id="tab-sys_post-23-5"> <changeSet author="a_A_5d9d78509" id="tab-sys_post-23-5">
<createTable tableName="IBZPOST"> <createTable tableName="IBZPOST">
<column name="POSTID" remarks="" type="VARCHAR(100)"> <column name="POSTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_POST_POSTID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_POST_POSTID"/>
...@@ -188,7 +192,7 @@ ...@@ -188,7 +192,7 @@
<!--输出实体[SYS_TEAM]数据结构 --> <!--输出实体[SYS_TEAM]数据结构 -->
<changeSet author="root" id="tab-sys_team-23-6"> <changeSet author="a_A_5d9d78509" id="tab-sys_team-23-6">
<createTable tableName="IBZTEAM"> <createTable tableName="IBZTEAM">
<column name="TEAMID" remarks="" type="VARCHAR(100)"> <column name="TEAMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_TEAM_TEAMID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAM_TEAMID"/>
...@@ -204,7 +208,7 @@ ...@@ -204,7 +208,7 @@
<!--输出实体[SYS_TEAMMEMBER]数据结构 --> <!--输出实体[SYS_TEAMMEMBER]数据结构 -->
<changeSet author="root" id="tab-sys_teammember-29-7"> <changeSet author="a_A_5d9d78509" id="tab-sys_teammember-29-7">
<createTable tableName="IBZTEAMMEMBER"> <createTable tableName="IBZTEAMMEMBER">
<column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)"> <column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/>
...@@ -221,46 +225,46 @@ ...@@ -221,46 +225,46 @@
</changeSet> </changeSet>
<!--输出实体[SYS_DEPT]外键关系 --> <!--输出实体[SYS_DEPT]外键关系 -->
<changeSet author="root" id="fk-sys_dept-64-8"> <changeSet author="a_A_5d9d78509" id="fk-sys_dept-71-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"/> <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>
<changeSet author="root" id="fk-sys_dept-64-9"> <changeSet author="a_A_5d9d78509" id="fk-sys_dept-71-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"/> <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> </changeSet>
<!--输出实体[SYS_DEPTMEMBER]外键关系 --> <!--输出实体[SYS_DEPTMEMBER]外键关系 -->
<changeSet author="root" id="fk-sys_deptmember-34-10"> <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-34-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"/> <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>
<changeSet author="root" id="fk-sys_deptmember-34-11"> <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-34-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"/> <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>
<changeSet author="root" id="fk-sys_deptmember-34-12"> <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-34-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"/> <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> </changeSet>
<!--输出实体[SYS_EMP]外键关系 --> <!--输出实体[SYS_EMP]外键关系 -->
<changeSet author="root" id="fk-sys_emp-84-13"> <changeSet author="a_A_5d9d78509" id="fk-sys_emp-84-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"/> <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>
<changeSet author="root" id="fk-sys_emp-84-14"> <changeSet author="a_A_5d9d78509" id="fk-sys_emp-84-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"/> <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>
<changeSet author="root" id="fk-sys_emp-84-15"> <changeSet author="a_A_5d9d78509" id="fk-sys_emp-84-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"/> <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> </changeSet>
<!--输出实体[SYS_ORG]外键关系 --> <!--输出实体[SYS_ORG]外键关系 -->
<changeSet author="root" id="fk-sys_org-39-16"> <changeSet author="a_A_5d9d78509" id="fk-sys_org-46-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"/> <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> </changeSet>
<!--输出实体[SYS_POST]外键关系 --> <!--输出实体[SYS_POST]外键关系 -->
<!--输出实体[SYS_TEAM]外键关系 --> <!--输出实体[SYS_TEAM]外键关系 -->
<!--输出实体[SYS_TEAMMEMBER]外键关系 --> <!--输出实体[SYS_TEAMMEMBER]外键关系 -->
<changeSet author="root" id="fk-sys_teammember-29-17"> <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-29-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"/> <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>
<changeSet author="root" id="fk-sys_teammember-29-18"> <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-29-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"/> <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>
<changeSet author="root" id="fk-sys_teammember-29-19"> <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-29-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"/> <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> </changeSet>
......
ibzou-core/src/main/resources/mapper/ou/sysdepartment/SysDepartmentMapper.xml
浏览文件 @ 74556a7f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="SysDepartmentResultMap" databaseId="mysql"> <select id="selectById" resultMap="SysDepartmentResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`DOMAINS`, t1.`ENABLE`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="SysDepartmentResultMap" databaseId="oracle"> <select id="selectById" resultMap="SysDepartmentResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID ) t1 where deptid=#{id}]]>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`DOMAINS`, t1.`ENABLE`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID <![CDATA[ SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.ENABLE = 1 WHERE t1.ENABLE = 1
]]> ]]>
</sql> </sql>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`DOMAINS`, t1.`ENABLE`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID <![CDATA[ SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1 LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID
WHERE t1.ENABLE = 1 WHERE t1.ENABLE = 1
]]> ]]>
</sql> </sql>
......
ibzou-core/src/main/resources/mapper/ou/sysorganization/SysOrganizationMapper.xml
浏览文件 @ 74556a7f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="SysOrganizationResultMap" databaseId="mysql"> <select id="selectById" resultMap="SysOrganizationResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="SysOrganizationResultMap" databaseId="oracle"> <select id="selectById" resultMap="SysOrganizationResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID ) t1 where orgid=#{id}]]>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID <![CDATA[ SELECT t1.`CREATEDATE`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.ENABLE = 1 WHERE t1.ENABLE = 1
]]> ]]>
</sql> </sql>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID <![CDATA[ SELECT t1.`CREATEDATE`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1 LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID
WHERE t1.ENABLE = 1 WHERE t1.ENABLE = 1
]]> ]]>
</sql> </sql>
......
ibzou-core/src/main/resources/sysmodel/ibzou.json
浏览文件 @ 74556a7f
...@@ -265,6 +265,20 @@ ...@@ -265,6 +265,20 @@
"key_field":0, "key_field":0,
"show_order":19, "show_order":19,
"major_field":0 "major_field":0
},
{
"fieldname":"ISVALID" ,
"codename":"IsValid",
"field_logic_name":"启用标志",
"entity_name":"SysDepartment",
"field_type":"YESNO",
"dict":"YesNo",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":1000,
"major_field":0
} }
], ],
"subEntitys":[ "subEntitys":[
...@@ -1265,6 +1279,21 @@ ...@@ -1265,6 +1279,21 @@
"key_field":0, "key_field":0,
"show_order":19, "show_order":19,
"major_field":0 "major_field":0
},
{
"fieldname":"ISVALID" ,
"codename":"IsValid",
"field_logic_name":"启用标志",
"entity_name":"SysOrganization",
"field_type":"YESNO",
"dict":"YesNo",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
} }
], ],
"subEntitys":[ "subEntitys":[
......
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @ 74556a7f
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
EXPOSE 8081 EXPOSE 40001
ADD ibzou-provider-api.jar /ibzou-provider-api.jar ADD ibzou-provider-api.jar /ibzou-provider-api.jar
ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
浏览文件 @ 74556a7f
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ibzou-provider-api: ibzou-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
ports: ports:
- "8081:8081" - "40001:40001"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
...@@ -14,6 +28,10 @@ services: ...@@ -14,6 +28,10 @@ services:
memory: 400M memory: 400M
mode: replicated mode: replicated
replicas: 1 replicas: 1
restart_policy:
condition: on-failure
max_attempts: 3
window: 120s
volumes: volumes:
- "nfs:/app/file" - "nfs:/app/file"
......
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/SysDepartmentDTO.java
浏览文件 @ 74556a7f
...@@ -181,6 +181,14 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -181,6 +181,14 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JsonProperty("updatedate") @JsonProperty("updatedate")
private Timestamp updatedate; private Timestamp updatedate;
/**
* 属性 [ISVALID]
*
*/
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/** /**
* 设置 [DEPTCODE] * 设置 [DEPTCODE]
...@@ -262,6 +270,14 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -262,6 +270,14 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
this.modify("leadername",leadername); this.modify("leadername",leadername);
} }
/**
* 设置 [ISVALID]
*/
public void setIsvalid(Integer isvalid){
this.isvalid = isvalid ;
this.modify("isvalid",isvalid);
}
} }
......
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/SysOrganizationDTO.java
浏览文件 @ 74556a7f
...@@ -134,6 +134,14 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -134,6 +134,14 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JsonProperty("updatedate") @JsonProperty("updatedate")
private Timestamp updatedate; private Timestamp updatedate;
/**
* 属性 [ISVALID]
*
*/
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/** /**
* 设置 [ORGCODE] * 设置 [ORGCODE]
...@@ -183,6 +191,14 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -183,6 +191,14 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
this.modify("domains",domains); this.modify("domains",domains);
} }
/**
* 设置 [ISVALID]
*/
public void setIsvalid(Integer isvalid){
this.isvalid = isvalid ;
this.modify("isvalid",isvalid);
}
} }
......
ibzou-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ 74556a7f
...@@ -13,6 +13,7 @@ import org.springframework.boot.ApplicationRunner; ...@@ -13,6 +13,7 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
...@@ -25,58 +26,55 @@ import java.util.*; ...@@ -25,58 +26,55 @@ import java.util.*;
@ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true") @ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true")
public class PermissionSyncJob implements ApplicationRunner { public class PermissionSyncJob implements ApplicationRunner {
@Autowired
@Lazy
private IBZUAAFeignClient client;
@Value("${ibiz.systemid:ibzou}") @Value("${ibiz.systemid:ibzou}")
private String systemId; private String systemId;
@Value("${ibiz.systemname:ibzou}") @Value("${ibiz.systemname:ibzou}")
private String systemName; private String systemName;
@Autowired @Autowired
@Lazy @Lazy
IBZLiteFeignClient liteFeignClient; private IBZUAAFeignClient uaaClient;
@Autowired
@Lazy
IBZLiteFeignClient liteClient;
@Override @Override
public void run(ApplicationArguments args) { public void run(ApplicationArguments args) {
try { try {
Thread.sleep(10000); Thread.sleep(10000);
InputStream permission = this.getClass().getResourceAsStream("/permission/systemResource.json"); //获取当前系统所有实体资源能力 InputStream permission = this.getClass().getResourceAsStream("/permission/systemResource.json"); //权限资源
String permissionResult = IOUtils.toString(permission,"UTF-8"); if (!ObjectUtils.isEmpty(permission)) {
JSONObject system= new JSONObject(); String strPermission = IOUtils.toString(permission, "UTF-8");
system.put("pssystemid",systemId); JSONObject system = new JSONObject() {{
system.put("pssystemname",systemName); put("pssystemid", systemId);
system.put("sysstructure",JSONObject.parseObject(permissionResult)); put("pssystemname", systemName);
system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes())); put("sysstructure", JSONObject.parseObject(strPermission));
if(client.syncSysAuthority(system)) { put("md5check", DigestUtils.md5DigestAsHex(strPermission.getBytes()));
log.info("向[UAA]同步系统资源成功"); }};
}else{ if (uaaClient.syncSysAuthority(system)) {
log.error("向[UAA]同步系统资源失败"); log.info("向[uaa]同步系统资源成功");
} else {
log.error("向[uaa]同步系统资源失败");
} }
} }
catch (Exception ex) { } catch (Exception ex) {
log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex)); log.error("向[uaa]同步系统资源失败，请检查[uaa]服务是否正常运行! {}", ex.getMessage());
} }
try { try {
InputStream sysModel = this.getClass().getResourceAsStream("/sysmodel/ibzou.json"); //获取当前系统所有实体资源能力 InputStream model = this.getClass().getResourceAsStream("/sysmodel/ibzou.json"); //系统模型
String strSysModel = IOUtils.toString(sysModel,"UTF-8"); if (!ObjectUtils.isEmpty(model)) {
if(liteFeignClient.syncSysModel(JSONObject.parseObject(strSysModel))) { String strModel = IOUtils.toString(model, "UTF-8");
log.info("向[lite]同步系统模型成功"); if (liteClient.syncSysModel(JSONObject.parseObject(strModel))) {
}else{ log.info("向[lite]同步模型成功");
log.error("向[lite]同步系统模型失败"); } else {
log.error("向[lite]同步模型失败");
} }
} }
catch (Exception ex) { } catch (Exception ex) {
log.error(String.format("向[lite]同步系统模型失败，请检查[lite]服务是否正常! [%s]",ex)); log.error("向[lite]同步系统模型失败，请检查[lite]服务是否正常运行! {}", ex.getMessage());
} }
} }
} }
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或