mirror of
http://124.126.16.154:8888/singularity/hyperf-admin.git
synced 2026-01-15 07:15:06 +08:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
21ddc159aa | ||
|
|
98ba4a13dc | ||
|
|
bb438b5996 | ||
|
|
5f75dc1afb | ||
|
|
0d4e80fe15 | ||
|
|
5e327fbbc5 | ||
|
|
e60d9174e5 | ||
|
|
6330f5e390 |
28
.gitea/workflows/publish_on_tagged.yml
Normal file
28
.gitea/workflows/publish_on_tagged.yml
Normal file
@@ -0,0 +1,28 @@
|
||||
name: Release development version to registry
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '**.**'
|
||||
|
||||
jobs:
|
||||
Publish on Tagged:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v4
|
||||
- run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
|
||||
- name: List files in the repository
|
||||
run: |
|
||||
ls ${{ gitea.workspace }}
|
||||
- name: Zip files in the repository
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install zip
|
||||
zip -r dist.zip *
|
||||
- name: Publish to registry
|
||||
run: |
|
||||
curl --user ch4o5:4fd300672472e666014314c1c94c604c634165a9 \
|
||||
--upload-file ./dist.zip \
|
||||
https://nest.doylee.cn/api/packages/HDK/composer?version=${{ gitea.ref_name }}
|
||||
- run: echo "🍏 This job's status is ${{ job.status }}."
|
||||
51
CHANGELOG.md
51
CHANGELOG.md
@@ -1,4 +1,55 @@
|
||||
# 版本更新日志
|
||||
### [0.4.2](http://124.126.16.154:8888/singularity/hyperf-admin/compare/v0.3.4...v0.4.2) (2025-09-26)
|
||||
|
||||
|
||||
### 🚀 Chore | 构建/工程依赖/工具
|
||||
|
||||
* 更新文件权限并添加发布脚本和CI配置 ([bb438b5](http://124.126.16.154:8888/singularity/hyperf-admin/commit/bb438b59963bb2a1906fc33311bbce85c60db5ce))
|
||||
|
||||
|
||||
### ✨ Features | 新功能
|
||||
|
||||
* **ci:** 添加基于标签的自动发布工作流 ([98ba4a1](http://124.126.16.154:8888/singularity/hyperf-admin/commit/98ba4a13dc9d3317351c0c549a94d017ee48d6e0))
|
||||
|
||||
### [0.3.4](http://124.126.16.154:8888/singularity/hyperf-admin/compare/v0.3.3...v0.3.4) (2023-04-19)
|
||||
|
||||
|
||||
### ✏️ Documentation | 文档
|
||||
|
||||
* **admin:** 修改了登录的验证文案 ([0d4e80f](http://124.126.16.154:8888/singularity/hyperf-admin/commit/0d4e80fe15e0e9a3de447012669ec2045323f1a5))
|
||||
|
||||
### [0.3.3](http://124.126.16.154:8888/singularity/hyperf-admin/compare/v0.3.2...v0.3.3) (2023-04-18)
|
||||
|
||||
|
||||
### 📦 Build System | 打包构建
|
||||
|
||||
* **composer:** 最低依赖版本改为 php7.4 ([254989e](http://124.126.16.154:8888/singularity/hyperf-admin/commit/254989e9922bdb333e57e2cbd69e31464d4de1bf))
|
||||
* **composer:** 更新包名 ([710eefc](http://124.126.16.154:8888/singularity/hyperf-admin/commit/710eefc4c6a3305c5653841c8f851e0b613f54e2))
|
||||
* **composer:** 限制 flysystem-oss 的版本 ([e9e6084](http://124.126.16.154:8888/singularity/hyperf-admin/commit/e9e6084e97620dda06cc9bde7fbe5e5162bbf894))
|
||||
* **composer:** 限制 flysystem-oss 的版本 ([3c5b77d](http://124.126.16.154:8888/singularity/hyperf-admin/commit/3c5b77dda68973e2fac9ce4c32a8cf8803129d33))
|
||||
* **hdk:** 引入 hdk-core ([dabfbdf](http://124.126.16.154:8888/singularity/hyperf-admin/commit/dabfbdf8612188043b7a4354bbe5c6e518422af9))
|
||||
* **semver:** 初始化版本记录文件 ([27b5f54](http://124.126.16.154:8888/singularity/hyperf-admin/commit/27b5f54d575ccc26747b00bf8c549c0935fb41d3))
|
||||
* 工程化项目 ([c2b56cf](http://124.126.16.154:8888/singularity/hyperf-admin/commit/c2b56cf9783cca6f69067a5434d2a0fd19ec89d6))
|
||||
|
||||
|
||||
### 🐛 Bug Fixes | Bug 修复
|
||||
|
||||
* **menu:** 修复添加菜单不选择权限时候的报错 ([8f5592e](http://124.126.16.154:8888/singularity/hyperf-admin/commit/8f5592ecc8a93e4749558ba2362ca357151bcf1c))
|
||||
* **scaffold:** 修复级联时菜单显示有误的问题 ([6330f5e](http://124.126.16.154:8888/singularity/hyperf-admin/commit/6330f5e390f432e2541724219a3297cdcea6fb5a))
|
||||
|
||||
|
||||
### 🚀 Chore | 构建/工程依赖/工具
|
||||
|
||||
* **release:** 0.4.0 ([dfd814c](http://124.126.16.154:8888/singularity/hyperf-admin/commit/dfd814c817d38521c764d83cec765ca0886e0467))
|
||||
* **release:** 0.4.1 ([e60d917](http://124.126.16.154:8888/singularity/hyperf-admin/commit/e60d9174e571a5d71f5a1b5280b336f0b6d05abb))
|
||||
|
||||
### [0.4.1](http://124.126.16.154:8888/singularity/hyperf-admin/compare/v0.4.0...v0.4.1) (2023-04-18)
|
||||
|
||||
|
||||
### 🐛 Bug Fixes | Bug 修复
|
||||
|
||||
* **scaffold:** 修复级联时菜单显示有误的问题 ([6330f5e](http://124.126.16.154:8888/singularity/hyperf-admin/commit/6330f5e390f432e2541724219a3297cdcea6fb5a))
|
||||
|
||||
## [0.4.0](http://124.126.16.154:8888/singularity/hyperf-admin/compare/v0.3.2...v0.4.0) (2023-04-07)
|
||||
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.4.0
|
||||
0.4.2
|
||||
@@ -129,5 +129,5 @@
|
||||
"url": "https://mirrors.cloud.tencent.com/composer/"
|
||||
}
|
||||
},
|
||||
"version": "0.4.0"
|
||||
"version": "0.4.2"
|
||||
}
|
||||
|
||||
28
src/admin/.gitea/workflows/publish_on_tagged.yml
Normal file
28
src/admin/.gitea/workflows/publish_on_tagged.yml
Normal file
@@ -0,0 +1,28 @@
|
||||
name: Release development version to registry
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '**.**'
|
||||
|
||||
jobs:
|
||||
Publish on Tagged:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v4
|
||||
- run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
|
||||
- name: List files in the repository
|
||||
run: |
|
||||
ls ${{ gitea.workspace }}
|
||||
- name: Zip files in the repository
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install zip
|
||||
zip -r dist.zip *
|
||||
- name: Publish to registry
|
||||
run: |
|
||||
curl --user ch4o5:4fd300672472e666014314c1c94c604c634165a9 \
|
||||
--upload-file ./dist.zip \
|
||||
https://nest.doylee.cn/api/packages/HDK/composer?version=${{ gitea.ref_name }}
|
||||
- run: echo "🍏 This job's status is ${{ job.status }}."
|
||||
68
src/admin/.versionrc
Normal file
68
src/admin/.versionrc
Normal file
@@ -0,0 +1,68 @@
|
||||
{
|
||||
"header": "# 版本更新日志",
|
||||
"preMajor": true,
|
||||
"types": [
|
||||
{
|
||||
"type": "feat",
|
||||
"section": "✨ Features | 新功能"
|
||||
},
|
||||
{
|
||||
"type": "fix",
|
||||
"section": "🐛 Bug Fixes | Bug 修复"
|
||||
},
|
||||
{
|
||||
"type": "init",
|
||||
"section": "🎉 Init | 初始化"
|
||||
},
|
||||
{
|
||||
"type": "docs",
|
||||
"section": "✏️ Documentation | 文档"
|
||||
},
|
||||
{
|
||||
"type": "style",
|
||||
"section": "💄 Styles | 风格"
|
||||
},
|
||||
{
|
||||
"type": "refactor",
|
||||
"section": "♻️ Code Refactoring | 代码重构"
|
||||
},
|
||||
{
|
||||
"type": "perf",
|
||||
"section": "⚡ Performance Improvements | 性能优化"
|
||||
},
|
||||
{
|
||||
"type": "tests",
|
||||
"section": "✅ Tests | 测试"
|
||||
},
|
||||
{
|
||||
"type": "test",
|
||||
"section": "✅ Tests | 测试"
|
||||
},
|
||||
{
|
||||
"type": "revert",
|
||||
"section": "⏪ Revert | 回退"
|
||||
},
|
||||
{
|
||||
"type": "build",
|
||||
"section": "📦 Build System | 打包构建"
|
||||
},
|
||||
{
|
||||
"type": "chore",
|
||||
"section": "🚀 Chore | 构建/工程依赖/工具"
|
||||
},
|
||||
{
|
||||
"type": "ci",
|
||||
"section": "👷 Continuous Integration | CI 配置"
|
||||
}
|
||||
],
|
||||
"bumpFiles": [
|
||||
{
|
||||
"filename": "VERSION_TRACKER.txt",
|
||||
"type": "plain-text"
|
||||
},
|
||||
{
|
||||
"filename": "composer.json",
|
||||
"type": "json"
|
||||
}
|
||||
]
|
||||
}
|
||||
0
src/admin/README.md
Normal file → Executable file
0
src/admin/README.md
Normal file → Executable file
4
src/admin/composer.json
Normal file → Executable file
4
src/admin/composer.json
Normal file → Executable file
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "hyperf-admin/admin",
|
||||
"name": "hdk/hdk-admin",
|
||||
"type": "project",
|
||||
"license": "MIT",
|
||||
"authors": [
|
||||
@@ -28,4 +28,4 @@
|
||||
"config": "HyperfAdmin\\Admin\\ConfigProvider"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
9
src/admin/scripts/docker-env.sh
Executable file
9
src/admin/scripts/docker-env.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
docker run \
|
||||
--pull always \
|
||||
-ti --rm --name "hdk-admin" \
|
||||
-w "/srv/www" \
|
||||
-v "$(pwd)":/srv/www \
|
||||
-v ~/.ssh:/root/.ssh \
|
||||
harbor.luxcreo.cn/library/hyperf:7.4-swoole /bin/ash
|
||||
5
src/admin/scripts/release.sh
Executable file
5
src/admin/scripts/release.sh
Executable file
@@ -0,0 +1,5 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
docker run --rm -it \
|
||||
-v $(pwd):/app -e "GIT_AUTHOR_NAME=ch4o5" -e "EMAIL=li_dongyun@outlook.com" \
|
||||
detouched/standard-version:latest $1
|
||||
0
src/admin/src/ConfigProvider.php
Normal file → Executable file
0
src/admin/src/ConfigProvider.php
Normal file → Executable file
0
src/admin/src/Controller/AdminAbstractController.php
Normal file → Executable file
0
src/admin/src/Controller/AdminAbstractController.php
Normal file → Executable file
0
src/admin/src/Controller/CommonConfigController.php
Normal file → Executable file
0
src/admin/src/Controller/CommonConfigController.php
Normal file → Executable file
0
src/admin/src/Controller/LogController.php
Normal file → Executable file
0
src/admin/src/Controller/LogController.php
Normal file → Executable file
0
src/admin/src/Controller/MenuController.php
Normal file → Executable file
0
src/admin/src/Controller/MenuController.php
Normal file → Executable file
0
src/admin/src/Controller/RoleController.php
Normal file → Executable file
0
src/admin/src/Controller/RoleController.php
Normal file → Executable file
0
src/admin/src/Controller/SystemController.php
Normal file → Executable file
0
src/admin/src/Controller/SystemController.php
Normal file → Executable file
0
src/admin/src/Controller/UploadController.php
Normal file → Executable file
0
src/admin/src/Controller/UploadController.php
Normal file → Executable file
4
src/admin/src/Controller/UserController.php
Normal file → Executable file
4
src/admin/src/Controller/UserController.php
Normal file → Executable file
@@ -205,10 +205,10 @@ class UserController extends AdminAbstractController
|
||||
}
|
||||
$user = $this->getModel()->where('username', $username)->first();
|
||||
if (!$user || $user['status'] !== YES) {
|
||||
return $this->fail(ErrorCode::CODE_ERR_PARAM, '该用户不存在或已被禁用');
|
||||
return $this->fail(ErrorCode::CODE_ERR_PARAM, 'Incorrect or invalid username');
|
||||
}
|
||||
if ($user->password !== $this->passwordHash($password)) {
|
||||
return $this->fail(ErrorCode::CODE_ERR_PARAM);
|
||||
return $this->fail(ErrorCode::CODE_ERR_PARAM, 'Incorrect password');
|
||||
}
|
||||
$data = [
|
||||
'iat' => Carbon::now()->timestamp,
|
||||
|
||||
0
src/admin/src/Crontab/ExportTask.php
Normal file → Executable file
0
src/admin/src/Crontab/ExportTask.php
Normal file → Executable file
0
src/admin/src/Install/InstallCommand.php
Normal file → Executable file
0
src/admin/src/Install/InstallCommand.php
Normal file → Executable file
0
src/admin/src/Install/UpdateCommand.php
Normal file → Executable file
0
src/admin/src/Install/UpdateCommand.php
Normal file → Executable file
0
src/admin/src/Install/install.sql
Normal file → Executable file
0
src/admin/src/Install/install.sql
Normal file → Executable file
0
src/admin/src/Middleware/AuthMiddleware.php
Normal file → Executable file
0
src/admin/src/Middleware/AuthMiddleware.php
Normal file → Executable file
0
src/admin/src/Middleware/PermissionMiddleware.php
Normal file → Executable file
0
src/admin/src/Middleware/PermissionMiddleware.php
Normal file → Executable file
0
src/admin/src/Model/CommonConfig.php
Normal file → Executable file
0
src/admin/src/Model/CommonConfig.php
Normal file → Executable file
0
src/admin/src/Model/ExportTasks.php
Normal file → Executable file
0
src/admin/src/Model/ExportTasks.php
Normal file → Executable file
0
src/admin/src/Model/FrontRoutes.php
Normal file → Executable file
0
src/admin/src/Model/FrontRoutes.php
Normal file → Executable file
0
src/admin/src/Model/GlobalConfig.php
Normal file → Executable file
0
src/admin/src/Model/GlobalConfig.php
Normal file → Executable file
0
src/admin/src/Model/OperatorLog.php
Normal file → Executable file
0
src/admin/src/Model/OperatorLog.php
Normal file → Executable file
0
src/admin/src/Model/RequestLog.php
Normal file → Executable file
0
src/admin/src/Model/RequestLog.php
Normal file → Executable file
0
src/admin/src/Model/Role.php
Normal file → Executable file
0
src/admin/src/Model/Role.php
Normal file → Executable file
0
src/admin/src/Model/RoleMenu.php
Normal file → Executable file
0
src/admin/src/Model/RoleMenu.php
Normal file → Executable file
0
src/admin/src/Model/User.php
Normal file → Executable file
0
src/admin/src/Model/User.php
Normal file → Executable file
0
src/admin/src/Model/UserRole.php
Normal file → Executable file
0
src/admin/src/Model/UserRole.php
Normal file → Executable file
0
src/admin/src/Model/Version.php
Normal file → Executable file
0
src/admin/src/Model/Version.php
Normal file → Executable file
0
src/admin/src/Model/Versionable.php
Normal file → Executable file
0
src/admin/src/Model/Versionable.php
Normal file → Executable file
0
src/admin/src/Service/AuthService.php
Normal file → Executable file
0
src/admin/src/Service/AuthService.php
Normal file → Executable file
0
src/admin/src/Service/CommonConfig.php
Normal file → Executable file
0
src/admin/src/Service/CommonConfig.php
Normal file → Executable file
0
src/admin/src/Service/ExportService.php
Normal file → Executable file
0
src/admin/src/Service/ExportService.php
Normal file → Executable file
0
src/admin/src/Service/GlobalConfig.php
Normal file → Executable file
0
src/admin/src/Service/GlobalConfig.php
Normal file → Executable file
0
src/admin/src/Service/Menu.php
Normal file → Executable file
0
src/admin/src/Service/Menu.php
Normal file → Executable file
0
src/admin/src/Service/ModuleProxy.php
Normal file → Executable file
0
src/admin/src/Service/ModuleProxy.php
Normal file → Executable file
0
src/admin/src/Service/OperatorLogService.php
Normal file → Executable file
0
src/admin/src/Service/OperatorLogService.php
Normal file → Executable file
0
src/admin/src/Service/PermissionService.php
Normal file → Executable file
0
src/admin/src/Service/PermissionService.php
Normal file → Executable file
0
src/admin/src/Service/UserService.php
Normal file → Executable file
0
src/admin/src/Service/UserService.php
Normal file → Executable file
0
src/admin/src/config/config.php
Normal file → Executable file
0
src/admin/src/config/config.php
Normal file → Executable file
0
src/admin/src/config/routes.php
Normal file → Executable file
0
src/admin/src/config/routes.php
Normal file → Executable file
0
src/admin/src/funcs/common.php
Normal file → Executable file
0
src/admin/src/funcs/common.php
Normal file → Executable file
@@ -827,7 +827,8 @@ abstract class AbstractController extends Controller
|
||||
switch ($_form['type']) {
|
||||
case 'checkbox':
|
||||
case 'cascader':
|
||||
$_form['value'] = array_map('intval', is_array($_form['value']) ? $_form['value'] : (array)$_form['value']);
|
||||
// $_form['value'] = array_map('intval', is_array($_form['value']) ? $_form['value'] : (array)$_form['value']);
|
||||
$_form['value'] = (array)$_form['value'];
|
||||
break;
|
||||
case 'image':
|
||||
$biz['props']['limit'] = $biz['props']['limit'] ?? 1;
|
||||
|
||||
Reference in New Issue
Block a user