fix [Bug]: 手机app注销后, 地址栏变成了root url. 应该是xxx.meteor.local #6891

steedos · May 29, 2024 · c96f26f · c96f26f
1 parent 1ed3d10
commit c96f26f
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 60 deletions.
diff --git a/creator/packages/steedos-base/client/bootstrap.coffee b/creator/packages/steedos-base/client/bootstrap.coffee
@@ -36,7 +36,7 @@ Steedos.logout = (redirect)->
 	if accountsUrl
 		if !redirect
 			if Meteor.isCordova
-				redirect = Meteor.absoluteUrl();
+				redirect = getRedirectUrl();
 			# else
 			# 	redirect = getRedirectUrl();
 	if redirect

diff --git a/server/bundle/programs/server/packages/modules.js b/server/bundle/programs/server/packages/modules.js
@@ -463,7 +463,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/objectql",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js"
 };
 
@@ -490,7 +490,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/i18n",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js"
 };
 
@@ -517,7 +517,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/core",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js"
 };
 
@@ -544,7 +544,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-meteor-package-loader",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "index.js"
 };
 
@@ -571,7 +571,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-api",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "index.js"
 };
 
@@ -598,7 +598,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-metadata-server",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "index.js"
 };
 
@@ -625,7 +625,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-package-registry",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "package.service.js"
 };
 
@@ -652,7 +652,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-objectql",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "package.service.js"
 };
 
@@ -679,7 +679,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-ui",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "package.service.js"
 };
 
@@ -706,7 +706,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-pages",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "package.service.js"
 };
 
@@ -733,7 +733,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/router",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js"
 };
 
@@ -760,7 +760,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/auth",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js"
 };
 
@@ -787,7 +787,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/workflow",
-  "version": "2.7.1-beta.13",
+  "version": "2.7.1-beta.21",
   "main": "index.js"
 };
 

