yangdamao 1 год назад
Родитель
Сommit
6ab6d7b8e1

+ 30 - 30
zhongzheng-admin-data/src/main/resources/application-dev.yml

@@ -124,17 +124,17 @@ liveGotoURL: http://
 enCodeVersion: trial
 
 oldStudySys:
-    syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords
+    syncPath: http://test.jqbao.net/System/BussinessApi/PostUserStudyRecords
     sharePath: http://192.168.1.210:8086/witsystem/dataapi/SaleOrder
     shareCanclePath: http://192.168.1.210:8086/witsystem/dataapi/ordercance
-    searchGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCount
-    pushGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCountAuto
+    searchGradeCount: http://test.jqbao.net/System/BussinessApi/OfficialGradeCount
+    pushGradeCount: http://test.jqbao.net/System/BussinessApi/OfficialGradeCountAuto
     educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
-    classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
-    classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
-    salePassword: http://gdxypx.xy.com/WitSystem/BussinessApi/GetSaleInfo
-    updateInvoicePath: http://gdxypx.xy.com/system/BussinessApi/UpdateInvoiceData
-    createExamPath: http://gdxypx.xy.com/system/BussinessApi/CreateSameClass
+    classUserListPath: http://test.jqbao.net/System/BussinessApi/UserCourseCategoryListcno
+    classOpenPath: http://test.jqbao.net/System/BussinessApi/OpenClass
+    salePassword: http://test.jqbao.net/WitSystem/BussinessApi/GetSaleInfo
+    updateInvoicePath: http://test.jqbao.net/system/BussinessApi/UpdateInvoiceData
+    createExamPath: http://test.jqbao.net/system/BussinessApi/CreateSameClass
 
 officialPush:
     infoPath: closehttps://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
@@ -146,7 +146,7 @@ officialPush:
 
 
 distributionOldPay:
-    host: http://gdxypx.xy.com/System/BussinessApi/AddRedPackData
+    host: http://test.jqbao.net/System/BussinessApi/AddRedPackData
 
 handouts:
     savePath: http://192.168.1.7:9090/course/handouts/save
@@ -158,20 +158,20 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
 
 oldOrder:
-    studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
-    orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
-    finishOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CompleteOrder
-    refuseCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/ReFundAuditResult
-    inputOrderSn: http://gdxypx.xy.com/WitSystem/BussinessApi/GetNewYxtinputOrderSn
-    checkOrderStudent: http://gdxypx.xy.com/WitSystem/BussinessApi/ReAuditUnderOrder
-    checkOrderBrokerage: http://gdxypx.xy.com/WitSystem/BussinessApi/CommissionRate
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
     refundPay: http://192.168.1.222:5030/common/platform/pay
     refundPayHandle: http://192.168.1.222:5030/common/platform/pay/handle
-    updateRemark: http://gdxypx.xy.com/WitSystem/BussinessApi/UpdateOrderAuditRemark
+    updateRemark: http://test.jqbao.net/WitSystem/BussinessApi/UpdateOrderAuditRemark
 
 oldSys:
-    host: http://gdxypx.xy.com
-    goods: http://gdxypx.xy.com/WitSystem/BussinessApi/NewYxtLogin
+    host: http://test.jqbao.net
+    goods: http://test.jqbao.net/WitSystem/BussinessApi/NewYxtLogin
     question: http://192.168.1.121:8057/WordData/GetMeasureList
     questionDetail: http://192.168.1.121:8057/WordData/GetTopicList
 
@@ -192,19 +192,19 @@ exam:
     subscribeAddExamNum: http://192.168.1.7:9099/cd/subscribe/add/num
     question: http://120.79.166.78:19013/common/question/getMeasureList
     questionDetail: http://120.79.166.78:19013/common/question/getTopicList
-    subscribe: http://192.168.1.222:5030/common/apply/subscribe
-    cancelSubscribe: http://192.168.1.222:5030/common/apply/subscribe/cancel
+    subscribe: http://192.168.1.7:5030/common/apply/subscribe
+    cancelSubscribe: http://192.168.1.7:5030/common/apply/subscribe/cancel
 
 shared:
