From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java b/service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java
old mode 100644
new mode 100755
index 25f37a0..7f19443
--- a/service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java
+++ b/service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java
@@ -74,7 +74,7 @@
         applicationKeyDto.setEndTime(DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
         //鏌ヨ璁㈠崟淇℃伅
         List<ApplicationKeyDto> applicationKeyDtos = applicationKeyInnerServiceSMOImpl.queryApplicationKeys(applicationKeyDto);
-        String url = ServiceConstant.SERVICE_API_URL + "/api/applicationKey.updateApplicationKey";
+        String url = "applicationKey.updateApplicationKey";
         for (ApplicationKeyDto tmpApplicationKeyDto : applicationKeyDtos) {
             try {
                 logger.debug("寮�濮嬪鐞嗚鍗�" + JSONObject.toJSONString(tmpApplicationKeyDto));
@@ -106,8 +106,9 @@
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
             logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, httpEntity, responseEntity);
-            return responseEntity;
         }
+        
+        return responseEntity;
     }
 
     /**

--
Gitblit v1.8.0