Merge pull request #2 from mmdapl/feat/mono-code

.dockerignore

@@ -4,8 +4,6 @@ node_modules
 */typings
 .idea
 .github
-nginx
-docs
 eslint.config.js
 .gitignore
 

.github/workflows/CI.yml

@@ -4,12 +4,12 @@ name: CI
 # 触发条件
 on:
   # 提PR到next分支触发CI
-#  pull_request:
-#    branches:
-#      - next
-#  push:
-#    branches:
-#      - next
+  #  pull_request:
+  #    branches:
+  #      - next
+  #  push:
+  #    branches:
+  #      - next
 
   # 手动触发部署
   workflow_dispatch:
@@ -65,4 +65,3 @@ jobs:
       - name: Build Midway Example Code
         run: |
           ./scripts/build xxx
-

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2024 142vip 储凡
+Copyright (c) 2019-present 142vip 储凡
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,3 +1,9 @@
 # @142vip/core-x
 
 坚持开源，x代表一切都有可能
+
+## 证书
+
+[MIT](https://opensource.org/license/MIT)
+
+Copyright (c) 2019-present, 142vip 储凡

eslint.config.js

@@ -1,7 +1,8 @@
-const antFu = require('@antfu/eslint-config').default
+import antFu from '@antfu/eslint-config'
+
 // 参考：https://github.com/antfu/eslint-config
 
-module.exports = antFu({
+export default antFu({
   ignores: [
     '**/node_modules/**',
     'dist',
@@ -12,23 +13,8 @@ module.exports = antFu({
     '**/typings/**/',
     '.output',
     '**/.output/**',
-    'packages/framework/*',
-    'packages/framework/**',
-    'apps/tools-api-back/**',
   ],
-  typescript: {
-    tsconfigPath: 'tsconfig.json',
-    overrides: {
-      'ts/no-unused-vars': ['error', { ignoreRestSiblings: true, argsIgnorePattern: '^_' }], // 忽略 rest 属性的兄弟属性，便于解构；忽略函数中下划线开头的参数。
-      'ts/consistent-type-imports': ['off'], // Nest.js的依赖注入会被识别为type-imports，自动fix会在import添加type，导致注入失败，此项必须关闭。
-      'ts/no-inferrable-types': ['error', { ignoreProperties: true }], // 允许类属性在设置默认值的同时设置类型，以兼容swagger对DTO中默认值的识别。
-      'ts/explicit-function-return-type': ['warn'], // 显式声明方法返回类型
-      'ts/explicit-member-accessibility': ['warn', { overrides: { constructors: 'off', properties: 'off' } }], // 显式声明可访问性修饰符
-      'ts/explicit-module-boundary-types': ['warn'], // 导出函数和类的公共类方法上显式返回和参数类型。
-      'ts/no-require-imports': ['warn'], // 禁止require
-      'ts/no-var-requires': ['warn'], // 禁止require
-    },
-  },
+  typescript: true,
   vue: true,
   // Disable jsonc and yaml support
   jsonc: false,
@@ -39,29 +25,13 @@ module.exports = antFu({
     markdown: 'prettier',
   },
   rules: {
-    'no-void': ['off'], // 允许void类型，间接允许返回void类型时，不写return。由于存在对express next()等库方法的调用，为保证类型兼容，此项须关闭。
-    'dot-notation': ['off'], // 依赖库中的值可能使用`[key: string]: any`式的类型定义，我们调用时不可避免的需要使用`obj['key']`来访问某些成员，比如ConfigModule。
-    'ts/no-unused-vars': ['error', { ignoreRestSiblings: true, argsIgnorePattern: '^_' }], // 忽略 rest 属性的兄弟属性，便于解构；忽略函数中下划线开头的参数。
-    'ts/consistent-type-imports': ['off'], // Nest.js的依赖注入会被识别为type-imports，自动fix会在import添加type，导致注入失败，此项必须关闭。
-    'ts/no-inferrable-types': ['error', { ignoreProperties: true }], // 允许类属性在设置默认值的同时设置类型，以兼容swagger对DTO中默认值的识别。
-    'ts/explicit-function-return-type': ['warn'], // 显式声明方法返回类型
-    'ts/explicit-member-accessibility': ['warn', { overrides: { constructors: 'off', properties: 'off' } }], // 显式声明可访问性修饰符
-    'ts/explicit-module-boundary-types': ['warn'], // 导出函数和类的公共类方法上显式返回和参数类型。
-    'ts/no-require-imports': ['warn'], // 禁止require
-    'ts/no-var-requires': ['warn'], // 禁止require
-    'node/prefer-global/buffer': ['error', 'always'], // 一致地使用全局 Buffer
-    'node/prefer-global/process': ['error', 'always'], // 一致地使用全局 process
-    'no-console': 'off',
+    'no-console': 'warn',
     'no-restricted-syntax': [
       'error',
       {
         selector: 'CallExpression[callee.object.name=\'console\'][callee.property.name!=/^(log|warn|error|info|trace)$/]',
         message: 'Unexpected property on console object was called',
       },
     ],
-    'semi': [2, 'never'], // 去掉结尾的分号
-    'singleQuote': 0,
-    'array-bracket-spacing': [2, 'never'], // 强制数组方括号中使用一致的空格
-    'no-control-regex': 0, // 禁止在正则表达式中使用控制字符
   },
 })

lerna.json

@@ -42,6 +42,10 @@
         "type": "perf",
         "section": "Performance Improvements"
       },
+      {
+        "type": "release",
+        "section": "Release Module"
+      },
       {
         "type": "chore",
         "hidden": true

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "142vip-oauth",
-  "version": "0.1.6-alpha.5",
-  "private": true,
+  "name": "@142vip/core-x",
+  "version": "0.0.1-alpha.1",
+  "type": "module",
   "engines": {
     "node": "18.18.0",
     "pnpm": "7"
@@ -27,6 +27,7 @@
     "turbo": "^2.0.1"
   },
   "devDependencies": {
+    "@142vip/changelog": "workspace:*",
     "@antfu/eslint-config": "^2.20.0",
     "@lerna-lite/cli": "^3.5.1",
     "@lerna-lite/list": "^3.5.1",

packages/egg-axios/README.md

@@ -1,2 +1 @@
 # @142vip/egg-axios
-

packages/egg-axios/package.json

@@ -3,6 +3,15 @@
   "private": false,
   "description": "公众号搜：储凡",
   "keywords": ["公众号搜：储凡"],
+  "scripts": {
+    "build": "npx tsc"
+  },
+  "dependencies": {
+
+  },
+  "devDependencies": {
+
+  },
   "author": "mmdapl <[email protected]>",
   "license": "MIT"
 }

packages/egg-axios/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.package.json",
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "include": [
+    "src/**/*"
+  ]
+}

packages/egg-grpc-client/README.md

@@ -1,2 +1 @@
 # @142vip/egg-grpc-client
-

packages/egg-grpc-client/package.json

@@ -3,6 +3,15 @@
   "private": false,
   "description": "公众号搜：储凡",
   "keywords": ["公众号搜：储凡"],
+  "scripts": {
+    "build": "npx tsc"
+  },
+  "dependencies": {
+
+  },
+  "devDependencies": {
+
+  },
   "author": "mmdapl <[email protected]>",
   "license": "MIT"
 }

packages/egg-grpc-client/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.package.json",
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "include": [
+    "src/**/*"
+  ]
+}

packages/egg-grpc-server/README.md

@@ -1,2 +1 @@
 # @142vip/egg-grpc-server
-

packages/egg-grpc-server/package.json

@@ -3,6 +3,9 @@
   "private": false,
   "description": "公众号搜：储凡",
   "keywords": ["公众号搜：储凡"],
+  "scripts": {
+    "build": "npx tsc"
+  },
   "author": "mmdapl <[email protected]>",
   "license": "MIT"
 }

packages/egg-grpc-server/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.package.json",
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "include": [
+    "src/**/*"
+  ]
+}

packages/egg-mysql/README.md

@@ -0,0 +1 @@
+# @142vip/egg-mysql

packages/egg-mysql/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@142vip/egg-mysql",
+  "private": false,
+  "description": "公众号搜：储凡",
+  "keywords": ["公众号搜：储凡"],
+  "scripts": {
+    "build": "npx tsc"
+  },
+  "author": "mmdapl <[email protected]>",
+  "license": "MIT"
+}

