Skip to content

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

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

上级 38720ae7
隐藏空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 45 行删除
ibzou-boot/src/main/resources/application-dev.yml
浏览文件 @ 43ab35eb
......@@ -4,21 +4,21 @@ server:
#zuul网关路由设置
zuul:
routes:
loginv7:
path: /v7/login
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
changepwd:
path: /v7/changepwd
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
uaa:
path: /uaa/**
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
config:
path: /configs/**
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
loginv7:
path: /v7/login
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
changepwd:
path: /v7/changepwd
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
uaa:
path: /uaa/**
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
config:
path: /configs/**
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
sensitive-headers:
- Cookie,Set-Cookie,Authorization
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 43ab35eb
......@@ -4,7 +4,7 @@
<!--输出实体[SYS_DEPT]数据结构 -->
<changeSet author="root" id="tab-sys_dept-58-1">
<changeSet author="a_A_5d9d78509" 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="root" id="tab-sys_deptmember-27-2">
<changeSet author="a_A_5d9d78509" 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="root" id="tab-sys_emp-74-3">
<changeSet author="a_A_5d9d78509" id="tab-sys_emp-74-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="root" id="tab-sys_org-33-4">
<changeSet author="a_A_5d9d78509" 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="root" id="tab-sys_post-21-5">
<changeSet author="a_A_5d9d78509" 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="root" id="tab-sys_team-21-6">
<changeSet author="a_A_5d9d78509" 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="root" id="tab-sys_teammember-25-7">
<changeSet author="a_A_5d9d78509" id="tab-sys_teammember-25-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="root" id="fk-sys_dept-58-8">
<changeSet author="a_A_5d9d78509" 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="root" id="fk-sys_dept-58-9">
<changeSet author="a_A_5d9d78509" 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="root" id="fk-sys_deptmember-27-10">
<changeSet author="a_A_5d9d78509" 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="root" id="fk-sys_deptmember-27-11">
<changeSet author="a_A_5d9d78509" 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="root" id="fk-sys_deptmember-27-12">
<changeSet author="a_A_5d9d78509" 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="root" id="fk-sys_emp-74-13">
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-74-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="root" id="fk-sys_emp-74-14">
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-74-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="root" id="fk-sys_emp-74-15">
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-74-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="root" id="fk-sys_org-33-16">
<changeSet author="a_A_5d9d78509" 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="root" id="fk-sys_teammember-25-17">
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-25-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="root" id="fk-sys_teammember-25-18">
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-25-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="root" id="fk-sys_teammember-25-19">
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-25-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-core/src/main/resources/mapper/ou/systeammember/SysTeamMemberMapper.xml
浏览文件 @ 43ab35eb
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="SysTeamMemberResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`DOMAINS`, t21.`PERSONNAME`, t1.`POSTID`, t31.`POSTNAME`, t1.`TEAMID`, t1.`TEAMMEMBERID`, t11.`TEAMNAME`, t1.`USERID` FROM `IBZTEAMMEMBER` t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID ) t1 where teammemberid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`DOMAINS`, t21.`PERSONNAME`, t1.`POSTID`, t31.`POSTNAME`, t1.`TEAMID`, t1.`TEAMMEMBERID`, t11.`TEAMNAME`, t1.`USERID`, t21.`USERNAME` FROM `IBZTEAMMEMBER` t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID ) t1 where teammemberid=#{id}]]>
</select>
<select id="selectById" resultMap="SysTeamMemberResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.DOMAINS, t21.PERSONNAME, t1.POSTID, t31.POSTNAME, t1.TEAMID, t1.TEAMMEMBERID, t11.TEAMNAME, t1.USERID, t21.USERNAME FROM IBZTEAMMEMBER t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID ) t1 where teammemberid=#{id}]]>
......@@ -63,7 +63,7 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`DOMAINS`, t21.`PERSONNAME`, t1.`POSTID`, t31.`POSTNAME`, t1.`TEAMID`, t1.`TEAMMEMBERID`, t11.`TEAMNAME`, t1.`USERID` FROM `IBZTEAMMEMBER` t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
<![CDATA[ SELECT t1.`DOMAINS`, t21.`PERSONNAME`, t1.`POSTID`, t31.`POSTNAME`, t1.`TEAMID`, t1.`TEAMMEMBERID`, t11.`TEAMNAME`, t1.`USERID`, t21.`USERNAME` FROM `IBZTEAMMEMBER` t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
]]>
</sql>
<!--数据查询[Default]-->
......@@ -78,7 +78,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`DOMAINS`, t21.`PERSONNAME`, t1.`POSTID`, t31.`POSTNAME`, t1.`TEAMID`, t1.`TEAMMEMBERID`, t11.`TEAMNAME`, t1.`USERID` FROM `IBZTEAMMEMBER` t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
<![CDATA[ SELECT t1.`DOMAINS`, t21.`PERSONNAME`, t1.`POSTID`, t31.`POSTNAME`, t1.`TEAMID`, t1.`TEAMMEMBERID`, t11.`TEAMNAME`, t1.`USERID`, t21.`USERNAME` FROM `IBZTEAMMEMBER` t1 LEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID LEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID LEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID
]]>
</sql>
<!--数据查询[View]-->
......
ibzou-dependencies/pom.xml
浏览文件 @ 43ab35eb
......@@ -233,12 +233,6 @@
<version>${jsonwebtoken-jjwt.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${alibaba-druid.version}</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>problem-spring-web</artifactId>
......@@ -351,6 +345,8 @@
</dependency>
</dependencies>
</project>
ibzou-util/src/main/java/cn/ibizlab/util/errors/ExceptionTranslator.java
浏览文件 @ 43ab35eb
......@@ -101,7 +101,7 @@ public class ExceptionTranslator implements ProblemHandling {
public static HttpHeaders createFailureAlert(String entityName, String errorKey, String defaultMessage) {
HttpHeaders headers = new HttpHeaders();
headers.add("X-ibz-error", "error." + errorKey);
headers.add("X-ibz-error", errorKey);
headers.add("X-ibz-params", entityName);
return headers;
}
......
ibzou-util/src/main/java/cn/ibizlab/util/rest/AppController.java
浏览文件 @ 43ab35eb
......@@ -59,6 +59,7 @@ public class AppController {
appData.put("enablepermissionvalid",false);
else
appData.put("enablepermissionvalid",enablePermissionValid);
fillAppData(appData);
return ResponseEntity.status(HttpStatus.OK).body(appData);
}
......@@ -87,4 +88,12 @@ public class AppController {
throw new BadRequestAlertException("获取配置失败，参数缺失","IBZConfig",configType);
return ResponseEntity.ok(ibzConfigService.getConfig(configType,targetType,userId));
}
/**
* 应用参数扩展
* @param appData
*/
protected void fillAppData(JSONObject appData){
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或