Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5760a92
Update application-dev.yml
YuKongEr Jan 22, 2019
2a4a9ec
Update application-dev.yml
YuKongEr Jan 22, 2019
52074ae
Update application-dev.yml
YuKongEr Jan 23, 2019
f147920
Update application-dev.yml
YuKongEr Apr 16, 2019
9d38a6d
add: zipkin配置
YuKongEr Apr 25, 2019
c0e9b12
add: zipkin配置
YuKongEr Apr 25, 2019
ab32caa
fix: zipkin使用mysql存储
YuKongEr Apr 26, 2019
d9d21af
fix:
YuKongEr Apr 26, 2019
9c79e21
fix:
YuKongEr Apr 26, 2019
22e1e6c
improved: 配置hostname模式 支持docker-compose
YuKongEr Apr 28, 2019
e4b1fe4
Update application-dev.yml
YuKongEr Jun 13, 2019
374e79c
Update application-dev.yml
GeorgeHyuan Jun 14, 2019
c4d4e37
Update application-dev.yml
GeorgeHyuan Jun 14, 2019
6d07cf3
Update application-dev.yml
GeorgeHyuan Jun 14, 2019
c9bf01b
dsfsdafdsf
GeorgeHyuan Jun 15, 2019
26a9546
dsfsdafdsf
GeorgeHyuan Jun 15, 2019
bd0c735
rabbitmq 通信端口号修改
GeorgeHyuan Jun 15, 2019
df0fa5a
success
GeorgeHyuan Jun 15, 2019
0069882
success
GeorgeHyuan Jun 15, 2019
8a32d37
gongs
GeorgeHyuan Jun 17, 2019
27f177d
generator
GeorgeHyuan Jun 17, 2019
8c12548
Update application-dev.yml
GeorgeHyuan Jun 18, 2019
037ff20
Update panda-zipkin-dev.yml
GeorgeHyuan Jun 18, 2019
79a7a65
Update application-dev.yml
GeorgeHyuan Jun 19, 2019
977dcbe
Update application-dev.yml
GeorgeHyuan Jun 19, 2019
6c0a39e
Update application-dev.yml
GeorgeHyuan Jun 19, 2019
ddd69f8
Update application-dev.yml
GeorgeHyuan Jun 19, 2019
00d1231
mysql redis rabbitmq
GeorgeHyuan Jun 19, 2019
c6e2b8a
redis mysql rabbitmq
GeorgeHyuan Jun 20, 2019
ee61b3d
s
GeorgeHyuan Jun 20, 2019
9e713aa
success
GeorgeHyuan Jun 29, 2019
742bec9
Merge remote-tracking branch 'origin/dev' into dev
GeorgeHyuan Jun 29, 2019
153b683
success
GeorgeHyuan Jun 29, 2019
8dff853
success
GeorgeHyuan Jun 29, 2019
79765e9
success
GeorgeHyuan Jun 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions application-dev.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
eureka:
client:
service-url:
defaultZone: http://localhost:8761/eureka/

server:
tomcat:
max-threads: 500 # Maximum amount of worker threads.
min-spare-threads: 50 # Minimum amount of worker threads
max-threads: 2000 # Maximum amount of worker threads.
min-spare-threads: 50 # Minimum amount of worker threads
spring:
datasource:
url: jdbc:mysql://193.112.100.103:3306/cloud?useUnicode=true&characterEncoding=UTF8&useSSL=false&autoReconnect=true
url: jdbc:mysql://192.168.124.23:3306/cloud?useUnicode=true&characterEncoding=UTF8&useSSL=false&autoReconnect=true
driver-class-name: com.mysql.jdbc.Driver
username: root
password: abc123
password: root
max-idle: 10
min-idle: 5
test-on-borrow: false
Expand All @@ -22,15 +17,26 @@ spring:
hikari:
minimum-idle: 0
redis:
host: 193.112.100.103
host: 192.168.124.23
port: 6379
password: x19961010

password:
timeout: 10000
lettuce:
pool:
# 连接池中的最大空闲连接
max-idle: 30
# 连接池中的最小空闲连接
min-idle: 10
# 连接池最大连接数(使用负值表示没有限制)
max-active: 30
# 连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: 10000

