路径前缀动态配置

YijiaRestful/src/main/java/com/platform/yijia/config/WebMvcConfig.java

@@ -1,52 +1,23 @@
-//package com.platform.yijia.config;
-//
-//import com.fasterxml.jackson.databind.DeserializationFeature;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-//import com.fasterxml.jackson.databind.module.SimpleModule;
-//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.http.converter.HttpMessageConverter;
-//import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-//import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-//
-//import java.text.SimpleDateFormat;
-//import java.util.List;
-//import java.util.TimeZone;
-//
-///**
-// * 添加与WebMvc相关的自定义配置
-// */
-//@Configuration
-//public class WebMvcConfig extends WebMvcConfigurationSupport {
-//
-//    @Value("${spring.jackson.date-format}")
-//    private String dateFormatPattern;
-//
-//    @Value("${spring.jackson.time-zone}")
-//    private String timeZone;
-//
-//    @Override
-//    protected void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
-//        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-//        ObjectMapper objectMapper = converter.getObjectMapper();
-//        // 生成JSON时,将所有Long转换成String
-//        SimpleModule simpleModule = new SimpleModule();
-//        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-//        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
-//        objectMapper.registerModule(simpleModule);
-//        // 时间格式化
-//        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-//        //这个可以引用spring boot yml 里的格式化配置和时区配置
-//        objectMapper.setDateFormat(new SimpleDateFormat(dateFormatPattern));
-//        objectMapper.setTimeZone(TimeZone.getTimeZone(timeZone));
-//        // 设置格式化内容
-//        converter.setObjectMapper(objectMapper);
-//        converters.add(0, converter);
-//        super.extendMessageConverters(converters);
-//    }
-//
-//}
+package com.platform.yijia.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.annotation.Resource;
+
+/**
+ * 添加与WebMvc相关的自定义配置
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Resource
+    private YiJiaPathProperties yiJiaPathProperties;
+
+    //统一后台接口路径访问前缀
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+        configurer.addPathPrefix(yiJiaPathProperties.getGlobalPrefix(), c -> c.isAnnotationPresent(YiJiaRequest.class));
+    }
+}

YijiaRestful/src/main/java/com/platform/yijia/config/YiJiaPathProperties.java

@@ -0,0 +1,21 @@
+package com.platform.yijia.config;
+
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/***
+ * <Title>YiJiaRequest</Title>
+ * <Description> 路径前缀配置 </Description>
+ * @Author JK
+ * @Date 2021年5月25日
+ */
+@Component
+//@ConfigurationProperties(prefix = "yijia.path")
+@Data
+public class YiJiaPathProperties {
+    @Value("${yijia.path.global-prefix}")
+    private String globalPrefix;
+}

YijiaRestful/src/main/java/com/platform/yijia/config/YiJiaRequest.java

@@ -0,0 +1,32 @@
+package com.platform.yijia.config;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.lang.annotation.*;
+
+/***
+ * <Title>YiJiaRequest</Title>
+ * <Description> 路径前缀配置注解 </Description>
+ * @Author JK
+ * @Date 2021年5月25日
+ */
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@RestController
+@RequestMapping
+public @interface YiJiaRequest {
+
+    @AliasFor(annotation = RequestMapping.class)
+    String name() default "";
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] value() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] path() default {};
+
+}

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -10,6 +10,7 @@ import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.alipay.api.response.AlipayUserInfoAuthResponse;
 import com.alipay.api.response.AlipayUserInfoShareResponse;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.param.request.AppUserInfoRequest;
 import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
@@ -39,7 +40,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class AppUserInfoController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(AppUserInfoController.class);
     @Autowired

YijiaRestful/src/main/java/com/platform/yijia/controller/CustomerGradeController.java

@@ -2,6 +2,7 @@ package com.platform.yijia.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.pojo.CustomerManage;
 import com.platform.yijia.service.CustomerGradeServices;
 import com.platform.yijia.service.PayOrderService;
