-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22 from jvuesource/v2.x
SSR render success
- Loading branch information
Showing
9 changed files
with
11,214 additions
and
11,326 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| application.title=JVue Framework | ||
| application.formatted-version=v2.0.0 | ||
|
|
||
| # 解决Spring Boot部署到Tomcat中文乱码 | ||
| spring.http.encoding.charset=UTF-8 | ||
| spring.http.encoding.force=true | ||
| spring.http.encoding.enabled=true | ||
|
|
||
| spring.profiles.active=prod | ||
| application.title=JVue Framework | ||
| application.formatted-version=v2.0.0 | ||
|
|
||
| # 解决Spring Boot部署到Tomcat中文乱码 | ||
| spring.http.encoding.charset=UTF-8 | ||
| spring.http.encoding.force=true | ||
| spring.http.encoding.enabled=true | ||
|
|
||
| spring.profiles.active=dev |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,41 @@ | ||
| REM ./build/cpm.cmd | ||
| REM ncp [source] [dest] [--limit=concurrency limit] [--filter=filter] --stopOnErr | ||
|
|
||
| REM clean && mkdir | ||
| del "dist/node_modules" /q | ||
| mkdir "dist/node_modules" | ||
|
|
||
| REM core-js | ||
| yarn ncp node_modules/core-js dist/node_modules/core-js | ||
| del -rf dist/node_modules/core-js/modules /q | ||
|
|
||
| REM vue-server-renderer | ||
| yarn ncp node_modules/he dist/node_modules/he | ||
| yarn ncp node_modules/lodash._reinterpolate dist/node_modules/lodash._reinterpolate | ||
| yarn ncp node_modules/lodash.template dist/node_modules/lodash.template | ||
| yarn ncp node_modules/lodash.templatesettings dist/node_modules/lodash.templatesettings | ||
| yarn ncp node_modules/resolve dist/node_modules/resolve | ||
| yarn ncp node_modules/serialize-javascript dist/node_modules/serialize-javascript | ||
| yarn ncp node_modules/vue-server-renderer dist/node_modules/vue-server-renderer | ||
| del dist/node_modules/vue-server-renderer/node_modules /q | ||
|
|
||
| REM vue | ||
| yarn ncp node_modules/vue dist/node_modules/vue | ||
|
|
||
| REM vue-router | ||
| yarn ncp node_modules/vue-router dist/node_modules/vue-router | ||
|
|
||
| REM axios | ||
| yarn ncp node_modules/axios dist/node_modules/axios | ||
| yarn ncp node_modules/is-buffer dist/node_modules/is-buffer | ||
| yarn ncp node_modules/follow-redirects dist/node_modules/follow-redirects | ||
|
|
||
| REM bootstrap-vue | ||
| yarn ncp node_modules/bootstrap-vue dist/node_modules/bootstrap-vue | ||
| del "dist/node_modules/bootstrap-vue/node_modules" /q | ||
| del "dist/node_modules/bootstrap-vue/src" /q | ||
|
|
||
| REM circular-json | ||
| yarn ncp node_modules/circular-json dist/node_modules/circular-json | ||
| REM ./build/cpm.cmd | ||
| REM ncp [source] [dest] [--limit=concurrency limit] [--filter=filter] --stopOnErr | ||
|
|
||
| REM clean && mkdir | ||
| del "dist/node_modules" /q | ||
| mkdir "dist/node_modules" | ||
|
|
||
| REM core-js | ||
| yarn ncp node_modules/core-js dist/node_modules/core-js | ||
|
|
||
| REM vue-server-renderer | ||
| yarn ncp node_modules/he dist/node_modules/he | ||
| yarn ncp node_modules/lodash._reinterpolate dist/node_modules/lodash._reinterpolate | ||
| yarn ncp node_modules/lodash.template dist/node_modules/lodash.template | ||
| yarn ncp node_modules/lodash.templatesettings dist/node_modules/lodash.templatesettings | ||
| yarn ncp node_modules/resolve dist/node_modules/resolve | ||
| yarn ncp node_modules/serialize-javascript dist/node_modules/serialize-javascript | ||
| yarn ncp node_modules/vue-server-renderer dist/node_modules/vue-server-renderer | ||
| del dist/node_modules/vue-server-renderer/node_modules /q | ||
|
|
||
| REM vue | ||
| yarn ncp node_modules/vue dist/node_modules/vue | ||
|
|
||
| REM vue-router | ||
| yarn ncp node_modules/vue-router dist/node_modules/vue-router | ||
|
|
||
| REM axios | ||
| yarn ncp node_modules/axios dist/node_modules/axios | ||
| yarn ncp node_modules/is-buffer dist/node_modules/is-buffer | ||
| yarn ncp node_modules/follow-redirects dist/node_modules/follow-redirects | ||
|
|
||
| REM bootstrap-vue | ||
| yarn ncp node_modules/bootstrap-vue dist/node_modules/bootstrap-vue | ||
| del "dist/node_modules/bootstrap-vue/node_modules" /q | ||
| del "dist/node_modules/bootstrap-vue/src" /q | ||
|
|
||
| REM circular-json | ||
| yarn ncp node_modules/circular-json dist/node_modules/circular-json | ||
|
|
||
| REM source-map | ||
| yarn ncp node_modules/source-map dist/node_modules/source-map |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,44 @@ | ||
| /** | ||
| * logger | ||
| * | ||
| * @author Terwer | ||
| * @version 1.0 | ||
| * 19-2-27 下午11:22 | ||
| **/ | ||
| global.loggerName = "default"; | ||
| const isDebugEnabled = | ||
| process.env.NODE_ENV === "development" && | ||
| process.env.VUE_APP_DEBUG === "true"; | ||
| const isInfoEnabled = | ||
| process.env.NODE_ENV === "development" && process.env.VUE_APP_INFO === "true"; | ||
| const isErrorEnabled = process.env.VUE_APP_ERROR === "true"; | ||
| console.log( | ||
| "isDebugEnabled,isInfoEnabled,isErrorEnabled=>", | ||
| `${isDebugEnabled},${isInfoEnabled},${isErrorEnabled}` | ||
| ); | ||
|
|
||
| const debug = log => { | ||
| if (isDebugEnabled) { | ||
| console.warn("[", global.loggerName, "]", log); | ||
| } | ||
| }; | ||
|
|
||
| const info = log => { | ||
| if (isInfoEnabled) { | ||
| console.log("[", global.loggerName, "]", log); | ||
| } | ||
| }; | ||
|
|
||
| const error = log => { | ||
| if (isErrorEnabled) { | ||
| console.error("[", global.loggerName, "]", log); | ||
| } | ||
| }; | ||
|
|
||
| let logger = { | ||
| debug, | ||
| info, | ||
| error | ||
| }; | ||
|
|
||
| export const getLogger = name => { | ||
| global.loggerName = name; | ||
| return logger; | ||
| }; | ||
| /** | ||
| * logger | ||
| * | ||
| * @author Terwer | ||
| * @version 1.0 | ||
| * 19-2-27 下午11:22 | ||
| **/ | ||
| global.loggerName = "default"; | ||
| const isDebugEnabled = process.env.VUE_APP_DEBUG === "true"; | ||
| const isInfoEnabled = process.env.VUE_APP_INFO === "true"; | ||
| const isErrorEnabled = process.env.VUE_APP_ERROR === "true"; | ||
| console.log( | ||
| "isDebugEnabled,isInfoEnabled,isErrorEnabled=>", | ||
| `${isDebugEnabled},${isInfoEnabled},${isErrorEnabled}` | ||
| ); | ||
|
|
||
| const debug = log => { | ||
| if (isDebugEnabled) { | ||
| console.warn("[", global.loggerName, "]", log); | ||
| } | ||
| }; | ||
|
|
||
| const info = log => { | ||
| if (isInfoEnabled) { | ||
| console.log("[", global.loggerName, "]", log); | ||
| } | ||
| }; | ||
|
|
||
| const error = log => { | ||
| if (isErrorEnabled) { | ||
| console.error("[", global.loggerName, "]", log); | ||
| } | ||
| }; | ||
|
|
||
| let logger = { | ||
| debug, | ||
| info, | ||
| error | ||
| }; | ||
|
|
||
| export const getLogger = name => { | ||
| global.loggerName = name; | ||
| return logger; | ||
| }; |
Oops, something went wrong.