yakuza0 2.23.8 → 2.23.9-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.23.8",
+  "version": "2.23.9-beta.3",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {

package/template/redirect.plugin.js

@@ -97,31 +97,33 @@ export default async (ctx, inject) => {
       url += '#' + options.hash
     }
 
-    if (!checkServer()) {
-      if (typeof options.replace === 'boolean' && options.replace) {
-        window.location.replace(url);
-        // if (options.target === '_blank') {
-        //   window.open(url, options.target, options.specs, options.replace)
-        // } else {
-        //   window.location.replace(url)
-        // }
-      } else {
-        if (isOuter || options.target !== '_self' || options.specs) {
-          if (_.startsWith(url, '/') && !_.startsWith(url, '//')) {
-            url = _.bothAddFix($yk.appConf.server.basePath, '/') + _.trimStart(url, '/')
-          }
-
-          window.open(url, options.target, options.specs)
+    if (typeof url === 'string') {
+      if (!checkServer()) {
+        if (typeof options.replace === 'boolean' && options.replace) {
+          window.location.replace(url);
+          // if (options.target === '_blank') {
+          //   window.open(url, options.target, options.specs, options.replace)
+          // } else {
+          //   window.location.replace(url)
+          // }
         } else {
-          redirect(url)
+          if (isOuter || options.target !== '_self' || options.specs) {
+            if (_.startsWith(url, '/') && !_.startsWith(url, '//')) {
+              url = _.bothAddFix($yk.appConf.server.basePath, '/') + _.trimStart(url, '/')
+            }
+
+            window.open(url, options.target, options.specs)
+          } else {
+            redirect(url)
+          }
         }
+      } else {
+        const q = jsUrl('?', url) || {};
+        if (route.query.ticket || route.query.__isc) {
+          q.__isc = route.query.ticket ? md5(route.query.ticket).substring(0, 6) : route.query.__isc
+        }
+        redirect(url, q)
       }
-    } else {
-      const q = jsUrl('?', url) || {};
-      if (route.query.ticket || route.query.__isc) {
-        q.__isc = route.query.ticket ? md5(route.query.ticket).substring(0, 6) : route.query.__isc
-      }
-      redirect(url, q)
     }
   }
 

package/utils/inclusive.js

@@ -1229,7 +1229,7 @@ var render = function () {
                 if (conf.inImage) {
                   scKeyStr = k + conf.imageKeyOrigin + yk0EnvStr;
                 }
-                var scKey = (0, _yakuza.md5)(scKeyStr).substring(2, 8);
+                var scKey = (0, _yakuza.md5)(_yakuza._.sortBy(scKeyStr.split('')).join('')).substring(2, 8);
                 conf.scKey = scKey;
 
                 var confStr = (0, _stringify2.default)(conf);