-    statistics: http://gdxypx.xy.com/WitSystem/BussinessApi/HighSeasData
-    customer: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerStatsData
-    cert: http://gdxypx.xy.com/WitSystem/BussinessApi/CertStatsData
-    orderArea: http://gdxypx.xy.com/WitSystem/BussinessApi/OrderAreaData
-    rateData: http://gdxypx.xy.com//WitSystem/BussinessApi/CustomerConversionRateData
-    rateTrend: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerConversionRateTrendData
-    customerOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerOrderData
-    tenantData: http://gdxypx.xy.com/witsystem/bussinessapi/GetOrgList
-    saleData: http://gdxypx.xy.com/witsystem/bussinessapi/GetSaleListByOrgId
+    statistics: http://test.jqbao.net/WitSystem/BussinessApi/HighSeasData
+    customer: http://test.jqbao.net/WitSystem/BussinessApi/CustomerStatsData
+    cert: http://test.jqbao.net/WitSystem/BussinessApi/CertStatsData
+    orderArea: http://test.jqbao.net/WitSystem/BussinessApi/OrderAreaData
+    rateData: http://test.jqbao.net//WitSystem/BussinessApi/CustomerConversionRateData
+    rateTrend: http://test.jqbao.net/WitSystem/BussinessApi/CustomerConversionRateTrendData
+    customerOrder: http://test.jqbao.net/WitSystem/BussinessApi/CustomerOrderData
+    tenantData: http://test.jqbao.net/witsystem/bussinessapi/GetOrgList
+    saleData: http://test.jqbao.net/witsystem/bussinessapi/GetSaleListByOrgId
 
 ZsBank:
     publickey: BNsIe9U0x8IeSe4h/dxUzVEz9pie0hDSfMRINRXc7s1UIXfkExnYECF4QqJ2SnHxLv3z/99gsfDQrQ6dzN5lZj0=

+ 40 - 41
zhongzheng-admin-data/src/main/resources/application-pre.yml

@@ -77,7 +77,7 @@ aliyun:
         policy:
             expire: 30 # 签名有效期(S)
         maxSize: 100 # 上传文件大小(M)
-        callback: http://120.79.166.78:19004/aliyun/oss/callback # 文件上传成功后的回调地址
+        callback: http://120.79.166.78:19013/aliyun/oss/callback # 文件上传成功后的回调地址
         dir:
             prefix: oss/images/ # 上传文件夹路径前缀 `
 
@@ -121,20 +121,20 @@ certificate:
 
 liveGotoURL: http://
 
-enCodeVersion: develop
+enCodeVersion: trial
 
 oldStudySys:
-    syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords
+    syncPath: http://test.jqbao.net/System/BussinessApi/PostUserStudyRecords
     sharePath: http://192.168.1.210:8086/witsystem/dataapi/SaleOrder
     shareCanclePath: http://192.168.1.210:8086/witsystem/dataapi/ordercance
-    searchGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCount
-    pushGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCountAuto
+    searchGradeCount: http://test.jqbao.net/System/BussinessApi/OfficialGradeCount
+    pushGradeCount: http://test.jqbao.net/System/BussinessApi/OfficialGradeCountAuto
     educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
-    classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
-    classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
-    salePassword: http://gdxypx.xy.com/WitSystem/BussinessApi/GetSaleInfo
-    updateInvoicePath: http://www.xyyxt.net/system/BussinessApi/UpdateInvoiceData
-    createExamPath: http://www.xyyxt.net/system/BussinessApi/CreateSameClass
+    classUserListPath: http://test.jqbao.net/System/BussinessApi/UserCourseCategoryListcno
+    classOpenPath: http://test.jqbao.net/System/BussinessApi/OpenClass
+    salePassword: http://test.jqbao.net/WitSystem/BussinessApi/GetSaleInfo
+    updateInvoicePath: http://test.jqbao.net/system/BussinessApi/UpdateInvoiceData
+    createExamPath: http://test.jqbao.net/system/BussinessApi/CreateSameClass
 
 officialPush:
     infoPath: closehttps://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
@@ -146,11 +146,11 @@ officialPush:
 
 
 distributionOldPay:
-    host: http://gdxypx.xy.com/System/BussinessApi/AddRedPackData
+    host: http://test.jqbao.net/System/BussinessApi/AddRedPackData
 
 handouts:
-    savePath: http://192.168.1.222:9090/course/handouts/save
-    updatePath: http://192.168.1.222:9090/course/handouts/edit
+    savePath: http://39.108.7.155:9090/course/handouts/save
+    updatePath: http://39.108.7.155:9090/course/handouts/edit
 
 Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
@@ -158,20 +158,20 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
 
 oldOrder:
-    studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
-    orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
-    finishOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CompleteOrder
-    refuseCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/ReFundAuditResult
-    inputOrderSn: http://gdxypx.xy.com/WitSystem/BussinessApi/GetNewYxtinputOrderSn
-    checkOrderStudent: http://gdxypx.xy.com/WitSystem/BussinessApi/ReAuditUnderOrder
-    checkOrderBrokerage: http://gdxypx.xy.com/WitSystem/BussinessApi/CommissionRate
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
     refundPay: http://120.79.166.78:19008/common/platform/pay
     refundPayHandle: http://120.79.166.78:19008/common/platform/pay/handle
-    updateRemark: http://gdxypx.xy.com/WitSystem/BussinessApi/UpdateOrderAuditRemark
+    updateRemark: http://test.jqbao.net/WitSystem/BussinessApi/UpdateOrderAuditRemark
 
 oldSys:
