From 018570ad9784d7fa9521a9a468ed8c98f648ebe7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 01 八月 2020 17:11:59 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/common/web/AuthController.java | 4 ++
src/main/java/com/zy/common/properties/SystemProperties.java | 2
src/main/webapp/views/index.html | 79 +++++++++++++++++++++++++--------------
src/main/webapp/static/layuiadmin/lib/admin.js | 6 ++-
4 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 5220938..f7855ca 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -61,7 +61,7 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String timeStr = "2020-08-01 16:48:35";
+ String timeStr = "2020-08-01 17:48:35";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
System.out.println("婵�娲荤爜锛�"+code);
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index fd37885..c2866e6 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -123,6 +123,10 @@
if (getUserId() == 9527) {
resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
} else {
+ // 婵�娲荤爜楠岃瘉
+ if (!SystemProperties.SYSTEM_ACTIVATION) {
+ return R.ok();
+ }
// 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗�
user = userService.selectById(getUserId());
List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
diff --git a/src/main/webapp/static/layuiadmin/lib/admin.js b/src/main/webapp/static/layuiadmin/lib/admin.js
index 1f8af78..0e69e9e 100644
--- a/src/main/webapp/static/layuiadmin/lib/admin.js
+++ b/src/main/webapp/static/layuiadmin/lib/admin.js
@@ -431,8 +431,10 @@
method: 'POST',
success: function (res) {
if (res.code === 200) {
- layer.msg(res.msg);
- layer.close(index);
+ alert("婵�娲绘垚鍔�");
+ location.reload();
+ // layer.msg(res.msg);
+ // layer.close(index);
} else if (res.code === 403) {
top.location.href = baseUrl+"/login";
} else {
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 6e76ec1..5dc0dc2 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -81,7 +81,7 @@
</a>
</li>
<li class="layui-nav-item layui-hide-xs" lay-unselect>
- <a href="javascript:;" layadmin-event="note">
+ <a id="activation-icon" href="javascript:;" layadmin-event="note">
<i class="layui-icon layui-icon-note"></i>
</a>
</li>
@@ -174,37 +174,23 @@
if ("" === localStorage.getItem('token')){
top.location.href = baseUrl+"/login";
}
+
+ // 婵�娲荤爜楠岃瘉
$.ajax({
- url: baseUrl+ "/menu/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- var menuHtml = "";
- if (res.data != null){
- for (var i = 0; i < res.data.length; i++) {
- menuHtml += '<li data-name="' + res.data[i].menuCode +'" class="layui-nav-item">\n';
- menuHtml += '<a href="javascript:;" lay-tips=' +res.data[i].menu+ ' lay-direction="2">\n';
- menuHtml += '<i class="layui-icon '+ res.data[i].menuIcon +'"></i>\n';
- menuHtml += ' <cite>' +res.data[i].menu+ '</cite>\n';
- menuHtml += '</a>\n';
- menuHtml += '<dl class="layui-nav-child">\n';
- for (var j = 0; j < res.data[i].subMenu.length; j++) {
- menuHtml += '<dd><a lay-href="' +res.data[i].subMenu[j].code+ '?resourceId='+ res.data[i].subMenu[j].id + '">' + res.data[i].subMenu[j].name + '</a></dd>\n';
- }
- menuHtml += '</dl>\n';
- menuHtml += '</li>\n';
- }
- }
- $('#LAY-system-side-menu').append(menuHtml);
- element.init();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/login";
- }else {
- layer.alert(res.msg)
- }
+ url: baseUrl+"/system/activation/auth",
+ dataType:'json',
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ $("#activation-icon").hide();
+ } else {
+ $("#activation-icon").click();
}
+ }
});
+
+ getMenu()
// 娉ㄩ攢
$(document).on('click','#logout',function () {
@@ -212,6 +198,41 @@
});
});
+
+ // 鍔犺浇鑿滃崟
+ function getMenu() {
+ $.ajax({
+ url: baseUrl+ "/menu/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var menuHtml = "";
+ if (res.data != null){
+ for (var i = 0; i < res.data.length; i++) {
+ menuHtml += '<li data-name="' + res.data[i].menuCode +'" class="layui-nav-item">\n';
+ menuHtml += '<a href="javascript:;" lay-tips=' +res.data[i].menu+ ' lay-direction="2">\n';
+ menuHtml += '<i class="layui-icon '+ res.data[i].menuIcon +'"></i>\n';
+ menuHtml += ' <cite>' +res.data[i].menu+ '</cite>\n';
+ menuHtml += '</a>\n';
+ menuHtml += '<dl class="layui-nav-child">\n';
+ for (var j = 0; j < res.data[i].subMenu.length; j++) {
+ menuHtml += '<dd><a lay-href="' +res.data[i].subMenu[j].code+ '?resourceId='+ res.data[i].subMenu[j].id + '">' + res.data[i].subMenu[j].name + '</a></dd>\n';
+ }
+ menuHtml += '</dl>\n';
+ menuHtml += '</li>\n';
+ }
+ }
+ $('#LAY-system-side-menu').append(menuHtml);
+ element.init();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ }else {
+ layer.alert(res.msg)
+ }
+ }
+ });
+ }
});
</script>
</body>
--
Gitblit v1.9.1