diff --git a/src/main/java/com/ynxbd/common/TestA.java b/src/main/java/com/ynxbd/common/TestA.java
index 891f0d1..d517c40 100644
--- a/src/main/java/com/ynxbd/common/TestA.java
+++ b/src/main/java/com/ynxbd/common/TestA.java
@@ -2,11 +2,8 @@ package com.ynxbd.common;
 
 import com.ynxbd.wx.wxfactory.AesWxHelper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 
 import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
 
 
 @Slf4j
@@ -14,8 +11,7 @@ public class TestA {
 
     public static void main(String[] args) throws UnsupportedEncodingException {
 
-        System.out.println(AesWxHelper.encode("397631"));
+//        System.out.println(AesWxHelper.decode(""));
     }
 
-
 }
diff --git a/src/main/java/com/ynxbd/common/action/ExtAction.java b/src/main/java/com/ynxbd/common/action/ExtAction.java
index 36a831b..b76ca47 100644
--- a/src/main/java/com/ynxbd/common/action/ExtAction.java
+++ b/src/main/java/com/ynxbd/common/action/ExtAction.java
@@ -49,6 +49,8 @@ public class ExtAction extends BaseAction {
                 params.append(",");
             }
         }
-        return Result.redirect(WeChatConfig.getDomain(false) + ":9899/?id=" + params);
+        String domain = WeChatConfig.getDomain(false);
+        domain = domain.replaceAll("https://", "http://");
+        return Result.redirect(domain + ":9899/?id=" + params);
     }
 }
diff --git a/src/main/java/com/ynxbd/common/action/HealthCodeAction.java b/src/main/java/com/ynxbd/common/action/HealthCodeAction.java
index 2703972..a43ed3a 100644
--- a/src/main/java/com/ynxbd/common/action/HealthCodeAction.java
+++ b/src/main/java/com/ynxbd/common/action/HealthCodeAction.java
@@ -11,10 +11,7 @@ import com.ynxbd.common.bean.enums.HealthCardRespCodeEnum;
 import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.PatientDao;
 import com.ynxbd.common.dao.his.HisPatientDao;
-import com.ynxbd.common.helper.common.DateHelper;
-import com.ynxbd.common.helper.common.ErrorHelper;
-import com.ynxbd.common.helper.common.IDNumberHelper;
-import com.ynxbd.common.helper.common.ValidHelper;
+import com.ynxbd.common.helper.common.*;
 import com.ynxbd.common.result.Result;
 import com.ynxbd.common.result.ResultEnum;
 import com.ynxbd.common.service.HCodeService;
diff --git a/src/main/java/com/ynxbd/common/action/InHospAction.java b/src/main/java/com/ynxbd/common/action/InHospAction.java
index 346dbca..8c8aa13 100644
--- a/src/main/java/com/ynxbd/common/action/InHospAction.java
+++ b/src/main/java/com/ynxbd/common/action/InHospAction.java
@@ -5,18 +5,20 @@ import com.ynxbd.common.bean.in_hosp.*;
 import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.his.HisInHospDao;
 import com.ynxbd.common.helper.common.DateHelper;
-import com.ynxbd.common.helper.common.JsonHelper;
 import com.ynxbd.common.result.JsonResult;
 import com.ynxbd.common.result.Result;
 import com.ynxbd.common.result.ResultEnum;
 import com.ynxbd.wx.wxfactory.AesWxHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 住院接口
@@ -46,7 +48,6 @@ public class InHospAction extends BaseAction {
         }
 
         JsonResult resp = new HisInHospDao().getPreMoneyList(patientId);
