@cloudbase/lowcode-builder 1.8.78 → 1.8.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.78",
+  "version": "1.8.80",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -47,7 +47,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.65",
+    "@cloudbase/cals": "^1.0.67",
     "@cloudbase/lowcode-generator": "^1.8.25",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/mp/common/util.js

@@ -870,3 +870,35 @@ export function reportEvent(tag) {
     });
   } catch (e) {}
 }
+
+let LOGIN_CONFIG = <%= customLoginConfig %>
+export async function getLoginConfig() {
+  <% if(loginConfigPathname){ %>
+  const { staticResourceDomain, loginConfigVersion, id } = app.__internal__?.getConfig() || {};
+  if (staticResourceDomain && loginConfigVersion && id) {
+    const url = app.__internal__?.resolveStaticResourceUrl?.(`<%= loginConfigPathname %>`)
+    if (!LOGIN_CONFIG) {
+      LOGIN_CONFIG = await new Promise((resolve, reject) => {
+        wx.request({
+          url,
+          success: res => {
+            if(String(res.statusCode).startsWith('2')){
+              resolve(res.data)
+            } else {
+              reject(new Error(`statusCode: ${res.statusCode} 获取${url}失败`))
+            }
+          },
+          fail: e => {
+            const error = new Error(e.errMsg)
+            error.code = e.errno
+            reject(error)
+          }
+        })
+      })
+    }
+    return LOGIN_CONFIG
+  } else {
+    throw new Error('缺少登录配置');
+  }
+  <% } %>
+}

package/template/mp/packages/$wd_system/pages/login/index.js

@@ -1,6 +1,7 @@
 import { app, $app } from '../../../../app/weapps-api'
 import loginByPassword from './methods/loginByPassword'
 import loginByWXPhone from './methods/loginByWXPhone'
+import { getLoginConfig } from '../../../../common/util'
 
 function decodePageQuery(query) {
   return Object.keys(query).reduce((decoded, key) => {
@@ -9,7 +10,6 @@ function decodePageQuery(query) {
   }, {});
 }
 
-let loginConfig
 Component({
   data: {
     params: {},
@@ -59,8 +59,8 @@ Component({
     },
     async onLoad(options) {
       try {
-        const config = await this._getLoginConfig().catch(() => {
-          return this._getLoginConfig()
+        const config = await getLoginConfig().catch(() => {
+          return getLoginConfig()
         })
         const query = decodePageQuery(options || {});
         let settingData = {
@@ -81,6 +81,7 @@ Component({
           initing: false
         })
       } catch(e) {
+        console.error('获取登录配置失败:', e)
         this.setData({
           initing: false,
           error: {
@@ -128,33 +129,6 @@ Component({
       const config = settingData || this.data.settingData
       return !!config.miniprogram.find(function (item) { return item.type === 'miniprogram_phone' }
       )
-    },
-    async _getLoginConfig() {
-      const { staticResourceDomain, loginConfigVersion, id } = app.__internal__?.getConfig() || {};
-      if (staticResourceDomain && loginConfigVersion && id) {
-        const url = app.__internal__?.resolveStaticResourceUrl?.(`/__auth/app/${id}/login.config.${loginConfigVersion}.json`)
-        if (!loginConfig) {
-          loginConfig = await new Promise((resolve, reject) => {
-            wx.request({
-              // url: `https://lowcode-1gk9y5ik310a94df-1307578329.tcloudbaseapp.com/__auth/app/app-8ph9atcy/login.config.v1_97dab26a85842c557de0ecb47cbb9bc1.json`,
-              url,
-              success: res => {
-                if(String(res.statusCode).startsWith('2')){
-                  resolve(res.data)
-                } else {
-                  reject(new Error(`statusCode: ${res.statusCode} 获取${url}失败`))
-                }
-              },
-              fail: e => {
-                reject(e)
-              }
-            })
-          })
-        }
-        return loginConfig
-      } else {
-        throw new Error('缺少登录配置');
-      }
     }
   }
 })