Skip to content

I
ibzuaa
提交 475fdaa3 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码 [ibiz-uaa，UAA鉴权]

上级 e87fdf25
隐藏空白字符变更
内嵌 并排
正在显示 包含 13 行增加 和 64 行删除
app_web/src/locale/lanres/entities/sys-auth-log/sys-auth-log_BO_CN_base.ts
浏览文件 @ 475fdaa3
......@@ -7,7 +7,6 @@ function getLocaleResourceBase(){
username: commonLogic.appcommonhandle("用户全局名",null),
personname: commonLogic.appcommonhandle("用户名称",null),
domain: commonLogic.appcommonhandle("域",null),
domains: commonLogic.appcommonhandle("域",null),
authtime: commonLogic.appcommonhandle("认证时间",null),
ipaddr: commonLogic.appcommonhandle("IP地址",null),
macaddr: commonLogic.appcommonhandle("MAC地址",null),
......
app_web/src/locale/lanres/entities/sys-auth-log/sys-auth-log_en_US_base.ts
浏览文件 @ 475fdaa3
......@@ -7,7 +7,6 @@ function getLocaleResourceBase(){
username: commonLogic.appcommonhandle("用户全局名",null),
personname: commonLogic.appcommonhandle("用户名称",null),
domain: commonLogic.appcommonhandle("域",null),
domains: commonLogic.appcommonhandle("域",null),
authtime: commonLogic.appcommonhandle("认证时间",null),
ipaddr: commonLogic.appcommonhandle("IP地址",null),
macaddr: commonLogic.appcommonhandle("MAC地址",null),
......
app_web/src/locale/lanres/entities/sys-auth-log/sys-auth-log_zh_CN_base.ts
浏览文件 @ 475fdaa3
......@@ -7,7 +7,6 @@ function getLocaleResourceBase(){
username: commonLogic.appcommonhandle("用户全局名",null),
personname: commonLogic.appcommonhandle("用户名称",null),
domain: commonLogic.appcommonhandle("域",null),
domains: commonLogic.appcommonhandle("域",null),
authtime: commonLogic.appcommonhandle("认证时间",null),
ipaddr: commonLogic.appcommonhandle("IP地址",null),
macaddr: commonLogic.appcommonhandle("MAC地址",null),
......
app_web/src/widgets/sys-auth-log/default-searchform/default-searchform-model.ts
浏览文件 @ 475fdaa3
......@@ -52,7 +52,7 @@ export default class DefaultModel {
},
{
name: 'n_domains_like',
prop: 'domains',
prop: 'domain',
dataType: 'TEXT',
},
]
......
app_web/src/widgets/sys-auth-log/main-grid/main-grid-model.ts
浏览文件 @ 475fdaa3
......@@ -58,7 +58,7 @@ export default class MainModel {
},
{
name: 'domains',
prop: 'domains',
prop: 'domain',
dataType: 'TEXT',
},
{
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java
浏览文件 @ 475fdaa3
......@@ -74,19 +74,12 @@ public class SysAuthLog extends EntityMP implements Serializable {
/**
* 域
*/
@TableField(value = "domain")
@DEField(name = "domains")
@TableField(value = "domains")
@JSONField(name = "domain")
@JsonProperty("domain")
@ApiModelProperty("域")
private String domain;
/**
* 域
*/
@TableField(value = "domains")
@JSONField(name = "domains")
@JsonProperty("domains")
@ApiModelProperty("域")
private String domains;
/**
* 认证时间
*/
......@@ -153,15 +146,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
*/
public void setDomain(String domain) {
this.domain = domain;
this.modify("domain", domain);
}
/**
* 设置 [域]
*/
public void setDomains(String domains) {
this.domains = domains;
this.modify("domains", domains);
this.modify("domains", domain);
}
/**
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 475fdaa3
......@@ -15,8 +15,6 @@
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAIN" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAINS" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHTIME" remarks="" type="DATETIME">
......
ibzuaa-core/src/main/resources/mapper/uaa/sysauthlog/SysAuthLogMapper.xml
浏览文件 @ 475fdaa3
......@@ -7,7 +7,7 @@
<![CDATA[select t1.* from (SELECT t1.`AUTHCODE`, t1.`AUTHTIME`, t1.`DOMAIN`, t1.`IPADDR`, t1.`LOGID`, t1.`MACADDR`, t1.`PERSONNAME`, t1.`USERAGENT`, t1.`USERNAME` FROM `IBZAUTHLOG` t1 ) t1 where logid=#{id}]]>
</select>
<select id="selectById" resultMap="SysAuthLogResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.AUTHCODE, t1.AUTHTIME, t1.DOMAIN, t1.DOMAINS, t1.IPADDR, t1.LOGID, t1.MACADDR, t1.PERSONNAME, t1.USERAGENT, t1.USERNAME FROM IBZAUTHLOG t1 ) t1 where logid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.AUTHCODE, t1.AUTHTIME, t1.DOMAINS, t1.IPADDR, t1.LOGID, t1.MACADDR, t1.PERSONNAME, t1.USERAGENT, t1.USERNAME FROM IBZAUTHLOG t1 ) t1 where logid=#{id}]]>
</select>
<select id="selectById" resultMap="SysAuthLogResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.AUTHCODE, t1.AUTHTIME, t1.DOMAIN, t1.IPADDR, t1.LOGID, t1.MACADDR, t1.PERSONNAME, t1.USERAGENT, t1.USERNAME FROM IBZAUTHLOG t1 ) t1 where logid=#{id}]]>
......@@ -16,6 +16,7 @@
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="SysAuthLogResultMap" type="cn.ibizlab.core.uaa.domain.SysAuthLog" autoMapping="true">
<id property="logid" column="logid" /><!--主键字段映射-->
<result property="domain" column="domains" />
</resultMap>
......@@ -37,7 +38,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.AUTHCODE, t1.AUTHTIME, t1.DOMAIN, t1.DOMAINS, t1.IPADDR, t1.LOGID, t1.MACADDR, t1.PERSONNAME, t1.USERAGENT, t1.USERNAME FROM IBZAUTHLOG t1
<![CDATA[ SELECT t1.AUTHCODE, t1.AUTHTIME, t1.DOMAINS, t1.IPADDR, t1.LOGID, t1.MACADDR, t1.PERSONNAME, t1.USERAGENT, t1.USERNAME FROM IBZAUTHLOG t1
]]>
</sql>
<!--数据查询[Default]-->
......@@ -52,7 +53,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.AUTHCODE, t1.AUTHTIME, t1.DOMAIN, t1.DOMAINS, t1.IPADDR, t1.LOGID, t1.MACADDR, t1.PERSONNAME, t1.USERAGENT, t1.USERNAME FROM IBZAUTHLOG t1
<![CDATA[ SELECT t1.AUTHCODE, t1.AUTHTIME, t1.DOMAINS, t1.IPADDR, t1.LOGID, t1.MACADDR, t1.PERSONNAME, t1.USERAGENT, t1.USERNAME FROM IBZAUTHLOG t1
]]>
</sql>
<!--数据查询[View]-->
......
ibzuaa-core/src/main/resources/sysmodel/ibzuaa.json
浏览文件 @ 475fdaa3
......@@ -209,22 +209,8 @@
"major_field":0
},
{
"fieldname":"DOMAIN" ,
"codename":"Domain",
"field_logic_name":"域",
"entity_name":"SYS_AUTHLOG",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":4,
"major_field":0
},
{
"fieldname":"DOMAINS" ,
"codename":"Domains",
"codename":"Domain",
"field_logic_name":"域",
"entity_name":"SYS_AUTHLOG",
"field_type":"TEXT",
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysAuthLogDTO.java
浏览文件 @ 475fdaa3
......@@ -63,7 +63,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
private String personname;
/**
* 属性 [DOMAIN]
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domain")
......@@ -72,16 +72,6 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
@ApiModelProperty("域")
private String domain;
/**
* 属性 [DOMAINS]
*
*/
@JSONField(name = "domains")
@JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("域")
private String domains;
/**
* 属性 [AUTHTIME]
*
......@@ -150,19 +140,11 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
}
/**
* 设置 [DOMAIN]
* 设置 [DOMAINS]
*/
public void setDomain(String domain){
this.domain = domain ;
this.modify("domain",domain);
}
/**
* 设置 [DOMAINS]
*/
public void setDomains(String domains){
this.domains = domains ;
this.modify("domains",domains);
this.modify("domains",domain);
}
/**
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或