chore: 1

docker/run/docker-compose.yaml

@@ -30,11 +30,6 @@ services:
       # 配置规则： certd_ + 配置项, 点号用_代替
       #                               ↓↓↓↓ ----------------------------- 如果忘记管理员密码，可以设置为true，重启之后，管理员密码将改成123456，然后请及时修改回false
       - certd_system_resetAdminPasswd=false
-      #                            ↓↓↓↓ -------------------------------- 默认同时启动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         # 数据库类型

packages/ui/certd-client/src/views/certd/pipeline/api.ts

@@ -84,6 +84,13 @@ export async function GetFiles(pipelineId: number) {
   });
 }
 
+export async function GetCount() {
+  return await request({
+    url: apiPrefix + "/count",
+    method: "post"
+  });
+}
+
 export type CertInfo = {
   crt: string;
   key: string;

packages/ui/certd-client/src/views/certd/pipeline/crud.tsx

@@ -438,6 +438,9 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
         status: {
           title: "状态",
           type: "dict-select",
+          search: {
+            show: true
+          },
           dict: dict({
             data: statusUtil.getOptions()
           }),

packages/ui/certd-client/src/views/certd/pipeline/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <fs-page class="fs-pipeline-detail">
     <pipeline-edit v-model:edit-mode="editMode" :pipeline-id="pipelineId" :options="pipelineOptionsRef"></pipeline-edit>
-    <a-tour v-model:current="tourCurrent" :open="tourOpen" :steps="tourSteps" @close="tourHandleOpen(false)" />
+    <a-tour v-bind="tour" v-model:current="tour.current" />
   </fs-page>
 </template>
 
@@ -14,6 +14,7 @@ import * as api from "./api";
 import { useRoute } from "vue-router";
 import { PipelineDetail, PipelineOptions, PluginGroups, RunHistory } from "./pipeline/type";
 import { TourProps } from "ant-design-vue";
+import { LocalStorage } from "/@/utils/util.storage";
 
 defineOptions({
   name: "PipelineDetail"
@@ -24,7 +25,7 @@ const pipelineId: Ref = ref(route.query.id);
 const pipelineOptions: PipelineOptions = {
   async getPipelineDetail({ pipelineId }) {
     const detail = await api.GetDetail(pipelineId);
-    onLoaded();
+    onLoaded(detail);
     return {
       pipeline: {
         id: detail.pipeline.id,
@@ -70,30 +71,37 @@ if (route.query.editMode !== "false") {
 }
 
 function useTour() {
-  const tourOpen = ref<boolean>(false);
-
-  const tourCurrent = ref(0);
-  //@ts-ignore
-  const tourSteps: TourProps["steps"] = ref([]);
+  const tour = ref({
+    open: false,
+    current: 0,
+    steps: [],
+    onClose: () => {
+      tour.value.open = false;
+    },
+    onFinish: () => {
+      tour.value.open = false;
+      LocalStorage.set("tour-off", true, 999999999);
+    }
+  });
 
   const tourHandleOpen = (val: boolean): void => {
     initSteps();
-    tourOpen.value = val;
+    tour.value.open = val;
   };
 
   function initSteps() {
     //@ts-ignore
-    tourSteps.value = [
+    tour.value.steps = [
       {
         title: "恭喜创建证书流水线成功",
-        description: "这里就是我们刚创建的证书任务,点击可以修改证书申请参数",
+        description: "这里就是我们刚创建的证书任务，点击可以修改证书申请参数",
         target: () => {
           return document.querySelector(".pipeline .stages .stage_0 .task");
         }
       },
       {
         title: "添加部署证书任务",
-        description: "证书申请成功之后还需要部署证书，点击这里可以添加部署任务",
+        description: "证书申请成功之后还需要部署证书，点击这里可以添加证书部署任务",
         target: () => {
           return document.querySelector(".pipeline .stages .last-stage .tasks .task");
         }
@@ -109,18 +117,28 @@ function useTour() {
   }
 
   return {
-    tourOpen,
-    tourCurrent,
-    tourSteps,
+    tour,
     tourHandleOpen
   };
 }
 
-const { tourOpen, tourCurrent, tourSteps, tourHandleOpen } = useTour();
+const { tour, tourHandleOpen } = useTour();
 
-async function onLoaded() {
-  await nextTick();
-  tourHandleOpen(true);
+async function onLoaded(pipeline: PipelineDetail) {
+  const count = LocalStorage.get("pipeline-count") ?? 0;
+  if (count > 1) {
+    return;
+  }
+  const off = LocalStorage.get("tour-off") ?? false;
+  if (off) {
+    return;
+  }
+  const res = await api.GetCount();
+  LocalStorage.set("pipeline-count", res.count);
+  if (res.count <= 1) {
+    await nextTick();
+    tourHandleOpen(true);
+  }
 }
 </script>
 <style lang="less">

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

@@ -10,7 +10,7 @@
       <div class="text">
         <div class="left">
           <div>
-            <span>您好，{{ userInfo.nickName || userInfo.username }}。 欢迎使用 {{ siteInfo.title }}</span>
+            <span>您好，{{ userInfo.nickName || userInfo.username }}， 欢迎使用 【{{ siteInfo.title }}】</span>
           </div>
           <div>
             <a-tag color="green" class="flex-inline"> <fs-icon icon="ion:time-outline" class="mr-5"></fs-icon> {{ now }}</a-tag>
@@ -215,7 +215,7 @@ onMounted(async () => {
         flex-direction: column;
         justify-content: center;
         > div {
-          margin: 2px;
+          margin: 4px;
         }
       }
     }

packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts

@@ -103,4 +103,10 @@ export class PipelineController extends CrudController<PipelineService> {
     await this.service.cancel(historyId);
     return this.ok({});
   }
+
+  @Post('/count', { summary: Constants.per.authOnly })
+  async count() {
+    const count = await this.service.count({ userId: this.getUserId() });
+    return this.ok({ count });
+  }
 }

packages/ui/certd-server/src/modules/db/d.ts

@@ -0,0 +1,3 @@
+export interface SqlAdapter {
+  date(columnName: string): string;
+}

packages/ui/certd-server/src/modules/db/index.ts

@@ -0,0 +1,34 @@
+import { SqliteAdapter } from './sqlite.js';
+import { PostgresqlAdapter } from './postgresql.js';
+import { Config, Init, Provide, Scope, ScopeEnum } from '@midwayjs/core';
+import { SqlAdapter } from './d.js';
+
+@Provide()
+@Scope(ScopeEnum.Singleton)
+export class DbAdapter implements SqlAdapter {
+  adapter: SqlAdapter;
+  @Config('typeorm.dataSource.default.type')
+  dbType: string;
+
+  @Init()
+  async init() {
+    if (this.isSqlite()) {
+      this.adapter = new SqliteAdapter();
+    } else if (this.isPostgresql()) {
+      this.adapter = new PostgresqlAdapter();
+    } else {
+      throw new Error(`dbType ${this.dbType} not support`);
+    }
+  }
+
+  isSqlite() {
+    return this.dbType === 'better-sqlite3';
+  }
+  isPostgresql() {
+    return this.dbType === 'postgres';
+  }
+
+  date(columnName: string) {
+    return this.adapter.date(columnName);
+  }
+}

packages/ui/certd-server/src/modules/db/postgresql.ts

@@ -0,0 +1,7 @@
+import { SqlAdapter } from './d.js';
+
+export class PostgresqlAdapter implements SqlAdapter {
+  date(columnName: string) {
+    return `to_char(${columnName}, 'YYYY-MM-DD')`;
+  }
+}

packages/ui/certd-server/src/modules/db/sqlite.ts

@@ -0,0 +1,7 @@
+import { SqlAdapter } from './d.js';
+
+export class SqliteAdapter implements SqlAdapter {
+  date(columnName: string) {
+    return `date(${columnName}, 'localtime')`;
+  }
+}

packages/ui/certd-server/src/modules/pipeline/service/history-service.ts

@@ -6,10 +6,10 @@ import { HistoryEntity } from '../entity/history.js';
 import { PipelineEntity } from '../entity/pipeline.js';
 import { HistoryDetail } from '../entity/vo/history-detail.js';
 import { HistoryLogService } from './history-log-service.js';
-import { FileItem, Pipeline, RunnableCollection } from '@certd/pipeline';
-import { FileStore } from '@certd/pipeline';
-import { logger } from '@certd/pipeline';
+import { FileItem, FileStore, logger, Pipeline, RunnableCollection } from '@certd/pipeline';
 import dayjs from 'dayjs';
+import { DbAdapter } from '../../db/index.js';
+
 /**
  * 证书申请
  */
@@ -24,6 +24,9 @@ export class HistoryService extends BaseService<HistoryEntity> {
   @Inject()
   logService: HistoryLogService;
 
+  @Inject()
+  dbAdapter: DbAdapter;
+
   @Config('certd')
   private certdConfig: any;
 
@@ -178,8 +181,6 @@ export class HistoryService extends BaseService<HistoryEntity> {
   async countPerDay(param: { days: number; userId?: any }) {
     const todayEnd = dayjs().endOf('day');
     const where: any = {
-      // 0点
-      // userId: param.userId,
       createTime: MoreThan(todayEnd.add(-param.days, 'day').toDate()),
     };
     if (param.userId > 0) {
@@ -187,8 +188,8 @@ export class HistoryService extends BaseService<HistoryEntity> {
     }
     const result = await this.getRepository()
       .createQueryBuilder('main')
-      .select('date(main.createTime)  AS date') // 将UNIX时间戳转换为日期
-      .addSelect('COUNT(*) AS count')
+      .select(`${this.dbAdapter.date('main.createTime')}  AS date`) // 将UNIX时间戳转换为日期
+      .addSelect('COUNT(1) AS count')
       .where(where)
       .groupBy('date')
       .getRawMany();

packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts

@@ -20,6 +20,7 @@ import { CnameRecordService } from '../../cname/service/cname-record-service.js'
 import { CnameProxyService } from './cname-proxy-service.js';
 import { PluginConfigGetter } from '../../plugin/service/plugin-config-getter.js';
 import dayjs from 'dayjs';
+import { DbAdapter } from '../../db/index.js';
 
 const runningTasks: Map<string | number, Executor> = new Map();
 const freeCount = 10;
@@ -60,6 +61,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
   @Config('certd')
   private certdConfig: any;
 
+  @Inject()
+  dbAdapter: DbAdapter;
+
   //@ts-ignore
   getRepository() {
     return this.repository;
@@ -522,8 +526,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
     const todayEnd = dayjs().endOf('day');
     const result = await this.getRepository()
       .createQueryBuilder('main')
-      .select('date(main.createTime)  AS date') // 将UNIX时间戳转换为日期
-      .addSelect('COUNT(*) AS count')
+      .select(`${this.dbAdapter.date('main.createTime')}  AS date`) // 将UNIX时间戳转换为日期
+      .addSelect('COUNT(1) AS count')
       .where({
         // 0点
         createTime: MoreThan(todayEnd.add(-param.days, 'day').toDate()),

packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts

@@ -4,18 +4,15 @@ import { MoreThan, Repository } from 'typeorm';
 import { UserEntity } from '../entity/user.js';
 import * as _ from 'lodash-es';
 import md5 from 'md5';
-import { CommonException, FileService } from '@certd/lib-server';
-import { BaseService } from '@certd/lib-server';
+import { BaseService, CommonException, Constants, FileService, SysInstallInfo, SysSettingsService } from '@certd/lib-server';
 import { RoleService } from './role-service.js';
 import { PermissionService } from './permission-service.js';
 import { UserRoleService } from './user-role-service.js';
-import { Constants } from '@certd/lib-server';
 import { UserRoleEntity } from '../entity/user-role.js';
 import bcrypt from 'bcryptjs';
-import { SysSettingsService } from '@certd/lib-server';
-import { SysInstallInfo } from '@certd/lib-server';
 import { RandomUtil } from '../../../../utils/random.js';
 import dayjs from 'dayjs';
+import { DbAdapter } from '../../../db/index.js';
 
 /**
  * 系统用户
@@ -37,6 +34,8 @@ export class UserService extends BaseService<UserEntity> {
 
   @Inject()
   fileService: FileService;
+  @Inject()
+  dbAdapter: DbAdapter;
 
   //@ts-ignore
   getRepository() {
@@ -260,8 +259,8 @@ export class UserService extends BaseService<UserEntity> {
     const todayEnd = dayjs().endOf('day');
     const result = await this.getRepository()
       .createQueryBuilder('main')
-      .select('date(main.createTime)  AS date') // 将UNIX时间戳转换为日期
-      .addSelect('COUNT(*) AS count')
+      .select(`${this.dbAdapter.date('main.createTime')}  AS date`) // 将UNIX时间戳转换为日期
+      .addSelect('COUNT(1) AS count')
       .where({
         // 0点
         createTime: MoreThan(todayEnd.add(-param.days, 'day').toDate()),