Skip to content

Commit fa0fe46

Browse files
author
miaowing
committed
clear code
1 parent f00f701 commit fa0fe46

File tree

14 files changed

+73
-341
lines changed

14 files changed

+73
-341
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
<a href="https://coveralls.io/github/nest-cloud/nestcloud?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nest-cloud/nestcloud/badge.svg?branch=master" alt="Coverage"/></a>
1515
</p>
1616

17-
A NodeJS micro-service solution based on Consul, writing by Typescript language and NestJS framework.
18-
19-
This starter is for NestCloud above v0.2.1, [email protected] ~ 0.2.0 Please see ([[email protected]](https://github.com/nest-cloud/nestcloud-starter/tree/v0.1.x)).
17+
A NodeJS micro-service solution, writing by Typescript language and NestJS framework.
2018

2119
## Installation
2220

@@ -30,7 +28,7 @@ $ yarn install
3028
- Mysql
3129

3230
```bash
33-
docker run -d --name=dev-consul -e CONSUL_BIND_INTERFACE=eth0 -p 8500:8500 consul
31+
docker run -d --name dev-consul -e CONSUL_BIND_INTERFACE=eth0 -p 8500:8500 consul
3432
docker run -d --name dev-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -e MYSQL_DATABASE=nestcloud -p 3306:3306 mysql:5.7
3533
```
3634

package.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@
2020
},
2121
"dependencies": {
2222
"@godaddy/terminus": "^4.1.2",
23-
"@nestcloud/boot": "^0.5.0-9",
24-
"@nestcloud/common": "^0.5.0-9",
25-
"@nestcloud/consul": "^0.5.0-9",
26-
"@nestcloud/config": "^0.5.0-9",
27-
"@nestcloud/service": "^0.5.0-9",
28-
"@nestcloud/core": "^0.5.0-9",
29-
"@nestcloud/feign": "^0.5.0-9",
30-
"@nestcloud/loadbalance": "^0.5.0-9",
31-
"@nestcloud/logger": "^0.5.0-9",
32-
"@nestcloud/proxy": "^0.5.0-9",
33-
"@nestcloud/schedule": "^0.5.0-9",
34-
"@nestcloud/validations": "^0.5.0-9",
23+
"@nestcloud/boot": "^0.5.2",
24+
"@nestcloud/common": "^0.5.2",
25+
"@nestcloud/consul": "^0.5.2",
26+
"@nestcloud/config": "^0.5.2",
27+
"@nestcloud/service": "^0.5.2",
28+
"@nestcloud/core": "^0.5.2",
29+
"@nestcloud/feign": "^0.5.2",
30+
"@nestcloud/loadbalance": "^0.5.2",
31+
"@nestcloud/logger": "^0.5.2",
32+
"@nestcloud/validations": "^0.5.2",
3533
"@nestjs/common": "^6.5.3",
3634
"@nestjs/core": "^6.5.3",
3735
"@nestjs/microservices": "^6.5.3",

src/app.module.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { ConfigModule } from '@nestcloud/config';
55
import { ServiceModule } from '@nestcloud/service';
66
import { LoadbalanceModule } from '@nestcloud/loadbalance';
77
import { FeignModule } from '@nestcloud/feign';
8-
import { ScheduleModule } from '@nestcloud/schedule';
98
import {
109
NEST_BOOT,
1110
NEST_LOADBALANCE,
@@ -17,7 +16,6 @@ import {
1716
} from '@nestcloud/common';
1817
import { TypeOrmHealthIndicator, TerminusModule, TerminusModuleOptions } from '@nestjs/terminus';
1918
import { TypeOrmModule } from '@nestjs/typeorm';
20-
import { ProxyModule } from '@nestcloud/proxy';
2119

2220
import * as controllers from './controllers';
2321
import * as repos from './repositories';
@@ -39,14 +37,12 @@ const getTerminusOptions = (db: TypeOrmHealthIndicator): TerminusModuleOptions =
3937
@Module({
4038
imports: [
4139
LoggerModule.register(),
42-
ScheduleModule.register(),
4340
BootModule.register(__dirname, `bootstrap-${process.env.NODE_ENV || 'development'}.yml`),
4441
ConsulModule.register({ dependencies: [NEST_BOOT] }),
4542
ConfigModule.register({ dependencies: [NEST_BOOT, NEST_CONSUL] }),
4643
ServiceModule.register({ dependencies: [NEST_BOOT] }),
4744
LoadbalanceModule.register({ dependencies: [NEST_BOOT] }),
4845
FeignModule.register({ dependencies: [NEST_LOADBALANCE] }),
49-
ProxyModule.register({ dependencies: [NEST_BOOT] }),
5046
TerminusModule.forRootAsync({
5147
inject: [TypeOrmHealthIndicator],
5248
useFactory: db => getTerminusOptions(db as TypeOrmHealthIndicator),

src/bootstrap-development.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ consul:
99
retryInterval: 5000
1010
service:
1111
id: null
12-
name: nestcloud-starter-service
12+
name: nestcloud-typeorm-example-service
1313
port: 8081
1414
config:
15-
key: nestcloud-starter-service-config
15+
key: nestcloud-typeorm-example-service-config
1616
dataSource:
1717
host: localhost
1818
port: 3306
@@ -29,20 +29,6 @@ loadbalance:
2929
rules:
3030
- service: your-service-name
3131
ruleCls: RoundRobinRule
32-
proxy:
33-
routes:
34-
- id: user
35-
# self
36-
uri: lb://nestcloud-starter-service
37-
filters:
38-
- name: AddRequestHeaderFilter
39-
parameters:
40-
test-header: test1213123123
41-
- name: AddResponseHeaderFilter
42-
parameters:
43-
response-header: 123123hello
44-
- id: article
45-
uri: https://api.apiopen.top/recommendPoetry
4632
logger:
4733
level: info
4834
transports:
@@ -69,5 +55,3 @@ logger:
6955
# 200M
7056
maxsize: 209715200
7157
maxFiles: 10
72-
custom:
73-
data: test

src/bootstrap-production.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,17 @@ consul:
99
retryInterval: 5000
1010
service:
1111
id: null
12-
name: nestcloud-starter-service
12+
name: nestcloud-typeorm-example-service
1313
port: ${{ PORT }}
1414
config:
15-
key: nestcloud-starter-service-config
15+
key: nestcloud-typeorm-example-service-config
1616
dataSource:
1717
host: ${{ DB_HOST }}
1818
port: ${{ DB_PORT }}
1919
username: ${{ DB_USER }}
2020
password: ${{ DB_PWD }}
2121
synchronize: false
2222
maxQueryExecutionTime: 1000
23-
proxy:
24-
routes:
25-
- id: user
26-
# self
27-
uri: lb://nestcloud-starter-service
28-
- id: article
29-
uri: https://api.apiopen.top/recommendPoetry
3023
logger:
3124
level: info
3225
transports:

src/clients/ArticleClient.ts

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

src/clients/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
export * from './UserClient';
2-
export * from './ArticleClient';

src/clients/interceptors/AddHeaderInterceptor.ts

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

src/controllers/ArticleController.ts

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

src/controllers/ProxyController.ts

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

0 commit comments

Comments
 (0)