Merge branch 'master' into dev

JX3BOX · Jan 27, 2025 · b370f25 · b370f25
2 parents 4949bbd + c54f181
commit b370f25
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 13 deletions.
diff --git a/.env.development b/.env.development
@@ -1,4 +1,8 @@
-STATIC_PATH=/
+STATIC_PATH=mirror
 BASE_URL=/
 
-VUE_APP_CMS_API=https://cms.jx3box.com
+VUE_APP_CMS_API=https://dev.cms.jx3box.com
+VUE_APP_NEXT_API=https://dev.next.jx3box.com
+VUE_APP_PAY_API=https://pay.jx3box.com
+VUE_APP_TEAM_API=https://team.jx3box.com
+VUE_APP_LUA_API=https://lua.jx3box.com
diff --git a/.env.production b/.env.production
@@ -2,3 +2,7 @@ STATIC_PATH=mirror
 BASE_URL=/
 
 VUE_APP_CMS_API=https://cms.jx3box.com
+VUE_APP_NEXT_API=https://next.jx3box.com
+VUE_APP_PAY_API=https://pay.jx3box.com
+VUE_APP_TEAM_API=https://team.jx3box.com
+VUE_APP_LUA_API=https://lua.jx3box.com
diff --git a/.env.staging b/.env.staging
@@ -0,0 +1,8 @@
+STATIC_PATH=mirror
+BASE_URL=/
+
+VUE_APP_CMS_API=http://localhost:7100
+VUE_APP_NEXT_API=https://next.jx3box.com
+VUE_APP_PAY_API=https://pay.jx3box.com
+VUE_APP_TEAM_API=https://team.jx3box.com
+VUE_APP_LUA_API=https://lua.jx3box.com
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -19,7 +19,7 @@ jobs:
             - name: Install && Build
               run: |
                   npm install
-                  npm run preview
+                  npm run build-dev
 
             ## TODO:下方修改1处
             - name: GrayEnv

diff --git a/package.json b/package.json
@@ -2,16 +2,17 @@
   "name": "account",
   "private": true,
   "scripts": {
-    "dev": "cross-env DEV_SERVER=true vue-cli-service serve",
+    "dev": "cross-env DEV_SERVER=true vue-cli-service serve --mode development",
     "serve": "vue-cli-service serve",
+    "debug": "cross-env DEV_SERVER=true vue-cli-service serve --mode staging",
     "build": "vue-cli-service build",
-    "preview": "cross-env BUILD_MODE=preview vue-cli-service build --mode development",
+    "build-dev": "cross-env BUILD_MODE=preview vue-cli-service build --mode development",
     "lint": "vue-cli-service lint",
     "inspect": "vue inspect > output.js",
     "update": "npm --registry https://registry.npmjs.org install @jx3box/jx3box-common@latest"
   },
   "dependencies": {
-    "@jx3box/jx3box-common": "^8.3.3",
+    "@jx3box/jx3box-common": "^8.5.7",
     "@jx3box/jx3box-common-ui": "^8.9.11",
     "axios": "^0.19.2",
     "core-js": "^3.4.3",

diff --git a/src/core/login/Login.vue b/src/core/login/Login.vue
@@ -239,6 +239,8 @@ export default {
 
             if (~~alternate) {
                 this.isAlternate = true;
+
+                sessionStorage.setItem("alternate", 1);
             }
         },
         checkDeviceID: function () {

diff --git a/src/core/login_callback_wesite/Login_Callback.vue b/src/core/login_callback_wesite/Login_Callback.vue
@@ -45,6 +45,15 @@ export default {
                 }
 
                 User.update(_data).then(() => {
+
+                    if (this.isAlternate) {
+                        localStorage.setItem(`jx3box-alternate-${_data.uid}`, JSON.stringify({
+                            ..._data,
+                            created_at: Number(localStorage.getItem("created_at")),
+                        }));
+                    }
+
+                    sessionStorage.removeItem("alternate");
                     this.skip();
                 });
             }

diff --git a/src/utils/direct_mixins.js b/src/utils/direct_mixins.js
@@ -4,6 +4,7 @@ export const directMixins = {
             redirect: "",
             redirect_button: "",
             homepage: "/",
+            isAlternate: false,
         };
     },
     mounted() {
@@ -27,6 +28,8 @@ export const directMixins = {
                 this.redirect = this.homepage;
                 this.redirect_button = "返回首页";
             }
+
+            this.isAlternate = sessionStorage.getItem("alternate") == 1;
         },
         skip: function () {
             if (this.redirect) {

diff --git a/vue.config.js b/vue.config.js
@@ -52,13 +52,13 @@ module.exports = {
     },
 
     //❤️ Porxy ~
-    devServer: {
-        proxy: {
-            "/api/cms": {
-                target: process.env["DEV_SERVER"] == "true" ? "http://localhost:7100" : "https://cms.jx3box.com",
-            },
-        }
-    },
+    // devServer: {
+    //     proxy: {
+    //         "/api/cms": {
+    //             target: process.env["DEV_SERVER"] == "true" ? "http://localhost:7100" : "https://cms.jx3box.com",
+    //         },
+    //     }
+    // },
 
     outputDir: process.env["BUILD_MODE"] == "preview" ? path.resolve(__dirname, pkg.name) : "dist", // 指定构建输出的目录