diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 1163b8e..6419606 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -54,4 +54,32 @@ services: - ./jvue-server:/app - ./data/maven/.m2:/root/.m2 - ./data/server/logs:/logs + restart: always + jvue-front: + privileged: true + container_name: jvue-front + image: jvue-front:4.0.0 + build: + context: . + dockerfile: ./jvue-front/Dockerfile + ports: + - "3000:3000" + environment: + - npm_config_unsafe_perm=true + # 这里的命令优先级比较高，会自动覆盖镜像里面的命令 + command: npm run serve + restart: always + jvue-admin: + privileged: true + container_name: jvue-admin + image: jvue-admin:4.0.0 + build: + context: . + dockerfile: ./jvue-admin/Dockerfile + ports: + - "3001:3001" + environment: + - npm_config_unsafe_perm=true + # 这里的命令优先级比较高，会自动覆盖镜像里面的命令 + command: npm run serve restart: always \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 26f490f..2de1857 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,3 +55,31 @@ services: - ./data/maven/.m2:/root/.m2 - ./data/server/logs:/logs restart: always + jvue-front: + privileged: true + container_name: jvue-front + image: jvue-front:4.0.0 + build: + context: . + dockerfile: ./jvue-front/Dockerfile + ports: + - "3000:3000" + environment: + - npm_config_unsafe_perm=true + # 这里的命令优先级比较高，会自动覆盖镜像里面的命令 + command: npm run serve + restart: always + jvue-admin: + privileged: true + container_name: jvue-admin + image: jvue-admin:4.0.0 + build: + context: . + dockerfile: ./jvue-admin/Dockerfile + ports: + - "3001:3001" + environment: + - npm_config_unsafe_perm=true + # 这里的命令优先级比较高，会自动覆盖镜像里面的命令 + command: npm run serve + restart: always diff --git a/jvue-admin/.browserslistrc b/jvue-admin/.browserslistrc new file mode 100644 index 0000000..9dee646 --- /dev/null +++ b/jvue-admin/.browserslistrc @@ -0,0 +1,3 @@ +> 1% +last 2 versions +not ie <= 8 diff --git a/jvue-admin/.eslintrc.js b/jvue-admin/.eslintrc.js new file mode 100644 index 0000000..3f3df4f --- /dev/null +++ b/jvue-admin/.eslintrc.js @@ -0,0 +1,14 @@ +module.exports = { + root: true, + env: { + node: true + }, + extends: ["plugin:vue/essential", "@vue/prettier"], + rules: { + "no-console": process.env.NODE_ENV === "production" ? "error" : "off", + "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off" + }, + parserOptions: { + parser: "babel-eslint" + } +}; diff --git a/jvue-admin/.gitignore b/jvue-admin/.gitignore new file mode 100644 index 0000000..912d2e7 --- /dev/null +++ b/jvue-admin/.gitignore @@ -0,0 +1,24 @@ +.DS_Store +node_modules +/dist + +/tests/e2e/reports/ +selenium-debug.log + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw* diff --git a/jvue-admin/Dockerfile b/jvue-admin/Dockerfile new file mode 100644 index 0000000..be164e0 --- /dev/null +++ b/jvue-admin/Dockerfile @@ -0,0 +1,21 @@ +#依赖的镜像 +FROM node:10.15.1-alpine + +# CDN注册 +RUN npm config set registry https://registry.npm.taobao.org && \ + npm set chromedriver_cdnurl https://npm.taobao.org/mirrors/chromedriver && \ + npm cache clean --force + +# 工作目录 +WORKDIR /app + +# 安装依赖 +COPY ./jvue-admin/package.json ./ +RUN npm install + +# 注意这个一定要要在npm install后面，否则devDependencies的包无法安装 +ENV HOST 0.0.0.0 + +COPY ./jvue-admin . + +CMD ["npm", "run", "serve"] \ No newline at end of file diff --git a/jvue-admin/README.md b/jvue-admin/README.md new file mode 100644 index 0000000..320d0e6 --- /dev/null +++ b/jvue-admin/README.md @@ -0,0 +1,39 @@ +# jvue-admin + +## Project setup +``` +yarn install +``` + +### Compiles and hot-reloads for development +``` +yarn run serve +``` + +### Compiles and minifies for production +``` +yarn run build +``` + +### Run your tests +``` +yarn run test +``` + +### Lints and fixes files +``` +yarn run lint +``` + +### Run your end-to-end tests +``` +yarn run test:e2e +``` + +### Run your unit tests +``` +yarn run test:unit +``` + +### Customize configuration +See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/jvue-admin/babel.config.js b/jvue-admin/babel.config.js new file mode 100644 index 0000000..3ecebf1 --- /dev/null +++ b/jvue-admin/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ["@vue/app"] +}; diff --git a/jvue-admin/jest.config.js b/jvue-admin/jest.config.js new file mode 100644 index 0000000..8b0e1e5 --- /dev/null +++ b/jvue-admin/jest.config.js @@ -0,0 +1,18 @@ +module.exports = { + moduleFileExtensions: ["js", "jsx", "json", "vue"], + transform: { + "^.+\\.vue$": "vue-jest", + ".+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$": + "jest-transform-stub", + "^.+\\.jsx?$": "babel-jest" + }, + transformIgnorePatterns: ["/node_modules/"], + moduleNameMapper: { + "^@/(.*)$": "/src/$1" + }, + snapshotSerializers: ["jest-serializer-vue"], + testMatch: [ + "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)" + ], + testURL: "http://localhost/" +}; diff --git a/jvue-admin/package.json b/jvue-admin/package.json new file mode 100644 index 0000000..f6b7a0d --- /dev/null +++ b/jvue-admin/package.json @@ -0,0 +1,34 @@ +{ + "name": "jvue-admin", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve --port 3001", + "start": "vue-cli-service serve --port 3001 --mode production", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "test:e2e": "vue-cli-service test:e2e", + "test:unit": "vue-cli-service test:unit" + }, + "dependencies": { + "vue": "^2.6.6", + "vue-router": "^3.0.1" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "^3.5.0", + "@vue/cli-plugin-e2e-nightwatch": "^3.5.0", + "@vue/cli-plugin-eslint": "^3.5.0", + "@vue/cli-plugin-unit-jest": "^3.5.0", + "@vue/cli-service": "^3.5.0", + "@vue/eslint-config-prettier": "^4.0.1", + "@vue/test-utils": "1.0.0-beta.29", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "^10.0.1", + "babel-jest": "^23.6.0", + "eslint": "^5.8.0", + "eslint-plugin-vue": "^5.0.0", + "node-sass": "^4.9.0", + "sass-loader": "^7.1.0", + "vue-template-compiler": "^2.5.21" + } +} diff --git a/jvue-admin/postcss.config.js b/jvue-admin/postcss.config.js new file mode 100644 index 0000000..5bfb8f6 --- /dev/null +++ b/jvue-admin/postcss.config.js @@ -0,0 +1,5 @@ +module.exports = { + plugins: { + autoprefixer: {} + } +}; diff --git a/jvue-admin/public/favicon.ico b/jvue-admin/public/favicon.ico new file mode 100644 index 0000000..c7b9a43 Binary files /dev/null and b/jvue-admin/public/favicon.ico differ diff --git a/jvue-admin/public/index.html b/jvue-admin/public/index.html new file mode 100644 index 0000000..69b9aca --- /dev/null +++ b/jvue-admin/public/index.html @@ -0,0 +1,17 @@ + + + + + + + + jvue-admin + + + +
+ + + diff --git a/jvue-admin/src/App.vue b/jvue-admin/src/App.vue new file mode 100644 index 0000000..440354e --- /dev/null +++ b/jvue-admin/src/App.vue @@ -0,0 +1,29 @@ + + + diff --git a/jvue-admin/src/assets/logo.png b/jvue-admin/src/assets/logo.png new file mode 100644 index 0000000..f3d2503 Binary files /dev/null and b/jvue-admin/src/assets/logo.png differ diff --git a/jvue-admin/src/components/HelloWorld.vue b/jvue-admin/src/components/HelloWorld.vue new file mode 100644 index 0000000..c9bc1d8 --- /dev/null +++ b/jvue-admin/src/components/HelloWorld.vue @@ -0,0 +1,130 @@ + + + + + + diff --git a/jvue-admin/src/main.js b/jvue-admin/src/main.js new file mode 100644 index 0000000..1f5f073 --- /dev/null +++ b/jvue-admin/src/main.js @@ -0,0 +1,10 @@ +import Vue from "vue"; +import App from "./App.vue"; +import router from "./router"; + +Vue.config.productionTip = false; + +new Vue({ + router, + render: h => h(App) +}).$mount("#app"); diff --git a/jvue-admin/src/router.js b/jvue-admin/src/router.js new file mode 100644 index 0000000..7b4bb79 --- /dev/null +++ b/jvue-admin/src/router.js @@ -0,0 +1,26 @@ +import Vue from "vue"; +import Router from "vue-router"; +import Home from "./views/Home.vue"; + +Vue.use(Router); + +export default new Router({ + mode: "history", + base: process.env.BASE_URL, + routes: [ + { + path: "/", + name: "home", + component: Home + }, + { + path: "/about", + name: "about", + // route level code-splitting + // this generates a separate chunk (about.[hash].js) for this route + // which is lazy-loaded when the route is visited. + component: () => + import(/* webpackChunkName: "about" */ "./views/About.vue") + } + ] +}); diff --git a/jvue-admin/src/views/About.vue b/jvue-admin/src/views/About.vue new file mode 100644 index 0000000..3fa2807 --- /dev/null +++ b/jvue-admin/src/views/About.vue @@ -0,0 +1,5 @@ + diff --git a/jvue-admin/src/views/Home.vue b/jvue-admin/src/views/Home.vue new file mode 100644 index 0000000..05494f6 --- /dev/null +++ b/jvue-admin/src/views/Home.vue @@ -0,0 +1,18 @@ + + + diff --git a/jvue-admin/tests/e2e/custom-assertions/elementCount.js b/jvue-admin/tests/e2e/custom-assertions/elementCount.js new file mode 100644 index 0000000..6fb13ff --- /dev/null +++ b/jvue-admin/tests/e2e/custom-assertions/elementCount.js @@ -0,0 +1,19 @@ +// A custom Nightwatch assertion. +// The assertion name is the filename. +// Example usage: +// +// browser.assert.elementCount(selector, count) +// +// For more information on custom assertions see: +// http://nightwatchjs.org/guide#writing-custom-assertions + +exports.assertion = function elementCount(selector, count) { + this.message = `Testing if element <${selector}> has count: ${count}`; + this.expected = count; + this.pass = val => val === count; + this.value = res => res.value; + function evaluator(_selector) { + return document.querySelectorAll(_selector).length; + } + this.command = cb => this.api.execute(evaluator, [selector], cb); +}; diff --git a/jvue-admin/tests/e2e/specs/test.js b/jvue-admin/tests/e2e/specs/test.js new file mode 100644 index 0000000..f10427a --- /dev/null +++ b/jvue-admin/tests/e2e/specs/test.js @@ -0,0 +1,14 @@ +// For authoring Nightwatch tests, see +// http://nightwatchjs.org/guide#usage + +module.exports = { + "default e2e tests": browser => { + browser + .url(process.env.VUE_DEV_SERVER_URL) + .waitForElementVisible("#app", 5000) + .assert.elementPresent(".hello") + .assert.containsText("h1", "Welcome to Your Vue.js App") + .assert.elementCount("img", 1) + .end(); + } +}; diff --git a/jvue-admin/tests/unit/.eslintrc.js b/jvue-admin/tests/unit/.eslintrc.js new file mode 100644 index 0000000..3600451 --- /dev/null +++ b/jvue-admin/tests/unit/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + jest: true + } +}; diff --git a/jvue-admin/tests/unit/example.spec.js b/jvue-admin/tests/unit/example.spec.js new file mode 100644 index 0000000..a846fbd --- /dev/null +++ b/jvue-admin/tests/unit/example.spec.js @@ -0,0 +1,12 @@ +import { shallowMount } from "@vue/test-utils"; +import HelloWorld from "@/components/HelloWorld.vue"; + +describe("HelloWorld.vue", () => { + it("renders props.msg when passed", () => { + const msg = "new message"; + const wrapper = shallowMount(HelloWorld, { + propsData: { msg } + }); + expect(wrapper.text()).toMatch(msg); + }); +}); diff --git a/jvue-front/.browserslistrc b/jvue-front/.browserslistrc new file mode 100644 index 0000000..9dee646 --- /dev/null +++ b/jvue-front/.browserslistrc @@ -0,0 +1,3 @@ +> 1% +last 2 versions +not ie <= 8 diff --git a/jvue-front/.eslintrc.js b/jvue-front/.eslintrc.js new file mode 100644 index 0000000..3f3df4f --- /dev/null +++ b/jvue-front/.eslintrc.js @@ -0,0 +1,14 @@ +module.exports = { + root: true, + env: { + node: true + }, + extends: ["plugin:vue/essential", "@vue/prettier"], + rules: { + "no-console": process.env.NODE_ENV === "production" ? "error" : "off", + "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off" + }, + parserOptions: { + parser: "babel-eslint" + } +}; diff --git a/jvue-front/.gitignore b/jvue-front/.gitignore new file mode 100644 index 0000000..912d2e7 --- /dev/null +++ b/jvue-front/.gitignore @@ -0,0 +1,24 @@ +.DS_Store +node_modules +/dist + +/tests/e2e/reports/ +selenium-debug.log + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw* diff --git a/jvue-front/Dockerfile b/jvue-front/Dockerfile new file mode 100644 index 0000000..b087224 --- /dev/null +++ b/jvue-front/Dockerfile @@ -0,0 +1,21 @@ +#依赖的镜像 +FROM node:10.15.1-alpine + +# CDN注册 +RUN npm config set registry https://registry.npm.taobao.org && \ + npm set chromedriver_cdnurl https://npm.taobao.org/mirrors/chromedriver && \ + npm cache clean --force + +# 工作目录 +WORKDIR /app + +# 安装依赖 +COPY ./jvue-front/package.json ./ +RUN npm install + +# 注意这个一定要要在npm install后面，否则devDependencies的包无法安装 +ENV HOST 0.0.0.0 + +COPY ./jvue-front . + +CMD ["npm", "run", "serve"] \ No newline at end of file diff --git a/jvue-front/README.md b/jvue-front/README.md new file mode 100644 index 0000000..041cb4c --- /dev/null +++ b/jvue-front/README.md @@ -0,0 +1,39 @@ +# jvue-front + +## Project setup +``` +yarn install +``` + +### Compiles and hot-reloads for development +``` +yarn run serve +``` + +### Compiles and minifies for production +``` +yarn run build +``` + +### Run your tests +``` +yarn run test +``` + +### Lints and fixes files +``` +yarn run lint +``` + +### Run your end-to-end tests +``` +yarn run test:e2e +``` + +### Run your unit tests +``` +yarn run test:unit +``` + +### Customize configuration +See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/jvue-front/babel.config.js b/jvue-front/babel.config.js new file mode 100644 index 0000000..3ecebf1 --- /dev/null +++ b/jvue-front/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ["@vue/app"] +}; diff --git a/jvue-front/jest.config.js b/jvue-front/jest.config.js new file mode 100644 index 0000000..8b0e1e5 --- /dev/null +++ b/jvue-front/jest.config.js @@ -0,0 +1,18 @@ +module.exports = { + moduleFileExtensions: ["js", "jsx", "json", "vue"], + transform: { + "^.+\\.vue$": "vue-jest", + ".+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$": + "jest-transform-stub", + "^.+\\.jsx?$": "babel-jest" + }, + transformIgnorePatterns: ["/node_modules/"], + moduleNameMapper: { + "^@/(.*)$": "/src/$1" + }, + snapshotSerializers: ["jest-serializer-vue"], + testMatch: [ + "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)" + ], + testURL: "http://localhost/" +}; diff --git a/jvue-front/package.json b/jvue-front/package.json new file mode 100644 index 0000000..3de0bee --- /dev/null +++ b/jvue-front/package.json @@ -0,0 +1,35 @@ +{ + "name": "jvue-front", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve --port 3000", + "dev": "vue-cli-service serve --port 3000 --mode production", + "start": "npm run build && npm run dev", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "test:e2e": "vue-cli-service test:e2e", + "test:unit": "vue-cli-service test:unit" + }, + "dependencies": { + "vue": "^2.6.6", + "vue-router": "^3.0.1" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "^3.5.0", + "@vue/cli-plugin-e2e-nightwatch": "^3.5.0", + "@vue/cli-plugin-eslint": "^3.5.0", + "@vue/cli-plugin-unit-jest": "^3.5.0", + "@vue/cli-service": "^3.5.0", + "@vue/eslint-config-prettier": "^4.0.1", + "@vue/test-utils": "1.0.0-beta.29", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "^10.0.1", + "babel-jest": "^23.6.0", + "eslint": "^5.8.0", + "eslint-plugin-vue": "^5.0.0", + "node-sass": "^4.9.0", + "sass-loader": "^7.1.0", + "vue-template-compiler": "^2.5.21" + } +} diff --git a/jvue-front/postcss.config.js b/jvue-front/postcss.config.js new file mode 100644 index 0000000..5bfb8f6 --- /dev/null +++ b/jvue-front/postcss.config.js @@ -0,0 +1,5 @@ +module.exports = { + plugins: { + autoprefixer: {} + } +}; diff --git a/jvue-front/public/favicon.ico b/jvue-front/public/favicon.ico new file mode 100644 index 0000000..c7b9a43 Binary files /dev/null and b/jvue-front/public/favicon.ico differ diff --git a/jvue-front/public/index.html b/jvue-front/public/index.html new file mode 100644 index 0000000..1da71e2 --- /dev/null +++ b/jvue-front/public/index.html @@ -0,0 +1,17 @@ + + + + + + + + jvue-front + + + +
+ + + diff --git a/jvue-front/src/App.vue b/jvue-front/src/App.vue new file mode 100644 index 0000000..440354e --- /dev/null +++ b/jvue-front/src/App.vue @@ -0,0 +1,29 @@ + + + diff --git a/jvue-front/src/assets/logo.png b/jvue-front/src/assets/logo.png new file mode 100644 index 0000000..f3d2503 Binary files /dev/null and b/jvue-front/src/assets/logo.png differ diff --git a/jvue-front/src/components/HelloWorld.vue b/jvue-front/src/components/HelloWorld.vue new file mode 100644 index 0000000..c9bc1d8 --- /dev/null +++ b/jvue-front/src/components/HelloWorld.vue @@ -0,0 +1,130 @@ + + + + + + diff --git a/jvue-front/src/main.js b/jvue-front/src/main.js new file mode 100644 index 0000000..1f5f073 --- /dev/null +++ b/jvue-front/src/main.js @@ -0,0 +1,10 @@ +import Vue from "vue"; +import App from "./App.vue"; +import router from "./router"; + +Vue.config.productionTip = false; + +new Vue({ + router, + render: h => h(App) +}).$mount("#app"); diff --git a/jvue-front/src/router.js b/jvue-front/src/router.js new file mode 100644 index 0000000..7b4bb79 --- /dev/null +++ b/jvue-front/src/router.js @@ -0,0 +1,26 @@ +import Vue from "vue"; +import Router from "vue-router"; +import Home from "./views/Home.vue"; + +Vue.use(Router); + +export default new Router({ + mode: "history", + base: process.env.BASE_URL, + routes: [ + { + path: "/", + name: "home", + component: Home + }, + { + path: "/about", + name: "about", + // route level code-splitting + // this generates a separate chunk (about.[hash].js) for this route + // which is lazy-loaded when the route is visited. + component: () => + import(/* webpackChunkName: "about" */ "./views/About.vue") + } + ] +}); diff --git a/jvue-front/src/views/About.vue b/jvue-front/src/views/About.vue new file mode 100644 index 0000000..3fa2807 --- /dev/null +++ b/jvue-front/src/views/About.vue @@ -0,0 +1,5 @@ + diff --git a/jvue-front/src/views/Home.vue b/jvue-front/src/views/Home.vue new file mode 100644 index 0000000..05494f6 --- /dev/null +++ b/jvue-front/src/views/Home.vue @@ -0,0 +1,18 @@ + + + diff --git a/jvue-front/tests/e2e/custom-assertions/elementCount.js b/jvue-front/tests/e2e/custom-assertions/elementCount.js new file mode 100644 index 0000000..6fb13ff --- /dev/null +++ b/jvue-front/tests/e2e/custom-assertions/elementCount.js @@ -0,0 +1,19 @@ +// A custom Nightwatch assertion. +// The assertion name is the filename. +// Example usage: +// +// browser.assert.elementCount(selector, count) +// +// For more information on custom assertions see: +// http://nightwatchjs.org/guide#writing-custom-assertions + +exports.assertion = function elementCount(selector, count) { + this.message = `Testing if element <${selector}> has count: ${count}`; + this.expected = count; + this.pass = val => val === count; + this.value = res => res.value; + function evaluator(_selector) { + return document.querySelectorAll(_selector).length; + } + this.command = cb => this.api.execute(evaluator, [selector], cb); +}; diff --git a/jvue-front/tests/e2e/specs/test.js b/jvue-front/tests/e2e/specs/test.js new file mode 100644 index 0000000..f10427a --- /dev/null +++ b/jvue-front/tests/e2e/specs/test.js @@ -0,0 +1,14 @@ +// For authoring Nightwatch tests, see +// http://nightwatchjs.org/guide#usage + +module.exports = { + "default e2e tests": browser => { + browser + .url(process.env.VUE_DEV_SERVER_URL) + .waitForElementVisible("#app", 5000) + .assert.elementPresent(".hello") + .assert.containsText("h1", "Welcome to Your Vue.js App") + .assert.elementCount("img", 1) + .end(); + } +}; diff --git a/jvue-front/tests/unit/.eslintrc.js b/jvue-front/tests/unit/.eslintrc.js new file mode 100644 index 0000000..3600451 --- /dev/null +++ b/jvue-front/tests/unit/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + jest: true + } +}; diff --git a/jvue-front/tests/unit/example.spec.js b/jvue-front/tests/unit/example.spec.js new file mode 100644 index 0000000..a846fbd --- /dev/null +++ b/jvue-front/tests/unit/example.spec.js @@ -0,0 +1,12 @@ +import { shallowMount } from "@vue/test-utils"; +import HelloWorld from "@/components/HelloWorld.vue"; + +describe("HelloWorld.vue", () => { + it("renders props.msg when passed", () => { + const msg = "new message"; + const wrapper = shallowMount(HelloWorld, { + propsData: { msg } + }); + expect(wrapper.text()).toMatch(msg); + }); +}); diff --git a/jvue-nginx/Dockerfile b/jvue-nginx/Dockerfile index 13790c7..bcd1407 100644 --- a/jvue-nginx/Dockerfile +++ b/jvue-nginx/Dockerfile @@ -7,5 +7,4 @@ ENV LANG C.UTF-8 # 设置时区 # ENV TZ Asia/Shanghai ENV TZ CST-8 -EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/jvue-nginx/nginx.conf b/jvue-nginx/nginx.conf index c2cbee9..e918865 100644 --- a/jvue-nginx/nginx.conf +++ b/jvue-nginx/nginx.conf @@ -3,7 +3,7 @@ server { charset utf-8; location /api/ { - proxy_set_header X-Real-IP $remote_addr; # 转发用户IP + proxy_set_header X-Real-IP $remote_addr; # 转发用户IP proxy_pass http://jvue-server:8081; # jvue-server } diff --git a/jvue-server/Dockerfile b/jvue-server/Dockerfile index 227fff8..701550c 100644 --- a/jvue-server/Dockerfile +++ b/jvue-server/Dockerfile @@ -2,7 +2,7 @@ # docker build . -t jvue-server:4.0.0 --force-rm --no-cache #依赖的镜像 -FROM maven:3.6.0-jdk-8 +FROM maven:3.6.0-jdk-8-alpine #镜像创建者的信息 MAINTAINER terwer "csyouwei@gmail.com" # 设置编码