Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
cn-src committed May 11, 2019
2 parents a4f3f92 + 623582d commit d8c12bd
Show file tree
Hide file tree
Showing 29 changed files with 3,929 additions and 2,478 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: node_js
node_js:
- "11.2.0"
- '11.14.0'
before_script:
- yarn global add @vue/cli
- yarn global add font-spider
- yarn global add @vue/cli
- yarn global add font-spider
install:
- yarn
- yarn

script:
- yarn build
- yarn test:unit
- yarn build
- yarn test:unit
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Swagger 规范接口的文档型 API UI 界面
<dependency>
<groupId>cn.javaer.springfox</groupId>
<artifactId>swagger-document-ui</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
</dependency>
```

Expand Down Expand Up @@ -78,7 +78,7 @@ Swagger 规范接口的文档型 API UI 界面
<dependency>
<groupId>cn.javaer.springfox</groupId>
<artifactId>swagger-document-ui</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
rm -rf dist
npm run build
yarn run font-spider config/font-clip.html
yarn run build
node config/generatePom.js
mvn clean package
17 changes: 0 additions & 17 deletions config/pom.template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.googlecode.todomap</groupId>
<artifactId>maven-jettygzip-plugin</artifactId>
<version>0.0.4</version>
<configuration>
<webappDirectory>target/classes</webappDirectory>
<outputDirectory>target/classes</outputDirectory>
</configuration>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>process</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dist/swagger-ui.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=webjars/swagger-document-ui/favicon.ico><title>API 文档</title><link href=webjars/swagger-document-ui/css/entity-view.css rel=prefetch><link href=webjars/swagger-document-ui/js/entity-view.js rel=prefetch><link href=webjars/swagger-document-ui/css/chunk-vendors.css rel=preload as=style><link href=webjars/swagger-document-ui/css/swagger-document-ui.css rel=preload as=style><link href=webjars/swagger-document-ui/js/chunk-vendors.js rel=preload as=script><link href=webjars/swagger-document-ui/js/swagger-document-ui.js rel=preload as=script><link href=webjars/swagger-document-ui/css/chunk-vendors.css rel=stylesheet><link href=webjars/swagger-document-ui/css/swagger-document-ui.css rel=stylesheet></head><body><noscript><strong>We're sorry but swagger-document-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=webjars/swagger-document-ui/js/chunk-vendors.js></script><script src=webjars/swagger-document-ui/js/swagger-document-ui.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=webjars/swagger-document-ui/favicon.ico><title>API 文档</title><link href=webjars/swagger-document-ui/css/entity-view.css rel=prefetch><link href=webjars/swagger-document-ui/js/entity-view.js rel=prefetch><link href=webjars/swagger-document-ui/css/app.css rel=preload as=style><link href=webjars/swagger-document-ui/css/chunk-vendors.css rel=preload as=style><link href=webjars/swagger-document-ui/js/app.js rel=preload as=script><link href=webjars/swagger-document-ui/js/chunk-vendors.js rel=preload as=script><link href=webjars/swagger-document-ui/css/chunk-vendors.css rel=stylesheet><link href=webjars/swagger-document-ui/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but swagger-document-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=webjars/swagger-document-ui/js/chunk-vendors.js></script><script src=webjars/swagger-document-ui/js/app.js></script></body></html>
Binary file added dist/webjars/swagger-document-ui/css/app.css.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/webjars/swagger-document-ui/css/chunk-vendors.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file added dist/webjars/swagger-document-ui/favicon.ico.gz
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions dist/webjars/swagger-document-ui/js/app.js

Large diffs are not rendered by default.

Binary file added dist/webjars/swagger-document-ui/js/app.js.gz
Binary file not shown.
25 changes: 12 additions & 13 deletions dist/webjars/swagger-document-ui/js/chunk-vendors.js

Large diffs are not rendered by default.

Binary file not shown.
1 change: 0 additions & 1 deletion dist/webjars/swagger-document-ui/js/chunk-vendors.js.map

This file was deleted.

3 changes: 1 addition & 2 deletions dist/webjars/swagger-document-ui/js/entity-view.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
1 change: 0 additions & 1 deletion dist/webjars/swagger-document-ui/js/entity-view.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions dist/webjars/swagger-document-ui/js/swagger-document-ui.js

This file was deleted.

This file was deleted.

32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "swagger-document-ui",
"version": "1.0.0",
"version": "1.0.1",
"license": "Apache-2.0",
"repository": "https://github.com/cn-src/swagger-document-ui.git",
"contributors": [
"cn-src <[email protected]>"
],
"scripts": {
"serve": "vue-cli-service serve",
"build": "font-spider config/font-clip.html && vue-cli-service build",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit"
},
Expand All @@ -17,27 +17,29 @@
"clipboard": "^2.0.4",
"file-saver": "^2.0.1",
"fuse.js": "^3.4.4",
"iview": "^3.3.3",
"iview": "^3.4.1",
"lodash": "^4.17.11",
"pinyin": "^2.8.3",
"pinyin": "^2.9.0",
"vue": "^2.6.10",
"vue-router": "^3.0.2"
"vue-router": "^3.0.6"
},
"devDependencies": {
"@babel/core": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@vue/cli-plugin-babel": "^3.5.3",
"@vue/cli-plugin-eslint": "^3.5.1",
"@vue/cli-plugin-unit-jest": "^3.5.3",
"@vue/cli-service": "^3.5.3",
"@babel/core": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"@vue/cli-plugin-babel": "^3.7.0",
"@vue/cli-plugin-eslint": "^3.7.0",
"@vue/cli-plugin-unit-jest": "^3.7.0",
"@vue/cli-service": "^3.7.0",
"@vue/test-utils": "^1.0.0-beta.29",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^24.5.0",
"babel-jest": "^24.8.0",
"babel-plugin-import": "^1.11.0",
"jest": "^24.5.0",
"compression-webpack-plugin": "^2.0.0",
"font-spider": "^1.3.4",
"jest": "^24.8.0",
"less": "^3.9.0",
"less-loader": "^4.1.0",
"prettier": "1.16.4",
"less-loader": "^5.0.0",
"prettier": "1.17.0",
"vue-cli-plugin-pug": "^1.0.7",
"vue-template-compiler": "^2.6.10"
},
Expand Down
Loading

0 comments on commit d8c12bd

Please sign in to comment.