From 5fecbf1b0422a4f07f140444722a910ed39c6bed Mon Sep 17 00:00:00 2001 From: Terwer Date: Fri, 15 Mar 2019 13:03:59 +0800 Subject: [PATCH 1/3] Add jvue-admin project --- docker-compose.yml | 51 +------ jvue-admin/.browserslistrc | 3 + jvue-admin/.eslintrc.js | 14 ++ jvue-admin/.gitignore | 24 ++++ jvue-admin/README.md | 39 ++++++ jvue-admin/babel.config.js | 3 + jvue-admin/jest.config.js | 18 +++ jvue-admin/package.json | 33 +++++ jvue-admin/postcss.config.js | 5 + jvue-admin/public/favicon.ico | Bin 0 -> 1150 bytes jvue-admin/public/index.html | 17 +++ jvue-admin/src/App.vue | 29 ++++ jvue-admin/src/assets/logo.png | Bin 0 -> 6849 bytes jvue-admin/src/components/HelloWorld.vue | 130 ++++++++++++++++++ jvue-admin/src/main.js | 10 ++ jvue-admin/src/router.js | 26 ++++ jvue-admin/src/views/About.vue | 5 + jvue-admin/src/views/Home.vue | 18 +++ .../e2e/custom-assertions/elementCount.js | 19 +++ jvue-admin/tests/e2e/specs/test.js | 14 ++ jvue-admin/tests/unit/.eslintrc.js | 5 + jvue-admin/tests/unit/example.spec.js | 12 ++ jvue-front/.browserslistrc | 3 + jvue-front/.eslintrc.js | 14 ++ jvue-front/.gitignore | 24 ++++ jvue-front/Dockerfile | 20 +++ jvue-front/README.md | 39 ++++++ jvue-front/babel.config.js | 3 + jvue-front/jest.config.js | 18 +++ jvue-front/package.json | 33 +++++ jvue-front/postcss.config.js | 5 + jvue-front/public/favicon.ico | Bin 0 -> 1150 bytes jvue-front/public/index.html | 17 +++ jvue-front/src/App.vue | 29 ++++ jvue-front/src/assets/logo.png | Bin 0 -> 6849 bytes jvue-front/src/components/HelloWorld.vue | 130 ++++++++++++++++++ jvue-front/src/main.js | 10 ++ jvue-front/src/router.js | 26 ++++ jvue-front/src/views/About.vue | 5 + jvue-front/src/views/Home.vue | 18 +++ .../e2e/custom-assertions/elementCount.js | 19 +++ jvue-front/tests/e2e/specs/test.js | 14 ++ jvue-front/tests/unit/.eslintrc.js | 5 + jvue-front/tests/unit/example.spec.js | 12 ++ jvue-nginx/Dockerfile | 1 - jvue-nginx/nginx.conf | 2 +- jvue-server/Dockerfile | 2 +- 47 files changed, 877 insertions(+), 47 deletions(-) create mode 100644 jvue-admin/.browserslistrc create mode 100644 jvue-admin/.eslintrc.js create mode 100644 jvue-admin/.gitignore create mode 100644 jvue-admin/README.md create mode 100644 jvue-admin/babel.config.js create mode 100644 jvue-admin/jest.config.js create mode 100644 jvue-admin/package.json create mode 100644 jvue-admin/postcss.config.js create mode 100644 jvue-admin/public/favicon.ico create mode 100644 jvue-admin/public/index.html create mode 100644 jvue-admin/src/App.vue create mode 100644 jvue-admin/src/assets/logo.png create mode 100644 jvue-admin/src/components/HelloWorld.vue create mode 100644 jvue-admin/src/main.js create mode 100644 jvue-admin/src/router.js create mode 100644 jvue-admin/src/views/About.vue create mode 100644 jvue-admin/src/views/Home.vue create mode 100644 jvue-admin/tests/e2e/custom-assertions/elementCount.js create mode 100644 jvue-admin/tests/e2e/specs/test.js create mode 100644 jvue-admin/tests/unit/.eslintrc.js create mode 100644 jvue-admin/tests/unit/example.spec.js create mode 100644 jvue-front/.browserslistrc create mode 100644 jvue-front/.eslintrc.js create mode 100644 jvue-front/.gitignore create mode 100644 jvue-front/Dockerfile create mode 100644 jvue-front/README.md create mode 100644 jvue-front/babel.config.js create mode 100644 jvue-front/jest.config.js create mode 100644 jvue-front/package.json create mode 100644 jvue-front/postcss.config.js create mode 100644 jvue-front/public/favicon.ico create mode 100644 jvue-front/public/index.html create mode 100644 jvue-front/src/App.vue create mode 100644 jvue-front/src/assets/logo.png create mode 100644 jvue-front/src/components/HelloWorld.vue create mode 100644 jvue-front/src/main.js create mode 100644 jvue-front/src/router.js create mode 100644 jvue-front/src/views/About.vue create mode 100644 jvue-front/src/views/Home.vue create mode 100644 jvue-front/tests/e2e/custom-assertions/elementCount.js create mode 100644 jvue-front/tests/e2e/specs/test.js create mode 100644 jvue-front/tests/unit/.eslintrc.js create mode 100644 jvue-front/tests/unit/example.spec.js diff --git a/docker-compose.yml b/docker-compose.yml index 26f490f..93d6727 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,54 +4,17 @@ # docker-compose up -d --force-recreate version: '3' services: - jvue-nginx: + jvue-front: privileged: true - image: jvue/nginx:1.15.9 - container_name: jvue-nginx + image: jvue/front:4.0.0 + container_name: jvue-front build: context: ./ - dockerfile: ./jvue-nginx/Dockerfile + dockerfile: ./jvue-front/Dockerfile ports: - - "80:80" - volumes: - - ./jvue-nginx/nginx.conf:/etc/nginx/conf.d/default.conf - - ./data/nginx/log:/var/log/nginx - jvue-mysql: - privileged: true - image: jvue/mysql:5.7.24 - container_name: jvue-mysql - build: - context: ./ - dockerfile: ./jvue-mysql/Dockerfile - ports: - - "3306:3306" - environment: - # 最好使用此设定时区,其它静像也可以使用,也可以用"TZ=Asia/Shanghai" - - "TZ=CST-8" - - "MYSQL_ROOT_PASSWORD=123456" - - "MYSQL_ROOT_HOST=%" - - "MYSQL_DATABASE=testbugucms" - - "MYSQL_USER=test" - - "MYSQL_PASSWORD=123456" - volumes: - - ./data/mysql/db:/var/db - - ./data/mysql/log:/var/log - - ./jvue-mysql/my.cnf:/etc/my.cnf - - ./jvue-mysql/init:/docker-entrypoint-initdb.d/ - restart: always - jvue-server: - privileged: true - image: jvue/server:4.0.0 - container_name: jvue-server - build: - context: ./ - dockerfile: ./jvue-server/Dockerfile - ports: - - "8081:8081" + - "3000:3000" working_dir: /app - command: mvn clean spring-boot:run -Dspring-boot.run.profiles=docker -DskipTests volumes: - - ./jvue-server:/app - - ./data/maven/.m2:/root/.m2 - - ./data/server/logs:/logs + - ./jvue-front:/app + - ./data/front/.npm:/root/.npm 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/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..e0c8431 --- /dev/null +++ b/jvue-admin/package.json @@ -0,0 +1,33 @@ +{ + "name": "jvue-admin", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "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 0000000000000000000000000000000000000000..c7b9a43c8cd16d0b434adaf513fcacb340809a11 GIT binary patch literal 1150 zcmchVOGsN$5QZm2NTI$erQpKHrdQX(jn+pVxKN`Ng)RzW5+8_2Xb@Y)Dkd6tq9V8u z3WAh^C@KZ1kA;tohzs}b3NC_*QmUXr$oP*rH(2mdT{z*(KX=aj=bX$9kqMvFRKj;Q zwI&d~A);J>5-PDega~WT5us%#Dc(Y}C4WpP?+fS;FaZ*z_CFzgiW=w{I02=q_TUz( z?=^H2uwoIK1n%|Ay21~QgjV1emYtWttJdz^L#=DjJ@Ex*9UPc*7<=rZo*_NAh4PxA zqkso~Ioa1y$e+3kIkXi29YNLi&lW}vY6C}ut4{8ou(7w=$_=$v{yJ$h?y!&bJfq*( zL_NQRF37$6e>%9erGV?p^lRFD?|5J_eupXaS;QluyrOmBT>PJhirMYb*i?(4Tf=j~?VvnUlY_ zDCVuuk3E&T9aP~Cr-0i-MaKUjf_|U!=R&t}_CfD=d${p~HH`BPaqb9aXT}UI$iGRg z>0^GlZ`vM4?;$*LhfI(RG|XK4GF+@-W*W}YJT5&2N_ZyZuaM_Ry=%PWx>r0P(Rc?> jRc4}SfGA>*agjwN{7E7DEm(*)%rSx{B0<6wBoglxJAy|R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +
+

