Browse Source

Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tags/v2.3.0^2
gitadmin 1 year ago
parent
commit
62465b329f
2 changed files with 10 additions and 10 deletions
  1. +5
    -5
      tuoheng_oidc_admin/src/main/resources/application-test.yml
  2. +5
    -5
      tuoheng_oidc_server/src/main/resources/application-test.yml

+ 5
- 5
tuoheng_oidc_admin/src/main/resources/application-test.yml View File

# 注册中心consul地址 # 注册中心consul地址
cloud: cloud:
consul: consul:
host: 192.168.11.242 # consul 所在服务地址
host: 172.15.1.11 # consul 所在服务地址
port: 8500 # consul 服务端口 port: 8500 # consul 服务端口
discovery: discovery:
## consul ip地址 ## consul ip地址
hostname: 192.168.11.242
hostname: 172.15.1.11
# 注册到consul的服务名称 # 注册到consul的服务名称
service-name: ${spring.application.name} # 服务提供者名称 service-name: ${spring.application.name} # 服务提供者名称
instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# 填写你数据库的url、登录名、密码和数据库名 # 填写你数据库的url、登录名、密码和数据库名
url: jdbc:mysql://192.168.11.242:3306/tuoheng_oidc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
url: jdbc:mysql://rm-uf6z740323e8053pj.mysql.rds.aliyuncs.com:3306/tuoheng_oidc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
username: root username: root
password: idontcare
password: TH22#2022
druid: druid:
# 连接池的配置信息 # 连接池的配置信息
# 初始连接数 # 初始连接数
# 缓存库默认索引0 # 缓存库默认索引0
database: 0 database: 0
# Redis服务器地址 # Redis服务器地址
host: 192.168.11.242
host: r-uf6cdzjifj20jszykr.redis.rds.aliyuncs.com
# Redis服务器连接端口 # Redis服务器连接端口
port: 6379 port: 6379
# Redis服务器连接密码(默认为空) # Redis服务器连接密码(默认为空)

+ 5
- 5
tuoheng_oidc_server/src/main/resources/application-test.yml View File

resource-server: resource-server:
jwt: jwt:
#issuer-uri: http://192.168.11.241:8090 #认证中心端点,作为资源端的配置、 #issuer-uri: http://192.168.11.241:8090 #认证中心端点,作为资源端的配置、
issuer-uri: https://oidc.test.t-aaron.com #认证中心端点,作为资源端的配置、
issuer-uri: https://login-test.t-aaron.com #认证中心端点,作为资源端的配置、


# 配置数据源 # 配置数据源
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# 填写你数据库的url、登录名、密码和数据库名 # 填写你数据库的url、登录名、密码和数据库名
url: jdbc:mysql://192.168.11.242:3306/tuoheng_oidc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
url: jdbc:mysql://rm-uf6z740323e8053pj.mysql.rds.aliyuncs.com:3306/tuoheng_oidc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
username: root username: root
password: idontcare
password: TH22#2022
druid: druid:
# 连接池的配置信息 # 连接池的配置信息
# 初始连接数 # 初始连接数
# 缓存库默认索引0 # 缓存库默认索引0
database: 0 database: 0
# Redis服务器地址 # Redis服务器地址
host: 192.168.11.242
host: r-uf6cdzjifj20jszykr.redis.rds.aliyuncs.com
# Redis服务器连接端口 # Redis服务器连接端口
port: 6379 port: 6379
# Redis服务器连接密码(默认为空) # Redis服务器连接密码(默认为空)
min-idle: 1 # 连接池中的最小空闲连接 min-idle: 1 # 连接池中的最小空闲连接
oauth2: oauth2:
token: token:
issuer: https://oidc.test.t-aaron.com
issuer: https://login-test.t-aaron.com

Loading…
Cancel
Save