create-young-proj 0.1.1 → 0.3.0

package/template-vue-admin/src/auto-imports.d.ts

@@ -1,4 +1,7 @@
-// Generated by 'unplugin-auto-import'
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-auto-import
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
@@ -21,7 +24,9 @@ declare global {
   const createInjectionState: typeof import('@vueuse/core')['createInjectionState']
   const createPinia: typeof import('pinia')['createPinia']
   const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
+  const createReusableTemplate: typeof import('@vueuse/core')['createReusableTemplate']
   const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
+  const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
   const createUnrefFn: typeof import('@vueuse/core')['createUnrefFn']
   const customRef: typeof import('vue')['customRef']
   const debouncedRef: typeof import('@vueuse/core')['debouncedRef']
@@ -114,10 +119,14 @@ declare global {
   const unrefElement: typeof import('@vueuse/core')['unrefElement']
   const until: typeof import('@vueuse/core')['until']
   const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
+  const useAnimate: typeof import('@vueuse/core')['useAnimate']
+  const useArrayDifference: typeof import('@vueuse/core')['useArrayDifference']
   const useArrayEvery: typeof import('@vueuse/core')['useArrayEvery']
   const useArrayFilter: typeof import('@vueuse/core')['useArrayFilter']
   const useArrayFind: typeof import('@vueuse/core')['useArrayFind']
   const useArrayFindIndex: typeof import('@vueuse/core')['useArrayFindIndex']
+  const useArrayFindLast: typeof import('@vueuse/core')['useArrayFindLast']
+  const useArrayIncludes: typeof import('@vueuse/core')['useArrayIncludes']
   const useArrayJoin: typeof import('@vueuse/core')['useArrayJoin']
   const useArrayMap: typeof import('@vueuse/core')['useArrayMap']
   const useArrayReduce: typeof import('@vueuse/core')['useArrayReduce']
@@ -204,14 +213,18 @@ declare global {
   const useOnline: typeof import('@vueuse/core')['useOnline']
   const usePageLeave: typeof import('@vueuse/core')['usePageLeave']
   const useParallax: typeof import('@vueuse/core')['useParallax']
+  const useParentElement: typeof import('@vueuse/core')['useParentElement']
+  const usePerformanceObserver: typeof import('@vueuse/core')['usePerformanceObserver']
   const usePermission: typeof import('@vueuse/core')['usePermission']
   const usePointer: typeof import('@vueuse/core')['usePointer']
+  const usePointerLock: typeof import('@vueuse/core')['usePointerLock']
   const usePointerSwipe: typeof import('@vueuse/core')['usePointerSwipe']
   const usePreferredColorScheme: typeof import('@vueuse/core')['usePreferredColorScheme']
   const usePreferredContrast: typeof import('@vueuse/core')['usePreferredContrast']
   const usePreferredDark: typeof import('@vueuse/core')['usePreferredDark']
   const usePreferredLanguages: typeof import('@vueuse/core')['usePreferredLanguages']
   const usePreferredReducedMotion: typeof import('@vueuse/core')['usePreferredReducedMotion']
+  const usePrevious: typeof import('@vueuse/core')['usePrevious']
   const useRafFn: typeof import('@vueuse/core')['useRafFn']
   const useRefHistory: typeof import('@vueuse/core')['useRefHistory']
   const useResizeObserver: typeof import('@vueuse/core')['useResizeObserver']
@@ -269,8 +282,10 @@ declare global {
   const watchArray: typeof import('@vueuse/core')['watchArray']
   const watchAtMost: typeof import('@vueuse/core')['watchAtMost']
   const watchDebounced: typeof import('@vueuse/core')['watchDebounced']
+  const watchDeep: typeof import('@vueuse/core')['watchDeep']
   const watchEffect: typeof import('vue')['watchEffect']
   const watchIgnorable: typeof import('@vueuse/core')['watchIgnorable']
+  const watchImmediate: typeof import('@vueuse/core')['watchImmediate']
   const watchOnce: typeof import('@vueuse/core')['watchOnce']
   const watchPausable: typeof import('@vueuse/core')['watchPausable']
   const watchPostEffect: typeof import('vue')['watchPostEffect']
@@ -280,3 +295,8 @@ declare global {
   const watchWithFilter: typeof import('@vueuse/core')['watchWithFilter']
   const whenever: typeof import('@vueuse/core')['whenever']
 }
+// for type re-export
+declare global {
+  // @ts-ignore
+  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
+}

package/template-vue-admin/src/main.ts

@@ -15,6 +15,7 @@ import 'element-plus/dist/index.css';
 import { createApp } from 'vue';
 import { server } from 'virtual:local-server';
 import App from './App.vue';
+import { CurrentVersion } from './stores';
 
 (async () => {
   // 获取环境变量
@@ -33,6 +34,7 @@ import App from './App.vue';
     console.log('🚀 ~ file: main.ts ~ line 28 ~ viteEnv', viteEnv);
   }
   window.__YOUNG_VITE_ENV__ = viteEnv;
+  CurrentVersion.value = viteEnv.VITE_CURRENT_VERSION;
 
   const app = createApp(App);
   Object.values(

package/template-vue-admin/src/modules/1-router.ts

@@ -1,10 +1,10 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-01-04 10:15:03
- * @LastEditTime: 2023-01-05 14:26:22
+ * @LastEditTime: 2023-05-18 15:45:18
  * @Description: 路由模块
  */
-import { createRouter, createWebHashHistory, type RouteRecordRaw } from 'vue-router';
+import { createRouter, createWebHashHistory } from 'vue-router';
 import { setupLayouts } from 'virtual:generated-layouts';
 import routes from '~pages';
 
@@ -26,9 +26,9 @@ declare module 'vue-router' {
      */
     noCache?: boolean;
     /**
-     * 鉴权路径，不设置则为白名单页面
+     * 设置 false 不参与鉴权，否则鉴权路径为当前路由
      */
-    authPath?: string;
+    auth?: false;
     /**
      * 页面布局，对应 layouts 目录下的布局页面，不写默认为 default/index
      */
@@ -37,24 +37,6 @@ declare module 'vue-router' {
 }
 
 export const finalRoutes = setupLayouts(routes);
-export const navMap = new Map<string, string>();
-
-/**
- * 生成权限节点映射表
- */
-const generateNavMap = (raw: RouteRecordRaw[], base = '') => {
-  for (const route of raw) {
-    if (route.children) {
-      generateNavMap(route.children, route.path);
-    } else {
-      const meta = route.meta;
-      if (meta && meta.authPath) {
-        navMap.set(meta.authPath, `${base}${route.path.startsWith('/') ? '' : '/'}${route.path}`);
-      }
-    }
-  }
-};
-generateNavMap(finalRoutes);
 
 export const router = createRouter({
   history: createWebHashHistory(),

package/template-vue-admin/src/modules/3-net.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-03-01 14:01:31
- * @LastEditTime: 2023-01-09 09:19:53
+ * @LastEditTime: 2023-05-18 16:21:55
  * @Description: 网络请求
  */
 import { useHttp } from '@bluesyoung/http';
@@ -27,8 +27,12 @@ export const http = useHttp<ResponseMsg>({
     start: startLoading,
     end: endLoading,
   },
-  fail: (err) => {
+  fail: (err: any) => {
     console.log('🚀 ~ file: 3-net.ts:60 ~ err', err, typeof err);
+    if (err?.response?.status === 401) {
+      ElMessage.error('无权限，请联系管理员');
+    }
+
     if (typeof err === 'string') {
       // 通用失败，弹出提示信息
       ElMessage.error(err);

package/template-vue-admin/src/modules/4-auth.ts

@@ -1,12 +1,12 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-03-01 19:40:13
- * @LastEditTime: 2023-01-11 10:32:35
+ * @LastEditTime: 2023-05-18 16:17:02
  * @Description: 权限校验
  */
 import { router } from './1-router';
 import type { RouteLocationNormalized } from 'vue-router';
-import { useNavStore, useTagsStore, useUserStore, getToken } from '@/stores';
+import { useNavStore, useTagsStore, useUserStore, getToken, getLoginInfo } from '@/stores';
 import { apis } from './3-net';
 
 const changeTitle = (route: RouteLocationNormalized) => {
@@ -49,17 +49,24 @@ export const clearChildren = <T extends Record<string, any>>(arr: T[]) => {
   return arr;
 };
 
-export const generateNavData = async () => {
-  const info = await apis.post.getCurrUserInfo();
+export const generateNavData = async (force = false) => {
+  const info = getLoginInfo();
 
   if (!info) {
+    // 登录过期
+    ElMessage.error('登录过期，请重新登录！');
+    router.replace('/base/login');
     return;
   }
 
-  const menu = Object.values(await apis.get.getMenuTree());
-  CurrUserInfo.value = info;
+  const menu = Object.values(await apis.get.getMenuTree(force)) as any[];
   RawNav.value = menu;
 
+  // 刷新右上角角色信息
+  apis.post.getCurrUserInfo().then((res) => {
+    CurrUserInfo.value = res;
+  });
+
   // 后端获取用户可见节点
   const navArr: NavArrItem[] = menu;
   const routes: string[] = generateRoleRoute(menu, 1);
@@ -78,29 +85,20 @@ export const hasPermission = (path: string) => {
 
 export const install: UserModule = (app) => {
   router.beforeEach(async (to, from) => {
-    /* 授权登录，暂未启用
-    const { code, state } = Object.fromEntries(new URLSearchParams(location.search));
-    if (code && state) {
-      (await casdoorLogin(code, state)) as UserKey;
-      getToken() && (await generateNavData());
-      location.search = '';
-      return true;
-    } else 
-    */
     if (to.path !== '/base/login') {
       // 页面无需权限
-      if (!to.meta.authPath) {
+      if (to.meta.auth === false) {
         return true;
       }
       // 已登录
       if (getToken()) {
         // 生成权限树
         await generateNavData();
-        if (hasPermission(to.meta.authPath)) {
+        if (hasPermission(to.path)) {
           // 拥有对应页面的权限
           return true;
         }
-        if (!hasPermission(to.meta.authPath)) {
+        if (!hasPermission(to.path)) {
           // 已登录，并且无权限
           return '/403';
         }

package/template-vue-admin/src/modules/5-checkupdate.ts

@@ -0,0 +1,38 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-03-02 16:50:48
+ * @LastEditTime: 2023-03-24 10:35:36
+ * @Description: 检查更新
+ */
+import { CurrentVersion } from '@/stores';
+import { sleep } from '@bluesyoung/utils';
+import { server } from 'virtual:local-server';
+import { generateNavData } from './4-auth';
+
+export const install: UserModule = (app) => {
+  let viteEnv: ImportMetaEnv;
+  // 每分钟一次，检查更新
+  setInterval(async () => {
+    if (import.meta.env.DEV) {
+      // 开发环境，局域网 ip
+      viteEnv = await (await fetch(server + '/get/env')).json(); // console.log('🚀 ~ file: 5-checkupdate.ts:187~ setInterval ~ viteEnv:"' viteEnv)
+    } else {
+      // 部署环境
+      viteEnv = await (await fetch(location.origin + location.pathname + `get/env`)).json();
+      // console.log('🚀 ~ file: 5-checkupdate.ts:231~ setInterval ~ viteEnv:', viteEnv);
+    }
+
+    const refresh = async () => {
+      await generateNavData(true);
+      await sleep(0.5);
+      location.reload();
+    };
+
+    if (viteEnv.VITE_CURRENT_VERSION !== CurrentVersion.value) {
+      setTimeout(refresh, 3e4);
+      ElMessageBox.alert('新版本已发布，点击立即重新加载(30s后自动刷新)', '温馨提示', {
+        type: 'warning',
+      }).then(() => refresh());
+    }
+  }, 6e4);
+};

package/template-vue-admin/src/stores/local/index.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-10-20 08:52:37
- * @LastEditTime: 2023-01-09 09:18:45
+ * @LastEditTime: 2023-05-18 16:00:10
  * @Description:
  */
 import { YoungLocalStorage } from '@bluesyoung/utils';
@@ -10,6 +10,10 @@ export const YoungStorage = new YoungLocalStorage();
 
 const TOKEN_KEY = 'bluesyoung-web.com/music/admin';
 
+export const SaveFlag = useLocalStorage('n天免登', true);
+
+export const CurrentVersion = useLocalStorage('当前版本', '');
+
 export const getToken = () => {
   return YoungStorage.get<UserKey>(TOKEN_KEY)?.token;
 };
@@ -21,3 +25,7 @@ export const setToken = (data: UserKey) => {
 export const removeToken = () => {
   return YoungStorage.remove(TOKEN_KEY);
 };
+
+export const getLoginInfo = () => {
+  return YoungStorage.get<UserKey>(TOKEN_KEY);
+};

package/template-vue-admin/src/typings/index.ts

@@ -1,35 +1,9 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-03-01 14:03:04
- * @LastEditTime: 2023-01-06 16:47:05
+ * @LastEditTime: 2023-05-18 16:05:43
  * @Description: 部分类型定义
  */
-export type UserItem = {
-  id: number;
-  username: string;
-  nickname: string;
-  mobile: string;
-  roleId: number;
-  status: number;
-  role_name?: string;
-  creator?: string;
-  newPassword?: string;
-  initPassword?: string;
-};
-
-export type RoleItem = {
-  createdAt?: string;
-  creator?: string;
-  desc: string;
-  id: number;
-  keyword: string;
-  name: string;
-  not_dev?: number;
-  sort?: number;
-  status: number;
-  updatedAt?: string;
-};
-
 export const MethodObj = {
   GET: 'info',
   POST: 'success',
@@ -37,14 +11,3 @@ export const MethodObj = {
   PUT: '',
   DELETE: 'danger',
 } as const;
-
-export type ApiItem = {
-  id: number;
-  path: string;
-  desc: string;
-  category: string;
-  method: keyof typeof MethodObj;
-  roleIds: number[];
-  creator?: string;
-  title?: string;
-};

package/template-vue-admin/src/typings/system.d.ts

@@ -0,0 +1,46 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-05-18 16:06:06
+ * @LastEditTime: 2023-05-18 16:06:07
+ * @Description: 
+ */
+import { MethodObj } from '.';
+
+declare global {
+  type UserItem = {
+    id: number;
+    username: string;
+    nickname: string;
+    mobile: string;
+    roleId: number;
+    status: number;
+    role_name?: string;
+    creator?: string;
+    newPassword?: string;
+    initPassword?: string;
+  };
+
+  type RoleItem = {
+    createdAt?: string;
+    creator?: string;
+    desc: string;
+    id: number;
+    keyword: string;
+    name: string;
+    not_dev?: number;
+    sort?: number;
+    status: number;
+    updatedAt?: string;
+  };
+
+  type ApiItem = {
+    id: number;
+    path: string;
+    desc: string;
+    category: string;
+    method: keyof typeof MethodObj;
+    roleIds: number[];
+    creator?: string;
+    title?: string;
+  };
+}

package/template-vue-admin/src/views/403.vue

@@ -1,12 +1,13 @@
 <!--
  * @Author: zhangyang
  * @Date: 2022-10-27 11:32:57
- * @LastEditTime: 2023-01-04 19:42:03
+ * @LastEditTime: 2023-05-18 15:49:39
  * @Description: 
 -->
 <route lang="yaml">
 meta:
   title: 403
+  auth: false
 </route>
 
 <script lang="ts" setup>

package/template-vue-admin/src/views/[...all_404].vue

@@ -1,18 +1,19 @@
 <!--
  * @Author: zhangyang
  * @Date: 2020-12-03 15:02:28
- * @LastEditTime: 2023-01-09 09:24:29
+ * @LastEditTime: 2023-05-18 15:49:25
  * @Description: 404
 -->
 <route lang="yaml">
 meta:
   title: 页面不存在
   layout: 'blank'
+  auth: false
 </route>
 <template>
   <div>
     <div class="g-container">
-      <div class="rail">
+      <div class="rail pointer-events-none">
         <div class="stamp four">4</div>
         <div class="stamp zero">0</div>
         <div class="stamp four">4</div>

package/template-vue-admin/src/views/base/login.vue

@@ -1,12 +1,13 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-01-04 12:08:08
- * @LastEditTime: 2023-01-09 09:38:39
+ * @LastEditTime: 2023-05-18 15:50:17
  * @Description: 
 -->
 <route lang="yaml">
 meta:
   layout: blank
+  auth: false
 </route>
 
 <script lang="ts" setup>

package/template-vue-admin/src/views/dashboard/[name].vue

@@ -1,17 +1,22 @@
 <!--
  * @Author: zhangyang
  * @Date: 2022-10-26 09:55:45
- * @LastEditTime: 2023-01-04 19:44:05
+ * @LastEditTime: 2023-05-18 15:50:31
  * @Description: 
 -->
 <route lang="yaml">
 meta:
   title: 欢迎页
-  authPath: /dashboard/index
+  auth: false
 </route>
 
 <script lang="ts" setup>
+import { generateNavData } from '@/modules/4-auth';
+
 const title = window.__YOUNG_VITE_ENV__.VITE_TITLE || '管理后台';
+
+// 每次进入直接拉取最近的菜单数据，同时登录过期时也可触发登录
+generateNavData(true);
 </script>
 
 <template>

package/template-vue-admin/src/views/index.vue

@@ -1,9 +1,15 @@
 <!--
  * @Author: zhangyang
  * @Date: 2022-10-25 11:54:36
- * @LastEditTime: 2022-12-07 15:33:23
+ * @LastEditTime: 2023-05-18 15:49:57
  * @Description: 
 -->
+<route lang="yaml">
+meta:
+  title: 入口
+  auth: false
+</route>
+
 <script lang="ts" setup>
 const router = useRouter();
 onMounted(() => {

package/template-vue-admin/src/views/system/api.vue

@@ -7,7 +7,6 @@
 <route lang="yaml">
 meta:
   title: 接口管理
-  authPath: /system/api
 </route>
 
 <script lang="ts" setup>

package/template-vue-admin/src/views/system/menuList.vue

@@ -7,7 +7,6 @@
 <route lang="yaml">
 meta:
   title: 菜单管理
-  authPath: /system/menuList
 </route>
 
 <script lang="ts" setup>
@@ -185,7 +184,7 @@ getList()
           </ElFormItem>
           <ElFormItem label="路径" prop="component" :rules="form.parentId === 0 ? {} :
             { message: '请输入合法的路径, eg: /path/page', trigger: 'blur', validator: (_: any, v: string) => v.trim() === '' || /\/(.*)\/(.*)/.test(v) }
-          ">
+            ">
             <ElInput v-model="form.component" />
           </ElFormItem>
         </ElForm>

package/template-vue-admin/src/views/system/role.vue

@@ -7,7 +7,6 @@
 <route lang="yaml">
 meta:
   title: 角色列表
-  authPath: /system/role
 </route>
 
 <script lang="ts" setup>

package/template-vue-admin/src/views/system/user.vue

@@ -7,7 +7,6 @@
 <route lang="yaml">
 meta:
   title: 用户管理
-  authPath: /system/user
 </route>
 
 <script lang="ts" setup>

package/template-vue-mobile/.vscode/base.code-snippets

@@ -0,0 +1,24 @@
+{
+  "mobile base": {
+    "prefix": "base",
+    "body": [
+      "<route lang=\"yaml\">",
+      "meta:",
+      "  auth: true",
+      "  title: $1",
+      "  layout: sub",
+      "</route>",
+      "",
+      "<script lang=\"ts\" setup>",
+      "$2",
+      "</script>",
+      "",
+      "<template>",
+      "  <div>",
+      "    $1",
+      "  </div>",
+      "</template>",
+    ],
+    "description": "mobile base"
+  }
+}

package/template-vue-mobile/.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+  "recommendations": [
+    "vue.volar",
+    "rome.rome",
+    "obkoro1.korofileheader",
+    "vue.vscode-typescript-vue-plugin",
+    "antfu.unocss",
+    "voorjaar.windicss-intellisense"
+  ]
+}

package/template-vue-mobile/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "rome.rome",
+  "[vue]": {
+    "editor.defaultFormatter": "Vue.volar"
+  }
+}

package/template-vue-mobile/Dockerfile

@@ -0,0 +1,42 @@
+# 拉取基础镜像
+FROM node:16-alpine as builder
+
+# 维护者
+MAINTAINER BluesYoung "bluesyoung_web@163.com"
+
+# 工作目录
+WORKDIR /app
+
+# 没有压缩包，首选 COPY，如果需要自动解包或下载，则使用 ADD
+
+# 对比依赖是否变更
+COPY package.json yarn.lock /app/
+
+# 设置npm仓库 + 下载依赖，上面的文件如果没有变化则跳过下载，直接使用缓存
+RUN npm config set registry https://registry.npmmirror.com && \
+    yarn config set registry https://registry.npmmirror.com && \        
+    yarn
+
+# 加入代码
+COPY . /app
+# 打包
+RUN yarn build
+
+# 打包完成，构建最终的极简镜像
+FROM node:16-alpine
+
+# 工作目录
+WORKDIR /app
+
+# 复制运行需要的文件[及依赖]
+# 直接复制源代码
+COPY boot.mjs /app/
+COPY config /app/config
+# 复制上一步的打包产物
+COPY --from=builder /app/.output /app/.output
+
+# 暴露指定的端口号，暂不需要
+# EXPOSE 3001
+
+# 启动容器时运行的命令
+ENTRYPOINT ["node", "boot.mjs"]