配置调整

src/main/java/com/ynxbd/common/TestA.java

@@ -1,5 +1,11 @@
 package com.ynxbd.common;
 
+import com.bocom.api.security.keygen.AESKeyGen;
 public class TestA {
 
+
+    public static void main(String[] args) {
+
+
+    }
 }

src/main/java/com/ynxbd/common/helper/lis/RMLisHelper.java

@@ -25,7 +25,7 @@ public class RMLisHelper {
     final private static Boolean IS_LOG_RESP;
 
     static {
-        ProperHelper config = new ProperHelper().read("webservice.properties");
+        ProperHelper config = new ProperHelper().read("lis.properties");
         String url = config.getString("lis.url");
         Boolean unifiedEntrance = config.getBoolean("lis.unifiedEntrance", false);
         IS_LOG_RESP = config.getBoolean("lis.is_log_resp", false);

src/main/java/com/ynxbd/wx/config/AIGuidanceConfig.java

@@ -8,26 +8,24 @@ import org.apache.commons.lang3.ObjectUtils;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * 智能导诊
+ * 智能导诊配置
  */
-
 @Slf4j
 public class AIGuidanceConfig {
     private AIGuidanceConfig() {
     }
 
-    final public static boolean IS_ENABLE;
+    public final static boolean IS_ENABLE;
-
     //配置文件读取项
-    final public static String HOS_ID;
+    public final static String HOS_ID;
     // 密钥
-    final public static String KEY;
+    public final static String KEY;
-    final public static String PARTNER_ID;
+    public final static String PARTNER_ID;
-    final public static String HOS_NAME;
+    public final static String HOS_NAME;
-    final public static String HOS_ADDRESS;
+    public final static String HOS_ADDRESS;
-    final public static String HOS_INTRO;
+    public final static String HOS_INTRO;
-    final public static String HOS_LEVEL;
+    public final static String HOS_LEVEL;
-    final public static String HOS_TELEPHONE;
+    public final static String HOS_TELEPHONE;
 
     static {
         ProperHelper config = new ProperHelper().read("ai-guidance.properties");

src/main/java/com/ynxbd/wx/servlet/test/OrderTest.java

@@ -3,10 +3,9 @@ package com.ynxbd.wx.servlet.test;
 import com.ynxbd.common.bean.pay.Order;
 import com.ynxbd.common.bean.pay.Recipe;
 import com.ynxbd.common.dao.RecipeDao;
-import com.ynxbd.wx.config.WeChatConfig;
 import com.ynxbd.common.helper.common.CodeHelper;
 import com.ynxbd.common.helper.common.ErrorHelper;
-import org.apache.commons.codec.digest.DigestUtils;
+import com.ynxbd.wx.config.WeChatConfig;
 import weixin.popular.api.PayMchAPI;
 import weixin.popular.bean.paymch.MchOrderInfoResult;
 import weixin.popular.bean.paymch.MchOrderquery;

src/main/java/com/ynxbd/wx/servlet/test/RefundTest.java

@@ -1,12 +0,0 @@
-package com.ynxbd.wx.servlet.test;
-
-import com.ynxbd.wx.wxfactory.WxPayHelper;
-
-import java.math.BigDecimal;
-
-// 退费
-public class RefundTest {
-//    public static void main(String[] args) {
-//        WxPayHelper.refund("WX34361d8ce54248773cf9acf4bdf8", "4200002138202312203358207528", new BigDecimal("0.800"), new BigDecimal("0.800"), "手动退费");
-//    }
-}

src/main/java/com/ynxbd/wx/servlet/test/RefundTestServlet.java

@@ -25,9 +25,8 @@ public class RefundTestServlet extends BaseServlet {
         if (i == 0) {
             i++;
             // 1
-            WxPayHelper.refund("WX66ac39360f1245abb138ef932e78", "4200002102202312207984632409", new BigDecimal("0.800"), new BigDecimal("0.800"), "手动退费");
+            WxPayHelper.refund("", "", new BigDecimal("0.800"), new BigDecimal("0.800"), "手动退费");
             // 2
-
         }
         return Result.success();
     }

src/main/java/com/ynxbd/wx/wxfactory/WxFactory.java

@@ -9,7 +9,6 @@ public class WxFactory {
     private static final String SUCCESS = "SUCCESS";
     private static final String FAIL = "FAIL";
 
-
     @NoArgsConstructor
     public static class Base {
 

src/main/resources/lis.properties

@@ -0,0 +1 @@
+# LIS\u914D\u7F6E
lis.url=192.168.1.185:8090
lis.unifiedEntrance=true

src/main/resources/medical-ali.properties

@@ -1,5 +1,5 @@
 # \u533B\u4FDD\u914D\u7F6E
-med_ali.is_dev=false
+med_ali.is_dev=true
 med_ali.is_enable=true
 med_ali.is_auto_refund=true
 # \u5B9A\u70B9\u533B\u7597\u673A\u6784\u540D\u79F0\uFF08\u652F\u4ED8\u5B9D\u53EF\u80FD\u4E0D\u540C\uFF09

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
lis.url=192.168.1.185:8090
lis.unifiedEntrance=true
# \u672C\u5730
#his.url=127.0.0.1:8888
# \u6D4B\u8BD5\u73AF\u5883
ali_code=675448357
# 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
+# \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