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

空格：id、lib、webhooks

Browse Source
This commit is contained in:
jiangzeyin 2019-03-01 17:33:41 +08:00
parent c4fe9ed9ba
commit 7287fa2b32
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/run.sh
View File

@ -37,7 +37,7 @@ function stop() {
if [[ "$pid" != "" ]]; then if [[ "$pid" != "" ]]; then
echo -n "boot ( pid $pid) is running" echo -n "boot ( pid $pid) is running"
echo echo
echo -n $"Shutting down boot: " echo -n $"Shutting down boot: wait"
kill $(pgrep -f ${Tag}) 2>/dev/null kill $(pgrep -f ${Tag}) 2>/dev/null
sleep 3 sleep 3
pid=$(ps -ef | grep -v 'grep' | egrep $Tag| awk '{printf $2 " "}') pid=$(ps -ef | grep -v 'grep' | egrep $Tag| awk '{printf $2 " "}')

4
src/main/java/cn/keepbx/jpom/controller/manage/EditProjectController.java
View File

@ -121,6 +121,10 @@ public class EditProjectController extends BaseController {
} }
} }
// 判断空格
if (id.contains(StrUtil.SPACE) || lib.contains(StrUtil.SPACE) || log.contains(StrUtil.SPACE) || token.contains(StrUtil.SPACE)) {
return JsonMessage.getString(401, "项目Id、项目Lib、WebHooks不能包含空格");
}
ProjectInfoModel exits = manageService.getProjectInfo(id); ProjectInfoModel exits = manageService.getProjectInfo(id);
try { try {
UserModel userName = getUser(); UserModel userName = getUser();

1
src/main/resources/bin/command/run_boot.sh
View File

@ -57,6 +57,7 @@ stop()
wget "$WebClose" wget "$WebClose"
fi fi
# #
echo -n $"Shutting down boot: wait"
kill $(pgrep -f ${Tag}) 2>/dev/null kill $(pgrep -f ${Tag}) 2>/dev/null
sleep 3 sleep 3
pid=`getPid` pid=`getPid`