create-pubinfo 2.0.14 → 2.1.0

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { a as validateInput, n as readPackageJSON, r as run, t as bootstrop } from "./helper-cICWEvEU.js";
+import { a as validateInput, n as readPackageJSON, r as run, t as bootstrop } from "./helper-Brawr6dy.js";
 import { checkbox, confirm, input, select } from "@inquirer/prompts";
+import { logger } from "@pubinfo/shared";
 import { Command } from "commander";
-import consola from "consola";
 import { resolve } from "node:path";
 import process from "node:process";
 import { existsSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
@@ -51,7 +51,7 @@ async function download(options) {
 		});
 	} catch (error) {
 		if (error.message.includes(REMOTE_URL)) error.message = error.message.replace(REMOTE_URL, "[REMOTE_URL]");
-		consola.error(`下载失败: ${error.message}`);
+		logger.error(`下载失败: ${error.message}`);
 		process.exit(1);
 	} finally {
 		finish();
@@ -67,7 +67,7 @@ function loading() {
 	return () => {
 		const { green, yellow } = colors;
 		spinner.stop();
-		consola.success(`${green("下载完成, 用时")} ${yellow(`${Date.now() - startTime}`)} ${green("ms.")}`);
+		logger.success(`${green("下载完成, 用时")} ${yellow(`${Date.now() - startTime}`)} ${green("ms.")}`);
 	};
 }
 
@@ -91,7 +91,7 @@ async function fetchData() {
 		return { version: await fetchVersion() };
 	} catch (error) {
 		if (error.message.includes(REMOTE_URL)) error.message = error.message.replace(REMOTE_URL, "[REMOTE_URL]");
-		consola.error(`网络连接异常: ${error.message}`);
+		logger.error(`网络连接异常: ${error.message}`);
 		process.exit(1);
 	} finally {
 		spinner.stop();
@@ -121,13 +121,13 @@ async function writeJSON(path, json) {
 */
 function rewriteFile(path, fn) {
 	if (!existsSync(path)) {
-		consola.error(`RewriteFile fail: ${path} does not exist`);
+		logger.error(`RewriteFile fail: ${path} does not exist`);
 		return;
 	}
 	try {
 		writeFileSync(path, fn(readFileSync(path, { encoding: "utf-8" })));
 	} catch (error) {
-		consola.error(`RewriteFile fail: ${error}`);
+		logger.error(`RewriteFile fail: ${error}`);
 	}
 }
 
@@ -155,7 +155,7 @@ async function writeMetaJSON(metaDir, options) {
 		});
 		await writeJSON(path, json);
 	} catch (error) {
-		consola.error(`初始化 metadata 失败: ${error}`);
+		logger.error(`初始化 metadata 失败: ${error}`);
 	}
 }
 /**
@@ -164,7 +164,7 @@ async function writeMetaJSON(metaDir, options) {
 function writeApps(appsDir, options) {
 	const { key, apps = [], openapi } = options;
 	if (!existsSync(appsDir)) {
-		consola.error(`初始化 apps 失败: ${appsDir} 不存在`);
+		logger.error(`初始化 apps 失败: ${appsDir} 不存在`);
 		return;
 	}
 	try {
@@ -184,7 +184,7 @@ function writeApps(appsDir, options) {
 			});
 		});
 	} catch (error) {
-		consola.error(`初始化 apps 失败: ${error}`);
+		logger.error(`初始化 apps 失败: ${error}`);
 	}
 }
 
@@ -247,7 +247,7 @@ async function main() {
 			}
 			await run(pkg.version);
 		} catch (error) {
-			consola.error(error);
+			logger.error(error);
 		}
 	});
 	program.parse();

package/dist/{helper-cICWEvEU.js → helper-Brawr6dy.js}

@@ -1,5 +1,5 @@
 import { checkbox, confirm, input, select } from "@inquirer/prompts";
-import consola from "consola";
+import { logger } from "@pubinfo/shared";
 import { dirname, posix, relative, resolve, sep } from "node:path";
 import process, { cwd } from "node:process";
 import { fileURLToPath } from "node:url";
@@ -75,7 +75,7 @@ async function generate(options) {
 		const newPath = resolve(targetDir, newName || oldName);
 		if (existsSync(oldPath)) renameSync(oldPath, newPath);
 	}
-	consola.success(`${colors.green("项目模板初始化完成.")}`);
+	logger.success(`${colors.green("项目模板初始化完成.")}`);
 }
 
 //#endregion
@@ -128,7 +128,7 @@ async function interaction() {
 		});
 		return answer;
 	} catch {
-		consola.fail("操作终止");
+		logger.fail("操作终止");
 		process.exit(1);
 	}
 }
@@ -147,7 +147,7 @@ async function run(version$1) {
 var package_default = {
 	name: "create-pubinfo",
 	type: "module",
-	version: "2.0.14",
+	version: "2.1.0",
 	description: "初始化项目框架",
 	author: "Werheng <werheng.zhang@gmail.com>",
 	license: "MIT",
@@ -170,11 +170,11 @@ var package_default = {
 	},
 	dependencies: {
 		"@inquirer/prompts": "catalog:node",
+		"@pubinfo/shared": "workspace:*",
 		"ansi-colors": "catalog:node",
 		"cfonts": "catalog:node",
 		"commander": "catalog:node",
 		"confbox": "catalog:node",
-		"consola": "catalog:browser",
 		"fs-extra": "catalog:node",
 		"giget": "catalog:node",
 		"node-plop": "catalog:node",

package/dist/index.d.ts

@@ -97,11 +97,11 @@ declare function readPackageJSON(): {
   };
   dependencies: {
     "@inquirer/prompts": string;
+    "@pubinfo/shared": string;
     "ansi-colors": string;
     cfonts: string;
     commander: string;
     confbox: string;
-    consola: string;
     "fs-extra": string;
     giget: string;
     "node-plop": string;

package/dist/index.js

@@ -1,3 +1,3 @@
-import { i as interaction, n as readPackageJSON, o as generate, r as run, s as copyTemplate } from "./helper-cICWEvEU.js";
+import { i as interaction, n as readPackageJSON, o as generate, r as run, s as copyTemplate } from "./helper-Brawr6dy.js";
 
 export { copyTemplate, generate, interaction, readPackageJSON, run };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-pubinfo",
   "type": "module",
-  "version": "2.0.14",
+  "version": "2.1.0",
   "description": "初始化项目框架",
   "author": "Werheng <werheng.zhang@gmail.com>",
   "license": "MIT",
@@ -30,14 +30,14 @@
     "cfonts": "^3.3.0",
     "commander": "^14.0.0",
     "confbox": "^0.2.2",
-    "consola": "^3.4.2",
     "fs-extra": "^11.3.0",
     "giget": "^2.0.0",
     "node-plop": "0.32.2",
     "ofetch": "^1.4.1",
     "ora": "^8.2.0",
     "rimraf": "^6.0.1",
-    "semver": "^7.7.2"
+    "semver": "^7.7.2",
+    "@pubinfo/shared": "2.1.0"
   },
   "devDependencies": {
     "@types/node": "^24.0.10"

package/templates/pubinfo-app/package.json.hbs

@@ -23,6 +23,7 @@
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1",
     "@pubinfo/module-auth": "{{version}}",
+    "@pubinfo/module-captcha": "{{version}}",
     {{#if rbac}}
     "@pubinfo/module-rbac": "{{version}}",
     {{/if}}

package/templates/pubinfo-app/src/layouts/index.vue

@@ -30,6 +30,10 @@ const dev = import.meta.env.DEV;
         </Layout.Header>
       </template>
 
+      <template #topbar>
+        <Layout.Topbar />
+      </template>
+
       <template #sidebar>
         <Layout.Sidebar />
       </template>

package/templates/pubinfo-app/src/main.ts.hbs

@@ -2,6 +2,7 @@ import { createPubinfo } from 'pubinfo';
 import { auth, basic } from './api/request';
 import App from './App.vue';
 import { setupAuth } from './modules/auth';
+import { setupCaptcha } from './modules/captcha';
 {{#if rbac}}
 import { setupRbac } from './modules/rbac';
 {{/if}}
@@ -19,6 +20,7 @@ createPubinfo({
   },
   modules: [
     setupAuth(),
+    setupCaptcha(),
     {{#if rbac}}
     setupRbac(),
     {{/if}}

package/templates/pubinfo-app/src/modules/captcha.ts

@@ -0,0 +1,8 @@
+import { captcha } from '@pubinfo/module-captcha';
+import { auth } from '../api/request';
+
+export function setupCaptcha() {
+  return captcha({
+    request: auth,
+  });
+}

package/templates/pubinfo-app/src/views/system/login/components/PasswordLogin.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { FormInstance, Rule } from 'ant-design-vue/es/form';
 import type { UnwrapRef } from 'vue';
+import { PubinfoVerifyInput } from '@pubinfo/module-captcha';
 import { useToggle } from '@vueuse/core';
 import { message, Modal } from 'ant-design-vue';
-import { RESPONSE_CODE } from 'pubinfo';
-import { useUserStore } from '@/stores';
-import { useCaptchas, useFocusElement } from '../composables';
+import { RESPONSE_CODE, useUserStore } from 'pubinfo';
+import { useFocusElement } from '../composables';
 import Useragreement from './Useragreement.vue';
 
 defineOptions({
@@ -32,19 +32,20 @@ function isHttpError(error: unknown): error is HttpError {
   return (error as HttpError).code !== undefined;
 }
 
+const pubinfoVerifyInputRef = ref<InstanceType<typeof PubinfoVerifyInput> | null>(null);
 const userStore = useUserStore();
-const { send, captcha, captchaHash } = useCaptchas();
 const router = useRouter();
 const route = useRoute();
 const { focusElementDataId } = useFocusElement();
 
 const loginForm = ref<FormInstance | null>(null);
-const formState: UnwrapRef<FormState> = reactive({
+const formState: UnwrapRef<FormState & { captchaType?: string }> = reactive({
   account: '',
   password: '',
   captchas: '',
   checked: true,
-  captchaHash,
+  captchaHash: '',
+  captchaType: '',
 });
 
 const rules: Record<string, Rule[]> = {
@@ -53,6 +54,10 @@ const rules: Record<string, Rule[]> = {
   captchas: [{ required: true, whitespace: true, message: '请输入验证码' }],
 };
 
+function getCaptchaHash(hash: string) {
+  formState.captchaHash = hash;
+}
+
 const [loading, setLoading] = useToggle(false);
 
 async function onSubmit() {
@@ -62,7 +67,7 @@ async function onSubmit() {
   setLoading(true);
   try {
     await loginForm.value?.validate();
-    await userStore.login(formState);
+    await userStore.signIn(formState);
     message.success('登录成功');
     router.push(route.query.redirect?.toString() ?? '/');
   }
@@ -73,7 +78,7 @@ async function onSubmit() {
         case RESPONSE_CODE.LOGINNAME_PASSWORD_WRONG:
         case RESPONSE_CODE.CODE_OVERTIME:
         case RESPONSE_CODE.CODE_WRONG:
-          send();
+          pubinfoVerifyInputRef.value?.refresh();
           break;
         case RESPONSE_CODE.CHANGE_INIT_PASSWORD:
         case RESPONSE_CODE.PASSWORD_EXPIRED:
@@ -142,33 +147,11 @@ function createChangePasswordModal(msg: string, token: string) {
         </a-input-password>
       </a-form-item>
       <a-form-item name="captchas">
-        <a-input
-          v-model:value="formState.captchas"
-          size="large"
-          allow-clear
-          placeholder="请输入验证码"
-          data-id="captchas"
-        >
-          <template #prefix>
-            <PubinfoIcon v-if="focusElementDataId === 'captchas'" name="i-solar-shield-check-bold" color="#1578FF" />
-            <PubinfoIcon v-else name="i-solar-shield-check-broken" color="#AFB0B2" />
-          </template>
-          <template #addonAfter>
-            <div
-              w-100px
-              h-38px
-              cursor-pointer
-              @click="send"
-            >
-              <img :src="captcha">
-            </div>
-          </template>
-        </a-input>
+        <PubinfoVerifyInput ref="pubinfoVerifyInputRef" v-model="formState.captchas" size="large" @get-captcha-hash="getCaptchaHash" />
       </a-form-item>
       <a-form-item>
         <Useragreement v-model:checked="formState.checked" />
       </a-form-item>
-      <!-- 登录 -->
       <a-form-item>
         <div w-full h-48px>
           <a-button

package/templates/pubinfo-app/src/views/system/login/composables.ts

@@ -1,7 +1,6 @@
 import type { Component, MaybeRef } from 'vue';
+import { LoginWithFourA } from '@pubinfo/module-auth';
 import { useActiveElement } from '@vueuse/core';
-import { useRequest } from 'alova/client';
-import { getAuthLoginValidCode } from '@/api/modules/auth';
 
 interface LoginTabs {
   title: string
@@ -18,6 +17,10 @@ export function useLoginTabs() {
       title: '手机号登录',
       component: defineAsyncComponent(() => import('./components/LoginWithPhone.vue')),
     },
+    {
+      title: '4A登录',
+      component: LoginWithFourA,
+    },
   ];
   const initialTab = ref(0);
 
@@ -31,25 +34,6 @@ export function useLoginTabs() {
   };
 }
 
-export function useCaptchas() {
-  const { send, onSuccess } = useRequest(getAuthLoginValidCode({ size: '100x40' }));
-  const captcha = ref('');
-  const captchaHash = ref('');
-
-  onSuccess(({ data }) => {
-    const { key, plaintext } = data.data!;
-
-    const imgUrl = `data:image/png;base64,${plaintext}`;
-    captcha.value = imgUrl;
-    captchaHash.value = key!;
-  });
-  return {
-    send,
-    captcha,
-    captchaHash,
-  };
-}
-
 export function useFocusElement() {
   const activeElement = useActiveElement();
   const focusElementDataId = computed(() =>