Skip to content

I
ibzuaa
提交 cff94bf2 编写于 作者: lzlhxj's avatar lzlhxj
浏览文件
操作

Merge branch 'master' of http://labcs.ibizee.cn/ibiz4jteam/ibzuaa

上级 1b8860c6 03f95ec8
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 357 行增加 和 429 行删除
app_web/package.json
浏览文件 @ cff94bf2
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"file-saver": "^2.0.2", "file-saver": "^2.0.2",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.16", "ibiz-gantt-elastic": "^1.0.17",
"ibiz-vue-lib": "^0.1.10", "ibiz-vue-lib": "^0.1.10",
"interactjs": "^1.9.4", "interactjs": "^1.9.4",
"moment": "^2.24.0", "moment": "^2.24.0",
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ cff94bf2
...@@ -28,21 +28,25 @@ ...@@ -28,21 +28,25 @@
<dropdown-menu slot='list' v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)"> <dropdown-menu slot='list' v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
<dropdown-item v-for="(detail,index) in (uiActionGroup.details)" :key="index" :name="detail.name"> <dropdown-item v-for="(detail,index) in (uiActionGroup.details)" :key="index" :name="detail.name">
<span class='item' @click="doUIAction($event, detail)"> <span class='item' @click="doUIAction($event, detail)">
<template v-if="detail.icon && !Object.is(detail.icon, '')"> <template v-if="detail.isShowIcon">
<i :class="detail.icon" ></i> <template v-if="detail.icon && !Object.is(detail.icon, '')">
</template> <i :class="detail.icon" ></i>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))"> </template>
<div v-if="detail.img && !Object.is(detail.img, '')"> <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<img :src="detail.img" /> <div v-if="detail.img && !Object.is(detail.img, '')">
</div> <img :src="detail.img" />
</div>
</template>
</template> </template>
&nbsp; &nbsp;
<span> <span>
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"> <template v-if="detail.isShowCaption">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}} <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
</template> {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"> </template>
{{detail.caption}} <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
</template>
</template> </template>
</span> </span>
</span> </span>
...@@ -55,21 +59,25 @@ ...@@ -55,21 +59,25 @@
<template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)"> <template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
<div v-for="(detail,index) in uiActionGroup.details" :key="index"> <div v-for="(detail,index) in uiActionGroup.details" :key="index">
<span class='item' @click="doUIAction($event, detail)"> <span class='item' @click="doUIAction($event, detail)">
<template v-if="detail.icon && !Object.is(detail.icon, '')"> <template v-if="detail.isShowIcon">
<i :class="detail.icon" ></i> <template v-if="detail.icon && !Object.is(detail.icon, '')">
</template> <i :class="detail.icon" ></i>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))"> </template>
<div v-if="detail.img && !Object.is(detail.img, '')"> <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<img :src="detail.img" /> <div v-if="detail.img && !Object.is(detail.img, '')">
</div> <img :src="detail.img" />
</template> </div>
</template>
</template>
&nbsp; &nbsp;
<span> <span>
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"> <template v-if="detail.isShowCaption">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}} <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
</template> {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"> </template>
{{detail.caption}} <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
</template>
</template> </template>
</span> </span>
</span> </span>
......
app_web/src/components/app-transfer/app-transfer.less
浏览文件 @ cff94bf2
.ivu-select-dropdown { .transfer-select{
padding: 0px; .ivu-select-dropdown {
.hidden { padding: 0px;
display: none; .hidden {
} display: none;
} }
\ No newline at end of file .el-transfer{
min-width: 100% !important;
display: flex;
justify-content: space-between;
.el-transfer-panel{
min-width: 25%;
}
.el-transfer__buttons{
align-self: center;
}
}
}
}
app_web/yarn.lock
浏览文件 @ cff94bf2
...@@ -5238,10 +5238,10 @@ human-signals@^1.1.1: ...@@ -5238,10 +5238,10 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
ibiz-gantt-elastic@^1.0.16: ibiz-gantt-elastic@^1.0.17:
version "1.0.16" version "1.0.17"
resolved "https://registry.npm.taobao.org/ibiz-gantt-elastic/download/ibiz-gantt-elastic-1.0.16.tgz#e2de7e8d4bdb3c292cfbc97c4f970c8ecfe6c43b" resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.17.tgz#447cce5db2e0127d2336c20370fc251992520c6f"
integrity sha1-4t5+jUvbPCks+8l8T5cMjs/mxDs= integrity sha512-AJOYXZGM020wafn60RJLM2yKmtT2BjCpBKkZ0PONcxdqW/kCyXOqEo3c3/PBtFEkJx/8KGTayB013BOdGI1+uQ==
dependencies: dependencies:
dayjs "^1.8.16" dayjs "^1.8.16"
resize-observer-polyfill "^1.5.1" resize-observer-polyfill "^1.5.1"
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysApp.java
浏览文件 @ cff94bf2
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -29,6 +30,7 @@ import org.springframework.data.annotation.Transient; ...@@ -29,6 +30,7 @@ import org.springframework.data.annotation.Transient;
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor
public class SysApp extends EntityBase implements Serializable { public class SysApp extends EntityBase implements Serializable {
/** /**
...@@ -109,7 +111,6 @@ public class SysApp extends EntityBase implements Serializable { ...@@ -109,7 +111,6 @@ public class SysApp extends EntityBase implements Serializable {
} }
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java
浏览文件 @ cff94bf2
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -114,6 +115,7 @@ public class SysAuthLog extends EntityMP implements Serializable { ...@@ -114,6 +115,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this.username = username ; this.username = username ;
this.modify("username",username); this.modify("username",username);
} }
/** /**
* 设置 [用户名称] * 设置 [用户名称]
*/ */
...@@ -121,6 +123,7 @@ public class SysAuthLog extends EntityMP implements Serializable { ...@@ -121,6 +123,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this.personname = personname ; this.personname = personname ;
this.modify("personname",personname); this.modify("personname",personname);
} }
/** /**
* 设置 [域] * 设置 [域]
*/ */
...@@ -128,6 +131,7 @@ public class SysAuthLog extends EntityMP implements Serializable { ...@@ -128,6 +131,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this.domain = domain ; this.domain = domain ;
this.modify("domain",domain); this.modify("domain",domain);
} }
/** /**
* 设置 [IP地址] * 设置 [IP地址]
*/ */
...@@ -135,6 +139,7 @@ public class SysAuthLog extends EntityMP implements Serializable { ...@@ -135,6 +139,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this.ipaddr = ipaddr ; this.ipaddr = ipaddr ;
this.modify("ipaddr",ipaddr); this.modify("ipaddr",ipaddr);
} }
/** /**
* 设置 [MAC地址] * 设置 [MAC地址]
*/ */
...@@ -142,6 +147,7 @@ public class SysAuthLog extends EntityMP implements Serializable { ...@@ -142,6 +147,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this.macaddr = macaddr ; this.macaddr = macaddr ;
this.modify("macaddr",macaddr); this.modify("macaddr",macaddr);
} }
/** /**
* 设置 [客户端] * 设置 [客户端]
*/ */
...@@ -149,6 +155,7 @@ public class SysAuthLog extends EntityMP implements Serializable { ...@@ -149,6 +155,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this.useragent = useragent ; this.useragent = useragent ;
this.modify("useragent",useragent); this.modify("useragent",useragent);
} }
/** /**
* 设置 [认证结果] * 设置 [认证结果]
*/ */
...@@ -157,6 +164,7 @@ public class SysAuthLog extends EntityMP implements Serializable { ...@@ -157,6 +164,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this.modify("authcode",authcode); this.modify("authcode",authcode);
} }
} }
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java
浏览文件 @ cff94bf2
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -105,6 +106,7 @@ public class SysPermission extends EntityMP implements Serializable { ...@@ -105,6 +106,7 @@ public class SysPermission extends EntityMP implements Serializable {
this.permissionname = permissionname ; this.permissionname = permissionname ;
this.modify("sys_permissionname",permissionname); this.modify("sys_permissionname",permissionname);
} }
/** /**
* 设置 [资源类别] * 设置 [资源类别]
*/ */
...@@ -112,6 +114,7 @@ public class SysPermission extends EntityMP implements Serializable { ...@@ -112,6 +114,7 @@ public class SysPermission extends EntityMP implements Serializable {
this.permissiontype = permissiontype ; this.permissiontype = permissiontype ;
this.modify("permissiontype",permissiontype); this.modify("permissiontype",permissiontype);
} }
/** /**
* 设置 [系统] * 设置 [系统]
*/ */
...@@ -120,6 +123,7 @@ public class SysPermission extends EntityMP implements Serializable { ...@@ -120,6 +123,7 @@ public class SysPermission extends EntityMP implements Serializable {
this.modify("pssystemid",pssystemid); this.modify("pssystemid",pssystemid);
} }
} }
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java
浏览文件 @ cff94bf2
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -89,6 +90,7 @@ public class SysRole extends EntityMP implements Serializable { ...@@ -89,6 +90,7 @@ public class SysRole extends EntityMP implements Serializable {
this.rolename = rolename ; this.rolename = rolename ;
this.modify("sys_rolename",rolename); this.modify("sys_rolename",rolename);
} }
/** /**
* 设置 [备注] * 设置 [备注]
*/ */
...@@ -97,6 +99,7 @@ public class SysRole extends EntityMP implements Serializable { ...@@ -97,6 +99,7 @@ public class SysRole extends EntityMP implements Serializable {
this.modify("memo",memo); this.modify("memo",memo);
} }
} }
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java
浏览文件 @ cff94bf2
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -134,6 +135,7 @@ public class SysRolePermission extends EntityMP implements Serializable { ...@@ -134,6 +135,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
this.roleid = roleid ; this.roleid = roleid ;
this.modify("sys_roleid",roleid); this.modify("sys_roleid",roleid);
} }
/** /**
* 设置 [权限表标识] * 设置 [权限表标识]
*/ */
...@@ -142,6 +144,7 @@ public class SysRolePermission extends EntityMP implements Serializable { ...@@ -142,6 +144,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
this.modify("sys_permissionid",permissionid); this.modify("sys_permissionid",permissionid);
} }
/** /**
* 获取 [角色权限关系表标识] * 获取 [角色权限关系表标识]
*/ */
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java
浏览文件 @ cff94bf2
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -77,6 +78,7 @@ public class SysUser extends EntityMP implements Serializable { ...@@ -77,6 +78,7 @@ public class SysUser extends EntityMP implements Serializable {
this.username = username ; this.username = username ;
this.modify("username",username); this.modify("username",username);
} }
/** /**
* 设置 [用户姓名] * 设置 [用户姓名]
*/ */
...@@ -84,6 +86,7 @@ public class SysUser extends EntityMP implements Serializable { ...@@ -84,6 +86,7 @@ public class SysUser extends EntityMP implements Serializable {
this.personname = personname ; this.personname = personname ;
this.modify("personname",personname); this.modify("personname",personname);
} }
/** /**
* 设置 [密码] * 设置 [密码]
*/ */
...@@ -92,6 +95,7 @@ public class SysUser extends EntityMP implements Serializable { ...@@ -92,6 +95,7 @@ public class SysUser extends EntityMP implements Serializable {
this.modify("password",password); this.modify("password",password);
} }
} }
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java
浏览文件 @ cff94bf2
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -120,6 +121,7 @@ public class SysUserRole extends EntityMP implements Serializable { ...@@ -120,6 +121,7 @@ public class SysUserRole extends EntityMP implements Serializable {
this.roleid = roleid ; this.roleid = roleid ;
this.modify("sys_roleid",roleid); this.modify("sys_roleid",roleid);
} }
/** /**
* 设置 [用户标识] * 设置 [用户标识]
*/ */
...@@ -128,6 +130,7 @@ public class SysUserRole extends EntityMP implements Serializable { ...@@ -128,6 +130,7 @@ public class SysUserRole extends EntityMP implements Serializable {
this.modify("sys_userid",userid); this.modify("sys_userid",userid);
} }
/** /**
* 获取 [用户角色关系标识] * 获取 [用户角色关系标识]
*/ */
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ cff94bf2
<?xml version="1.1" encoding="UTF-8" standalone="no"?> !!!!模版产生代码错误:----
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
<!--输出实体[SYS_AUTHLOG]数据结构 --> FTL stack trace ("~" means nesting-related):
<changeSet author="a_A_5d9d78509" id="tab-sys_authlog-36-1"> - Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
<createTable tableName="IBZAUTHLOG"> ----
<column name="LOGID" remarks="" type="VARCHAR(100)"> \ No newline at end of file
<constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
</column>
<column name="USERNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAIN" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHTIME" remarks="" type="DATETIME">
</column>
<column name="IPADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="MACADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="USERAGENT" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHCODE" remarks="" type="VARCHAR(15)">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-93-2">
<createTable tableName="IBZROLE_PERMISSION">
<column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_USER_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_user_role-62-3">
<createTable tableName="IBZUSER_ROLE">
<column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_USERID" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role-89-4">
<createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
</column>
<column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PSSYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-36-5">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
</column>
<column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
</column>
<column name="APPS" remarks="" type="TEXT(1048576)">
</column>
<column name="MD5CHECK" remarks="" type="VARCHAR(100)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-6">
<createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
</column>
<column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_AUTHLOG]外键关系 -->
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-93-7">
<addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
</changeSet>
<!--输出实体[SYS_USER_ROLE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_user_role-62-9">
<addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
</changeSet>
<!--输出实体[SYS_ROLE]外键关系 -->
<!--输出实体[SYS_PSSYSTEM]外键关系 -->
<!--输出实体[SYS_PERMISSION]外键关系 -->
</databaseChangeLog>
ibzuaa-util/src/main/java/cn/ibizlab/util/cache/redis/CustomJacksonSerializer.java
浏览文件 @ cff94bf2
...@@ -10,6 +10,10 @@ public class CustomJacksonSerializer<T> extends Jackson2JsonRedisSerializer<T> ...@@ -10,6 +10,10 @@ public class CustomJacksonSerializer<T> extends Jackson2JsonRedisSerializer<T>
public static final String DEFAULT_PACKAGE ="[\\w+\\.]+\\.AuthenticationUser"; public static final String DEFAULT_PACKAGE ="[\\w+\\.]+\\.AuthenticationUser";
public static final String CLASSNAME_EX="_$$_";
public static final String CLASSNAME_EX_PATTEN="(_\\$\\$_)(\\w+)";
public static final String USER_PACKAGE= AuthenticationUser.class.getName(); public static final String USER_PACKAGE= AuthenticationUser.class.getName();
public CustomJacksonSerializer(Class type) { public CustomJacksonSerializer(Class type) {
...@@ -20,6 +24,12 @@ public class CustomJacksonSerializer<T> extends Jackson2JsonRedisSerializer<T> ...@@ -20,6 +24,12 @@ public class CustomJacksonSerializer<T> extends Jackson2JsonRedisSerializer<T>
public T deserialize(byte[] bytes) throws SerializationException { public T deserialize(byte[] bytes) throws SerializationException {
String serializerContent = new String(bytes, DEFAULT_CHARSET); String serializerContent = new String(bytes, DEFAULT_CHARSET);
Matcher matcher = Pattern.compile(DEFAULT_PACKAGE).matcher(serializerContent); Matcher matcher = Pattern.compile(DEFAULT_PACKAGE).matcher(serializerContent);
return matcher.find()?super.deserialize(serializerContent.replaceAll(DEFAULT_PACKAGE,USER_PACKAGE).getBytes()):super.deserialize(bytes); if(matcher.find()){
serializerContent=serializerContent.replaceAll(DEFAULT_PACKAGE,USER_PACKAGE);
}
if(serializerContent.contains(CLASSNAME_EX)){
serializerContent=serializerContent.replaceAll(CLASSNAME_EX_PATTEN,"");
}
return super.deserialize(serializerContent.getBytes());
} }
} }
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或