优化验证码功能

AppFrontService/src/main/java/com/java110/app/controller/EnvController.java

@@ -0,0 +1,33 @@
+package com.java110.app.controller;
+
+import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.CommonConstant;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @ClassName EnvController 环境查询控制类
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2020/2/10 23:17
+ * @Version 1.0
+ * add by wuxw 2020/2/10
+ **/
+@RestController
+@RequestMapping(path = "/app/env")
+public class EnvController {
+
+    @RequestMapping(path = "/getEnv", method = RequestMethod.GET)
+    public ResponseEntity<String> getEnv(HttpServletRequest request) {
+        String env = MappingCache.getValue("HC_ENV");
+        return new ResponseEntity<>(env, HttpStatus.OK);
+    }
+}

AppFrontService/src/main/java/com/java110/app/smo/AppAbstractComponentSMO.java

@@ -3,6 +3,7 @@ package com.java110.app.smo;
 import com.java110.app.properties.WechatAuthProperties;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.PayUtil;
@@ -73,7 +74,7 @@ public abstract class AppAbstractComponentSMO extends AbstractComponentSMO {
         SortedMap<String, String> resultMap = new TreeMap<String, String>();
 //生成支付金额，开发环境处理支付金额数到0.01、0.02、0.03元
 
-        double payAmount = PayUtil.getPayAmountByEnv("DEV", money);
+        double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
 //添加或更新支付记录(参数跟进自己业务需求添加)
 
         Map<String, String> resMap = this.java110UnifieldOrder(restTemplate,feeName, orderNum, wechatAuthProperties.TRADE_TYPE_JSAPI, payAmount, openId);

java110-utils/src/main/java/com/java110/utils/util/PayUtil.java

@@ -331,7 +331,7 @@ public class PayUtil {
     public static double getPayAmountByEnv(String env, Double money) {
         double pay_money = 0.01;
 //测试环境
-        if ("DEV".equals(env)) {
+        if ("DEV".equals(env) || "TEST".equals(env)) {
             if (money > 10000) {
                 pay_money = 0.03;
             } else if (money > 1000) {