diff --git a/.gitignore b/.gitignore index 7acbab8..1936d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,105 +1,106 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# Next.js build output -.next - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and *not* Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port -openRenamerBackend/database.db +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# Next.js build output +.next + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and *not* Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port +openRenamerBackend/database.db +openRenamerBackend/database.db diff --git a/openRenamerBackend/backup.json b/openRenamerBackend/backup.json deleted file mode 100644 index 21f9e32..0000000 --- a/openRenamerBackend/backup.json +++ /dev/null @@ -1,13 +0,0 @@ -{ "name": "nas_backup", "script": "./dist/index.js", - "cwd": "./", - "env": { - "PORT": 8082, - "MYSQL_HOST":"localhost", - "MYSQL_PORT":3306, - "MYSQL_USER":"root", - "MYSQL_PASS":"123456" - }, - "log_file": "./log/combined.log", - "out_file": "./log/out.log", - "error_file": "./error.log" -} diff --git a/openRenamerBackend/package.json b/openRenamerBackend/package.json index 19a28fa..8c8208e 100644 --- a/openRenamerBackend/package.json +++ b/openRenamerBackend/package.json @@ -1,29 +1,30 @@ -{ - "name": "nas_backup", - "version": "1.0.0", - "description": "文件备份用", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "fxb", - "license": "ISC", - "dependencies": { - "@types/fs-extra": "^5.0.4", - "@types/koa": "^2.0.47", - "@types/node": "^11.13.4", - "axios": "^0.21.1", - "fs-extra": "^7.0.0", - "koa": "^2.5.3", - "koa-body": "^4.0.4", - "koa-router": "^7.4.0", - "koa-static": "^5.0.0", - "koa2-cors": "^2.0.6", - "log4js": "^6.3.0", - "moment": "^2.22.2", - "mysql2": "^2.2.5", - "sqlite": "^4.0.23", - "uuid": "^3.3.2", - "winston": "^3.1.0" - } -} +{ + "name": "nas_backup", + "version": "1.0.0", + "description": "文件备份用", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "fxb", + "license": "ISC", + "dependencies": { + "@types/fs-extra": "^5.0.4", + "@types/koa": "^2.0.47", + "@types/node": "^11.13.4", + "axios": "^0.21.1", + "fs-extra": "^7.0.0", + "koa": "^2.5.3", + "koa-body": "^4.0.4", + "koa-router": "^7.4.0", + "koa-static": "^5.0.0", + "koa2-cors": "^2.0.6", + "log4js": "^6.3.0", + "moment": "^2.22.2", + "mysql2": "^2.2.5", + "sqlite": "^4.0.23", + "sqlite3": "^5.0.2", + "uuid": "^3.3.2", + "winston": "^3.1.0" + } +} diff --git a/openRenamerFront/.eslintrc.js b/openRenamerFront/.eslintrc.js deleted file mode 100644 index 2734abe..0000000 --- a/openRenamerFront/.eslintrc.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = { - root: true, - env: { - node: true, - }, - extends: ["plugin:vue/vue3-essential", "eslint:recommended", "@vue/prettier"], - parserOptions: { - parser: "babel-eslint", - }, - rules: { - "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", - "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", - }, -}; diff --git a/openRenamerFront/.gitignore b/openRenamerFront/.gitignore index 51b3106..75b967f 100644 --- a/openRenamerFront/.gitignore +++ b/openRenamerFront/.gitignore @@ -1,24 +1,24 @@ -.DS_Store -node_modules -/dist -package-lock.json - - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? +.DS_Store +node_modules +/dist +package-lock.json +yarn.lock + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/openRenamerFront/.prettierrc b/openRenamerFront/.prettierrc new file mode 100644 index 0000000..94dbf2a --- /dev/null +++ b/openRenamerFront/.prettierrc @@ -0,0 +1,4 @@ +{ + "printWidth": 150, + "tabWidth": 2 +} \ No newline at end of file diff --git a/openRenamerFront/package.json b/openRenamerFront/package.json index 787d4f6..d845177 100644 --- a/openRenamerFront/package.json +++ b/openRenamerFront/package.json @@ -1,33 +1,28 @@ -{ - "name": "open-renamer", - "version": "0.1.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" - }, - "dependencies": { - "@element-plus/icons": "^0.0.11", - "axios": "^0.21.1", - "core-js": "^3.6.5", - "element-plus": "^1.0.2-beta.48", - "vue": "^3.0.0", - "vue-router": "^4.0.0-0" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-service": "~4.5.0", - "@vue/compiler-sfc": "^3.0.0", - "@vue/eslint-config-prettier": "^6.0.0", - "babel-eslint": "^10.1.0", - "eslint": "^6.7.2", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-vue": "^7.0.0", - "less": "^3.0.4", - "less-loader": "^5.0.0", - "prettier": "^2.2.1" - } -} +{ + "name": "open-renamer", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" + }, + "dependencies": { + "@element-plus/icons": "^0.0.11", + "axios": "^0.21.1", + "core-js": "^3.6.5", + "element-plus": "^1.0.2-beta.48", + "vue": "^3.0.0", + "vue-router": "^4.0.0-0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "~4.5.0", + "@vue/cli-plugin-eslint": "~4.5.0", + "@vue/cli-plugin-router": "~4.5.0", + "@vue/cli-service": "~4.5.0", + "@vue/compiler-sfc": "^3.0.0", + "less": "^3.0.4", + "less-loader": "^5.0.0", + "prettier": "^2.2.1" + } +} diff --git a/openRenamerFront/src/views/home/Home.vue b/openRenamerFront/src/views/home/Home.vue index 9025988..60090a5 100644 --- a/openRenamerFront/src/views/home/Home.vue +++ b/openRenamerFront/src/views/home/Home.vue @@ -1,45 +1,21 @@