From 99a2046d68284f388f718ed9f175eb55c3ddb277 Mon Sep 17 00:00:00 2001 From: ping <1017253325@qq.com> Date: Wed, 16 Jul 2025 18:06:40 +0800 Subject: [PATCH 1/5] update --- crontab/dev/crontab.txt | 12 ++++++++++++ crontab/prod/crontab.txt | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 crontab/dev/crontab.txt create mode 100644 crontab/prod/crontab.txt diff --git a/crontab/dev/crontab.txt b/crontab/dev/crontab.txt new file mode 100644 index 0000000..7b9b8b8 --- /dev/null +++ b/crontab/dev/crontab.txt @@ -0,0 +1,12 @@ +0 23 * * * /d/backup/db/dbdump.sh + +*/20 * * * * curl https://dev.opencomputing.cn/hpc/GetUserBill.dspy > /d/zhc/crontab_dev.log 2>&1 +0 0 * * * curl https://dev.opencomputing.cn/lease/update_stock.dspy > /d/zhc/crontab_dev.log 2>&1 +# 30 9 * * * curl https://dev.opencomputing.cn/provider_settle/auto_provider_settle_cron_job.dspy > /d/zhc/crontab_dev.log 2>&1 +# 0 1 * * * curl https://dev.opencomputing.cn/handover/params_time.dspy > /d/zhc/crontab_dev.log 2>&1 +0 2 * * * curl https://dev.opencomputing.cn/daylog/updateCurrentTime.dspy > /d/zhc/crontab_dev.log 2>&1 +*/60 * * * * curl https://dev.opencomputing.cn/baiduc/baidu_users_get_post_pay.dspy > /d/zhc/crontab_dev.log 2>&1 +*/1 * * * * curl https://dev.opencomputing.cn/account/email_info.dspy > /d/zhc/crontab_dev.log 2>&1 +*/1 * * * * curl https://dev.opencomputing.cn/jdcloud/get_partner_order_list.dspy?page=1 > /d/zhc/crontab_dev.log 2>&1 +* * * * * curl https://dev.opencomputing.cn/baiduc/baidu_new_update_resouce.dspy > /d/zhc/crontab_dev.log 2>&1 +#* * * * * curl https://dev.opencomputing.cn/baiduc/baidu_sms_kafka_consumer.dspy > /d/zhc/crontab_dev.log 2>&1 diff --git a/crontab/prod/crontab.txt b/crontab/prod/crontab.txt new file mode 100644 index 0000000..5a04847 --- /dev/null +++ b/crontab/prod/crontab.txt @@ -0,0 +1,12 @@ +0 23 * * * /d/backup/db/dbdump.sh + +*/20 * * * * curl https://www.kaiyuancloud.cn/hpc/GetUserBill.dspy > /d/zhc/crontab_prod.log 2>&1 +0 0 * * * curl https://www.kaiyuancloud.cn/lease/update_stock.dspy > /d/zhc/crontab_prod.log 2>&1 +# 30 9 * * * curl https://www.kaiyuancloud.cn/provider_settle/auto_provider_settle_cron_job.dspy > /d/zhc/crontab_prod.log 2>&1 +# 0 1 * * * curl https://www.kaiyuancloud.cn/handover/params_time.dspy > /d/zhc/crontab_prod.log 2>&1 +0 2 * * * curl https://www.kaiyuancloud.cn/daylog/updateCurrentTime.dspy > /d/zhc/crontab_prod.log 2>&1 +*/60 * * * * curl https://www.kaiyuancloud.cn/baiduc/baidu_users_get_post_pay.dspy > /d/zhc/crontab_prod.log 2>&1 +*/1 * * * * curl https://www.kaiyuancloud.cn/account/email_info.dspy > /d/zhc/crontab_prod.log 2>&1 +*/1 * * * * curl https://www.kaiyuancloud.cn/jdcloud/get_partner_order_list.dspy?page=1 > /d/zhc/crontab_prod.log 2>&1 +* * * * * curl https://www.kaiyuancloud.cn/baiduc/baidu_new_update_resouce.dspy > /d/zhc/crontab_prod.log 2>&1 +# * * * * * curl https://www.kaiyuancloud.cn/baiduc/baidu_sms_kafka_consumer.dspy > /d/zhc/crontab_dev.log 2>&1 -- 2.34.1 From 019f47797e011cc3d4cdf13e6e267642cd510dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E7=93=9C=E4=B8=80=E5=9D=97=E5=85=AB?= <2523890936@qq.com> Date: Thu, 17 Jul 2025 11:51:57 +0800 Subject: [PATCH 2/5] bugfix --- .../clusterResourceInstanceConfiguration/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/f/web-kboss/src/views/operation/computingCenterManagement/clusterResourceInstanceConfiguration/index.vue b/f/web-kboss/src/views/operation/computingCenterManagement/clusterResourceInstanceConfiguration/index.vue index dcbfa1e..3d35d13 100644 --- a/f/web-kboss/src/views/operation/computingCenterManagement/clusterResourceInstanceConfiguration/index.vue +++ b/f/web-kboss/src/views/operation/computingCenterManagement/clusterResourceInstanceConfiguration/index.vue @@ -131,6 +131,7 @@ + -- 2.34.1 From 0c7be40d6447a43ff3d67f026eaf6fa42fef78dc Mon Sep 17 00:00:00 2001 From: ping <1017253325@qq.com> Date: Fri, 18 Jul 2025 09:29:39 +0800 Subject: [PATCH 3/5] update --- b/product/get_firstpage_product_tree.dspy | 2 +- b/reseller/get_ipc_logo.dspy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/b/product/get_firstpage_product_tree.dspy b/b/product/get_firstpage_product_tree.dspy index a139434..88d0d49 100644 --- a/b/product/get_firstpage_product_tree.dspy +++ b/b/product/get_firstpage_product_tree.dspy @@ -660,7 +660,7 @@ async def get_firstpage_product_tree(ns={}): db = DBPools() async with db.sqlorContext('kboss') as sor: try: - if ns.get('url_link') and 'kaiyuancloud' in ns.get('url_link'): + if ns.get('url_link') and ('kaiyuancloud' in ns.get('url_link') or 'opencomputing' in ns.get('url_link')): data_baidu = { "id": "12", "secTitle": "阿里云", diff --git a/b/reseller/get_ipc_logo.dspy b/b/reseller/get_ipc_logo.dspy index 7ed62a4..e762518 100644 --- a/b/reseller/get_ipc_logo.dspy +++ b/b/reseller/get_ipc_logo.dspy @@ -46,7 +46,7 @@ async def get_ipc_logo(ns={}): if '?domain_name=' in url_link: domain_url = url_link.split('?domain_name=')[1] # 如果是业主机构 - if ('ncmatch' in domain_url or '9527' in domain_url or '8889' in domain_url or '8891' in domain_url or domain_url in ['xterm.kaiyuancloud.cn','www.kaiyuancloud.cn', 'dev.kaiyuancloud.cn', 'test.kaiyuancloud.cn', 'localhost:9527']) and '/domain/' not in url_link: + if ('ncmatch' in domain_url or '9527' in domain_url or '8889' in domain_url or '8891' in domain_url or domain_url in ['xterm.kaiyuancloud.cn','www.kaiyuancloud.cn', 'dev.kaiyuancloud.cn', 'dev.opencomputing.cn', 'test.kaiyuancloud.cn', 'localhost:9527']) and '/domain/' not in url_link: yezhu_info = (await sor.R('organization', {'org_type': '0'}))[0] domain_res = (await sor.R('params', {'pname': '业主机构域名'}))[0]['pvalue'] # yezhu = { @@ -82,7 +82,7 @@ async def get_ipc_logo(ns={}): ] } } - elif 'kaiyuancloud' in domain_url: + elif 'kaiyuancloud' in domain_url or 'opencomputing' in domain_url: yezhu['additional_msg'] = { "home": { "logoImg": "https://www.kaiyuancloud.cn/idfile?path=logo.png", -- 2.34.1 From 5d867dc4ec8ac108b68709709ec478f01ae87236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E7=93=9C=E4=B8=80=E5=9D=97=E5=85=AB?= <2523890936@qq.com> Date: Fri, 18 Jul 2025 14:49:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?icp=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f/web-kboss/src/utils/request.js | 7 ++++--- f/web-kboss/src/views/homePage/indexLast.vue | 12 ++++++++---- f/web-kboss/src/views/login/indexNew.vue | 17 ++++++++--------- .../index.vue | 1 - f/web-kboss/vue.config.js | 4 +++- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/f/web-kboss/src/utils/request.js b/f/web-kboss/src/utils/request.js index 758e757..d3d7efe 100644 --- a/f/web-kboss/src/utils/request.js +++ b/f/web-kboss/src/utils/request.js @@ -19,9 +19,10 @@ let myUrl = window.location.href.split("/#")[0]; let testUrl = '' -// window.location.href === "https://www.kaiyuancloud.cn/#/login?redirect=%2F" -if (window.location.href.includes("www.kaiyuancloud.cn/dev")) { - testUrl = 'https://www.kaiyuancloud.cn/dev' +// window.location.href === "https://www.kaiyuancloud.cn/#/login?redirect=%2F"1 +if (window.location.href.includes("dev.opencomputing.cn")) { + + testUrl = 'https://dev.opencomputing.cn' } else if (window.location.href.includes("https://www.kaiyuancloud.cn")) {//dev testUrl = 'https://www.kaiyuancloud.cn' } else if (window.location.href.includes("localhost")) { diff --git a/f/web-kboss/src/views/homePage/indexLast.vue b/f/web-kboss/src/views/homePage/indexLast.vue index b1b4518..4bf51e7 100644 --- a/f/web-kboss/src/views/homePage/indexLast.vue +++ b/f/web-kboss/src/views/homePage/indexLast.vue @@ -15,8 +15,8 @@