From f9688cb059e76fd976a76d36f716a9ceb2044efb Mon Sep 17 00:00:00 2001 From: licc168 Date: Thu, 4 Jan 2018 14:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=80=9A=E8=BF=87httpclint=E6=96=B9=E5=BC=8F=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEip=E8=8E=B7=E5=8F=96=E7=8E=AF=E5=A2=83=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dove-config-admin/pom.xml | 2 +- .../licc/dove/security/UserDetailService.java | 8 +- .../dove/service/DoveConfigAppService.java | 12 +- .../dove/service/DoveConfigEnvIpService.java | 16 +- .../service/DoveConfigPropertiesService.java | 9 +- .../com/licc/dove/service/MenuService.java | 4 +- .../com/licc/dove/service/UserService.java | 2 +- .../service/base/impl/BaseServiceImpl.java | 3 +- .../licc/dove/vo/DoveConfigPropertiesVO.java | 2 +- .../mapper/DoveConfigPropertiesMapper.xml | 4 +- .../resources/public/js/config/properties.js | 1 + .../thymeleaf/config/appPropertiesList.html | 1 + .../java/com/licc/dove/ConfigProperties.java | 33 ++ .../licc/dove/SpringBootWebApplication.java | 1 - .../licc/dove/config/service/ApiService.java | 41 ++ dove-spring-boot-starter/pom.xml | 14 +- .../loader/CustomPropertySourceLocator.java | 53 ++- .../licc/dove/loader/util/HttpClientUtil.java | 369 ++++++++++++++++++ 18 files changed, 522 insertions(+), 53 deletions(-) create mode 100644 dove-config-client/src/main/java/com/licc/dove/ConfigProperties.java create mode 100644 dove-config-server/src/main/java/com/licc/dove/config/service/ApiService.java create mode 100644 dove-spring-boot-starter/src/main/java/com/licc/dove/loader/util/HttpClientUtil.java diff --git a/dove-config-admin/pom.xml b/dove-config-admin/pom.xml index fa933fa..a2c6700 100644 --- a/dove-config-admin/pom.xml +++ b/dove-config-admin/pom.xml @@ -123,7 +123,7 @@ org.springframework.boot spring-boot-starter-tomcat - provided + compile com.licc.dove diff --git a/dove-config-admin/src/main/java/com/licc/dove/security/UserDetailService.java b/dove-config-admin/src/main/java/com/licc/dove/security/UserDetailService.java index 800859e..8783f50 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/security/UserDetailService.java +++ b/dove-config-admin/src/main/java/com/licc/dove/security/UserDetailService.java @@ -1,11 +1,8 @@ package com.licc.dove.security; -import com.licc.dove.domain.User; -import com.licc.dove.service.UserService; - - import java.util.ArrayList; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.GrantedAuthority; @@ -15,6 +12,9 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import com.licc.dove.domain.User; +import com.licc.dove.service.UserService; + /** * @author Jonsy diff --git a/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigAppService.java b/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigAppService.java index 53e1eaf..613c9e2 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigAppService.java +++ b/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigAppService.java @@ -1,17 +1,17 @@ package com.licc.dove.service; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + import com.licc.dove.dao.CommonDao; import com.licc.dove.dao.Page; -import com.licc.dove.dao.ParamMap; import com.licc.dove.domain.DoveConfigApp; import com.licc.dove.param.DoveConfigAppParam; -import com.licc.dove.param.PageParam; import com.licc.dove.service.base.impl.BaseServiceImpl; import com.licc.dove.util.BeanMapper; -import com.licc.dove.vo.MenuVO; -import java.util.List; -import javax.annotation.Resource; -import org.springframework.stereotype.Service; /** * @author lichangchao diff --git a/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigEnvIpService.java b/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigEnvIpService.java index 6c1410f..0b01763 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigEnvIpService.java +++ b/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigEnvIpService.java @@ -1,22 +1,16 @@ package com.licc.dove.service; -import com.licc.dove.dao.ParamMap; -import com.licc.dove.domain.DoveConfigEnvIp; -import com.licc.dove.param.DoveConfigEnvIpParam; -import com.licc.dove.vo.DoveConfigEnvIpVO; -import com.licc.dove.vo.DoveConfigPropertiesVO; -import java.util.List; - import javax.annotation.Resource; import org.springframework.stereotype.Service; import com.licc.dove.dao.CommonDao; import com.licc.dove.dao.Page; -import com.licc.dove.domain.DoveConfigEnv; -import com.licc.dove.param.DoveConfigEnvParam; +import com.licc.dove.dao.ParamMap; +import com.licc.dove.domain.DoveConfigEnvIp; +import com.licc.dove.param.DoveConfigEnvIpParam; import com.licc.dove.service.base.impl.BaseServiceImpl; -import com.licc.dove.util.BeanMapper; +import com.licc.dove.vo.DoveConfigEnvIpVO; /** * @author lichangchao @@ -36,4 +30,6 @@ public Page page(DoveConfigEnvIpParam param) { } + + } diff --git a/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigPropertiesService.java b/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigPropertiesService.java index 16b5dac..6336ca1 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigPropertiesService.java +++ b/dove-config-admin/src/main/java/com/licc/dove/service/DoveConfigPropertiesService.java @@ -1,17 +1,16 @@ package com.licc.dove.service; +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + import com.licc.dove.dao.CommonDao; import com.licc.dove.dao.Page; import com.licc.dove.dao.ParamMap; -import com.licc.dove.domain.DoveConfigApp; import com.licc.dove.domain.DoveConfigPropertie; -import com.licc.dove.param.DoveConfigAppParam; import com.licc.dove.param.DoveConfigPropertieParam; import com.licc.dove.service.base.impl.BaseServiceImpl; -import com.licc.dove.util.BeanMapper; import com.licc.dove.vo.DoveConfigPropertiesVO; -import javax.annotation.Resource; -import org.springframework.stereotype.Service; /** * 配置中心-属性管理 diff --git a/dove-config-admin/src/main/java/com/licc/dove/service/MenuService.java b/dove-config-admin/src/main/java/com/licc/dove/service/MenuService.java index 1bfd8dc..f7efb00 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/service/MenuService.java +++ b/dove-config-admin/src/main/java/com/licc/dove/service/MenuService.java @@ -1,7 +1,5 @@ package com.licc.dove.service; -import com.licc.dove.dao.Order.Direction; -import com.licc.dove.dao.ParamMap; import java.util.List; import javax.annotation.Resource; @@ -12,7 +10,9 @@ import com.google.common.collect.Lists; import com.licc.dove.dao.CommonDao; import com.licc.dove.dao.Order; +import com.licc.dove.dao.Order.Direction; import com.licc.dove.dao.Page; +import com.licc.dove.dao.ParamMap; import com.licc.dove.domain.Menu; import com.licc.dove.param.PageParam; import com.licc.dove.service.base.impl.BaseServiceImpl; diff --git a/dove-config-admin/src/main/java/com/licc/dove/service/UserService.java b/dove-config-admin/src/main/java/com/licc/dove/service/UserService.java index 786cb79..044a3af 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/service/UserService.java +++ b/dove-config-admin/src/main/java/com/licc/dove/service/UserService.java @@ -1,7 +1,6 @@ package com.licc.dove.service; -import com.licc.dove.dao.CommonDao; import java.util.Date; import java.util.List; @@ -12,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import com.licc.dove.dao.CommonDao; import com.licc.dove.domain.User; import com.licc.dove.param.UserParam; import com.licc.dove.service.base.impl.BaseServiceImpl; diff --git a/dove-config-admin/src/main/java/com/licc/dove/service/base/impl/BaseServiceImpl.java b/dove-config-admin/src/main/java/com/licc/dove/service/base/impl/BaseServiceImpl.java index 513c6aa..b401aa7 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/service/base/impl/BaseServiceImpl.java +++ b/dove-config-admin/src/main/java/com/licc/dove/service/base/impl/BaseServiceImpl.java @@ -21,7 +21,8 @@ public class BaseServiceImpl implements IBaseService { CommonDao commonDao; @Override public void deleteById(Long id) { - commonDao.delete(id); + T t = commonDao.get(DTOClass,id); + commonDao.delete(t); } @Override diff --git a/dove-config-admin/src/main/java/com/licc/dove/vo/DoveConfigPropertiesVO.java b/dove-config-admin/src/main/java/com/licc/dove/vo/DoveConfigPropertiesVO.java index 7fe6d5a..56cca06 100644 --- a/dove-config-admin/src/main/java/com/licc/dove/vo/DoveConfigPropertiesVO.java +++ b/dove-config-admin/src/main/java/com/licc/dove/vo/DoveConfigPropertiesVO.java @@ -23,5 +23,5 @@ public class DoveConfigPropertiesVO { String appName; String appProfile; - + String appLable; } diff --git a/dove-config-admin/src/main/resources/mybatis/mapper/DoveConfigPropertiesMapper.xml b/dove-config-admin/src/main/resources/mybatis/mapper/DoveConfigPropertiesMapper.xml index b97740c..1d79837 100644 --- a/dove-config-admin/src/main/resources/mybatis/mapper/DoveConfigPropertiesMapper.xml +++ b/dove-config-admin/src/main/resources/mybatis/mapper/DoveConfigPropertiesMapper.xml @@ -9,6 +9,8 @@ + + t.id , t.config_app_id , t.pro_key, t.pro_value @@ -17,7 +19,7 @@