zhang song 6 år sedan
förälder
incheckning
82b4e7b09f

+ 2 - 2
pine-admin/src/main/java/com/pine/admin/config/InterceptorConfig.java

@@ -31,8 +31,8 @@ public class InterceptorConfig implements HandlerInterceptor {
      * @throws Exception
      */
     @Override
-    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
-        String url = httpServletRequest.getRequestURI();
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) {
+//        log.info("--------------进入controller层之前拦截请求---------------");
         return handler;
     }
 

+ 4 - 2
pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/OrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.pine.admin.modules.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.pine.admin.aop.Operation;
 import com.pine.admin.modules.business.dao.CustomerDao;
 import com.pine.admin.modules.business.entity.Customer;
 import com.pine.admin.modules.business.service.LogisticsTemplateService;
@@ -220,10 +221,11 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
+    @Operation("核销订单")
     public String checkWriteOffVirtualRequest(Long orderId, String writeOffCode) {
         Map<String,Object> map = new HashMap<>();
         map.put("orderId",orderId);
-        map.put("writeOffCode","4935");
+        map.put("writeOffCode",writeOffCode);
         map.put("dealerName",ShiroUtils.getShiroUserInfo().getName());
         String resKey = RSAUtils.encrypt(RSAUtils.publicKey, JSONObject.toJSONString(map));
 
@@ -240,6 +242,6 @@ public class OrderServiceImpl implements OrderService {
         if (!maps.get("code").toString().equals("1")) {
             throw new ApiException(maps.get("msg").toString());
         }
-        return maps.get("code").toString();
+        return maps.get("msg").toString();
     }
 }

+ 6 - 5
pine-admin/src/main/java/com/pine/admin/modules/system/controller/SysUserLoginController.java

@@ -51,13 +51,14 @@ public class SysUserLoginController {
     }
 
     @PostMapping("/secretLogin")
