Skip to content

Fix the controller generation zip judgement failure problem #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Fix the controller generation zip judgement failure problem #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
275fe11
Fix the controller generation zip judgement failure problem
zds-s Mar 12, 2024
e400a0c
Added close-pull-request actions
zds-s Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/app-store/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
13 changes: 13 additions & 0 deletions src/jwt-auth/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
13 changes: 13 additions & 0 deletions src/mine-core/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
13 changes: 13 additions & 0 deletions src/mine-generator/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
4 changes: 2 additions & 2 deletions src/mine-generator/src/ApiGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function setGenInfo(GeneratorTablesContract $generatorTablesContract): Ap
*/
public function generator(): void
{
$filename = Str::camel(str_replace(env('DB_PREFIX'), '', $this->tablesContract->getTablename()));
$filename = Str::camel(str_replace(env('DB_PREFIX', ''), '', $this->tablesContract->getTablename()));
$module = Str::lower($this->tablesContract->getModuleName());
$this->filesystem->makeDirectory(BASE_PATH . "/runtime/generate/vue/src/api/{$module}", 0755, true, true);
$path = BASE_PATH . "/runtime/generate/vue/src/api/{$module}/{$filename}.js";
Expand All @@ -89,7 +89,7 @@ public function getShortBusinessName(): string
return Str::camel(str_replace(
Str::lower($this->tablesContract->getModuleName()),
'',
str_replace(env('DB_PREFIX'), '', $this->tablesContract->getTablename())
str_replace(env('DB_PREFIX', ''), '', $this->tablesContract->getTablename())
));
}

Expand Down
7 changes: 4 additions & 3 deletions src/mine-generator/src/ControllerGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use Hyperf\Support\Filesystem\Filesystem;
use Mine\Exception\NormalStatusException;
use Mine\Generator\Contracts\GeneratorTablesContract;
use Mine\Generator\Enums\GenerateTypeEnum;
use Mine\Helper\Str;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
Expand Down Expand Up @@ -68,7 +69,7 @@ public function setGenInfo(GeneratorTablesContract $tablesContract): ControllerG
public function generator(): void
{
$module = Str::title($this->tablesContract->getModuleName()[0]) . mb_substr($this->tablesContract->getModuleName(), 1);
if ($this->tablesContract->getGenerateType() === 1) {
if ($this->tablesContract->getGenerateType() === GenerateTypeEnum::ZIP) {
$path = BASE_PATH . "/runtime/generate/php/app/{$module}/Controller/";
} else {
$path = BASE_PATH . "/app/{$module}/Controller/";
Expand Down Expand Up @@ -101,7 +102,7 @@ public function getType(): string
*/
public function getBusinessName(): string
{
return Str::studly(str_replace(env('DB_PREFIX'), '', $this->tablesContract->getTableName()));
return Str::studly(str_replace(env('DB_PREFIX', ''), '', $this->tablesContract->getTableName()));
}

/**
Expand All @@ -112,7 +113,7 @@ public function getShortBusinessName(): string
return Str::camel(str_replace(
Str::lower($this->tablesContract->getModuleName()),
'',
str_replace(env('DB_PREFIX'), '', $this->tablesContract->getTableName())
str_replace(env('DB_PREFIX', ''), '', $this->tablesContract->getTableName())
));
}

Expand Down
13 changes: 13 additions & 0 deletions src/mine-helpers/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
13 changes: 13 additions & 0 deletions src/mine-service/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
13 changes: 13 additions & 0 deletions src/next-core-x/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
13 changes: 13 additions & 0 deletions src/office/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "
13 changes: 13 additions & 0 deletions src/translatable/.github/workflows/close-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Pull Request

on:
pull_request_target:
types: [ opened ]

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: superbrothers/close-pull-request@v3
with:
comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/mineadmin/components repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "