Merge branch 'master' of git://github.com/xiaochong44/module-zero-core-template

Author: ismcagdas

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/appsettings.json

@@ -5,7 +5,7 @@
     "App": {
         "ServerRootAddress": "http://localhost:21021/",
         "ClientRootAddress": "http://localhost:4200/",
-        "CorsOrigins": "http://localhost:4200,http://localhost:8080"
+        "CorsOrigins": "http://localhost:4200,http://localhost:8080,http://localhost:8081"
     },
     "Authentication": {
         "JwtBearer": {

vue/.babelrc

@@ -1,9 +1,21 @@
-npm-debug.log
+.DS_Store
 node_modules
-.project
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
 .vscode
-.history
-.DS_Store
-\.settings/
-build/env.js
-dist/
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*