Merge branch 'dev'

This commit is contained in:
mjt
2024-01-24 13:29:06 +08:00
4 changed files with 1705 additions and 1613 deletions
File diff suppressed because it is too large Load Diff
@@ -10,7 +10,27 @@
<#include "/common_js.ftl" />
<script type="text/javascript">
</script>
<#-- 将表头固定-->
<style>
table {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
}
th, td {
border: 1px solid #dddddd;
text-align: left;
padding: 8px;
}
th {
position: sticky;
top: 0;
background-color: #f2f2f2;
}
</style>
</head>
<body>
@@ -31,12 +51,13 @@
<div class="list">
<table width="50%">
<thead>
<tr>Ap
<tr>
API数量:&nbsp<b>${authorityBoList?size}</b>个
<th align="center" width="15%">
uri
</th>
<th align="center" width="15%">
描述
API名称
</th>
<th align="center" width="10%">
是否有权限<input type="checkbox" id="auth" >全选</input>
@@ -63,7 +84,7 @@
${bo.uri!}
</td>
<td align="center">
${bo.description!}
${bo.name!}
</td>
<td align="center">
<input type="checkbox" <#if bo.hasAuth>checked </#if> id="auth_${bo_index + 1}" ></input>
@@ -1,150 +1,179 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>api用户列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}" />
<#include "/common_js.ftl" />
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">用户列表</a><a href="add" class="create">新建用户</a>
</div>
<hr/>
<div class="list">
<div style="padding-left:5px;">
共有用户<b>${apiUserBoList?size}</b>个
</div>
<table width="100%">
<thead>
<tr>
<th align="center" width="55px">
ID
</th>
<th align="center" width="100px">
昵称
</th>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>api用户列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<#include "/common_js.ftl" />
<#-- 将表头固定-->
<style>
table {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
}
th, td {
border: 1px solid #dddddd;
text-align: left;
padding: 8px;
}
th {
position: sticky;
top: 0;
background-color: #f2f2f2;
}
.resizable-td {
resize: horizontal; /* 允许水平调整大小 */
overflow: auto; /* 显示滚动条以便查看超出部分 */
min-width: 50px; /* 设置最小宽度,防止过于缩小 */
}
</style>
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">用户列表</a><a href="add" class="create">新建用户</a>
</div>
<hr/>
<div class="list">
<div style="padding-left:5px;">
共有用户<b>${apiUserBoList?size}</b>个
</div>
<table width="100%">
<thead>
<tr>
<th align="center" width="55px">
ID
</th>
<th align="center" width="100px">
昵称
</th>
<th align="center" width="60px">
账户用途
</th>
<th align="center" width="100px">
username
</th>
<th align="center" width="60px">
password
</th>
<th align="center" width="100px">
username
</th>
<th align="center" width="60px">
password
</th>
<th align="center" width="100px">
销售负责人
</th>
<th align="center" width="100px">
公司
</th>
<th align="center" width="550px">
appKey
</th>
<th align="center" width="150px">
appKey
</th>
<th align="center" width="60px">
账户类型
</th>
<th align="center" width="60px">
账户用途
</th>
<th align="center" width="60px">
是否监控
</th>
<th align="center" width="60px">
是否监控
</th>
<th align="center" width="120px">
到期时间
</th>
<th align="center">
操作
</th>
</tr>
</thead>
<#if (apiUserBoList??&&apiUserBoList?size>0)>
<#list apiUserBoList as bo>
<tr <#if bo.status!=0>style="background-color:#C3C3C3"</#if>>
<td align="center">
${bo.userId!}
</td>
<td align="center">
<a href="../apiUser/edit?userId=${bo.userId!}">${bo.displayName!}</a>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td align="center">
${bo.userName!}
</td>
<td align="center">
<#if bo.password?? && bo.password == t_util.md5Hex('123456')>
初始密码
<#else>
******
</#if>
</td>
<td align="center">
${bo.manager!}
</td>
<td align="center">
${bo.company!}
</td>
<td align="center">
${bo.appKey!}
</td>
<td align="center">
<#if bo.isTest==0>
正式账户
<#else>
测试账户
</#if>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td>
<#if bo.isMonitor==1>
是
<#else>
否
</#if>
</td>
<td align="center">
<#if bo.deadTime??>
${bo.deadTime?string("yyyy年MM月dd日")}
</#if>
</td>
<td align="center">
<a href="../apiUser/auth?userId=${bo.userId!}">权限控制</a>
<a href="../apiUser/city?userId=${bo.userId!}">城市管理</a>
<a href="../apiUser/priceRating?userId=${bo.userId!}">价格评级</a>
<#if bo.status==0>
<a href="javascript:if(confirm('确认禁用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=1'}">禁用</a>
<#else>
<a href="javascript:if(confirm('确认再次启用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=0'}"><font style="color:#198B3D;">再启用</font></a>
</#if>
</td>
</tr>
</#list>
</#if>
</table>
</div>
</div>
</body>
</html>
<th align="center">
操作
</th>
</tr>
</thead>
<#if (apiUserBoList??&&apiUserBoList?size>0)>
<#list apiUserBoList as bo>
<tr <#if bo.status!=0>style="background-color:#C3C3C3"</#if>>
<td align="center">
${bo.userId!}
</td>
<td align="center">
<a href="../apiUser/edit?userId=${bo.userId!}">${bo.displayName!}</a>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td align="center">
${bo.userName!}
</td>
<td align="center">
<#if bo.password?? && bo.password == t_util.md5Hex('123456')>
初始密码
<#else>
******
</#if>
</td>
<td align="center">
${bo.manager!}
</td>
<td align="center">
${bo.company!}
</td>
<td align="center" class="resizable-td">
${bo.appKey!}
</td>
<td align="center">
<#if bo.isTest==0>
正式账户
<#else>
测试账户
</#if>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td>
<#if bo.isMonitor==1>
是
<#else>
否
</#if>
</td>
<td align="center">
<#if bo.deadTime??>
${bo.deadTime?string("yyyy年MM月dd日")}
</#if>
</td>
<td align="center">
<a href="../apiUser/auth?userId=${bo.userId!}">API权限控制</a>
<a href="../apiUser/auth?userId=${bo.userId!}&msg=0">新增API</a>
<a href="../apiUser/city?userId=${bo.userId!}">城市管理</a>
<a href="../apiUser/priceRating?userId=${bo.userId!}">价格评级</a>
<#if bo.status==0>
<a href="javascript:if(confirm('确认禁用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=1'}">禁用</a>
<#else>
<a href="javascript:if(confirm('确认再次启用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=0'}"><font
style="color:#198B3D;">再启用</font></a>
</#if>
</td>
</tr>
</#list>
</#if>
</table>
</div>
</div>
</body>
</html>
</#compress>
@@ -8,6 +8,25 @@
.up {color: green;}
#spinner{width:500px;height:100px;margin:30px 0 0 100px;text-align:center;padding-top:50px;border:2px solid #CCC;}
#checkMsg{width:500px;margin:30px 0 0 100px;padding:10px 0 10px 50px;text-align:left;border:2px solid #CCC;}
<#-- 将表头固定-->
table {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
}
th, td {
border: 1px solid #dddddd;
text-align: left;
padding: 8px;
}
th {
position: sticky;
top: 0;
background-color: #f2f2f2;
}
</style>
</head>
<body>