mirror of https://github.com/certd/certd
				
				
				
			fix: 修复历史记录根据流水线名称查询报错的bug
							parent
							
								
									0584b3672b
								
							
						
					
					
						commit
						ce9a9862f1
					
				|  | @ -6,6 +6,7 @@ import { CacheManager } from '@midwayjs/cache'; | |||
| import { BaseSettings, SysPrivateSettings, SysPublicSettings } from './models.js'; | ||||
| import * as _ from 'lodash-es'; | ||||
| import { BaseService } from '../../../basic/index.js'; | ||||
| import { checkComm } from '@certd/pipeline'; | ||||
| 
 | ||||
| /** | ||||
|  * 设置 | ||||
|  | @ -39,6 +40,9 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> { | |||
|     if (!key) { | ||||
|       return null; | ||||
|     } | ||||
|     if (key === 'sys.site') { | ||||
|       checkComm(); | ||||
|     } | ||||
|     return await this.repository.findOne({ | ||||
|       where: { | ||||
|         key, | ||||
|  |  | |||
|  | @ -154,7 +154,10 @@ function openUpgrade() { | |||
|           <div class="vip-type-vs"> | ||||
|             <a-row gutter={20}> | ||||
|               <a-col span={8}> | ||||
|                 <h3 class="block-header">免费版</h3> | ||||
|                 <h3 class="block-header"> | ||||
|                   免费版 | ||||
|                   <fs-icon v-if="!userStore.isPlus" class="color-green" icon="ion:checkmark-sharp" /> | ||||
|                 </h3> | ||||
|                 <ul> | ||||
|                   <li> | ||||
|                     <fs-icon class="color-green" icon="ion:checkmark-sharp"></fs-icon>证书申请功能无限制 | ||||
|  | @ -170,7 +173,10 @@ function openUpgrade() { | |||
|                 </ul> | ||||
|               </a-col> | ||||
|               <a-col span={8}> | ||||
|                 <h3 class="block-header">专业版</h3> | ||||
|                 <h3 class="block-header"> | ||||
|                   专业版 | ||||
|                   <fs-icon v-if="userStore.isPlus && !userStore.isComm" class="color-green" icon="ion:checkmark-sharp" /> | ||||
|                 </h3> | ||||
|                 <ul> | ||||
|                   <li> | ||||
|                     <fs-icon class="color-green" icon="ion:checkmark-sharp"></fs-icon> | ||||
|  | @ -191,7 +197,10 @@ function openUpgrade() { | |||
|                 </ul> | ||||
|               </a-col> | ||||
|               <a-col span={8}> | ||||
|                 <h3 class="block-header">商业版</h3> | ||||
|                 <h3 class="block-header"> | ||||
|                   商业版 | ||||
|                   <fs-icon v-if="userStore.isComm" class="color-green" icon="ion:checkmark-sharp" /> | ||||
|                 </h3> | ||||
|                 <ul> | ||||
|                   <li> | ||||
|                     <fs-icon class="color-green" icon="ion:checkmark-sharp"></fs-icon> | ||||
|  | @ -265,6 +274,9 @@ function openUpgrade() { | |||
|     margin-left: 0px; | ||||
|     padding: 0; | ||||
|   } | ||||
|   .color-green { | ||||
|     color: green; | ||||
|   } | ||||
|   .vip-type-vs { | ||||
|     .fs-icon { | ||||
|       margin-right: 5px; | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
|   <a-layout class="fs-framework"> | ||||
|     <a-layout-sider v-model:collapsed="asideCollapsed" :trigger="null" collapsible> | ||||
|       <div class="header-logo"> | ||||
|         <img src="/assets/images/logo/logo.svg" /> | ||||
|         <img src="/static/images/logo/logo.svg" /> | ||||
|         <span v-if="!asideCollapsed" class="title">Certd</span> | ||||
|       </div> | ||||
|       <div class="aside-menu"> | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
|       <div class="user-layout-content"> | ||||
|         <div class="top flex flex-col items-center justify-center"> | ||||
|           <div class="header flex flex-row items-center"> | ||||
|             <img src="/assets/images/logo/rect-black.svg" class="logo" alt="logo" /> | ||||
|             <img src="/static/images/logo/rect-black.svg" class="logo" alt="logo" /> | ||||
|             <span class="title"></span> | ||||
|           </div> | ||||
|           <div class="desc"></div> | ||||
|  | @ -65,7 +65,7 @@ export default { | |||
|   .login-container { | ||||
|     width: 100%; | ||||
|     min-height: 100%; | ||||
|     background: #f0f2f5 url(/src/assets/background.svg) no-repeat 50%; | ||||
|     background: #f0f2f5 url(/static/background.svg) no-repeat 50%; | ||||
|     background-size: 100%; | ||||
|     //padding: 50px 0 84px; | ||||
|     position: relative; | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ export const sysResources = [ | |||
|     title: "系统管理", | ||||
|     name: "sys", | ||||
|     path: "/sys", | ||||
|     redirect: "/sys/authority", | ||||
|     redirect: "/sys/settings", | ||||
|     component: LayoutPass, | ||||
|     meta: { | ||||
|       icon: "ion:settings-outline", | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ | |||
|       </a-alert> | ||||
|     </div> | ||||
|     <div class="content"> | ||||
|       <img src="/assets/images/preview.png" class="preview_img" /> | ||||
|       <img src="/static/images/preview.png" class="preview_img" /> | ||||
|     </div> | ||||
|     <div class="footer_box"> | ||||
|       <div>如果觉得好用,请不要吝啬你的star哟!</div> | ||||
|  |  | |||
|  | @ -39,7 +39,6 @@ | |||
| <script setup lang="ts"> | ||||
| import { reactive } from "vue"; | ||||
| import * as api from "./api"; | ||||
| import { PublicSettingsSave, SettingKeys } from "./api"; | ||||
| import { notification } from "ant-design-vue"; | ||||
| import { useSettingStore } from "/src/store/modules/settings"; | ||||
| 
 | ||||
|  | @ -50,37 +49,26 @@ interface FormState { | |||
|   icpNo: string; | ||||
| } | ||||
| 
 | ||||
| const formState = reactive<Partial<FormState>>({ | ||||
|   registerEnabled: false, | ||||
|   managerOtherUserPipeline: false | ||||
| }); | ||||
| const formState = reactive<Partial<FormState>>({}); | ||||
| 
 | ||||
| async function loadSysPublicSettings() { | ||||
|   const data: any = await api.SettingsGet(SettingKeys.SysPublic); | ||||
| async function loadSysSiteSettings() { | ||||
|   const data: any = await api.SettingsGet(); | ||||
|   if (data == null) { | ||||
|     return; | ||||
|   } | ||||
|   const setting = JSON.parse(data.setting); | ||||
|   Object.assign(formState, setting); | ||||
| } | ||||
| 
 | ||||
| loadSysPublicSettings(); | ||||
| loadSysSiteSettings(); | ||||
| const settingsStore = useSettingStore(); | ||||
| const onFinish = async (form: any) => { | ||||
|   await api.PublicSettingsSave(form); | ||||
|   await api.SettingsSave(form); | ||||
|   await settingsStore.loadSysSettings(); | ||||
|   notification.success({ | ||||
|     message: "保存成功" | ||||
|   }); | ||||
| }; | ||||
| 
 | ||||
| const onFinishFailed = (errorInfo: any) => { | ||||
|   // console.log("Failed:", errorInfo); | ||||
| }; | ||||
| 
 | ||||
| async function stopOtherUserTimer() { | ||||
|   await api.stopOtherUserTimer(); | ||||
|   notification.success({ | ||||
|     message: "停止成功" | ||||
|   }); | ||||
| } | ||||
| </script> | ||||
| 
 | ||||
| <style lang="less"> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 xiaojunnuo
						xiaojunnuo