-
         List<InHosp> resultList = new ArrayList<>();
         if (!resp.success()) {
             log.info("[住院]交金缴费记录查询失败信息：{}", resp.getMessage());
@@ -100,45 +101,6 @@ public class InHospAction extends BaseAction {
         return Result.success(inHospSummaryFee);
     }
 
-    /**
-     * [住院]查询住院费用清单
-     *
-     * @param date      查询日期（空为查询所有）
-     * @param patientId 患者id
-     */
-    @Action("getInHospFee")
-    public Result getInHospFee(String date, @AesDecode String patientId) {
-        log.info("[住院]查询住院费用清单 patientId={}, date={}", patientId, date);
-        if (patientId == null) {
-            return Result.error(ResultEnum.PARAM_IS_DEFECT);
-        }
-
-        JsonResult resp = new HisInHospDao().getInHospFee(patientId, date);
-        if (!resp.success()) {
-            return Result.error(resp.getMessage());
-        }
-
-        InHospFee inHospFee = new InHospFee();
-        List<InHospFeeItem> items = resp.getDataMapList(InHospFeeItem.class, "Item");
-        items.forEach(item -> {
-            BigDecimal price = item.getPrice();
-            Integer count = item.getCount();
-            if (price != null && count != null) {
-                item.setPayMoney(price.multiply(new BigDecimal(count)));
-            }
-        });
-
-        inHospFee.setItems(items);
-        inHospFee.setPatientName(resp.getDataMapString("PatientName"));
-        inHospFee.setAdmissionDate(resp.getDataMapString("AdmissionDate"));
-        inHospFee.setAdmissionDeptName(resp.getDataMapString("AdmissionDeptName"));
-        inHospFee.setStayDeptName(resp.getDataMapString("StayDeptName"));
-        inHospFee.setAttendingPhysician(resp.getDataMapString("setAttendingPhysician"));
-        inHospFee.setLengthOfStay(resp.getDataMapString("LengthOfStay"));
-        inHospFee.setTotalHospitalization(resp.getDataMapBigDecimal("TotalHospitalization"));
-        return Result.success(inHospFee);
-    }
-
 
     /**
      * [住院]通过住院号查询患者信息(含预交金)
@@ -172,8 +134,8 @@ public class InHospAction extends BaseAction {
      * @param endDate     结束日期
      * @param inHospState { 0 | null 查询所有；1:只查询在院记录； }
      */
-    @Action("getInHospByPatientId")
-    public Result getInHospByPatientId(@AesDecode String patientId, String begDate, String endDate, String inHospState) {
+    @Action("getInHospRecords")
+    public Result getInHospRecords(@AesDecode String patientId, String begDate, String endDate, String inHospState) {
         log.info("[住院]通过患者ID查询在院患者信息 patientId={}, endDate={}, endDate={}", patientId, begDate, endDate);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -215,46 +177,105 @@ public class InHospAction extends BaseAction {
     }
 
     /**
-     * [住院]通过患者ID查询住院记录
+     * [住院]通过患者ID查询住院记录（出院后）
      *
      * @param patientId 患者Id
      * @return 住院记录
      */
-    @Action("getHospListByPatientId")
-    public Result getHospListByPatientId(@AesDecode String patientId) {
-        log.info("[住院]通过患者ID查询住院记录 patientId-{}", patientId);
+    @Action("getOutHospRecords")
+    public Result getOutHospRecords(@AesDecode String patientId, String begDate, String endDate) {
+        log.info("[住院]通过患者ID查询住院记录（出院后） patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
+
         JsonResult resp = new HisInHospDao().getAllHospList(patientId);
         if (!resp.success()) {
             return Result.error(resp.getMessage());
         }
+
         List<InHospitalList> dataList = resp.getDataMapList(InHospitalList.class, "Items", "Item");
+
+        boolean hasDateRange = (!ObjectUtils.isEmpty(begDate) && !ObjectUtils.isEmpty(endDate));
+
+        List<InHospitalList> records = new ArrayList<>();
+        String inHospitalDate, outHospitalDate;
         for (InHospitalList item : dataList) {
-            item.setEnTreatNum(AesWxHelper.encode(item.getZyNum()));
+            if (hasDateRange) { // 有日期范围
+                inHospitalDate = item.getInHospitalDate();
+                outHospitalDate = item.getOutHospitalDate();
+                if ((!ObjectUtils.isEmpty(inHospitalDate) && DateHelper.inDateRange(begDate, endDate, inHospitalDate, DateHelper.DateEnum.yyyy_MM_dd)) ||
+                        (!ObjectUtils.isEmpty(outHospitalDate) && DateHelper.inDateRange(begDate, endDate, outHospitalDate, DateHelper.DateEnum.yyyy_MM_dd))) {
+                    item.setEnTreatNum(AesWxHelper.encode(item.getZyNum()));
+                    records.add(item);
+                }
+            } else {
+                item.setEnTreatNum(AesWxHelper.encode(item.getZyNum()));
+                records.add(item);
+            }
         }
-        return Result.success(dataList);
+
+        records = records.stream().sorted(Comparator.comparing(InHospitalList::getInHospitalDate, Comparator.reverseOrder())).collect(Collectors.toList());
+        return Result.success(records);
     }
 
     /**
-     * [住院]通过住院号查询所有费用明细
+     * [住院]查询住院费用清单（住院中）
+     *
+     * @param date      查询日期（空为查询所有）
+     * @param patientId 患者id
+     */
+    @Action("getInPatientFee")
+    public Result getInPatientFee(@AesDecode String patientId, String date) {
+        log.info("[住院]查询住院费用清单 patientId={}, date={}", patientId, date);
+        if (patientId == null) {
+            return Result.error(ResultEnum.PARAM_IS_DEFECT);
+        }
+
+        JsonResult resp = new HisInHospDao().getInPatientFee(patientId, date);
+        if (!resp.success()) {
+            return Result.error(resp.getMessage());
+        }
+
+        InHospFee inHospFee = new InHospFee();
+        List<InHospFeeItem> items = resp.getDataMapList(InHospFeeItem.class, "Item");
+        items.forEach(item -> {
+            BigDecimal price = item.getPrice();
+            Integer count = item.getCount();
+            if (price != null && count != null) {
+                item.setMoney(price.multiply(new BigDecimal(count)));
+            }
+        });
+
+        inHospFee.setItems(items);
+        inHospFee.setPatientName(resp.getDataMapString("PatientName"));
+        inHospFee.setAdmissionDate(resp.getDataMapString("AdmissionDate"));
+        inHospFee.setAdmissionDeptName(resp.getDataMapString("AdmissionDeptName"));
+        inHospFee.setStayDeptName(resp.getDataMapString("StayDeptName"));
+        inHospFee.setAttendingPhysician(resp.getDataMapString("setAttendingPhysician"));
+        inHospFee.setLengthOfStay(resp.getDataMapString("LengthOfStay"));
+        inHospFee.setTotalHospitalization(resp.getDataMapBigDecimal("TotalHospitalization"));
+        return Result.success(inHospFee);
+    }
+
+
+    /**
+     * [住院]通过住院号查询所有费用明细（已出院 | 未出院不知道能不能查）
      *
      * @param treatNum 住院号
      * @return 费用明细
      */
-    @Action("getAllFeeByTreat")
-    public Result getAllFeeByTreat(@AesDecode String treatNum) {
-        log.info("[住院]通过住院号查询所有费用明细  treatNum-{}", treatNum);
+    @Action("getOutHospTreatFee")
+    public Result getOutHospTreatFee(@AesDecode String treatNum) {
+        log.info("[住院]通过住院号查询所有费用明细 treatNum={}", treatNum);
         if (treatNum == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
-        JsonResult resp = new HisInHospDao().getAllFee(treatNum);
+        JsonResult resp = new HisInHospDao().getOutHospTreatFee(treatNum);
         if (!resp.success()) {
             return Result.error(resp.getMessage());
         }
         List<InHospAllFee> dataList = resp.getDataMapList(InHospAllFee.class, "Items", "Item");
         return Result.success(dataList);
     }
-
 }
diff --git a/src/main/java/com/ynxbd/common/action/RecipeAction.java b/src/main/java/com/ynxbd/common/action/RecipeAction.java
index 4ac863e..52cdd27 100644
--- a/src/main/java/com/ynxbd/common/action/RecipeAction.java
+++ b/src/main/java/com/ynxbd/common/action/RecipeAction.java
@@ -234,7 +234,7 @@ public class RecipeAction extends BaseAction {
      * @param pageSize  每页数量
      * @param pyCode    拼音码
      * @param type      类型 {1:检查治疗; 2:药品材料; 99:全部}
-     * @param groupFlag 组套标识 { 0：不含组套； 1：包含组套 }
+     * @param groupFlag 检查治疗是否包含组套项目 [0:否；1:是（不传时默认值）]
      * @return 结果
      */
     @Action("getStandardPrice")
diff --git a/src/main/java/com/ynxbd/common/action/RegisterAction.java b/src/main/java/com/ynxbd/common/action/RegisterAction.java
index ee77ddc..8c5bfac 100644
--- a/src/main/java/com/ynxbd/common/action/RegisterAction.java
+++ b/src/main/java/com/ynxbd/common/action/RegisterAction.java
@@ -229,7 +229,7 @@ public class RegisterAction extends BaseAction {
     @Action("getHisRegHistoryRecords")
     public Result getHisRegHistoryRecords(String begDate, String endDate, @AesDecode String patientId) {
         try {
-            log.info("[挂号]查询挂号记录 patientId={}, begDate={},endDate={}", patientId, begDate, endDate);
+            log.info("[挂号]查询挂号记录 patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
             if (patientId == null || begDate == null || endDate == null) {
                 return Result.error(ResultEnum.PARAM_IS_DEFECT);
             }
@@ -246,7 +246,7 @@ public class RegisterAction extends BaseAction {
      */
     @Action("getHisRegReserveRecords")
     public Result getHisRegReserveRecords(String begDate, String endDate, @AesDecode String patientId) {
-        log.info("[预约挂号]查询预约记录 patientId={}, begDate={},endDate={}", patientId, begDate, endDate);
+        log.info("[预约挂号]查询预约记录 patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
diff --git a/src/main/java/com/ynxbd/common/action/pay/PayAction.java b/src/main/java/com/ynxbd/common/action/pay/PayAction.java
index d5f496d..726b61a 100644
--- a/src/main/java/com/ynxbd/common/action/pay/PayAction.java
+++ b/src/main/java/com/ynxbd/common/action/pay/PayAction.java
@@ -135,8 +135,8 @@ public class PayAction extends BaseAction {
      * *
      * * @param payCode  退款支付方式 { ali：支付宝；wx：微信 }
      */
-    @Action("inHospPrepay")
-    public Result inHospPrepay(String openid, String patientId, String patientName, String treatNum, String payMoney, String payWay, String payCode) {
+    @Action("inHospDepositPay")
+    public Result inHospDepositPay(String openid, String patientId, String patientName, String treatNum, String payMoney, String payWay, String payCode) {
         Result result = PayService.isPaymentPermittedByTime();
         if (result != null) {
             return result;
diff --git a/src/main/java/com/ynxbd/common/action/test/TestAction.java b/src/main/java/com/ynxbd/common/action/test/TestAction.java
index 6699d00..5671697 100644
--- a/src/main/java/com/ynxbd/common/action/test/TestAction.java
+++ b/src/main/java/com/ynxbd/common/action/test/TestAction.java
@@ -39,7 +39,7 @@ public class TestAction extends BaseAction {
     public synchronized void refund_handle() {
         if (i == 0) {
             i++;
-//            WxPayHelper.refund("", "", new BigDecimal("0.900"), new BigDecimal("0.900"), "手动退费");
+            WxPayHelper.refund("", "", new BigDecimal("6.230"), new BigDecimal("6.230"), "手动退费");
         }
     }
 
diff --git a/src/main/java/com/ynxbd/common/bean/in_hosp/InHospFeeItem.java b/src/main/java/com/ynxbd/common/bean/in_hosp/InHospFeeItem.java
index b37214f..4a1b1be 100644
--- a/src/main/java/com/ynxbd/common/bean/in_hosp/InHospFeeItem.java
+++ b/src/main/java/com/ynxbd/common/bean/in_hosp/InHospFeeItem.java
@@ -30,6 +30,6 @@ public class InHospFeeItem {
     private Integer count;
     // 单价
     private BigDecimal price;
-
-    private BigDecimal payMoney;
+    // 计算结果
+    private BigDecimal money;
 }
diff --git a/src/main/java/com/ynxbd/common/dao/his/HisInHospDao.java b/src/main/java/com/ynxbd/common/dao/his/HisInHospDao.java
index 6d3f6cd..aea7803 100644
--- a/src/main/java/com/ynxbd/common/dao/his/HisInHospDao.java
+++ b/src/main/java/com/ynxbd/common/dao/his/HisInHospDao.java
@@ -70,7 +70,7 @@ public class HisInHospDao {
      * @param patientId 患者id
      * @return 住院费用清单
      */
-    public JsonResult getInHospFee(String patientId, String date) {
+    public JsonResult getInPatientFee(String patientId, String date) {
         return HisHelper.getJsonResult(HisEnum.AP_Query_InpatientFee, params -> {
             params.put("PatientID", patientId);
             params.put("FeeDate", date == null ? "" : date);
@@ -84,14 +84,14 @@ public class HisInHospDao {
      * @return 住院记录
      */
     public JsonResult getAllHospList(String patientId) {
-        return HisHelper.getJsonResult(HisEnum.Query_InHospListByPatientId, params -> {
+        return HisHelper.getJsonResult(HisEnum.Query_InHospRecords, params -> {
             params.put("PatientID", patientId);
             params.put("CallNo", HisHelper.WECHAT_CALL_NO);
         });
     }
 
-    public JsonResult getAllFee(String treatNum) {
-        return HisHelper.getJsonResult(HisEnum.Query_InHospFeeDailyByTreat, params -> {
+    public JsonResult getOutHospTreatFee(String treatNum) {
+        return HisHelper.getJsonResult(HisEnum.Query_OutHospTreatFee, params -> {
             params.put("ZYNum", treatNum);
             params.put("CallNo", HisHelper.WECHAT_CALL_NO);
         });
diff --git a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java
index d02eaf2..9c94345 100644
--- a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java
+++ b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java
@@ -270,7 +270,7 @@ public class HisRecipeDao {
      * @param pageSize  每页数量
      * @param pyCode    拼音码
      * @param type      类型
-     * @param groupFlag 组套标识
+     * @param groupFlag 检查治疗是否包含组套项目 [0:否；1:是（不传时默认值）]
      */
     public static JsonResult getStandardPrice(Integer pageNum, Integer pageSize, String pyCode, String type, String groupFlag) {
         return HisHelper.getJsonResult(HisEnum.Recipe_Query_StandardPrice, params -> {
diff --git a/src/main/java/com/ynxbd/common/helper/his/HisEnum.java b/src/main/java/com/ynxbd/common/helper/his/HisEnum.java
index 23c05e1..6b42be2 100644
--- a/src/main/java/com/ynxbd/common/helper/his/HisEnum.java
+++ b/src/main/java/com/ynxbd/common/helper/his/HisEnum.java
@@ -76,18 +76,16 @@ public enum HisEnum {
     Medical_QueryOrderStatus("[医保]查询医保结算信息", "40025", "YDZF_QueryOrderStatus", true),
 
     // 住院-------------------------
-    AP_Query_Prepay("[住院]查询预交金缴费记录", "5003", "AP_Query_Prepay", true),
-    AP_Query_InpatientFee("[住院]查询住院费用清单", "5004", "AP_Query_InpatientFee", true),
-    AP_Query_InpatientSummaryFee("[住院]查询住院日费用汇总", "5006", "AP_Query_InpatientSummaryFee", true),
+    AP_Query_Prepay("[住院]查询预交金缴费记录（出院后）", "5003", "AP_Query_Prepay", true),
+    AP_Query_InpatientFee("[住院]查询住院费用清单（住院中）", "5004", "AP_Query_InpatientFee", true),
+    AP_Query_InpatientSummaryFee("[住院]查询住院日费用汇总（住院中）", "5006", "AP_Query_InpatientSummaryFee", true),
 
-    // 住院[自定义]-------------------
+    Query_InHospRecords("[住院]通过患者ID查询住院记录（出院后）", "1011", "UniversalInterface", true),
+    Query_OutHospTreatFee("[住院]通过住院号查询费用明细（出院后）", "1012", "UniversalInterface", true),
 
-    Query_InHospListByPatientId("[住院]通过患者ID查询住院记录", "1011", "UniversalInterface", true),
-    Query_InHospFeeDailyByTreat("[住院]通过住院号查询费用明细", "1012", "UniversalInterface", true),
     Query_InHospPrepay("[住院]预交金缴费", "4003", "UniversalInterface", true),
     Query_InHospByTreatNum("[住院]通过住院号查询患者信息(含预交金)", "1005", "UniversalInterface", true),
-    Query_InHospByPatientId("[住院]通过患者ID查询在院患者信息", "1006", "UniversalInterface", true),
-
+    Query_InHospByPatientId("[住院]通过患者ID查询在院患者信息（目前只能查询住院中）", "1006", "UniversalInterface", true),
 
     XK_GET_TREAT_LIST("[互联网医院]查询就诊记录列表", "13001", "UniversalInterface", true),
     XK_CREATE_TREAT("[互联网医院]创建就诊记录", "13002", "UniversalInterface", true),
diff --git a/src/main/java/com/ynxbd/common/service/RecipeService.java b/src/main/java/com/ynxbd/common/service/RecipeService.java
index 1c7b187..81b130a 100644
--- a/src/main/java/com/ynxbd/common/service/RecipeService.java
+++ b/src/main/java/com/ynxbd/common/service/RecipeService.java
@@ -957,7 +957,7 @@ public class RecipeService {
      * @param pageSize  每页数量
      * @param pyCode    拼音码
      * @param type      类型 {1:检查治疗; 2:药品材料; 99:全部}
-     * @param groupFlag 组套标识 { 0：不含组套； 1：包含组套 }
+     * @param groupFlag 检查治疗是否包含组套项目 [0:否；1:是（不传时默认值）]
      * @return 结果
      */
     public Result getStandardPrice(Integer pageNum, Integer pageSize, String pyCode, String type, String groupFlag) {
diff --git a/src/main/resources/webservice.properties b/src/main/resources/webservice.properties
index b7363c4..9354497 100644
--- a/src/main/resources/webservice.properties
+++ b/src/main/resources/webservice.properties
@@ -1 +1 @@
-# \u5F00\u542F\u5904\u65B9\u9884\u7ED3\u7B97\uFF08\u7B2C2\u5F00\u5173\uFF09\uFF08\u6CE8\u610F\u8BE5\u914D\u7F6E\u9700\u8054\u7CFBhis\u5F00\u53D1\u8005\u786E\u8BA4\u652F\u6301\u624D\u80FD\u5F00\u542F\uFF0C\u5426\u5219\u5B58\u5728\u98CE\u9669\uFF01\uFF09
his.is_recipe_prepay=false
# \u672C\u5730
#his.url=127.0.0.1:8888
# HIS\u662F\u5426\u5F00\u542F\u652F\u4ED8\u5B9D\u5206\u5F00\u5BF9\u8D26
his.is_ali_mer=false
# \u662F\u5426\u5F3A\u5236\u6253\u5370webservice\u7684xml\u8FD4\u56DE\u6570\u636E
his.is_log_resp=true
# \u662F\u5426\u4F20\u9012openid\u7ED9his\u63A8\u9001\u6D88\u606F
his.is_push_msg=false
#-------------------------------------------------------------
# \u6D4B\u8BD5\u73AF\u5883
his.dev_url=127.0.0.1:7777
# \u533B\u4FDD======================
# \u65E7\u914D\u7F6E
his.md_url=127.0.0.1:7777
# \u5FAE\u4FE1\u533B\u4FDD
his.wx_med_url=10.20.10.7:7885
# \u652F\u4ED8\u5B9D\u533B\u4FDD
his.ali_med_url=10.20.10.7:7885

# \u6D4B\u8BD5============================================================
### \u5FB7\u5B8F\u4E2D\u533B
#his.url=200.200.200.60:8888
# \u7EA2\u6CB3\u5DDE\u533B\u9662
#his.url=10.20.10.6:8888
# \u8292\u5E02\u5987\u5E7C
his.url=192.168.11.7:8888
# \u5B81\u8497\u5987\u5E7C
#his.url=172.19.3.15:8888
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.39:8888

# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.10:8888
# \u7EA2\u6CB3
#his.url=10.20.10.6:8888
# \u7EA2\u6CB3\u533B\u4FDD
#his.url=10.20.10.6:8888
#his.url=192.168.12.10:8888
#his.md_url=192.168.1.128:7885
#his.dev_url=10.20.10.6:9988
# \u6C38\u80DC
#his.url=200.200.200.20:8888
# \u5FB7\u5B8F\u4E2D\u533B
#his.url=200.200.200.60:8888
# \u534E\u576A
#his.url=192.168.1.115:8888
# \u8499\u81EA\u4E2D\u533B
#his.url=192.168.0.228:8888
# \u7389\u9F99
#his.url=192.168.0.17:8888
# \u4E91\u9F99
#his.url=200.200.200.69:8888
#
#his.url=172.16.10.15:8888
# \u7984\u529D\u949F\u7231
#his.url=200.200.200.5:8888
# \u8499\u81EA\u5E02\u4EBA\u6C11\u533B\u9662
#his.url=200.200.200.174:8080
# \u5143\u8C0B
#his.url=200.200.200.29:8888
# \u5143\u8C0B\u533B\u4FDD
#his.dev_url=200.200.200.36:9999
# \u8292\u5E02
#his.url=192.168.100.8:8888
# \u7EA2\u6CB3\u5987\u5E7C\u4FDD\u5065\u9662
#his.url=192.168.1.204:8888
# \u8292\u5E02\u5987\u5E7C
#his.url=192.168.11.7:8888
#
#his.url=10.10.11.23:8888
# \u77F3\u6797
#his.url=192.168.10.10:8888
# \u5BCC\u6C11
#his.url=200.200.201.27:8888
# \u897F\u53CC\u7248\u7EB3
#his.url=10.10.11.23:8888

#wx.password=ynxbd@6910
\ No newline at end of file
+# \u5F00\u542F\u5904\u65B9\u9884\u7ED3\u7B97\uFF08\u7B2C2\u5F00\u5173\uFF09\uFF08\u6CE8\u610F\u8BE5\u914D\u7F6E\u9700\u8054\u7CFBhis\u5F00\u53D1\u8005\u786E\u8BA4\u652F\u6301\u624D\u80FD\u5F00\u542F\uFF0C\u5426\u5219\u5B58\u5728\u98CE\u9669\uFF01\uFF09
his.is_recipe_prepay=false
# \u672C\u5730
#his.url=127.0.0.1:8888
# HIS\u662F\u5426\u5F00\u542F\u652F\u4ED8\u5B9D\u5206\u5F00\u5BF9\u8D26
his.is_ali_mer=false
# \u662F\u5426\u5F3A\u5236\u6253\u5370webservice\u7684xml\u8FD4\u56DE\u6570\u636E
his.is_log_resp=true
# \u662F\u5426\u4F20\u9012openid\u7ED9his\u63A8\u9001\u6D88\u606F
his.is_push_msg=false
#-------------------------------------------------------------
# \u6D4B\u8BD5\u73AF\u5883
his.dev_url=127.0.0.1:7777
# \u533B\u4FDD======================
# \u65E7\u914D\u7F6E
his.md_url=127.0.0.1:7777
# \u5FAE\u4FE1\u533B\u4FDD
his.wx_med_url=10.20.10.7:7885
# \u652F\u4ED8\u5B9D\u533B\u4FDD
his.ali_med_url=10.20.10.7:7885

# \u6D4B\u8BD5============================================================
# \u5FB7\u5B8F\u4E2D\u533B
his.url=200.200.200.60:8888
# \u7EA2\u6CB3\u5DDE\u533B\u9662
#his.url=10.20.10.6:8888
# \u8292\u5E02\u5987\u5E7C
#his.url=192.168.11.7:8888
# \u5B81\u8497\u5987\u5E7C
#his.url=172.19.3.15:8888
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.39:8888

# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.10:8888
# \u7EA2\u6CB3
#his.url=10.20.10.6:8888
# \u7EA2\u6CB3\u533B\u4FDD
#his.url=10.20.10.6:8888
#his.url=192.168.12.10:8888
#his.md_url=192.168.1.128:7885
#his.dev_url=10.20.10.6:9988
# \u6C38\u80DC
#his.url=200.200.200.20:8888
# \u5FB7\u5B8F\u4E2D\u533B
#his.url=200.200.200.60:8888
# \u534E\u576A
#his.url=192.168.1.115:8888
# \u8499\u81EA\u4E2D\u533B
#his.url=192.168.0.228:8888
# \u7389\u9F99
#his.url=192.168.0.17:8888
# \u4E91\u9F99
#his.url=200.200.200.69:8888
#
#his.url=172.16.10.15:8888
# \u7984\u529D\u949F\u7231
#his.url=200.200.200.5:8888
# \u8499\u81EA\u5E02\u4EBA\u6C11\u533B\u9662
#his.url=200.200.200.174:8080
# \u5143\u8C0B
#his.url=200.200.200.29:8888
# \u5143\u8C0B\u533B\u4FDD
#his.dev_url=200.200.200.36:9999
# \u8292\u5E02
#his.url=192.168.100.8:8888
# \u7EA2\u6CB3\u5987\u5E7C\u4FDD\u5065\u9662
#his.url=192.168.1.204:8888
# \u8292\u5E02\u5987\u5E7C
#his.url=192.168.11.7:8888
#
#his.url=10.10.11.23:8888
# \u77F3\u6797
#his.url=192.168.10.10:8888
# \u5BCC\u6C11
#his.url=200.200.201.27:8888
# \u897F\u53CC\u7248\u7EB3
#his.url=10.10.11.23:8888

#wx.password=ynxbd@6910
\ No newline at end of file
diff --git a/src/main/resources/wx.properties b/src/main/resources/wx.properties
index 42dffcf..794c52f 100644
--- a/src/main/resources/wx.properties
+++ b/src/main/resources/wx.properties
@@ -1,18 +1,14 @@
-wx.app_id=
+wx.app_id=wxd503671f502bd89d
 wx.app_secret=
 wx.token=ynxbd
 wx.aes_key=
 wx.mch_id=
 wx.mch_key=
 # \u57DF\u540D
-wx.domain=http://www.xxx.com
+wx.domain=
 # \u9879\u76EE\u90E8\u7F72\u670D\u52A1\u540D
 wx.deploy_server_name=wx
 # \u9759\u6001\u8D44\u6E90\u8DEF\u5F84
 wx.web_static_path=/web
 # \u9000\u8D39\u5BC6\u7801
 wx.password=ynxbd@6910
-#
-# \u7528\u4E8E\u6388\u6743\u7684\u533B\u5171\u4F53\u516C\u4F17\u53F7\u914D\u7F6E=======================
-wx.gmc.is_enable=true
-wx.gmc.auth_domain=http://www.xxx.com
\ No newline at end of file