diff --git a/zyplayer-doc-core/pom.xml b/zyplayer-doc-core/pom.xml
index fb2758be..72be858d 100644
--- a/zyplayer-doc-core/pom.xml
+++ b/zyplayer-doc-core/pom.xml
@@ -14,6 +14,8 @@
UTF-8
UTF-8
1.8
+ ${java.version}
+ ${java.version}
1.2.53
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/aspect/AuthMan.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java
similarity index 86%
rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/aspect/AuthMan.java
rename to zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java
index 9a4d31fe..31e4b028 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/aspect/AuthMan.java
+++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java
@@ -1,4 +1,4 @@
-package com.zyplayer.doc.data.aspect;
+package com.zyplayer.doc.core.annotation;
import java.lang.annotation.*;
diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ThreadLocalUtil.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ThreadLocalUtil.java
new file mode 100644
index 00000000..baad269a
--- /dev/null
+++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ThreadLocalUtil.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.core.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class ThreadLocalUtil {
+ private static ThreadLocal request = new ThreadLocal<>();
+
+ public static void setHttpServletRequest(HttpServletRequest request) {
+ ThreadLocalUtil.request.set(request);
+ }
+
+ public static HttpServletRequest getHttpServletRequest() {
+ return ThreadLocalUtil.request.get();
+ }
+
+ public static void clean() {
+ ThreadLocalUtil.request.remove();
+ }
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/aspect/AuthAspect.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/aspect/AuthAspect.java
index 466327ed..92c9b348 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/aspect/AuthAspect.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/aspect/AuthAspect.java
@@ -1,9 +1,11 @@
package com.zyplayer.doc.data.aspect;
import com.google.common.collect.Maps;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.HttpConst;
import com.zyplayer.doc.core.json.ResponseJson;
+import com.zyplayer.doc.core.util.ThreadLocalUtil;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.service.manage.UserAuthService;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.util.Map;
@@ -28,7 +31,7 @@ public class AuthAspect {
@Resource
private UserAuthService userAuthService;
- @Around(value = "@annotation(AuthMan) || @within(AuthMan)")
+ @Around(value = "@annotation(com.zyplayer.doc.core.annotation.AuthMan) || @within(com.zyplayer.doc.core.annotation.AuthMan)")
public Object authController(ProceedingJoinPoint pjp) throws Throwable {
AuthMan authMan = BeanUtil.getAnnotation(pjp, AuthMan.class);
ResponseBody responseBody = BeanUtil.getAnnotation(pjp, ResponseBody.class);
@@ -42,7 +45,9 @@ public class AuthAspect {
if (isResponseBody) {
return DocResponseJson.failure(HttpConst.TOKEN_TIMEOUT, reason);
} else if (returnType.isAssignableFrom(ModelAndView.class)) {
- return new ModelAndView("redirect:/static/manage/login.html");
+ HttpServletRequest request = ThreadLocalUtil.getHttpServletRequest();
+ StringBuffer requestURL = request.getRequestURL();
+ return new ModelAndView("redirect:/static/manage/login.html?returnUrl=" + requestURL);
} else if (returnType.isAssignableFrom(Map.class)) {
return Maps.newHashMap();
}
diff --git a/zyplayer-doc-db/pom.xml b/zyplayer-doc-db/pom.xml
index 9a18d26e..0ddc20e0 100644
--- a/zyplayer-doc-db/pom.xml
+++ b/zyplayer-doc-db/pom.xml
@@ -71,7 +71,13 @@
commons-lang
2.6
-
+
+ com.zyplayer
+ zyplayer-doc-core
+ 1.0.1
+ compile
+
+
UTF-8
diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java
index 4019d19b..a3391739 100644
--- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java
+++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java
@@ -1,16 +1,20 @@
package com.zyplayer.doc.db.controller;
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletResponse;
-
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.ZipUtil;
+import com.alibaba.fastjson.JSON;
+import com.zyplayer.doc.core.annotation.AuthMan;
+import com.zyplayer.doc.db.controller.vo.DatabaseExportVo;
+import com.zyplayer.doc.db.controller.vo.TableColumnVo;
+import com.zyplayer.doc.db.controller.vo.TableColumnVo.TableInfoVo;
+import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean;
+import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean.DatabaseProduct;
+import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean;
+import com.zyplayer.doc.db.framework.db.dto.*;
+import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper;
+import com.zyplayer.doc.db.framework.db.mapper.mysql.MysqlMapper;
+import com.zyplayer.doc.db.framework.json.DocDbResponseJson;
+import com.zyplayer.doc.db.framework.json.ResponseJson;
import org.apache.commons.lang.StringUtils;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,26 +23,10 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.fastjson.JSON;
-import com.zyplayer.doc.db.controller.vo.DatabaseExportVo;
-import com.zyplayer.doc.db.controller.vo.TableColumnVo;
-import com.zyplayer.doc.db.controller.vo.TableColumnVo.TableInfoVo;
-import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean;
-import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean.DatabaseProduct;
-import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean;
-import com.zyplayer.doc.db.framework.db.dto.ColumnInfoDto;
-import com.zyplayer.doc.db.framework.db.dto.DatabaseInfoDto;
-import com.zyplayer.doc.db.framework.db.dto.QueryTableColumnDescDto;
-import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto;
-import com.zyplayer.doc.db.framework.db.dto.TableDescDto;
-import com.zyplayer.doc.db.framework.db.dto.TableInfoDto;
-import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper;
-import com.zyplayer.doc.db.framework.db.mapper.mysql.MysqlMapper;
-import com.zyplayer.doc.db.framework.json.DocDbResponseJson;
-import com.zyplayer.doc.db.framework.json.ResponseJson;
-
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ZipUtil;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 文档控制器
@@ -46,6 +34,7 @@ import cn.hutool.core.util.ZipUtil;
* @author 暮光:城中城
* @since 2018年8月8日
*/
+@AuthMan
@RestController
@RequestMapping("/zyplayer-doc-db/doc-db")
public class DatabaseDocController {
diff --git a/zyplayer-doc-db/src/main/resources/export/js/common.js b/zyplayer-doc-db/src/main/resources/export/js/common.js
index bb1866c3..56bf0cf3 100644
--- a/zyplayer-doc-db/src/main/resources/export/js/common.js
+++ b/zyplayer-doc-db/src/main/resources/export/js/common.js
@@ -27,8 +27,11 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
+ if (result.errCode == 200) {
return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -147,7 +150,10 @@ function getObjectFirstAttributeIfOnly(data) {
function postService(url, param, success=function(){}, complete=function(){}){
ajaxTemp(url, "POST", "JSON", param, function(result){
- if(result.errCode != "200"){
+ if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else if (result.errCode != "200") {
Toast.warn(result.errMsg);
} else {
success(result);
@@ -178,8 +184,13 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
diff --git a/zyplayer-doc-db/src/main/resources/webjars/doc-db/js/common.js b/zyplayer-doc-db/src/main/resources/webjars/doc-db/js/common.js
index 4c5d3f72..05bcc167 100644
--- a/zyplayer-doc-db/src/main/resources/webjars/doc-db/js/common.js
+++ b/zyplayer-doc-db/src/main/resources/webjars/doc-db/js/common.js
@@ -27,8 +27,11 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
+ if (result.errCode == 200) {
return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -147,7 +150,10 @@ function getObjectFirstAttributeIfOnly(data) {
function postService(url, param, success=function(){}, complete=function(){}){
ajaxTemp(url, "POST", "JSON", param, function(result){
- if(result.errCode != "200"){
+ if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else if (result.errCode != "200") {
Toast.warn(result.errMsg);
} else {
success(result);
@@ -178,8 +184,13 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java
index e97d64a8..eaa47d4b 100644
--- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java
+++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java
@@ -2,6 +2,7 @@ package com.zyplayer.doc.dubbo.controller;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.dubbo.controller.param.DubboRequestParam;
import com.zyplayer.doc.dubbo.controller.vo.DubboInfoVo;
@@ -47,6 +48,7 @@ import java.util.stream.Collectors;
* @author 暮光:城中城
* @since 2019年2月10日
*/
+@AuthMan
@RestController
@RequestMapping("/zyplayer-doc-dubbo/doc-dubbo")
public class DubboController {
diff --git a/zyplayer-doc-dubbo/src/main/resources/webjars/doc-dubbo/js/common.js b/zyplayer-doc-dubbo/src/main/resources/webjars/doc-dubbo/js/common.js
index 579ecac9..2a699c46 100644
--- a/zyplayer-doc-dubbo/src/main/resources/webjars/doc-dubbo/js/common.js
+++ b/zyplayer-doc-dubbo/src/main/resources/webjars/doc-dubbo/js/common.js
@@ -27,8 +27,11 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
+ if (result.errCode == 200) {
return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -193,8 +196,13 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
diff --git a/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java b/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java
index a090e93e..a1beb805 100644
--- a/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java
+++ b/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java
@@ -3,9 +3,8 @@ package com.zyplayer.doc.grpc.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.protobuf.ByteString;
-import com.nxest.grpc.client.GrpcChannelFactory;
-import com.nxest.grpc.server.GrpcService;
import com.zyplayer.doc.core.exception.ConfirmException;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.grpc.controller.po.ColumnInfo;
import com.zyplayer.doc.grpc.controller.po.GrpcDocInfo;
@@ -26,8 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.HashMap;
@@ -43,6 +40,7 @@ import java.util.regex.Pattern;
* @author 暮光:城中城
* @since 2019年3月31日
*/
+@AuthMan
@RestController
@RequestMapping("/zyplayer-doc-grpc")
public class GrpcDocController {
diff --git a/zyplayer-doc-grpc/src/main/resources/webjars/doc-grpc/js/common.js b/zyplayer-doc-grpc/src/main/resources/webjars/doc-grpc/js/common.js
index 579ecac9..2a699c46 100644
--- a/zyplayer-doc-grpc/src/main/resources/webjars/doc-grpc/js/common.js
+++ b/zyplayer-doc-grpc/src/main/resources/webjars/doc-grpc/js/common.js
@@ -27,8 +27,11 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
+ if (result.errCode == 200) {
return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -193,8 +196,13 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/RequestInfoInterceptor.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/RequestInfoInterceptor.java
index 96eb29df..315c4dc9 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/RequestInfoInterceptor.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/RequestInfoInterceptor.java
@@ -1,5 +1,6 @@
package com.zyplayer.doc.manage.framework.interceptor;
+import com.zyplayer.doc.core.util.ThreadLocalUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -8,6 +9,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.Optional;
/**
* 记录当前请求信息
@@ -23,9 +25,13 @@ public class RequestInfoInterceptor implements HandlerInterceptor {
*/
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object arg2, Exception arg3) {
- long startTime = startTimeThreadLocal.get();
+ Long startTime = startTimeThreadLocal.get();
+ startTime = Optional.ofNullable(startTime).orElse(System.currentTimeMillis());
long totalTime = System.currentTimeMillis() - startTime;// 结束时间
logger.info("总耗时:{}ms,URI:{}", totalTime, request.getRequestURI());
+
+ ThreadLocalUtil.clean();
+ startTimeThreadLocal.remove();
}
@Override
@@ -38,6 +44,7 @@ public class RequestInfoInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) {
startTimeThreadLocal.set(System.currentTimeMillis());
+ ThreadLocalUtil.setHttpServletRequest(request);
return true;
}
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/AuthInfoController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/AuthInfoController.java
index 0aa29b5d..09caaa36 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/AuthInfoController.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/AuthInfoController.java
@@ -2,7 +2,7 @@ package com.zyplayer.doc.manage.web.manage;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java
index a2d05690..3d104347 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java
@@ -1,6 +1,6 @@
package com.zyplayer.doc.manage.web.manage;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.servlet.ModelAndView;
@@ -12,6 +12,11 @@ import org.springframework.web.servlet.ModelAndView;
@Controller
public class DocSystemController {
+ @GetMapping("/")
+ public ModelAndView home() {
+ return new ModelAndView("redirect:/static/manage/home.html");
+ }
+
@GetMapping("/doc-wiki")
public ModelAndView wiki() {
return new ModelAndView("/doc-wiki-v2.html");
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserAuthController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserAuthController.java
index d8f2b08b..09a9079c 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserAuthController.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserAuthController.java
@@ -3,7 +3,7 @@ package com.zyplayer.doc.manage.web.manage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserInfoController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserInfoController.java
index a3e26b20..569c07d7 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserInfoController.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserInfoController.java
@@ -3,7 +3,7 @@ package com.zyplayer.doc.manage.web.manage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
diff --git a/zyplayer-doc-manage/src/main/resources/application.yml b/zyplayer-doc-manage/src/main/resources/application.yml
index c58d089b..d9d34ed4 100644
--- a/zyplayer-doc-manage/src/main/resources/application.yml
+++ b/zyplayer-doc-manage/src/main/resources/application.yml
@@ -46,9 +46,9 @@ zyplayer:
dubbo:
# 优先使用zookeeper,未配置时找nacos的配置
zookeeper:
- url: 127.0.0.1:2181
+ url: 10.248.224.18:2181
# 服务参数那些信息的服务地址,dubbo7.0新特性
- metadata-url: 127.0.0.1:2181
+# metadata-url: 127.0.0.1:2181
nacos:
# url: http://127.0.0.1:8848/nacos
# 服务名称,多个使用 ; 分割,nacos没办法获取所有的服务列表,所以需要指定
diff --git a/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js
index 441218d0..1b6baa05 100644
--- a/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js
+++ b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js
@@ -35,8 +35,11 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
+ if (result.errCode == 200) {
return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
} else {
alert(result.errMsg);
}
@@ -222,8 +225,13 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
diff --git a/zyplayer-doc-manage/src/main/webapp/static/manage/home.html b/zyplayer-doc-manage/src/main/webapp/static/manage/home.html
index 82db4359..a69ff0f4 100644
--- a/zyplayer-doc-manage/src/main/webapp/static/manage/home.html
+++ b/zyplayer-doc-manage/src/main/webapp/static/manage/home.html
@@ -45,10 +45,10 @@
文档查看页面
diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java
index 172e819d..ebc28a8e 100644
--- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java
+++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java
@@ -2,6 +2,7 @@ package com.zyplayer.doc.swagger.controller;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSON;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.swagger.controller.vo.LocationListVo;
@@ -33,6 +34,7 @@ import java.util.stream.Collectors;
* @author 暮光:城中城
* @since 2018年8月21日
*/
+@AuthMan
@RestController
@RequestMapping("/swagger-mg-ui/document")
public class MgDocumentController {
diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java
index ff31cfc3..a896703e 100644
--- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java
+++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java
@@ -1,16 +1,16 @@
package com.zyplayer.doc.swagger.controller;
-import java.util.List;
-
+import com.zyplayer.doc.core.annotation.AuthMan;
+import com.zyplayer.doc.core.json.DocResponseJson;
+import com.zyplayer.doc.swagger.framework.service.MgStorage;
+import com.zyplayer.doc.swagger.framework.service.MgStorageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.zyplayer.doc.core.json.DocResponseJson;
-import com.zyplayer.doc.swagger.framework.service.MgStorage;
-import com.zyplayer.doc.swagger.framework.service.MgStorageService;
+import java.util.List;
/**
* 后台存储服务控制器
@@ -18,6 +18,7 @@ import com.zyplayer.doc.swagger.framework.service.MgStorageService;
* @author 暮光:城中城
* @since 2018年8月21日
*/
+@AuthMan
@RestController
@RequestMapping("/swagger-mg-ui/storage")
public class MgStorageController {
diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java
index 93c83638..111e0103 100644
--- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java
+++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java
@@ -1,6 +1,7 @@
package com.zyplayer.doc.swagger.controller;
import com.alibaba.fastjson.JSON;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.swagger.controller.vo.SwaggerResourcesInfoVo;
import com.zyplayer.doc.swagger.framework.constant.Consts;
import com.zyplayer.doc.swagger.framework.constant.StorageKeys;
@@ -26,6 +27,7 @@ import java.util.List;
* @author 暮光:城中城
* @since 2018年12月16日
*/
+@AuthMan
@RestController
public class ZyplayerSwaggerController {
diff --git a/zyplayer-doc-swagger/src/main/resources/export/js/common.js b/zyplayer-doc-swagger/src/main/resources/export/js/common.js
index 591b322e..4804caa4 100644
--- a/zyplayer-doc-swagger/src/main/resources/export/js/common.js
+++ b/zyplayer-doc-swagger/src/main/resources/export/js/common.js
@@ -27,8 +27,11 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
+ if (result.errCode == 200) {
return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -192,8 +195,13 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js b/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js
index 78dce91d..d39b9f46 100644
--- a/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js
+++ b/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js
@@ -27,11 +27,14 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
- return true;
- } else {
- Toast.error(result.errMsg);
- }
+ if (result.errCode == 200) {
+ return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ Toast.error(result.errMsg);
+ }
return false;
}
@@ -175,7 +178,7 @@ function getObjectFirstAttributeIfOnly(data) {
/**
* ajax处理事件模板
- *
+ *
* @url 后台处理的url,即action
* @dataSentType 数据发送的方式,有post,get方式
* @dataReceiveType 数据接收格式,有html json text等
@@ -192,12 +195,17 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
-
+
},
complete : function(msg) {
if (msg.responseText.startWith("")) {
@@ -233,7 +241,7 @@ function postWithFile(url, paramsStr, successFunction, errorFunction, completeFu
}
},
beforeSend: function () {
-
+
},
complete: function (msg) {
if (typeof completeFunction == "function") {
diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js
index e38d7db0..cf995f27 100644
--- a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js
+++ b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js
@@ -27,8 +27,11 @@ function deserialize(value) {
}
function validateResult(result) {
- if(result.errCode == 200) {
+ if (result.errCode == 200) {
return true;
+ } else if (result.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -192,8 +195,13 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
data : eval(paramsStr),
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
- if(typeof successFunction == "function") {
- successFunction(msg,id);
+ if (msg.errCode == 400) {
+ var href = encodeURI(window.location.href);
+ window.location = "static/manage/login.html?returnUrl=" + href;
+ } else {
+ if (typeof successFunction == "function") {
+ successFunction(msg, id);
+ }
}
},
beforeSend : function() {
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
index be608b98..2ecc1fe8 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java
index ca17fa29..ffa843fe 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.*;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
index 58da3413..43fae0e6 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
@@ -3,7 +3,7 @@ package com.zyplayer.doc.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
index 63911c13..42d4531c 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
@@ -3,7 +3,7 @@ package com.zyplayer.doc.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.*;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
index 988a5079..70e0c846 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
@@ -2,7 +2,7 @@ package com.zyplayer.doc.wiki.controller;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java
index 73dd0c0b..01153fc2 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java
@@ -3,7 +3,7 @@ package com.zyplayer.doc.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java
index 2a388439..801ec95a 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java
@@ -4,7 +4,7 @@ import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.aspect.AuthMan;
+import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
diff --git a/zyplayer-doc-wiki/src/main/resources/535877f50039c0cb49a6196a5b7517cd.woff b/zyplayer-doc-wiki/src/main/resources/535877f50039c0cb49a6196a5b7517cd.woff
deleted file mode 100644
index 02b9a253..00000000
Binary files a/zyplayer-doc-wiki/src/main/resources/535877f50039c0cb49a6196a5b7517cd.woff and /dev/null differ
diff --git a/zyplayer-doc-wiki/src/main/resources/6f0a76321d30f3c8120915e57f7bd77e.ttf b/zyplayer-doc-wiki/src/main/resources/6f0a76321d30f3c8120915e57f7bd77e.ttf
new file mode 100644
index 00000000..73bc90f4
Binary files /dev/null and b/zyplayer-doc-wiki/src/main/resources/6f0a76321d30f3c8120915e57f7bd77e.ttf differ
diff --git a/zyplayer-doc-wiki/src/main/resources/732389ded34cb9c52dd88271f1345af9.ttf b/zyplayer-doc-wiki/src/main/resources/732389ded34cb9c52dd88271f1345af9.ttf
deleted file mode 100644
index 91b74de3..00000000
Binary files a/zyplayer-doc-wiki/src/main/resources/732389ded34cb9c52dd88271f1345af9.ttf and /dev/null differ
diff --git a/zyplayer-doc-wiki/src/main/resources/doc-wiki-v2.html b/zyplayer-doc-wiki/src/main/resources/doc-wiki-v2.html
index 3cc9f5cd..2aa4e4c0 100644
--- a/zyplayer-doc-wiki/src/main/resources/doc-wiki-v2.html
+++ b/zyplayer-doc-wiki/src/main/resources/doc-wiki-v2.html
@@ -8,7 +8,7 @@
-
+