diff --git a/docker/run/docker-compose.yaml b/docker/run/docker-compose.yaml index cf5bd70f..420cf0b1 100644 --- a/docker/run/docker-compose.yaml +++ b/docker/run/docker-compose.yaml @@ -28,18 +28,14 @@ services: # 设置环境变量即可自定义certd配置 # 配置项见: packages/ui/certd-server/src/config/config.default.ts # 配置规则: certd_ + 配置项, 点号用_代替 - - # ↓↓↓↓ ------------------------------------ 这里可以设置http代理 - #- HTTPS_PROXY=http://xxxxxx:xx - #- HTTP_PROXY=http://xxxxxx:xx # ↓↓↓↓ ----------------------------- 如果忘记管理员密码,可以设置为true,重启之后,管理员密码将改成123456,然后请及时修改回false - certd_system_resetAdminPasswd=false - # ↓↓↓↓ -------------------------- 如果设置为true,启动后所有配置了cron的流水线任务都将被立即触发一次 - - certd_cron_immediateTriggerOnce=false - # ↓↓↓↓ -------------------------------- 配置证书和key,则表示https方式启动,使用https协议访问,https://your.domain:7001 - #- certd_koa_key=./data/ssl/cert.key - #- certd_koa_cert=./data/ssl/cert.crt - + # ↓↓↓↓ -------------------------------- 默认同时启动https,https访问地址https://your.domain:7002 + #- certd_https_key=./data/ssl/cert.key + #- certd_https_cert=./data/ssl/cert.crt + #- certd_https_enabled=true + #- certd_https_port=7002 + - # ↓↓↓↓ ------------------------------- 使用postgresql数据库 # - certd_flyway_scriptDir=./db/migration-pg # 升级脚本目录 # - certd_typeorm_dataSource_default_type=postgres # 数据库类型 diff --git a/packages/ui/certd-client/public/static/images/logo/logo.png b/packages/ui/certd-client/public/static/images/logo/logo.png new file mode 100644 index 00000000..cb42f747 Binary files /dev/null and b/packages/ui/certd-client/public/static/images/logo/logo.png differ diff --git a/packages/ui/certd-server/src/middleware/reset-passwd/middleware.ts b/packages/ui/certd-server/src/middleware/reset-passwd/middleware.ts index 56fa7bbb..eba30c11 100644 --- a/packages/ui/certd-server/src/middleware/reset-passwd/middleware.ts +++ b/packages/ui/certd-server/src/middleware/reset-passwd/middleware.ts @@ -30,6 +30,7 @@ export class ResetPasswdMiddleware implements IWebMiddleware { logger.info('开始重置1号管理员用户的密码'); const newPasswd = '123456'; await this.userService.resetPassword(1, newPasswd); + await this.userService.updateStatus(1, 1); logger.info(`重置1号管理员用户的密码完成,新密码为:${newPasswd}`); } } diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts index a6a0d27b..5748a6f4 100644 --- a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts +++ b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts @@ -198,6 +198,9 @@ export class UserService extends BaseService { } async resetPassword(userId: any, newPasswd: string) { + if (!userId) { + throw new CommonException('userId不能为空'); + } const param = { id: userId, password: newPasswd, @@ -210,15 +213,19 @@ export class UserService extends BaseService { ids = ids.split(','); ids = ids.map(id => parseInt(id)); } - if (ids instanceof Array) { - if (ids.includes(1)) { - throw new CommonException('不能删除管理员'); - } + if (ids.length === 0) { + return; + } + if (ids.includes(1)) { + throw new CommonException('不能删除管理员'); } await super.delete(ids); } async isAdmin(userId: any) { + if (!userId) { + throw new CommonException('userId不能为空'); + } const userRoles = await this.userRoleService.find({ where: { userId, @@ -229,4 +236,13 @@ export class UserService extends BaseService { return true; } } + + async updateStatus(id: number, status: number) { + if (!id) { + throw new CommonException('userId不能为空'); + } + await this.repository.update(id, { + status, + }); + } }