Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev

packages/ui/certd-client/src/views/framework/forgot-password/index.vue

@@ -76,7 +76,7 @@
         <a-button type="primary" size="large" html-type="submit" class="submit-button"> 找回密码</a-button>
 
         <div class="mt-2 flex-between">
-          <a v-comm="false" href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员无绑定通信方式或MFA丢失找回 </a>
+          <a v-comm="false" href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员忘记密码 </a>
 
           <router-link :to="{ name: 'login' }"> 返回登录 </router-link>
         </div>

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -59,6 +59,9 @@
               <router-link v-if="!!settingStore.sysPublic.selfServicePasswordRetrievalEnabled && !queryBindCode" :to="{ name: 'forgotPassword' }">
                 {{ t("authentication.forgotPassword") }}
               </router-link>
+              <a v-else v-comm="false" href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank">
+                {{ t("authentication.forgotPassword") }}
+              </a>
             </div>
 
             <router-link v-if="hasRegisterTypeEnabled() && !queryBindCode" class="register" :to="{ name: 'register' }">

packages/ui/certd-server/src/middleware/reset-passwd/middleware.ts

@@ -33,21 +33,6 @@ export class ResetPasswdMiddleware implements IWebMiddleware {
 
   @Init()
   async init() {
-    if (this.resetAdminPasswd === true) {
+    
-      logger.info('开始重置1号管理员用户的密码');
-      const newPasswd = '123456';
-      await this.userService.resetPassword(1, newPasswd);
-      await this.userService.updateStatus(1, 1);
-      await this.userSettingsService.deleteWhere({
-        userId: 1,
-        key:"user.two.factor"
-      })
-      const publicSettings = await this.sysSettingsService.getPublicSettings()
-      publicSettings.captchaEnabled = false
-      await this.sysSettingsService.savePublicSettings(publicSettings);
-
-      const user = await this.userService.info(1);
-      logger.info(`重置1号管理员用户的密码完成，2FA设置已删除，验证码登录已禁用，用户名：${user.username},新密码：${newPasswd}，请在登录进去之后尽快修改密码`);
-    }
   }
 }

packages/ui/certd-server/src/modules/auto/auto-z.ts

@@ -7,6 +7,8 @@ import { getVersion } from '../../utils/version.js';
 import dayjs from 'dayjs';
 import { Application } from '@midwayjs/koa';
 import { httpsServer, HttpsServerOptions } from './https/server.js';
+import { UserService } from '../sys/authority/service/user-service.js';
+import { UserSettingsService } from '../mine/service/user-settings-service.js';
 
 @Autoload()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
@@ -22,6 +24,15 @@ export class AutoZPrint {
   @Config('koa')
   koaConfig: any;
 
+  @Inject()
+  userService: UserService;
+  
+  @Inject()
+  userSettingsService: UserSettingsService;
+
+  @Config('system.resetAdminPasswd')
+  private resetAdminPasswd: boolean;
+
   @Init()
   async init() {
     //监听https
@@ -41,6 +52,26 @@ export class AutoZPrint {
     }
     logger.info('Certd已启动');
     logger.info('=========================================');
+    await this.resetPasswd();
+  }
+
+  async resetPasswd(){
+    if (this.resetAdminPasswd === true) {
+      logger.info('开始重置1号管理员用户的密码');
+      const newPasswd = '123456';
+      await this.userService.resetPassword(1, newPasswd);
+      await this.userService.updateStatus(1, 1);
+      await this.userSettingsService.deleteWhere({
+        userId: 1,
+        key:"user.two.factor"
+      })
+      const publicSettings = await this.sysSettingsService.getPublicSettings()
+      publicSettings.captchaEnabled = false
+      await this.sysSettingsService.savePublicSettings(publicSettings);
+
+      const user = await this.userService.info(1);
+      logger.info(`重置1号管理员用户的密码完成，2FA设置已删除，验证码登录已禁用，用户名：${user.username},新密码：${newPasswd}，请在登录进去之后尽快修改密码`);
+    }
   }
 
   startHeapLog() {