Skip to content

G
guns-vip
Commit 986223f5 by naan1993
Options

更新配置

parent 1f3adafd
Showing with 6 additions and 84 deletions
.gitignore
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*.idea *.idea
target/ target/
logs/ logs/
# Log file # Log file
*.log *.log
......
guns-admin/pom.xml
...@@ -56,16 +56,6 @@ ...@@ -56,16 +56,6 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -150,26 +140,6 @@ ...@@ -150,26 +140,6 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
guns-admin/src/main/java/com/stylefeng/guns/common/constant/DSEnum.java → guns-admin/src/main/java/com/stylefeng/guns/common/constant/DatasourceEnum.java
...@@ -7,7 +7,7 @@ package com.stylefeng.guns.common.constant; ...@@ -7,7 +7,7 @@ package com.stylefeng.guns.common.constant;
* @author fengshuonan * @author fengshuonan
* @date 2017年3月5日 上午10:15:02 * @date 2017年3月5日 上午10:15:02
*/ */
public interface DSEnum { public interface DatasourceEnum {
String DATA_SOURCE_GUNS = "dataSourceGuns"; //guns数据源 String DATA_SOURCE_GUNS = "dataSourceGuns"; //guns数据源
......
guns-admin/src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java
...@@ -3,7 +3,7 @@ package com.stylefeng.guns.config; ...@@ -3,7 +3,7 @@ package com.stylefeng.guns.config;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor;
import com.baomidou.mybatisplus.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
import com.stylefeng.guns.common.constant.DSEnum; import com.stylefeng.guns.common.constant.DatasourceEnum;
import com.stylefeng.guns.core.datascope.DataScopeInterceptor; import com.stylefeng.guns.core.datascope.DataScopeInterceptor;
import com.stylefeng.guns.core.datasource.DruidProperties; import com.stylefeng.guns.core.datasource.DruidProperties;
import com.stylefeng.guns.core.mutidatasource.DynamicDataSource; import com.stylefeng.guns.core.mutidatasource.DynamicDataSource;
...@@ -83,8 +83,8 @@ public class MybatisPlusConfig { ...@@ -83,8 +83,8 @@ public class MybatisPlusConfig {
DynamicDataSource dynamicDataSource = new DynamicDataSource(); DynamicDataSource dynamicDataSource = new DynamicDataSource();
HashMap<Object, Object> hashMap = new HashMap(); HashMap<Object, Object> hashMap = new HashMap();
hashMap.put(DSEnum.DATA_SOURCE_GUNS, dataSourceGuns); hashMap.put(DatasourceEnum.DATA_SOURCE_GUNS, dataSourceGuns);
hashMap.put(DSEnum.DATA_SOURCE_BIZ, bizDataSource); hashMap.put(DatasourceEnum.DATA_SOURCE_BIZ, bizDataSource);
dynamicDataSource.setTargetDataSources(hashMap); dynamicDataSource.setTargetDataSources(hashMap);
dynamicDataSource.setDefaultTargetDataSource(dataSourceGuns); dynamicDataSource.setDefaultTargetDataSource(dataSourceGuns);
return dynamicDataSource; return dynamicDataSource;
...@@ -106,7 +106,7 @@ public class MybatisPlusConfig { ...@@ -106,7 +106,7 @@ public class MybatisPlusConfig {
return new DataScopeInterceptor(); return new DataScopeInterceptor();
} }
/* /**
* 乐观锁mybatis插件 * 乐观锁mybatis插件
*/ */
@Bean @Bean
......
guns-admin/src/main/resources/application.yml
...@@ -28,12 +28,6 @@ beetl: ...@@ -28,12 +28,6 @@ beetl:
################### spring配置 ################### ################### spring配置 ###################
spring: spring:
undertown:
io-threads: 2
worker-threads: 20
buffer-size: 1024
buffers-per-region: 1024
direct-buffers: true
redis: redis:
host: localhost host: localhost
port: 6379 port: 6379
......
guns-core/pom.xml
...@@ -59,17 +59,6 @@ ...@@ -59,17 +59,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!--aop--> <!--aop-->
......
guns-parent/pom.xml
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
<jwt.version>0.7.0</jwt.version> <jwt.version>0.7.0</jwt.version>
<flowable.version>6.2.0</flowable.version> <flowable.version>6.2.0</flowable.version>
<hutool.version>4.0.0</hutool.version> <hutool.version>4.0.0</hutool.version>
<mp-sdk.version>2.9.0</mp-sdk.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -179,21 +178,6 @@ ...@@ -179,21 +178,6 @@
<artifactId>hutool-http</artifactId> <artifactId>hutool-http</artifactId>
<version>${hutool.version}</version> <version>${hutool.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
<version>${mp-sdk.version}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
<version>${mp-sdk.version}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
<version>${mp-sdk.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
guns-rest/pom.xml
...@@ -22,16 +22,6 @@ ...@@ -22,16 +22,6 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
guns-rest/src/main/resources/application.yml
...@@ -27,12 +27,6 @@ mybatis-plus: ...@@ -27,12 +27,6 @@ mybatis-plus:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用 # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
spring: spring:
undertown:
io-threads: 2
worker-threads: 20
buffer-size: 1024
buffers-per-region: 1024
direct-buffers: true
datasource: datasource:
url: jdbc:mysql://127.0.0.1:3306/rest?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://127.0.0.1:3306/rest?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
username: root username: root
......
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