diff --git a/ConfigBasic.js b/ConfigBasic.js index 435afc1..ee647ad 100644 --- a/ConfigBasic.js +++ b/ConfigBasic.js @@ -5,13 +5,13 @@ module.exports={ production: { protocol: 'httpall', - host: 'app.vic.yuanjin.net', + host: 'vic-app.bittic.org', // 如果使用 https 协议,必须填写以下内容,或在命令行参数中设置: sslType: 'file', // greenlock or file - sslDomainList: ['app.vic.yuanjin.net'], - sslKey: '/etc/letsencrypt/live/server.vic.yuanjin.net/privkey.pem', // ssl key file, - sslCert: '/etc/letsencrypt/live/server.vic.yuanjin.net/fullchain.pem', // ssl cert file, - sslCA: '/etc/letsencrypt/live/server.vic.yuanjin.net/bundle.pem', // ssl ca file, + sslDomainList: ['vic-app.bittic.org'], + sslKey: '/etc/letsencrypt/live/vic-server.bittic.org/privkey.pem', // ssl key file, + sslCert: '/etc/letsencrypt/live/vic-server.bittic.org/fullchain.pem', // ssl cert file, + sslCA: '/etc/letsencrypt/live/vic-server.bittic.org/bundle.pem', // ssl ca file, }, } \ No newline at end of file diff --git a/ConfigCustom.js b/ConfigCustom.template.js similarity index 100% rename from ConfigCustom.js rename to ConfigCustom.template.js diff --git a/ConfigDeploy.js b/ConfigDeploy.js index 5655d60..7bfd993 100644 --- a/ConfigDeploy.js +++ b/ConfigDeploy.js @@ -8,4 +8,33 @@ module.exports={ password: '', // 登录用户密码 key: `${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件 }, -} \ No newline at end of file +} + +module.exports = { + deploy: { + fromPath: "./dist", + gotoTarget: "github", + github: { + targetType: "git", + repo: "https://github.com/tuc-vic/vic.bittic.org", + branch: "main", + gitname: "log-team", + gitemail: "log-team@outlook.com", + url: 'http://vic.bittic.org' + }, + vultr: { + targetType: "ssh", + host: "vic.bittic.org", + targetPath: "/faronear/tuc-vic/vic.webhome.hexo", + targetDir: "public", + user: "adot", + password: "", + key: `${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件 + }, + unicloud: { + targetType: "serverless", + space: "cn-bittic-vic", + url: "http://vic.bittic.cn", + }, + }, +}; diff --git a/package.json b/package.json index 331e04e..843fcfa 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,13 @@ "private": true, "name": "vic.user.react", "scripts": { - "start": "umi dev", - "build": "umi build", - "test": "umi test", + "boot": "npx run-script-os", + "boot:nix": "rm -fr node_modules && rm -fr package-lock.json && npm i", + "boot:windows": "npx rimraf node_modules package-lock.json & npm i", "lint:es": "eslint --ext .js src mock tests", "lint:ts": "tslint \"src/**/*.ts\" \"src/**/*.tsx\"", "dev": "umi dev", + "test": "umi test", "dist": "umi build", "deploy": "node ./node_modules/sol.deployer/deploy.js", "allinone": "npm run dist && npm run deploy", @@ -31,6 +32,7 @@ "react-virtualized-auto-sizer": "^1.0.2", "react-window": "^1.8.5", "react-window-infinite-loader": "^1.0.3", + "sol.deployer": "git+https://git.faronear.org/npm/sol.deployer", "umi-plugin": "^0.1.2" }, "devDependencies": { @@ -42,7 +44,6 @@ "babel-eslint": "^10.0.2", "bluebird": "^3.5.5", "chalk": "^2.4.2", - "sol.deployer": "git+https://git.faronear.org/npm/sol.deployer", "eslint": "^6.2.1", "eslint-config-umi": "^1.5.0", "eslint-plugin-flowtype": "^4.2.0", @@ -54,8 +55,12 @@ "husky": "^3.0.4", "lint-staged": "^9.2.3", "moment": "^2.24.0", - "pm2": "^3.5.0", + "nodemon": "^2.0.2", + "pm2": "^4.5.0", "react-test-renderer": "^16.7.0", + "rimraf": "^3.0.2", + "run-script-os": "^1.1.6", + "sol.webserver": "git+https://git.faronear.org/npm/sol.webserver", "supervisor": "^0.12.0", "swig-templates": "^2.0.3", "tslint": "^5.19.0", @@ -63,8 +68,7 @@ "tslint-react": "^4.0.0", "umi": "^2.8.20", "umi-plugin-react": "^1.9.19", - "umi-types": "^0.3.17", - "sol.webserver": "git+https://git.faronear.org/npm/sol.webserver" + "umi-types": "^0.3.17" }, "lint-staged": { "*.{ts,tsx}": [ diff --git a/public/CNAME b/public/CNAME index f0c44f8..8302d3f 100644 --- a/public/CNAME +++ b/public/CNAME @@ -1 +1 @@ -app.vic.yuanjin.net \ No newline at end of file +vic-app.bittic.org \ No newline at end of file diff --git a/src/config.ts b/src/config.ts index 9da983c..bbcadf0 100644 --- a/src/config.ts +++ b/src/config.ts @@ -7,14 +7,14 @@ export default { '/home/market', '/home/profile', ], - baseURL: 'https://server.vic.yuanjin.net/v1', + baseURL: 'https://vic-server.bittic.org/v1', // baseURL: 'http://yapi.faronear.org/mock/20/v1', - linkAndroid: 'https://vic.yuanjin.net/downloads/vic.apk', - linkIOS: 'https://app.vic.yuanjin.net', - linkWeb: 'https://app.vic.yuanjin.net', + linkAndroid: 'https://vic.bittic.org/downloads/vic.apk', + linkIOS: 'https://vic-app.bittic.org', + linkWeb: 'https://vic-app.bittic.org', linkTelegram: 'https://t.me/vichome', linkWechat: 'https://weixin.qq.com/g/AT997GKdoc9WnieL', linkEmail: 'team-vic@outlook.com', - linkHomeweb: 'https://vic.yuanjin.net', + linkHomeweb: 'https://vic.bittic.org', linkSupport: 'essilk', }; diff --git a/src/pages/invite/service.ts b/src/pages/invite/service.ts index 842f118..65ea963 100644 --- a/src/pages/invite/service.ts +++ b/src/pages/invite/service.ts @@ -14,5 +14,5 @@ export function generateInviteHref(invite: string): string { if (isLocalhost) { return `${window.location.origin}${postfix}` } - return `https://app.vic.yuanjin.net/#${postfix}`; + return `https://vic-app.bittic.org/#${postfix}`; }