Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/baidu/service/impl/BdApiServiceImpl.java

@@ -11,6 +11,7 @@ import com.fs.common.exception.base.BaseException;
 import com.fs.common.utils.DateUtils;
 import org.apache.commons.text.StringSubstitutor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.fs.baidu.mapper.BdApiMapper;
 import com.fs.baidu.domain.BdApi;
@@ -28,6 +29,9 @@ public class BdApiServiceImpl extends ServiceImpl<BdApiMapper, BdApi> implements
 
     private final String OAUTH_URL = "https://u.baidu.com/oauth/page/index?platformId=4960345965958561794&appId={appId}&scope={scope}&state={state}&callback={callback}";
 
+    @Value("${baidu.back-domain}")
+    private String backDomain;
+
     /**
      * 查询百度信息
      * 
@@ -117,7 +121,7 @@ public class BdApiServiceImpl extends ServiceImpl<BdApiMapper, BdApi> implements
         params.put("appId", api.getAppId());
         params.put("scope", "65,66,67,68,69,70,1009333,1009334,71,72,1009335,73,74,75,1001788,1001789,1001455,1001790,1001791,1002161,1002829,1004606");
         params.put("state", id.toString());
-        params.put("callback", "https://bd.runtzh.com/prod-api/baiduBack/callback");
+        params.put("callback", "http://" + backDomain +"/prod-api/baiduBack/callback");
         String filledUri = UriComponentsBuilder
                 .fromUriString(OAUTH_URL)
                 .buildAndExpand(params)

fs-service/src/main/resources/application-config-dev.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-fcky.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-hcl.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-hdt.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 1231323123
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-hzyy.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-jnmy.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-jzzx.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-sft.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 1231321232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-sxjz.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-xfk.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid-yzt.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 1231321232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-druid.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level:

fs-service/src/main/resources/application-config-myhk.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 1231321232
+  back-domain: admin.muyi88.com
 #配置
 logging:
   level:

fs-service/src/main/resources/config/dev/application-config-dev.yml

@@ -1,5 +1,6 @@
 baidu:
   token: 12313231232
+  back-domain: https://www.xxxx.com
 #配置
 logging:
   level: