Commit ba552566 by RuoYi

升级select2到最新版4.0.7

parent 661db117
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
<!-- select2下拉框插件 --> <!-- select2下拉框插件 -->
<div th:fragment="select2-css"> <div th:fragment="select2-css">
<link th:href="@{/ajax/libs/select/select2.css}" rel="stylesheet"/> <link th:href="@{/ajax/libs/select2/select2.min.css}" rel="stylesheet"/>
<link th:href="@{/ajax/libs/select/select2-bootstrap.css}" rel="stylesheet"/> <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet"/>
</div> </div>
<div th:fragment="select2-js"> <div th:fragment="select2-js">
<script th:src="@{/ajax/libs/select/select2.js}"></script> <script th:src="@{/ajax/libs/select2/select2.min.js}"></script>
</div> </div>
<!-- bootstrap-select下拉框插件 --> <!-- bootstrap-select下拉框插件 -->
......
...@@ -56,7 +56,8 @@ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO ...@@ -56,7 +56,8 @@ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO
} }
@Override @Override
public void update(Session session) throws UnknownSessionException { public void update(Session session) throws UnknownSessionException
{
super.update(session); super.update(session);
} }
...@@ -75,6 +76,7 @@ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO ...@@ -75,6 +76,7 @@ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO
// 时间差不足 无需同步 // 时间差不足 无需同步
needSync = false; needSync = false;
} }
// isGuest = true 访客
boolean isGuest = onlineSession.getUserId() == null || onlineSession.getUserId() == 0L; boolean isGuest = onlineSession.getUserId() == null || onlineSession.getUserId() == 0L;
// session 数据变更了 同步 // session 数据变更了 同步
...@@ -88,6 +90,7 @@ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO ...@@ -88,6 +90,7 @@ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO
return; return;
} }
} }
// 更新上次同步数据库时间
onlineSession.setAttribute(LAST_SYNC_DB_TIMESTAMP, onlineSession.getLastAccessTime()); onlineSession.setAttribute(LAST_SYNC_DB_TIMESTAMP, onlineSession.getLastAccessTime());
// 更新完后 重置标识 // 更新完后 重置标识
if (onlineSession.isAttributeChanged()) if (onlineSession.isAttributeChanged())
......
...@@ -79,16 +79,17 @@ public class GenController extends BaseController ...@@ -79,16 +79,17 @@ public class GenController extends BaseController
/** /**
* 生成zip文件 * 生成zip文件
*
* @param response * @param response
* @param data * @param data
* @throws IOException * @throws IOException
*/ */
private void genCode(HttpServletResponse response, byte[] data) throws IOException { private void genCode(HttpServletResponse response, byte[] data) throws IOException
{
response.reset(); response.reset();
response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
response.addHeader("Content-Length", "" + data.length); response.addHeader("Content-Length", "" + data.length);
response.setContentType("application/octet-stream; charset=UTF-8"); response.setContentType("application/octet-stream; charset=UTF-8");
IOUtils.write(data, response.getOutputStream()); IOUtils.write(data, response.getOutputStream());
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment