pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-02-06 10:35:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

【springboot3分支 issues/7353】The bean 'dataSource', defined in class path resource #7353

Browse Source
This commit is contained in:
JEECG
2024-10-19 19:30:05 +08:00
parent 6d432bc186
commit 79f7134bd5
12 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/common/common.macro.ftl
View File

@ -84,7 +84,7 @@
<#-- login user -->
<li class="dropdown">
<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
${I18n.system_welcome} ${Request["XXL_JOB_LOGIN_IDENTITY"].username}
${I18n.system_welcome} ${XXL_JOB_LOGIN_IDENTITY.username}
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
@ -137,7 +137,7 @@
<li class="nav-click <#if pageName == "index">active</#if>" ><a href="${request.contextPath}/"><i class="fa fa-circle-o text-aqua"></i><span>${I18n.job_dashboard_name}</span></a></li>
<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-yellow"></i><span>${I18n.jobinfo_name}</span></a></li>
<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-green"></i><span>${I18n.joblog_name}</span></a></li>
<#if Request["XXL_JOB_LOGIN_IDENTITY"].role == 1>
<#if XXL_JOB_LOGIN_IDENTITY.role == 1>
<li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-red"></i><span>${I18n.jobgroup_name}</span></a></li>
<li class="nav-click <#if pageName == "user">active</#if>" ><a href="${request.contextPath}/user"><i class="fa fa-circle-o text-purple"></i><span>${I18n.user_manage}</span></a></li>
</#if>

2
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/joblog/joblog.index.ftl
View File

@ -30,7 +30,7 @@
<div class="input-group">
<span class="input-group-addon">${I18n.jobinfo_field_jobgroup}</span>
<select class="form-control" id="jobGroup" paramVal="<#if jobInfo?exists>${jobInfo.jobGroup}</#if>" >
<#if Request["XXL_JOB_LOGIN_IDENTITY"].role == 1>
<#if XXL_JOB_LOGIN_IDENTITY.role == 1>
<option value="0" >${I18n.system_all}</option> <#-- 仅管理员支持查询全部；普通用户仅支持查询有权限的 jobGroup -->
</#if>
<#list JobGroupList as group>