-    host: http://gdxypx.xy.com
-    goods: http://gdxypx.xy.com/WitSystem/BussinessApi/NewYxtLogin
+    host: http://test.jqbao.net
+    goods: http://test.jqbao.net/WitSystem/BussinessApi/NewYxtLogin
     question: http://192.168.1.121:8057/WordData/GetMeasureList
     questionDetail: http://192.168.1.121:8057/WordData/GetTopicList
 
@@ -180,34 +180,33 @@ invoice:
 
 liveHost: http://192.168.1.222:6009
 
-fileHost: http://192.168.1.222:9099
+fileHost: http://39.108.7.155:9099
 
 exam:
-    applySave: http://192.168.1.222:9099/cd/exam/save
-    applyUpdate: http://192.168.1.222:9099/cd/exam/update
-    applyDelete: http://192.168.1.222:9099/cd/exam/delete
-    subscribeSave: http://192.168.1.222:9099/cd/subscribe/save
-    subscribeSaveExam: http://192.168.1.222:9099/cd/subscribe/save/exam
-    subscribeUpdateExam: http://192.168.1.222:9099/cd/subscribe/update/exam
-    subscribeAddExamNum: http://192.168.1.222:9099/cd/subscribe/add/num
+    applySave: http://39.108.7.155:9099/cd/exam/save
+    applyUpdate: http://39.108.7.155:9099/cd/exam/update
+    applyDelete: http://39.108.7.155:9099/cd/exam/delete
+    subscribeSave: http://39.108.7.155:9099/cd/subscribe/save
+    subscribeSaveExam: http://39.108.7.155:9099/cd/subscribe/save/exam
+    subscribeUpdateExam: http://39.108.7.155:9099/cd/subscribe/update/exam
+    subscribeAddExamNum: http://39.108.7.155:9099/cd/subscribe/add/num
     question: http://120.79.166.78:19013/common/question/getMeasureList
     questionDetail: http://120.79.166.78:19013/common/question/getTopicList
     subscribe: http://120.79.166.78:19008/common/apply/subscribe
     cancelSubscribe: http://120.79.166.78:19008/common/apply/subscribe/cancel
 
 shared:
-    statistics: http://gdxypx.xy.com/WitSystem/BussinessApi/HighSeasData
-    customer: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerStatsData
-    cert: http://gdxypx.xy.com/WitSystem/BussinessApi/CertStatsData
-    orderArea: http://gdxypx.xy.com/WitSystem/BussinessApi/OrderAreaData
-    rateData: http://gdxypx.xy.com//WitSystem/BussinessApi/CustomerConversionRateData
-    rateTrend: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerConversionRateTrendData
-    customerOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerOrderData
-    tenantData: http://gdxypx.xy.com/witsystem/bussinessapi/GetOrgList
-    saleData: http://gdxypx.xy.com/witsystem/bussinessapi/GetSaleListByOrgId
+    statistics: http://test.jqbao.net/WitSystem/BussinessApi/HighSeasData
+    customer: http://test.jqbao.net/WitSystem/BussinessApi/CustomerStatsData
+    cert: http://test.jqbao.net/WitSystem/BussinessApi/CertStatsData
+    orderArea: http://test.jqbao.net/WitSystem/BussinessApi/OrderAreaData
+    rateData: http://test.jqbao.net//WitSystem/BussinessApi/CustomerConversionRateData
+    rateTrend: http://test.jqbao.net/WitSystem/BussinessApi/CustomerConversionRateTrendData
+    customerOrder: http://test.jqbao.net/WitSystem/BussinessApi/CustomerOrderData
+    tenantData: http://test.jqbao.net/witsystem/bussinessapi/GetOrgList
+    saleData: http://test.jqbao.net/witsystem/bussinessapi/GetSaleListByOrgId
 
 ZsBank:
     publickey: BNsIe9U0x8IeSe4h/dxUzVEz9pie0hDSfMRINRXc7s1UIXfkExnYECF4QqJ2SnHxLv3z/99gsfDQrQ6dzN5lZj0=
     privatekey: NBtl7WnuUtA2v5FaebEkU0/Jj1IodLGT6lQqwkzmd2E=
     sm4key: VuAzSWQhsoNqzn0K
-

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/service/impl/CdExamRoomServiceImpl.java

@@ -390,6 +390,7 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
                         Map<String, String> headersMap = new HashMap<>();
                         headersMap.put("TenantId", getNewTenant(item.getTenantId(),1).getNewId().toString());
                         try {
+                            log.error(EXAM_SUBSCRIBE_PATH+":"+JSONObject.toJSONString(jsonObject));
                             HttpUtils.sendPostHeader(EXAM_SUBSCRIBE_PATH, jsonObject,headersMap);
                         }catch (Exception e){
                             //预约错误记录日志