diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java index 4f59fe761..354e4c4ff 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java @@ -13,7 +13,7 @@ import java.util.*; */ public class BaiDuApiUtils { - private static String AK = "9E99D3540e4dafb7894f7b9fe27fa6b5"; + private static String AK = "ajgWIBd9rYsXed1hcDQqYvkX"; public static String[] AKS = new String[]{"hj5KqPjaGA3uivtg8uS8XfAnj9X1kPMr","xjFg7DfDqvQleIZasM3ph8Zi2Lw8kgCg", "4pb6fzrWIzvibDu8L1o8DGoY2h1wRIUq","ZzX6mRFfE5GKn4cpUp24Q3OyUIHnfQAR","79ac4ea49e7dedbf80b0ecd475d07784", "9E99D3540e4dafb7894f7b9fe27fa6b5","W3M5uHfcrmlAdhQjf6v93LCI", "C8bb035aacf602551e829e4c64575224", diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index c51c573f7..bec6487c4 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -1435,6 +1435,25 @@ public class DataUtil { return null; } + /** + * 匹配符合条件的字符串 + * + * @param str + * @param pattern + * @return + */ + public static List matchAll(String str, Pattern pattern) { + if (str == null) { + return null; + } + List list = new ArrayList(); + Matcher matcher = pattern.matcher(str); + while (matcher.find()) { + list.add(matcher.group()); + } + return list; + } + public static boolean isNumeric(String str) { try { Double.parseDouble(str); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java index a24864225..509490d97 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/ExcelUtil.java @@ -58,7 +58,7 @@ public class ExcelUtil { row.setHeightInPoints(35); Font font = workBook.createFont(); font.setFontName("宋体"); - font.setBoldweight(Font.BOLDWEIGHT_BOLD); + // font.setBoldweight(Font.BOLDWEIGHT_BOLD); font.setFontHeightInPoints((short) 12); CellStyle cellStyle = workBook.createCellStyle(); cellStyle.setFont(font); diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java index 25f4d5a12..234c29d79 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/RandomUtil.java @@ -39,7 +39,7 @@ public final class RandomUtil extends RandomUtils { public static void main(String[] args) { for (int i = 0; i < 1000; i++) { - System.out.println(random(0, 10)); + System.out.println(random(-9, 9)); } } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java index c5991df90..8283df958 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java @@ -102,6 +102,8 @@ public class FjtEvaluation implements SqlEntity{ private String finishDateStr;//竣工时间 private String useType;//房屋用途 + + private Date downPdfDate;//下载报告时间 @GeneratedValue(strategy = GenerationType.AUTO) @Id @@ -750,6 +752,16 @@ public class FjtEvaluation implements SqlEntity{ this.useType = useType; } + + @Column(name = "down_pdf_date") + public Date getDownPdfDate() { + return downPdfDate; + } + + public void setDownPdfDate(Date downPdfDate) { + this.downPdfDate = downPdfDate; + } + @Override public String toString() { return "FjtEvaluation{" + diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java index e1064e8cd..c13a28b36 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java @@ -38,6 +38,7 @@ public class OpenConfig extends Configuration { private final String ipdatfile; private final String baiduAk; + private final String defaultCity; private final boolean isOpenAllAuthority; @@ -54,6 +55,7 @@ public class OpenConfig extends Configuration { baiduAk = configuration.get("fangjia.baidu.ak"); isOpenAllAuthority = configuration.getBoolean("fangjia.isOpenAllAuthority", false); enabledAddressMatch = configuration.getBoolean("fangjia.addressMatch.enabled",false); + defaultCity = configuration.get("fangjia.default.city"); } public static OpenConfig getConfig() { @@ -134,4 +136,7 @@ public class OpenConfig extends Configuration { return enabledAddressMatch; } + public String getDefaultCity() { + return defaultCity; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 907212d5f..af890d880 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -89,6 +89,7 @@ import com.fangjia.service.mongo.fangjia.ServerAreaService; import com.fangjia.service.open.WaitCrawlKeywordsService; import com.fangjia.service.sql.FjtEvaluationService; import com.fangjia.service.web.AddressService; +import org.sothis.web.mvc.annotation.Param; @Authority(role = Role.USER) public class AddressController { @@ -106,6 +107,7 @@ public class AddressController { private HouseLoudongService houseLoudongService; private FjtEvaluationService fjtEvaluationService; private AddressMatchProxyService addressMatchProxyService; + private final static String AK = OpenConfig.getConfig().getBaiduAk(); private final static Logger LOGGER = LoggerFactory.getLogger(AddressController.class); @@ -117,6 +119,8 @@ public class AddressController { private static final String GRADE_NATION = "全国评分"; private static final String GRADE_CONSUME = "消费评分"; + public final static OpenConfig CONFIG = OpenConfig.getConfig(); + /** * @deprecated see parse2Action * @param model @@ -1705,6 +1709,228 @@ public class AddressController { return mav; } + /** + * 地址标准化接口V2 + * + * @param model + * @return + */ + public Object standard2Action(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch(Exception ex){ + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 五级地址标准化接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch(Exception ex){ + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 五级行政区划V2地址标准化接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructure2Action(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + } catch(Exception ex){ + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 详细地址标准化接口 + * + * @param model + * @return + */ + public Object divisionStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch(Exception ex){ + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址标准化专用测试接口 + * @param model + * @return + */ + public Object structureAndCompleteAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + } catch(Exception ex){ + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + public Object similarityAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 1ba157ee5..f6e9855f0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -2363,7 +2363,7 @@ public class PropertyController { mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); return mav; } - District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), + District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName().replace(" ",""), "district"); if (null == district) { mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java index 4cc728b6a..826c55070 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java @@ -80,7 +80,7 @@ public class DistrictController { // response.sendRedirect("/coming"); // return null; // } - if("b".equals(login_user_type)){ + if("b".equals(login_user_type) || "gb".equals(login_user_type)){ CacheUtils.putValue(CachePolicyEnum.LONG, UsersInfoService.class, weiXinId + "_city_"+ login_user_type , model.getCityName()); } Long userId = Long.parseLong(CookieUtils.getCookieValue(request,"login_user_id")); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 81419d5e4..e97bc10ae 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -80,7 +80,19 @@ public class UserController { } else { weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); } + + String cacheWeiXinId = CookieUtils.getCookieValue(request,"login_enterpriseuser_weixinid"); + try { + if(StringUtils.isNotBlank(weiXinId) && StringUtils.isNotBlank(cacheWeiXinId)){ + System.out.println("cookie weiXinId:"+weiXinId); + response.sendRedirect("reqCityChoicePage?type=b&code="+model.getCode()); + } + } catch (IOException e) { + e.printStackTrace(); + } + if(weiXinId == null && StringUtils.isNotBlank(model.getCode())) {//微信公众号渤海银行 + System.out.println("bh OPEN_ID 随机生成:" + weiXinId); weiXinId = DataConvertUtil.getRandomString2(16); } if(weiXinId != null && !weiXinId.equals("")){ @@ -115,33 +127,49 @@ public class UserController { if(weiXinId != null && !weiXinId.equals("")){ CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); } - System.out.println("微信OPEN_ID:" + weiXinId); + System.out.println("reqCityChoicePage 微信OPEN_ID:" + weiXinId); //企业用户入口查询企业账户开通的城市 - if(type.equals("b")){ + if(type.equals("b") || type.equals("gb")){ //Boolean isLogin = usersInfoService.checkEnterpriseWeiXinUserIsLogin(weiXinId); String cacheWeiXinId = CookieUtils.getCookieValue(request,"login_enterpriseuser_weixinid"); - if(cacheWeiXinId != null) { - Long userId = Long.parseLong(CookieUtils.getCookieValue(request,"login_user_id")); + String loginUserIdstr = CookieUtils.getCookieValue(request,"login_user_id"); + if(cacheWeiXinId != null && StringUtils.isNotBlank(loginUserIdstr)) { + Long userId = Long.parseLong(loginUserIdstr); CookieUtils.setCookie("login_user_id", userId + "", "/", 60 * 60 * 24 *7, response); try { FjtUsers users = fjtUsersService.findById(userId); - List citys = userCityService.findSupportCityByUserId(userId); - if(citys == null || citys.isEmpty()){ - citys = Arrays.asList("上海"); - } + + if(users.getRole()==17 && type.equals("gb")){ + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); + response.sendRedirect("reqLoginPage"); + }else if(users.getRole()==12 && type.equals("b")){ + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); + response.sendRedirect("bhydLoginPage?code="+model.getCode()); + }else{ + List citys = userCityService.findSupportCityByUserId(userId); + if(citys == null || citys.isEmpty()){ + citys = Arrays.asList("上海"); + } // if(users!=null && users.getRole() == 12){ // citys = Arrays.asList("上海"); // }else{ // citys = userCityService.findSupportCityByUserId(userId); // } - model.setCitys(citys); + model.setCitys(citys); + } } catch (Exception e) { model.setCitys(new ArrayList()); } } else { + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); try { - response.sendRedirect("reqLoginPage"); +// if(type.equals("bh")){ +// response.sendRedirect("bhydLoginPage?code="+model.getCode()); +// }else{ + response.sendRedirect("reqLoginPage"); +// } + } catch (IOException e) { } } @@ -173,6 +201,20 @@ public class UserController { } catch (Exception e) { } } + + public Object bhloginOutAction(UserModel model,HttpServletRequest request, HttpServletResponse response, String city) { + try { + CookieUtils.removeCookie(request, response,"login_user_id"); + CookieUtils.removeCookie(request, response,"login_user_type"); + CookieUtils.removeCookie(request, response,"login_enterpriseuser_weixinid"); + response.sendRedirect("bhydLoginPage?code=bhydcode"); + } catch (Exception e) { + e.printStackTrace(); + } + return model; + } + + public Object aboutAction(UserModel model) { return model; @@ -285,7 +327,7 @@ public class UserController { return resultModel; } CookieUtils.setCookie("login_user_id", user.getId() + "", "/", 60 * 60 * 24 *7, response); - CookieUtils.setCookie("login_user_type", "b", "/", 60 * 60 * 24 *7, response); + CookieUtils.setCookie("login_user_type", "gb", "/", 60 * 60 * 24 *7, response); CookieUtils.setCookie("login_enterpriseuser_weixinid", weiXinId, "/", 60 * 60 * 24 *7, response); //CacheUtils.putValue(CachePolicyEnum.LONG, UsersInfoService.class, weiXinId + "_" + Message.SMS_CODE_TYPE_ENTER_LOGIN , user.getId()); resultModel.setResult(Message.RESULT_SUCCESS); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index 6e72df050..272979fca 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -454,14 +454,22 @@ public class WeiXinEvaluationController { System.out.println("渤海地址搜索 "+evaluation.getAddress()); List bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getAddress()); JSONObject o = null; - if(bhDists.size()<1){ + if(bhDists.size()==0){ bhDists = BHBankUtils.getDistrictByBhbank(district.getName()); + } + if(bhDists.size()==1){ o = bhDists.get(0); }else if(bhDists.size()>1){ int mod = Integer.MAX_VALUE; for(JSONObject jo : bhDists){ - double price = Double.valueOf((String)jo.get("price")); - int bhprice = (int)price; + int bhprice = 0; + if (jo.get("price") == null || jo.get("price").equals("null")) { + bhprice = 0; + } else { + double price = Double.valueOf((String)jo.get("price")); + bhprice = (int)price; + } + int bhmod = Math.abs(bhprice - avgPrice); if(bhmod0){ - params.put("groundArea", String.valueOf(ev.getHouseArea())); + if(ev.getBasementArea()!=null && ev.getBasementArea()>0){ + double area = ev.getHouseArea() - ev.getBasementArea(); + if(area>0){ + params.put("groundArea", String.valueOf(area)); + } + }else{ + params.put("groundArea", String.valueOf(ev.getHouseArea())); + } } + if(ev.getBasementArea()!=null && ev.getBasementArea()>0){ + params.put("undergroundArea", String.valueOf(ev.getBasementArea())); + } + params.put("orientName", "南"); params.put("buildYear", ev.getFinishDateStr()); fjwTotalPrice= (int)(fjwTotalPrice/10000) * 10000; @@ -430,7 +441,7 @@ public class BHBankUtils { Map params = new HashMap(); params.put("queryId",queryId); if(StringUtils.isNotBlank(reportMsg)){ - params.put("reportMsg",reportMsg); + params.put("reportMsg",reportMsg.replace(" ","")); } diff --git a/projects/fangjia-open/src/main/resources/fangjia-open.properties b/projects/fangjia-open/src/main/resources/fangjia-open.properties index aaf6af5ca..c7d4d526c 100644 --- a/projects/fangjia-open/src/main/resources/fangjia-open.properties +++ b/projects/fangjia-open/src/main/resources/fangjia-open.properties @@ -100,4 +100,5 @@ fangjia.jms.email.queue=email.queue fangjia.redis_nodes=192.168.0.79:6379,192.168.0.79:6380,192.168.0.79:6381,192.168.0.81:6382,192.168.0.81:6383,192.168.0.81:6384 -fangjia.fangjiatong.url = http://user.fangjia.com/fangjiatong2 \ No newline at end of file +fangjia.fangjiatong.url = http://user.fangjia.com/fangjiatong2 +fangjia.default.city = \u91CD\u5E86\u5E02 \ No newline at end of file diff --git a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml index fb8d631db..c17530d88 100644 --- a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml @@ -1,8 +1,8 @@ - - + + @@ -33,5 +33,15 @@ /property/avgPrice + + + /address/standard + + + + + /address/fiveDivisionStructure + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/district/weXinList.ftl b/projects/fangjia-open/src/main/webapp/district/weXinList.ftl index 3e07b5ef4..46ef7c552 100644 --- a/projects/fangjia-open/src/main/webapp/district/weXinList.ftl +++ b/projects/fangjia-open/src/main/webapp/district/weXinList.ftl @@ -26,7 +26,7 @@
- + <#if !(cityName??) || cityName == ""> <#else> @@ -48,7 +48,7 @@
    - <#if type?? && type == 'b'> + <#if type?? && (type == 'b' || type == 'gb')>
    - <#if type?? && type == 'b' && (citys??&&citys?size>0)> + <#if type?? && (type == 'b' || type == 'gb') && (citys??&&citys?size>0)>
    <#list citys as bo>

    ${bo}

    @@ -54,7 +54,7 @@
    - <#if type?? && type == 'c' || type == 'b' && (citys??&&citys?size=0)> + <#if type?? && type == 'c' || (type == 'b' || type == 'gb') && (citys??&&citys?size=0)>
    褰撳墠瀹氫綅鍩庡競
    diff --git a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl index 621633126..f9d2c03e3 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl @@ -84,7 +84,7 @@ if(re.result == "fail"){ $.toast(re.msg); } else { - window.location.href = "reqCityChoicePage?type=b"; + window.location.href = "reqCityChoicePage?type=gb"; } },error:function (data, status) { $.toast("鍙戦�佸け璐ワ紝璇烽噸璇�"); diff --git a/projects/fangjia-open/src/main/webapp/user/setup.ftl b/projects/fangjia-open/src/main/webapp/user/setup.ftl index a173193de..797f87a6c 100644 --- a/projects/fangjia-open/src/main/webapp/user/setup.ftl +++ b/projects/fangjia-open/src/main/webapp/user/setup.ftl @@ -67,7 +67,7 @@
    +
  • +
    +
    + *寤虹瓚闈㈢Н涓惈鏈夊湴涓嬮檮灞為潰绉� +
    +
    +
  • diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index e70200bda..165012ff6 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -44,7 +44,7 @@ <#if role?? && role==17 && loanInfoMap??>

    鎵�灞炲垎绫伙細${loanInfoMap.type!}绫�

    鍙捶鎴愭暟锛�${loanInfoMap.loan_ratio!}鎴�

    -

    鍙捶閲戦锛�${(fjtEvaluation.totalPrice*loanInfoMap.loan_ratio*0.1/10000)?string('0.##')}涓囧厓

    +

    鍙捶閲戦锛�${(bohaiEvaluationAudit.inquirePrice*loanInfoMap.loan_ratio*0.1/10000)?string('0.##')}涓囧厓

    璐锋鍒╃巼锛�4.5%

    <#else> @@ -88,7 +88,7 @@
    鏈熸湜浠凤細 -  涓囧厓 + disabled> 涓囧厓 鎻愪氦 鍒锋柊
    diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index ee26c1830..c71006bb8 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.fangjia fangjia-script @@ -62,7 +62,7 @@ - org.eclipse.m2e @@ -141,11 +141,11 @@ activemq-pool 5.5.0 - - cn.emay - emayclient - 4.3 - + + cn.emay + emayclient + 4.3 + org.apache.activemq activemq-core @@ -366,18 +366,20 @@ org.apache.poi poi + 3.10-FINAL org.apache.poi poi-ooxml + 3.10-FINAL - - - xml-apis - xml-apis - - + + + xml-apis + xml-apis + +