Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理BUG

Browse Source
This commit is contained in:
wanggeng 2022-01-25 16:47:01 +08:00
parent 8d5d8766e1
commit 79c6c469a4
7 changed files with 234 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/dtos/OAuth2ClientDTO.java
View File

@ -43,6 +43,8 @@ public class OAuth2ClientDTO extends OAuth2ClientSimpleDTO {
private String expireTime; private String expireTime;
@ApiModelProperty(name = "gmtCreate", value = "创建时间") @ApiModelProperty(name = "gmtCreate", value = "创建时间")
private String gmtCreate; private String gmtCreate;
@ApiModelProperty(name = "sort", value = "排序")
private Double sort;
public String getResourceIds() { public String getResourceIds() {
return resourceIds == null ? "" : resourceIds.trim(); return resourceIds == null ? "" : resourceIds.trim();
@ -166,40 +168,12 @@ public class OAuth2ClientDTO extends OAuth2ClientSimpleDTO {
this.gmtCreate = gmtCreate; this.gmtCreate = gmtCreate;
} }
@Override public Double getSort() {
public String toString() { return sort == null ? 0 : sort;
final StringBuilder sb = new StringBuilder("{");
sb.append("\"resourceIds\":")
.append("\"").append(resourceIds).append("\"");
sb.append(",\"clientSecret\":")
.append("\"").append(clientSecret).append("\"");
sb.append(",\"scope\":")
.append("\"").append(scope).append("\"");
sb.append(",\"authorizedGrantTypes\":")
.append("\"").append(authorizedGrantTypes).append("\"");
sb.append(",\"authorities\":")
.append("\"").append(authorities).append("\"");
sb.append(",\"accessTokenValidity\":")
.append(accessTokenValidity);
sb.append(",\"refreshTokenValidity\":")
.append(refreshTokenValidity);
sb.append(",\"additionalInformation\":")
.append("\"").append(additionalInformation).append("\"");
sb.append(",\"autoapprove\":")
.append("\"").append(autoapprove).append("\"");
sb.append(",\"menuId\":")
.append("\"").append(menuId).append("\"");
sb.append(",\"menuName\":")
.append("\"").append(menuName).append("\"");
sb.append(",\"systemType\":")
.append("\"").append(systemType).append("\"");
sb.append(",\"systemState\":")
.append("\"").append(systemState).append("\"");
sb.append(",\"expireTime\":")
.append("\"").append(expireTime).append("\"");
sb.append(",\"gmtCreate\":")
.append("\"").append(gmtCreate).append("\"");
sb.append('}');
return sb.toString();
} }
public void setSort(Double sort) {
this.sort = sort;
}
} }

9
login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/pos/OAuth2ClientPO.java
View File

@ -31,6 +31,7 @@ public class OAuth2ClientPO implements Serializable{
private String expireTime; private String expireTime;
private String systemSummary; private String systemSummary;
private String systemIcon; private String systemIcon;
private Double sort;
private String gmtCreate; private String gmtCreate;
private String creator; private String creator;
private String gmtModified; private String gmtModified;
@ -189,6 +190,14 @@ public class OAuth2ClientPO implements Serializable{
this.systemIcon = systemIcon; this.systemIcon = systemIcon;
} }
public Double getSort() {
return sort == null ? 0 : sort;
}
public void setSort(Double sort) {
this.sort = sort;
}
public String getGmtCreate() { public String getGmtCreate() {
return gmtCreate == null ? "" : gmtCreate.trim(); return gmtCreate == null ? "" : gmtCreate.trim();
} }

10
login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/vos/OAuth2ClientVO.java
View File

