Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/resources/application-dev.yml

@@ -138,7 +138,7 @@ tuoheng:
   # DSP服务域名
   dsp-domain-url: https://dsp.t-aaron.com/
   # 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/
   # 文件配置

tuoheng-service/tuoheng-admin/src/main/resources/application-local.yml

@@ -144,7 +144,7 @@ tuoheng:
   # DSP服务域名
   dsp-domain-url: http://192.168.11.241:7011/
   # 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/
   # 文件配置

tuoheng-service/tuoheng-admin/src/main/resources/application-prod.yml

@@ -139,7 +139,7 @@ tuoheng:
   # DSP服务域名
   dsp-domain-url: https://dsp-portal.t-aaron.com/
   # 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/
   # 文件配置

tuoheng-service/tuoheng-admin/src/main/resources/application-test.yml

@@ -125,7 +125,7 @@ file:
 
 # 自定义配置
 tuoheng:
-  oidc-url: http://172.15.1.11:7011
+  oidc-url: http://106.15.64.139:7011
   # 图片域名
   image-url: https://image.t-aaron.com/
   # OSS域名
@@ -137,11 +137,11 @@ tuoheng:
   # 通道地址
   live-channel-domain-url: https://streaming.t-aaron.com/
   # DSP服务域名
-  dsp-domain-url: http://192.168.11.241:7011/
+  dsp-domain-url: http://172.15.1.11:7011/
   # 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:
     #上传的服务器上的映射文件夹