rabbitmq:
host: 127.0.0.1
port: 5672
username: guest
password: guest
host: 192.168.124.23
port: 5672
username: george
password: george123
http:
multipart:
max-file-size: 1000MB
Expand Down Expand Up @@ -78,3 +84,9 @@ hystrix:
isolation:
thread:
timeoutInMilliseconds: 60000
#关闭验证
management:
metrics:
web:
server:
auto-time-requests: false
4 changes: 0 additions & 4 deletions panda-auth

This file was deleted.

4 changes: 0 additions & 4 deletions panda-auth-dev

This file was deleted.

20 changes: 18 additions & 2 deletions panda-auth-dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
# sleuth配置
spring:
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1

ignore:
urls:
- /**/*.css
- /auth/**
- /token/**
- /mobile/**
- /**/*.css
- /auth/**
- /refresh/**
- /swagger-ui.html
- /swagger-resources/**
- /*/v2/api-docs
- /webjars/**
28 changes: 26 additions & 2 deletions panda-gateway-dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
spring:
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1

ignore:
urls:
- /**/*.css
- /auth/**
- /**/*.css
- /auth/**
- /admin/user/mobile/**
- /refresh/**
- /swagger-ui.html
- /swagger-resources/**
- /*/v2/api-docs
- /webjars/**
- /doc.html
- /zipkin/**

swagger:
client:
- panda-user-service
- panda-gen-service
# 关闭默认路由
zuul:
ignoredServices: '*'
51 changes: 51 additions & 0 deletions panda-gen-service-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# sleuth配置
spring:
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1
# DataSource Config
datasource:
username: root
password: root
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://192.168.124.23:3306/cloud?useUnicode=true&useSSL=false&characterEncoding=utf8

mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.yukong.entity
global-config:
db-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: AUTO
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: NOT_EMPTY
#驼峰下划线转换
table-underline: true
#mp2.3+ 全局表前缀 mp_
#table-prefix: mp_
#刷新mapper 调试神器
#refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
# Sequence序列接口实现类配置
#key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
#逻辑删除配置(下面3个配置)
logic-delete-value: 1
logic-not-delete-value: 0
#sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
#自定义填充策略接口实现
#meta-object-handler: com.baomidou.mybatisplus.core.handlers.MetaObjectHandler
configuration:
#配置返回数据库(column下划线命名&&返回java实体是驼峰命名),自动匹配无需as(没开启这个,SQL需要写as: select user_id as userId)
map-underscore-to-camel-case: true
cache-enabled: false
#配置JdbcTypeForNull, oracle数据库必须配置
jdbc-type-for-null: 'null'
# Logger Config
logging:
level:
com.yukong.panda.gen.mapper: debug
49 changes: 49 additions & 0 deletions panda-user-service-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# sleuth配置
spring:
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1

mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.yukong.entity
global-config:
db-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: AUTO
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: NOT_EMPTY
#驼峰下划线转换
table-underline: true
#mp2.3+ 全局表前缀 mp_
#table-prefix: mp_
#刷新mapper 调试神器
#refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
# Sequence序列接口实现类配置
#key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
#逻辑删除配置(下面3个配置)
logic-delete-value: 1
logic-not-delete-value: 0
#sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
#自定义填充策略接口实现
#meta-object-handler: com.baomidou.mybatisplus.core.handlers.MetaObjectHandler
configuration:
#配置返回数据库(column下划线命名&&返回java实体是驼峰命名),自动匹配无需as(没开启这个,SQL需要写as: select user_id as userId)
map-underscore-to-camel-case: true
cache-enabled: false
#配置JdbcTypeForNull, oracle数据库必须配置
jdbc-type-for-null: 'null'
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# Logger Config
#logging:
# level:
# com.yukong.panda.user.mapper: debug
# com.yukong.panda.common.base.mapper: debug


19 changes: 19 additions & 0 deletions panda-zipkin-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
zipkin:
collector:
rabbitmq:
addresses: 192.168.124.23
port: 5672
username: george
password: george123
virtual-host: /
queue: zipkin
storage:
type: mysql
StorageComponent: mysql

#关闭验证
management:
metrics:
web:
server:
auto-time-requests: false