From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 6237e62..332639c 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -11,14 +11,12 @@
import com.doumee.service.system.SystemDictService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.Optional;
@Service
public class SystemDictDataBizImpl implements SystemDictDataBiz {
@@ -68,7 +66,8 @@
queryDto.setDeleted(Boolean.FALSE);
SystemDict dictData = systemDictService.findOne(queryDto);
if (dictData == null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊间笉瀛樺湪");
+ return new SystemDictData();
+// throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊间笉瀛樺湪");
}
SystemDictData data = new SystemDictData();
data.setDictId(dictData.getId());
@@ -139,13 +138,29 @@
}
@Override
+ public void refreshCache() {
+ /* HKCarOpenService.ACCESS_KEY= queryByCode(Constants.HK_PARAM, Constants.HK_CARS_OPENAPI_ACCESS_KEY).getCode();
+ HKCarOpenService.BASE_URL= queryByCode(Constants.HK_PARAM, Constants.HK_CARS_OPENAPI_URL).getCode();
+ HKCarOpenService.ACCESS_SECRET= queryByCode(Constants.HK_PARAM, Constants.HK_CARS_OPENAPI_ACCESS_SECRET).getCode();
+ ArtemisConfig.host = queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
+ ArtemisConfig.appKey = queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
+ ArtemisConfig.appSecret = queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
+ HKConstants.https = queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();*/
+ }
+ @Override
+ public String getWxAccessToken(){
+
+ return queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode();
+ }
+
+ @Override
public String getPreFixPath(String resourceCode, String targetCode) {
if (StringUtils.isBlank(resourceCode) || StringUtils.isBlank(targetCode)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璺緞鍙傛暟涓嶅畬鏁�");
}
SystemDict queryDto = new SystemDict();
- queryDto.setCode(Constants.OSS);
+ queryDto.setCode(Constants.FTP);
queryDto.setDeleted(Boolean.FALSE);
SystemDict dictData = systemDictService.findOne(queryDto);
if (dictData == null) {
--
Gitblit v1.9.3