@@ -23,7 +24,7 @@ import java.util.Map;
  * 客户优惠和营销
  */
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class CustomerGradeController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(CustomerGradeController.class);
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.param.request.RechargeBalance;
 import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
@@ -13,6 +14,7 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +33,7 @@ import java.util.*;
  * @Date 2021年3月22日
  */
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class ElectronicMembershipCardController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(ElectronicMembershipCardController.class);
 
@@ -59,6 +61,8 @@ public class ElectronicMembershipCardController {
     private StationOilGunService stationOilGunService;
     @Resource
     private SysDictDataService sysDictDataService;
+    @Value("${yijia.path.global-prefix}")
+    private String globalPrefix;
 
     //查询该油站是否启用电子会员卡
     @RequestMapping(value = "/getStationCardEnabledFlag", method = RequestMethod.GET)
@@ -802,7 +806,8 @@ public class ElectronicMembershipCardController {
                     reqData.put("tradeSource", "01"); //交易来源 01服务商，02收银台，03硬件
                     reqData.put("trmIp", "172.16.2.1");//商家ip地址
                     reqData.put("outFrontFailUrl", ""); //js 支付，前台 事变通知地址
-                    reqData.put("notifyUrl", "https://www.huijy.net/demo/getCardRechargeCallback"); //回调地址
+                    String notifyUrl = "https://www.huijy.net/"+globalPrefix+"/getCardRechargeCallback";
+                    reqData.put("notifyUrl", notifyUrl); //回调地址
 //                    reqData.put("notifyUrl", "https://www.huijy.net/api/getCardRechargeCallback"); //回调地址
 //                    reqData.put("subMechId", ""); //子商户号
 //                    reqData.put("amt", "0.01");

YijiaRestful/src/main/java/com/platform/yijia/controller/IntegralShoppingMallController.java

@@ -2,6 +2,7 @@ package com.platform.yijia.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
 import com.platform.yijia.utils.CodeMsg;
@@ -31,7 +32,7 @@ import java.util.*;
  * @Date 2021年2月24日
  */
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class IntegralShoppingMallController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(IntegralShoppingMallController.class);
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.param.request.*;
 import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
@@ -14,6 +15,7 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +28,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class PayController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(PayController.class);
     @Resource
@@ -55,6 +57,9 @@ public class PayController {
     private  ElectronicMembershipCardService electronicMembershipCardService;
     @Resource
     private  CustomerManagerService customerManagerService;
+    @Value("${yijia.path.global-prefix}")
+    private String globalPrefix;
+
 
 
     /***
@@ -215,8 +220,10 @@ public class PayController {
 
                     //reqData.put("outFrontUrl", ""); //js 支付，前台 成功通知地址
                     reqData.put("outFrontFailUrl", ""); //js 支付，前台 事变通知地址
+                    //globalPrefix
+                    String notifyUrl = "https://www.huijy.net/"+globalPrefix+"/getCallback";
                     //reqData.put("notifyUrl", "https://www.huijy.net/api/getCallback"); //回调地址
-                    reqData.put("notifyUrl", "https://www.huijy.net/demo/getCallback"); //回调地址
+                    reqData.put("notifyUrl", notifyUrl); //回调地址
                     //reqData.put("needReceipt", "00"); //电子发票功能 微信开具电子 发票使用
                     //reqData.put("ledgerAccountFlag", "00"); //是否做分账 分账交易使 用；00：做； 01：不做；不传默认为不做分账
                     //reqData.put("ledgerAccountEffectTime", "00"); //分账有效时间 单位为天；是 否做分账选择 00 时该字段必传

YijiaRestful/src/main/java/com/platform/yijia/controller/PayOrderController.java

@@ -1,5 +1,6 @@
 package com.platform.yijia.controller;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.dao.PayOrderMapper;
 import com.platform.yijia.param.request.PayOrderRequest;
 import com.platform.yijia.pojo.*;
@@ -18,7 +19,7 @@ import java.sql.Timestamp;
 import java.util.*;
 
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class PayOrderController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(PayOrderController.class);
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -2,6 +2,7 @@ package com.platform.yijia.controller;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.param.request.LoginBody;
 import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
@@ -33,7 +34,7 @@ import java.util.*;
  */
 
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class PosMachineController {
     @Resource
     private PosMachineService posMachineService;

YijiaRestful/src/main/java/com/platform/yijia/controller/StationController.java

@@ -1,6 +1,7 @@
 package com.platform.yijia.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.param.request.StationRequest;
 import com.platform.yijia.param.response.StationInfoVo;
 import com.platform.yijia.pojo.*;
@@ -12,6 +13,8 @@ import com.platform.yijia.utils.CodeMsg;
 import com.platform.yijia.utils.FeiEPrinterUtil;
 import com.platform.yijia.utils.ResultData;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -20,8 +23,11 @@ import java.util.List;
 import java.util.Map;
 
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class StationController {
+
+    private static Logger logger =(Logger) LoggerFactory.getLogger(StationController.class);
+
     @Resource
     private StationService stationService;
 
@@ -45,6 +51,7 @@ public class StationController {
                 String gzhAppId = m.get("gzhAppId");
                 Map<String, Object> map = new HashMap<>();
                 map.put("appId", gzhAppId);
+                logger.info("该油站公众号：" +gzhAppId);
                 resultData =ResultData.success(map);
             }else{
                 resultData =ResultData.error(CodeMsg.REQUEST_FAIL);

YijiaRestful/src/main/java/com/platform/yijia/controller/SydDeptController.java

@@ -1,6 +1,7 @@
 package com.platform.yijia.controller;
 
 import com.google.gson.Gson;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.param.request.RequestParameter;
 import com.platform.yijia.pojo.SysDept;
 import com.platform.yijia.service.SysDeptService;
@@ -14,7 +15,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class SydDeptController {
 
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/controller/WXLoginController.java

@@ -2,6 +2,7 @@ package com.platform.yijia.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.pojo.AppUserInfo;
 import com.platform.yijia.service.AppUserInfoService;
 import com.platform.yijia.utils.ConstantUtil;
@@ -28,7 +29,7 @@ import java.util.List;
  **/
 
 @Controller
-@RequestMapping("/demo")
+@YiJiaRequest()
 public class WXLoginController {
 
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/pojo/IntegralWares.java

@@ -22,10 +22,7 @@ public class IntegralWares {
     private String waresStatus;         //'商品状态（1上架，2下架）',
     private Date createTime;            //'创建时间',
     private String createBy;            //'创建人id',
-    private String createName;          //'创建人名称',
     private Date updateTime;            //'更新时间',
     private String updateBy;            //'更新人id',
-    private String updateName;          //'更新人名称',
     private Integer stationId;          //'油站ID',
-    private String stationName;         //油站名称
 }

YijiaRestful/src/main/java/com/platform/yijia/utils/DESUtils.java

@@ -0,0 +1,149 @@
+package com.platform.yijia.utils;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+public class DESUtils {
+	/**
+     * 随意定一个私钥（长度必须为24位）
+     */
+    public static final String SECRET_KEY = "ABCDEFGHIJKLMN1234567890";
+
+    /**
+     * 加密
+     *
+     * @param inStr     需要加密的内容
+     * @param secretKey 密钥
+     * @return 加密后的数据
+     */
+
+    public static String encrypt(String inStr, String secretKey) {
+
+        SecretKey deskey = new SecretKeySpec(secretKey.getBytes(), "DESede");
+
+        Cipher cipher;
+
+        String outStr = null;
+
+        try {
+
+            cipher = Cipher.getInstance("DESede");
+
+            cipher.init(Cipher.ENCRYPT_MODE, deskey);
+
+            outStr = byte2hex(cipher.doFinal(inStr.getBytes()));
+
+        } catch (Exception e) {
+            System.err.println("3DES加密异常"+ e.getMessage());
+        }
+        return outStr;
+
+    }
+
+    /**
+     * 解密
+     *
+     * @param inStr     需要解密的内容
+     * @param secretKey 密钥
+     * @return 解密后的数据
+     */
+
+    public static String decrypt(String inStr, String secretKey) {
+
+        SecretKey deskey = new SecretKeySpec(secretKey.getBytes(), "DESede");
+
+        Cipher cipher;
+        String outStr = null;
+
+        try {
+
+            cipher = Cipher.getInstance("DESede");
+
+            cipher.init(Cipher.DECRYPT_MODE, deskey);
+
+            outStr = new String(cipher.doFinal(hex2byte(inStr)));
+
+        } catch (Exception e) {
+            System.err.println("3DES解密异常"+e.getMessage());
+        }
+        return outStr;
+
+    }
+
+    /**
+     * 转化为16进制字符串方法
+     *
+     * @param digest 需要转换的字节组
+     * @return 转换后的字符串
+     */
+
+    private static String byte2hex(byte[] digest) {
+
+        StringBuffer hs = new StringBuffer();
+
+        String stmp = "";
+
+        for (int n = 0; n < digest.length; n++) {
+
+            stmp = Integer.toHexString(digest[n] & 0XFF);
+
+            if (stmp.length() == 1) {
+
+                hs.append("0" + stmp);
+
+            } else {
+
+                hs.append(stmp);
+
+            }
+
+        }
+
+        return hs.toString().toUpperCase();
+
+    }
+
+    /**
+     * 十六进转二进制
+     *
+     * @param hexStr 待转换16进制字符串
+     * @return 二进制字节组
+     */
+
+    public static byte[] hex2byte(String hexStr) {
+
+        if (hexStr == null)
+
+            return null;
+
+        hexStr = hexStr.trim();
+
+        int len = hexStr.length();
+
+        if (len == 0 || len % 2 == 1)
+
+            return null;
+
+        byte[] digest = new byte[len / 2];
+
+        try {
+
+            for (int i = 0; i < hexStr.length(); i += 2) {
+
+                digest[i / 2] = (byte) Integer.decode("0x" + hexStr.substring(i, i + 2)).intValue();
+
+            }
+            return digest;
+
+        } catch (Exception e) {
+
+            return null;
+
+        }
+
+    }
+
+
+
+}

YijiaRestful/src/main/resources/application.yml

@@ -9,10 +9,19 @@ server:
         # tomcat的URI编码
         uri-encoding: UTF-8
 
+# POS机查询数据分页
 pagehelper:
     helper-dialect=mysql:
+
+# 路径前缀动态配置
+yijia:
+    path:
+        global-prefix: demo
+
+# POS机登录解密密文密码
 3des:
     pwd: LAnZ8RRSkIY0EGVYheu2IjEk
+
 # Spring配置
 spring:
     datasource:

YijiaRestful/src/main/resources/mapper/IntegralWaresMapper.xml

@@ -14,19 +14,16 @@
     <result column="wares_status"    jdbcType="VARCHAR"    property="waresStatus" />
     <result column="create_time"     jdbcType="TIMESTAMP"  property="createTime" />
     <result column="create_by"       jdbcType="VARCHAR"    property="createBy" />
-    <result column="create_name"     jdbcType="VARCHAR"    property="createName" />
     <result column="update_time"     jdbcType="TIMESTAMP"  property="updateTime" />
     <result column="update_by"       jdbcType="VARCHAR"    property="updateBy" />
-    <result column="update_name"     jdbcType="VARCHAR"    property="updateName" />
     <result column="station_id"      jdbcType="INTEGER"    property="stationId" />
-    <result column="station_name"    jdbcType="VARCHAR"    property="stationName" />
   </resultMap>
 
   <!--查询列-->
   <sql id="Base_Column_List">
     id, wares_type, wares_name, sale_integral, wares_pic,
     wares_detail, wares_count, wares_out_count, wares_status,
-    create_time, create_by, create_name, update_time, update_by, update_name, station_name
+    create_time, create_by, update_time, update_by
   </sql>
 
   <!--查询油站商品信息-->