public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 20:50:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

SessionManager and UI Fix

Browse Source
This commit is contained in:
MaxKey
2022-05-22 19:52:29 +08:00
parent f22e71c1ef
commit 853f45a315
52 changed files with 1168 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java
View File

@@ -143,6 +143,7 @@ public class AccountsService extends JpaBaseService<Accounts>{
account.setRelatedUsername(generateAccount(user,strategy));
account.setRelatedPassword(PasswordReciprocal.getInstance().encode(userInfoService.randomPassword()));
account.setInstId(strategy.getInstId());
account.setCreateType("automatic");
account.setStatus(ConstsStatus.ACTIVE);
account.setStrategyId(strategy.getId());

14
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml
View File

@@ -22,8 +22,10 @@
select
gp.id,
gp.groupid,
g.name groupname,
gp.appid,
apps.name,
apps.name appname,
apps.icon,
apps.loginurl,
apps.protocol,
@@ -33,12 +35,18 @@
apps.vendorurl
from
mxk_apps apps,
mxk_group_privileges gp
mxk_group_privileges gp,
mxk_groups g
where
apps.instid = #{instId}
and gp.instid = #{instId}
and gp.appid = apps.id
and gp.groupid = #{groupId}
and g.instid = #{instId}
and gp.appid = apps.id
and gp.groupid = g.id
<if test="groupId != null and groupId != ''">
and gp.groupid = #{groupId}
and g.id = #{groupId}
</if>
<include refid="where_statement"/>
</select>

41
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml
View File

@@ -37,15 +37,40 @@
<!-- DAY HOUR COUNT 当天每小时 -->
<select id="analysisDayHour" parameterType="java.util.HashMap" resultType="Map">
select
count(id) reportcount,
hour(logintime) reportstring
from mxk_history_login
where instid = #{instId}
and date(logintime) =curdate()
group by reportstring
order by reportstring
select h.reportstring reportstring, ifnull(c.reportcount, 0) reportcount from (
select 0 reportstring union all
select 1 reportstring union all
select 2 reportstring union all
select 3 reportstring union all
select 4 reportstring union all
select 5 reportstring union all
select 6 reportstring union all
select 7 reportstring union all
select 8 reportstring union all
select 9 reportstring union all
select 10 reportstring union all
select 11 reportstring union all
select 12 reportstring union all
select 13 reportstring union all
select 14 reportstring union all
select 15 reportstring union all
select 16 reportstring union all
select 17 reportstring union all
select 18 reportstring union all
select 19 reportstring union all
select 20 reportstring union all
select 21 reportstring union all
select 22 reportstring union all
select 23 reportstring
) h left join(
select count(id) reportcount, hour(logintime) reportstring
from mxk_history_login
where instid = #{instId} and date(logintime) =curdate()
group by reportstring
)c on h.reportstring=c.reportstring
order by h.reportstring
</select>
<!-- 30 DAY COUNT 最近30天每天访问量-->
<select id="analysisMonth" parameterType="java.util.HashMap" resultType="Map">
select