npm - @next-core/brick-container - Versions diffs - 2.97.10 → 2.98.0 - Mend

@next-core/brick-container 2.97.10 → 2.98.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/dist/preview.html CHANGED Viewed

	@@ -1 +1 @@
1	- <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.5fb551513edc8051ce6c.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.~~74e57e23~~.js"></script><script src="polyfill.3e88f145a0893497373b.js"></script><script src="preview.~~a1c503c44a1b9e182631~~.js"></script></body></html>
1	+ <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.5fb551513edc8051ce6c.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.67123def.js"></script><script src="polyfill.3e88f145a0893497373b.js"></script><script src="preview.5ac2ee3c5ce9a68f8477.js"></script></body></html>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "2.97.10",
+  "version": "2.98.0",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
   "license": "GPL-3.0",
@@ -73,5 +73,5 @@
     "webpack-dev-server": "^4.11.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "626d2cbe6432c558683e48db86a9c5f2151950ab"
+  "gitHead": "0048f12938aeae15fe6d60e9fa16542278ad0284"
 }

package/tools/package-union/report_union_micro_app.py CHANGED Viewed

@@ -11,6 +11,9 @@ from  concurrent.futures import ThreadPoolExecutor,as_completed, wait, ALL_COMPL
 reload(sys)
 sys.setdefaultencoding("utf-8")
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))  # 将 tools 目录加入 path
+from utils.get_headers import get_headers
 # 公共路径
 _INSTALL_BASE_PATH = "/usr/local/easyops"
 _APPLICATIONS_SA_FOLDER = "applications_sa"
@@ -50,7 +53,7 @@ def get_version(install_path):
 def collect_app_info(union_app_id, union_app_version, app_path, report_app_id, version):
     if not os.path.exists(app_path):
         print u"could not find app path {}".format(app_path)
-        return
+        return
     bootstrap_file_name = ""
     for f in os.listdir(app_path):
         if f.startswith("bootstrap-mini.") and f.endswith(".json"):
@@ -115,7 +118,7 @@ def report(org, app):
 def create_or_update_micro_app_sa(org, app):
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     url = "http://{}/api/v1/micro_app_standalone/report".format(MICRO_APP_SA_ADDR)
     rsp = requests.post(url, json=app, headers=headers)
     rsp.raise_for_status()
@@ -131,7 +134,7 @@ def import_micro_app_permissions(org, permission_path):
     if not os.path.exists(permission_path):
         print "permission path {} does not exist, return...".format(permission_path)
         return
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     url = "http://{}/api/micro_app/v1/permission/import".format(MICRO_APP_ADDR)
     print "permission path is {}, will start import permissions".format(permission_path)

package/tools/report_installed_brick_next_package.py CHANGED Viewed

@@ -10,6 +10,9 @@ import tarfile
 from copy import deepcopy
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+from utils.get_headers import get_headers
 reload(sys)
 sys.setdefaultencoding("utf-8")
@@ -239,7 +242,7 @@ def collect(install_path):
 def report_bricks_atom(org, nb_targz_path, package_name, package_version, bricks_content, stories_content,
                        snippets_content):
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     # report atom
     atom_url = "http://{}/api/v1/brick/atom/import".format(MICRO_APP_ADDR)
     data_dict = {"stories": stories_content, "bricks": bricks_content}
@@ -258,7 +261,8 @@ def report_bricks_atom(org, nb_targz_path, package_name, package_version, bricks
 def report_brick_next_package(org, brick_targz_path, package_name, package_version):
     # report brick_next or NT
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     # report atom
     atom_url = "http://{}/api/v1/brick_next/report".format(MICRO_APP_ADDR)
     data = {"packageName": package_name, "packageVersion": package_version}
@@ -268,7 +272,8 @@ def report_brick_next_package(org, brick_targz_path, package_name, package_versi
 def report_provider_into_contract(org, package_name, contract_content):
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     # report contract
     url = "http://{}/api/v1/brick/provider/import_into_contract".format(MICRO_APP_ADDR)
     param = {"packageName": package_name, "data": {

package/tools/report_installed_theme_template.py CHANGED Viewed

@@ -5,6 +5,10 @@ import simplejson
 import requests
 import ens_api
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+from utils.get_headers import get_headers
 def collect(install_path):
   if not os.path.exists(install_path):
     raise Exception("could not find install path {}".format(install_path))
@@ -22,7 +26,7 @@ def create_or_update_theme_template_data(data, org):
   if session_id <= 0:
     raise Exception("get nameservice logic.micro_app_service error, session_id={}".format(session_id))
   address = "{}:{}".format(ip, port)
-  headers = {"org": str(org), "user": "defaultUser"}
+  headers = get_headers(org)
   url = "http://{}/api/v1/next-builder/theme-data-import".format(address)
   param = {"themeData": data}
   rsp = requests.post(url, json=param, headers=headers)

package/tools/utils/__init__.py ADDED Viewed

File without changes

package/tools/utils/get_headers.py ADDED Viewed

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+import sys
+import os
+TOOLS_DIR = "/usr/local/easyops/deploy_init/tools"
+sys.path.append(TOOLS_DIR)
+get_token = None
+token_util_path = os.path.join(TOOLS_DIR, "get_token_util.py")
+if os.path.exists(token_util_path):
+    from get_token_util import get_token
+APP_ID = "brick_next"
+DEFAULT_USER = "defaultUser"
+def get_headers(org, user=DEFAULT_USER):
+    headers = {"org": str(org), "user": user}
+    if get_token is None:
+        return headers
+    token = get_token(user=user, org=int(org), app_id=APP_ID)
+    if not token:
+        return headers
+    headers["Authorization"] = "Bearer {}".format(token)
+    return headers