better code

This commit is contained in:
devezhao 2021-11-16 16:03:59 +08:00
parent 5a8e45191a
commit f87a9c6d35
5 changed files with 782 additions and 705 deletions

1456
.deploy/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -9,16 +9,17 @@
"url": "https://github.com/getrebuild/rebuild.git"
},
"dependencies": {
"@babel/core": "^7.11.1",
"@babel/preset-env": "^7.11.0",
"@babel/preset-react": "^7.10.4",
"@babel/core": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@babel/preset-react": "^7.16.0",
"gulp": "^4.0.2",
"gulp-babel": "^8.0.0",
"clean-css": "4.2.3",
"gulp-clean-css": "^4.3.0",
"gulp-debug": "^4.0.0",
"gulp-filter": "^6.0.0",
"gulp-filter": "^7.0.0",
"gulp-javascript-obfuscator": "^1.1.6",
"gulp-replace": "^1.0.0",
"gulp-replace": "^1.1.3",
"rev-hash": "^3.0.0"
}
}

View file

@ -2,14 +2,14 @@
JARFILE=rebuild-boot.jar
echo Use jar file [ $JARFILE ]
echo "Use jar file [ $JARFILE ]"
PID=$(ps -ef | grep $JARFILE | grep -v grep | awk '{ print $2 }')
if [ -z "$PID" ]
then
echo Rebuild-Boot is already stopped
echo "Rebuild-Boot is already stopped"
else
echo Stopping Rebuild-Boot \(kill $PID\) ...
echo "Stopping Rebuild-Boot \(kill $PID\) ..."
kill $PID
sleep 10
fi
@ -18,5 +18,5 @@ echo "Starting Rebuild-Boot ..."
nohup java -Xms1001M -Xmx1001M -XX:+UseG1GC -jar $JARFILE >/dev/null 2>&1 &
sleep 5
echo done
echo "done"
exit 0

View file

@ -25,7 +25,7 @@ import redis.clients.jedis.params.SetParams;
public abstract class DistributedJobLock {
private static final String LOCK_KEY = "#RBJOBLOCK";
private static final int LOCK_TIME = 15; // 15s offset
private static final long LOCK_TIME = 15; // 15s offset
/**
* 是否已在运行中即并发判断分布式环境

View file

@ -63,6 +63,14 @@ $(document).ready(function () {
// CUSTOM
const ACTION_NAMES = {
'R': $L('读取'),
'U': $L('更新'),
'D': $L('删除'),
'A': $L('分派'),
'S': $L('共享'),
}
$('#priv-entity tbody td>a.cp').click(function () {
if (rb.commercial < 1) {
RbHighbar.error(WrapHtml($L('免费版不支持自定义权限功能 [(查看详情)](https://getrebuild.com/docs/rbv-features)')))
@ -80,7 +88,7 @@ $(document).ready(function () {
<AdvFilter
entity={entity}
filter={advFilterSettings[filterKey]}
title={$L('自定义权限')}
title={$L('自定义%s权限', ACTION_NAMES[action] || '')}
inModal
canNoFilters
confirm={(set) => {