diff --git a/...f74debdf962b32efd074b043c7ff1f83f819b1.js → ...8f74acd4a07c9307c152159dd33468ab267999.js b/...f74debdf962b32efd074b043c7ff1f83f819b1.js → ...8f74acd4a07c9307c152159dd33468ab267999.js
diff --git a/...962b32efd074b043c7ff1f83f819b1.stats.json → ...a07c9307c152159dd33468ab267999.stats.json b/...962b32efd074b043c7ff1f83f819b1.stats.json → ...a07c9307c152159dd33468ab267999.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4306489,
-  "totalMinifiedGzipBytes": 1084972,
+  "totalMinifiedBytes": 4306472,
+  "totalMinifiedGzipBytes": 1084969,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -2269,7 +2269,7 @@
       }
     ],
     "packages/steedos_base.js": [
-      104674,
+      104657,
       {
         "node_modules": {
           "meteor": {
@@ -2296,7 +2296,7 @@
                 "server_session.js": 14
               },
               "client": {
-                "bootstrap.coffee": 6048,
+                "bootstrap.coffee": 6031,
                 "collections.js": 1355,
                 "lib": {
                   "printThis": {

diff --git a/server/bundle/programs/web.browser.legacy/program.json b/server/bundle/programs/web.browser.legacy/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "5ef74debdf962b32efd074b043c7ff1f83f819b1.js",
+      "path": "e98f74acd4a07c9307c152159dd33468ab267999.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/5ef74debdf962b32efd074b043c7ff1f83f819b1.js?meteor_js_resource=true",
-      "size": 4306489,
-      "hash": "5ef74debdf962b32efd074b043c7ff1f83f819b1",
-      "sri": "phpE45IekXzi2ZCA7Lc4buyj0JWIzo65LWBClDBB55O4LyBr25gkKuSmYbozwj86aX2sGx7gfv0viumgLKoRpA=="
+      "url": "/e98f74acd4a07c9307c152159dd33468ab267999.js?meteor_js_resource=true",
+      "size": 4306472,
+      "hash": "e98f74acd4a07c9307c152159dd33468ab267999",
+      "sri": "WyXZP7Wm6h7KpW4hjCyWQ7hhasaFslnVTURUF9vMCVZPS5YMjxQZQGDS6AnEIZ2TXkKmdw6hkDdnCjTBNuIvZQ=="
     },
     {
-      "path": "5ef74debdf962b32efd074b043c7ff1f83f819b1.stats.json",
+      "path": "e98f74acd4a07c9307c152159dd33468ab267999.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/5ef74debdf962b32efd074b043c7ff1f83f819b1.stats.json?meteor_js_resource=true",
+      "url": "/e98f74acd4a07c9307c152159dd33468ab267999.stats.json?meteor_js_resource=true",
       "size": 92684,
-      "hash": "678d46c2b0a6da2715e3ad839696b3e8e8614431",
-      "sri": "XaQNIOzb6y6L4+FxTj3MujFMjtGxQRGtGUisD2ZTfug3ck+5oyxA6iOiLzA0xZWZrbByDRgyt5jfPRT0tKzRlA=="
+      "hash": "1a7feb447e72800fe3b91012edb66f094cb41ed2",
+      "sri": "VAbV7y7lPH4xNrG1DuNh038cIKgCl7tOSV7y/doGv5daycTSq94MCCy6GWhXkBqQpvPhxy0i0LRygQNjnP4E0Q=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...f74debdf962b32efd074b043c7ff1f83f819b1.js → ...8f74acd4a07c9307c152159dd33468ab267999.js b/...f74debdf962b32efd074b043c7ff1f83f819b1.js → ...8f74acd4a07c9307c152159dd33468ab267999.js
diff --git a/...962b32efd074b043c7ff1f83f819b1.stats.json → ...a07c9307c152159dd33468ab267999.stats.json b/...962b32efd074b043c7ff1f83f819b1.stats.json → ...a07c9307c152159dd33468ab267999.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4306489,
-  "totalMinifiedGzipBytes": 1084972,
+  "totalMinifiedBytes": 4306472,
+  "totalMinifiedGzipBytes": 1084969,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -2269,7 +2269,7 @@
       }
     ],
     "packages/steedos_base.js": [
-      104674,
+      104657,
       {
         "node_modules": {
           "meteor": {
@@ -2296,7 +2296,7 @@
                 "server_session.js": 14
               },
               "client": {
-                "bootstrap.coffee": 6048,
+                "bootstrap.coffee": 6031,
                 "collections.js": 1355,
                 "lib": {
                   "printThis": {

diff --git a/server/bundle/programs/web.browser/program.json b/server/bundle/programs/web.browser/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "5ef74debdf962b32efd074b043c7ff1f83f819b1.js",
+      "path": "e98f74acd4a07c9307c152159dd33468ab267999.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/5ef74debdf962b32efd074b043c7ff1f83f819b1.js?meteor_js_resource=true",
-      "size": 4306489,
-      "hash": "5ef74debdf962b32efd074b043c7ff1f83f819b1",
-      "sri": "phpE45IekXzi2ZCA7Lc4buyj0JWIzo65LWBClDBB55O4LyBr25gkKuSmYbozwj86aX2sGx7gfv0viumgLKoRpA=="
+      "url": "/e98f74acd4a07c9307c152159dd33468ab267999.js?meteor_js_resource=true",
+      "size": 4306472,
+      "hash": "e98f74acd4a07c9307c152159dd33468ab267999",
+      "sri": "WyXZP7Wm6h7KpW4hjCyWQ7hhasaFslnVTURUF9vMCVZPS5YMjxQZQGDS6AnEIZ2TXkKmdw6hkDdnCjTBNuIvZQ=="
     },
     {
-      "path": "5ef74debdf962b32efd074b043c7ff1f83f819b1.stats.json",
+      "path": "e98f74acd4a07c9307c152159dd33468ab267999.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/5ef74debdf962b32efd074b043c7ff1f83f819b1.stats.json?meteor_js_resource=true",
+      "url": "/e98f74acd4a07c9307c152159dd33468ab267999.stats.json?meteor_js_resource=true",
       "size": 92684,
-      "hash": "678d46c2b0a6da2715e3ad839696b3e8e8614431",
-      "sri": "XaQNIOzb6y6L4+FxTj3MujFMjtGxQRGtGUisD2ZTfug3ck+5oyxA6iOiLzA0xZWZrbByDRgyt5jfPRT0tKzRlA=="
+      "hash": "1a7feb447e72800fe3b91012edb66f094cb41ed2",
+      "sri": "VAbV7y7lPH4xNrG1DuNh038cIKgCl7tOSV7y/doGv5daycTSq94MCCy6GWhXkBqQpvPhxy0i0LRygQNjnP4E0Q=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...2aafbed53b7a0c1764110924a38709ee250b0e.js → ...31fbfbf2538cf6ea65911b8a2664e4aac3947a.js b/...2aafbed53b7a0c1764110924a38709ee250b0e.js → ...31fbfbf2538cf6ea65911b8a2664e4aac3947a.js
diff --git a/...3b7a0c1764110924a38709ee250b0e.stats.json → ...538cf6ea65911b8a2664e4aac3947a.stats.json b/...3b7a0c1764110924a38709ee250b0e.stats.json → ...538cf6ea65911b8a2664e4aac3947a.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4482716,
-  "totalMinifiedGzipBytes": 1144269,
+  "totalMinifiedBytes": 4482699,
+  "totalMinifiedGzipBytes": 1144268,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9639,
     "packages/coffeescript.js": 32,
@@ -2001,7 +2001,7 @@
       }
     ],
     "packages/steedos_base.js": [
-      105446,
+      105429,
       {
         "node_modules": {
           "meteor": {
@@ -2028,7 +2028,7 @@
                 "server_session.js": 14
               },
               "client": {
-                "bootstrap.coffee": 6048,
+                "bootstrap.coffee": 6031,
                 "collections.js": 1355,
                 "lib": {
                   "printThis": {

diff --git a/server/bundle/programs/web.cordova/program.json b/server/bundle/programs/web.cordova/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "cc2aafbed53b7a0c1764110924a38709ee250b0e.js",
+      "path": "3731fbfbf2538cf6ea65911b8a2664e4aac3947a.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/__cordova/cc2aafbed53b7a0c1764110924a38709ee250b0e.js?meteor_js_resource=true",
-      "size": 4482716,
-      "hash": "cc2aafbed53b7a0c1764110924a38709ee250b0e",
-      "sri": "Gux5fnbAwQ1l9mnSnoYqBjhmwf66FSuodrTqO91jsGOstArwF4Rz4lCTIZxzEqk0S6zOvFYvIqASZp+IKsWhUA=="
+      "url": "/__cordova/3731fbfbf2538cf6ea65911b8a2664e4aac3947a.js?meteor_js_resource=true",
+      "size": 4482699,
+      "hash": "3731fbfbf2538cf6ea65911b8a2664e4aac3947a",
+      "sri": "ilqli7/E3vo/WgnnQlw9P7py3D9wlZyPsgapBogwYcD2S1fYMIUYYGeb64kmEJR/QzzoGFHZkfkLpKuTs+Ufow=="
     },
     {
-      "path": "cc2aafbed53b7a0c1764110924a38709ee250b0e.stats.json",
+      "path": "3731fbfbf2538cf6ea65911b8a2664e4aac3947a.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/__cordova/cc2aafbed53b7a0c1764110924a38709ee250b0e.stats.json?meteor_js_resource=true",
+      "url": "/__cordova/3731fbfbf2538cf6ea65911b8a2664e4aac3947a.stats.json?meteor_js_resource=true",
       "size": 82586,
-      "hash": "f046c4966aee5344cca63f805f87fba825344fa9",
-      "sri": "LauAbi3XxlUTAB/EWoIVp8Daw+Mq7EgoEaWziWMYuxgCCz9oVCgxpS62qb7GCTwXRmDUx1ZzWleHffrbDzCWaw=="
+      "hash": "a7f327f72f597c1294b181323bc28e7912b68526",
+      "sri": "Wd1PCvFid0db2t3MWIN0SlwrfAh/quPC5ikkQ85/PDVgOKxdixSDjscT9WK527IL7BLnbPXtV1h/fIwx7YpgCw=="
     },
     {
       "path": "106b9e345091b56401f90f1c9096385cd0758cb4.css",

diff --git a/server/bundle/star.json b/server/bundle/star.json
@@ -36,5 +36,5 @@
   "meteorRelease": "[email protected]",
   "nodeVersion": "12.16.1",
   "npmVersion": "6.13.4",
-  "gitCommitHash": "ca1be3117e80e75c549ec46654e5f2db870f8091"
+  "gitCommitHash": "1ed3d10c5e2929cfbe495ab05aa8e2100246300d"
 }