{{ msg }}

+

+ For a guide and recipes on how to configure / customize this project,
+ check out the + vue-cli documentation. +

+

Installed CLI Plugins

+ +

Essential Links

+ +

Ecosystem

+ +
+ + + + + + 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..31b59a8 --- /dev/null +++ b/jvue-front/Dockerfile @@ -0,0 +1,20 @@ +#依赖的镜像 +FROM node:10.15.1-alpine +#镜像创建者的信息 +MAINTAINER terwer "csyouwei@gmail.com" +# 设置编码 +ENV LANG C.UTF-8 +# 设置Node环境 +ENV HOST 0.0.0.0 +ENV NODE_ENV=production + +WORKDIR /app + +COPY ./jvue-front . + +RUN npm config set registry https://registry.npm.taobao.org && \ + npm i -g @vue/cli \ + npm install && \ + npm run build + +CMD ["npm","run","start"] \ 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..c1b2ffc --- /dev/null +++ b/jvue-front/package.json @@ -0,0 +1,33 @@ +{ + "name": "jvue-front", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "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 0000000000000000000000000000000000000000..c7b9a43c8cd16d0b434adaf513fcacb340809a11 GIT binary patch literal 1150 zcmchVOGsN$5QZm2NTI$erQpKHrdQX(jn+pVxKN`Ng)RzW5+8_2Xb@Y)Dkd6tq9V8u z3WAh^C@KZ1kA;tohzs}b3NC_*QmUXr$oP*rH(2mdT{z*(KX=aj=bX$9kqMvFRKj;Q zwI&d~A);J>5-PDega~WT5us%#Dc(Y}C4WpP?+fS;FaZ*z_CFzgiW=w{I02=q_TUz( z?=^H2uwoIK1n%|Ay21~QgjV1emYtWttJdz^L#=DjJ@Ex*9UPc*7<=rZo*_NAh4PxA zqkso~Ioa1y$e+3kIkXi29YNLi&lW}vY6C}ut4{8ou(7w=$_=$v{yJ$h?y!&bJfq*( zL_NQRF37$6e>%9erGV?p^lRFD?|5J_eupXaS;QluyrOmBT>PJhirMYb*i?(4Tf=j~?VvnUlY_ zDCVuuk3E&T9aP~Cr-0i-MaKUjf_|U!=R&t}_CfD=d${p~HH`BPaqb9aXT}UI$iGRg z>0^GlZ`vM4?;$*LhfI(RG|XK4GF+@-W*W}YJT5&2N_ZyZuaM_Ry=%PWx>r0P(Rc?> jRc4}SfGA>*agjwN{7E7DEm(*)%rSx{B0<6wBoglxJAy|R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +
+

