diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java index b875cda..b627ecc 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java @@ -21,8 +21,8 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableCaching //@EnableDiscoveryClient //@EnableFeignClients -@MapperScan(basePackages = "com.hcframe.**.dao") -@ComponentScan(basePackages = {"com.hcframe.**"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {DataSourceConfiguration.class})) +@MapperScan(basePackages = "com.taixingyiji.**.dao") +@ComponentScan(basePackages = {"com.taixingyiji.**"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {DataSourceConfiguration.class})) public class ActivitiApplication { public static void main(String[] args) { diff --git a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java index b613a83..f4495de 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java @@ -29,12 +29,12 @@ import java.util.Map; */ @Configuration // 配置tk.mybatis参数及通用mapper,指定sqlSession工厂Bean -@tk.mybatis.spring.annotation.MapperScan(basePackages = "com.hcframe.**.dao", //这里扫描dao层的接口 +@tk.mybatis.spring.annotation.MapperScan(basePackages = "com.taixingyiji.**.dao", //这里扫描dao层的接口 sqlSessionFactoryRef = "sqlSessionFactoryBean222", markerInterface = MyMapper.class //指定tkmybatis 中的通用mapper ) // 配置mybatis参数，指定sqlSession工厂Bean -@MapperScan(basePackages = "com.hcframe.**.dao",sqlSessionFactoryRef = "sqlSessionFactoryBean222") +@MapperScan(basePackages = "com.taixingyiji.**.dao",sqlSessionFactoryRef = "sqlSessionFactoryBean222") @EnableConfigurationProperties(MybatisProperties.class) public class DataSourceConfiguration { diff --git a/hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/ConfigApplication.java b/hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/ConfigApplication.java index b085ca2..c18e2e1 100644 --- a/hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/ConfigApplication.java +++ b/hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/ConfigApplication.java @@ -19,7 +19,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @EnableDiscoveryClient @EnableFeignClients //@EnableCasClient -@ComponentScan(basePackages = {"com.hcframe.**"}) +@ComponentScan(basePackages = {"com.taixingyiji.**"}) public class ConfigApplication { public static void main(String[] args) { SpringApplication.run(ConfigApplication.class, args); diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/EsApplication.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/EsApplication.java similarity index 91% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/EsApplication.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/EsApplication.java index 7417644..49ac61c 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/EsApplication.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/EsApplication.java @@ -1,4 +1,4 @@ -package com.hcframe.es; +package com.taixingyiji.es; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -16,7 +16,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @EnableCaching //@EnableDiscoveryClient //@EnableFeignClients -@ComponentScan(basePackages = {"com.hcframe.**"}) +@ComponentScan(basePackages = {"com.taixingyiji.**"}) public class EsApplication { public static void main(String[] args) { diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/ServletInitializer.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/ServletInitializer.java similarity index 93% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/ServletInitializer.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/ServletInitializer.java index 933a07a..e0e1f75 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/ServletInitializer.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/ServletInitializer.java @@ -1,4 +1,4 @@ -package com.hcframe.es; +package com.taixingyiji.es; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/annotation/LogAnno.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/annotation/LogAnno.java similarity index 93% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/annotation/LogAnno.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/annotation/LogAnno.java index dbf425d..19b8403 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/annotation/LogAnno.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/annotation/LogAnno.java @@ -1,4 +1,4 @@ -package com.hcframe.es.annotation; +package com.taixingyiji.es.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/CommandLineRunnerImpl.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/config/CommandLineRunnerImpl.java similarity index 90% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/CommandLineRunnerImpl.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/config/CommandLineRunnerImpl.java index df3445d..f2328a6 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/CommandLineRunnerImpl.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/config/CommandLineRunnerImpl.java @@ -1,7 +1,6 @@ -package com.hcframe.es.config; +package com.taixingyiji.es.config; import com.taixingyiji.base.module.cache.CacheService; -import com.taixingyiji.base.module.datasource.utils.DataSourceUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/ShiroRealmConfig.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/config/ShiroRealmConfig.java similarity index 98% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/ShiroRealmConfig.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/config/ShiroRealmConfig.java index 46146ac..559791b 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/ShiroRealmConfig.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/config/ShiroRealmConfig.java @@ -1,4 +1,4 @@ -package com.hcframe.es.config; +package com.taixingyiji.es.config; import com.taixingyiji.base.module.auth.dao.FtUserDao; import com.taixingyiji.base.module.auth.entity.FtUser; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/controller/SearchController.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/controller/SearchController.java similarity index 96% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/controller/SearchController.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/controller/SearchController.java index e392881..97e2b5d 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/controller/SearchController.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/controller/SearchController.java @@ -1,7 +1,7 @@ -package com.hcframe.es.controller; +package com.taixingyiji.es.controller; import com.taixingyiji.base.common.ResultVO; -import com.hcframe.es.service.SearchService; +import com.taixingyiji.es.service.SearchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/entity/FtUser.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/entity/FtUser.java similarity index 97% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/entity/FtUser.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/entity/FtUser.java index 75d2714..852be35 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/entity/FtUser.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/entity/FtUser.java @@ -1,4 +1,4 @@ -package com.hcframe.es.entity; +package com.taixingyiji.es.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/esmapper/EsMapper.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/esmapper/EsMapper.java similarity index 91% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/esmapper/EsMapper.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/esmapper/EsMapper.java index d9db31a..4ba01a4 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/esmapper/EsMapper.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/esmapper/EsMapper.java @@ -1,4 +1,4 @@ -package com.hcframe.es.esmapper; +package com.taixingyiji.es.esmapper; import org.elasticsearch.action.search.SearchResponse; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/esmapper/impl/EsMapperImpl.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/esmapper/impl/EsMapperImpl.java similarity index 97% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/esmapper/impl/EsMapperImpl.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/esmapper/impl/EsMapperImpl.java index 4107caa..fc85a64 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/esmapper/impl/EsMapperImpl.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/esmapper/impl/EsMapperImpl.java @@ -1,7 +1,7 @@ -package com.hcframe.es.esmapper.impl; +package com.taixingyiji.es.esmapper.impl; import com.taixingyiji.base.common.ServiceException; -import com.hcframe.es.esmapper.EsMapper; +import com.taixingyiji.es.esmapper.EsMapper; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.RequestOptions; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/SearchService.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/service/SearchService.java similarity index 91% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/SearchService.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/service/SearchService.java index 87a1005..12e5eb1 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/SearchService.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/service/SearchService.java @@ -1,4 +1,4 @@ -package com.hcframe.es.service; +package com.taixingyiji.es.service; import com.taixingyiji.base.common.ResultVO; diff --git a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/impl/SearchServiceImpl.java b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/service/impl/SearchServiceImpl.java similarity index 96% rename from hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/impl/SearchServiceImpl.java rename to hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/service/impl/SearchServiceImpl.java index 36de300..90c72ef 100644 --- a/hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/impl/SearchServiceImpl.java +++ b/hcframe-parent/hcframe-es/src/main/java/com/taixingyiji/es/service/impl/SearchServiceImpl.java @@ -1,9 +1,9 @@ -package com.hcframe.es.service.impl; +package com.taixingyiji.es.service.impl; import com.alibaba.fastjson.JSON; import com.taixingyiji.base.common.ResultVO; -import com.hcframe.es.esmapper.EsMapper; -import com.hcframe.es.service.SearchService; +import com.taixingyiji.es.esmapper.EsMapper; +import com.taixingyiji.es.service.SearchService; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.text.Text; import org.elasticsearch.search.SearchHit; diff --git a/hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/taixingyiji/gateway_cas_stater/config/CasGatewayClientConfig.java b/hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/taixingyiji/gateway_cas_stater/config/CasGatewayClientConfig.java index 5c76d42..7cd4e59 100644 --- a/hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/taixingyiji/gateway_cas_stater/config/CasGatewayClientConfig.java +++ b/hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/taixingyiji/gateway_cas_stater/config/CasGatewayClientConfig.java @@ -29,7 +29,7 @@ public class CasGatewayClientConfig { public String ignoreUrlPatternType="REGEX"; - public String cookieHolderPattern="com.hcframe.gateway_cas_stater.data.DataStorageImpl"; + public String cookieHolderPattern="com.taixingyiji.gateway_cas_stater.data.DataStorageImpl"; public String authKey="X-Access-Token"; diff --git a/hcframe-parent/hcframe-test/src/main/java/com/taixingyiji/test/TestApplication.java b/hcframe-parent/hcframe-test/src/main/java/com/taixingyiji/test/TestApplication.java index bb8c1b4..c864331 100644 --- a/hcframe-parent/hcframe-test/src/main/java/com/taixingyiji/test/TestApplication.java +++ b/hcframe-parent/hcframe-test/src/main/java/com/taixingyiji/test/TestApplication.java @@ -16,7 +16,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @EnableCaching //@EnableDiscoveryClient //@EnableFeignClients -@ComponentScan(basePackages = {"com.hcframe.**"}) +@ComponentScan(basePackages = {"com.taixingyiji.**"}) public class TestApplication { public static void main(String[] args) { diff --git a/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/UserApplication.java b/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/UserApplication.java index 005aa9f..915225e 100644 --- a/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/UserApplication.java +++ b/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/UserApplication.java @@ -20,8 +20,8 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableSwagger2 @ServletComponentScan @EnableCaching -@MapperScan(basePackages = "com.hcframe.**.dao") -@ComponentScan(basePackages = {"com.hcframe.**"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {DataSourceConfiguration.class})) +@MapperScan(basePackages = "com.taixingyiji.**.dao") +@ComponentScan(basePackages = {"com.taixingyiji.**"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {DataSourceConfiguration.class})) @EnableDiscoveryClient @Import(CasClientConfigurationProperties.class) //@EnableCasClient diff --git a/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/common/log/OprateLog.java b/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/common/log/OprateLog.java index 08bcb93..a0dd5c8 100644 --- a/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/common/log/OprateLog.java +++ b/hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/common/log/OprateLog.java @@ -55,7 +55,7 @@ public class OprateLog { this.tableService = tableService; } - @Around("@annotation(com.hcframe.base.module.log.annotation.LogAnno)") + @Around("@annotation(com.taixingyiji.base.module.log.annotation.LogAnno)") public Object aroundAdvice(ProceedingJoinPoint pjp) throws Throwable { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); assert attributes != null;