github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'refs/heads/v2' into v2-dev

pull/213/head
xiaojunnuo 2024-10-12 17:24:01 +08:00
parent 273ab6139f a10b8aa042
commit 67ba17286c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/ui/certd-client/src/layout/layout-framework.vue
View File

@ -93,7 +93,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, onErrorCaptured, ref } from "vue"; import { computed, onErrorCaptured, onMounted, ref } from "vue";
import FsMenu from "./components/menu/index.jsx"; import FsMenu from "./components/menu/index.jsx";
import FsLocale from "./components/locale/index.vue"; import FsLocale from "./components/locale/index.vue";
import FsUserInfo from "./components/user-info/index.vue"; import FsUserInfo from "./components/user-info/index.vue";
@ -146,6 +146,10 @@ const sysPublic = computed(() => {
const siteInfo = computed(() => { const siteInfo = computed(() => {
return settingStore.siteInfo; return settingStore.siteInfo;
}); });
onMounted(async () => {
await settingStore.checkUrlBound();
});
</script> </script>
<style lang="less"> <style lang="less">
@import "../style/theme/index.less"; @import "../style/theme/index.less";

1
packages/ui/certd-client/src/store/modules/settings.ts
View File

@ -135,7 +135,6 @@ export const useSettingStore = defineStore({
_.merge(this.plusInfo, allSettings.plusInfo || {}); _.merge(this.plusInfo, allSettings.plusInfo || {});
//@ts-ignore //@ts-ignore
this.initSiteInfo(allSettings.siteInfo || {}); this.initSiteInfo(allSettings.siteInfo || {});
await this.checkUrlBound();
}, },
initSiteInfo(siteInfo: SiteInfo) { initSiteInfo(siteInfo: SiteInfo) {
//@ts-ignore //@ts-ignore

2
packages/ui/certd-server/src/modules/auto/auto-init-site.ts
View File

@ -63,6 +63,8 @@ export class AutoInitSite {
} }
logger.info('初始化站点完成'); logger.info('初始化站点完成');
// const pkg = require('../../../package.json');
// logger.info(`当前版本为：${pkg.version}`);
} }
async startOptimizeDb() { async startOptimizeDb() {