-    public Result secretLogin(HttpServletRequest request) {
+    public Result secretLogin(@RequestParam(value = "casualBacking")String  casualBacking) {
         try {
 
-            String casualBacking = request.getParameter("casualBacking");
-            String ip = request.getParameter("ip");
-
-            String responseString = sysService.decryptUser(ip, casualBacking);
+//            String casualBacking = request.getParameter("casualBacking");
+//            String ip = request.getParameter("ips");
+            log.info("ip:"+casualBacking);
+//            String responseString = sysService.decryptUser(ips, casualBacking);
+            String responseString = sysService.decryptUser(casualBacking.split("@@")[1], casualBacking.split("@@")[0]);
 
             DealerOpenIdToken dealerOpenIdToken;
 

+ 1 - 1
pine-admin/src/main/java/com/pine/admin/modules/system/service/SysService.java

@@ -34,7 +34,7 @@ public interface SysService {
      * @param casualBacking
      * @return
      */
-    String decryptUser(String Ip,String casualBacking);
+    String decryptUser(String ips,String casualBacking);
 
     //经销商登录(亿客接口)
     DealerOpenIdToken dealerLogin(String userCode, String password) throws Exception;

+ 5 - 3
pine-admin/src/main/java/com/pine/admin/modules/system/service/impl/SysServiceImpl.java

@@ -96,21 +96,23 @@ public class SysServiceImpl implements SysService {
     }
 
     @Override
-    public String decryptUser(String ip, String casualBacking) {
-
+    public String decryptUser(String ips, String casualBacking) {
+        log.info("ip:"+ips);
         String responseString = RSAUtils.changeSpecialToString(casualBacking);
         if (StringUtils.isEmpty(responseString)) {
             log.error("offlineAudit fail due to rsa decrypt fail");
             throw new ApiException("秘钥解析失败");
         }
 //        String redisKey = RSAUtils.encrypt(RSAUtils.publicKey, ip + ":" + responseString);
-        String redisKey = ip + ":" + responseString;
+        String redisKey = ips + ":" + responseString;
 
         log.info("免密登录key:" + redisKey);
 
         Map<String, String> map = new HashMap<>();
         map.put("key", redisKey);
+        log.info(redisKey);
         String dealerInfo = PostUtil.formUpload(Constant.LOGIN_REDIS_API, map, null, "");
+        log.info("url:"+Constant.LOGIN_REDIS_API+"PARAM:"+map.get("key"));
         log.info("获取经销商信息:" + dealerInfo);
         if (StringUtils.isEmpty(dealerInfo)) {
             throw new ApiException("用户未登录");

+ 165 - 0
pine-admin/src/main/java/com/pine/admin/pay/FinancialPaySetting.java

@@ -0,0 +1,165 @@
+package com.pine.admin.pay;
+
+import lombok.Data;
+
+/**
+ * @author 葛新帅
+ * @date 2019-08-02 14:58
+ * <p>
+ * 金融支付设置
+ */
+@Data
+public class FinancialPaySetting {
+
+    /**
+     * 设置 ID
+     */
+    private long id;
+
+    /**
+     * 消息来源
+     */
+    private String msgSrc;
+    /**
+     * 来源编号
+     */
+    private String msgSrcId;
+
+    /**
+     * 通讯秘钥
+     */
+    private String key;
+
+    /**
+     * 业务类型
+     */
+    private String instMid;
+
+    /**
+     * 商户号
+     */
+    private String mid;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 设置类型 0 PC  1 公众号  2 H5
+     */
+    private String type;
+
+
+    /**
+     * 金融支付通讯 url
+     */
+    public interface APIurl {
+
+        /**
+         * PC 端扫码支付获取二维码 API
+         */
+        String PC_API_URL = "https://qr-test2.chinaums.com/netpay-route-server/api/";
+//        String PC_API_URL = "https://qr.chinaums.com/netpay-route-server/api/";
+
+        /**
+         * H5 支付 API
+         */
+        String H5_API_URL = "https://qr-test2.chinaums.com/netpay-portal/webpay/pay.do";
+//        String H5_API_URL = "https://qr.chinaums.com/netpay-portal/webpay/pay.do";
+
+        /**
+         * 公众号支付 API
+         */
+        String PUBLIC_API_URL = "https://qr-test2.chinaums.com/netpay-portal/webpay/pay.do";
+//        String PUBLIC_API_URL = "https://qr.chinaums.com/netpay-portal/webpay/pay.do";
+
+
+        /**
+         * H5 退款
+         */
+        String H5_BACK_MONEY_API_URL = "https://qr-test2.chinaums.com/netpay-route-server/api/";
+//        String H5_BACK_MONEY_API_URL="https://qr.chinaums.com/netpay-route-server/api/";
+
+
+        /**
+         * 公众号退款
+         */
+        String PUBLIC_BACK_MONEY_API_URL = "https://qr-test2.chinaums.com/netpay-route-server/api/";
+//        String PUBLIC_BACK_MONEY_API_URL = "https://qr.chinaums.com/netpay-route-server/api/";
+
+
+
+        /**
+         *  H5 查询接口
+         */
+//        String H5_QUERY_API_URL = "https://qr-test2.chinaums.com/netpay-route-server/api/";
+        String H5_QUERY_API_URL = "https://qr.chinaums.com/netpay-route-server/api/";
+
+        /**
+         * 公众号查询接口
+         */
+//        String PUBLIC_QUERY_API_URL = "https://qr-test2.chinaums.com/netpay-route-server/api/";
+        String PUBLIC_QUERY_API_URL = "https://qr.chinaums.com/netpay-route-server/api/";
+
+        /**PC公众号查询接口
+         */
+        String PC_QUERY_API_URL = "https://qr-test2.chinaums.com/netpay-route-server/api/";
+//        String PC_QUERY_API_URL = "https://qr.chinaums.com/netpay-route-server/api/";
+
+    }
+
+
+    /**
+     * 金融支付常量
+     */
+    public interface Common {
+
+        /**
+         * PC 支付
+         */
+        String PC_PAY = "0";
+
+        /**
+         * 公众号支付
+         */
+        String PUBLIC_PAY = "1";
+
+        /**
+         * H5 支付
+         */
+        String H5_PAY = "2";
+
+        /**
+         * PC 扫码支付消息类型
+         */
+        String PC_MSG_TYPE = "bills.getQRCode";
+
+        /**
+         * H5 支付消息类型
+         */
+        String H5_MSG_TYPE = "trade.h5Pay";
+
+        /**
+         * 公众号支付消息类型
+         */
+        String PUBLIC_MSG_TYPE = "WXPay.jsPay";
+
+        /**
+         * PC 扫码退款消息类型
+         */
+        String PC_MSG_TYPE_BACK = "bills.refund";
+
+        /**
+         * H5 支付退款消息类型
+         */
+        String H5_MSG_TYPE_BACK = "refund";
+
+        /**
+         * 公众号支付退款消息类型
+         */
+        String PUBLIC_MSG_TYPE_BACK = "refund";
+
+    }
+
+}

+ 83 - 0
pine-admin/src/main/java/com/pine/admin/pay/PayResult.java

@@ -0,0 +1,83 @@
+package com.pine.admin.pay;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.pine.admin.modules.business.entity.UserInfo;
+import com.pine.common.dto.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * com.pine.admin.modules.business.controller
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019/11/29
+ */
+
+@Slf4j
+@ApiIgnore
+public class PayResult {
+    public static void main(String[] args) {
+        Object all = PayResult.all("2", "47176542923691344527369369912", null);
+    }
+
+    public static Object all(String payChannel, String billNo, String payTime) {
+
+        FinancialPaySetting paySetting = new FinancialPaySetting();
+        JSONObject json = new JSONObject();
+        String queryUrl = null;
+
+        json.put("msgSrc","WWW.HEJIASHH.COM");
+        json.put("requestTimestamp", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        json.put("mid", "898340255110746");
+        json.put("tid", "02160497");
+
+        if ("1".equals(payChannel)) {
+            queryUrl = FinancialPaySetting.APIurl.H5_QUERY_API_URL;
+            json.put("msgType", "query");
+            json.put("merOrderId", billNo);
+        }
+
+        if ("2".equals(payChannel)) {
+            queryUrl = FinancialPaySetting.APIurl.PUBLIC_QUERY_API_URL;
+            json.put("msgType", "query");
+            json.put("merOrderId", billNo);
+
+        }
+
+        if ("3".equals(payChannel)) {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            queryUrl = FinancialPaySetting.APIurl.PC_API_URL;
+            json.put("billNo", billNo);
+            json.put("billDate", LocalDateTime.parse(payTime, formatter));
+            json.put("msgType", "bills.query");
+        }
+
+        Map<String, String> paramsMap = PayUtils.jsonToMap(json);
+        paramsMap.put("sign", PayUtils.makeSign("ZGS2rj4QmNTE5N6SEjyTYacJc3rDhzk2zxjCzpJT4fD2Tt3N", paramsMap));
+
+        JSONObject jsonObject = PostUtil.sendRequest(JSON.toJSONString(paramsMap), queryUrl);
+        log.info("searchPayOrderInfo result is : {} ,queryUrl:{}", jsonObject.toJSONString(), queryUrl);
+        if (!StringUtils.isEmpty(jsonObject)) {
+            if ("SUCCESS".equals(jsonObject.getString("errCode"))) {
+                log.info("searchPayOrderInfo success billNo : {} ,queryUrl", billNo);
+
+            }
+        }
+        return jsonObject.toJSONString();
+    }
+
+}

+ 152 - 0
pine-admin/src/main/java/com/pine/admin/pay/PayUtils.java

@@ -0,0 +1,152 @@
+package com.pine.admin.pay;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.*;
+
+/**
+ * @author 葛新帅
+ * @date 2019-08-05 13:34
+ * <p>
+ * 支付工具类
+ */
+public class PayUtils {
+
+
+    public static String makeOrderRequest(JSONObject json, String md5Key, String apiUrl) {
+        Map<String, String> params = jsonToMap(json);
+        params.put("sign", makeSign(md5Key, params));
+        return apiUrl + "?" + buildUrlParametersStr(params);
+    }
+
+
+    public static String makeSign(String md5Key, Map<String, String> params) {
+        String preStr = buildSignString(params); // 把数组所有元素,按照“参数=参数值”的模式用“&”字符拼接成字符串
+        String text = preStr + md5Key;
+        return DigestUtils.md5Hex(getContentBytes(text)).toUpperCase();
+    }
+
+    public static boolean checkSign(String md5Key, Map<String, String> params) {
+        String sign = params.get("sign");
+
+        if (StringUtils.isBlank(sign)) {
+            return false;
+        }
+
+        String signV = makeSign(md5Key, params);
+
+        return StringUtils.equalsIgnoreCase(sign, signV);
+    }
+
+    // 获取HttpServletRequest里面的参数,并decode
+    public static Map<String, String> getRequestParams(HttpServletRequest request) {
+        Map<String, String[]> params = request.getParameterMap();
+        Map<String, String> params2 = new HashMap<>();
+        for (String key : params.keySet()) {
+            String[] values = params.get(key);
+            if (values.length > 0) {
+                params2.put(key, values[0]);
+            }
+        }
+        return params2;
+    }
+
+    public static String genMerOrderId(String msgId, String orderType) {
+        String date = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS");
+        String rand = RandomStringUtils.randomNumeric(6);
+        return msgId + date + rand + orderType;
+    }
+
+
+    public static String getPublicH5BillNo(String msgId, String orderCode) {
+        return msgId + orderCode + RandomStringUtils.randomNumeric(6);
+    }
+
+
+    public static String buildUrlParametersStr(Map<String, String> paramMap) {
+        Map.Entry entry;
+        StringBuffer buffer = new StringBuffer();
+
+        for (Iterator iterator = paramMap.entrySet().iterator(); iterator.hasNext(); ) {
+            entry = (Map.Entry) iterator.next();
+
+            buffer.append(entry.getKey().toString()).append("=");
+            try {
+                if (entry.getValue() != null && StringUtils.isNotBlank(entry.getValue().toString())) {
+                    buffer.append(URLEncoder.encode(entry.getValue().toString(), "UTF-8"));
+                }
+            } catch (UnsupportedEncodingException e) {
+            }
+
+            buffer.append(iterator.hasNext() ? "&" : "");
+        }
+
+        return buffer.toString();
+    }
+
+    // 使json-lib来进行json到map的转换,fastjson有排序问题,不能用
+    public static Map<String, String> jsonToMap(JSONObject json) {
+        Map<String, String> map = new HashMap<>();
+        for (Object key : json.keySet()) {
+            String value = json.getString((String) key);
+            map.put((String) key, value);
+        }
+        return map;
+    }
+
+    // 构建签名字符串
+    public static String buildSignString(Map<String, String> params) {
+
+        if (params == null || params.size() == 0) {
+            return "";
+        }
+
+        List<String> keys = new ArrayList<>(params.size());
+
+        for (String key : params.keySet()) {
+            if ("sign".equals(key)) {
+                continue;
+            }
+            if (StringUtils.isEmpty(params.get(key))) {
+                continue;
+            }
+            keys.add(key);
+        }
+
+        Collections.sort(keys);
+
+        StringBuilder buf = new StringBuilder();
+
+        for (int i = 0; i < keys.size(); i++) {
+            String key = keys.get(i);
+            String value = params.get(key);
+
+            if (i == keys.size() - 1) {// 拼接时,不包括最后一个&字符
+                buf.append(key + "=" + value);
+            } else {
+                buf.append(key + "=" + value + "&");
+            }
+        }
+
+        return buf.toString();
+    }
+
+    // 根据编码类型获得签名内容byte[]
+    public static byte[] getContentBytes(String content) {
+        try {
+            return content.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("签名过程中出现错误");
+        }
+    }
+
+
+}

+ 72 - 0
pine-admin/src/main/java/com/pine/admin/pay/PostUtil.java

@@ -0,0 +1,72 @@
+package com.pine.admin.pay;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * com.lecshop.util
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019/11/8
+ */
+@Slf4j
+public class PostUtil {
+
+    public static JSONObject sendRequest(String strReqJsonStr, String getUrl) {
+        log.debug(" sendRequest start , the strReqJsonStr is : {}  ,getUrl :{}", strReqJsonStr, getUrl);
+        HttpURLConnection httpURLConnection = null;
+        BufferedReader in = null;
+        PrintWriter out = null;
+        String resultStr = null;
+        Map<String, String> resultMap = new HashMap<String, String>();
+        try {
+            URL url = new URL(getUrl);
+            httpURLConnection = (HttpURLConnection) url.openConnection();
+            httpURLConnection.setRequestMethod("POST");
+            httpURLConnection.setDoInput(true);
+            httpURLConnection.setDoOutput(true);
+            httpURLConnection.setRequestProperty("Content_Type", "application/json");
+            httpURLConnection.setRequestProperty("Accept_Charset", "UTF-8");
+            httpURLConnection.setRequestProperty("contentType", "UTF-8");
+            //发送POST请求参数
+            out = new PrintWriter(httpURLConnection.getOutputStream());
+            out.write(strReqJsonStr);
+            out.flush();
+            //读取响应
+            if (httpURLConnection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                StringBuffer content = new StringBuffer();
+                String tempStr = null;
+                in = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream()));
+                while ((tempStr = in.readLine()) != null) {
+                    content.append(tempStr);
+                }
+                log.debug(" sendRequest result is : {} ", content.toString());
+                //转换成json对象
+                JSONObject respJson = JSON.parseObject(content.toString());
+                return respJson;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultMap.put("errCode", "HttpURLException");
+            resultMap.put("msg", "调用出现异常:" + e.toString());
+            resultStr = JSONObject.toJSONString(resultMap);
+            log.error("  sendRequest error , the resultStr : {} ,getUrl :{} ", resultStr,getUrl);
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+            httpURLConnection.disconnect();
+        }
+        return null;
+    }
+}

+ 2 - 1
pine-admin/src/main/resources/application-dev.properties

@@ -50,7 +50,8 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 ### mysql config   ###
-spring.datasource.url=jdbc:mysql://47.100.127.59:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
+#spring.datasource.url=jdbc:mysql://47.100.127.59:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.url=jdbc:mysql://112.30.212.47:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=pl,okmijn
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver

+ 16 - 0
pine-admin/src/test/com/pine/admin/pay/PayResultTest.java

@@ -0,0 +1,16 @@
+package com.pine.admin.pay;
+
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class PayResultTest {
+
+    @Test
+    public void all() {
+    }
+}

+ 27 - 17
pine-common/src/main/java/com/pine/common/utils/Constant.java

@@ -14,9 +14,13 @@ package com.pine.common.utils;
  * @author Mark sunlightcs@gmail.com
  */
 public class Constant {
-    /** 超级管理员ID */
+    /**
+     * 超级管理员ID
+     */
     public static final int SUPER_ADMIN = 1;
-    /** 数据权限过滤 */
+    /**
+     * 数据权限过滤
+     */
     public static final String SQL_FILTER = "sql_filter";
     /**
      * 当前页码
@@ -35,49 +39,49 @@ public class Constant {
      */
     public static final String ORDER = "order";
     /**
-     *  升序
+     * 升序
      */
     public static final String ASC = "asc";
     /**
-     *  兑换码生成位数
+     * 兑换码生成位数
      */
     public static final Integer EXCHANGE_CODE_SIZE = 15;
 
     /**
-     *  订单 支付方式 微信
+     * 订单 支付方式 微信
      */
     public static final Integer ORDER_PAY_WEI = 0;
 
     /**
-     *  订单 支付方式 微信
+     * 订单 支付方式 微信
      */
     public static final Integer ORDER_PAY_CODE = 1;
 
     /**
-     *  订单 支付状态 已经支付
+     * 订单 支付状态 已经支付
      */
     public static final Integer ORDER_PAY_ALREADY = 0;
 
     /**
-     *  订单 支付状态 未支付
+     * 订单 支付状态 未支付
      */
     public static final Integer ORDER_PAY_YET = 1;
 
 
     /**
-     *  订单 状态 0待支付
+     * 订单 状态 0待支付
      */
     public static final Integer ORDER_STATUS_TO_PAY = 0;
     /**
-     *  订单 状态 1代发货
+     * 订单 状态 1代发货
      */
     public static final Integer ORDER_STATUS_TO_SHIP = 1;
     /**
-     *  订单 状态 2代收货
+     * 订单 状态 2代收货
      */
     public static final Integer ORDER_STATUS_TO_RECEIPT = 2;
     /**
-     *  订单 状态 3已签收
+     * 订单 状态 3已签收
      */
     public static final Integer ORDER_STATUS_TO_SIGNING = 3;
     /**
@@ -97,11 +101,17 @@ public class Constant {
     public static final Integer USER_WEIXIN = 0;
     public static final Integer USER_DEALER = 2;
 
-    public static final String validatebacking= "http://shop.jetour.com.cn/admin/validatebacking.htm";
-    public static final String dealerWriteOffVerification= "http://shop.jetour.com.cn/admin/dealerWriteOffVerification.htm";
-    public static final String offlineaudit= "http://shop.jetour.com.cn/admin/offlineaudit.htm";
-    public static final String LOGIN_URL= "https://dealer.jetour.com.cn/api/auth/sys-user/getShopRoleByAccountAndPassword";
-    public static final String LOGIN_REDIS_API= "http://47.100.17.208:8280/api/auth/sys-user/getShopLoginByRedisKey";
+    public static final String validatebacking = "http://shop.jetour.com.cn/admin/validatebacking.htm";
+    public static final String dealerWriteOffVerification = "http://shop.jetour.com.cn/admin/dealerWriteOffVerification.htm";
+    public static final String offlineaudit = "http://shop.jetour.com.cn/admin/offlineaudit.htm";
+    public static final String LOGIN_URL = "https://dealer.jetour.com.cn/api/auth/sys-user/getShopRoleByAccountAndPassword";
+    public static final String LOGIN_REDIS_API = "https://dealer.jetour.com.cn/api/auth/sys-user/getShopLoginByRedisKey";
+
+//    public static final String validatebacking= "http://shoptest.jetour.com.cn/admin/validatebacking.htm";
+//    public static final String dealerWriteOffVerification= "http://shoptest.jetour.com.cn/admin/dealerWriteOffVerification.htm";
+//    public static final String offlineaudit= "http://shoptest.jetour.com.cn/admin/offlineaudit.htm";
+//    public static final String LOGIN_URL= "https://dealer.jetour.com.cn/api/auth/sys-user/getShopRoleByAccountAndPassword";
+//    public static final String LOGIN_REDIS_API= "http://47.100.17.208:8280/api/auth/sys-user/getShopLoginByRedisKey";
 
     /**
      * 菜单类型

+ 1 - 1
pine-common/src/main/java/com/pine/common/utils/RSAUtils.java

@@ -52,7 +52,7 @@ public class RSAUtils {
         System.out.println(encrypt.replace("+", "%2B"));
 
         String aaaa =
-    "O1kIS1c61PFpkyYo2eMNlh18Gk1oFTlVlc9Bx/u0qFCONWy8679FrVxE0xseEK+mf0pfKUgeNnNJbZk0CVuVyhd8yH65C2GfZ5olHoeu/Eb/V2cnQFc5W7SYdXOvj2t4S4aEIJUhz9HUf3e5+nbjPrr2zYvDnAD0ymGdYOeS5rE="
+                "QlGvvArhBysB3T5YW1iv2R54FLo3yC3Zzr5EOuXJAVjUYh7mwLGV1msZN1sLP4BumlTGrE3QL5L80yx1cl4sUQBtZTTT/J55dmbeFxU0uoXOVz0um7FTCt85cIQWsnfVwLdD8am6SuU7ihHzHsNlxwhAqzC86KoHqhj9O9orfAk="
                 ;
 
         String responseString = RSAUtils.decrypt(RSAUtils.privateKey, aaaa);