Commit 35427630 by fengshuonan

修改包名为cn

parent d552b1db
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.stylefeng.guns</groupId> <groupId>cn.stylefeng.guns</groupId>
<artifactId>guns-admin</artifactId> <artifactId>guns-admin</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
......
...@@ -44,7 +44,7 @@ public class SwaggerConfig{ ...@@ -44,7 +44,7 @@ public class SwaggerConfig{
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.select() .select()
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) //这里采用包含注解的方式来确定要显示的接口 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) //这里采用包含注解的方式来确定要显示的接口
//.apis(RequestHandlerSelectors.basePackage("com.stylefeng.guns.modular.system.controller")) //这里采用包扫描的方式来确定要显示的接口 //.apis(RequestHandlerSelectors.basePackage("cn.stylefeng.guns.modular.system.controller")) //这里采用包扫描的方式来确定要显示的接口
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build();
} }
......
...@@ -45,7 +45,7 @@ import java.util.HashMap; ...@@ -45,7 +45,7 @@ import java.util.HashMap;
@Configuration @Configuration
@ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "true") @ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "true")
@EnableTransactionManagement(order = 2) @EnableTransactionManagement(order = 2)
@MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao","com.stylefeng.guns.multi.mapper"}) @MapperScan(basePackages = {"cn.stylefeng.guns.modular.*.dao","cn.stylefeng.guns.multi.mapper"})
public class MultiDataSourceConfig { public class MultiDataSourceConfig {
@Bean @Bean
......
...@@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration @Configuration
@ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "false", matchIfMissing = true) @ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "false", matchIfMissing = true)
@EnableTransactionManagement @EnableTransactionManagement
@MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao"}) @MapperScan(basePackages = {"cn.stylefeng.guns.modular.*.dao"})
public class SingleDataSourceConfig { public class SingleDataSourceConfig {
/** /**
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
package cn.stylefeng.guns.config.web; package cn.stylefeng.guns.config.web;
import cn.stylefeng.guns.config.properties.GunsProperties; import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.intercept.RestApiInteceptor;
import cn.stylefeng.guns.core.listener.ConfigListener;
import cn.stylefeng.roses.core.xss.XssFilter; import cn.stylefeng.roses.core.xss.XssFilter;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.http.StatViewServlet; import com.alibaba.druid.support.http.StatViewServlet;
...@@ -24,8 +26,6 @@ import com.alibaba.druid.support.spring.stat.BeanTypeAutoProxyCreator; ...@@ -24,8 +26,6 @@ import com.alibaba.druid.support.spring.stat.BeanTypeAutoProxyCreator;
import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config; import com.google.code.kaptcha.util.Config;
import cn.stylefeng.guns.core.intercept.RestApiInteceptor;
import cn.stylefeng.guns.core.listener.ConfigListener;
import org.springframework.aop.Advisor; import org.springframework.aop.Advisor;
import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.aop.support.JdkRegexpMethodPointcut; import org.springframework.aop.support.JdkRegexpMethodPointcut;
...@@ -111,7 +111,7 @@ public class WebConfig extends WebMvcConfigurerAdapter { ...@@ -111,7 +111,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
@Bean @Bean
public JdkRegexpMethodPointcut druidStatPointcut() { public JdkRegexpMethodPointcut druidStatPointcut() {
JdkRegexpMethodPointcut druidStatPointcut = new JdkRegexpMethodPointcut(); JdkRegexpMethodPointcut druidStatPointcut = new JdkRegexpMethodPointcut();
String patterns = "com.stylefeng.guns.modular.*.service.*"; String patterns = "cn.stylefeng.guns.modular.*.service.*";
//可以set多个 //可以set多个
druidStatPointcut.setPatterns(patterns); druidStatPointcut.setPatterns(patterns);
return druidStatPointcut; return druidStatPointcut;
......
...@@ -19,6 +19,8 @@ import cn.hutool.core.convert.Convert; ...@@ -19,6 +19,8 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.core.common.constant.cache.Cache; import cn.stylefeng.guns.core.common.constant.cache.Cache;
import cn.stylefeng.guns.core.common.constant.cache.CacheKey; import cn.stylefeng.guns.core.common.constant.cache.CacheKey;
import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
import cn.stylefeng.guns.core.common.constant.state.MenuStatus;
import cn.stylefeng.guns.core.log.LogObjectHolder; import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.modular.system.dao.*; import cn.stylefeng.guns.modular.system.dao.*;
import cn.stylefeng.guns.modular.system.model.*; import cn.stylefeng.guns.modular.system.model.*;
...@@ -26,10 +28,6 @@ import cn.stylefeng.roses.core.util.SpringContextHolder; ...@@ -26,10 +28,6 @@ import cn.stylefeng.roses.core.util.SpringContextHolder;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
import cn.stylefeng.guns.core.common.constant.state.MenuStatus;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
...@@ -33,7 +33,7 @@ import org.springframework.stereotype.Component; ...@@ -33,7 +33,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class SessionHolderInterceptor extends BaseController { public class SessionHolderInterceptor extends BaseController {
@Pointcut("execution(* com.stylefeng.guns.*..controller.*.*(..))") @Pointcut("execution(* cn.stylefeng.guns.*..controller.*.*(..))")
public void cutService() { public void cutService() {
} }
......
...@@ -4,7 +4,7 @@ server: ...@@ -4,7 +4,7 @@ server:
guns: guns:
swagger-open: true #是否开启swagger (true/false) swagger-open: true #是否开启swagger (true/false)
kaptcha-open: false #是否开启登录时验证码 (true/false) kaptcha-open: false #是否开启登录时验证码 (true/false)
# file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) # file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
session-invalidate-time: 1800 #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒 session-invalidate-time: 1800 #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
...@@ -27,7 +27,7 @@ spring: ...@@ -27,7 +27,7 @@ spring:
max-file-size: 100MB max-file-size: 100MB
mybatis-plus: mybatis-plus:
typeAliasesPackage: com.stylefeng.guns.modular.system.model typeAliasesPackage: cn.stylefeng.guns.modular.system.model
log: log:
path: guns-logs path: guns-logs
...@@ -51,8 +51,8 @@ guns: ...@@ -51,8 +51,8 @@ guns:
username: root username: root
password: root password: root
dataSourceNames: dataSourceNames:
- dataSourceGuns - dataSourceGuns
- dataSourceBiz - dataSourceBiz
--- ---
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment