Skip to content

Commit

Permalink
Merge branch 'release/v1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnymillergh committed Feb 12, 2020
2 parents db28537 + fe275d9 commit 6781fd9
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TAG must be corresponding with the version tag in package.json, need to modify it when new version releases
TAG=1.1.1
# Package JSON string for globally access attention
VUE_APP_PACKAGE_JSON=''

# TAG must be corresponding with the version tag in package.json, need to modify it when new version releases
TAG=1.1.0
VUE_APP_EXRX_NET_BASE_URL='http://exrx.net'
4 changes: 1 addition & 3 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ VUE_APP_RUN_ON_DOCKER = 'false'
VUE_APP_BASE_URL = 'http://localhost:8080'
# Base api
VUE_APP_BASE_API = '/exrx-net-crawler-server-dev_loc'
# Resource base api for picture, video ect.
# Resource base api for pictures, videos ect.
VUE_APP_RESOURCE_BASE_API = 'http://localhost:8080/exrx-net-crawler-server-dev_loc'

VUE_APP_EXRX_NET_BASE_URL = 'http://exrx.net'

# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
# It only does one thing by converting all import() to require().
Expand Down
2 changes: 1 addition & 1 deletion .env.development_docker
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ VUE_APP_RUN_ON_DOCKER = 'true'
VUE_APP_BASE_URL = ''
# Base api
VUE_APP_BASE_API = 'http://localhost:8081/jm-spring-boot-template-dev_dkr'
# Resource base api for picture, video ect.
# Resource base api for pictures, videos ect.
VUE_APP_RESOURCE_BASE_API = 'http://localhost:8081/jm-spring-boot-template-dev_dkr'
6 changes: 3 additions & 3 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ VUE_APP_RUN_ON_DOCKER = 'true'
# Left blank if the environment is not development.
VUE_APP_BASE_URL = ''
# Base api
VUE_APP_BASE_API = 'http://172.11.239.12:8080/exrx-net-crawler-server-prod'
# Resource base api for picture, video ect.
VUE_APP_RESOURCE_BASE_API = 'http://172.11.239.12:8080/exrx-net-crawler-server-prod'
VUE_APP_BASE_API = 'http://172.11.239.4:8080/exrx-net-crawler-server-stage'
# Resource base api for pictures, videos ect.
VUE_APP_RESOURCE_BASE_API = 'http://172.11.239.4:8080/exrx-net-crawler-server-stage'
6 changes: 3 additions & 3 deletions .env.stage
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ VUE_APP_RUN_ON_DOCKER = 'true'
# Left blank if the environment is not development.
VUE_APP_BASE_URL = ''
# Base api
VUE_APP_BASE_API = 'http://localhost/jm-spring-boot-template-stage'
# Resource base api for picture, video ect.
VUE_APP_RESOURCE_BASE_API = 'http://localhost/jm-spring-boot-template-stage'
VUE_APP_BASE_API = 'http://172.11.239.4:8080/exrx-net-crawler-server-stage'
# Resource base api for pictures, videos ect.
VUE_APP_RESOURCE_BASE_API = 'http://172.11.239.4:8080/exrx-net-crawler-server-stage'
6 changes: 3 additions & 3 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ VUE_APP_RUN_ON_DOCKER = 'true'
# Left blank if the environment is not development.
VUE_APP_BASE_URL = ''
# Base api
VUE_APP_BASE_API = 'http://localhost/jm-spring-boot-template-test'
# Resource base api for picture, video ect.
VUE_APP_RESOURCE_BASE_API = 'http://localhost/jm-spring-boot-template-test'
VUE_APP_BASE_API = 'http://172.11.239.4:8080/exrx-net-crawler-server-stage'
# Resource base api for pictures, videos ect.
VUE_APP_RESOURCE_BASE_API = 'http://172.11.239.4:8080/exrx-net-crawler-server-stage'
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## [1.1.1](https://github.com/johnnymillergh/exrx-net-crawler/compare/v1.1.0...v1.1.1) (2020-02-12)


### Bug Fixes

* **$Env:** delete whitespace ([e2e1312](https://github.com/johnnymillergh/exrx-net-crawler/commit/e2e13123ee4aff5dbc27ed39800e6e83afa5196f))


### Performance Improvements

* **$Docker:** update back-end server IP ([96ab126](https://github.com/johnnymillergh/exrx-net-crawler/commit/96ab1265297e19a4f1e14eb1f079320455bb44b1))
* **$Env:** abstract ENV variables ([4055a36](https://github.com/johnnymillergh/exrx-net-crawler/commit/4055a369dfa0cb93bbcdce3063d34c51defc84ed))



# [1.1.0](https://github.com/johnnymillergh/exrx-net-crawler/compare/v1.0.2...v1.1.0) (2020-02-11)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "exrx-net-crawler",
"version": "1.1.0",
"version": "1.1.1",
"license": "Apache-2.0",
"description": "The Crawler for ExRx.net",
"author": {
Expand Down

0 comments on commit 6781fd9

Please sign in to comment.