test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-02 03:48:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

代码调整，文档更新

Browse Source
This commit is contained in:
jiangzeyin 2019-03-17 20:42:27 +08:00
parent 7817e1cb60
commit 0fdea6d271
16 changed files with 127 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PLANS.md
View File

@ -1,7 +1,9 @@
### 开发计划
1. 兼容windows 服务器
2. 主要管理页面兼容移动端
3. 账号暴露破解
4. nginx 快捷管理
5. ssl 到期提醒、快捷续签
1. 主要管理页面兼容移动端
2. nginx 快捷管理
3. ssl 到期提醒、快捷续签
~~1. 兼容windows 服务器~~
~~2. 账号暴露破解~~

10
README.md
View File

@ -103,8 +103,10 @@ mvn package
[http://jpom-demo.jiangzeyin.cn](http://jpom-demo.jiangzeyin.cn)
账号：admin
密码：admin123
账号：demo
密码：demo123
> 演示系统有部分功能做了限制，详情功能请自行部署体验
1. [Jboot案例代码](https://gitee.com/keepbx/Jpom-demo-case/tree/master/jboot-test)
2. [SpringBoot案例代码](https://gitee.com/keepbx/Jpom-demo-case/tree/master/springboot-test)
@ -123,10 +125,6 @@ mvn package
[用户角色说明>>](/doc/safeMode.md#用户权限说明)
### windows 开启实时查看控制台日志
[飞机>>](/doc/windows-tail.md)
### 阿里云Oss配置
[查看文档](/doc/CodePipeline-Oss.md)

16
src/main/java/cn/keepbx/jpom/common/BaseDataService.java
View File

@ -39,7 +39,7 @@ public abstract class BaseDataService {
JSONObject data = allData.getJSONObject(key);
// 判断是否存在数据
if (null != data && 0 < data.keySet().size()) {
throw new RuntimeException("项目名称已存在！");
throw new RuntimeException("数据Id已经存在啦：" + filename + " :" + key);
} else {
allData.put(key, json);
JsonUtil.saveJson(getDataFilePath(filename), allData);
@ -60,7 +60,7 @@ public abstract class BaseDataService {
// 判断是否存在数据
if (null == data || 0 == data.keySet().size()) {
throw new Exception("数据不存在");
throw new Exception("数据不存在:" + key);
} else {
allData.put(key, json);
JsonUtil.saveJson(getDataFilePath(filename), allData);
@ -98,5 +98,15 @@ public abstract class BaseDataService {
return (JSONObject) JsonUtil.readJson(getDataFilePath(filename));
}
protected <T> T getJsonObjectById(String file, String id, Class<T> cls) throws IOException {
JSONObject jsonObject = getJsonObject(file);
if (jsonObject == null) {
return null;
}
jsonObject = jsonObject.getJSONObject(id);
if (jsonObject == null) {
return null;
}
return jsonObject.toJavaObject(cls);
}
}

4
src/main/java/cn/keepbx/jpom/common/commander/AbstractCommander.java
View File

@ -169,9 +169,9 @@ public abstract class AbstractCommander {
// 通过VirtualMachine.list()列出所有的java进程
List<VirtualMachineDescriptor> descriptorList = VirtualMachine.list();
for (VirtualMachineDescriptor virtualMachineDescriptor : descriptorList) {
VirtualMachine virtualMachine = VirtualMachine.attach(virtualMachineDescriptor);
int pid = Convert.toInt(virtualMachineDescriptor.id(), 0);
// 根据进程id查询启动属性，如果属性-Dapplication匹配，说明项目已经启动，并返回进程id
VirtualMachine virtualMachine = VirtualMachine.attach(virtualMachineDescriptor);
Properties properties = virtualMachine.getAgentProperties();
String args = StrUtil.emptyToDefault(properties.getProperty("sun.jvm.args"), "");
if (StrUtil.containsIgnoreCase(args, tag)) {
@ -187,7 +187,7 @@ public abstract class AbstractCommander {
if (jmxServiceURL != null) {
JMXConnector jmxc = JMXConnectorFactory.connect(jmxServiceURL, null);
MBeanServerConnection mBeanServerConnection = jmxc.getMBeanServerConnection();
MemoryMXBean memBean = ManagementFactory.newPlatformMXBeanProxy
(mBeanServerConnection, ManagementFactory.MEMORY_MXBEAN_NAME, MemoryMXBean.class);

2
src/main/java/cn/keepbx/jpom/controller/LoginControl.java
View File

@ -83,7 +83,7 @@ public class LoginControl extends BaseController {
@RequestMapping(value = "userLogin", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
@NotLogin
public String userLogin(String userName, String userPwd, String code) {
public String userLogin(String userName, String userPwd, String code) throws IOException {
if (StrUtil.isEmpty(userName) || StrUtil.isEmpty(userPwd)) {
return JsonMessage.getString(405, "请输入登录信息");
}

55
src/main/java/cn/keepbx/jpom/controller/manage/ConsoleController.java
View File

@ -1,13 +1,11 @@
package cn.keepbx.jpom.controller.manage;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.jiangzeyin.common.DefaultSystemLog;
import cn.jiangzeyin.common.JsonMessage;
import cn.keepbx.jpom.common.BaseController;
import cn.keepbx.jpom.model.ProjectInfoModel;
import cn.keepbx.jpom.model.UserModel;
import cn.keepbx.jpom.service.manage.CommandService;
import cn.keepbx.jpom.service.manage.ProjectInfoService;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
@ -35,8 +33,6 @@ public class ConsoleController extends BaseController {
@Resource
private ProjectInfoService projectInfoService;
@Resource
private CommandService commandService;
/**
* 管理项目
@ -44,7 +40,7 @@ public class ConsoleController extends BaseController {
* @return page
*/
@RequestMapping(value = "console", method = RequestMethod.GET, produces = MediaType.TEXT_HTML_VALUE)
public String console(String id) throws IOException {
public String console(String id) {
ProjectInfoModel projectInfoModel = null;
try {
projectInfoModel = projectInfoService.getItem(id);
@ -55,7 +51,7 @@ public class ConsoleController extends BaseController {
UserModel userName = getUser();
setAttribute("projectInfo", projectInfoModel);
setAttribute("userInfo", userName.getUserMd5Key());
String logSize = getLogSize(id);
String logSize = projectInfoService.getLogSize(id);
setAttribute("logSize", logSize);
setAttribute("manager", userName.isProject(id));
@ -68,53 +64,6 @@ public class ConsoleController extends BaseController {
return "manage/console";
}
@RequestMapping(value = "logSize", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
public String logSize(String id) throws IOException {
String info = getLogSize(id);
if (info != null) {
return JsonMessage.getString(200, "ok", info);
}
return JsonMessage.getString(500, "获取日志大小失败");
}
@RequestMapping(value = "resetLog", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
public String resetLog(String id) {
ProjectInfoModel pim;
try {
pim = projectInfoService.getItem(id);
String msg = commandService.execCommand(CommandService.CommandOp.backupLog, pim);
if (msg.contains("ok")) {
return JsonMessage.getString(200, "重置成功");
}
return JsonMessage.getString(201, "重置失败：" + msg);
} catch (Exception e) {
DefaultSystemLog.ERROR().error(e.getMessage(), e);
return JsonMessage.getString(500, "重置日志失败");
}
}
private String getLogSize(String id) {
ProjectInfoModel pim;
try {
pim = projectInfoService.getItem(id);
if (pim == null) {
return null;
}
} catch (IOException e) {
DefaultSystemLog.ERROR().error(e.getMessage(), e);
return null;
}
String logSize = null;
File file = new File(pim.getLog());
if (file.exists()) {
long fileSize = file.length();
logSize = FileUtil.readableFileSize(fileSize);
}
return logSize;
}
@RequestMapping(value = "export.html", method = RequestMethod.GET)
@ResponseBody

34
src/main/java/cn/keepbx/jpom/controller/manage/LogBackController.java
View File

@ -8,6 +8,7 @@ import cn.jiangzeyin.common.JsonMessage;
import cn.keepbx.jpom.common.BaseController;
import cn.keepbx.jpom.common.interceptor.ProjectPermission;
import cn.keepbx.jpom.model.ProjectInfoModel;
import cn.keepbx.jpom.service.manage.CommandService;
import cn.keepbx.jpom.service.manage.ProjectInfoService;
import com.alibaba.fastjson.JSONArray;
import org.springframework.http.MediaType;
@ -32,6 +33,9 @@ public class LogBackController extends BaseController {
@Resource
private ProjectInfoService projectInfoService;
@Resource
private CommandService commandService;
@RequestMapping(value = "logBack", method = RequestMethod.GET, produces = MediaType.TEXT_HTML_VALUE)
public String console(String id) {
try {
@ -96,4 +100,34 @@ public class LogBackController extends BaseController {
return JsonMessage.getString(500, "没有对应文件夹");
}
}
@RequestMapping(value = "logSize", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
public String logSize(String id) {
String info = projectInfoService.getLogSize(id);
if (info != null) {
return JsonMessage.getString(200, "ok", info);
}
return JsonMessage.getString(500, "获取日志大小失败");
}
@RequestMapping(value = "resetLog", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
public String resetLog(String id) {
ProjectInfoModel pim;
try {
pim = projectInfoService.getItem(id);
String msg = commandService.execCommand(CommandService.CommandOp.backupLog, pim);
if (msg.contains("ok")) {
return JsonMessage.getString(200, "重置成功");
}
return JsonMessage.getString(201, "重置失败：" + msg);
} catch (Exception e) {
DefaultSystemLog.ERROR().error(e.getMessage(), e);
return JsonMessage.getString(500, "重置日志失败");
}
}
}

16
src/main/java/cn/keepbx/jpom/controller/user/UserInfoController.java
View File

@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.io.IOException;
/**
* 用户管理
@ -73,7 +74,7 @@ public class UserInfoController extends BaseController {
* @return json
*/
@RequestMapping(value = "updateName", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public String updateName(String name) {
public String updateName(String name) throws IOException {
if (StrUtil.isEmpty(name)) {
return JsonMessage.getString(405, "请输入新的昵称");
}
@ -98,7 +99,7 @@ public class UserInfoController extends BaseController {
* @return String
*/
@RequestMapping(value = "deleteUser", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public String deleteUser(String id) {
public String deleteUser(String id) throws IOException {
UserModel userName = getUser();
if (!userName.isManage()) {
return JsonMessage.getString(400, "你没有删除用户的权限");
@ -130,7 +131,7 @@ public class UserInfoController extends BaseController {
* @return String
*/
@RequestMapping(value = "addUser", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public String addUser(String id) {
public String addUser(String id) throws IOException {
UserModel userName = getUser();
if (!userName.isManage()) {
return JsonMessage.getString(400, "你还没有权限");
@ -204,9 +205,16 @@ public class UserInfoController extends BaseController {
userModel.setManage(manageB);
manageB = "true".equals(getParameter("uploadFile"));
// 如果操作人没有权限 就不能管理被操作者
if (!userName.isUploadFile() && manageB) {
return JsonMessage.getString(402, "你没有管理上传文件的权限");
}
userModel.setUploadFile(manageB);
manageB = "true".equals(getParameter("deleteFile"));
if (!userName.isDeleteFile() && manageB) {
return JsonMessage.getString(402, "你没有管理删除文件的权限");
}
userModel.setDeleteFile(manageB);
return null;
}
@ -218,7 +226,7 @@ public class UserInfoController extends BaseController {
* @return String
*/
@RequestMapping(value = "updateUser", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public String updateUser(String id) {
public String updateUser(String id) throws IOException {
UserModel userName = getUser();
if (!userName.isManage()) {
return JsonMessage.getString(400, "你还没有权限");

32
src/main/java/cn/keepbx/jpom/service/manage/ProjectInfoService.java
View File

@ -1,5 +1,7 @@
package cn.keepbx.jpom.service.manage;
import cn.hutool.core.io.FileUtil;
import cn.jiangzeyin.common.DefaultSystemLog;
import cn.keepbx.jpom.common.BaseOperService;
import cn.keepbx.jpom.model.ProjectInfoModel;
import cn.keepbx.jpom.system.ConfigBean;
@ -7,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Set;
@ -73,15 +76,26 @@ public class ProjectInfoService extends BaseOperService<ProjectInfoModel> {
*/
@Override
public ProjectInfoModel getItem(String id) throws IOException {
JSONObject jsonObject = getJsonObject(ConfigBean.PROJECT);
if (jsonObject == null) {
return null;
}
jsonObject = jsonObject.getJSONObject(id);
if (jsonObject == null) {
return null;
}
return jsonObject.toJavaObject(ProjectInfoModel.class);
return getJsonObjectById(ConfigBean.PROJECT, id, ProjectInfoModel.class);
}
public String getLogSize(String id) {
ProjectInfoModel pim;
try {
pim = getItem(id);
if (pim == null) {
return null;
}
} catch (IOException e) {
DefaultSystemLog.ERROR().error(e.getMessage(), e);
return null;
}
String logSize = null;
File file = new File(pim.getLog());
if (file.exists()) {
long fileSize = file.length();
logSize = FileUtil.readableFileSize(fileSize);
}
return logSize;
}
}

10
src/main/java/cn/keepbx/jpom/service/system/CertService.java
View File

@ -70,15 +70,7 @@ public class CertService extends BaseOperService<CertModel> {
@Override
public CertModel getItem(String id) throws IOException {
JSONObject jsonObject = getJsonObject(ConfigBean.CERT);
if (jsonObject == null) {
return null;
}
jsonObject = jsonObject.getJSONObject(id);
if (jsonObject == null) {
return null;
}
return jsonObject.toJavaObject(CertModel.class);
return getJsonObjectById(ConfigBean.CERT, id, CertModel.class);
}
/**

16
src/main/java/cn/keepbx/jpom/service/user/UserService.java
View File

@ -56,7 +56,7 @@ public class UserService extends BaseOperService<UserModel> {
* @param pwd 密码
* @return 登录
*/
public UserModel simpleLogin(String name, String pwd) {
public UserModel simpleLogin(String name, String pwd) throws IOException {
UserModel userModel = getItem(name);
if (userModel == null) {
return null;
@ -128,18 +128,8 @@ public class UserService extends BaseOperService<UserModel> {
* @return 用户信息
*/
@Override
public UserModel getItem(String userId) {
try {
JSONObject jsonObject = getJsonObject(ConfigBean.USER);
JSONObject user = jsonObject.getJSONObject(userId);
if (user == null) {
return null;
}
return user.toJavaObject(UserModel.class);
} catch (IOException e) {
DefaultSystemLog.ERROR().error(e.getMessage(), e);
}
return null;
public UserModel getItem(String userId) throws IOException {
return getJsonObjectById(ConfigBean.USER, userId, UserModel.class);
}
/**

39
src/main/java/cn/keepbx/jpom/socket/FileTailWatcher.java
View File

@ -54,7 +54,7 @@ public class FileTailWatcher implements Runnable {
try {
return new FileTailWatcher(file, s);
} catch (IOException e) {
e.printStackTrace();
DefaultSystemLog.ERROR().error("创建文件监听失败", e);
return null;
}
});
@ -87,20 +87,31 @@ public class FileTailWatcher implements Runnable {
}
}
/**
* 添加监听回话
*
* @param session 回话
*/
private void add(Session session) {
if (this.socketSessions.add(session)) {
try {
SocketSessionUtil.send(session, StrUtil.format("监听日志成功,目前共有{}人正在查看", this.socketSessions.size()));
} catch (IOException ignored) {
}
if (this.limitQueue.size() <= 0) {
send("日志文件为空");
this.send(session, "日志文件为空");
return;
}
this.send(session, StrUtil.format("监听日志成功,目前共有{}人正在查看", this.socketSessions.size()));
// 开发发送头信息
for (String s : this.limitQueue) {
send(s);
this.send(session, s);
}
} else {
this.send(session, "添加日志监听失败");
}
}
private void send(Session session, String msg) {
try {
SocketSessionUtil.send(session, msg);
} catch (IOException ignored) {
}
}
@ -126,14 +137,14 @@ public class FileTailWatcher implements Runnable {
tmp = CharsetUtil.convert(tmp, CharsetUtil.CHARSET_ISO_8859_1, CharsetUtil.systemCharset());
limitQueue.offer(tmp);
if (send) {
send(tmp);
sendAll(tmp);
}
}
// 记录当前读到的位置
this.randomFile.seek(currentLength);
}
private void send(String msg) {
private void sendAll(String msg) {
Iterator<Session> iterator = socketSessions.iterator();
while (iterator.hasNext()) {
Session socketSession = iterator.next();
@ -164,7 +175,7 @@ public class FileTailWatcher implements Runnable {
this.read(true);
} catch (IOException e) {
DefaultSystemLog.ERROR().error("读取文件发送异常", e);
this.send("读取文件发生异常：" + e.getMessage());
this.sendAll("读取文件发生异常：" + e.getMessage());
break;
}
try {
@ -174,13 +185,7 @@ public class FileTailWatcher implements Runnable {
}
// 通知客户端
if (socketSessions.size() > 0) {
for (Session socketSession : socketSessions) {
try {
SocketSessionUtil.send(socketSession, "服务主动关闭日志文件");
} catch (Exception e) {
DefaultSystemLog.ERROR().error("发送消息失败", e);
}
}
this.sendAll("服务主动关闭日志文件");
}
IoUtil.close(this.randomFile);
// 清理线程记录

1
src/main/java/cn/keepbx/jpom/socket/LogWebSocketHandle.java
View File

@ -92,7 +92,6 @@ public class LogWebSocketHandle {
}
String projectId = json.getString("projectId");
ProjectInfoService projectInfoService = SpringUtil.getBean(ProjectInfoService.class);
// SocketSessionUtil socketSession = getItem(session);
ProjectInfoModel projectInfoModel = null;
try {
projectInfoModel = projectInfoService.getItem(projectId);

3
src/main/java/cn/keepbx/jpom/system/ExtConfigEnvironmentPostProcessor.java
View File

@ -17,11 +17,8 @@ import java.io.IOException;
*/
public class ExtConfigEnvironmentPostProcessor implements EnvironmentPostProcessor {
private static ConfigurableEnvironment configurableEnvironment;
@Override
public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
configurableEnvironment = environment;
YamlPropertySourceLoader yamlPropertySourceLoader = new YamlPropertySourceLoader();
Resource resource = ExtConfigBean.getResource();
try {

34
src/main/java/cn/keepbx/jpom/system/init/CheckRunCommand.java
View File

@ -3,9 +3,6 @@ package cn.keepbx.jpom.system.init;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.system.JavaRuntimeInfo;
import cn.hutool.system.SystemUtil;
import cn.jiangzeyin.common.DefaultSystemLog;
import cn.jiangzeyin.common.JsonMessage;
import cn.jiangzeyin.common.PreLoadClass;
@ -45,7 +42,6 @@ public class CheckRunCommand {
*/
@PreLoadMethod
private static void checkSh() throws Exception {
tipTail();
try {
ConfigBean.getInstance().getRamCommandPath();
} catch (ConfigException e) {
@ -60,36 +56,6 @@ public class CheckRunCommand {
}
}
private static void tipTail() {
if (!AbstractCommander.OS_INFO.isWindows()) {
return;
}
JavaRuntimeInfo javaRuntimeInfo = SystemUtil.getJavaRuntimeInfo();
String path = javaRuntimeInfo.getLibraryPath();
String[] paths = StrUtil.splitToArray(path, ';');
for (String itemPath : paths) {
String item = FileUtil.normalize(itemPath);
int index = item.indexOf(StrUtil.COLON);
if (index < 0) {
continue;
}
item = item.substring(index + 1);
if (item.startsWith(StrUtil.SLASH)) {
item = item.substring(1);
}
if (item.endsWith(StrUtil.SLASH)) {
item = item.substring(0, item.length() - 1);
}
if (StrUtil.equalsIgnoreCase("WINDOWS/system32", item)) {
File file = new File(itemPath, "tail.exe");
if (!file.exists()) {
DefaultSystemLog.LOG().info("还未配置tail：详情查看>> https://gitee.com/keepbx/jpom/blob/master/doc/windows-tail.md");
}
break;
}
}
}
/**
* 检查运行数据
*/

2
src/main/java/cn/keepbx/jpom/util/LimitQueue.java
View File

@ -3,6 +3,8 @@ package cn.keepbx.jpom.util;
import java.util.concurrent.ConcurrentLinkedDeque;
/**
* 定长队列
*
* @author jiangzeyin
* @date 2019/3/16
*/