1.

王通
1 parent d3bbd39b
Showing 2 changed files with 12 additions and 12 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/security/SsoConfig.java
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -49,7 +48,7 @@ import java.util.Set;
  */
 @RestController
 @RequestMapping("adminUtils")
-public class AdminUtilsController implements InitializingBean {
+public class AdminUtilsController {
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -346,8 +345,7 @@ public class AdminUtilsController implements InitializingBean {
             gatewayHttpLoader.afterPropertiesSet();
             gatewayHttpUtils.afterPropertiesSet();
             rfidHttpLoader.afterPropertiesSet();
-            ssoConfig.setSystemCode(SystemParamCache.getSsoSystemCode());
-            ssoConfig.setSsoAuthUrl(SystemParamCache.getUrlHttpSsoAuth());
+            ssoConfig.afterPropertiesSet();
             return "success";
         } catch (Exception e) {
@@ -366,8 +364,7 @@ public class AdminUtilsController implements InitializingBean {
             gatewayHttpLoader.afterPropertiesSet();
             gatewayHttpUtils.afterPropertiesSet();
             rfidHttpLoader.afterPropertiesSet();
-            ssoConfig.setSystemCode(SystemParamCache.getSsoSystemCode());
-            ssoConfig.setSsoAuthUrl(SystemParamCache.getUrlHttpSsoAuth());
+            ssoConfig.afterPropertiesSet();
             return "success";
         } catch (Exception e) {
@@ -389,9 +386,4 @@ public class AdminUtilsController implements InitializingBean {
         return "error";
     }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        reloadAndApplySystemParam();
-    }
 }
 \ No newline at end of file
 package com.bsth.security;
 import com.bsth.common.Constants;
+import com.bsth.data.SystemParamCache;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -9,7 +11,7 @@ import org.springframework.stereotype.Component;
  * @author Hill
  */
 @Component
-public class SsoConfig {
+public class SsoConfig implements InitializingBean {
     /**
      * 是否开启sso登录
@@ -87,4 +89,10 @@ public class SsoConfig {
     public void setSsoAuthUrl(String ssoAuthUrl) {
         this.ssoAuthUrl = ssoAuthUrl;
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        setSystemCode(SystemParamCache.getSsoSystemCode());
+        setSsoAuthUrl(SystemParamCache.getUrlHttpSsoAuth());
+    }
 }