@ -61,6 +61,8 @@ public class OAuth2ClientVO {
private String systemSummary; private String systemSummary;
@ApiModelProperty(name = "systemIcon", value = "系统图标") @ApiModelProperty(name = "systemIcon", value = "系统图标")
private String systemIcon; private String systemIcon;
@ApiModelProperty(name = "sort", value = "排序")
private Double sort;
public String getClientId() { public String getClientId() {
return clientId == null ? "" : clientId.trim(); return clientId == null ? "" : clientId.trim();
@ -205,4 +207,12 @@ public class OAuth2ClientVO {
public void setSystemIcon(String systemIcon) { public void setSystemIcon(String systemIcon) {
this.systemIcon = systemIcon; this.systemIcon = systemIcon;
} }
public Double getSort() {
return sort == null ? 0D : sort;
}
public void setSort(Double sort) {
this.sort = sort;
}
} }

37
login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml
View File

@ -32,6 +32,7 @@
<result property="expireTime" column="expire_time"/> <result property="expireTime" column="expire_time"/>
<result property="systemSummary" column="system_summary"/> <result property="systemSummary" column="system_summary"/>
<result property="systemIcon" column="system_icon"/> <result property="systemIcon" column="system_icon"/>
<result property="sort" column="sort"/>
<result property="menuId" column="menu_id"/> <result property="menuId" column="menu_id"/>
</resultMap> </resultMap>
@ -56,6 +57,7 @@
<result property="expireTime" column="expire_time"/> <result property="expireTime" column="expire_time"/>
<result property="systemSummary" column="system_summary"/> <result property="systemSummary" column="system_summary"/>
<result property="systemIcon" column="system_icon"/> <result property="systemIcon" column="system_icon"/>
<result property="sort" column="sort"/>
<result property="gmtCreate" column="gmt_create"/> <result property="gmtCreate" column="gmt_create"/>
<result property="creator" column="creator"/> <result property="creator" column="creator"/>
<result property="gmtModified" column="gmt_create"/> <result property="gmtModified" column="gmt_create"/>
@ -85,6 +87,7 @@
`expire_time` varchar(10) DEFAULT NULL COMMENT '系统到期时间', `expire_time` varchar(10) DEFAULT NULL COMMENT '系统到期时间',
`system_summary` text COMMENT '系统介绍', `system_summary` text COMMENT '系统介绍',
`system_icon` varchar(255) DEFAULT NULL COMMENT '系统图标', `system_icon` varchar(255) DEFAULT NULL COMMENT '系统图标',
`sort` double(11, 4) DEFAULT NULL COMMENT '排序',
`gmt_create` datetime DEFAULT NULL, `gmt_create` datetime DEFAULT NULL,
`creator` char(36) DEFAULT NULL, `creator` char(36) DEFAULT NULL,
`gmt_modified` datetime DEFAULT NULL, `gmt_modified` datetime DEFAULT NULL,
@ -115,6 +118,7 @@
expire_time, expire_time,
system_summary, system_summary,
system_icon, system_icon,
sort,
creator, creator,
gmt_create, gmt_create,
modifier, modifier,
@ -134,11 +138,12 @@
#{additionalInformation}, #{additionalInformation},
#{autoapprove}, #{autoapprove},
#{environment}, #{environment},
#{system_type}, #{systemType},
#{system_state}, #{systemState},
#{expire_time}, #{expireTime},
#{system_summary}, #{systemSummary},
#{system_icon}, #{systemIcon},
#{sort},
#{creator}, #{creator},
#{gmtCreate}, #{gmtCreate},
#{modifier}, #{modifier},
@ -217,6 +222,9 @@
</if> </if>
<if test="systemIcon != null"> <if test="systemIcon != null">
system_icon = #{systemIcon}, system_icon = #{systemIcon},
</if>
<if test="sort != null">
sort = #{sort},
</if> </if>
modifier = #{modifier}, modifier = #{modifier},
gmt_modified = #{gmtModified} gmt_modified = #{gmtModified}
@ -282,7 +290,7 @@
</when> </when>
<otherwise> <otherwise>
ORDER BY ORDER BY
t1.gmt_create desc t1.sort
</otherwise> </otherwise>
</choose> </choose>
</select> </select>
@ -312,6 +320,21 @@
#{menuIds[${index}]} #{menuIds[${index}]}
</foreach> </foreach>
</if> </if>
<choose>
<when test="sort != null and (sort == 'clientId' or sort == 'clientName')">
ORDER BY
<if test="sort == 'clientId'">
t1.client_id ${order}
</if>
<if test="sort == 'clientName'">
t1.client_name ${order}
</if>
</when>
<otherwise>
ORDER BY
t1.sort
</otherwise>
</choose>
</select> </select>
<!-- Oauth客户端详情 --> <!-- Oauth客户端详情 -->
@ -334,6 +357,7 @@
t1.expire_time, t1.expire_time,
t1.system_summary, t1.system_summary,
t1.system_icon, t1.system_icon,
t1.sort,
t2.menu_id, t2.menu_id,
t2.menu_name t2.menu_name
FROM FROM
@ -383,6 +407,7 @@
t1.expire_time, t1.expire_time,
t1.system_summary, t1.system_summary,
t1.system_icon, t1.system_icon,
t1.sort,
t1.menu_id, t1.menu_id,
t1.gmt_create, t1.gmt_create,
t1.creator, t1.creator,

132
login-oauth2-server/src/main/resources/templates/oauth2client/save.html
View File

@ -50,16 +50,22 @@
<input type="text" name="webServerRedirectUri" lay-verify="required|url" placeholder="请输入重定向链接" class="layui-input"> <input type="text" name="webServerRedirectUri" lay-verify="required|url" placeholder="请输入重定向链接" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-row">
<label class="layui-form-label">访问令牌时效 *</label> <div class="layui-col-sm6 layui-col-xs6">
<div class="layui-input-block"> <div class="layui-form-item">
<input type="number" name="accessTokenValidity" lay-verify="required|number" placeholder="请输入访问令牌时效" class="layui-input"> <label class="layui-form-label">访问令牌时效 *</label>
<div class="layui-input-block">
<input type="number" name="accessTokenValidity" lay-verify="required|number" placeholder="请输入访问令牌时效" class="layui-input">
</div>
</div>
</div> </div>
</div> <div class="layui-col-sm6 layui-col-xs6">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">令牌刷新时效 *</label> <label class="layui-form-label">令牌刷新时效 *</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" name="refreshTokenValidity" lay-verify="required|number" placeholder="请输入刷新令牌时效" class="layui-input"> <input type="number" name="refreshTokenValidity" lay-verify="required|number" placeholder="请输入刷新令牌时效" class="layui-input">
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-form-item" pane>
@ -72,52 +78,82 @@
<input type="checkbox" name="authorizedGrantTypes[refresh_token]" title="刷新" checked> <input type="checkbox" name="authorizedGrantTypes[refresh_token]" title="刷新" checked>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">授权范围 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item" pane>
<input type="radio" name="scope" value="all" title="全部" checked> <label class="layui-form-label">授权范围 *</label>
<input type="radio" name="scope" value="read" title="只读"> <div class="layui-input-block">
<input type="radio" name="scope" value="write" title="只写"> <input type="radio" name="scope" value="all" title="全部" checked>
<input type="radio" name="scope" value="read" title="只读">
<input type="radio" name="scope" value="write" title="只写">
</div>
</div>
</div>
<div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item" pane>
<label class="layui-form-label">授权权限 *</label>
<div class="layui-input-block">
<input type="radio" name="authorities" value="all" title="全部" checked>
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">授权权限 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item" pane>
<input type="radio" name="authorities" value="all" title="全部" checked> <label class="layui-form-label">自动授权 *</label>
<div class="layui-input-block">
<input type="radio" name="autoapprove" value="true" title="启用" checked>
<input type="radio" name="autoapprove" value="false" title="关闭">
</div>
</div>
</div>
<div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item" pane>
<label class="layui-form-label">环境类型 *</label>
<div class="layui-input-block">
<input type="radio" name="environment" value="formal" title="正式环境" checked>
<input type="radio" name="environment" value="test" title="测试环境">
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">自动授权 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item" pane>
<input type="radio" name="autoapprove" value="true" title="启用" checked> <label class="layui-form-label">系统类型 *</label>
<input type="radio" name="autoapprove" value="false" title="关闭"> <div class="layui-input-block">
<input type="radio" name="systemType" value="within" title="体系内系统" checked lay-filter="systemTypeFilter">
<input type="radio" name="systemType" value="third" title="第三方系统" lay-filter="systemTypeFilter">
</div>
</div>
</div>
<div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
<input type="number" class="layui-input" id="sort" name="sort" step="0.0001" placeholder="请输入排序">
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">环境类型 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item third-info" pane>
<input type="radio" name="environment" value="formal" title="正式环境" checked> <label class="layui-form-label">系统状态 *</label>
<input type="radio" name="environment" value="test" title="测试环境"> <div class="layui-input-block">
<input type="radio" name="systemState" value="normal" title="正常" checked>
<input type="radio" name="systemState" value="locking" title="锁定">
</div>
</div>
</div> </div>
</div> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item" pane> <div class="layui-form-item third-info">
<label class="layui-form-label">系统类型 *</label> <label class="layui-form-label">系统到期时间 *</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="radio" name="systemType" value="within" title="体系内系统" checked lay-filter="systemTypeFilter"> <input type="text" class="layui-input" id="expireTime" name="expireTime" placeholder="请选择系统到期时间">
<input type="radio" name="systemType" value="third" title="第三方系统" lay-filter="systemTypeFilter"> </div>
</div> </div>
</div>
<div class="layui-form-item third-info" pane>
<label class="layui-form-label">系统状态 *</label>
<div class="layui-input-block">
<input type="radio" name="systemState" value="normal" title="正常" checked>
<input type="radio" name="systemState" value="locking" title="锁定">
</div>
</div>
<div class="layui-form-item third-info">
<label class="layui-form-label">系统到期时间 *</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="expireTime" name="expireTime" placeholder="请选择系统到期时间">
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">

138
login-oauth2-server/src/main/resources/templates/oauth2client/update.html
View File

@ -50,16 +50,22 @@
<input type="text" name="webServerRedirectUri" lay-verify="required|url" placeholder="请输入重定向链接" class="layui-input"> <input type="text" name="webServerRedirectUri" lay-verify="required|url" placeholder="请输入重定向链接" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-row">
<label class="layui-form-label">访问令牌时效 *</label> <div class="layui-col-sm6 layui-col-xs6">
<div class="layui-input-block"> <div class="layui-form-item">
<input type="number" name="accessTokenValidity" lay-verify="required|number" placeholder="请输入访问令牌时效" class="layui-input"> <label class="layui-form-label">访问令牌时效 *</label>
<div class="layui-input-block">
<input type="number" name="accessTokenValidity" lay-verify="required|number" placeholder="请输入访问令牌时效" class="layui-input">
</div>
</div>
</div> </div>
</div> <div class="layui-col-sm6 layui-col-xs6">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">令牌刷新时效 *</label> <label class="layui-form-label">令牌刷新时效 *</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" name="refreshTokenValidity" lay-verify="required|number" placeholder="请输入刷新令牌时效" class="layui-input"> <input type="number" name="refreshTokenValidity" lay-verify="required|number" placeholder="请输入刷新令牌时效" class="layui-input">
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-form-item" pane>
@ -67,57 +73,87 @@
<div class="layui-input-block"> <div class="layui-input-block">
<input type="checkbox" name="authorizedGrantTypes[authorization_code]" title="授权码模式" checked> <input type="checkbox" name="authorizedGrantTypes[authorization_code]" title="授权码模式" checked>
<input type="checkbox" name="authorizedGrantTypes[password]" title="密码模式"> <input type="checkbox" name="authorizedGrantTypes[password]" title="密码模式">
<input type="checkbox" name="authorizedGrantTypes[client_credentials]" title="客户端模式"> <input type="checkbox" name="authorizedGrantTypes[client_credentials]" title="客户端模式" checked>
<input type="checkbox" name="authorizedGrantTypes[implicit]" title="简单模式"> <input type="checkbox" name="authorizedGrantTypes[implicit]" title="简单模式">
<input type="checkbox" name="authorizedGrantTypes[refresh_token]" title="刷新"> <input type="checkbox" name="authorizedGrantTypes[refresh_token]" title="刷新" checked>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">授权范围 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item" pane>
<input type="radio" name="scope" value="all" title="全部" checked> <label class="layui-form-label">授权范围 *</label>
<input type="radio" name="scope" value="read" title="只读"> <div class="layui-input-block">
<input type="radio" name="scope" value="write" title="只写"> <input type="radio" name="scope" value="all" title="全部" checked>
<input type="radio" name="scope" value="read" title="只读">
<input type="radio" name="scope" value="write" title="只写">
</div>
</div>
</div>
<div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item" pane>
<label class="layui-form-label">授权权限 *</label>
<div class="layui-input-block">
<input type="radio" name="authorities" value="all" title="全部" checked>
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">授权权限 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item" pane>
<input type="radio" name="authorities" value="all" title="全部" checked> <label class="layui-form-label">自动授权 *</label>
<div class="layui-input-block">
<input type="radio" name="autoapprove" value="true" title="启用" checked>
<input type="radio" name="autoapprove" value="false" title="关闭">
</div>
</div>
</div>
<div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item" pane>
<label class="layui-form-label">环境类型 *</label>
<div class="layui-input-block">
<input type="radio" name="environment" value="formal" title="正式环境" checked>
<input type="radio" name="environment" value="test" title="测试环境">
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">自动授权 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item" pane>
<input type="radio" name="autoapprove" value="true" title="启用" checked> <label class="layui-form-label">系统类型 *</label>
<input type="radio" name="autoapprove" value="false" title="关闭"> <div class="layui-input-block">
<input type="radio" name="systemType" value="within" title="体系内系统" checked lay-filter="systemTypeFilter">
<input type="radio" name="systemType" value="third" title="第三方系统" lay-filter="systemTypeFilter">
</div>
</div>
</div>
<div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
<input type="number" class="layui-input" id="sort" name="sort" step="0.0001" placeholder="请输入排序">
</div>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-row">
<label class="layui-form-label">环境类型 *</label> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-input-block"> <div class="layui-form-item third-info" pane>
<input type="radio" name="environment" value="formal" title="正式环境" checked> <label class="layui-form-label">系统状态 *</label>
<input type="radio" name="environment" value="test" title="测试环境"> <div class="layui-input-block">
<input type="radio" name="systemState" value="normal" title="正常" checked>
<input type="radio" name="systemState" value="locking" title="锁定">
</div>
</div>
</div> </div>
</div> <div class="layui-col-sm6 layui-col-xs12">
<div class="layui-form-item" pane> <div class="layui-form-item third-info">
<label class="layui-form-label">系统类型 *</label> <label class="layui-form-label">系统到期时间 *</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="radio" name="systemType" value="within" title="体系内系统" checked lay-filter="systemTypeFilter"> <input type="text" class="layui-input" id="expireTime" name="expireTime" placeholder="请选择系统到期时间">
<input type="radio" name="systemType" value="third" title="第三方系统" lay-filter="systemTypeFilter"> </div>
</div> </div>
</div>
<div class="layui-form-item third-info" pane>
<label class="layui-form-label">系统状态 *</label>
<div class="layui-input-block">
<input type="radio" name="systemState" value="normal" title="正常" checked>
<input type="radio" name="systemState" value="locking" title="锁定">
</div>
</div>
<div class="layui-form-item third-info">
<label class="layui-form-label">系统到期时间 *</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="expireTime" name="expireTime" placeholder="请选择系统到期时间">
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">
@ -156,7 +192,6 @@
</script> </script>
</div> </div>
</div> </div>
<div class="layui-form-item layui-layout-admin"> <div class="layui-form-item layui-layout-admin">
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-footer" style="left: 0;"> <div class="layui-footer" style="left: 0;">
@ -303,6 +338,7 @@
expireTime: data.expireTime, expireTime: data.expireTime,
systemSummary: data.systemSummary, systemSummary: data.systemSummary,
systemIcon: data.systemIcon, systemIcon: data.systemIcon,
sort: data.sort
}); });
var authorizedGrantTypes = data.authorizedGrantTypes.split(','); var authorizedGrantTypes = data.authorizedGrantTypes.split(',');
var formObj = {}; var formObj = {};

4
module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml
View File

@ -146,6 +146,10 @@
AND AND
grid_group_id = #{gridGroupId} grid_group_id = #{gridGroupId}
</if> </if>
<if test="gridGroupCode != null and gridGroupCode != ''">
AND
grid_group_code = #{gridGroupCode}
</if>
</select> </select>
<!-- 网格组列表 --> <!-- 网格组列表 -->