From 2ce20c4dd9df60435afe5e6820103a37cf7f684a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 12 七月 2024 18:26:15 +0800
Subject: [PATCH] 提交
---
admin/src/views/business/iamInterfaceLog.vue | 3
server/admin/src/main/java/com/doumee/timer/init/InitBizService.java | 38 +++++++++
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java | 10 +-
server/admin/src/main/java/com/doumee/timer/ZbomRedisResetBiz.java | 38 +++++++++
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 7 +
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java | 4
server/admin/src/main/java/com/doumee/api/business/PushController.java | 4
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 6
admin/src/views/business/interfaceLog.vue | 3
admin/src/views/business/shop.vue | 39 +++++----
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
admin/src/views/business/shopTree.vue | 9 +-
server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java | 2
server/service/src/main/java/com/doumee/service/business/InitService.java | 6
admin/src/views/business/crmInterfaceLog.vue | 4
admin/src/views/business/shopUsers.vue | 11 +-
16 files changed, 134 insertions(+), 52 deletions(-)
diff --git a/admin/src/views/business/crmInterfaceLog.vue b/admin/src/views/business/crmInterfaceLog.vue
index 67b4296..86ff316 100644
--- a/admin/src/views/business/crmInterfaceLog.vue
+++ b/admin/src/views/business/crmInterfaceLog.vue
@@ -50,8 +50,8 @@
</el-table-column>
<el-table-column label="骞冲彴" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
- <span v-if="row.plat == 1">ERP绯荤粺</span>
+ <span v-if="row.plat == 0">蹇楅偊CRM骞冲彴</span>
+ <span v-if="row.plat == 1">蹇楅偊鐭俊閫氶亾</span>
</template>
</el-table-column>
<el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
diff --git a/admin/src/views/business/iamInterfaceLog.vue b/admin/src/views/business/iamInterfaceLog.vue
index 83cbd54..af65e0f 100644
--- a/admin/src/views/business/iamInterfaceLog.vue
+++ b/admin/src/views/business/iamInterfaceLog.vue
@@ -50,8 +50,7 @@
</el-table-column>
<el-table-column label="骞冲彴" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
- <span v-if="row.plat == 1">ERP绯荤粺</span>
+ <span v-if="row.plat == 0">蹇楅偊IAM骞冲彴</span>
</template>
</el-table-column>
<el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
diff --git a/admin/src/views/business/interfaceLog.vue b/admin/src/views/business/interfaceLog.vue
index f792a20..b027af7 100644
--- a/admin/src/views/business/interfaceLog.vue
+++ b/admin/src/views/business/interfaceLog.vue
@@ -50,8 +50,7 @@
</el-table-column>
<el-table-column label="骞冲彴" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
- <span v-if="row.plat == 1">ERP绯荤粺</span>
+ <span v-if="row.plat == 0">蹇楅偊涓彴</span>
</template>
</el-table-column>
<el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
diff --git a/admin/src/views/business/shop.vue b/admin/src/views/business/shop.vue
index 31878aa..233e5a8 100644
--- a/admin/src/views/business/shop.vue
+++ b/admin/src/views/business/shop.vue
@@ -2,31 +2,31 @@
<TableLayout :permissions="['business:shop:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="閮ㄩ棬鍚嶇О" prop="name">
+ <el-form-item label="" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="涓婄骇缁勭粐" prop="parentId">
+ <el-form-item label="" prop="parentId">
<el-input v-model="searchForm.parentName" placeholder="璇疯緭鍏ヤ笂绾х粍缁囧悕绉�/缂栫爜" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
- <el-option label="鍋滅敤" value="1"></el-option>
+ <el-form-item label="" prop="status">
+ <el-select v-model="searchForm.status" style="width: 130px" @change="search" clearable placeholder="鐘舵��">
+ <el-option label="鍋滅敤" value="0"></el-option>
<el-option label="姝ｅ父" value="1"></el-option>
- <el-option label="宸插垹闄�" value="2"></el-option>
+ <el-option label="宸插垹闄�" value="-1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="缁勭粐缂栫爜" prop="code">
+ <el-form-item label="" prop="code">
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏ョ粍缁囩紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="涓�绾х粍缁囩被鍨�" prop="type">
- <el-select v-model="searchForm.type" @change="search" clearable placeholder="涓�绾х粍缁囩被鍨�">
+ <el-form-item label="" prop="type">
+ <el-select v-model="searchForm.type" @change="search" style="width: 130px" clearable placeholder="涓�绾х粍缁囩被鍨�">
<el-option label="HR" value="1"></el-option>
<el-option label="鍔犵洘鍟�" value="2"></el-option>
<el-option label="铏氭嫙缁勭粐" value="3"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜岀骇缁勭粐绫诲瀷" prop="type">
- <el-select v-model="searchForm.secondType" @change="search" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
+ <el-form-item label="" prop="type">
+ <el-select v-model="searchForm.secondType" @change="search" style="width: 130px" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
<el-option label="S" value="1"></el-option>
<el-option label="F" value="2"></el-option>
<el-option label="搴楅潰" value="3"></el-option>
@@ -34,8 +34,8 @@
<el-option label="铏氭嫙搴楅潰" value="5"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="閮ㄩ棬灞炴��" prop="attribute">
- <el-select v-model="searchForm.attribute" @change="search" clearable placeholder="閮ㄩ棬灞炴��">
+ <el-form-item label="" prop="attribute">
+ <el-select v-model="searchForm.attribute" @change="search" style="width: 130px" clearable placeholder="閮ㄩ棬灞炴��">
<el-option label="瀹炰綋搴楅潰" value="1"></el-option>
<el-option label="铏氭嫙搴楅潰" value="2"></el-option>
<el-option label="鐢靛晢閮�" value="3"></el-option>
@@ -43,19 +43,19 @@
<el-option label="璐㈠姟閮�" value="5"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐪佷唤鍚嶇О" prop="provinceName">
+ <el-form-item label="" prop="provinceName">
<el-input v-model="searchForm.provinceName" placeholder="璇疯緭鍏ョ渷浠藉悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍩庡競鍚嶇О" prop="cityName">
+ <el-form-item label="" prop="cityName">
<el-input v-model="searchForm.cityName" placeholder="璇疯緭鍏ュ煄甯傚悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍖哄幙鍚嶇О" prop="areaName">
+ <el-form-item label="" prop="areaName">
<el-input v-model="searchForm.areaName" placeholder="璇疯緭鍏ュ尯鍘垮悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍝佺被缂栫爜" prop="unitCode">
+ <el-form-item label="" prop="unitCode">
<el-input v-model="searchForm.unitCode" placeholder="璇疯緭鍏ュ搧绫荤紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="瀹㈡埛绫诲瀷缂栫爜" prop="siteCode">
+ <el-form-item label="" prop="siteCode">
<el-input v-model="searchForm.siteCode" placeholder="璇疯緭鍏ュ鎴风被鍨嬬紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
@@ -78,6 +78,7 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="120px"></el-table-column>
+ <el-table-column prop="code" label="缁勭粐缂栫爜" min-width="120px"></el-table-column>
<el-table-column prop="type" label="涓�绾х被鍨�" min-width="80px">
<template scope="{row}">
<span v-if="row.type == 1">HR</span>
@@ -107,7 +108,7 @@
<template scope="{row}">
<span v-if="row.status == 0" style="color: red">鍋滅敤</span>
<span v-if="row.status == 1" style="color: green">姝ｅ父</span>
- <span v-if="row.status == 2" style="color: grey">宸插垹闄�</span>
+ <span v-if="row.status == -1" style="color: grey">宸插垹闄�</span>
</template>
</el-table-column>
<el-table-column prop="namePath" label="缁勭粐璺緞" min-width="200px"></el-table-column>
diff --git a/admin/src/views/business/shopTree.vue b/admin/src/views/business/shopTree.vue
index e024478..e3828f5 100644
--- a/admin/src/views/business/shopTree.vue
+++ b/admin/src/views/business/shopTree.vue
@@ -25,7 +25,8 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="300px"></el-table-column>
+ <el-table-column prop="name" label="缁勭粐鍚嶇О" fixed min-width="300px"></el-table-column>
+ <el-table-column prop="code" label="缁勭粐缂栫爜" min-width="120px"></el-table-column>
<el-table-column prop="type" label="涓�绾х被鍨�" min-width="100px">
<template scope="{row}">
<span v-if="row.type == 1">HR</span>
@@ -55,12 +56,12 @@
<template scope="{row}">
<span v-if="row.status == 0" style="color: red">鍋滅敤</span>
<span v-if="row.status == 1" style="color: green">姝ｅ父</span>
- <span v-if="row.status == 2" style="color: grey">宸插垹闄�</span>
+ <span v-if="row.status == -1" style="color: grey">宸插垹闄�</span>
</template>
</el-table-column>
-<!--
+
<el-table-column prop="namePath" label="缁勭粐璺緞" min-width="200px"></el-table-column>
--->
+
<!--
<el-table-column prop="syncDate" label="鏈�鍚庡悓姝ユ椂闂�" min-width="120px"></el-table-column>
-->
diff --git a/admin/src/views/business/shopUsers.vue b/admin/src/views/business/shopUsers.vue
index 4e23bf9..e3af0ef 100644
--- a/admin/src/views/business/shopUsers.vue
+++ b/admin/src/views/business/shopUsers.vue
@@ -9,14 +9,14 @@
<el-input v-model="searchForm.iamUsername" placeholder="璇疯緭鍏ョ櫥褰曡处鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="" prop="shopType">
- <el-select v-model="searchForm.shopType" @change="search" clearable placeholder="涓�绾х粍缁囩被鍨�">
+ <el-select v-model="searchForm.shopType" @change="search" style="width: 130px" clearable placeholder="涓�绾х粍缁囩被鍨�">
<el-option label="HR" value="1"></el-option>
<el-option label="鍔犵洘鍟�" value="2"></el-option>
<el-option label="铏氭嫙缁勭粐" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="shopSecType">
- <el-select v-model="searchForm.shopSecType" @change="search" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
+ <el-select v-model="searchForm.shopSecType" @change="search" style="width: 130px" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
<el-option label="S" value="1"></el-option>
<el-option label="F" value="2"></el-option>
<el-option label="搴楅潰" value="3"></el-option>
@@ -25,10 +25,9 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="status">
- <el-select v-model="searchForm.status" @keypress.enter.native="search" clearable placeholder="鐘舵��">
- <el-option label="姝ｅ父" value="0"></el-option>
- <el-option label="绂佺敤" value="1"></el-option>
- <el-option label="鎷夐粦/鍐荤粨" value="2"></el-option>
+ <el-select v-model="searchForm.status" @keypress.enter.native="search" style="width: 120px" clearable placeholder="鐘舵��">
+ <el-option label="鍋滅敤" value="0"></el-option>
+ <el-option label="姝ｅ父" value="1"></el-option>
</el-select>
</el-form-item>
<section>
diff --git a/server/admin/src/main/java/com/doumee/api/business/PushController.java b/server/admin/src/main/java/com/doumee/api/business/PushController.java
index cf2218d..3190d34 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PushController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PushController.java
@@ -47,7 +47,7 @@
success = Constants.ONE;
r = ApiResponse.failed("鎿嶄綔澶辫触");
}finally {
- zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, shopList,success, JSONObject.toJSONString(r));
+ zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo",Constants.ONE,"IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, shopList,success, JSONObject.toJSONString(r));
}
return r;
}
@@ -71,7 +71,7 @@
e.getMessage();
r = ApiResponse.failed("鎿嶄綔澶辫触");
}finally {
- zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));
+ zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo",Constants.ONE,"IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));
}
return r;
}
diff --git a/server/admin/src/main/java/com/doumee/timer/ZbomRedisResetBiz.java b/server/admin/src/main/java/com/doumee/timer/ZbomRedisResetBiz.java
new file mode 100644
index 0000000..770f75f
--- /dev/null
+++ b/server/admin/src/main/java/com/doumee/timer/ZbomRedisResetBiz.java
@@ -0,0 +1,38 @@
+package com.doumee.timer;
+
+import com.doumee.biz.zbom.ZbomIAMService;
+import com.doumee.service.business.InitService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author 鍒濆鍖栧織閭﹀悇骞冲彴缂撳瓨瀛楀吀鍊�
+ * @since 2023-07-26 11:44
+ */
+@Component("zbomDictDataTask")
+public class ZbomRedisResetBiz implements JobService {
+ private static final Logger log = LoggerFactory.getLogger(ZbomRedisResetBiz.class);
+
+ @Autowired
+ InitService initService;
+ @Override
+ public void run(String params,String module) {
+ Method method = null;
+ try {
+ if(StringUtils.equals(module,"refreshZbomDictDataCache")){
+ initService.refreshZbomDictDataCache();
+ }else if(StringUtils.equals(module,"orgInit")){
+
+ }else
+ log.info("\n ======== 瀹氭椂浠诲姟宸叉墽琛岋細zbomRedisResut.========"+module);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/server/admin/src/main/java/com/doumee/timer/init/InitBizService.java b/server/admin/src/main/java/com/doumee/timer/init/InitBizService.java
new file mode 100644
index 0000000..2e352e1
--- /dev/null
+++ b/server/admin/src/main/java/com/doumee/timer/init/InitBizService.java
@@ -0,0 +1,38 @@
+package com.doumee.timer.init;
+
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.utils.Constants;
+import com.doumee.service.business.InitService;
+import com.doumee.service.business.ShopService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * 蹇楅偊缁勭粐淇℃伅琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2024/07/04 14:40
+ */
+@Service
+public class InitBizService {
+
+ @Autowired
+ @Lazy
+ private InitService initService;
+
+ @PostConstruct
+ public void clearImporting(){
+ initService.clearImporting();
+ }
+ @PostConstruct
+ public void refreshZbomDictDataCache(){
+ initService.refreshZbomDictDataCache();
+ }
+ @PostConstruct
+ public void cacheShopTree(){
+// redisTemplate.opsForValue().set(Constants.RedisKeys.SHOP_TREE,shopService.shopTree(null));
+ }
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java
index 59c90e8..006b2c6 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java
@@ -30,5 +30,5 @@
void updateShopInfo(String token, String uuid, String timestamp, List<IamUpateShopModel> shopList);
void updateUserInfo(String token, String uuid, String timestamp, IamUpateUserModel upateUserModel);
- void saveInterfaceLog(String url,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone);
+ void saveInterfaceLog(String url,int type,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
index 0033390..5d3fb8c 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
@@ -368,7 +368,7 @@
}
@Override
@Async
- public void saveInterfaceLog(String url,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
+ public void saveInterfaceLog(String url,int type,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
Map<String,Object> map = new HashMap<>();
map.put("token",token);
map.put("uuid",uuid);
@@ -382,7 +382,7 @@
log.setName(name);
log.setIsdeleted(Constants.ZERO);
log.setRequest(JSONObject.toJSONString(map));
- log.setType(Constants.ONE);
+ log.setType(type);
log.setSuccess(success);
log.setRepose(respone);
iamInterfaceLogMapper.insert(log);
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java
index 8820113..f8cec4b 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java
@@ -57,10 +57,10 @@
if(StringUtils.isBlank(content)){
return false;
}
- String appkey ="581ba98d70ae2b85c4ecb9c785";
- String urlStr = "http://wx.zhibang.com/api/QR/Face_UserSms?TenantId=2&smstype=6&" ;
-// String appkey = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_KEY);
-// String urlStr = (String)redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_URL) ;
+// String appkey ="581ba98d70ae2b85c4ecb9c785";
+// String urlStr = "http://wx.zhibang.com/api/QR/Face_UserSms?TenantId=2&smstype=6&" ;
+ String appkey = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_KEY);
+ String urlStr = (String)redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_URL) ;
try {
StringBuffer sb = new StringBuffer(urlStr);
Integer _t = (int) System.currentTimeMillis();
@@ -105,7 +105,7 @@
log.setCreateDate(new Date());
log.setUrl(url);
log.setEditDate(log.getCreateDate());
- log.setPlat(Constants.ZERO);
+ log.setPlat(Constants.ONE);
log.setName(name);
log.setIsdeleted(Constants.ZERO);
log.setRequest(param);
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index 224e993..5b38aa3 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -19,6 +19,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -36,6 +37,9 @@
public class ZbomZhongTaiServiceImpl implements ZbomZhongTaiService {
@Autowired
private InterfaceLogMapper interfaceLogMapper;
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
/**
* 鑾峰彇鐢ㄦ埛鐧婚檰token
* @param param
@@ -287,7 +291,8 @@
Map<String,String> headers = new HashMap<>();
headers.put(ZTConstants.HEADER_TOKEN,token);
headers.put(ZTConstants.HEADER_USERTYPE,userType);
- res = HttpsUtil.postJsonWithHeaders(url,param,headers);
+ String index = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_ZHONGTAI_API_URL);
+ res = HttpsUtil.postJsonWithHeaders(index+url,param,headers);
TypeReference typeReference =
new TypeReference<ZTBaseResponse<T>>(){};
ZTBaseResponse<T> result = JSONObject.parseObject(res, typeReference.getType());
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
index 3eb505c..6c76b7e 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -10,8 +10,8 @@
public static String DEFAULT_PID = "1";//榛樿鐪佸競鍖簆id=1琛ㄧず鍙栧叏涓浗
public interface IntegerUrl{
String USER_UPDATE_URL ="customer/api/sync";
- String USER_GET_TOKEN_URL ="http://api.dev.zbom.7zcloud.com/customer/api/login";
- String USER_LOGOUT_URL ="http://api.dev.zbom.7zcloud.com/customer/api/disable";
+ String USER_GET_TOKEN_URL ="/customer/api/login";
+ String USER_LOGOUT_URL ="/customer/api/disable";
String CATALOG_LIST_URL ="/content/api/catalog";
String CONTENT_LIST_URL ="/content/api/page";
String CONTENT_INFO_URL ="/content/api/detail/";
@@ -21,7 +21,7 @@
String LIKE_DO_URL ="/content/api/like";
String COLLECT_LIST_URL ="/behavior/getFavorite";
String LIKE_LIST_URL ="/behavior/getLike";
- String AREA_LIST_URL ="/admin/bAreaRegion/getChildren";
+ String AREA_LIST_URL ="/base/admin/bAreaRegion/getChildren";
}
public interface IntegerName{
String USER_UPDATE_NAME ="鐢ㄦ埛淇℃伅鍚屾";
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 95372cc..0a989e0 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -320,6 +320,7 @@
public static final String WX_PLATFORM = "WX_PLATFORM";
+ public static final String ZBOM_ZHONGTAI_API_URL = "ZBOM_ZHONGTAI_API_URL";
public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
public static final String WX_PLATFORM_SECRET = "WX_PLATFORM_SECRET";
@@ -363,6 +364,7 @@
String ZBOM_CRM_API_KEY ="ZBOM_CRM_API_KEY";
String ZBOM_CRM_API_URL ="ZBOM_CRM_API_URL";
String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
+ String ZBOM_ZHONGTAI_API_URL ="ZBOM_ZHONGTAI_API_URL";
String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
String IAM_APPKEY ="IAM_APPKEY";
String SHOP_TREE ="SHOP_TREE";
diff --git a/server/service/src/main/java/com/doumee/service/business/InitService.java b/server/service/src/main/java/com/doumee/service/business/InitService.java
index cfea56d..d05de5d 100644
--- a/server/service/src/main/java/com/doumee/service/business/InitService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InitService.java
@@ -28,23 +28,23 @@
@Lazy
private SystemDictDataBiz systemDictDataBiz;
- @PostConstruct
public void clearImporting(){
redisTemplate.delete(Constants.RedisKeys.IMPORTING_SHOP);
redisTemplate.delete(Constants.RedisKeys.IMPORTING_USERS);
}
- @PostConstruct
- public void initIamAppIdAndAppKey(){
+ public void refreshZbomDictDataCache(){
redisTemplate.opsForValue().set(Constants.RedisKeys.IAM_APPKEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_IAM_APPKEY).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.IAM_APPID,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_IAM_APPID).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_CRM_API_KEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_CRM_API_KEY).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_CRM_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_CRM_API_URL).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_URL).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_KEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_KEY).getCode());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_ZHONGTAI_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_ZHONGTAI_API_URL).getCode());
}
@PostConstruct
public void cacheShopTree(){
// redisTemplate.opsForValue().set(Constants.RedisKeys.SHOP_TREE,shopService.shopTree(null));
}
+
}
--
Gitblit v1.9.3