Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

 fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java

@@ -90,7 +90,7 @@
      String cartJS = configService.get("taobao_cart_js");

      String js = null;

      try {

          js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),

         js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),

               StringUtil.getBase64String("*M#34f?,"));

      } catch (Exception e) {

         e.printStackTrace();

@@ -101,4 +101,22 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



   /**

    * 获取账号绑定中的配置信息

    * 
    * @param acceptData

    * @param uid

    * @param out

    */



   @RequestMapping(value = "getBindAccountConfig", method = RequestMethod.POST)

   public void getBindAccountConfig(AcceptData acceptData, PrintWriter out) {

      String alipayHelpUrl = configService.get("alipay_help");// 支付宝帮助

      String alipayBindFailUrl = configService.get("alipay_bind_fail_reason");// 支付宝绑定失败原因

      JSONObject data = new JSONObject();

      data.put("alipayHelp", alipayHelpUrl);

      data.put("alipayBindFailReason", alipayBindFailUrl);

      out.print(JsonUtil.loadTrueResult(data));

   }



}