manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dubbo文档覆盖优化，线程安全处理，文档优化

Browse Source
This commit is contained in:
暮光：城中城
2020-12-09 18:18:04 +08:00
parent 95ec165d49
commit 7285947cb3
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java
View File

@@ -15,6 +15,7 @@ import com.zyplayer.doc.dubbo.framework.service.MgDubboStorageService;
import com.zyplayer.doc.dubbo.framework.service.NacosDocService;
import com.zyplayer.doc.dubbo.framework.service.ZookeeperDocService;
import org.apache.commons.lang.StringUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.rpc.service.GenericService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -158,13 +159,15 @@ public class DubboController {
@PostMapping(value = "/getDocList")
public DocResponseJson getDocList() {
String dubboServiceList = mgDubboStorageService.get(StorageKeys.DUBBO_SERVICE_LIST);
String dubboServiceDoc = mgDubboStorageService.get(StorageKeys.DUBBO_SERVICE_DOC);
if (StringUtils.isBlank(dubboServiceList)) {
return DocResponseJson.ok();
}
DubboInfoVo dubboInfoVo = new DubboInfoVo();
List<DubboInfo> providerList = JSON.parseArray(dubboServiceList, DubboInfo.class);
dubboInfoVo.setServerList(providerList);
// TODO 感觉不该在这里返回，应该每次点击的时候去包里面重新找一次文档
// 但是这样的话只存了一个大的json，容易出现覆盖问题，看来还得分接口方法一条一条记录的存，才能针对方法来修改
String dubboServiceDoc = mgDubboStorageService.get(StorageKeys.DUBBO_SERVICE_DOC);
if (StringUtils.isNotBlank(dubboServiceDoc)) {
List<DubboDocInfo> docInfoList = JSON.parseArray(dubboServiceDoc, DubboDocInfo.class);
Map<String, DubboDocInfo> docInfoMap = docInfoList.stream().collect(Collectors.toMap(DubboDocInfo::getFunction, val -> val));
@@ -199,15 +202,26 @@ public class DubboController {
if (dubboDocInfo == null) {
dubboDocInfo = new DubboDocInfo();
dubboDocInfo.setParams(definition.getParams());
dubboDocInfo.setFunction(function);
dubboDocInfo.setVersion(1);
dubboDocInfo.setResultType(definition.getResultType());
dubboDocInfo.setService(param.getService());
dubboDocInfo.setMethod(param.getMethod());
dubboDocInfo.setFunction(function);
dubboDocInfo.setVersion(1);
docInfoMap.put(function, dubboDocInfo);
List<DubboDocInfo> docInfoList = new ArrayList<>(docInfoMap.values());
mgDubboStorageService.put(StorageKeys.DUBBO_SERVICE_DOC, JSON.toJSONString(docInfoList));
} else {
// 根据参数顺序，把之前写的参数说明放到新的上面去
if (CollectionUtils.isNotEmpty(definition.getParams()) && CollectionUtils.isNotEmpty(dubboDocInfo.getParams())) {
for (int i = 0; i < definition.getParams().size() && i < dubboDocInfo.getParams().size(); i++) {
DubboDocInfo.DubboDocParam dubboDocNew = definition.getParams().get(i);
DubboDocInfo.DubboDocParam dubboDocOld = dubboDocInfo.getParams().get(i);
dubboDocNew.setParamDesc(StringUtils.defaultIfBlank(dubboDocOld.getParamDesc(), dubboDocNew.getParamDesc()));
}
}
dubboDocInfo.setParams(definition.getParams());
dubboDocInfo.setResultType(definition.getResultType());
}
List<DubboDocInfo> docInfoList = new ArrayList<>(docInfoMap.values());
mgDubboStorageService.put(StorageKeys.DUBBO_SERVICE_DOC, JSON.toJSONString(docInfoList));
return DocResponseJson.ok(dubboDocInfo);
}
@@ -277,6 +291,9 @@ public class DubboController {
try {
classLoadService.closeClassLoad(() -> {
File docJarFile = new File(zyplayerDocDubboLibPath + "/" + DubboDocConst.DUBBO_DOC_LIB_NAME);
if (docJarFile.exists()) {
docJarFile.delete();
}
file.transferTo(docJarFile);
});
} catch (Exception e) {

7
zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/ClassLoadService.java
View File

@@ -53,8 +53,10 @@ public class ClassLoadService {
}
synchronized (ClassLoadService.class) {
// file:D:/maven/repository/com/zyplayer/dubbo-api/1.0/dubbo-api-1.0.jar
URL fileUrl = new URL("file:/" + zyplayerDocDubboLibPath + "/" + DubboDocConst.DUBBO_DOC_LIB_NAME);
docClassLoader = new URLClassLoader(new URL[]{fileUrl}, Thread.currentThread().getContextClassLoader());
if (docClassLoader == null) {
URL fileUrl = new URL("file:/" + zyplayerDocDubboLibPath + "/" + DubboDocConst.DUBBO_DOC_LIB_NAME);
docClassLoader = new URLClassLoader(new URL[]{fileUrl}, Thread.currentThread().getContextClassLoader());
}
}
return docClassLoader;
}
@@ -77,6 +79,7 @@ public class ClassLoadService {
docClassLoader = null;
if (callback != null) {
// callback方式，防止刚close，马上又被别人new出来了
// callback主要是删除文件，如果文件被加载了应该删除和创建不了（我没测，理论上会是这样）
callback.callback();
}
}