Skip to content

Commit

Permalink
refactor: 调整 logger
Browse files Browse the repository at this point in the history
  • Loading branch information
terwer committed Jun 11, 2023
1 parent a4308cd commit 4175c4c
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/components/publish/PublishIndex.vue
Expand Up @@ -24,9 +24,9 @@
-->

<script setup lang="ts">
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
const logger = createLogger("publisher-index")
const logger = createAppLogger("publisher-index")
</script>

<template>
Expand Down
4 changes: 2 additions & 2 deletions src/components/test/SiyuanTest.vue
Expand Up @@ -24,15 +24,15 @@
-->

<script setup lang="ts">
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { reactive, ref } from "vue"
import { AppInstance } from "~/src/appInstance.ts"
import { Utils } from "~/src/utils/utils.ts"
import { SiYuanApiAdaptor, SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api"
import { MediaObject, Post } from "zhi-blog-api"
import { fileToBuffer } from "~/src/utils/polyfillUtils.ts"
const logger = createLogger("siyuan-test")
const logger = createAppLogger("siyuan-test")
const params = ref("{}")
const showParamFile = ref(false)
Expand Down
8 changes: 4 additions & 4 deletions src/components/test/WordpressTest.vue
Expand Up @@ -26,13 +26,13 @@
<script setup lang="ts">
import { AppInstance } from "~/src/appInstance.ts"
import { Utils } from "~/src/utils/utils.ts"
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { reactive, ref } from "vue"
import { fileToBuffer } from "~/src/utils/polyfillUtils.ts"
import { SimpleXmlRpcClient } from "simple-xmlrpc"
import {MediaObject} from "zhi-blog-api";
import { MediaObject } from "zhi-blog-api"
import { createAppLogger } from "~/src/utils/appLogger.ts"
const logger = createLogger("wordpress-test")
const logger = createAppLogger("wordpress-test")
const params = ref("{}")
const showParamFile = ref(false)
Expand Down Expand Up @@ -236,7 +236,7 @@ const wordpressHandleApi = async () => {
overwrite: true,
}
const xmlrpcApiUrl = "http://127.0.0.1:3000/xmlrpc.php"
const client = new SimpleXmlRpcClient(xmlrpcApiUrl)
const client = new SimpleXmlRpcClient(xmlrpcApiUrl, "", {})
const result = await client.methodCall("metaWeblog.newMediaObject", ["", "terwer", "123456", metadata])
logMessage.value = JSON.stringify(result)
logger.info("wordpress new mediaObject result=>", result)
Expand Down
4 changes: 2 additions & 2 deletions src/composables/useRouter.ts
Expand Up @@ -24,9 +24,9 @@
*/

import { createRouter, createWebHashHistory, Router, RouteRecordRaw } from "vue-router"
import Home from "~/src/views/Home.vue"
import Home from "~/src/pages/Home.vue"

const ApiTest = () => import("~/src/views/ApiTest.vue")
const ApiTest = () => import("~/src/pages/ApiTest.vue")
const SiyuanTest = () => import("~/src/components/test/SiyuanTest.vue")
const WordpressTest = () => import("~/src/components/test/WordpressTest.vue")

Expand Down
4 changes: 2 additions & 2 deletions src/layouts/default/DefaultFooter.vue
Expand Up @@ -72,12 +72,12 @@
import { useDark, useToggle } from "@vueuse/core"
import { ref } from "vue"
import { version } from "../../../package.json"
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { Utils } from "~/src/utils/utils.ts"
import SetIndex from "~/src/components/set/SetIndex.vue"
const logger = createLogger("layouts/default/DefaultFooter")
const logger = createAppLogger("layouts/default/DefaultFooter")
const common = Utils.zhiCommon()
const { t } = useVueI18n()
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/default/DefaultHeader.vue
Expand Up @@ -28,11 +28,11 @@
</template>

<script lang="ts" setup>
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
const { t } = useVueI18n()
const logger = createLogger("layouts/default/DefaultHeader.vue")
const logger = createAppLogger("layouts/default/DefaultHeader.vue")
</script>

<style scoped></style>
4 changes: 2 additions & 2 deletions src/loaders/tools.ts
@@ -1,6 +1,6 @@
import { Utils } from "~/src/utils/utils"
import { AppInstance } from "~/src/appInstance.ts"
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"

/**
* 初始化工具类
Expand All @@ -9,7 +9,7 @@ import { createLogger } from "~/src/utils/simpleLogger.ts"
*/
export const initTools = async (appInstance: AppInstance) => {
// logger
appInstance.logger = createLogger("publisher-widget-app")
appInstance.logger = createAppLogger("publisher-widget-app")

// common
appInstance.common = Utils.zhiCommon()
Expand Down
4 changes: 2 additions & 2 deletions src/main.ts
Expand Up @@ -25,7 +25,7 @@

import { createApp } from "vue"
import App from "./App.vue"
import { createLogger } from "./utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useRouter } from "./composables/useRouter.ts"
import i18n from "~/src/locales"
import "element-plus/dist/index.css"
Expand All @@ -41,7 +41,7 @@ import { AppInstance } from "~/src/appInstance.ts"
* @since 0.0.1
*/
;(async () => {
const logger = createLogger("vue-main-entry")
const logger = createAppLogger("vue-main-entry")

// https://stackoverflow.com/a/62383325/4037224
const app = createApp(App)
Expand Down
4 changes: 2 additions & 2 deletions src/views/ApiTest.vue → src/pages/ApiTest.vue
Expand Up @@ -27,9 +27,9 @@
import { ref, toRaw } from "vue"
import { ElTabPane, ElTabs } from "element-plus"
import { useRouter } from "vue-router"
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
const logger = createLogger("api-test")
const logger = createAppLogger("api-test")
const router = useRouter()
const activeTab = ref<string>("siyuan")
Expand Down
File renamed without changes.
5 changes: 2 additions & 3 deletions src/stores/configUtil.ts
Expand Up @@ -24,10 +24,9 @@
*/

import { getLocalStorageAdaptor } from "~/src/stores/localStorageAdaptor.ts"
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { toRaw } from "vue"
import { createAppLogger } from "~/src/utils/appLogger.ts"

const logger = createLogger("localstorage-config")
const logger = createAppLogger("localstorage-config")

/**
* 获取配置:这个是所有数据保存的根方法
Expand Down
6 changes: 3 additions & 3 deletions src/utils/simpleLogger.ts → src/utils/appLogger.ts
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

import { isDev } from "./constants.ts"
import { isDev } from "~/src/utils/constants.ts"
import { simpleLogger } from "zhi-lib-base"

/**
Expand All @@ -48,8 +48,8 @@ interface ILogger {
* @version 1.0.0
* @since 1.0.0
*/
export const createLogger = (name: string): ILogger => {
return simpleLogger(name, "publisher-widget", isDev)
export const createAppLogger = (name: string): ILogger => {
return simpleLogger(name, "picgo-plugin-app", isDev)
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/utils/utils.ts
Expand Up @@ -24,7 +24,7 @@
*/

import { AppInstance } from "~/src/appInstance.ts"
import { createLogger } from "~/src/utils/simpleLogger.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { ZhiUtil } from "zhi-common"
import { BlogAdaptor } from "zhi-blog-api"
import { SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api"
Expand All @@ -37,7 +37,7 @@ import { SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api"
* @since 0.9.0
*/
export class Utils {
private static logger = createLogger("publisher-widget-utils")
private static logger = createAppLogger("publisher-widget-utils")
private static kApi

/**
Expand Down

0 comments on commit 4175c4c

Please sign in to comment.