Skip to content

Commit 6367786

Browse files
authored
Merge pull request #4 from DTStack/for-github
For GitHub
2 parents 9f11c0c + 93aeb82 commit 6367786

File tree

36 files changed

+370
-206
lines changed

36 files changed

+370
-206
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DB_PASSWORD='123456'
2121
DB_DATABASE='yice-performance'
2222

2323
# devops 的默认用户名和密码
24-
DEVOPS_USERNAME="admin@dtstack.com"
24+
DEVOPS_USERNAME="admin"
2525
DEVOPS_PASSWORD="123456"
2626
# devops 接口请求时默认的 cookie
2727
DEVOPS_COOKIE=""

.github/workflows/CI.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
node-version: 14
2020

2121
- name: Setup pnpm
22-
uses: pnpm/action-setup@v2
22+
uses: pnpm/action-setup@v4
2323
with:
2424
version: 6.35.1
2525

@@ -38,5 +38,8 @@ jobs:
3838
- name: Run test
3939
run: pnpm test
4040

41+
- name: Run check-types
42+
run: pnpm check-types
43+
4144
- name: Run build
4245
run: pnpm build

.gitlab-ci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
before_script:
44
- echo $CI_COMMIT_REF_NAME
55
- whoami
6+
- npm config set registry https://registry.npmmirror.com/
67
- pnpm install --reporter=silent
78

89
stages:
910
- prettier
1011
- eslint
1112
- stylelint
13+
- check-types
1214
- test
1315
- build
1416

@@ -36,10 +38,19 @@ stylelint:
3638
rules:
3739
- if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /master/
3840

41+
# 创建 MR 时执行;master 分支有 push 时执行
42+
check-types:
43+
stage: check-types
44+
needs: [prettier, eslint, stylelint]
45+
script:
46+
- pnpm check-types;
47+
rules:
48+
- if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /master/
49+
3950
# 创建 MR 时执行;master 分支有 push 时执行
4051
test:
4152
stage: test
42-
needs: [prettier, eslint, stylelint]
53+
needs: [check-types]
4354
script:
4455
- pnpm test;
4556
rules:

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.md
33
dist
44
*.less
5+
.turbo

.vscode/settings.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"editor.formatOnSave": true,
3-
"editor.codeActionsOnSave": {
4-
"source.fixAll.eslint": "explicit",
5-
"source.fixAll.stylelint": "explicit"
6-
},
72
"editor.defaultFormatter": "esbenp.prettier-vscode",
83
"files.insertFinalNewline": true,
94
"[typescriptreact]": {

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,29 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [2.2.2](///compare/v2.2.1...v2.2.2) (2024-11-20)
6+
7+
8+
### Bug Fixes
9+
10+
* use new fetchData's params when autoRefresh 69baf39
11+
12+
### [2.2.1](///compare/v2.2.0...v2.2.1) (2024-11-19)
13+
14+
15+
### Bug Fixes
16+
17+
* use real time when send emails 7c69162
18+
19+
## [2.2.0](///compare/v2.1.2...v2.2.0) (2024-09-10)
20+
21+
22+
### Features
23+
24+
* add pm2-logrotate for split logs by day f40eedd
25+
* some optimize 6d0668e
26+
* support 63x 70x f7a6dfa
27+
528
### [2.1.2](///compare/v2.1.1...v2.1.2) (2024-07-16)
629

730

README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,26 @@ cd yice-performance
6262
> 易测检测系统和我司内部的 devops 系统深度绑定,用于检测我司需要登录的一些页面,但不影响评分功能的实现参考。
6363
6464

65+
## 常见问题
66+
67+
### 1. yice-server 容器无法启动
68+
69+
  可能是 `docker` 版本较低,建议升级到 docker v24 及以上,升级前应当备份。
70+
71+
### 2. gcc 版本过低
72+
73+
  主机部署时建议使用 Ubuntu。
74+
  主机模式部署时 CentOS7 上启动服务时报错:Error: /lib64/libstdc++.so.6: version 'CXXABI_1.3.9' not found,这是因为 CentOS7 的 gcc 版本过低,需要升级到 gcc-4.8.5 以上,执行下方命令可以看到没有 CXXABI_1.3.9。
75+
76+
``` shell
77+
strings /lib64/libstdc++.so.6 | grep CXXABI
78+
```
79+
80+
### 3. MacOS M 系列 arm 芯片本地安装 canvas 时失败
81+
82+
   [email protected] [email protected] 代理开增强模式,可以正常安装依赖并启动。出现报错时,可以考虑使用这个依赖版本组合。
83+
84+
6585
## 趋势
6686

6787
[![Stargazers over time](https://starchart.cc/dtstack/yice-performance.svg)](https://starchart.cc/dtstack/yice-performance)

apps/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"cron-parser": "^4.8.1",
3636
"dingtalk-robot-sender": "^1.2.0",
3737
"dotenv": "^16.3.1",
38-
"jsdom": "^22.1.0",
38+
"jsdom": "21.1.2",
3939
"lighthouse": "9.6.8",
4040
"mysql": "^2.18.1",
4141
"mysql2": "^3.2.0",

apps/server/src/modules/devops/controllers/devops.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class DevopsController {
5151
@HttpCode(HttpStatus.OK)
5252
@Get('getDevopsUrl')
5353
async getDevopsUrl(@Query() query: getStagesReqDto) {
54-
return await this.devopsService.getDevopsUrl(query?.shiliId);
54+
return await this.devopsService.getDevopsUrl(+query?.shiliId);
5555
}
5656

5757
@ApiOperation({ summary: '获取 devops 项目列表' })

apps/server/src/modules/devops/dto/devops.req.dto.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export class getShiLisReqDto {
77

88
export class getStagesReqDto {
99
@ApiPropertyOptional({ required: false, description: 'devops实例id' })
10-
shiliId: number;
10+
shiliId: string;
1111
}
1212

1313
export class getHistoriesReqDto {

0 commit comments

Comments
 (0)