{{ msg }}

+

+ For a guide and recipes on how to configure / customize this project,
+ check out the + vue-cli documentation. +

+

Installed CLI Plugins

+ +

Essential Links

+ +

Ecosystem

+ +
+ + + + + + 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" # 设置编码 From 19007547e22a316a86b3153f0c6b00147f3bd8f7 Mon Sep 17 00:00:00 2001 From: Terwer Date: Fri, 15 Mar 2019 18:59:18 +0800 Subject: [PATCH 2/3] jvue-front run success --- docker-compose.yml | 16 +++------------- jvue-front/Dockerfile | 23 ++++++++++------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 93d6727..b56a4f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,20 +1,10 @@ -# 构建docker-compose项目 -# docker-compose up -# docker-compose up -V --force-recreate -# docker-compose up -d --force-recreate version: '3' services: jvue-front: - privileged: true - image: jvue/front:4.0.0 container_name: jvue-front + image: jvue-front:4.0.0 build: - context: ./ + context: . dockerfile: ./jvue-front/Dockerfile ports: - - "3000:3000" - working_dir: /app - volumes: - - ./jvue-front:/app - - ./data/front/.npm:/root/.npm - restart: always + - "8080:8080" \ No newline at end of file diff --git a/jvue-front/Dockerfile b/jvue-front/Dockerfile index 31b59a8..1f76404 100644 --- a/jvue-front/Dockerfile +++ b/jvue-front/Dockerfile @@ -1,20 +1,17 @@ -#依赖的镜像 FROM node:10.15.1-alpine -#镜像创建者的信息 -MAINTAINER terwer "csyouwei@gmail.com" -# 设置编码 -ENV LANG C.UTF-8 -# 设置Node环境 -ENV HOST 0.0.0.0 -ENV NODE_ENV=production + +# 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 + COPY ./jvue-front . -RUN npm config set registry https://registry.npm.taobao.org && \ - npm i -g @vue/cli \ - npm install && \ - npm run build +RUN npm run build -CMD ["npm","run","start"] \ No newline at end of file +CMD ["npm", "run", "serve"] \ No newline at end of file From 33710b7cb8fbd4b5c08fe63a281b1ad3665223e0 Mon Sep 17 00:00:00 2001 From: Terwer Date: Fri, 15 Mar 2019 19:52:44 +0800 Subject: [PATCH 3/3] Build complete --- docker-compose-dev.yml | 28 +++++++++++++++ docker-compose.yml | 77 ++++++++++++++++++++++++++++++++++++++++- jvue-admin/Dockerfile | 21 +++++++++++ jvue-admin/package.json | 3 +- jvue-front/Dockerfile | 8 +++-- jvue-front/package.json | 4 ++- 6 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 jvue-admin/Dockerfile 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 b56a4f2..2de1857 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,85 @@ +# 构建docker-compose项目 +# docker-compose up +# docker-compose up -V --force-recreate +# docker-compose up -d --force-recreate version: '3' services: + jvue-nginx: + privileged: true + image: jvue/nginx:1.15.9 + container_name: jvue-nginx + build: + context: ./ + dockerfile: ./jvue-nginx/Dockerfile + ports: + - "80:80" + volumes: + - ./jvue-nginx/nginx.conf:/etc/nginx/conf.d/default.conf + - ./data/nginx/log:/var/log/nginx + jvue-mysql: + privileged: true + image: jvue/mysql:5.7.24 + container_name: jvue-mysql + build: + context: ./ + dockerfile: ./jvue-mysql/Dockerfile + ports: + - "3306:3306" + environment: + # 最好使用此设定时区,其它静像也可以使用,也可以用"TZ=Asia/Shanghai" + - "TZ=CST-8" + - "MYSQL_ROOT_PASSWORD=123456" + - "MYSQL_ROOT_HOST=%" + - "MYSQL_DATABASE=testbugucms" + - "MYSQL_USER=test" + - "MYSQL_PASSWORD=123456" + volumes: + - ./data/mysql/db:/var/db + - ./data/mysql/log:/var/log + - ./jvue-mysql/my.cnf:/etc/my.cnf + - ./jvue-mysql/init:/docker-entrypoint-initdb.d/ + restart: always + jvue-server: + privileged: true + image: jvue/server:4.0.0 + container_name: jvue-server + build: + context: ./ + dockerfile: ./jvue-server/Dockerfile + ports: + - "8081:8081" + working_dir: /app + command: mvn clean spring-boot:run -Dspring-boot.run.profiles=docker -DskipTests + volumes: + - ./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: - - "8080:8080" \ No newline at end of file + - "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/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/package.json b/jvue-admin/package.json index e0c8431..f6b7a0d 100644 --- a/jvue-admin/package.json +++ b/jvue-admin/package.json @@ -3,7 +3,8 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", + "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", diff --git a/jvue-front/Dockerfile b/jvue-front/Dockerfile index 1f76404..b087224 100644 --- a/jvue-front/Dockerfile +++ b/jvue-front/Dockerfile @@ -1,3 +1,4 @@ +#依赖的镜像 FROM node:10.15.1-alpine # CDN注册 @@ -5,13 +6,16 @@ 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 -COPY ./jvue-front . +# 注意这个一定要要在npm install后面,否则devDependencies的包无法安装 +ENV HOST 0.0.0.0 -RUN npm run build +COPY ./jvue-front . CMD ["npm", "run", "serve"] \ No newline at end of file diff --git a/jvue-front/package.json b/jvue-front/package.json index c1b2ffc..3de0bee 100644 --- a/jvue-front/package.json +++ b/jvue-front/package.json @@ -3,7 +3,9 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", + "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",