Merge pull request 'main' (#1) from main into prod

Reviewed-on: #1

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": "阿里云",

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": "开元云",

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

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

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"
+// window.location.href === "https://www.kaiyuancloud.cn/#/login?redirect=%2F"1
-if (window.location.href.includes("www.kaiyuancloud.cn/dev")) {
+if (window.location.href.includes("dev.opencomputing.cn")) {
-  testUrl = 'https://www.kaiyuancloud.cn/dev'
+
+  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")) {

f/web-kboss/src/views/homePage/indexLast.vue

@@ -15,8 +15,8 @@
             <ul class="info">
               <li>地址：<span v-if="JSON.stringify(logoInfoNew)!=='{}'">{{ logoInfoNew.home.adress }}</span>
               </li>
-              <li> 邮箱：open-computing@kaiyuancloud.cn</li>
+              <li> 邮箱：{{logoInfoNew.home.email}}</li>
-              <li>电话： <span class="tel">400-6150805 010-65917875 </span>
+              <li>电话： <span class="tel">{{logoInfoNew.home.mobile}}</span>
               </li>
 
 
@@ -80,9 +80,13 @@
       </div>
       <div style="display: flex;justify-content: center;align-items: center;width: 100%; ">
         <span v-if="JSON.stringify(logoInfoNew)!=='{}'"
-              style="margin:15px 0 ;width: 1400px;display:flex;justify-content:center;align-items:center;color: #7A82A0;">京公网安备11010502054007号 &nbsp;{{
+              style="margin:15px 0 ;width: 1400px;display:flex;justify-content:center;align-items:center;color: #7A82A0;"> 京ICP{{
+            logoInfoNew.home.license
+          }}&nbsp; &nbsp;&nbsp;{{
             logoInfoNew.home.footerTitle
-          }}&nbsp;版权所有 @kaiyuanyun 2023 </span>
+          }}&nbsp;{{
+            logoInfoNew.home.copyright
+          }}&nbsp; </span>
         <!--        IPC备案号:{{ ICP }} <span style="margin-left: 0.267rem">版权所有 @kaiyuanyun 2023</span>-->
         <!--        <img src="../../image/login/policeInsignia/policeInsignia.png" alt=""-->
         <!--             style="width:0.227rem;height:0.227rem;margin-right: 0.027rem;">-->

f/web-kboss/src/views/login/indexNew.vue

@@ -164,17 +164,14 @@
 
     <div class="message-footer">
       <div class="item">
-        <span class="goPAge"
+        <span v-if="JSON.stringify(logoInfoNew)!=='{}'" class="goPAge"
-              @click="goPloic">京公网安备：11010502054007号</span>
+              @click="goPloic">京公网安备：{{ logoInfoNew.home.publicsecurity }}</span>
-        <span class="goPAge" @click="goIPC">京ICP备：2022001945号-1</span>
+        <span v-if="JSON.stringify(logoInfoNew)!=='{}'" class="goPAge" @click="goIPC">京ICP备：{{logoInfoNew.home.license}}</span>
-        <span>增值电信业务经营许可证：京B2 -20232313</span>
+        <span v-if="JSON.stringify(logoInfoNew)!=='{}'">增值电信业务经营许可证：{{logoInfoNew.home.businesslicense}}</span>
-        <span>邮箱：Open-computing@kaiyuancloud.cn</span>
+        <span v-if="JSON.stringify(logoInfoNew)!=='{}'">邮箱：{{logoInfoNew.home.email}}</span>
       </div>
       <div class="item">
-        <!--        <span>地址：北京市朝阳区农展馆南路13号瑞辰国际</span>-->
+        <span v-if="JSON.stringify(logoInfoNew)!=='{}'">电话：{{logoInfoNew.home.mobile}}</span>
-        <span>电话：4006150805      010-65917875</span>
-
-        <!--        <span> 版权所有 © 2023开元云（北京）科技有限公司</span>-->
       </div>
     </div>
   </div>
@@ -657,6 +654,7 @@ export default {
         if (res.status == true && res.data && res.data.length) {
           this.$store.commit('setLogoInfo', res.data[0]);
           this.isShow = true
+          this.$store.commit('setLogoInfoNew', res.data[0].additional_msg);
           if (res.data[0].orgname == '中关村数智人工智能产业联盟') {
             this.logoUrlOut = 'https://www.ncmatch.cn'
           }
@@ -969,6 +967,7 @@ export default {
     ...mapState({
       isSuccessCode: state => state.login.isSuccessCode,
       audioElement: state => state.sales.audioElement,
+      logoInfoNew: state => state.product.logoInfoNew,
 
     })
   }

f/web-kboss/vue.config.js

@@ -63,7 +63,9 @@ module.exports = {
       //   }
       // },
       '/api': {
-        target: 'http://47.93.12.75:8891',
+        // target: 'http://47.93.12.75:8891',
+        target: 'https://dev.opencomputing.cn',
+
         // target: 'https://www.kaiyuancloud.cn',
         ws: true,
         changeOrigin: true,