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..275d74e 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']) 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 = { @@ -68,7 +68,16 @@ async def get_ipc_logo(ns={}): "bannerTitle": "开元数智", "adress": "北京市石景山区和平西路60号院1号楼11层1101-30", "footerTitle": "开元数智(北京)科技有限公司", - 'qrCode': 'https://www.kaiyuancloud.cn/idfile?path=firstpagehot/ncmatch_inquiry.jpg' + 'qrCode': 'https://www.kaiyuancloud.cn/idfile?path=firstpagehot/ncmatch_inquiry.jpg', + 'footer_info': '京ICP备2022001945号-4 开元数智(北京)科技有限公司 版权所有 @kaiyuanyun 2023', + "copyright": "@kaiyuanyun 2023", + "domain_name": "ncmatch.cn", + "email": "Open-computing@kaiyuancloud.cn", + "license": "2022001945号-1", + "logo": "https://www.kaiyuancloud.cn/idfile?path=logo_ncmatch.png", + "mobile": "400-6150805 010-65917875", + "publicsecurity": "11010502054007", + "businesslicense": "京B2-20232313" }, "about": { "title": "开元数智", @@ -82,14 +91,23 @@ async def get_ipc_logo(ns={}): ] } } - elif 'kaiyuancloud' in domain_url: + elif 'kaiyuancloud' in domain_url or 'opencomputing' in domain_url or 'localhost' in domain_url: yezhu['additional_msg'] = { "home": { "logoImg": "https://www.kaiyuancloud.cn/idfile?path=logo.png", "bannerTitle": "开元云", "adress": "北京市朝阳区东三环中路65号富力中心", "footerTitle": "开元云(北京)科技有限公司", - 'qrCode': 'https://www.kaiyuancloud.cn/idfile?path=firstpagehot/kaiyuancloud_inquiry.png' + 'qrCode': 'https://www.kaiyuancloud.cn/idfile?path=firstpagehot/kaiyuancloud_inquiry.png', + 'footer_info': '京公网安备11010502054007号 开元云(北京)科技有限公司 版权所有 @kaiyuanyun 2023', + "copyright": "@kaiyuanyun 2023", + "domain_name": "ncmatch.cn", + "email": "Open-computing@kaiyuancloud.cn", + "license": "2022001945号-1", + "logo": "https://www.kaiyuancloud.cn/idfile?path=logo_ncmatch.png", + "mobile": "400-6150805 010-65917875", + "publicsecurity": "11010502054007", + "businesslicense": "京B2-20232313" }, "about": { "title": "开元云", 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 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 @@