Skip to content

Commit 42f45c6

Browse files
committed
feat: modstart upgrade
1 parent a6a4a85 commit 42f45c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+695
-488
lines changed

module/AdminManager/Docs/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.7.0
1+
## 1.7.0 文件上传和文件管理逻辑优化
22

33
- 新增:文件上传和文件管理逻辑优化
44

module/AdminManager/Docs/release/1.0.0.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

module/AdminManager/Docs/release/1.1.0.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

module/AdminManager/Docs/release/1.2.0.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

module/AdminManager/Docs/release/1.3.0.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

module/Site/Docs/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.3.0
1+
## 1.3.0 菜单调整,公安备案
22

33
- 新增:公安备案信息后台可配置
44
- 优化:调整后台菜单结构

module/Vendor/Atomic/AtomicUtil.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static function consume($name)
3737
return false;
3838
} else {
3939
if (RandomUtil::percent(20)) {
40-
ModelUtil::delete('atomic', 'expire', '<', time());
40+
ModelUtil::model('atomic')->where('expire', '<', time())->delete();
4141
}
4242
ModelUtil::transactionBegin();
4343
$atomic = ModelUtil::getWithLock('atomic', ['name' => $name]);
@@ -65,4 +65,4 @@ public static function remove($name)
6565
ModelUtil::delete('atomic', ['name' => $name]);
6666
}
6767
}
68-
}
68+
}

module/Vendor/Session/SessionUtil.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public static function atomicProduce($name, $value, $expire = 3600)
1313
AtomicUtil::produce("$name:" . Session::getId(), $value, $expire);
1414
}
1515

16-
public static function atomicConsume($name, $token = null)
16+
public static function atomicConsume($name)
1717
{
1818
return AtomicUtil::consume("$name:" . Session::getId());
1919
}
2020

21-
public static function atomicRemove($name, $token = null)
21+
public static function atomicRemove($name)
2222
{
2323
AtomicUtil::remove("$name:" . Session::getId());
2424
}
25-
}
25+
}

public/asset/common/gridManager.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/asset/common/htmlEnhance.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)