Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
chengwang 1 year ago
parent
commit
395a446f72
4 changed files with 7 additions and 7 deletions
  1. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/resources/application-dev.yml
  2. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/resources/application-local.yml
  3. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/resources/application-prod.yml
  4. +4
    -4
      tuoheng-service/tuoheng-admin/src/main/resources/application-test.yml

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/resources/application-dev.yml View File

# DSP服务域名 # DSP服务域名
dsp-domain-url: https://dsp.t-aaron.com/ dsp-domain-url: https://dsp.t-aaron.com/
# DSP回调地址 # DSP回调地址
dsp-callback-url: https://192.168.11.11:9055/api/dsp/{requestId}/callback
dsp-callback-url: https://192.168.11.11:9177/dsp/callback/{requestId}
#飞手平台地址 #飞手平台地址
pilot-url: http://192.168.11.11:7011/pilot/web/ pilot-url: http://192.168.11.11:7011/pilot/web/
# 文件配置 # 文件配置

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/resources/application-local.yml View File

# DSP服务域名 # DSP服务域名
dsp-domain-url: http://192.168.11.241:7011/ dsp-domain-url: http://192.168.11.241:7011/
# DSP回调地址 # DSP回调地址
dsp-callback-url: https://127.0.0.1:9055/api/dsp/{requestId}/callback
dsp-callback-url: https://127.0.0.1:9117/dsp/callback/{requestId}
#飞手平台地址 #飞手平台地址
pilot-url: http://192.168.11.241:7011/pilot/web/ pilot-url: http://192.168.11.241:7011/pilot/web/
# 文件配置 # 文件配置

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/resources/application-prod.yml View File

# DSP服务域名 # DSP服务域名
dsp-domain-url: https://dsp-portal.t-aaron.com/ dsp-domain-url: https://dsp-portal.t-aaron.com/
# DSP回调地址 # DSP回调地址
dsp-callback-url: https://hhz.t-aaron.com/api/dsp/{requestId}/callback
dsp-callback-url: https://freeway.t-aaron.com/freeway/admin/dsp/callback/{requestId}
#飞手平台地址 #飞手平台地址
pilot-url: https://pilot.t-aaron.com/pilot/web/ pilot-url: https://pilot.t-aaron.com/pilot/web/
# 文件配置 # 文件配置

+ 4
- 4
tuoheng-service/tuoheng-admin/src/main/resources/application-test.yml View File



# 自定义配置 # 自定义配置
tuoheng: tuoheng:
oidc-url: http://172.15.1.11:7011
oidc-url: http://106.15.64.139:7011
# 图片域名 # 图片域名
image-url: https://image.t-aaron.com/ image-url: https://image.t-aaron.com/
# OSS域名 # OSS域名
# 通道地址 # 通道地址
live-channel-domain-url: https://streaming.t-aaron.com/ live-channel-domain-url: https://streaming.t-aaron.com/
# DSP服务域名 # DSP服务域名
dsp-domain-url: http://192.168.11.241:7011/
dsp-domain-url: http://172.15.1.11:7011/
# DSP回调地址 # DSP回调地址
dsp-callback-url: http://192.168.11.241:9055/api/dsp/{requestId}/callback
dsp-callback-url: https://freeway-test.t-aaron.com/freeway/admin/dsp/callback/{requestId}
#飞手平台地址 #飞手平台地址
pilot-url: http://192.168.11.241:7011/pilot/web/
pilot-url: http://172.15.1.11:7011/pilot/web/
# 文件配置 # 文件配置
uploads: uploads:
#上传的服务器上的映射文件夹 #上传的服务器上的映射文件夹

Loading…
Cancel
Save