|
@@ -71,7 +71,7 @@ object DictTypeApi {
|
|
|
/** 直接 http 请求还是通过注册中心 */
|
|
|
logger.debug("标记=${Configure.customProperties.eurekaorhttp}")
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/org/group/query"
|
|
|
+ val url = "${Configure.opts.data_org}/org/group/query"
|
|
|
val postObject = SHttpUtil.postObject<GroupResponse>(url, jsonObject)
|
|
|
DClassDefService.logger.debug("集团结果:${postObject.toJson()}")
|
|
|
if (postObject.result == "success"){
|
|
@@ -111,7 +111,7 @@ object DictTypeApi {
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
/** 直接 http 请求还是通过注册中心 */
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/org/project/query?userId=123456&groupCode=$code"
|
|
|
+ val url = "${Configure.opts.data_org}/org/project/query?userId=123456&groupCode=$code"
|
|
|
|
|
|
DClassDefService.logger.debug("url:${url}")
|
|
|
DClassDefService.logger.debug("项目请求体:${jsonObject.toJson()}")
|
|
@@ -152,7 +152,7 @@ object DictTypeApi {
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
/** 直接 http 请求还是通过注册中心 */
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/rwd/def/class/"
|
|
|
+ val url = "${Configure.opts.data_rwd}/rwd/def/class/"
|
|
|
val postObject = SHttpUtil.postObject<DictPlatformTypeResponse>(url, jsonObject)
|
|
|
if (postObject.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!postObject.data.isNullOrEmpty()){
|
|
@@ -191,7 +191,7 @@ object DictTypeApi {
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
/** 直接 http 请求还是通过注册中心 */
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/rwd/def/funcid"
|
|
|
+ val url = "${Configure.opts.data_rwd}/rwd/def/funcid"
|
|
|
logger.debug("url=${url}")
|
|
|
logger.debug("boby=${jsonObject}")
|
|
|
val postObject = SHttpUtil.postObject<DictPlatformInfoResponse>(url, jsonObject)
|
|
@@ -230,7 +230,7 @@ object DictTypeApi {
|
|
|
jsonObject2["type"] = type
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/dic/dt/data/query?groupCode=WD&userId=123456"
|
|
|
+ val url = "${Configure.opts.data_dic}/dic/dt/data/query?groupCode=WD&userId=123456"
|
|
|
val postObject = SHttpUtil.postObject<DictMajorResponse>(url, jsonObject)
|
|
|
if (postObject.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!postObject.data.isNullOrEmpty()){
|
|
@@ -269,7 +269,7 @@ object DictTypeApi {
|
|
|
jsonObject2["groupId"] = groupId
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/dict/scheme/query"
|
|
|
+ val url = "${Configure.opts.data_dic}/dict/scheme/query"
|
|
|
val postObject = SHttpUtil.postObject<DictGroupSchemeResponse>(url, jsonObject)
|
|
|
if (postObject.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!postObject.data.isNullOrEmpty()){
|
|
@@ -305,7 +305,7 @@ object DictTypeApi {
|
|
|
jsonObject2["groupId"] = schemeId.toString()
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/dict/scheme/class/query"
|
|
|
+ val url = "${Configure.opts.data_dic}/dict/scheme/class/query"
|
|
|
val postObject = SHttpUtil.postObject<DictSchemeCategoryResponse>(url, jsonObject)
|
|
|
if (postObject.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!postObject.data.isNullOrEmpty()){
|
|
@@ -341,7 +341,7 @@ object DictTypeApi {
|
|
|
jsonObject2["classCode"] = code
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/dict/scheme/funcid/query"
|
|
|
+ val url = "${Configure.opts.data_dic}/dict/scheme/funcid/query"
|
|
|
val postObject = SHttpUtil.postObject<DictSchemeCategoryResponseInfo>(url, jsonObject)
|
|
|
if (postObject.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!postObject.data.isNullOrEmpty()){
|
|
@@ -378,7 +378,7 @@ object DictTypeApi {
|
|
|
jsonObject2["projectId"] = jsonArray
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/dict/scheme/project/query"
|
|
|
+ val url = "${Configure.opts.data_dic}/dict/scheme/project/query"
|
|
|
val postObject = SHttpUtil.postObject<DictSchemeAndProjectResponse>(url, jsonObject)
|
|
|
if (postObject.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!postObject.data.isNullOrEmpty()){
|
|
@@ -414,7 +414,7 @@ object DictTypeApi {
|
|
|
val jsonObject2 = JSONObject()
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/rwd/def/class?groupCode=$groupId"
|
|
|
+ val url = "${Configure.opts.data_rwd}/rwd/def/class?groupCode=$groupId"
|
|
|
val dictGroupCategoryResponse = SHttpUtil.postObject<DictPlatformTypeResponse>(url,jsonObject)
|
|
|
if (dictGroupCategoryResponse.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!dictGroupCategoryResponse.data.isNullOrEmpty()){
|
|
@@ -448,7 +448,7 @@ object DictTypeApi {
|
|
|
jsonObject2["classCode"] = code
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/rwd/def/funcid?groupCode=$groupId"
|
|
|
+ val url = "${Configure.opts.data_rwd}/rwd/def/funcid?groupCode=$groupId"
|
|
|
val dictPlatformInfoResponse = SHttpUtil.postObject<DictPlatformInfoResponse>(url,jsonObject)
|
|
|
if (dictPlatformInfoResponse.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!dictPlatformInfoResponse.data.isNullOrEmpty()){
|
|
@@ -485,7 +485,7 @@ object DictTypeApi {
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/rwd/def/class?groupCode=$groupCode&projectId=$projectId"
|
|
|
+ val url = "${Configure.opts.data_rwd}/rwd/def/class?groupCode=$groupCode&projectId=$projectId"
|
|
|
logger.debug("url = $url")
|
|
|
logger.debug("boby = ${jsonObject.toJson()}")
|
|
|
val dictGroupCategoryResponse = SHttpUtil.postObject<DictPlatformTypeResponse>(url,jsonObject)
|
|
@@ -522,7 +522,7 @@ object DictTypeApi {
|
|
|
jsonObject2["classCode"] = code
|
|
|
jsonObject["criteria"] = jsonObject2
|
|
|
if (!Configure.customProperties.eurekaorhttp) {
|
|
|
- val url = "${Configure.opts.dataPlatform}/rwd/def/funcid?groupCode=$groupId&projectId=$projectId"
|
|
|
+ val url = "${Configure.opts.data_rwd}/rwd/def/funcid?groupCode=$groupId&projectId=$projectId"
|
|
|
val dictPlatformInfoResponse = SHttpUtil.postObject<DictPlatformInfoResponse>(url,jsonObject)
|
|
|
if (dictPlatformInfoResponse.result == Configure.opts.SUCCESS_CODE) {
|
|
|
if (!dictPlatformInfoResponse.data.isNullOrEmpty()){
|