Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java

 import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.eContract.service.ITaCompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.sample.mapper.TaContactMapper;
 import jodd.util.URLDecoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
     @Autowired
     private TaCompanySealUtil taCompanySealUtil;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
     /**
      * 在法大大创建一个新的企业信息
      *
     public TaCompany newFirstCompanyInfo() throws Exception {
         log.info("========法大大企业注册=======");
         //在法大大注册企业用户
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fddServerHost);
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         String open_id = "CJ_" + HttpsUtil.getTimeStamp();
         String account_type = CommConstant.ACCOUNT_TYPE_COMPANY;
         String result =base.invokeregisterAccount(open_id,account_type);
         }
         log.info("正在申请企业认证,客户编码是{}",taCompany.getFadadaCode());
         //和法大大申请认证页面
-        GetCompanyVerifyUrl comverify = new GetCompanyVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fddServerHost);
+        GetCompanyVerifyUrl comverify = new GetCompanyVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         //客户编号必填
         String customer_id = taCompany.getFadadaCode();
         /**
     public TaCompany updateCompanyInfoByFdd(Integer id) throws Exception {
         TaCompany taCompany = taCompanyMapper.selectById(id);
         log.info("企业正在从法大大获取最新数据，企业编号是 {}", taCompany.getFadadaCode());
-        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fddServerHost);
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         String verified_serialno = taCompany.getCertifiedSerialNumber();
         String result = personCertInfo.invokeFindPersonCert(verified_serialno, CommConstant.ACCOUNT_TYPE_COMPANY);
         log.info("企业最新数据结果 {}",result);
         bizContent = new String(Base64.decodeBase64(bizContent.getBytes()));
         return bizContent;
     }
+
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf(File.separator);
+        int twoIndex = subUrl.indexOf(File.separator,index);
+        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
 }