packages/egg-mysql/src/mysql.ts

@@ -0,0 +1,3 @@
+export class Mysql {
+
+}

packages/egg-mysql/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.package.json",
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "include": [
+    "src/**/*"
+  ]
+}

packages/egg-redis/README.md

@@ -1,2 +1 @@
 # @142vip/egg
-

packages/egg-redis/package.json

@@ -1,8 +1,11 @@
 {
-  "name": "@142vip/egg",
+  "name": "@142vip/egg-redis",
   "private": false,
   "description": "公众号搜：储凡",
   "keywords": ["公众号搜：储凡"],
+  "scripts": {
+    "build": "npx tsc"
+  },
   "author": "mmdapl <[email protected]>",
   "license": "MIT"
 }

packages/egg-redis/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.package.json",
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "include": [
+    "src/**/*"
+  ]
+}

packages/egg-sequelize/README.md

@@ -1,2 +1 @@
 # @142vip/egg-sequelize
-

packages/egg-sequelize/index.d.ts

@@ -0,0 +1 @@
+export * from './src'

packages/egg-sequelize/package.json

@@ -2,7 +2,15 @@
   "name": "@142vip/egg-sequelize",
   "private": false,
   "description": "公众号搜：储凡",
-  "keywords": ["公众号搜：储凡"],
+  "keywords": [
+    "公众号搜：储凡"
+  ],
+  "scripts": {
+    "build": "npx tsc"
+  },
+  "dependencies": {
+    "egg-sequelize": "^6.0.0"
+  },
   "author": "mmdapl <[email protected]>",
   "license": "MIT"
 }

packages/egg-sequelize/src/core/base.entity.ts

@@ -0,0 +1,29 @@
+import { DataTypes } from 'sequelize'
+
+/**
+ * 基础实体
+ */
+export const BaseEntity = {
+  /**
+   * 主键
+   */
+  id: {
+    type: DataTypes.BIGINT,
+    primaryKey: true,
+    autoIncrement: true,
+  },
+  /**
+   * 是否删除
+   */
+  deleted: {
+    type: DataTypes.BIGINT,
+    defaultValue: false,
+  },
+}
+
+/**
+ * 创建实体
+ */
+export function createEntity(entity: object) {
+  return Object.assign({}, BaseEntity, entity)
+}